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

39997 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mergify[bot]
6539d32ca9 fix: Fetch conversion factor even if it already existed in row, on item change (#29917) (#29935) 
* fix: Fetch conversion factor even if it already existed in row, on item change

* fix: Retain manually changed conversion factor

- If item code changes, reset conversion factor on client side
- Keep API behavious consistent, if conversion factor is sent, same must come back
- API should not ideally reset values in most cases

(cherry picked from commit 235fc127b3)

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2022-02-22 13:01:31 +05:30
mergify[bot]
0f101b5209 fix(Salary Slip): TypeError while clearing any amount field in components (backport #29931) (#29932) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2022-02-22 11:56:56 +05:30
mergify[bot]
233a75a438 fix(LMS): program enrollment does not give any feedback (backport #29922) (#29924) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2022-02-21 23:10:20 +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
mergify[bot]
6b87d38a80 fix: JobCard TimeLog to_date (#29872) (#29919) 
(cherry picked from commit e4c4dc402e)

Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
 2022-02-21 20:17:05 +05:30
Deepesh Garg
a63373ce98 fix: Gross profit for credit notes 
(cherry picked from commit 973f6b1bbd)
 2022-02-21 13:59:15 +00:00
Deepesh Garg
9a0b83027a fix: Remove unused param 
(cherry picked from commit 07bcbc6c7e)
 2022-02-21 13:59:15 +00:00
Deepesh Garg
b0a9ff0b04 fix: Update columns in new format 
(cherry picked from commit 2172ab2d37)
 2022-02-21 13:59:15 +00:00
Deepesh Garg
ab4a96dadd fix: Multiple fixes in Gross Profit report 
(cherry picked from commit da73685f71)
 2022-02-21 13:59:15 +00:00
Saqib Ansari
f107a6f3f2 Merge branch 'version-13-hotfix' into fetch-valuation-rate 2022-02-21 17:56:11 +05:30
Ankush Menat
9adbaaea4a fix: round off increments in numeric item variant 
(cherry picked from commit 00e8565868)
 2022-02-21 17:44:41 +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
e4281734fe Merge pull request #29909 from frappe/mergify/bp/version-13-hotfix/pr-29907 
fix: Total Credit amount in TDS Payable monthly report (backport #29907)
 2022-02-21 15:40:41 +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
a6fba24ab1 fix: Total Credit amount in TDS Payable monthly report 
(cherry picked from commit a82cf7214e)
 2022-02-21 10:05:23 +00:00
Saqib Ansari
1b0ee018b5 Merge branch 'version-13-hotfix' into fetch-valuation-rate 2022-02-21 15:11:26 +05:30
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
Deepesh Garg
e70933eea2 Merge pull request #29905 from frappe/mergify/bp/version-13-hotfix/pr-29887 
fix: Ledger entries on LIA for term loans (backport #29887)
 2022-02-21 14:54:05 +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
Saqib Ansari
bc28755978 fix: sider 2022-02-21 14:26:21 +05:30
Deepesh Garg
a015fcc921 fix: Ledger entries on LIA for term loans 
(cherry picked from commit 1aa12fb3f1)
 2022-02-21 08:55:36 +00:00
Deepesh Garg
130f039549 fix: Ledger entries on LIA for term loans 
(cherry picked from commit 1aa12fb3f1)
 2022-02-21 08:54:58 +00:00
mergify[bot]
14c5be7c27 chore: Show 'Produced Qty' field in Sales Order Item (#29903) (#29904) 
(cherry picked from commit e952cce17d)

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2022-02-21 14:23:52 +05:30
Saqib Ansari
2aba6c38b3 fix: cannot edit valutaion_rate in asset repair 2022-02-21 14:01:12 +05:30
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