CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-17 17:26:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
43,388 Commits 421 Branches 1,718 Tags
de59b5040739bbc0cc3e5a3fcef42f2253eb3f96
Commit Graph

43388 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ruthra kumar
de59b50407 feat: Repost Payment Ledger entries for vouchers 
primarily intended to manually correct PLE entries for vouchers
affected by Item Value repost-https://github.com/frappe/erpnext/pull/32567

(cherry picked from commit 0448c0fa36)
 2022-11-09 08:57:23 +00:00
ruthra kumar
a399e2d765 refactor: split delete gl utility function into two 
(cherry picked from commit 9209ec59c2)
 2022-11-09 08:57:23 +00:00
Deepesh Garg
17ccc0e56c Merge pull request #32891 from frappe/mergify/bp/version-14-hotfix/pr-32883 
fix: Project filter in timesheet (backport #32883)
 2022-11-08 21:44:59 +05:30
Sagar Sharma
5e6a9833c5 Merge pull request #32898 from frappe/mergify/bp/version-14-hotfix/pr-32888 
chore: link SCR Return in SCR Dashboard (backport #32888)
 2022-11-08 21:38:27 +05:30
Sagar Sharma
02bb523210 chore: link SCR Return in SCR Dashboard 
(cherry picked from commit 47248251e2)
 2022-11-08 16:07:34 +00:00
Deepesh Garg
19b3152e32 chore: Resolve conflicts 2022-11-08 17:42:29 +05:30
Deepesh Garg
6163a052c8 chore: Linting Issues 
(cherry picked from commit 7b5cf6978e)

# Conflicts:
#	erpnext/manufacturing/doctype/workstation/workstation.py
 2022-11-08 09:26:03 +00:00
Deepesh Garg
37bed12df4 fix: Project filter in timesheet 
(cherry picked from commit 2b65b22aa2)
 2022-11-08 09:26:02 +00:00
Sagar Sharma
1426de0530 Merge pull request #32887 from frappe/mergify/bp/version-14-hotfix/pr-32886 
chore: remove `debugger` from `stock_entry_list.js` (backport #32886)
 2022-11-08 12:14:22 +05:30
Sagar Sharma
beef0510ee chore: remove debugger from stock_entry_list.js 
(cherry picked from commit 84ab100d86)
 2022-11-08 06:40:55 +00:00
Sagar Sharma
bacd7ecb1d Merge pull request #32884 from frappe/mergify/bp/version-14-hotfix/pr-32877 
fix: make `consumed_qty` read-only in SCR Supplied Items (backport #32877)
 2022-11-08 09:51:16 +05:30
Sagar Sharma
af60c8f759 fix: linter 
(cherry picked from commit 5e8a22be24)
 2022-11-07 23:05:58 +05:30
Sagar Sharma
2c5a8c43f6 fix: make consumed_qty editable when backflush based on Material Transfer 
(cherry picked from commit bf4b012cec)
 2022-11-07 17:29:45 +00:00
Sagar Sharma
68229f06d1 fix: make consumed_qty read-only in SCR Supplied Items 
(cherry picked from commit f8d2e276a5)
 2022-11-07 17:29:45 +00:00
Deepesh Garg
cc92e6965a Merge pull request #32864 from frappe/mergify/bp/version-14-hotfix/pr-32846 
fix: add german translations (backport #32846)
 2022-11-07 18:43:06 +05:30
Raffael Meyer
85f98bb51a Merge branch 'version-14-hotfix' into mergify/bp/version-14-hotfix/pr-32846 2022-11-07 13:34:28 +01:00
barredterra
8e00e62616 chore: resolve merge conflicts 2022-11-07 13:31:54 +01:00
Deepesh Garg
401979bbe5 Merge pull request #32875 from frappe/mergify/bp/version-14-hotfix/pr-32874 
fix: Increase columns width in Warehouse wise Item Balance Age and Value (backport #32874)
 2022-11-07 15:41:05 +05:30
Nihantra C. Patel
0b09c31cb0 fix: Increase columns width in Warehouse wise Item Balance Age and Value 
(cherry picked from commit 8355c1092c)
 2022-11-07 08:05:38 +00:00
Deepesh Garg
c2da8cf7cd Merge pull request #32870 from frappe/mergify/bp/version-14-hotfix/pr-32776 
perf: use `get_cached_value` instead of `db.get_value` in controllers (backport #32776)
 2022-11-07 13:30:15 +05:30
Deepesh Garg
d36c135103 Merge pull request #32872 from frappe/mergify/bp/version-14-hotfix/pr-32802 
fix: `Material Consumption` option in case of `Skip Transfer to WIP` in WO (backport #32802)
 2022-11-07 10:16:10 +05:30
Sagar Sharma
8c856cd5fc fix: Material Consumption option in case of Skip Transfer to WIP in WO 
(cherry picked from commit 8ea6983734)
 2022-11-07 04:06:34 +00:00
Daizy Modi
34ca17ab11 perf: use get_cached_value instead of db.get_value in controllers (#32776) 
(cherry picked from commit 4efc947f14)
 2022-11-07 03:52:39 +00:00
Sagar Sharma
3d2e8c7fb3 Merge pull request #32868 from frappe/mergify/bp/version-14-hotfix/pr-32867 
fix: get `consumed_qty` based on `received_qty` in SCR (backport #32867)
 2022-11-06 17:04:34 +05:30
Sagar Sharma
8f78be8525 test: add test case for consumed-qty 
(cherry picked from commit 4d8da4420e)
 2022-11-06 10:48:35 +00:00
Sagar Sharma
ea9a50278d fix: get consumed_qty based on received_qty in SCR 
(cherry picked from commit 70c9b8dc50)
 2022-11-06 10:48:34 +00:00
Sagar Sharma
e316558286 fix: set received_qty before_validate SCR 
(cherry picked from commit c447dfaa9c)
 2022-11-06 10:48:34 +00:00
Deepesh Garg
b9fb1045d7 feat: Item Wise TDS Calculation 2022-11-06 11:50:20 +05:30
Raffael Meyer
e276a5ba83 chore: add german translations (#32846) 
Mostly for balance sheet

(cherry picked from commit d2b6490bca)

# Conflicts:
#	erpnext/translations/de.csv
 2022-11-06 04:53:21 +00:00
Deepesh Garg
1a0f123c8c Merge pull request #32859 from frappe/mergify/bp/version-14-hotfix/pr-32794 
fix: Disable tax included prices for internal transfers (backport #32794)
 2022-11-05 21:16:44 +05:30
Deepesh Garg
6838e5ea3b fix: Disable tax included prices for internal transfers (#32794) 
* fix: Disable tax-included prices for internal transfers

(cherry picked from commit 8d30ebb12b)
 2022-11-05 15:22:07 +00:00
Deepesh Garg
41a5905a75 Merge pull request #32856 from frappe/mergify/bp/version-14-hotfix/pr-32847 
fix: Create POS Opening Entry POS Profile filter. (backport #32847)
 2022-11-05 20:51:49 +05:30
Sagar Sharma
eb6b267001 Merge pull request #32858 from frappe/mergify/bp/version-14-hotfix/pr-32850 
fix: wrong consumed items in SCR return (backport #32850)
 2022-11-05 20:12:54 +05:30
Sagar Sharma
0856e65700 test: fix test case 
(cherry picked from commit 324bfa9fde)
 2022-11-05 11:53:50 +00:00
Sagar Sharma
3f79a057e4 fix: make BOM required in SCR Item 
(cherry picked from commit 760c26e9c0)
 2022-11-05 11:53:50 +00:00
Sagar Sharma
bd7435ce1e test: add test case 
(cherry picked from commit 761e9df1bf)
 2022-11-05 11:53:50 +00:00
Sagar Sharma
97445d9516 fix: rename test method 
(cherry picked from commit 611d827e0b)
 2022-11-05 11:53:49 +00:00
Sagar Sharma
e629cba2b7 fix: map BOM while mapping the return SCR 
(cherry picked from commit 54072ec9cd)
 2022-11-05 11:53:49 +00:00
Deepesh Garg
cc8a184666 Merge pull request #32855 from frappe/mergify/bp/version-14-hotfix/pr-32844 
fix: Auto advance allocation against partial invoices (backport #32844)
 2022-11-05 16:59:03 +05:30
Maharshi Patel
60af9c0516 fix: Create POS Opening Entry POS Profile filter. 
pos_profile_query was variable instead of function.

(cherry picked from commit 1328a45f2a)
 2022-11-05 11:15:32 +00:00
Deepesh Garg
c3b2629412 test: Check parital payment allocation 
(cherry picked from commit 428971f127)
 2022-11-05 10:58:42 +00:00
Deepesh Garg
b7763d953a fix: Auto advance allocation against partial invoices 
(cherry picked from commit 181df2fe63)
 2022-11-05 10:58:42 +00:00
Sagar Sharma
3bd024ca8f Merge pull request #32831 from bhavesh95863/patch-2 
fix: mysql syntax issue
 2022-11-05 11:30:14 +05:30
Sagar Sharma
d443925b1e Merge branch 'version-14-hotfix' into patch-2 2022-11-05 10:29:11 +05:30
Sagar Sharma
2f145f9912 refactor: rewrite query in QB 2022-11-05 10:28:06 +05:30
rohitwaghchaure
d9147c1975 Merge pull request #32841 from frappe/mergify/bp/version-14-hotfix/pr-32799 
fix: Scan Barcode UX (backport #32799)
 2022-11-04 12:09:36 +05:30
rohitwaghchaure
31bada9205 fix: trailing whitespace 2022-11-04 11:28:41 +05:30
rohitwaghchaure
ab87a950e5 fix: conflicts 2022-11-04 11:21:39 +05:30
Rohit Waghchaure
d8e403bf5d fix: auto increment qty if item table has no items 
(cherry picked from commit e5b19e3f70)
 2022-11-04 05:36:09 +00:00
Rohit Waghchaure
1944f4df4d fix: Scan Barcode UX 
(cherry picked from commit e1f9ba78e5)

# Conflicts:
#	erpnext/public/js/utils/barcode_scanner.js
 2022-11-04 05:36:09 +00:00