CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-17 01:07:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
43,325 Commits 422 Branches 1,718 Tags
16f364da37c4a67cdee1a00714a3560b155ef9fe
Commit Graph

43325 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ernesto Ruiz
16f364da37 fix: add translate function to name of chart labels in budget_variance_report.py 
(cherry picked from commit 48ed6381b3)
 2022-11-03 04:17:21 +00:00
Ernesto Ruiz
e681f06883 fix: add translate function to period in sales_analytics.py 
(cherry picked from commit 083a78135c)
 2022-11-03 04:17:21 +00:00
Ernesto Ruiz
b0c06d5a04 fix: add translate function to period in stock_analytics.py 
(cherry picked from commit c1e608d9ef)
 2022-11-03 04:17:20 +00:00
Ernesto Ruiz
0ead51642f fix: refactor code for better translatable string in stock_ageing.py 
(cherry picked from commit 71a0ae2e59)
 2022-11-03 04:17:20 +00:00
Ernesto Ruiz
2dc24f22ea fix: refactor code for better translatable string 
(cherry picked from commit a671652ab2)
 2022-11-03 04:17:20 +00:00
Ernesto Ruiz
b8caa587d2 fix: add translate function to name of chart labels in deferred_revenue_and_expense.py 
(cherry picked from commit a963618b08)
 2022-11-03 04:17:19 +00:00
