noahjacob
dd86642037
refactor: removed py2 code
2021-08-10 11:41:29 +05:30
noahjacob
b214e624bb
style: fixed formatting
2021-08-10 11:41:29 +05:30
noahjacob
74bcb987f3
style: fixed formatting
2021-08-10 11:41:29 +05:30
noahjacob
4fb1b6b80c
fix: Sider
2021-08-10 11:41:29 +05:30
noahjacob
a4cea1e56d
refactor: variable names
2021-08-10 11:41:29 +05:30
noahjacob
3a663ac77f
test: changed test item name
2021-08-10 11:41:29 +05:30
noahjacob
c95d96e7ae
refactor: changed variable names
2021-08-10 11:41:29 +05:30
noahjacob
a9ef56a107
test: added test case for creating and updating
2021-08-10 11:41:29 +05:30
noahjacob
415519af15
feat: added multi-select fields to create multiple pricing rules.
2021-08-10 11:41:29 +05:30
Saqib
7eefe927a5
Merge branch 'develop' into payment-reconc-party-validation-fix
2021-08-10 11:37:56 +05:30
Anupam Kumar
e196dee510
Merge pull request #26085 from anupamvs/lead-cleanup
...
refactor: lead
2021-08-10 11:34:23 +05:30
rohitwaghchaure
c5e7673277
Merge pull request #26814 from noahjacob/mr_allowance_feat_v13
...
feat: over transfer allowance for material transfers (bp #26264 )
2021-08-10 11:32:43 +05:30
Anupam Kumar
8e6d298fcf
Merge branch 'develop' into lead-cleanup
2021-08-10 11:32:43 +05:30
Deepesh Garg
797170e913
fix: Linting issues
2021-08-10 11:02:21 +05:30
Deepesh Garg
428ccebad9
test: Update test cases for discount accounting
2021-08-10 10:43:01 +05:30
Deepesh Garg
b73bb3e501
fix: Add discount account handling in Purchase Invoice
2021-08-10 10:42:47 +05:30
Deepesh Garg
9b561ea839
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into discount_accounting_v13
2021-08-10 10:38:14 +05:30
Deepesh Garg
cd980f5e6b
Merge pull request #26723 from GangaManoj/backport-po-payment-terms
...
feat: Fetch Payment Terms from linked Sales/Purchase Order
2021-08-10 10:34:39 +05:30
Afshan
f5b5be9644
Merge branch 'develop' into po-payment-terms
2021-08-10 09:32:08 +05:30
Afshan
a982a2a72e
Merge branch 'develop' into payment-reconc-party-validation-fix
2021-08-10 09:30:48 +05:30
rohitwaghchaure
7ca1493655
Merge pull request #26868 from rohitwaghchaure/merge-version-13-hotfix-into-v13-pre-9
...
chore: merge version-13-hotfix into v13-pre-release
2021-08-10 01:29:00 +05:30
Rohit Waghchaure
f571e42aa4
Merge branch 'version-13-hotfix' into merge-version-13-hotfix-into-v13-pre-9
2021-08-10 01:06:23 +05:30
Ankush
5e428f0447
perf(cache): fix active SLA doctype caching ( #26861 )
...
If no SLA is configured then this query runs on EVERY `validate` call.
Root cause: if not active SLA doctypes exist then `not []` evalutes to
true and causes query to run again.
2021-08-09 22:15:49 +05:30
Deepesh Garg
f2c4699c9b
Merge pull request #26867 from fproldan/fix_price_list_subscription_hotfix
...
fix: depends_on in price list field in Subscription Plan
2021-08-09 20:35:28 +05:30
Deepesh Garg
b92c404ed0
Merge pull request #26866 from fproldan/fix_price_list_subscription
...
fix: depends_on in price list field in Subscription Plan
2021-08-09 20:35:17 +05:30
Francisco Roldan
0a90302170
fix: depends_on in price list field
2021-08-09 11:41:56 -03:00
Francisco Roldan
7e3dd9e8ee
fix: depends_on in price list field
2021-08-09 11:21:41 -03:00
Deepesh Garg
75a832715c
test: Update test cases for discount accounting
2021-08-09 19:03:14 +05:30
Deepesh Garg
cb539b7a6a
fix: Add discount account handling in Purchase Invoice
2021-08-09 19:01:41 +05:30
Deepesh Garg
8b9c04aae8
test: Fix test cases for payment terms fetch
2021-08-09 18:53:15 +05:30
Deepesh Garg
802c6b3738
test: Improve test case for not coping payment terms
2021-08-09 18:53:15 +05:30
Deepesh Garg
bcf56e64ba
fix: Ignore default payment term templates when coping payment terms from orders
2021-08-09 18:53:14 +05:30
GangaManoj
072f63b324
Revert "fix: Only fetch default Payment Terms Template if present"
...
This reverts commit fb80ca9e06
2021-08-09 18:53:14 +05:30
GangaManoj
e247e3a4b2
fix: Only fetch default Payment Terms Template if present
2021-08-09 18:53:14 +05:30
GangaManoj
5b33e75c65
fix: Fetch discount details from Payment Terms only if Discount Type = Percentage
2021-08-09 18:53:14 +05:30
GangaManoj
0588382c38
fix: Stop fetching amount while fetching Payment Terms
2021-08-09 18:53:14 +05:30
GangaManoj
55cb82c74d
fix: Compare Payment Schedules
2021-08-09 18:53:14 +05:30
GangaManoj
1200872c7e
fix: Disable automcatically_fetch_payment_terms after running its associated tests
2021-08-09 18:53:13 +05:30
GangaManoj
7244afe129
fix: Rename test to reflect changes in code
2021-08-09 18:53:13 +05:30
GangaManoj
54d1336d11
fix: Condition for fetching Payment Terms from Sales/Purchase Orders
2021-08-09 18:53:13 +05:30
Frappe PR Bot
18bd182f61
patch: delete all orphaned tables docs ( #26863 )
2021-08-09 18:34:51 +05:30
Deepesh Garg
90cca2cb55
Merge branch 'develop' into payment-reconc-party-validation-fix
2021-08-09 18:06:33 +05:30
Anuja Pawar
08ae49cd11
fix(regional): add permissions for VAT Audit report ( #26851 )
...
fix(regional): add permissions for VAT Audit report
2021-08-09 17:58:52 +05:30
Frappe PR Bot
0ff9ef673c
fix: add parameter for db insert while adding item tax ( #26855 ) ( #26858 )
...
(cherry picked from commit b3bbebd27c
2021-08-09 17:58:18 +05:30
Anupam Kumar
d0d0be0a61
Merge branch 'develop' into lead-cleanup
2021-08-09 17:25:53 +05:30
Ganga Manoj
458f7f1194
patch: delete all orphaned tables docs ( #26743 )
2021-08-09 17:16:48 +05:30
Anupam Kumar
2f06c3e40d
Merge branch 'develop' into lead-cleanup
2021-08-09 16:07:04 +05:30
Ankush
9f5111809d
test: fix flaky purchase receipt test ( #26859 ) ( #26860 )
...
# Conflicts:
# erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
2021-08-09 15:35:26 +05:30
Anupam
db3ee31413
fix: test case
2021-08-09 15:34:50 +05:30
Ankush
7ba8c821a1
test: fix flaky purchase receipt test ( #26859 )
2021-08-09 15:14:26 +05:30
