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

Migrate customized precision for newly created total fields

Browse Source
This commit is contained in:
Nabin Hait 2015-04-30 16:13:12 +05:30
parent 1bf03289a6
commit aa03a8e3a2
2 changed files with 30 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
erpnext/patches/v5_0/taxes_and_totals_in_party_currency.py
View File

@ -3,6 +3,8 @@
# License: GNU General Public License v3. See license.txt # License: GNU General Public License v3. See license.txt
import frappe import frappe
from frappe.model.meta import get_field_precision
from frappe.custom.doctype.property_setter.property_setter import make_property_setter
def execute(): def execute():
selling_doctypes = ["Quotation", "Sales Order", "Delivery Note", "Sales Invoice"] selling_doctypes = ["Quotation", "Sales Order", "Delivery Note", "Sales Invoice"]
@ -19,18 +21,30 @@ def update_values(dt, tax_table):
frappe.reload_doctype(dt + " Item") frappe.reload_doctype(dt + " Item")
frappe.reload_doctype(tax_table) frappe.reload_doctype(tax_table)
net_total_precision = get_field_precision(frappe.get_meta(dt).get_field("net_total"))
make_property_setter(dt, "base_total", "precision", net_total_precision, "Select")
rate_field_precision = get_field_precision(frappe.get_meta(dt + " Item").get_field("rate"))
for field in ("net_rate", "base_net_rate", "net_amount", "base_net_amount", "base_rate", "base_amount"):
make_property_setter(dt + " Item", field, "precision", rate_field_precision, "Select")
tax_amount_precision = get_field_precision(frappe.get_meta(tax_table).get_field("tax_amount"))
for field in ("base_tax_amount", "total", "base_total", "tax_amount_after_discount_amount",
"base_tax_amount_after_discount_amount"):
make_property_setter(tax_table, field, "precision", tax_amount_precision, "Select")
# update net_total, discount_on # update net_total, discount_on
frappe.db.sql(""" frappe.db.sql("""
UPDATE UPDATE
`tab{0}` `tab{0}`
SET SET
total = net_total, total = net_total,
base_total = net_total*conversion_rate, base_total = round(net_total*conversion_rate, {1}),
net_total = base_net_total / conversion_rate, net_total = round(base_net_total / conversion_rate, {1}),
apply_discount_on = "Grand Total" apply_discount_on = "Grand Total"
WHERE WHERE
docstatus < 2 docstatus < 2
""".format(dt)) """.format(dt, net_total_precision))
# update net_amount # update net_amount
@ -40,14 +54,14 @@ def update_values(dt, tax_table):
SET SET
item.base_net_amount = item.base_amount, item.base_net_amount = item.base_amount,
item.base_net_rate = item.base_rate, item.base_net_rate = item.base_rate,
item.net_amount = item.base_net_amount / par.conversion_rate, item.net_amount = round(item.base_net_amount / par.conversion_rate, {2}),
item.net_rate = item.base_net_rate / par.conversion_rate, item.net_rate = round(item.base_net_rate / par.conversion_rate, {2}),
item.base_amount = item.amount * par.conversion_rate, item.base_amount = round(item.amount * par.conversion_rate, {2}),
item.base_rate = item.rate * par.conversion_rate item.base_rate = round(item.rate * par.conversion_rate, {2})
WHERE WHERE
par.name = item.parent par.name = item.parent
and par.docstatus < 2 and par.docstatus < 2
""".format(dt, dt + " Item")) """.format(dt, dt + " Item", rate_field_precision))
# update tax in party currency # update tax in party currency
frappe.db.sql(""" frappe.db.sql("""
@ -55,12 +69,12 @@ def update_values(dt, tax_table):
`tab{0}` par, `tab{1}` tax `tab{0}` par, `tab{1}` tax
SET SET
tax.base_tax_amount = tax.tax_amount, tax.base_tax_amount = tax.tax_amount,
tax.tax_amount = tax.base_tax_amount / par.conversion_rate, tax.tax_amount = round(tax.base_tax_amount / par.conversion_rate, {2}),
tax.base_total = tax.total, tax.base_total = round(tax.total, {2}),
tax.total = tax.base_total / conversion_rate, tax.total = round(tax.base_total / conversion_rate, {2}),
tax.base_tax_amount_after_discount_amount = tax.tax_amount_after_discount_amount, tax.base_tax_amount_after_discount_amount = round(tax.tax_amount_after_discount_amount, {2}),
tax.tax_amount_after_discount_amount = tax.base_tax_amount_after_discount_amount / conversion_rate tax.tax_amount_after_discount_amount = round(tax.base_tax_amount_after_discount_amount / conversion_rate, {2})
WHERE WHERE
par.name = tax.parent par.name = tax.parent
and par.docstatus < 2 and par.docstatus < 2
""".format(dt, tax_table)) """.format(dt, tax_table, tax_amount_precision))

2
erpnext/selling/doctype/sales_order/sales_order.py
View File

@ -51,7 +51,7 @@ class SalesOrder(SellingController):
d.projected_qty = tot_avail_qty and flt(tot_avail_qty[0][0]) or 0 d.projected_qty = tot_avail_qty and flt(tot_avail_qty[0][0]) or 0
unique_chk_list = set(check_list) unique_chk_list = set(check_list)
if len(unique_chk_list) != len(check_list): if len(unique_chk_list) != len(check_list):
frappe.msgprint(_("Warning:Same item has been entered multiple times.")) frappe.msgprint(_("Warning: Same item has been entered multiple times."))
def validate_sales_mntc_quotation(self): def validate_sales_mntc_quotation(self):
for d in self.get('items'): for d in self.get('items'):