nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-30 15:09:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

changed fieldname from charge to taxes

Browse Source
This commit is contained in:
Akhilesh Darjee
2014-01-28 19:16:05 +05:30
parent a7ab20ec78
commit 2ced3b07d4
16 changed files with 73 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/controllers/buying_controller.py
View File

@@ -38,7 +38,7 @@ class BuyingController(StockController):
self.set_missing_item_details(get_item_details)
if self.doc.fields.get("__islocal"):
self.set_taxes("purchase_tax_details", "purchase_other_charges")
self.set_taxes("purchase_tax_details", "taxes_and_charges")
def set_supplier_from_item_default(self):
if self.meta.get_field("supplier") and not self.doc.supplier:
@@ -59,7 +59,7 @@ class BuyingController(StockController):
def get_purchase_tax_details(self):
self.doclist = self.doc.clear_table(self.doclist, "purchase_tax_details")
self.set_taxes("purchase_tax_details", "purchase_other_charges")
self.set_taxes("purchase_tax_details", "taxes_and_charges")
def validate_stock_or_nonstock_items(self):
if not self.get_stock_items():

4
erpnext/controllers/selling_controller.py
View File

@@ -30,7 +30,7 @@ class SellingController(StockController):
self.set_missing_lead_customer_details()
self.set_price_list_and_item_details()
if self.doc.fields.get("__islocal"):
self.set_taxes("other_charges", "charge")
self.set_taxes("other_charges", "taxes_and_charges")
def set_missing_lead_customer_details(self):
if self.doc.customer:
@@ -52,7 +52,7 @@ class SellingController(StockController):
def get_other_charges(self):
self.doclist = self.doc.clear_table(self.doclist, "other_charges")
self.set_taxes("other_charges", "charge")
self.set_taxes("other_charges", "taxes_and_charges")
def apply_shipping_rule(self):
if self.doc.shipping_rule: