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
40,943 Commits 421 Branches 1,718 Tags
2a615af00a754162c202d10f77e1c1d36a6d48cd
Commit Graph

40943 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
marination
cb4e6b9221 fix: Transfer Bucket logic for Repack Entry with split batch rows 
(cherry picked from commit 799671c748)
 2022-02-18 13:50:35 +00:00
Marica
f958956322 Merge pull request #29825 from frappe/mergify/bp/version-13-hotfix/pr-29803 
fix: Update SO via Work Order made from MR (attached to SO) (backport #29803)
 2022-02-18 19:20:12 +05:30
marination
88ca371887 test: Negative Stock, over consumption & over production with split rows, balance precision 
(cherry picked from commit d5be536740)
 2022-02-18 13:49:09 +00:00
marination
fde5a9e6f7 fix: Range Qty precision 
(cherry picked from commit ed4a6c6cc6)
 2022-02-18 13:49:09 +00:00
marination
c66b5752e2 fix: Precision of available qty and negative stock in transfer bucket 
- Maintain only positive values in transfer bucket
- Use it to neutralize/add stock to fifo queue

(cherry picked from commit d3fbbcfed3)
 2022-02-18 13:49:08 +00:00
marination
cab05dbefb chore: Add transfer bucket working to .md file 
(cherry picked from commit f6233e77c6)
 2022-02-18 13:49:08 +00:00
marination
690ae52a8e test: Stock Ageing FIFO buckets for Repack entry with same item 
(cherry picked from commit ea3b7de867)
 2022-02-18 13:49:08 +00:00
marination
d86e63e22d fix: Transfer Bucket logic for Repack Entry with split batch rows 
(cherry picked from commit 799671c748)
 2022-02-18 13:49:07 +00:00
Rohit Waghchaure
58aedaa0f7 fix: added item name in the excel sheet 
(cherry picked from commit 02e77029fa)
 2022-02-17 20:18:01 +05:30
Rohit Waghchaure
72dec4b28f fix: added item name in the excel sheet 
(cherry picked from commit 02e77029fa)
 2022-02-17 20:17:47 +05:30
Ankush Menat
90ebe6f266 fix: avoid creating bins without item-wh 
Co-Authored-By:  Shadrak Gurupnor <30501401+shadrak98@users.noreply.github.com>
Co-Authored-By: Saurabh <saurabh6790@gmail.com>
(cherry picked from commit c36bd7e1a6)
 2022-02-17 20:17:13 +05:30
Ankush Menat
29a1f338a4 fix: avoid creating bins without item-wh 
Co-Authored-By:  Shadrak Gurupnor <30501401+shadrak98@users.noreply.github.com>
Co-Authored-By: Saurabh <saurabh6790@gmail.com>
(cherry picked from commit c36bd7e1a6)
 2022-02-17 20:16:57 +05:30
Deepesh Garg
bdef164061 Merge pull request #29827 from frappe/mergify/bp/version-13-hotfix/pr-29137 
feat: Payment Terms Status report (backport #29137)
 2022-02-17 19:16:28 +05:30
Rucha Mahabal
ddfdb445fa chore: remove unused code and fields related to workstation from Timesheet Detail 
(cherry picked from commit bef46e2b64)
 2022-02-17 18:22:43 +05:30
Rucha Mahabal
98bafc5898 test: timesheet not overlapping with continuous timelogs 
(cherry picked from commit 47ff968253)
 2022-02-17 18:22:43 +05:30
Rucha Mahabal
91e6fea2cd fix: convert overlap raw query to frappe.qb 
(cherry picked from commit 3ec9acf8f7)
 2022-02-17 18:22:43 +05:30
Rucha Mahabal
6db0ea8be8 fix(Timesheet): convert time logs to datetime while checking for overlap 
(cherry picked from commit e2e998fbd9)
 2022-02-17 18:22:43 +05:30
Saqib Ansari
f9282d2a6b Merge pull request #29861 from frappe/mergify/bp/version-13-pre-release/pr-29859 
fix: coupon code is applied even if ignore_pricing_rule is enabled (backport #29859)
 2022-02-17 16:22:05 +05:30
Saqib Ansari
5db80b2b57 Merge pull request #29860 from frappe/mergify/bp/version-13-hotfix/pr-29859 
fix: coupon code is applied even if ignore_pricing_rule is enabled (backport #29859)
 2022-02-17 16:20:51 +05:30
Saqib Ansari
381ccd7653 fix: coupon code is applied even if ignore_pricing_rule is enabled 
(cherry picked from commit 2743999785)
 2022-02-17 10:42:43 +00:00
Saqib Ansari
63079f3e07 fix: coupon code is applied even if ignore_pricing_rule is enabled 
(cherry picked from commit 2743999785)
 2022-02-17 10:42:15 +00:00
Ankush Menat
20f7db98cb fix: production plan status should consider qty + WO status 
(cherry picked from commit db93f26f20)
 2022-02-17 15:09:08 +05:30
Saqib Ansari
6559c1cd01 Merge pull request #29851 from frappe/mergify/bp/version-13-pre-release/pr-29848 
fix: currency in bank reconciliation tool (backport #29848)
 2022-02-17 14:40:22 +05:30
Saqib Ansari
a4cd33441f Merge pull request #29850 from frappe/mergify/bp/version-13-hotfix/pr-29848 
fix: currency in bank reconciliation tool (backport #29848)
 2022-02-17 14:40:16 +05:30
Saqib Ansari
d898cb45dc fix: currency in bank reconciliation tool 
(cherry picked from commit 60674e52b8)
 2022-02-17 08:57:47 +00:00
Saqib Ansari
97505fdc82 fix: currency in bank reconciliation tool 
(cherry picked from commit 60674e52b8)
 2022-02-17 08:57:28 +00:00
Ankush Menat
fb0167ffc6 test: putaway rule re-application shouldn't do anything 
(cherry picked from commit d9fc3f3d90)
 2022-02-17 12:47:44 +05:30
Ankush Menat
90f2cfd102 fix: avoid updating items table if no change due to putaway 
(cherry picked from commit b000e93744)
 2022-02-17 12:47:44 +05:30
mergify[bot]
8953794cda fix: allow renaming and merging (backport #29830) (#29832) 
Co-authored-by: Wolfram Schmidt <wolfram.schmidt@phamos.eu>
 2022-02-16 17:53:00 +05:30
marination
94a1016623 chore: Move patch that updates SO from WO to v13 2022-02-16 17:45:41 +05:30
Marica
8727addec3 Merge pull request #29824 from frappe/mergify/bp/version-13-pre-release/pr-29823 
perf: Weed out disabled variants via sql query instead of pythonic looping separately (backport #29639) (backport #29823)
 2022-02-16 14:30:47 +05:30
ruthra kumar
2ca25fc9f1 test: added test for alternate currency 
- Sales Order and Invoice will be submitted in USD with exchange rate
of 70 with the default company currency
- Report will display in defauly company currency

(cherry picked from commit 48f37c7659)
 2022-02-16 08:46:23 +00:00
ruthra kumar
fa03246a94 test: refactor and fix failing test case 
(cherry picked from commit 49fdc6c52e)
 2022-02-16 08:46:23 +00:00
ruthra kumar
07c094152e refactor: create invoices list without if else 
(cherry picked from commit a4b8d67323)
 2022-02-16 08:46:22 +00:00
ruthra kumar
63c73e6eaf fix: default to company currency in report output 
(cherry picked from commit 85ed0fb8d6)
 2022-02-16 08:46:22 +00:00
ruthra kumar
2614de9ab3 refactor: currency field and code cleanup 
(cherry picked from commit bc244d0740)
 2022-02-16 08:46:22 +00:00
Deepesh Garg
b249478fcc fix: Copyright info 
(cherry picked from commit 4284017e9d)
 2022-02-16 08:46:21 +00:00
ruthra
b6910912a9 test: qty and rate changed to remove need for fractional Nos 
(cherry picked from commit 4535a7a301)
 2022-02-16 08:46:21 +00:00
ruthra
c6fb52a31a refactor: remove unused imports 
(cherry picked from commit edd980acdc)
 2022-02-16 08:46:21 +00:00
ruthra
408704e269 test: fix failing test case payment terms status 
(cherry picked from commit 9f1e68801d)
 2022-02-16 08:46:20 +00:00
ruthra
bc2b4411ee feat: Payment Terms Status report 
- calculate status at runtime for payment terms based on invoices
 - invoices are used in FIFO method

(cherry picked from commit 1bac793083)
 2022-02-16 08:46:20 +00:00
marination
98ce6a1c8d chore: Patch to update SO work_order_qty and Linter fix 
(cherry picked from commit 0ca58d7627)

# Conflicts:
#	erpnext/patches.txt
 2022-02-16 08:35:11 +00:00
marination
2ce07eff71 test: SO > MR > WO flow 
(cherry picked from commit f9d52e7346)
 2022-02-16 08:35:09 +00:00
marination
bb119c8e52 fix: Update SO via Work Order made from MR (attached to SO) 
- Add SO Item reference in WO from MR (that was made from SO)

(cherry picked from commit 18731622c4)
 2022-02-16 08:35:09 +00:00
marination
ad0d865ccc chore: Remove commented out code 
(cherry picked from commit 29c576e144)
(cherry picked from commit de834a8362)
 2022-02-16 08:33:44 +00:00
marination
abd5d3caea chore: Fix flaky test test_exact_match_with_price 
- Clear cart settings in cache to avoid stale values

(cherry picked from commit 4f5a0b8941)
(cherry picked from commit b75e982286)
 2022-02-16 08:33:44 +00:00
marination
2bcc77583a fix: Trim spaces from attributes (multi-variant creation) & explicit method for building cache 
- Multiple Item Variants creation fails due to extra spaces in attributes from popup. Clean them before passing to server side
- Mention explicit method to build variants cache to avoid ambiguity between old method path (pre-refactor)

(cherry picked from commit a64228741d)
(cherry picked from commit ca8986028d)
 2022-02-16 08:33:43 +00:00
marination
585b760144 perf: Weed out disabled variants via sql query instead of pythonic looping separately 
- If the number of variants are large (almost 2lakhs), the query to get variants and attribute data takes time
- If the no.of disabled attributes is large as well, the list comprehension weeding out disabled variants takes forever
- We dont need to loop over the variants data so many times
- Avoid any `if a in list(b)` is best when the iterables have tremendous data

(cherry picked from commit 26bd3053d1)
(cherry picked from commit 251656ab52)
 2022-02-16 08:33:43 +00:00
Marica
ec0ea604ac Merge pull request #29823 from frappe/mergify/bp/version-13-hotfix/pr-29639 
perf: Weed out disabled variants via sql query instead of pythonic looping separately (backport #29639)
 2022-02-16 14:02:54 +05:30
marination
de834a8362 chore: Remove commented out code 
(cherry picked from commit 29c576e144)
 2022-02-16 08:10:00 +00:00