diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.txt b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.txt index 3fafc1cba96..1ad767e31c8 100755 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.txt +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.txt @@ -2,7 +2,7 @@ { "creation": "2013-05-21 16:16:39", "docstatus": 0, - "modified": "2014-02-11 12:01:59", + "modified": "2014-02-17 12:01:59", "modified_by": "Administrator", "owner": "Administrator" }, @@ -826,4 +826,4 @@ "submit": 0, "write": 0 } -] \ No newline at end of file +] diff --git a/erpnext/patches.txt b/erpnext/patches.txt index 1b6553b88bc..66e65d9453d 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -1,4 +1,3 @@ -erpnext.patches.1401.enable_all_price_list erpnext.patches.4_0.update_user_properties erpnext.patches.4_0.move_warehouse_user_to_restrictions erpnext.patches.4_0.new_permissions 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 1f3c2bb2b84..19913eb8b21 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 @@ -7,10 +7,12 @@ import frappe def execute(): # udpate sales cycle for d in ['Sales Invoice', 'Sales Order', 'Quotation', 'Delivery Note']: + print d, 'one' frappe.conn.sql("""update `tab%s` set taxes_and_charges=charge""" % d) # udpate purchase cycle for d in ['Purchase Invoice', 'Purchase Order', 'Supplier Quotation', 'Purchase Receipt']: + print d, 'two' frappe.conn.sql("""update `tab%s` set taxes_and_charges=purchase_other_charges""" % d) - frappe.conn.sql("""update `tabPurchase Taxes and Charges` set parentfield='other_charges'""") \ No newline at end of file + frappe.conn.sql("""update `tabPurchase Taxes and Charges` set parentfield='other_charges'""") diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.txt b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.txt index 44325d78400..5b83710c767 100755 --- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.txt +++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.txt @@ -2,7 +2,7 @@ { "creation": "2013-05-21 16:16:39", "docstatus": 0, - "modified": "2014-02-11 12:01:00", + "modified": "2014-02-17 12:01:00", "modified_by": "Administrator", "owner": "Administrator" }, @@ -850,4 +850,4 @@ "doctype": "DocPerm", "role": "Supplier" } -] \ No newline at end of file +]