nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-19 01:25:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
42,989 Commits 404 Branches 1,700 Tags
d54bf6d91cc7b8afacdbe2fcbf0d4e7292d70445
Commit Graph

42989 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sagar Sharma
d54bf6d91c refactor: rewrite BOM Variance Report queries in QB 2022-09-21 11:16:45 +05:30
Sagar Sharma
85cda4a995 Merge pull request #32301 from frappe/mergify/bp/version-14-hotfix/pr-32295 
refactor: rewrite `BOM Stock Report` queries in `QB` (backport #32295)
 2022-09-20 23:09:25 +05:30
Sagar Sharma
ed9a896f72 fix: warehouse filter in BOM Stock Calculated Report 
(cherry picked from commit 390ce5719d)
 2022-09-20 17:37:19 +00:00
Sagar Sharma
181dccd8d8 refactor: rewrite BOM Stock Report queries in QB 
(cherry picked from commit 8fd7c04920)
 2022-09-20 17:37:18 +00:00
Deepesh Garg
fcd46aa243 Merge pull request #32294 from frappe/mergify/bp/version-14-hotfix/pr-32284 
fix: remove no_copy for ignore_pricing_rule (backport #32284)
 2022-09-20 17:16:12 +05:30
Deepesh Garg
d62b983057 chore: Resolve conflicts 2022-09-20 16:45:23 +05:30
Deepesh Garg
b0131a8a80 Merge pull request #32288 from frappe/mergify/bp/version-14-hotfix/pr-32204 
fix(UX): More predictable tax withholding application in invoices (backport #32204)
 2022-09-20 16:38:44 +05:30
Maharshi Patel
c0003195b8 fix: remove no_copy for ignore_pricing_rule 
(cherry picked from commit 8c5b420aea)
 2022-09-20 10:50:22 +00:00
Deepesh Garg
957fc440fd Merge pull request #32290 from frappe/mergify/bp/version-14-hotfix/pr-32264 
fix: Depreciation posting date only when calculate depreciation is checked (backport #32264)
 2022-09-20 15:00:19 +05:30
Deepesh Garg
4939153f8c fix: Depreciation posting date only when calculate depreciation is checked 
(cherry picked from commit fac82cf69b)
 2022-09-20 09:18:22 +00:00
Deepesh Garg
302f2d10e2 chore: fix tests 
(cherry picked from commit 9aa1f84d45)
 2022-09-20 09:06:40 +00:00
Deepesh Garg
eba46dae6c fix: TDS deduction via journal entry 
(cherry picked from commit 36d0906ea2)
 2022-09-20 09:06:40 +00:00
Deepesh Garg
27fdd41a6e test: Add tests 
(cherry picked from commit b6184ce471)
 2022-09-20 09:06:40 +00:00
Deepesh Garg
f759c29d55 fix: Fetch vouchers to show in Invoice 
(cherry picked from commit 3fb1595a4e)
 2022-09-20 09:06:40 +00:00
Deepesh Garg
e8076629fa fix: Add child table for tax withheld vouchers 
(cherry picked from commit 246c1a9380)
 2022-09-20 09:06:39 +00:00
Sagar Sharma
77678ecfeb Merge pull request #32285 from frappe/mergify/bp/version-14-hotfix/pr-32280 
refactor: rewrite `Item Shortage Report` queries in QB (backport #32280)
 2022-09-20 11:43:55 +05:30
Sagar Sharma
273ed40cfb test: add test cases for Item Shortage Report 
(cherry picked from commit 3dc754cac2)
 2022-09-20 05:45:04 +00:00
Sagar Sharma
a56b5ed8e5 refactor: rewrite Item Shortage Report queries in QB 
(cherry picked from commit f0a78aa559)
 2022-09-20 05:45:03 +00:00
ruthra kumar
d7d75be0d7 Merge pull request #32283 from frappe/mergify/bp/version-14-hotfix/pr-32217 
fix: incorrect gl if tax on multi currency payment entry (backport #32217)
 2022-09-20 11:10:25 +05:30
ruthra kumar
5ba5b7bf51 test: gl entries of payments with advance tax 
(cherry picked from commit 5bd5dd7262)
 2022-09-20 04:31:10 +00:00
ruthra kumar
dcfc11df7a fix: incorrect gl if tax on multi currency payment entry 
(cherry picked from commit f0ae77b23b)
 2022-09-20 04:31:10 +00:00
Deepesh Garg
f14b577766 Merge pull request #32278 from frappe/mergify/bp/version-14-hotfix/pr-32235 
fix: fetch description only if empty on the payment schedule (backport #32235)
 2022-09-20 09:54:17 +05:30
Maharshi Patel
887663129e fix: fetch description only if empty on the payment schedule 
added fetch_if_empty on description field of payment_schedule.

(cherry picked from commit f4b64686ae)
 2022-09-20 03:44:29 +00:00
Sagar Sharma
327256a516 Merge pull request #32275 from frappe/mergify/bp/version-14-hotfix/pr-32274 
fix: `po_detail` or `sco_rm_detail` not getting set while while mapping SE (backport #32274)
 2022-09-19 19:46:43 +05:30
Sagar Sharma
ff210c73eb fix: po_detail or sco_rm_detail not getting set while while mapping SE 
(cherry picked from commit 3a9c08e7c9)
 2022-09-19 13:49:43 +00:00
ruthra kumar
a85dd86832 Merge pull request #32270 from frappe/mergify/bp/version-14-hotfix/pr-32251 
fix: use default supplier currency if default supplier is enabled (backport #32251)
 2022-09-19 14:04:16 +05:30
ruthra kumar
c98413c981 fix: use default supplier currency if default supplier is enabled 
(cherry picked from commit 77fdc37cb7)
 2022-09-19 07:33:18 +00:00
Deepesh Garg
198d19b920 Merge pull request #32246 from frappe/mergify/bp/version-14-hotfix/pr-32238 
fix: suggestion threshold label and rule was not working for other item with min and max amount (backport #32238)
 2022-09-19 10:10:55 +05:30
Deepesh Garg
5a2e286de6 Merge pull request #32255 from frappe/mergify/bp/version-14-hotfix/pr-32244 
fix: Parent Level project linkning on creating PO from project (backport #32244)
 2022-09-18 19:41:45 +05:30
Sagar Sharma
24ccebc633 Merge pull request #32260 from frappe/mergify/bp/version-14-hotfix/pr-32250 
fix: make `po_detail` or `sco_rm_detail` mandatory for SE Send to Subcontractor (backport #32250)
 2022-09-18 15:58:48 +05:30
Sagar Sharma
908944b68b fix: make po_detail or sco_rm_detail mandatory for SE Send to Subcontractor 
(cherry picked from commit b90875575c)
 2022-09-18 09:24:48 +00:00
Deepesh Garg
cbaffb4858 fix: Parent Level project linkning on creating PO from project 
(cherry picked from commit 93e134aab0)
 2022-09-17 15:00:33 +00:00
Sagar Sharma
7dcb8bb674 Merge pull request #32248 from frappe/mergify/bp/version-14-hotfix/pr-32247 
fix: add SCO supplied item reference while mapping the Stock Entry (backport #32247)
 2022-09-17 16:09:15 +05:30
Sagar Sharma
a15f0d427c fix: sco_rm_detail in Stock Entry 
(cherry picked from commit 2f97370b8e)
 2022-09-17 10:12:48 +00:00
Rohit Waghchaure
436b7e3b70 fix: suggestion threshold label and rule was not working for other items with min and max amount 
(cherry picked from commit f5bd3fa952)
 2022-09-17 06:42:22 +00:00
Sagar Sharma
075d456417 Merge pull request #32240 from frappe/mergify/bp/version-14-hotfix/pr-32236 
fix: production plan pending-qty (backport #32236)
 2022-09-16 21:31:57 +05:30
Sagar Sharma
ff78906361 test: update test case for production plan pending-qty 
(cherry picked from commit bd6af7c613)
 2022-09-16 13:00:32 +00:00
Sagar Sharma
5f3caf6975 fix: production plan pending-qty 
(cherry picked from commit 5be7d42dfd)
 2022-09-16 13:00:31 +00:00
Sagar Sharma
5c09b28d62 Merge pull request #32234 from frappe/mergify/bp/version-14-hotfix/pr-32233 
refactor: rewrite Production Plan queries in QB (backport #32233)
 2022-09-16 13:57:26 +05:30
Sagar Sharma
b700a0be1f refactor: rewrite Production Plan queries in QB 
(cherry picked from commit b8cf3b4c77)
 2022-09-16 08:00:08 +00:00
Nabin Hait
cceadcec33 Merge pull request #32231 from frappe/mergify/bp/version-14-hotfix/pr-32225 
fix: create dunning from sales invoice (backport #32225)
 2022-09-16 13:06:45 +05:30
Nabin Hait
22372e69eb Merge branch 'version-14-hotfix' into mergify/bp/version-14-hotfix/pr-32225 2022-09-16 12:17:14 +05:30
Nabin Hait
88c446b0bf Merge pull request #32232 from nabinhait/asset-repair-test-fix1 
fix: disable cwip in asset repair tests
 2022-09-16 12:17:01 +05:30
Nabin Hait
5cab0aa1d7 fix: disable cwip in asset repair tests 2022-09-16 11:44:25 +05:30
Nabin Hait
569b4c256a Merge pull request #32230 from frappe/mergify/bp/version-14-hotfix/pr-32219 
fix: No permission to read doctype (backport #32219)
 2022-09-16 11:37:09 +05:30
Nabin Hait
17ea6cc5a5 fix: create dunning from sales invoice 
(cherry picked from commit 29db084dc3)
 2022-09-16 05:35:51 +00:00
Nabin Hait
442f54a988 fix: No permission to read doctype 
(cherry picked from commit c0da948a4e)
 2022-09-16 05:35:29 +00:00
Deepesh Garg
c07e61953a Merge pull request #32228 from frappe/mergify/bp/version-14-hotfix/pr-32222 
fix: abbreviation issue on renaming cost center (backport #32222)
 2022-09-16 11:03:14 +05:30
Nabin Hait
2102b83bd9 Merge pull request #32229 from frappe/mergify/bp/version-14-hotfix/pr-32221 
fix: consider posting time for internal transfer PO (backport #32221)
 2022-09-16 09:39:33 +05:30
Rohit Waghchaure
f370c7b50b fix: consider posting time for internal transfer PO 
(cherry picked from commit cb763938dc)
 2022-09-16 04:08:04 +00:00