Merge branch 'develop' of https://github.com/frappe/erpnext into lcv_multicurrency

This commit is contained in:
Deepesh Garg
2020-12-25 18:35:26 +05:30
59 changed files with 3270 additions and 312 deletions

View File

@@ -110,8 +110,14 @@ class AccountsController(TransactionBase):
self.set_inter_company_account()
validate_regional(self)
validate_einvoice_fields(self)
if self.doctype != 'Material Request':
apply_pricing_rule_on_transaction(self)
def before_cancel(self):
validate_einvoice_fields(self)
def validate_deferred_start_and_end_date(self):
for d in self.items:
@@ -1518,3 +1524,7 @@ def update_child_qty_rate(parent_doctype, trans_items, parent_doctype_name, chil
@erpnext.allow_regional
def validate_regional(doc):
pass
@erpnext.allow_regional
def validate_einvoice_fields(doc):
pass