From dfae0ea5709035033a0b4a28bc1c48a950881f6b Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 31 Jan 2014 17:25:09 +0530 Subject: [PATCH] minor fix in patch --- .../patches/4_0/map_charge_to_taxes_and_charges.py | 14 +++++--------- erpnext/selling/doctype/quotation/quotation.txt | 2 +- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/erpnext/patches/4_0/map_charge_to_taxes_and_charges.py b/erpnext/patches/4_0/map_charge_to_taxes_and_charges.py index fc51c2a794..6656ceebd7 100644 --- a/erpnext/patches/4_0/map_charge_to_taxes_and_charges.py +++ b/erpnext/patches/4_0/map_charge_to_taxes_and_charges.py @@ -6,15 +6,11 @@ import webnotes def execute(): # udpate sales cycle - webnotes.conn.sql("""update `tabSales Invoice` set taxes_and_charges=charge""") - webnotes.conn.sql("""update `tabSales Order` set taxes_and_charges=charge""") - webnotes.conn.sql("""update `tabQuotation` set taxes_and_charges=charge""") - webnotes.conn.sql("""update `tabDelivery Note` set taxes_and_charges=charge""") + for d in ['Sales Invoice', 'Sales Order', 'Quotation', 'Delivery Note']: + webnotes.conn.sql("""update `tab%s` set taxes_and_charges=charge""" % d) # udpate purchase cycle - webnotes.conn.sql("""update `tabPurchase Invoice` set taxes_and_charges=purchase_other_charges""") - webnotes.conn.sql("""update `tabPurchase Order` set taxes_and_charges=purchase_other_charges""") - webnotes.conn.sql("""update `tabSupplier Quotation` set taxes_and_charges=purchase_other_charges""") - webnotes.conn.sql("""update `tabPurchase Receipt` set taxes_and_charges=purchase_other_charges""") - + for d in ['Purchase Invoice', 'Purchase Order', 'Supplier Quotation', 'Purchase Receipt']: + webnotes.conn.sql("""update `tab%s` set taxes_and_charges=purchase_other_charges""" % d) + webnotes.conn.sql("""update `tabPurchase Taxes and Charges` set parentfield='other_charges'""") \ No newline at end of file diff --git a/erpnext/selling/doctype/quotation/quotation.txt b/erpnext/selling/doctype/quotation/quotation.txt index a8a1c079fb..740bf691a9 100644 --- a/erpnext/selling/doctype/quotation/quotation.txt +++ b/erpnext/selling/doctype/quotation/quotation.txt @@ -2,7 +2,7 @@ { "creation": "2013-05-24 19:29:08", "docstatus": 0, - "modified": "2014-01-29 19:42:32", + "modified": "2014-01-31 19:42:32", "modified_by": "Administrator", "owner": "Administrator" },