schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Deepesh Garg
2021-01-15 15:43:59 +05:30
parent 797a742cb2 d2c71350cd
commit cbed6f970a
115 changed files with 2871 additions and 1531 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/public/js/controllers/transaction.js
View File

@@ -537,6 +537,7 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
company: me.frm.doc.company,
order_type: me.frm.doc.order_type,
is_pos: cint(me.frm.doc.is_pos),
is_return: cint(me.frm.doc.is_return),
is_subcontracted: me.frm.doc.is_subcontracted,
transaction_date: me.frm.doc.transaction_date || me.frm.doc.posting_date,
ignore_pricing_rule: me.frm.doc.ignore_pricing_rule,