Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
38,615 Commits 3 Branches 0 Tags
Commit Graph

38615 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 b3bbebd27c73827d5a88ff47d0d16fb73dcf6de2)

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 07337d5c78c14119ae9fc5d010080a1db61d0bdd)

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 16d4de5130097bc2dfdc7e073f1e13f0a22481d1)

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 7e0c57fa3fe62417ad3be75412e0c031d6486bb8)

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 07e65ab5895f166b6dceb38dfbea1cb90f6015b9)
 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
Deepesh Garg
25d131a39f test: Improve test case for not coping payment terms 2021-08-07 17:39:40 +05:30
Deepesh Garg
a27ef14db6 fix: Override template only if setting is enabled 2021-08-07 00:12:57 +05:30
Deepesh Garg
a59a761f99 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into backport-po-payment-terms 2021-08-06 23:55:01 +05:30
Deepesh Garg
0bba425fe3 fix: Ignore default payment term templates when coping payment terms from orders 2021-08-06 23:53:16 +05:30
Frappe PR Bot
aec7846407
test: fix pricelist tests (#26839) (#26840) 
problem: exchange rate API is returning exchange rates for "_Test currency".
These tests were relying on failure of that function.

(cherry picked from commit 27a29eb6bc67fc8dce482c0b38239929cf3fc6fb)

Co-authored-by: Ankush <ankush@iwebnotes.com>
 2021-08-06 21:55:01 +05:30
Ankush
27a29eb6bc
test: fix pricelist tests (#26839) 
problem: exchange rate API is returning exchange rates for "_Test currency".
These tests were relying on failure of that function.
 2021-08-06 21:34:44 +05:30
Frappe PR Bot
9ea24db20a
test: use item that allows fractional UOM in test (#26837) (#26838) 
(cherry picked from commit 614336fe1d2f2d136809e29d394800994e7ae4c9)

Co-authored-by: Ankush <ankush@iwebnotes.com>
 2021-08-06 21:14:40 +05:30
Ankush
614336fe1d
test: use item that allows fractional UOM in test (#26837) 2021-08-06 19:36:21 +05:30
GangaManoj
fcbd79b7d3 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into backport-asset-repair-refactor 2021-08-06 18:12:24 +05:30
Saqib
f1141e7756
fix: failing budget test due to project naming (#26834) 2021-08-06 17:37:17 +05:30
Anupam
b4e720f8ec fix: test case 2021-08-06 14:39:13 +05:30
Anupam
59c971015a fix: test case 2021-08-06 14:02:57 +05:30
Saqib
668f442139
Merge branch 'develop' into po-payment-terms 2021-08-06 13:42:10 +05:30
Frappe PR Bot
c8e6c07032
fix(e-invoicing): cannot generate IRNs for standalone credit notes (#26824) (#26833) 2021-08-06 12:33:18 +05:30
Anupam
01a0585ba0 fix: removing organization_lead traceback 2021-08-06 12:21:02 +05:30
Anupam
4723e18f9e fix: sider issue 2021-08-06 11:16:55 +05:30
Noah Jacob
cb44aed78b test: get sales order with variant 2021-08-06 11:16:25 +05:30
Deepesh Garg
ffd7642de2
Merge pull request #26832 from deepeshgarg007/budget_test_case 
test: Failing budget test due to project naming
 2021-08-06 11:14:47 +05:30