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

fix: disable pricing rules for internal transfers (#31034)

Browse Source 
* fix: disable pricing rules for internal transfers

* fix: only apply validation on internal transfers

Co-authored-by: Marica <maricadsouza221197@gmail.com>

* fix: internal_party_field undefined

Co-authored-by: Marica <maricadsouza221197@gmail.com>
This commit is contained in:
Ankush Menat 2022-05-16 18:09:14 +05:30 committed by GitHub
parent 06c036f49f
commit 3714e36b44
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
erpnext/controllers/accounts_controller.py
View File

@ -148,6 +148,7 @@ class AccountsController(TransactionBase):
self.validate_inter_company_reference() self.validate_inter_company_reference()
self.disable_pricing_rule_on_internal_transfer()
self.set_incoming_rate() self.set_incoming_rate()
if self.meta.get_field("currency"): if self.meta.get_field("currency"):
@ -382,6 +383,14 @@ class AccountsController(TransactionBase):
msg += _("Please create purchase from internal sale or delivery document itself") msg += _("Please create purchase from internal sale or delivery document itself")
frappe.throw(msg, title=_("Internal Sales Reference Missing")) frappe.throw(msg, title=_("Internal Sales Reference Missing"))
def disable_pricing_rule_on_internal_transfer(self):
if not self.get("ignore_pricing_rule") and self.is_internal_transfer():
self.ignore_pricing_rule = 1
frappe.msgprint(
_("Disabled pricing rules since this {} is an internal transfer").format(self.doctype),
alert=1,
)
def validate_due_date(self): def validate_due_date(self):
if self.get("is_pos"): if self.get("is_pos"):
return return
@ -1738,6 +1747,8 @@ class AccountsController(TransactionBase):
internal_party_field = "is_internal_customer" internal_party_field = "is_internal_customer"
elif self.doctype in ("Purchase Invoice", "Purchase Receipt", "Purchase Order"): elif self.doctype in ("Purchase Invoice", "Purchase Receipt", "Purchase Order"):
internal_party_field = "is_internal_supplier" internal_party_field = "is_internal_supplier"
else:
return False
if self.get(internal_party_field) and (self.represents_company == self.company): if self.get(internal_party_field) and (self.represents_company == self.company):
return True return True

22
erpnext/stock/doctype/delivery_note/test_delivery_note.py
View File

@ -1007,6 +1007,7 @@ class TestDeliveryNote(FrappeTestCase):
customer = create_internal_customer(represents_company=company) customer = create_internal_customer(represents_company=company)
rate = 42 rate = 42
# Create item price and pricing rule
frappe.get_doc( frappe.get_doc(
{ {
"item_code": item, "item_code": item,
@ -1016,6 +1017,25 @@ class TestDeliveryNote(FrappeTestCase):
} }
).insert() ).insert()
frappe.get_doc(
{
"doctype": "Pricing Rule",
"title": frappe.generate_hash(),
"apply_on": "Item Code",
"price_or_product_discount": "Price",
"selling": 1,
"company": company,
"margin_type": "Percentage",
"margin_rate_or_amount": 10,
"apply_discount_on": "Grand Total",
"items": [
{
"item_code": item,
}
],
}
).insert()
make_stock_entry(target=warehouse, qty=5, basic_rate=rate, item_code=item) make_stock_entry(target=warehouse, qty=5, basic_rate=rate, item_code=item)
dn = create_delivery_note( dn = create_delivery_note(
item_code=item, item_code=item,
@ -1025,12 +1045,14 @@ class TestDeliveryNote(FrappeTestCase):
rate=500, rate=500,
warehouse=warehouse, warehouse=warehouse,
target_warehouse=target, target_warehouse=target,
ignore_pricing_rule=0,
do_not_save=True, do_not_save=True,
do_not_submit=True, do_not_submit=True,
) )
self.assertEqual(dn.items[0].rate, 500) # haven't saved yet self.assertEqual(dn.items[0].rate, 500) # haven't saved yet
dn.save() dn.save()
self.assertEqual(dn.ignore_pricing_rule, 1)
# rate should reset to incoming rate # rate should reset to incoming rate
self.assertEqual(dn.items[0].rate, rate) self.assertEqual(dn.items[0].rate, rate)