From e9f2b176bc71bb808b8f19f1b5a687324f0d3d92 Mon Sep 17 00:00:00 2001 From: Helkyd Date: Wed, 11 Oct 2017 15:02:27 +0100 Subject: [PATCH 01/10] Salary Detail Abbr When processing via Process Salary Abbr is not filled unless if Hourly pay ... this is required for later check what Component is or was added for Employee --- erpnext/hr/doctype/salary_slip/salary_slip.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/erpnext/hr/doctype/salary_slip/salary_slip.py b/erpnext/hr/doctype/salary_slip/salary_slip.py index 356104e69c..a39c171aff 100644 --- a/erpnext/hr/doctype/salary_slip/salary_slip.py +++ b/erpnext/hr/doctype/salary_slip/salary_slip.py @@ -69,7 +69,8 @@ class SalarySlip(TransactionBase): 'amount': amount, 'default_amount': amount, 'depends_on_lwp' : struct_row.depends_on_lwp, - 'salary_component' : struct_row.salary_component + 'salary_component' : struct_row.salary_component, + 'abbr' : struct_row.abbr }) else: component_row.amount = amount From 2b6bf82d6103f32f78c1d210bb708d00fc5a76e0 Mon Sep 17 00:00:00 2001 From: Helkyd Date: Wed, 22 Nov 2017 14:49:51 +0100 Subject: [PATCH 02/10] Default Payment Mode POS drafted, user retrieves the record and sets the default payment mode so that Zero payment is not done. --- erpnext/accounts/page/pos/pos.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/erpnext/accounts/page/pos/pos.js b/erpnext/accounts/page/pos/pos.js index be0b6f7b72..b86529e753 100644 --- a/erpnext/accounts/page/pos/pos.js +++ b/erpnext/accounts/page/pos/pos.js @@ -1638,6 +1638,14 @@ erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({ this.si_docs = this.get_doc_from_localstorage(); if (this.name) { this.update_invoice() + //to retrieve and set the default payment + invoice_data[this.name] = this.frm.doc; + invoice_data[this.name].payments[0].amount = this.frm.doc.net_total + invoice_data[this.name].payments[0].base_amount = this.frm.doc.net_total + + this.frm.doc.paid_amount = this.frm.doc.net_total + this.frm.doc.outstanding_amount = 0 + } else { this.name = $.now(); this.frm.doc.offline_pos_name = this.name; From 3264c135453f16896baa9c4a15cd5051ad894553 Mon Sep 17 00:00:00 2001 From: Helkyd Date: Wed, 22 Nov 2017 16:06:22 +0100 Subject: [PATCH 03/10] No ZERO payment If no payment mode selected does not process ... to avoid having SI with payment pending as POS for sure was paid.. --- erpnext/public/js/payment/payments.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/erpnext/public/js/payment/payments.js b/erpnext/public/js/payment/payments.js index 77209e093a..554566ad95 100644 --- a/erpnext/public/js/payment/payments.js +++ b/erpnext/public/js/payment/payments.js @@ -27,9 +27,14 @@ erpnext.payments = erpnext.stock.StockController.extend({ var me = this; this.dialog.set_primary_action(__("Submit"), function() { - me.dialog.hide() - me.submit_invoice() - }) + //Allow no ZERO payment + $.each(me.frm.doc.payments, function (index, data) { + if (data.amount != 0) { + me.dialog.hide(); + me.submit_invoice(); + return; + } + }); }) }, make_keyboard: function(){ From 6e3f789f82d3ddd07297c9d72ad689108b50baaf Mon Sep 17 00:00:00 2001 From: Helkyd Date: Wed, 22 Nov 2017 16:12:27 +0100 Subject: [PATCH 04/10] code fixe fixed }) --- erpnext/public/js/payment/payments.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/erpnext/public/js/payment/payments.js b/erpnext/public/js/payment/payments.js index 554566ad95..32523735a6 100644 --- a/erpnext/public/js/payment/payments.js +++ b/erpnext/public/js/payment/payments.js @@ -34,7 +34,8 @@ erpnext.payments = erpnext.stock.StockController.extend({ me.submit_invoice(); return; } - }); }) + }); + }) }, make_keyboard: function(){ From 5cf01d9702b5f56a543f8e2ccf2fdfeb81bc514b Mon Sep 17 00:00:00 2001 From: Cesar Date: Mon, 29 Jan 2018 11:54:12 +0100 Subject: [PATCH 05/10] Sort by account name Trial balance not sorted .. by adding those changes fixes the problem. --- erpnext/accounts/report/trial_balance/trial_balance.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/erpnext/accounts/report/trial_balance/trial_balance.py b/erpnext/accounts/report/trial_balance/trial_balance.py index 9eea472086..ba6d00b68d 100644 --- a/erpnext/accounts/report/trial_balance/trial_balance.py +++ b/erpnext/accounts/report/trial_balance/trial_balance.py @@ -52,7 +52,7 @@ def validate_filters(filters): def get_data(filters): accounts = frappe.db.sql("""select name, parent_account, account_name, root_type, report_type, lft, rgt - from `tabAccount` where company=%s order by lft""", filters.company, as_dict=True) + from `tabAccount` where company=%s order by account_name,lft""", filters.company, as_dict=True) company_currency = erpnext.get_company_currency(filters.company) if not accounts: @@ -168,7 +168,8 @@ def accumulate_values_into_parents(accounts, accounts_by_name): def prepare_data(accounts, filters, total_row, parent_children_map, company_currency): data = [] - + tmpacnt = sorted(accounts) + accounts = tmpacnt for d in accounts: has_value = False row = { From 58c040cffb503b6b9ae192a2e4af0530ab0aecfe Mon Sep 17 00:00:00 2001 From: Cesar Date: Mon, 29 Jan 2018 11:57:15 +0100 Subject: [PATCH 06/10] Revert "Sort by account name" This reverts commit 5cf01d9702b5f56a543f8e2ccf2fdfeb81bc514b. --- erpnext/accounts/report/trial_balance/trial_balance.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/erpnext/accounts/report/trial_balance/trial_balance.py b/erpnext/accounts/report/trial_balance/trial_balance.py index ba6d00b68d..9eea472086 100644 --- a/erpnext/accounts/report/trial_balance/trial_balance.py +++ b/erpnext/accounts/report/trial_balance/trial_balance.py @@ -52,7 +52,7 @@ def validate_filters(filters): def get_data(filters): accounts = frappe.db.sql("""select name, parent_account, account_name, root_type, report_type, lft, rgt - from `tabAccount` where company=%s order by account_name,lft""", filters.company, as_dict=True) + from `tabAccount` where company=%s order by lft""", filters.company, as_dict=True) company_currency = erpnext.get_company_currency(filters.company) if not accounts: @@ -168,8 +168,7 @@ def accumulate_values_into_parents(accounts, accounts_by_name): def prepare_data(accounts, filters, total_row, parent_children_map, company_currency): data = [] - tmpacnt = sorted(accounts) - accounts = tmpacnt + for d in accounts: has_value = False row = { From d6a61ad0c389715dbf54e35770257431c8d1a13b Mon Sep 17 00:00:00 2001 From: Helkyd Date: Mon, 29 Jan 2018 13:47:12 +0000 Subject: [PATCH 07/10] Trial Balance sort by Account Name Trial Balance order by Account Name Used Sorted under Prepare_data Function. --- erpnext/accounts/report/trial_balance/trial_balance.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/erpnext/accounts/report/trial_balance/trial_balance.py b/erpnext/accounts/report/trial_balance/trial_balance.py index 9eea472086..1ad8f0e725 100644 --- a/erpnext/accounts/report/trial_balance/trial_balance.py +++ b/erpnext/accounts/report/trial_balance/trial_balance.py @@ -52,7 +52,7 @@ def validate_filters(filters): def get_data(filters): accounts = frappe.db.sql("""select name, parent_account, account_name, root_type, report_type, lft, rgt - from `tabAccount` where company=%s order by lft""", filters.company, as_dict=True) + from `tabAccount` where company=%s order by account_name, lft""", filters.company, as_dict=True) company_currency = erpnext.get_company_currency(filters.company) if not accounts: @@ -168,6 +168,8 @@ def accumulate_values_into_parents(accounts, accounts_by_name): def prepare_data(accounts, filters, total_row, parent_children_map, company_currency): data = [] + tmpaccnt = sorted(accounts) + accounts = tmpaccnt for d in accounts: has_value = False From d8b1927e8d510391c4c40b509b8961bdceeab3ca Mon Sep 17 00:00:00 2001 From: Cesar Date: Mon, 29 Jan 2018 15:39:52 +0100 Subject: [PATCH 08/10] Allow no ZERO Payment Allow no ZERO Payment --- erpnext/public/js/payment/payments.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/public/js/payment/payments.js b/erpnext/public/js/payment/payments.js index 32523735a6..0d656bc1fb 100644 --- a/erpnext/public/js/payment/payments.js +++ b/erpnext/public/js/payment/payments.js @@ -27,14 +27,14 @@ erpnext.payments = erpnext.stock.StockController.extend({ var me = this; this.dialog.set_primary_action(__("Submit"), function() { - //Allow no ZERO payment + // Allow no ZERO payment $.each(me.frm.doc.payments, function (index, data) { if (data.amount != 0) { me.dialog.hide(); me.submit_invoice(); return; } - }); + }); }) }, From b258686b004c9e2a122af2777ace1ef5a8cfd53e Mon Sep 17 00:00:00 2001 From: Helkyd Date: Thu, 1 Feb 2018 15:53:30 +0000 Subject: [PATCH 09/10] Update trial_balance.py Fix to order only if account starts with Number ... while for others not required.... --- erpnext/accounts/report/trial_balance/trial_balance.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/erpnext/accounts/report/trial_balance/trial_balance.py b/erpnext/accounts/report/trial_balance/trial_balance.py index 09b43c1bc9..f484111be3 100644 --- a/erpnext/accounts/report/trial_balance/trial_balance.py +++ b/erpnext/accounts/report/trial_balance/trial_balance.py @@ -176,7 +176,8 @@ def accumulate_values_into_parents(accounts, accounts_by_name): def prepare_data(accounts, filters, total_row, parent_children_map, company_currency): data = [] tmpaccnt = sorted(accounts) - accounts = tmpaccnt + if accounts[0].account_name[0].isnumeric(): + accounts = tmpaccnt for d in accounts: has_value = False From 5e93b02c85042bc591b5aeb2e9f40c153f75ec59 Mon Sep 17 00:00:00 2001 From: Helkyd Date: Fri, 2 Feb 2018 12:27:30 +0000 Subject: [PATCH 10/10] Update trial_balance.py Assuming that Account_number has NUMBERs will sort. --- erpnext/accounts/report/trial_balance/trial_balance.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/accounts/report/trial_balance/trial_balance.py b/erpnext/accounts/report/trial_balance/trial_balance.py index f484111be3..7142c69955 100644 --- a/erpnext/accounts/report/trial_balance/trial_balance.py +++ b/erpnext/accounts/report/trial_balance/trial_balance.py @@ -51,7 +51,7 @@ def validate_filters(filters): filters.to_date = filters.year_end_date def get_data(filters): - accounts = frappe.db.sql("""select name, parent_account, account_name, root_type, report_type, lft, rgt + accounts = frappe.db.sql("""select name, parent_account, account_name, account_number, root_type, report_type, lft, rgt from `tabAccount` where company=%s order by account_name, lft""", filters.company, as_dict=True) company_currency = erpnext.get_company_currency(filters.company) @@ -176,7 +176,7 @@ def accumulate_values_into_parents(accounts, accounts_by_name): def prepare_data(accounts, filters, total_row, parent_children_map, company_currency): data = [] tmpaccnt = sorted(accounts) - if accounts[0].account_name[0].isnumeric(): + if not (accounts[0].account_number is None): accounts = tmpaccnt for d in accounts: