nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-17 08:35:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,909 Commits 401 Branches 1,698 Tags
46ed9a059c9384b65500cc28c19eef5f2c50a70a
Commit Graph

38909 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Subin Tom
46ed9a059c fix: Taxjar minor fixes 
(cherry picked from commit 1682a26fe6)
 2022-02-22 14:08:52 +00:00
Saqib Ansari
945a685a34 Merge pull request #29937 from frappe/mergify/bp/version-13-hotfix/pr-29900 
fix(asset): no. of depr booked cannot be equal to total no. of depr (backport #29900)
 2022-02-22 18:45:01 +05:30
mergify[bot]
807997c6ec fix: remove customer field value when MR is not customer provided (#29938) (#29941) 
(cherry picked from commit 7f55226a58)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-02-22 18:20:59 +05:30
Saqib Ansari
b6d42ff571 test: number_of_depr_booked = total_number_of_depr 
(cherry picked from commit 780694f6e2)
 2022-02-22 08:54:16 +00:00
Saqib Ansari
2e6a076f90 fix(asset): no. of depreciation booked cannot be equal to total no. of depreciations 
(cherry picked from commit c5808543c8)
 2022-02-22 08:54:16 +00:00
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
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
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
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
a6fba24ab1 fix: Total Credit amount in TDS Payable monthly report 
(cherry picked from commit a82cf7214e)
 2022-02-21 10:05:23 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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