Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

map charge to taxes and charges in transactions

Browse Source
This commit is contained in:
Akhilesh Darjee 2014-01-30 13:56:57 +05:30
parent b665d86292
commit 4cdb79941b
7 changed files with 37 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/controllers/accounts_controller.py
View File

@ -131,6 +131,10 @@ class AccountsController(TransactionBase):
self.doclist.append(tax) self.doclist.append(tax)
def get_other_charges(self):
self.doclist = self.doc.clear_table(self.doclist, "other_charges")
self.set_taxes("other_charges", "taxes_and_charges")
def calculate_taxes_and_totals(self): def calculate_taxes_and_totals(self):
self.discount_amount_applied = False self.discount_amount_applied = False
self._calculate_taxes_and_totals() self._calculate_taxes_and_totals()

13
erpnext/patches.txt
View File

@ -3,8 +3,17 @@ erpnext.patches.4_0.update_user_properties
erpnext.patches.4_0.move_warehouse_user_to_restrictions erpnext.patches.4_0.move_warehouse_user_to_restrictions
erpnext.patches.4_0.new_permissions erpnext.patches.4_0.new_permissions
erpnext.patches.4_0.update_incharge_name_to_sales_person_in_maintenance_schedule erpnext.patches.4_0.update_incharge_name_to_sales_person_in_maintenance_schedule
erpnext.patches.4_0.reload_sales_doctype_and_print_format execute:webnotes.reload_doc('accounts', 'doctype', 'sales_invoice') # 2014-01-29
erpnext.patches.4_0.reload_purchase_doctype_and_print_format execute:webnotes.reload_doc('selling', 'doctype', 'sales_order') # 2014-01-29
execute:webnotes.reload_doc('selling', 'doctype', 'quotation') # 2014-01-29
execute:webnotes.reload_doc('stock', 'doctype', 'delivery_note') # 2014-01-29
erpnext.patches.4_0.reload_sales_print_format
execute:webnotes.reload_doc('accounts', 'doctype', 'purchase_invoice') # 2014-01-29
execute:webnotes.reload_doc('buying', 'doctype', 'purchase_order') # 2014-01-29
execute:webnotes.reload_doc('buying', 'doctype', 'supplier_quotation') # 2014-01-29
execute:webnotes.reload_doc('stock', 'doctype', 'purchase_receipt') # 2014-01-29
erpnext.patches.4_0.reload_purchase_print_format
execute:webnotes.reload_doc('accounts', 'doctype', 'pos_setting') # 2014-01-29 execute:webnotes.reload_doc('accounts', 'doctype', 'pos_setting') # 2014-01-29
execute:webnotes.reload_doc('selling', 'doctype', 'customer') # 2014-01-29 execute:webnotes.reload_doc('selling', 'doctype', 'customer') # 2014-01-29
execute:webnotes.reload_doc('buying', 'doctype', 'supplier') # 2014-01-29 execute:webnotes.reload_doc('buying', 'doctype', 'supplier') # 2014-01-29
erpnext.patches.4_0.map_charge_to_taxes_and_charges

20
erpnext/patches/4_0/map_charge_to_taxes_and_charges.py Normal file
View File

@ -0,0 +1,20 @@
# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
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""")
# 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""")
webnotes.conn.sql("""update `tabPurchase Taxes and Charges` set parentfield='other_charges'""")

4
erpnext/patches/4_0/reload_purchase_doctype_and_print_format.py → erpnext/patches/4_0/reload_purchase_print_format.py
View File

@ -5,10 +5,6 @@ from __future__ import unicode_literals
import webnotes import webnotes
def execute(): def execute():
webnotes.reload_doc('accounts', 'doctype', 'purchase_invoice')
webnotes.reload_doc('buying', 'doctype', 'purchase_order')
webnotes.reload_doc('buying', 'doctype', 'supplier_quotation')
webnotes.reload_doc('stock', 'doctype', 'purchase_receipt')
webnotes.reload_doc('buying', 'Print Format', 'Purchase Order Classic') webnotes.reload_doc('buying', 'Print Format', 'Purchase Order Classic')
webnotes.reload_doc('buying', 'Print Format', 'Purchase Order Modern') webnotes.reload_doc('buying', 'Print Format', 'Purchase Order Modern')
webnotes.reload_doc('buying', 'Print Format', 'Purchase Order Spartan') webnotes.reload_doc('buying', 'Print Format', 'Purchase Order Spartan')

4
erpnext/patches/4_0/reload_sales_doctype_and_print_format.py → erpnext/patches/4_0/reload_sales_print_format.py
View File

@ -5,10 +5,6 @@ from __future__ import unicode_literals
import webnotes import webnotes
def execute(): def execute():
webnotes.reload_doc('accounts', 'doctype', 'sales_invoice')
webnotes.reload_doc('selling', 'doctype', 'sales_order')
webnotes.reload_doc('selling', 'doctype', 'quotation')
webnotes.reload_doc('stock', 'doctype', 'delivery_note')
webnotes.reload_doc('accounts', 'Print Format', 'POS Invoice') webnotes.reload_doc('accounts', 'Print Format', 'POS Invoice')
webnotes.reload_doc('accounts', 'Print Format', 'Sales Invoice Classic') webnotes.reload_doc('accounts', 'Print Format', 'Sales Invoice Classic')
webnotes.reload_doc('accounts', 'Print Format', 'Sales Invoice Modern') webnotes.reload_doc('accounts', 'Print Format', 'Sales Invoice Modern')

2
erpnext/public/js/queries.js
View File

@ -33,7 +33,7 @@ $.extend(erpnext.queries, {
}, },
task: function() { task: function() {
return { query: "projects.utils.query_task" }; return { query: "erpnext.projects.utils.query_task" };
}, },
customer_filter: function(doc) { customer_filter: function(doc) {

4
erpnext/utilities/transaction_base.py
View File

@ -144,10 +144,6 @@ class TransactionBase(StatusUpdater):
if self.meta.get_field(fieldname): if self.meta.get_field(fieldname):
self.doc.fields[fieldname] = val self.doc.fields[fieldname] = val
def get_other_charges(self):
self.doclist = self.doc.clear_table(self.doclist, "other_charges")
self.set_taxes("other_charges", "taxes_and_charges")
def get_lead_defaults(self): def get_lead_defaults(self):
out = self.get_default_address_and_contact("lead") out = self.get_default_address_and_contact("lead")