CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-15 16:28:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
42,804 Commits 416 Branches 1,718 Tags
aea484be1fa163d17136457592fa3dad497ec6ed
Commit Graph

42804 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepesh Garg
aea484be1f Merge pull request #32032 from frappe/mergify/bp/version-14-hotfix/pr-32030 
fix: Loan Interest accruals for 0 rated loans (backport #32030)
 2022-08-31 21:04:38 +05:30
Deepesh Garg
52fc10d00c chore: Add check for principal amount 
(cherry picked from commit a76d3827ec)
 2022-08-30 15:47:11 +00:00
Deepesh Garg
1b9082e07b fix: Loan Interest accruals for 0 rated loans 
(cherry picked from commit eefc9b7172)
 2022-08-30 15:47:11 +00:00
mergify[bot]
0e9a1fb40e fix: force delete old report docs (backport #32026) (#32027) 
fix: force delete old report docs (#32026)

(cherry picked from commit ffa3071d36)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-08-30 15:46:08 +05:30
Deepesh Garg
77ac7f06d4 Merge pull request #32021 from frappe/mergify/bp/version-14-hotfix/pr-32005 
fix: lost quotation not to expired (backport #32005)
 2022-08-30 11:08:40 +05:30
MOHAMMED NIYAS
8717235a34 fix: lost quotation not to expired 
(cherry picked from commit 69ffef8c0e)
 2022-08-30 05:03:44 +00:00
Deepesh Garg
670426f428 Merge pull request #32017 from frappe/mergify/bp/version-14-hotfix/pr-32016 
fix: permissions for Task Type (backport #32016)
 2022-08-30 08:38:14 +05:30
mergify[bot]
1b5a1cbaad fix(patch): update sla doctype directly (backport #32014) (#32015) 
fix(patch): update sla doctype directly (#32014)

fix: update sla doctype directly
(cherry picked from commit 2d41704424)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-08-29 22:17:39 +05:30
Raffael Meyer
7ca1beb15d fix: permissions for Task Type (#32016) 
(cherry picked from commit 73f4d5931d)
 2022-08-29 16:27:00 +00:00
ruthra kumar
c660db145b Merge pull request #32013 from frappe/mergify/bp/version-14-hotfix/pr-32009 
refactor: readd remarks field to payment ledger (backport #32009)
 2022-08-29 20:21:43 +05:30
ruthra kumar
0aaf9c4f05 chore: add remarks migration to patches.txt 
(cherry picked from commit d522f13d55)
 2022-08-29 19:52:33 +05:30
ruthra kumar
b3b0272ec9 chore: patch for migrating remarks to payment ledger 
(cherry picked from commit 3a6b095ed4)
 2022-08-29 14:19:46 +00:00
ruthra kumar
f7898b4954 refactor: re-add remarks field to payment ledger and AR/AP report 
(cherry picked from commit 5782c4469a)
 2022-08-29 14:19:46 +00:00
Deepesh Garg
b067eae38c Merge pull request #32008 from frappe/mergify/bp/version-14-hotfix/pr-32006 
fix: Rounded total for cash and non trade discount invoices (backport #32006)
 2022-08-29 17:46:14 +05:30
mergify[bot]
cee867f941 fix: AD not getting copied from SCO while creating a SE (backport #32004) (#32007) 
fix: AD not getting copied from SCO while creating a SE (#32004)

(cherry picked from commit 9dbaaa33f5)

Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
 2022-08-29 15:50:22 +05:30
Deepesh Garg
6c4fcd80c6 fix: Rounded total for cash and non trade discount invoices 
(cherry picked from commit 318da16b99)
 2022-08-29 10:06:08 +00:00
Deepesh Garg
11657effa5 Merge pull request #31970 from frappe/mergify/bp/version-14-hotfix/pr-31955 
chore: update french translation (backport #31955)
 2022-08-28 11:32:54 +05:30
Deepesh Garg
d3b7942f32 Merge pull request #31979 from frappe/mergify/bp/version-14-hotfix/pr-31977 
fix: restrict party types to Supplier/Customer for AR/AP report (backport #31977)
 2022-08-28 11:25:00 +05:30
mergify[bot]
f407c972d1 chore: allow return of components in SCO (backport #31994) (#31995) 
chore: allow return of components in SCO (#31994)

chore: allow return of components in sco
(cherry picked from commit af5cbc881f)

Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
 2022-08-26 23:15:20 +05:30
Deepesh Garg
0b72295fa2 Merge pull request #31990 from frappe/mergify/bp/version-14-hotfix/pr-31988 
chore: remove precision on discount_percentage of Sales Invoice Item (backport #31988)
 2022-08-26 18:09:26 +05:30
Deepesh Garg
204b6c0272 Merge pull request #31973 from frappe/mergify/bp/version-14-hotfix/pr-31943 
fix: gl entries for asset repair (backport #31943)
 2022-08-26 17:34:57 +05:30
Deepesh Garg
1118e25b6d Merge pull request #31985 from frappe/mergify/bp/version-14-hotfix/pr-31984 
fix: Purchase Order creation from Sales Order (backport #31984)
 2022-08-26 16:05:01 +05:30
ruthra kumar
9b9df70632 chore: remove precision on discount_percentage of Sales Invoice Item 
(cherry picked from commit c42fef541a)
 2022-08-26 10:34:50 +00:00
Solufyin
39ff0cc6d8 fix: Purchase Order creation from Sales Order 
(cherry picked from commit bd4b4ddd8b)
 2022-08-26 06:31:51 +00:00
ruthra kumar
c407d1e51a fix: restrict party types to Supplier/Customer for AR/AP report 
(cherry picked from commit 6aa8fd0f7b)
 2022-08-25 10:50:46 +00:00
mergify[bot]
4d8ced6c87 fix: add validation for PO in Stock Entry (backport #31974) (#31975) 
fix: add validation for PO in Stock Entry (#31974)

(cherry picked from commit 8566832dd5)

Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
 2022-08-25 15:29:48 +05:30
Deepesh Garg
4f832678cf chore: fix against account 
(cherry picked from commit c1f6dd46d1)
 2022-08-25 07:55:08 +00:00
Nabin Hait
f0f7afa669 fix: gl entries for asset repair 
(cherry picked from commit b4a2eb2e65)
 2022-08-25 07:55:08 +00:00
Florian HENRY
cb6cbf7818 chore: update fr translation 
(cherry picked from commit 299da5d596)
 2022-08-25 07:37:06 +00:00
Florian HENRY
3aec1175df chore: update fr translation 
(cherry picked from commit 1f6f2747d4)
 2022-08-25 07:37:06 +00:00
Florian HENRY
c645995ae3 chore: update french translation 
(cherry picked from commit 264f98af14)
 2022-08-25 07:37:05 +00:00
rohitwaghchaure
f772c17f3f Merge pull request #31969 from frappe/mergify/bp/version-14-hotfix/pr-31967 
fix: material request connection on work order (backport #31967)
 2022-08-25 12:30:25 +05:30
Rohit Waghchaure
193502ce03 fix: material request connection on work order 
(cherry picked from commit 9ab10def49)
 2022-08-25 06:59:56 +00:00
rohitwaghchaure
abd637a238 Merge pull request #31968 from frappe/mergify/bp/version-14-hotfix/pr-31966 
fix: default supplier not set in the PP (backport #31966)
 2022-08-25 12:26:47 +05:30
Rohit Waghchaure
4cf9fb08e1 fix: default supplier not set in the PP 
(cherry picked from commit 5fd468d9ec)
 2022-08-25 06:55:46 +00:00
Deepesh Garg
e4ca20654f Merge pull request #31964 from frappe/mergify/bp/version-14-hotfix/pr-31909 
fix: Add docstatus filter for voucher_no in Repost Item Valuation (backport #31909)
 2022-08-25 11:25:02 +05:30
Deepesh Garg
bc873939eb Merge pull request #31959 from frappe/mergify/bp/version-14-hotfix/pr-31934 
refactor: disable discount accounting on Buying module(PI) (backport #31934)
 2022-08-25 11:06:58 +05:30
Deepesh Garg
c6d3e9f432 Merge pull request #31958 from frappe/mergify/bp/version-14-hotfix/pr-31950 
fix: display amount in account currency if party is supplied (backport #31950)
 2022-08-25 11:06:42 +05:30
rohitwaghchaure
54f4504df6 Merge pull request #31963 from frappe/mergify/bp/version-14-hotfix/pr-31951 
fix: Purposes not set in Maintenance Visit (backport #31951)
 2022-08-25 10:50:50 +05:30
Sagar Sharma
309da96442 fix: Add docstatus filter for voucher_no in Repost Item Valuation 
(cherry picked from commit 520306dc87)
 2022-08-25 05:20:26 +00:00
Rohit Waghchaure
94ebfa765c fix: Purposes not set 
(cherry picked from commit f9a7b31b5b)
 2022-08-25 05:19:53 +00:00
ruthra kumar
2577747c5c test: remove discount accounting tests 
(cherry picked from commit 277ef04b60)
 2022-08-25 05:04:46 +00:00
ruthra kumar
fb387426d6 refactor: disable discount accounting on Buying module(PI) 
(cherry picked from commit a956e20f29)
 2022-08-25 05:04:46 +00:00
ruthra kumar
15915d7053 fix: display amount in account currency if party is supplied 
(cherry picked from commit e5b04d54ff)
 2022-08-25 05:04:27 +00:00
mergify[bot]
362976fa42 fix: Explicitly commit "log_error" since its getting called during GET request (backport #31952) (#31953) 
fix: Explicitly commit "log_error" since its getting called during GET request (#31952)

(cherry picked from commit 122f1c0ced)

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2022-08-24 18:26:08 +05:30
mergify[bot]
a7d23abc2f fix: Route condition set for stock ledger (backport #31935) (#31945) 
fix: Route condition set for stock ledger (#31935)

(cherry picked from commit 0e26df331c)

Co-authored-by: Solufyin <34390782+Solufyin@users.noreply.github.com>
 2022-08-24 13:30:25 +05:30
mergify[bot]
4b609322ba chore: add Work Order test dependencies (backport #31936) (#31937) 
chore: add Work Order test dependencies (#31936)

(cherry picked from commit fe73d55f70)

Co-authored-by: HENRY Florian <florian.henry@open-concept.pro>
 2022-08-23 16:09:26 +05:30
Deepesh Garg
e831b6e054 Merge pull request #31930 from frappe/mergify/bp/version-14-hotfix/pr-31910 
fix: Cash and non trade discount calculation (backport #31910)
 2022-08-23 10:36:15 +05:30
Deepesh Garg
856a64b77c chore: Linting issues 
(cherry picked from commit 1cb7ae16ab)
 2022-08-23 04:49:57 +00:00
Deepesh Garg
3afb625ff8 fix: Test cases 
(cherry picked from commit ae3dce0cbd)
 2022-08-23 04:49:57 +00:00