nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-03 13:38:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #30270 from frappe/mergify/bp/version-13-hotfix/pr-30269

Browse Source 
fix: Do not update ignore pricing rule check implicitly (backport #30269)
This commit is contained in:
Saqib Ansari
2022-03-16 13:01:54 +05:30
committed by GitHub
parent 461506a7ff f27fd605f5
commit b8fc06f633
4 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/accounts/doctype/sales_invoice/sales_invoice.py
View File

@@ -1714,7 +1714,6 @@ def make_maintenance_schedule(source_name, target_doc=None):
@frappe.whitelist() @frappe.whitelist()
def make_delivery_note(source_name, target_doc=None): def make_delivery_note(source_name, target_doc=None):
def set_missing_values(source, target): def set_missing_values(source, target):
target.ignore_pricing_rule = 1
target.run_method("set_missing_values") target.run_method("set_missing_values")
target.run_method("set_po_nos") target.run_method("set_po_nos")
target.run_method("calculate_taxes_and_totals") target.run_method("calculate_taxes_and_totals")

1
erpnext/buying/doctype/supplier_quotation/supplier_quotation.py
View File

@@ -109,7 +109,6 @@ def get_list_context(context=None):
@frappe.whitelist() @frappe.whitelist()
def make_purchase_order(source_name, target_doc=None): def make_purchase_order(source_name, target_doc=None):
def set_missing_values(source, target): def set_missing_values(source, target):
target.ignore_pricing_rule = 1
target.run_method("set_missing_values") target.run_method("set_missing_values")
target.run_method("get_schedule_dates") target.run_method("get_schedule_dates")
target.run_method("calculate_taxes_and_totals") target.run_method("calculate_taxes_and_totals")

3
erpnext/selling/doctype/quotation/quotation.py
View File

@@ -151,7 +151,6 @@ def _make_sales_order(source_name, target_doc=None, ignore_permissions=False):
if source.referral_sales_partner: if source.referral_sales_partner:
target.sales_partner=source.referral_sales_partner target.sales_partner=source.referral_sales_partner
target.commission_rate=frappe.get_value('Sales Partner', source.referral_sales_partner, 'commission_rate') target.commission_rate=frappe.get_value('Sales Partner', source.referral_sales_partner, 'commission_rate')
target.ignore_pricing_rule = 1
target.flags.ignore_permissions = ignore_permissions target.flags.ignore_permissions = ignore_permissions
target.run_method("set_missing_values") target.run_method("set_missing_values")
target.run_method("calculate_taxes_and_totals") target.run_method("calculate_taxes_and_totals")
@@ -226,7 +225,7 @@ def _make_sales_invoice(source_name, target_doc=None, ignore_permissions=False):
if customer: if customer:
target.customer = customer.name target.customer = customer.name
target.customer_name = customer.customer_name target.customer_name = customer.customer_name
target.ignore_pricing_rule = 1
target.flags.ignore_permissions = ignore_permissions target.flags.ignore_permissions = ignore_permissions
target.run_method("set_missing_values") target.run_method("set_missing_values")
target.run_method("calculate_taxes_and_totals") target.run_method("calculate_taxes_and_totals")

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

@@ -641,7 +641,6 @@ def make_sales_invoice(source_name, target_doc=None, ignore_permissions=False):
target.set_advances() target.set_advances()
def set_missing_values(source, target): def set_missing_values(source, target):
target.ignore_pricing_rule = 1
target.flags.ignore_permissions = True target.flags.ignore_permissions = True
target.run_method("set_missing_values") target.run_method("set_missing_values")
target.run_method("set_po_nos") target.run_method("set_po_nos")