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,162 Commits 398 Branches 1,698 Tags
15413cf8355b780c7597ffc04934f798e522263e
Commit Graph

39162 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rucha Mahabal
15413cf835 fix: Non Profit fixes (#30280) 2022-03-17 12:52:02 +05:30
mergify[bot]
0becc1e231 refactor: call repost directly during tests (#30277) (#30279) 
enqueue(now=frappe.flags.in_test) is always true in test, this change avoids
confusion.

(cherry picked from commit 76187d175f)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-03-16 23:01:38 +05:30
mergify[bot]
64b646050e refactor: removed unrequired code and test for standalone delivery note serial return (#30276) (#30278) 
(cherry picked from commit 2a0ca7c91a)

Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>
 2022-03-16 19:51:22 +05:30
Ankush Menat
f3af5dd384 test: packed item return scenarios 
(cherry picked from commit b46d6e3c05)
 2022-03-16 14:02:17 +05:30
Ankush Menat
cde3c685ee revert: "fix: updated packed_items getting fetched on Sales Return / Credit Note (#28607)" 
This reverts commit 20216fa9f1.

(cherry picked from commit b781e8b7d1)
 2022-03-16 14:02:17 +05:30
Saqib Ansari
b8fc06f633 Merge pull request #30270 from frappe/mergify/bp/version-13-hotfix/pr-30269 
fix: Do not update ignore pricing rule check implicitly (backport #30269)
 2022-03-16 13:01:54 +05:30
Saqib Ansari
461506a7ff Merge pull request #30267 from frappe/mergify/bp/version-13-hotfix/pr-30265 
feat: add German translations (backport #30265)
 2022-03-16 13:01:32 +05:30
Deepesh Garg
f27fd605f5 fix: Do not update ignore prcing rule check implicitly 
(cherry picked from commit 1f79b47a17)
 2022-03-16 07:03:16 +00:00
Saqib Ansari
3bcef50b15 Merge pull request #30262 from frappe/mergify/bp/version-13-hotfix/pr-30244 
fix: incorrect debit credit amount in presentation currency (backport #30244)
 2022-03-16 10:55:04 +05:30
Samuel Danieli
29fa902b33 feat: add German translations 
(cherry picked from commit bbe5739547)
 2022-03-16 05:24:45 +00:00
Saqib Ansari
510668f78a test: foreign_account_balance_after_exchange_rate_revaluation 
(cherry picked from commit 12d99ed69a)
 2022-03-15 13:10:27 +00:00
Saqib Ansari
8663a776dd fix: incorrect debit credit amount in presentation currency 
(cherry picked from commit 83a5fae591)
 2022-03-15 13:10:26 +00:00
Marica
69bf64e238 Merge pull request #30259 from frappe/mergify/bp/version-13-hotfix/pr-30258 
fix: Sub-Category Routing in Item Group Page Listing pills (backport #30258)
 2022-03-15 17:47:40 +05:30
marination
a56fd20ab4 fix: Sub-Categpry Routing in Item Group Page Listing pills 
- Use absolute route even 3-4 sub-category levels down
- Remove scroll from category pills due to accessibility issues
- Arrange sub-category pills alphabetically

(cherry picked from commit 8264d6b0bc)
 2022-03-15 12:00:33 +00:00
mergify[bot]
2c5e76d542 fix(pos): loyalty points in case of returned pos invoice (#30257) 2022-03-15 17:28:21 +05:30
rohitwaghchaure
5d458d6eb7 Merge pull request #30243 from akurungadam/jc-fix 
fix: Job Card sub operations status and list view
 2022-03-15 15:20:56 +05:30
mergify[bot]
6ef08545b6 fix: Leave Policy Assignment creation patch (backport #30215) (#30252) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2022-03-15 12:24:08 +05:30
mergify[bot]
0133b2a145 fix: salary slip amount rounding errors (backport #30248) (#30251) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2022-03-15 11:41:38 +05:30
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
Anoop Kurungadam
7b8723445e fix: job card - sub operations table status misbehaviour on pause / resume Job Card 2022-03-14 19:34:18 +05:30
Anoop Kurungadam
fa32fc3c83 fix: show status in job card list view in Draft mode 2022-03-14 19:33:58 +05:30
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