Skip to content
Permalink
Browse files

Merge branch 'hotfix'

  • Loading branch information...
sahil28297 committed May 1, 2019
2 parents f6a9eec + 98e511d commit 9089b242baf431b3c0a83814197069d003953f05
Showing with 1,254 additions and 1,035 deletions.
  1. +1 −1 erpnext/__init__.py
  2. +5 −0 erpnext/accounts/doctype/bank_account/bank_account.js
  3. +2 −2 erpnext/accounts/doctype/bank_account/bank_account.json
  4. +19 −1 erpnext/accounts/doctype/bank_transaction/bank_transaction.js
  5. +778 −745 erpnext/accounts/doctype/bank_transaction/bank_transaction.json
  6. +81 −5 erpnext/accounts/doctype/bank_transaction/bank_transaction.py
  7. +1 −1 erpnext/accounts/doctype/bank_transaction/bank_transaction_list.js
  8. +6 −6 erpnext/accounts/doctype/bank_transaction/bank_transaction_upload.py
  9. +11 −4 erpnext/accounts/page/bank_reconciliation/bank_reconciliation.js
  10. +1 −36 erpnext/accounts/page/bank_reconciliation/bank_reconciliation.py
  11. +4 −0 erpnext/controllers/status_updater.py
  12. +1 −1 erpnext/hooks.py
  13. +2 −2 erpnext/hr/doctype/employee/employee.py
  14. +8 −4 erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py
  15. +166 −166 ...type/employee_tax_exemption_declaration_category/employee_tax_exemption_declaration_category.json
  16. +45 −2 erpnext/hr/doctype/payroll_period/payroll_period.json
  17. +0 −2 erpnext/hr/doctype/salary_component/salary_component.js
  18. +68 −37 erpnext/hr/doctype/salary_slip/salary_slip.py
  19. +8 −8 erpnext/hr/doctype/salary_slip/test_salary_slip.py
  20. +4 −3 erpnext/hr/doctype/salary_structure/salary_structure.py
  21. +1 −1 erpnext/patches.txt
  22. +5 −3 erpnext/projects/doctype/project/project.py
  23. +2 −2 erpnext/projects/doctype/task/task.json
  24. +1 −1 erpnext/selling/doctype/sales_order/sales_order.py
  25. +34 −2 erpnext/support/doctype/issue/issue.json
@@ -5,7 +5,7 @@
from erpnext.hooks import regional_overrides
from frappe.utils import getdate

__version__ = '11.1.23'
__version__ = '11.1.24'

def get_default_company(user=None):
'''Get default company for user'''
@@ -12,6 +12,11 @@ frappe.ui.form.on('Bank Account', {
}
};
});
frm.set_query("party_type", function() {
return {
query: "erpnext.setup.doctype.party_type.party_type.get_party_type",
};
});
},
refresh: function(frm) {
frappe.dynamic_link = { doc: frm.doc, fieldname: 'name', doctype: 'Bank Account' }
@@ -2,7 +2,7 @@
"allow_copy": 0,
"allow_events_in_timeline": 0,
"allow_guest_to_view": 0,
"allow_import": 0,
"allow_import": 1,
"allow_rename": 1,
"autoname": "",
"beta": 0,
@@ -975,7 +975,7 @@
"email": 1,
"export": 1,
"if_owner": 0,
"import": 0,
"import": 1,
"permlevel": 0,
"print": 1,
"read": 1,
@@ -2,7 +2,7 @@
// For license information, please see license.txt

frappe.ui.form.on('Bank Transaction', {
onload: function(frm) {
onload(frm) {
frm.set_query('payment_document', 'payment_entries', function() {
return {
"filters": {
@@ -12,3 +12,21 @@ frappe.ui.form.on('Bank Transaction', {
});
}
});

frappe.ui.form.on('Bank Transaction Payments', {
payment_entries_remove: function(frm, cdt, cdn) {
update_clearance_date(frm, cdt, cdn);
}
});

const update_clearance_date = (frm, cdt, cdn) => {
if (frm.doc.docstatus === 1) {
frappe.xcall('erpnext.accounts.doctype.bank_transaction.bank_transaction.unclear_reference_payment',
{doctype: cdt, docname: cdn})
.then(e => {
if (e == "success") {
frappe.show_alert({message:__("Document {0} successfully uncleared", [e]), indicator:'green'});
}
});
}
};

0 comments on commit 9089b24

Please sign in to comment.
You can’t perform that action at this time.