From 3f30e3132bcf5076379cb3742cf082387498778b Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 4 Jul 2013 14:36:16 +0530 Subject: [PATCH 1/6] [mapper] reload --- patches/patch_list.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/patches/patch_list.py b/patches/patch_list.py index 4955c75e6c..fc4fd738fe 100644 --- a/patches/patch_list.py +++ b/patches/patch_list.py @@ -243,4 +243,6 @@ patch_list = [ "patches.june_2013.p04_fix_event_for_lead_oppty_project", "patches.june_2013.p05_remove_search_criteria_reports", "execute:webnotes.delete_doc('DocType', 'Update Delivery Date')", + "execute:webnotes.reload_doc('accounts', 'DocType Mapper', 'Purchase Order-Purchase Invoice')", + "execute:webnotes.reload_doc('accounts', 'DocType Mapper', 'Purchase Receipt-Purchase Invoice')", ] \ No newline at end of file From e2dd8009994e2cf67438be56f477870aecaea580 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 4 Jul 2013 14:37:58 +0530 Subject: [PATCH 2/6] Update purchase_register.py --- accounts/report/purchase_register/purchase_register.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/accounts/report/purchase_register/purchase_register.py b/accounts/report/purchase_register/purchase_register.py index 655cf8ced0..0fbe451035 100644 --- a/accounts/report/purchase_register/purchase_register.py +++ b/accounts/report/purchase_register/purchase_register.py @@ -58,7 +58,7 @@ def execute(filters=None): row.append(invoice_tax_map.get(inv.name, {}).get(tax_acc)) # total tax, grand total, outstanding amount & rounded total - row += [inv.other_charges_total, inv.grand_total, flt(inv.grand_total, 2), \ + row += [inv.total_tax, inv.grand_total, flt(inv.grand_total, 2), \ inv.outstanding_amount] data.append(row) @@ -164,4 +164,4 @@ def get_account_details(invoice_list): where name in (%s)""" % ", ".join(["%s"]*len(accounts)), tuple(accounts), as_dict=1): account_map[acc.name] = acc.parent_account - return account_map \ No newline at end of file + return account_map From bce622d723f494b7f48b9e58940d3faa9a9061a9 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 4 Jul 2013 14:40:21 +0530 Subject: [PATCH 3/6] Update patch_list.py --- patches/patch_list.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/patches/patch_list.py b/patches/patch_list.py index fc4fd738fe..9fdf39b539 100644 --- a/patches/patch_list.py +++ b/patches/patch_list.py @@ -243,6 +243,6 @@ patch_list = [ "patches.june_2013.p04_fix_event_for_lead_oppty_project", "patches.june_2013.p05_remove_search_criteria_reports", "execute:webnotes.delete_doc('DocType', 'Update Delivery Date')", - "execute:webnotes.reload_doc('accounts', 'DocType Mapper', 'Purchase Order-Purchase Invoice')", - "execute:webnotes.reload_doc('accounts', 'DocType Mapper', 'Purchase Receipt-Purchase Invoice')", -] \ No newline at end of file + "execute:webnotes.reload_doc('accounts', 'DocType Mapper', 'Purchase Order-Purchase Invoice') # 2013-07-04", + "execute:webnotes.reload_doc('accounts', 'DocType Mapper', 'Purchase Receipt-Purchase Invoice') # 2013-07-04", +] From 7dc77f764fe19c20f862df1ef5103e05225836c7 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 4 Jul 2013 14:56:29 +0530 Subject: [PATCH 4/6] Update Purchase Order-Purchase Invoice.txt --- .../Purchase Order-Purchase Invoice.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/accounts/DocType Mapper/Purchase Order-Purchase Invoice/Purchase Order-Purchase Invoice.txt b/accounts/DocType Mapper/Purchase Order-Purchase Invoice/Purchase Order-Purchase Invoice.txt index ce45824e40..031abd216d 100644 --- a/accounts/DocType Mapper/Purchase Order-Purchase Invoice/Purchase Order-Purchase Invoice.txt +++ b/accounts/DocType Mapper/Purchase Order-Purchase Invoice/Purchase Order-Purchase Invoice.txt @@ -4,7 +4,7 @@ "docstatus": 0, "creation": "2010-08-08 17:09:35", "modified_by": "Administrator", - "modified": "2012-04-03 12:49:50" + "modified": "2013-07-04 12:49:50" }, { "name": "__common__", @@ -120,4 +120,4 @@ "to_table": "Purchase Taxes and Charges", "validation_logic": "docstatus =1" } -] \ No newline at end of file +] From 19f2396f9567004db577d8db2eb0797779f04790 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 4 Jul 2013 14:56:50 +0530 Subject: [PATCH 5/6] Update Purchase Receipt-Purchase Invoice.txt --- .../Purchase Receipt-Purchase Invoice.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/accounts/DocType Mapper/Purchase Receipt-Purchase Invoice/Purchase Receipt-Purchase Invoice.txt b/accounts/DocType Mapper/Purchase Receipt-Purchase Invoice/Purchase Receipt-Purchase Invoice.txt index f6c87e266c..5ed4b2aced 100644 --- a/accounts/DocType Mapper/Purchase Receipt-Purchase Invoice/Purchase Receipt-Purchase Invoice.txt +++ b/accounts/DocType Mapper/Purchase Receipt-Purchase Invoice/Purchase Receipt-Purchase Invoice.txt @@ -4,7 +4,7 @@ "docstatus": 0, "creation": "2010-08-08 17:09:35", "modified_by": "Administrator", - "modified": "2012-04-03 12:49:50" + "modified": "2013-07-04 12:49:50" }, { "name": "__common__", @@ -141,4 +141,4 @@ "to_table": "Purchase Taxes and Charges", "validation_logic": "docstatus=1" } -] \ No newline at end of file +] From fa8d69c7cabb50a3403b4a87295ef26b6fcf97ff Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 4 Jul 2013 15:02:23 +0530 Subject: [PATCH 6/6] Update patch_list.py --- patches/patch_list.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/patches/patch_list.py b/patches/patch_list.py index 9fdf39b539..56cb93c456 100644 --- a/patches/patch_list.py +++ b/patches/patch_list.py @@ -243,6 +243,6 @@ patch_list = [ "patches.june_2013.p04_fix_event_for_lead_oppty_project", "patches.june_2013.p05_remove_search_criteria_reports", "execute:webnotes.delete_doc('DocType', 'Update Delivery Date')", - "execute:webnotes.reload_doc('accounts', 'DocType Mapper', 'Purchase Order-Purchase Invoice') # 2013-07-04", - "execute:webnotes.reload_doc('accounts', 'DocType Mapper', 'Purchase Receipt-Purchase Invoice') # 2013-07-04", + "execute:webnotes.reload_doc('accounts', 'DocType Mapper', 'Purchase Order-Purchase Invoice') # 2013-07-04 3:00", + "execute:webnotes.reload_doc('accounts', 'DocType Mapper', 'Purchase Receipt-Purchase Invoice') # 2013-07-04 3:00", ]