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

[buying controller] [fix] use discount_rate instead of discount

Browse Source
This commit is contained in:
Anand Doshi 2013-05-06 12:52:46 +05:30
parent 3f9366bb6c
commit b8b1e58c4d
1 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
controllers/buying_controller.py
View File

@ -140,31 +140,28 @@ class BuyingController(StockController):
item.fields[base_field] = flt((flt(item.fields[print_field], item.fields[base_field] = flt((flt(item.fields[print_field],
self.precision.item[print_field]) * self.doc.conversion_rate), self.precision.item[print_field]) * self.doc.conversion_rate),
self.precision.item[base_field]) self.precision.item[base_field])
for item in self.item_doclist: # hack! - cleaned up in _cleanup()
round_floats_in_doc(item, self.precision.item) if self.doc.doctype != "Purchase Invoice":
self.precision.item["rate"] = self.precision.item.purchase_rate
for item in self.item_doclist:
# hack! - cleaned up in _cleanup() # hack! - cleaned up in _cleanup()
if self.doc.doctype != "Purchase Invoice": if self.doc.doctype != "Purchase Invoice":
item.rate = item.purchase_rate item.rate = item.purchase_rate
self.precision.item.rate = self.precision.item.purchase_rate
item.discount = item.discount_rate round_floats_in_doc(item, self.precision.item)
self.precision.item.discount = self.precision.item.discount_rate
if item.discount == 100: if item.discount_rate == 100:
if not item.import_ref_rate: item.import_ref_rate = item.import_ref_rate or item.import_rate
item.import_ref_rate = item.import_rate
item.import_rate = 0 item.import_rate = 0
else: else:
if item.import_ref_rate: if item.import_ref_rate:
item.import_rate = flt(item.import_ref_rate * item.import_rate = flt(item.import_ref_rate * (1.0 - (item.discount_rate / 100.0)),
(1.0 - (item.discount_rate / 100.0)),
self.precision.item.import_rate) self.precision.item.import_rate)
else: else:
# assume that print rate and discount are specified # assume that print rate and discount_rate are specified
item.import_ref_rate = flt(item.import_rate / item.import_ref_rate = flt(item.import_rate / (1.0 - (item.discount_rate / 100.0)),
(1.0 - (item.discount_rate / 100.0)),
self.precision.item.import_ref_rate) self.precision.item.import_ref_rate)
item.import_amount = flt(item.import_rate * item.qty, item.import_amount = flt(item.import_rate * item.qty,
@ -297,9 +294,6 @@ class BuyingController(StockController):
item.purchase_rate = item.rate item.purchase_rate = item.rate
del item.fields["rate"] del item.fields["rate"]
item.discount_rate = item.discount
del item.fields["discount"]
def validate_on_previous_row(self, tax): def validate_on_previous_row(self, tax):
""" """
validate if a valid row id is mentioned in case of validate if a valid row id is mentioned in case of