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

Field Rename: rate field mass replacement

Browse Source
This commit is contained in:
Nabin Hait
2014-02-10 18:26:49 +05:30
parent a7f757a3f4
commit 7979f7ed21
29 changed files with 133 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
erpnext/controllers/buying_controller.py
View File

@@ -79,31 +79,22 @@ class BuyingController(StockController):
self.calculate_total_advance("Purchase Invoice", "advance_allocation_details")
def calculate_item_values(self):
# hack! - cleaned up in _cleanup()
if self.doc.doctype != "Purchase Invoice":
df = self.meta.get_field("purchase_rate", parentfield=self.fname)
df.fieldname = "rate"
for item in self.item_doclist:
# hack! - cleaned up in _cleanup()
if self.doc.doctype != "Purchase Invoice":
item.rate = item.purchase_rate
self.round_floats_in(item)
if item.discount_percentage == 100.0:
item.import_rate = 0.0
elif not item.import_rate:
item.import_rate = flt(item.price_list_rate * (1.0 - (item.discount_percentage / 100.0)),
self.precision("import_rate", item))
item.rate = 0.0
elif not item.rate:
item.rate = flt(item.price_list_rate * (1.0 - (item.discount_percentage / 100.0)),
self.precision("rate", item))
item.import_amount = flt(item.import_rate * item.qty,
item.import_amount = flt(item.rate * item.qty,
self.precision("import_amount", item))
item.item_tax_amount = 0.0;
self._set_in_company_currency(item, "import_amount", "amount")
self._set_in_company_currency(item, "price_list_rate", "base_price_list_rate")
self._set_in_company_currency(item, "import_rate", "rate")
self._set_in_company_currency(item, "rate", "base_rate")
def calculate_net_total(self):
@@ -159,16 +150,6 @@ class BuyingController(StockController):
def _cleanup(self):
super(BuyingController, self)._cleanup()
# except in purchase invoice, rate field is purchase_rate
# reset fieldname of rate
if self.doc.doctype != "Purchase Invoice":
df = self.meta.get_field("rate", parentfield=self.fname)
df.fieldname = "purchase_rate"
for item in self.item_doclist:
item.purchase_rate = item.rate
del item.fields["rate"]
if not self.meta.get_field("item_tax_amount", parentfield=self.fname):
for item in self.item_doclist:

20
erpnext/controllers/selling_controller.py
View File

@@ -115,13 +115,13 @@ class SellingController(StockController):
item.amount = flt((item.export_amount * self.doc.conversion_rate) /
(1 + cumulated_tax_fraction), self.precision("amount", item))
item.basic_rate = flt(item.amount / item.qty, self.precision("basic_rate", item))
item.base_rate = flt(item.amount / item.qty, self.precision("base_rate", item))
if item.discount_percentage == 100:
item.base_price_list_rate = item.basic_rate
item.basic_rate = 0.0
item.base_price_list_rate = item.base_rate
item.base_rate = 0.0
else:
item.base_price_list_rate = flt(item.basic_rate / (1 - (item.discount_percentage / 100.0)),
item.base_price_list_rate = flt(item.base_rate / (1 - (item.discount_percentage / 100.0)),
self.precision("base_price_list_rate", item))
def get_current_tax_fraction(self, tax, item_tax_map):
@@ -153,16 +153,16 @@ class SellingController(StockController):
self.round_floats_in(item)
if item.discount_percentage == 100:
item.export_rate = 0
elif not item.export_rate:
item.export_rate = flt(item.price_list_rate * (1.0 - (item.discount_percentage / 100.0)),
self.precision("export_rate", item))
item.rate = 0
elif not item.rate:
item.rate = flt(item.price_list_rate * (1.0 - (item.discount_percentage / 100.0)),
self.precision("rate", item))
item.export_amount = flt(item.export_rate * item.qty,
item.export_amount = flt(item.rate * item.qty,
self.precision("export_amount", item))
self._set_in_company_currency(item, "price_list_rate", "base_price_list_rate")
self._set_in_company_currency(item, "export_rate", "basic_rate")
self._set_in_company_currency(item, "rate", "base_rate")
self._set_in_company_currency(item, "export_amount", "amount")
def calculate_net_total(self):