From 632f7673d5ab19cbf59abe60b6ce8fc20e8ad22a Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 7 Aug 2017 13:50:16 +0530 Subject: [PATCH 1/4] Added total row in GST reports (#10292) --- .../gst_itemised_purchase_register.json | 4 ++-- .../gst_itemised_sales_register.json | 4 ++-- .../report/gst_purchase_register/gst_purchase_register.json | 4 ++-- .../report/gst_sales_register/gst_sales_register.json | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/erpnext/regional/report/gst_itemised_purchase_register/gst_itemised_purchase_register.json b/erpnext/regional/report/gst_itemised_purchase_register/gst_itemised_purchase_register.json index eec93bc32d..379fe10589 100644 --- a/erpnext/regional/report/gst_itemised_purchase_register/gst_itemised_purchase_register.json +++ b/erpnext/regional/report/gst_itemised_purchase_register/gst_itemised_purchase_register.json @@ -1,5 +1,5 @@ { - "add_total_row": 0, + "add_total_row": 1, "apply_user_permissions": 1, "creation": "2017-06-22 15:25:04.101930", "disabled": 0, @@ -7,7 +7,7 @@ "doctype": "Report", "idx": 0, "is_standard": "Yes", - "modified": "2017-06-22 15:25:10.749203", + "modified": "2017-08-04 15:39:41.671851", "modified_by": "Administrator", "module": "Regional", "name": "GST Itemised Purchase Register", diff --git a/erpnext/regional/report/gst_itemised_sales_register/gst_itemised_sales_register.json b/erpnext/regional/report/gst_itemised_sales_register/gst_itemised_sales_register.json index 9df9bb2d37..b73786bdc5 100644 --- a/erpnext/regional/report/gst_itemised_sales_register/gst_itemised_sales_register.json +++ b/erpnext/regional/report/gst_itemised_sales_register/gst_itemised_sales_register.json @@ -1,5 +1,5 @@ { - "add_total_row": 0, + "add_total_row": 1, "apply_user_permissions": 1, "creation": "2017-06-22 15:24:43.083217", "disabled": 0, @@ -7,7 +7,7 @@ "doctype": "Report", "idx": 0, "is_standard": "Yes", - "modified": "2017-06-22 15:24:50.611910", + "modified": "2017-08-04 15:39:46.998093", "modified_by": "Administrator", "module": "Regional", "name": "GST Itemised Sales Register", diff --git a/erpnext/regional/report/gst_purchase_register/gst_purchase_register.json b/erpnext/regional/report/gst_purchase_register/gst_purchase_register.json index c0ea019acd..115ee97303 100644 --- a/erpnext/regional/report/gst_purchase_register/gst_purchase_register.json +++ b/erpnext/regional/report/gst_purchase_register/gst_purchase_register.json @@ -1,5 +1,5 @@ { - "add_total_row": 0, + "add_total_row": 1, "apply_user_permissions": 1, "creation": "2017-06-22 11:06:40.836073", "disabled": 0, @@ -7,7 +7,7 @@ "doctype": "Report", "idx": 0, "is_standard": "Yes", - "modified": "2017-06-22 12:17:15.487392", + "modified": "2017-08-04 15:39:53.123814", "modified_by": "Administrator", "module": "Regional", "name": "GST Purchase Register", diff --git a/erpnext/regional/report/gst_sales_register/gst_sales_register.json b/erpnext/regional/report/gst_sales_register/gst_sales_register.json index 2e52d9ab5c..3f5246d575 100644 --- a/erpnext/regional/report/gst_sales_register/gst_sales_register.json +++ b/erpnext/regional/report/gst_sales_register/gst_sales_register.json @@ -1,5 +1,5 @@ { - "add_total_row": 0, + "add_total_row": 1, "apply_user_permissions": 1, "creation": "2017-06-21 16:44:41.621260", "disabled": 0, @@ -7,7 +7,7 @@ "doctype": "Report", "idx": 0, "is_standard": "Yes", - "modified": "2017-06-22 11:39:24.609998", + "modified": "2017-08-04 15:39:33.401936", "modified_by": "Administrator", "module": "Regional", "name": "GST Sales Register", From 738d8c2e0f5328c8bfd49ee3076122978f816969 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 8 Aug 2017 11:15:13 +0530 Subject: [PATCH 2/4] Changed patch order to reload domain --- erpnext/patches.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/patches.txt b/erpnext/patches.txt index 6a14569a3b..cb751f1c60 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -334,6 +334,7 @@ execute:frappe.reload_doctype('Employee') #2016-10-18 execute:frappe.db.sql("update `tabEmployee` set prefered_contact_email = IFNULL(prefered_contact_email,'') ") execute:frappe.reload_doctype("Salary Slip") execute:frappe.db.sql("update `tabSalary Slip` set posting_date=creation") +erpnext.patches.v8_0.create_domain_docs #16-05-2017 erpnext.patches.v7_1.update_portal_roles erpnext.patches.v7_1.set_total_amount_currency_in_je finally:erpnext.patches.v7_0.update_timesheet_communications @@ -404,7 +405,6 @@ erpnext.patches.v8_0.delete_bin_indexes erpnext.patches.v8_0.move_account_head_from_account_to_warehouse_for_inventory erpnext.patches.v8_0.change_in_words_varchar_length erpnext.patches.v8_0.update_stock_qty_value_in_bom_item -erpnext.patches.v8_0.create_domain_docs #16-05-2017 erpnext.patches.v8_0.update_sales_cost_in_project erpnext.patches.v8_0.save_system_settings erpnext.patches.v8_1.delete_deprecated_reports From 9ef1d0f5a509e14ede544bc0c024832838fbdcbf Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Tue, 8 Aug 2017 11:23:25 +0530 Subject: [PATCH 3/4] [Fix] Balance sheet not working (#10311) --- erpnext/accounts/report/financial_statements.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/accounts/report/financial_statements.py b/erpnext/accounts/report/financial_statements.py index b6c4fd2266..d81c1ebc88 100644 --- a/erpnext/accounts/report/financial_statements.py +++ b/erpnext/accounts/report/financial_statements.py @@ -234,7 +234,7 @@ def add_total_row(out, root_type, balance_must_be, period_list, company_currency for period in period_list: total_row.setdefault(period.key, 0.0) total_row[period.key] += row.get(period.key, 0.0) - row[period.key] = "" + row[period.key] = 0.0 total_row.setdefault("total", 0.0) total_row["total"] += flt(row["total"]) From 1846d0fa2fe146665293d2c527f23e115a434af0 Mon Sep 17 00:00:00 2001 From: mbauskar Date: Tue, 8 Aug 2017 13:24:11 +0600 Subject: [PATCH 4/4] bumped to version 8.7.3 --- erpnext/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/__init__.py b/erpnext/__init__.py index 64bfa0f077..d7030e8636 100644 --- a/erpnext/__init__.py +++ b/erpnext/__init__.py @@ -4,7 +4,7 @@ import inspect import frappe from erpnext.hooks import regional_overrides -__version__ = '8.7.2' +__version__ = '8.7.3' def get_default_company(user=None): '''Get default company for user'''