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
)
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
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
Anupam
42bb77bf80
fix: creating contact on creation of lead
2021-08-09 15:11:13 +05:30
Frappe PR Bot
ea83e2b45f
fix: validate python expressions ( #26835 ) ( #26856 )
...
(cherry picked from commit 07337d5c78
)
Co-authored-by: Ankush <ankush@iwebnotes.com>
2021-08-09 14:48:59 +05:30
Afshan
b3bbebd27c
fix: add parameter for db insert while adding item tax ( #26855 )
2021-08-09 14:39:32 +05:30
Anupam Kumar
9c04c297b8
refactor: Accounts Settings form cleanup ( #26842 )
2021-08-09 14:01:02 +05:30
harshpwctech
b0f3c0f3fd
fix: JWT decoding error ( #26624 )
2021-08-09 13:42:05 +05:30
Saqib
e7a77d9cb1
Merge pull request #26415 from GangaManoj/backport-asset-repair-refactor
...
refactor: Asset Repair
2021-08-09 12:46:05 +05:30
Ankush
07337d5c78
fix: validate python expressions ( #26835 )
2021-08-09 12:38:40 +05:30
Anupam Kumar
ef8539fd60
refactor: Selling Settings form cleanup ( #26841 )
2021-08-09 12:38:14 +05:30
Marica
a8166c06c7
fix: Faulty Gl Entry for Asset LCVs ( #26803 )
...
* fix: Faulty Gl Entry for Asset LCVs
- Both Gl entries were crediting in their respective accounts
- Asset Account must be debited into
* fix: Use keyword arguments instead of positional for better readability
* chore: Test for LCV for draft asset created via Purchase Receipt
2021-08-09 12:38:12 +05:30
Marica
ab8f0cab4d
fix: Faulty Gl Entry for Asset LCVs ( #26803 )
...
* fix: Faulty Gl Entry for Asset LCVs
- Both Gl entries were crediting in their respective accounts
- Asset Account must be debited into
* fix: Use keyword arguments instead of positional for better readability
* chore: Test for LCV for draft asset created via Purchase Receipt
2021-08-09 12:24:04 +05:30
Frappe PR Bot
210441d9b5
fix: price list with 0 value are ignored (bp #26655 )
...
* fix: price list with 0 value are ignored
Steps to reproduce:
1. Create 2 item price for two different supplier. One of them should be
zero.
2. Create PO
3. Add supplier with non-zero price and add item.
4. change supplier. Price won't change. If price was non-zero it
would've changed.
Root cause: falsiness check instead of null value check is used for
checking if price list value exists. 0 is evaluated as false.
* refactor: make get_price_list_rate function pure
(cherry picked from commit 16d4de5130
)
Co-authored-by: Ankush <ankush@iwebnotes.com>
2021-08-09 11:34:33 +05:30
Frappe PR Bot
3dfbf19e8f
fix: allow alternative items when using job card (bp #26724 )
...
(cherry picked from commit 7e0c57fa3f
)
Co-authored-by: Ankush <ankush@iwebnotes.com>
2021-08-09 11:33:55 +05:30
Frappe PR Bot
bba9aac9c0
feat: add french address template (bp #26316 )
...
* add french address template
Co-authored-by: HENRY Florian <florian.henry@open-concept.pro>
(cherry picked from commit 07e65ab589
)
2021-08-09 10:58:39 +05:30
Marica
4c929b6994
Merge branch 'develop' into serial-no-space
2021-08-09 10:50:09 +05:30
Marica
e9c293d621
Merge pull request #25845 from noahjacob/item_so_variant_fix
...
fix: production plan not fetching sales order of a variant
2021-08-09 10:47:54 +05:30
Ankush
7e0c57fa3f
fix: allow alternative items when using job card ( #26724 )
2021-08-09 10:46:29 +05:30
Ankush
16d4de5130
fix: price list with 0 value are ignored ( #26655 )
...
* fix: price list with 0 value are ignored
Steps to reproduce:
1. Create 2 item price for two different supplier. One of them should be
zero.
2. Create PO
3. Add supplier with non-zero price and add item.
4. change supplier. Price won't change. If price was non-zero it
would've changed.
Root cause: falsiness check instead of null value check is used for
checking if price list value exists. 0 is evaluated as false.
* refactor: make get_price_list_rate function pure
2021-08-09 10:41:24 +05:30
HENRY Florian
07e65ab589
feat: add french address template ( #26316 )
...
* add french address template
Co-authored-by: Ankush <ankush@iwebnotes.com>
2021-08-09 10:32:31 +05:30
Deepesh Garg
5ace2767af
test: Fix test cases for payment terms fetch
2021-08-08 19:17:38 +05:30