CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-13 23:38:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,437 Commits 415 Branches 1,717 Tags
f4670a86a0008febb8aaf7e3c5fe131ec80cee1f
Commit Graph

38437 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mergify[bot]
f4670a86a0 fix: minor issues (#29140) 2022-01-04 19:16:52 +05:30
mergify[bot]
2838dc537e fix: update idx after updating items in so/po (#29134) (#29136) 
(cherry picked from commit 733c9defdf)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-01-04 19:05:38 +05:30
mergify[bot]
fe1a66cf54 fix: future recurring period calculation (backport #29083) (#29118) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
(cherry picked from commit 11cfa16158)

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2022-01-04 11:58:41 +05:30
Saqib Ansari
e2b2be82e0 Merge pull request #29112 from frappe/mergify/bp/version-13-hotfix/pr-28907 
fix: Validation in POS for item batch no stock quantity (backport #28907)
 2022-01-03 19:35:43 +05:30
Subin Tom
fe3ebafea4 fix: linters fix 2022-01-03 19:10:03 +05:30
Subin Tom
860a0f4696 fix: linters fix 2022-01-03 19:06:40 +05:30
Subin Tom
a34ded79f3 fix: importing Sum() for qb for test fix 2022-01-03 19:01:57 +05:30
Saqib Ansari
d1739eb59a Merge pull request #29113 from frappe/mergify/bp/version-13-hotfix/pr-28160 
refactor: `update_invoice_status` with query builder (backport #28160)
 2022-01-03 18:32:53 +05:30
Pruthvi Patel
84f3f34821 Update erpnext/controllers/accounts_controller.py 
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
(cherry picked from commit 16a90d3e60)
 2022-01-03 12:30:23 +00:00
Pruthvi Patel
50628d416c test: update_invoice_status 
(cherry picked from commit 4d48ca4228)
 2022-01-03 12:30:23 +00:00
Pruthvi Patel
e648a2ccde fix: consider Discounted status 
(cherry picked from commit 0799f378b4)
 2022-01-03 12:30:23 +00:00
Pruthvi Patel
1efce21ba4 refactor: update_invoice_status with query builder 
(cherry picked from commit 6c96ed4e11)
 2022-01-03 12:30:22 +00:00
Subin Tom
110a1e5557 fix: using get_batch_qty method to get available_qty 
(cherry picked from commit 7385497219)
 2022-01-03 12:27:40 +00:00
Subin Tom
80f92ee547 fix: added Sum() in query 
(cherry picked from commit 267da48889)
 2022-01-03 12:27:39 +00:00
Saqib
0be144c193 chore: remove extra whitespace 
(cherry picked from commit c3a9ca09d1)
 2022-01-03 12:27:39 +00:00
Saqib
bf92681fff fix: typo 
(cherry picked from commit 9c8f523537)
 2022-01-03 12:27:38 +00:00
Subin Tom
3947d859c5 fix: replaced sql query with frappe.qb 
(cherry picked from commit 68beee2a00)
 2022-01-03 12:27:38 +00:00
Subin Tom
0222cd198d fix: Validation in POS for item batch no stock quantity 
(cherry picked from commit 9f235526d4)
 2022-01-03 12:27:37 +00:00
rohitwaghchaure
fca8f17b40 Merge pull request #29104 from frappe/mergify/bp/version-13-hotfix/pr-29103 
fix: incorrect posting time fetching incorrect qty (backport #29103)
 2022-01-03 14:53:39 +05:30
rohitwaghchaure
fcbcb08fcd fix: incorrect posting time fetching incorrect qty (#29103) 
(cherry picked from commit f02e6b4631)
 2022-01-03 08:58:56 +00:00
mergify[bot]
674a923669 feat: Add currency in import download statement (#29093) 2022-01-03 13:42:25 +05:30
mergify[bot]
4fdaf51599 fix: filter query in bank reconciliation tool (#29099) 2022-01-03 11:41:23 +05:30
Deepesh Garg
39f7a9de47 Merge pull request #29092 from deepeshgarg007/taxes_category_tax_fetch 
fix(India): Tax and Charges template not getting fetched based on tax category assigned
 2022-01-02 19:06:00 +05:30
Deepesh Garg
342658ea70 fix: Test Case 2022-01-02 18:39:59 +05:30
Deepesh Garg
7a5937a98c fix(India): Tax and Charges template not getting fetched based on tax category assigned 2022-01-02 17:53:15 +05:30
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
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