CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-17 09:17:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
39,527 Commits 421 Branches 1,718 Tags
58501c7e0ea739016a0ca3255565ebca7b60d125
Commit Graph

39527 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Saqib Ansari
58501c7e0e Merge pull request #30085 from frappe/mergify/bp/version-13-pre-release/pr-29991 
fix(pos): minor fixes (backport #29991)
 2022-03-07 11:53:14 +05:30
Saqib Ansari
3525f0e585 fix: merge conflicts 2022-03-07 11:52:16 +05:30
Saqib Ansari
25c434fb02 fix(pos): coupon code is applied even if ignore pricing rule is check 
(cherry picked from commit 81514516f3)

# Conflicts:
#	erpnext/public/js/controllers/transaction.js
 2022-03-07 06:20:52 +00:00
Saqib Ansari
da4e43b8bc fix(pos): mode of payment disappears after save 
(cherry picked from commit 69c34cd7ae)
 2022-03-07 06:20:50 +00:00
Ankush Menat
a8137bda67 fix: dont hardcode precision in routing 
Co-Authored-By: Suraj Shetty <surajshetty3416@gmail.com>
(cherry picked from commit 9ef35ef773)
 2022-03-02 20:22:02 +05:30
Ankush Menat
d34f5051d7 fix: remove dead dashboard links 
(cherry picked from commit f8ac4c082a)
 2022-03-02 20:22:02 +05:30
Ankush Menat
45ba50036f fix: track changes on warehouse 
(cherry picked from commit d22a1d440c)
 2022-03-01 13:11:35 +05:30
Rohit Waghchaure
f87ba6ac0a Merge branch 'version-13-pre-release' into version-13 v13.21.0 2022-02-21 20:29:03 +05:30
Rohit Waghchaure
506e1221b8 bumped to version 13.21.0 2022-02-21 20:49:03 +05:50
rohitwaghchaure
a6a7504d6c Merge pull request #29920 from rohitwaghchaure/change-log-for-v13-21 
chore: change log for v13.21.0
 2022-02-21 20:21:27 +05:30
Rohit Waghchaure
b05d2201eb chore: change log for v13.21.0 2022-02-21 20:18:04 +05:30
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