CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-13 23:38:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: Add POS Invoices

Browse Source 
(cherry picked from commit 5f821b93a5)
This commit is contained in:
Deepesh Garg
2022-12-05 15:43:03 +05:30
committed by Mergify
parent c726c16702
commit 033b2a4825
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/doctype/pricing_rule/test_pricing_rule.py
View File

@@ -997,7 +997,7 @@ def make_pricing_rule(**args):
"apply_on": args.apply_on or "Item Code",
"applicable_for": args.applicable_for,
"selling": args.selling or 0,
"currency": "USD",
"currency": "INR",
"apply_discount_on_rate": args.apply_discount_on_rate or 0,
"buying": args.buying or 0,
"min_qty": args.min_qty or 0.0,

2
erpnext/accounts/doctype/pricing_rule/utils.py
View File

@@ -244,7 +244,7 @@ def get_other_conditions(conditions, values, args):
and ifnull(`tabPricing Rule`.valid_upto, '2500-12-31')"""
values["transaction_date"] = args.get("transaction_date")
if args.get("doctype") in ["Sales Order", "Delivery Note", "Sales Invoice"]:
if args.get("doctype") in ["Sales Order", "Delivery Note", "Sales Invoice", "POS Invoice"]:
conditions += """ and ifnull(`tabPricing Rule`.selling, 0) = 1"""
else:
conditions += """ and ifnull(`tabPricing Rule`.buying, 0) = 1"""