ruthra kumar
b17761c276 Merge pull request #32822 from frappe/mergify/bp/version-14-hotfix/pr-32816 
fix: update advance paid in SO/PO from Payment Ledger (backport #32816)
 2022-11-02 19:31:33 +05:30
Sagar Sharma
d8c0a147db Merge pull request #32820 from frappe/mergify/bp/version-14-hotfix/pr-32788 
fix: use `flt` instead of `cint` in `get_batch_no` (backport #32788)
 2022-11-02 19:11:08 +05:30
Sagar Sharma
611dcc11d2 Merge branch 'version-14-hotfix' into mergify/bp/version-14-hotfix/pr-32788 2022-11-02 17:49:26 +05:30
Sagar Sharma
75d347d757 Merge pull request #32823 from frappe/mergify/bp/version-14-hotfix/pr-32800 
fix: test cases (backport #32800)
 2022-11-02 17:49:01 +05:30
Rohit Waghchaure
d3fbe3074d test: run tmate 
(cherry picked from commit 3f2728e3f7)
 2022-11-02 11:44:05 +00:00
Rohit Waghchaure
0feec4ca8a fix: test cases 
(cherry picked from commit ddd1b4be3f)
 2022-11-02 11:44:05 +00:00
ruthra kumar
cf32e1905c test: SO advance paid on Payment submission and cancellation 
(cherry picked from commit 721ac6b847)
 2022-11-02 10:59:47 +00:00
ruthra kumar
87dc812a4b test: PO advance paid on payment submission and cancellation 
(cherry picked from commit 1a0a8ac7e2)
 2022-11-02 10:59:46 +00:00
ruthra kumar
388cf5113b test: refactor use @change_settings decorator when possible 
(cherry picked from commit 81d791eea0)
 2022-11-02 10:59:46 +00:00
ruthra kumar
a561432908 fix: update advance paid in SO/PO from Payment Ledger 
(cherry picked from commit 4487065b67)
 2022-11-02 10:59:45 +00:00
Sagar Sharma
6510464482 fix: use flt instead of cint in get_batch_no 
(cherry picked from commit 9fb3fb4c83)
 2022-11-02 10:25:26 +00:00
Deepesh Garg
d68fa0eff2 Merge pull request #32807 from frappe/mergify/bp/version-14-hotfix/pr-32779 
fix: Mode of payment for returns in POS Sales Invoice (backport #32779)
 2022-11-01 22:12:11 +05:30
Deepesh Garg
3f72156ea9 chore: Update tests 
(cherry picked from commit 5b74161195)
 2022-11-01 16:00:18 +00:00
Deepesh Garg
a260426dd4 fix: Mode of payment for returns in POS Sales Invoice 
(cherry picked from commit 06e8e28531)
 2022-11-01 16:00:18 +00:00
Deepesh Garg
148dc37d92 Merge pull request #32804 from frappe/mergify/bp/version-14-hotfix/pr-32801 
fix: Issues while cancel/amending Purchase Invoice with TDS enabled (backport #32801)
 2022-11-01 21:29:17 +05:30
Deepesh Garg
74a6479f70 fix: Issues while cancel/amending Purchase Invoice with TDS enabled 
(cherry picked from commit f7c9258770)
 2022-11-01 15:19:10 +00:00
ruthra kumar
f2f1c160f8 Merge pull request #32797 from frappe/mergify/bp/version-14-hotfix/pr-32577 
feat(pricing rule): free qty rounding and recursion qty (backport #32577)
 2022-11-01 17:09:46 +05:30
Dany Robert
9b66020fc7 feat(pricing rule): free qty rounding and recursion qty (#32577) 
Option to specify recursion start qty and repeating qty

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
(cherry picked from commit 1d83fb20d6)
 2022-11-01 11:12:44 +00:00
Deepesh Garg
6af43ba40d Merge pull request #32795 from frappe/mergify/bp/version-14-hotfix/pr-32790 
fix: pro_rata_amount calculation in assets tests (backport #32790)
 2022-11-01 16:19:49 +05:30
Anand Baburajan
bd531eb898 Merge branch 'version-14-hotfix' into mergify/bp/version-14-hotfix/pr-32790 2022-11-01 15:21:29 +05:30
Deepesh Garg
15f4812108 Merge pull request #32782 from frappe/mergify/bp/version-14-hotfix/pr-32768 
fix: Budget validation for main cost center (backport #32768)
 2022-11-01 15:21:16 +05:30
anandbaburajan
4c5b688e0d chore: empty commit to try fixing stuck test 
(cherry picked from commit 672fbd3849)
 2022-11-01 09:48:04 +00:00
anandbaburajan
d1b2786f24 fix: pro_rata_amount calculation in assets tests 
(cherry picked from commit 65e855bfff)
 2022-11-01 09:48:04 +00:00
rohitwaghchaure
2eb01aae27 Merge pull request #32783 from frappe/mergify/bp/version-14-hotfix/pr-32730 
fix: duplicate custom fields for inventory dimension (backport #32730)
 2022-10-31 23:06:29 +05:30
Rohit Waghchaure
1152ac3ff1 fix: duplicate custom fields for inventory dimension 
(cherry picked from commit 45ededbed5)
 2022-10-31 16:56:17 +00:00
Deepesh Garg
89a1c83431 fix: Budget validation for main cost center 
(cherry picked from commit 4e26d42d17)
 2022-10-31 16:49:31 +00:00
Deepesh Garg
2a1a61238a Merge pull request #32780 from frappe/mergify/bp/version-14-hotfix/pr-32777 
fix: Reset advance paid amount on Order cancel and amend (backport #32777)
 2022-10-31 22:07:54 +05:30
Deepesh Garg
34bd7837e2 fix: Reset advance paid amount on Oreder cancel and amend 
(cherry picked from commit 92f37ca111)
 2022-10-31 16:09:27 +00:00
Deepesh Garg
f66a6693f4 Merge pull request #32761 from frappe/mergify/bp/version-14-hotfix/pr-32759 
Pass project to stock entry items (backport #32759)
 2022-10-30 09:29:03 +05:30
Hossein Yousefian
4035873295 fix: Pass project to stock entry items 
fix: Pass project to stock entry items
(cherry picked from commit 54c2ffc36b)
 2022-10-29 16:55:25 +00:00
Deepesh Garg
4a86efedfc Merge pull request #32752 from frappe/mergify/bp/version-14-hotfix/pr-32744 
refactor: additional filters on Payment Terms status report (backport #32744)
 2022-10-29 17:12:17 +05:30
Sagar Sharma
b7cbc804b2 Merge pull request #32756 from frappe/mergify/bp/version-14-hotfix/pr-32754 
fix: add `Sales Order` reference in Material Request Dashboard (backport #32754)
 2022-10-29 13:49:16 +05:30
Sagar Sharma
fc6389280c fix: add Sales Order reference in Material Request Dashboard 
(cherry picked from commit 15ebf4a0cf)
 2022-10-29 07:07:25 +00:00
ruthra kumar
6dbb4a3b0d test: due date filter on Payment Terms report 
(cherry picked from commit fed39a53cb)
 2022-10-29 05:40:16 +00:00
ruthra kumar
6114241ff2 fix: key error in filter access 
(cherry picked from commit 4765f937ea)
 2022-10-29 05:40:16 +00:00
ruthra kumar
a03ec0afb3 feat: additional filters on Payment terms report 
Filter on Status and Due dates

(cherry picked from commit aadb6b1772)
 2022-10-29 05:40:15 +00:00
Deepesh Garg
db5d74b7dc Merge pull request #32748 from frappe/mergify/bp/version-14-hotfix/pr-32722 
fix: Reference due date field type in Journal Entry Accounts table (backport #32722)
 2022-10-29 11:00:01 +05:30
Deepesh Garg
ad6e0f3af7 Merge pull request #32746 from frappe/mergify/bp/version-14-hotfix/pr-32699 
fix: Curreny in SOA print for multi-currency party (backport #32699)
 2022-10-29 10:59:49 +05:30
Deepesh Garg
abcf30aaa3 Merge pull request #32745 from frappe/mergify/bp/version-14-hotfix/pr-32692 
fix: Clear invoice table post importing invoices (backport #32692)
 2022-10-29 10:59:35 +05:30
Deepesh Garg
cc9c876007 Merge pull request #32747 from frappe/mergify/bp/version-14-hotfix/pr-32718 
fix: Total Sales amount update in project via Sales Order (backport #32718)
 2022-10-29 10:59:10 +05:30
Sagar Sharma
199e77faef Merge pull request #32750 from frappe/mergify/bp/version-14-hotfix/pr-32662 
refactor: rewrite stock reports queries in qb (backport #32662)
 2022-10-28 22:48:03 +05:30
Sagar Sharma
98428f0bce refactor: rewrite Itemwise Recommended Reorder Level Report queries in QB 
(cherry picked from commit 40bd121593)
 2022-10-28 15:36:01 +00:00
Sagar Sharma
a4b99a34cb refactor: rewrite Product Bundle Balance Report queries in QB 
(cherry picked from commit cde785f1bb)
 2022-10-28 15:36:01 +00:00
Sagar Sharma
c4587d8caa refactor: rewrite Stock Ledger Report queries in QB 
(cherry picked from commit feaa2dbba8)
 2022-10-28 15:36:01 +00:00