schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
38,414 Commits 322 Branches 1,581 Tags
d763b16e9fbcb5ecd22b3e043f0d37c0fa701378
Commit Graph

38414 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Devin Slauenwhite
d763b16e9f Merge remote-tracking branch 'upstream/version-13-hotfix' into fix-ecommerce-cart-badge 2021-12-31 10:41:37 -05:00
Devin Slauenwhite
2602fc633b fix(e-commerce): shopping cart total quantity (#29076) 
* fix: shopping cart total quantity

* fix: linter error
 2021-12-31 20:28:00 +05:30
mergify[bot]
79d126f5d0 fix: leave_allocation variable not being defined (backport #29086) (#29087) 
(cherry picked from commit dbbc8d8aed)

Co-authored-by: Vaibhav Chopra <53619134+sudo-vaibhav@users.noreply.github.com>
 2021-12-31 13:54:18 +05:30
Devin Slauenwhite
c9a9d0bab8 fix(ux): tripple digit cart qty 2021-12-29 21:47:04 -05:00
rohitwaghchaure
12f5464a3b Merge pull request #29066 from frappe/mergify/bp/version-13-hotfix/pr-29064 
fix: optimize patch for update bom in SO and MR (backport #29064)
 2021-12-29 13:59:40 +05:30
Rohit Waghchaure
9d575e6e27 fix: optimize patch for update bom in SO and MR 
(cherry picked from commit d9b9f4e8b7)
 2021-12-29 06:39:14 +00:00
Deepesh Garg
098b3614e1 Merge pull request #29061 from frappe/mergify/bp/version-13-hotfix/pr-28034 
fix: Updates in term loan processing (backport #28034)
 2021-12-28 19:36:04 +05:30
Deepesh Garg
bbe4bc1fc0 fix: Resolve conflicts 2021-12-28 19:10:27 +05:30
Deepesh Garg
0f8a7d7a6c fix: Update modified timestamp 2021-12-28 18:53:10 +05:30
Deepesh Garg
a4396d7f31 fix: Add test for loan repayment cancellation 
(cherry picked from commit 68d49817a1)
 2021-12-28 13:10:38 +00:00
Deepesh Garg
4248bebe48 fix: Test cases 
(cherry picked from commit f78bf4c6ef)
 2021-12-28 13:10:37 +00:00
Deepesh Garg
b616443809 fix: Book unaccrued interest check 
(cherry picked from commit c572a4cb88)
 2021-12-28 13:10:36 +00:00
Deepesh Garg
3c803c46d3 fix: Repayment schedule revert on cancel 
(cherry picked from commit 8f6600b27a)
 2021-12-28 13:10:35 +00:00
Deepesh Garg
dc3a0337d1 fix: Unsecured loan status update 
(cherry picked from commit dcae9ba86e)

# Conflicts:
#	erpnext/loan_management/doctype/loan_repayment/loan_repayment.py
 2021-12-28 13:10:34 +00:00
Deepesh Garg
430617cb68 fix: Loan repayment schedule date 
(cherry picked from commit 1a5f0da6ca)
 2021-12-28 13:10:32 +00:00
Deepesh Garg
2b1b831560 fix: Updates in term loan processing 
(cherry picked from commit 8116b9b62f)

# Conflicts:
#	erpnext/loan_management/doctype/loan/loan.json
 2021-12-28 13:10:31 +00:00
mergify[bot]
165114ba4c fix: tests (#29051) (#29060) 
* fix(test): create salary slip as per timesheet dates for Project Profitability

* fix(test): reload salary slip before checking for payment days

(cherry picked from commit 88df5ce530)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-12-28 17:28:31 +05:30
Marica
964b19e1b1 Merge pull request #29034 from frappe/mergify/bp/version-13-hotfix/pr-29033 
fix: avoid `"string" in None` condition (backport #29033)
 2021-12-28 15:02:28 +05:30
Marica
b9e327515b Merge pull request #29058 from frappe/mergify/bp/version-13-hotfix/pr-28555 
fix: Validate Finished Goods for Independent Manufacture entries as well (backport #28555)
 2021-12-28 15:01:11 +05:30
Deepesh Garg
e0a88d99f4 Merge pull request #29052 from frappe/mergify/bp/version-13-hotfix/pr-29009 
fix: Start date validation for deferred invoices (backport #29009)
 2021-12-28 14:45:58 +05:30
marination
00b9f1fbef fix: Merge conflict 2021-12-28 14:41:03 +05:30
marination
59aaef3719 fix: Avoid Impact on Repack Entry 
- Repack entries must be considered for fg/scrap checkbox auto set
- This must be avoided only for Manufacture entries, due to confusion between scrap and fg
- No scrap in repack, so its straight forward

(cherry picked from commit 22809a2838)
 2021-12-28 09:07:08 +00:00
marination
fdf5811c27 fix: Sider 
(cherry picked from commit 7d0340e660)
 2021-12-28 09:07:07 +00:00
marination
66a5b3f34d fix: Linter (imports) 
(cherry picked from commit dfff972a78)
 2021-12-28 09:07:07 +00:00
marination
d8b781bb1e test: Independent Manufacture Entry 
- Check validations
- Check if FG basic rate is calculated correctly

(cherry picked from commit affb29194b)

# Conflicts:
#	erpnext/stock/doctype/stock_entry/test_stock_entry.py
 2021-12-28 09:07:07 +00:00
marination
6c6785e284 fix: Dont auto set is finished item or is scrap itm checkbox for independent entry 
- System cant differentiate between scrap and FG when WO is absent, so dont auto set
- User must set it manually
- `validate_finished_goods` checks this

(cherry picked from commit 8c9779d69d)
 2021-12-28 09:07:06 +00:00
marination
fc57ed1ca8 fix: Validate Finished Goods for Independent Manufacture entries as well 
- Check if FG exists even if WO is absent
- Check if multiple FGs are there, block.

(cherry picked from commit d6bc121999)
 2021-12-28 09:07:05 +00:00
mergify[bot]
aeb7bbc629 fix: rename non existent doctype field to the right one (#29055) (#29056) 
(cherry picked from commit 095a6e186f)

Co-authored-by: Development for People <47140294+developmentforpeople@users.noreply.github.com>
 2021-12-28 14:13:09 +05:30
Deepesh Garg
bdb6c4170b fix: Test case 2021-12-28 14:13:04 +05:30
Deepesh Garg
701bca5845 Merge pull request #28996 from deepeshgarg007/bank_reco_tool_fixes 
fix: Issues in Bank Reconciliation tool
 2021-12-28 13:40:28 +05:30
Deepesh Garg
becb39da90 fix: Remove debug statement 2021-12-28 13:18:17 +05:30
Marica
aa58653b75 Merge pull request #29053 from frappe/mergify/bp/version-13-hotfix/pr-28966 
fix: Stock Ageing Report - Negative Opening Stock (backport #28966)
 2021-12-28 13:04:33 +05:30
marination
bae184fc2f fix: Merge Conflicts 2021-12-28 12:43:14 +05:30
marination
24727dbadb fix: Linter (extra line after import) 
(cherry picked from commit 6ca978c18b)
 2021-12-28 06:54:48 +00:00
marination
ba5f4843c0 test: Stock Ageing FIFO Slot generation 
(cherry picked from commit 098f72e7ec)
 2021-12-28 06:54:47 +00:00
marination
bf266d82e7 chore: Added .md file to explain stock ageing business logic 
(cherry picked from commit c007f84ade)
 2021-12-28 06:54:47 +00:00
marination
e30c52861d chore: Use frappe.qb for query 
(cherry picked from commit 878fd377c2)
 2021-12-28 06:54:46 +00:00
marination
57b7fe6627 fix: Sider and Server side test 
- args passed to wrong function
- missing space around '='

(cherry picked from commit 24a35c69c0)
 2021-12-28 06:54:46 +00:00
marination
c04b62a7dd fix: Linter (imports) 
(cherry picked from commit 8951a5c267)
 2021-12-28 06:54:46 +00:00
marination
19fd1fb4b1 fix: Stock Ageing Report - Negative Opening Stock 
- Consider negative opening stock in logic and neutralise it with +ve stock
- minor code refactor: class for FIFOSlots to generate chronological FIFO queue

(cherry picked from commit 0f43792dbb)

# Conflicts:
#	erpnext/stock/report/stock_ageing/stock_ageing.py
 2021-12-28 06:54:46 +00:00
Deepesh Garg
b00f6676f1 fix: Start date validation for deferred invoices 
(cherry picked from commit 7ad149f9fe)
 2021-12-28 06:36:26 +00:00
Deepesh Garg
8be6bd978e Merge branch 'version-13-hotfix' into mergify/bp/version-13-hotfix/pr-29033 2021-12-28 11:03:34 +05:30
mergify[bot]
bffe329ade fix: filter out Claimed employee advances in Expense Claim (#29046) (#29047) 
(cherry picked from commit 25f4de80b3)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-12-27 21:23:50 +05:30
Rucha Mahabal
b0bc3994c3 fix: flaky HR tests (#29045) 
* fix(test): Leave Allocation validation against Leave Application after submit (#29005)

* fix(test): Leave Allocation validation against Leave Application after submit

* chore: clean-up Leave Allocation tests

* fix(test): set holiday list for leave allocation test

* fix: flaky HR tests (#29017)

* fix(test): use root company in Expense Claim tests

* fix(test): set Holiday List for Leave Allocation

* fix(test): set Holiday List for company
 2021-12-27 17:26:16 +05:30
Rucha Mahabal
d0d82bc34a fix: ignore links while setting default notification templates in Settings (#29042) 2021-12-27 15:16:58 +05:30
Marica
1c2a8c679c Merge pull request #28951 from dj12djdjs/fix-ecommerce-selling-price-with-rule 
fix(e-commerce): fetch selling price with pricing rule
 2021-12-27 12:49:33 +05:30
Marica
39fd9ee40d Merge branch 'version-13-hotfix' into fix-ecommerce-selling-price-with-rule 2021-12-27 12:19:41 +05:30
Raffael Meyer
f92cdbbbf3 fix: avoid "string" in None condition 
(cherry picked from commit 52397c9771)
 2021-12-26 04:50:10 +00:00
Deepesh Garg
3f6d9336b5 Merge pull request #28953 from deepeshgarg007/price_fetch_optimize 
fix(UX): Optimize rate updation on changing price list
 2021-12-24 19:33:29 +05:30
mergify[bot]
b2e42aa16c chore: add running stock value difference in invariant report (#29012) (#29013) 
[skip ci]

(cherry picked from commit 7987a46509)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-12-23 21:17:42 +05:30