nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-16 16:15:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
39,142 Commits 398 Branches 1,698 Tags
f48caf49447cd7a4bd6e2ae032f91298971eb751
Commit Graph

39142 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepesh Garg
f48caf4944 Merge pull request #30246 from frappe/mergify/bp/version-13-hotfix/pr-30230 
fix: KSA E-Invoice QR Code showing wrong VAT amount (backport #30230)
 2022-03-15 09:49:55 +05:30
Deepesh Garg
5e4ab346c7 Merge pull request #30245 from frappe/mergify/bp/version-13-hotfix/pr-30206 
fix: Do not update ignore prcing rule check implicitly (backport #30206)
 2022-03-15 09:49:35 +05:30
Deepesh Garg
ec92551f7c Update erpnext/regional/saudi_arabia/utils.py 
Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com>
(cherry picked from commit e33d4713cd)
 2022-03-14 16:17:46 +00:00
Deepesh Garg
c5de90320f fix: Itemised tax rate updation 
(cherry picked from commit be56efad26)
 2022-03-14 16:17:46 +00:00
Deepesh Garg
fc298770e9 fix: Linting Issue 
(cherry picked from commit 3cc2e53b08)
 2022-03-14 16:17:46 +00:00
Deepesh Garg
8b077106f9 fix: KSA E-Invoice QR Code showing wrong VAT amount 
(cherry picked from commit b37559c535)
 2022-03-14 16:17:45 +00:00
Deepesh Garg
b0e178a29d fix: Do not update ignore prcing rule check implicitly 
(cherry picked from commit 96b5cedcf8)
 2022-03-14 16:16:50 +00:00
Ankush Menat
1dbb654500 test: refactor BOM quality template test 2022-03-14 18:56:33 +05:30
Florian HENRY
d8de8caa1e fix: BOM - clear Quality Inspection Template according to Inspection Quality Required 
Squashed commit of the following:

commit b73fa210b234d2c8067db2c32f94f362b89afe5a
Author: Florian HENRY <florian.henry@open-concept.pro>
Date:   Mon Mar 14 08:30:24 2022 +0100

    add json tes

commit 984d015a7d9aceb6ea64be7ed9f1cc0caa356714
Author: Florian HENRY <florian.henry@open-concept.pro>
Date:   Mon Mar 14 08:30:06 2022 +0100

    better test

commit 42061146658598da02eda7cb781bd2cf44c8ca34
Author: Florian HENRY <florian.henry@open-concept.pro>
Date:   Fri Mar 11 16:12:57 2022 +0100

    update test

commit 6259c0957566600b044fcd4a5e14e69cdff71020
Author: Florian HENRY <florian.henry@open-concept.pro>
Date:   Fri Mar 11 13:59:13 2022 +0100

    update test

commit cbc4ad9566f6f7f01dd622651458fea309d80954
Merge: faa44b3fdd 94d0f8d4e7
Author: Florian HENRY <florian.henry@open-concept.pro>
Date:   Fri Mar 11 12:46:48 2022 +0100

    Merge branch 'develop' of https://github.com/frappe/erpnext into dev_fix_30190

commit faa44b3fdd983adfc04bbf04a7ebfef114501bb3
Author: Florian HENRY <florian.henry@open-concept.pro>
Date:   Fri Mar 11 12:03:35 2022 +0100

    fix: clear Quality Inspection Template according to Inspection Quality Required
 2022-03-14 18:56:33 +05:30
mergify[bot]
767a02cd15 fix: cannot create multicurrency sales order with product bundles (#30222) 2022-03-14 18:33:42 +05:30
mergify[bot]
34d6031601 fix(pos): do not reset mode of payments in case of consolidation (backport #30198) (#30218) 2022-03-14 18:30:41 +05:30
Marica
9b2cb23b22 Merge pull request #30232 from frappe/mergify/bp/version-13-hotfix/pr-30229 
fix: Add missing currency option in Supplier Quotation's `rounded_total` field (backport #30229)
 2022-03-14 17:22:06 +05:30
Ankush Menat
2d8bbf1112 Merge pull request #30237 from frappe/mergify/bp/version-13-hotfix/pr-30207 
fix: Do not consider cancelled entries (backport #30207)
 2022-03-14 17:20:46 +05:30
Deepesh Garg
f23810749d fix: Do not consider cancelled entries 
(cherry picked from commit 6308e1be91)
 2022-03-14 11:49:53 +00:00
Ankush Menat
4768f4f278 fix(ux): negative stock warning 
(cherry picked from commit 02d64a32c2)
 2022-03-14 17:18:06 +05:30
Ankush Menat
aab677c26f Merge pull request #30216 from s-aga-r/fix/production-plan/validation/max_qty 
fix: max_qty validation condition in WO
 2022-03-14 17:08:21 +05:30
marination
d5b142e5ca chore: Re-arrange fields for consistency with base currency LHS 
(cherry picked from commit a579a211fd)
 2022-03-14 11:31:19 +00:00
marination
017624c270 fix: Add missing currency option in Supplier Quotation's rounded_total field 
(cherry picked from commit dcd88ddc87)
 2022-03-14 11:31:19 +00:00
Sagar Sharma
b22bdc5ff7 test: add test for planned_qty 2022-03-14 16:28:23 +05:30
Ankush Menat
1fd96f379f test(refactor): use FrappeTestCase 
(cherry picked from commit b0d1e6db54)
 2022-03-14 16:20:04 +05:30
mergify[bot]
2e79c4fd59 fix(ux): remove get item buttons from submitted production plan (#30224) 
(cherry picked from commit 1af13ca4bf)

fix(patch): remove dead links to ProdPlan Item

(cherry picked from commit d3e90ed8c8)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-03-14 15:17:46 +05:30
Ankush Menat
468964a3f7 ci: Revert fail on merge conflict label 
This reverts commit d32f229483.
 2022-03-14 14:43:15 +05:30
Nabin Hait
98a67967a3 fix: Search query of payroll entry reference in Journal Entry (#30225) 2022-03-14 14:40:00 +05:30
Saqib Ansari
75061cae66 Merge pull request #30220 from nextchamp-saqib/backport-#26872 
fix: pos return payment mode issue (#26872)
 2022-03-14 13:41:41 +05:30
Subin Tom
a1c9d1c67f fix: pos return payment mode issue (#26872) 2022-03-14 12:53:26 +05:30
Deepesh Garg
2e10e9ec33 Merge pull request #30210 from frappe/mergify/bp/version-13-hotfix/pr-30039 
fix: Nil and Exempted values in GSTR-3B Report (backport #30039)
 2022-03-14 12:51:31 +05:30
Deepesh Garg
5c285bc019 Merge pull request #30211 from frappe/mergify/bp/version-13-hotfix/pr-29979 
fix: Multi-currency bank reconciliation fixes (backport #29979)
 2022-03-14 12:51:14 +05:30
Ankush Menat
7aca949a33 fix(ux): skip items without batch series 
(cherry picked from commit 941ea1ec74)
 2022-03-14 12:50:59 +05:30
Ankush Menat
aadc2a8849 test: negative fifo test 
(cherry picked from commit 91fd9d917a)
 2022-03-14 12:50:59 +05:30
Saqib Ansari
1120a0f72f Merge pull request #30219 from frappe/mergify/bp/version-13-hotfix/pr-30217 
fix: cannot create purchase order from sales order (backport #30217)
 2022-03-14 12:45:51 +05:30
Saqib Ansari
1cee08f3e9 fix: cannot create purchase order from sales order 
(cherry picked from commit 58804b8436)
 2022-03-14 07:05:59 +00:00
Sagar Sharma
d198c488a4 fix: max_qty validation condition 2022-03-14 12:05:34 +05:30
Ankush Menat
fc257fa58d test: actual bom naming test 
(cherry picked from commit 94d0f8d4e7)
 2022-03-14 09:58:14 +05:30
Rohan Bansal
c8ca92e406 fix: cancelled document check 
(cherry picked from commit 67d8a7ba86)
 2022-03-14 09:58:14 +05:30
Ankush Menat
1a2a03ed98 refactor: split versioning code for testability 
(cherry picked from commit 6b58d53403)
 2022-03-14 09:58:14 +05:30
Rohan Bansal
6a031a87da fix: improve bom autoname logic 
(cherry picked from commit 7f2670941c)
 2022-03-14 09:58:14 +05:30
Ankush Menat
25df914bc6 test: bom for item_code that is >VARCHAR_LEN 
(cherry picked from commit e2c99e02a9)
 2022-03-14 09:58:14 +05:30
Rohan Bansal
404a82121d fix: if an item code is too long, truncate before setting BOM name 
(cherry picked from commit d9c91748f4)
 2022-03-14 09:58:14 +05:30
Rucha Mahabal
164d28a87a Merge pull request #30212 from frappe/mergify/bp/version-13-hotfix/pr-29439 2022-03-13 21:46:50 +05:30
Rucha Mahabal
465c117708 fix: conflicts 2022-03-13 21:05:06 +05:30
Rucha Mahabal
d50dbca844 fix: flaky tests 
(cherry picked from commit d61c437588)
 2022-03-13 15:26:33 +00:00
Rucha Mahabal
70febe468b fix: add more type hints 
(cherry picked from commit 558650bc3a)
 2022-03-13 15:26:33 +00:00
Rucha Mahabal
9449d11a4c fix: simplify insufficient leave balance message 
(cherry picked from commit 8173e6a8ea)
 2022-03-13 15:26:32 +00:00
Rucha Mahabal
c66a66e090 fix: conflicts 
(cherry picked from commit b2c549a464)
 2022-03-13 15:26:32 +00:00
Rucha Mahabal
d4301675d1 chore: linter issue 
(cherry picked from commit 921d6b25d7)
 2022-03-13 15:26:32 +00:00
Rucha Mahabal
fab0153e34 test: separate leave ledger entries for leave applications across allocations 
(cherry picked from commit 97b7b5012e)
 2022-03-13 15:26:31 +00:00
Rucha Mahabal
75833243ae fix: boundary determination for separate ledger entries 
(cherry picked from commit 70239158b9)
 2022-03-13 15:26:31 +00:00
Rucha Mahabal
b63cedc7d7 test: leave application validations 
(cherry picked from commit 6755d6e6f5)
 2022-03-13 15:26:31 +00:00
Rucha Mahabal
bfedac47e6 fix: clearer validation/warning messages for insufficient balance in leave application 
(cherry picked from commit a504ffcc4c)
 2022-03-13 15:26:31 +00:00
Rucha Mahabal
a30ec8bef6 feat: split ledger entries for applications created across allocations 
- fix: ledger entry for expiring cf leaves not considering holidays

(cherry picked from commit c0f1e269e4)
 2022-03-13 15:26:31 +00:00