nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-07 07:20:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
39,869 Commits 460 Branches 1,746 Tags
d8b7693ea9fa5267bf4fa28e6d35e97795e95c92
Commit Graph

39869 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Saqib Ansari
57d5a027fb fix: remove redundant method 2022-02-21 13:58:01 +05:30
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
2c84b1dfa6 Merge pull request #29898 from frappe/mergify/bp/version-13-hotfix/pr-29896 
fix(pos): removal of coupon code (backport #29896)
 2022-02-21 11:52:31 +05:30
Saqib Ansari
9b241cb6f1 fix(pos): removal of coupon code 
(cherry picked from commit fa38c291bd)
 2022-02-21 06:19:46 +00:00
Saqib Ansari
8d24cb44a8 fix(pos): removal of coupon code 
(cherry picked from commit fa38c291bd)
 2022-02-21 06:19:24 +00:00
rohitwaghchaure
85b7bc8d6b Merge pull request #29892 from frappe/mergify/bp/version-13-hotfix/pr-29771 
fix: Error in consolidated financial statements (backport #29771)
 2022-02-20 19:54:44 +05:30
Deepesh Garg
232ba3580b fix: Linting issues 
(cherry picked from commit fec40aac7a)
 2022-02-20 13:48:45 +00:00
Deepesh Garg
b99a95b280 fix: Remove commented out code 
(cherry picked from commit 42cdd6d237)
 2022-02-20 13:48:45 +00:00
Deepesh Garg
02b7541fb9 fix: Error in consolidated financial statements 
(cherry picked from commit ae613008be)
 2022-02-20 13:48:45 +00:00
Deepesh Garg
ce2a5c97eb Merge pull request #29888 from frappe/mergify/bp/version-13-hotfix/pr-29869 
fix: GSTIN filter for GSTR-1 report (backport #29869)
 2022-02-20 17:25:10 +05:30
Deepesh Garg
6084aeb7d1 chore: remove console statements 
(cherry picked from commit d188fcc066)
 2022-02-19 14:12:43 +00:00
Deepesh Garg
3a98cc351c Update gstr_1.js 
(cherry picked from commit a28ec89507)
 2022-02-19 14:12:43 +00:00
Deepesh Garg
41b82145ea fix: GSTIN filter for GSTR-1 report 
(cherry picked from commit 87b074ac09)
 2022-02-19 14:12:42 +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
52aedcf8c4 Merge pull request #29876 from frappe/mergify/bp/version-13-hotfix/pr-29816 
fix: Stock Ageing Transfer Bucket logic for Repack Entry with split batch rows (backport #29816)
 2022-02-18 19:34:35 +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
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