CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-18 01:36:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
39,516 Commits 426 Branches 1,718 Tags
b10d167c98bb741dc28e40583dad01cb991952ce
Commit Graph

39516 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepesh Garg
b10d167c98 Merge pull request #29910 from frappe/mergify/bp/version-13-pre-release/pr-29907 
fix: Total Credit amount in TDS Payable monthly report (backport #29907)
 2022-02-21 15:40:53 +05:30
Deepesh Garg
a5fbf89285 fix: Total Credit amount in TDS Payable monthly report 
(cherry picked from commit a82cf7214e)
 2022-02-21 10:05:49 +00:00
Deepesh Garg
15849c5cac Merge pull request #29906 from frappe/mergify/bp/version-13-pre-release/pr-29887 
fix: Ledger entries on LIA for term loans (backport #29887)
 2022-02-21 14:54:18 +05:30
Marica
28abe13e0b Merge pull request #29908 from frappe/mergify/bp/version-13-pre-release/pr-29904 
chore: Show 'Produced Qty' field in Sales Order Item (backport #29903) (backport #29904)
 2022-02-21 14:42:22 +05:30
mergify[bot]
251288994c chore: Show 'Produced Qty' field in Sales Order Item (#29903) (#29904) 
(cherry picked from commit e952cce17d)

Co-authored-by: Marica <maricadsouza221197@gmail.com>
(cherry picked from commit 14c5be7c27)
 2022-02-21 09:06:01 +00:00
Deepesh Garg
a015fcc921 fix: Ledger entries on LIA for term loans 
(cherry picked from commit 1aa12fb3f1)
 2022-02-21 08:55:36 +00:00
Saqib Ansari
c34fcf3083 Merge pull request #29899 from frappe/mergify/bp/version-13-pre-release/pr-29896 
fix(pos): removal of coupon code (backport #29896)
 2022-02-21 12:02:49 +05:30
Saqib Ansari
9b241cb6f1 fix(pos): removal of coupon code 
(cherry picked from commit fa38c291bd)
 2022-02-21 06:19:46 +00:00
Marica
920a99ee76 Merge pull request #29877 from frappe/mergify/bp/version-13-pre-release/pr-29816 
fix: Stock Ageing Transfer Bucket logic for Repack Entry with split batch rows (backport #29816)
 2022-02-18 20:02:17 +05:30
Marica
8dc6468b6a Merge pull request #29878 from frappe/mergify/bp/version-13-pre-release/pr-29825 
fix: Update SO via Work Order made from MR (attached to SO) (backport #29803) (backport #29825)
 2022-02-18 20:01:18 +05:30
Marica
104d3e1019 fix: Solve merge conflict in patches.txt 2022-02-18 19:27:11 +05:30
marination
6cf1049495 chore: Move patch that updates SO from WO to v13 
(cherry picked from commit 94a1016623)

# Conflicts:
#	erpnext/patches.txt
 2022-02-18 13:51:12 +00:00
marination
b46bd0d9d1 chore: Patch to update SO work_order_qty and Linter fix 
(cherry picked from commit 0ca58d7627)

# Conflicts:
#	erpnext/patches.txt
(cherry picked from commit 98ce6a1c8d)

# Conflicts:
#	erpnext/patches.txt
 2022-02-18 13:51:12 +00:00
marination
0e3398c761 test: SO > MR > WO flow 
(cherry picked from commit f9d52e7346)
(cherry picked from commit 2ce07eff71)
 2022-02-18 13:51:11 +00:00
marination
8dbe953b8f 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)
(cherry picked from commit bb119c8e52)
 2022-02-18 13:51:10 +00:00
marination
113222628b test: Negative Stock, over consumption & over production with split rows, balance precision 
(cherry picked from commit d5be536740)
 2022-02-18 13:50:36 +00:00
marination
ae7aead4d0 fix: Range Qty precision 
(cherry picked from commit ed4a6c6cc6)
 2022-02-18 13:50:36 +00:00
marination
4126e42ae7 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:50:36 +00:00
marination
51af328a53 chore: Add transfer bucket working to .md file 
(cherry picked from commit f6233e77c6)
 2022-02-18 13:50:35 +00:00
marination
06758e53fd test: Stock Ageing FIFO buckets for Repack entry with same item 
(cherry picked from commit ea3b7de867)
 2022-02-18 13:50:35 +00:00
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
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
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
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
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
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
d898cb45dc fix: currency in bank reconciliation tool 
(cherry picked from commit 60674e52b8)
 2022-02-17 08:57:47 +00:00
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
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
rohitwaghchaure
c843b0b210 Merge pull request #29809 from rohitwaghchaure/merge-branch-hotfix-to-pre-release-for-13-21 
chore: Merge branch 'version-13-hotfix' into 'version-13-pre-release'
 2022-02-15 17:54:17 +05:30
mergify[bot]
20ba40066a fix: dont attempt to set batch number if item doesn't have batch no (#29812) (#29814) 
This causes other triggers and unnecessary changes (e.g. price list)

(cherry picked from commit f89a64db48)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-02-15 16:12:17 +05:30
Deepesh Garg
335e80f787 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into merge-branch-hotfix-to-pre-release-for-13-21 2022-02-15 15:56:33 +05:30
Deepesh Garg
3e2b9a2c50 Merge pull request #29810 from frappe/mergify/bp/version-13-hotfix/pr-29791 
fix: Fixes in TDS payable monthly report (backport #29791)
 2022-02-15 15:55:08 +05:30
Deepesh Garg
038d729462 fix: Filter out bank payment entries 
(cherry picked from commit 04cbde2e52)
 2022-02-15 10:10:29 +00:00
Deepesh Garg
ea3acb09be fix: Fixes in TDS payable monthly report 
(cherry picked from commit 2ff6b3560e)
 2022-02-15 10:10:28 +00:00
Rohit Waghchaure
01356031bb chore: Merge branch 'version-13-hotfix' into 'version-13-pre-release' 2022-02-15 15:14:10 +05:30
Sagar Sharma
83ab63ba81 chore: warning for Amazon MWS integration deprecation (#29792) 
* chore: warning for amazon mws integration deprecation

* style: spaces to tabs

[skip ci]
 2022-02-15 11:37:29 +05:30
Deepesh Garg
321cbd5982 Merge pull request #29800 from frappe/mergify/bp/version-13-hotfix/pr-29789 
fix: disable rounded total in opening invoice creation tool (backport #29789)
 2022-02-15 11:32:14 +05:30
Saqib Ansari
5d608edc54 fix: disable rounded total in opening invoice creation tool 
(cherry picked from commit 18d0a59a9d)
 2022-02-15 05:09:01 +00:00
Marica
93cde7e5ff Merge pull request #29794 from frappe/mergify/bp/version-13-hotfix/pr-29705 
fix: Set Pending Qty in Prod Plan after updating Work Order (backport #29705)
 2022-02-14 23:39:26 +05:30
Marica
a8107f6e06 Merge pull request #29795 from frappe/mergify/bp/version-13-hotfix/pr-29788 
fix: Generate Warehouse wise FIFO Queue always and later aggregate if required (backport #29788)
 2022-02-14 23:38:52 +05:30
marination
e9ef1cbd3d test: Cover back to back recos from different warehouses 
(cherry picked from commit f221a0d253)
 2022-02-14 17:35:38 +00:00
marination
3d45ea0c1f fix: Generate Wh wise FIFO Queue and later aggregate if required 
- Back to back stock recos cause incorrect qty calculation across warehouses
- Hard to differentiate how much of the qty is reset by the reco
- Maintain Queue and balances warehouse wise and later aggregate for accurate values

(cherry picked from commit f62b3207ff)
 2022-02-14 17:35:37 +00:00
marination
698f910a30 fix: Server Tests and sider 
(cherry picked from commit e46a1bc80f)
 2022-02-14 17:32:59 +00:00
marination
1df4e2c44a test: Production Plan Pending Qty impact tests 
- Two tests to check impact on pending qty: From SO and independent Prod Plan
- Added docstring to each test case for brief summary
- Changed helper function args to fallback to 0 instead of 1 if no arg is passed
- Removed unnecessary `get_doc()`
- Made helper function actions optional depending on args passed

(cherry picked from commit 86ca41b14a)
 2022-02-14 17:32:59 +00:00
marination
6800c3efae fix: Initialise pending qty as planned qty for independent item rows in Prod Plan 
- Rows that are not fetched from MR or SO, had pending qty 0 throughout
- Initialise pending qty on save only.
- After submit this field will be updated by work order/stock entry
- Bring functions in `validate()` closer to the top

(cherry picked from commit eaccef6116)
 2022-02-14 17:32:58 +00:00
marination
c7b9df5aee fix: Set Pending Qty in Prod Plan after updating Work Order 
(cherry picked from commit 7116d7ae0e)
 2022-02-14 17:32:58 +00:00