schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
39,888 Commits 322 Branches 1,581 Tags
6c23dea71619e4bdbbb3872a2e0575f10696eee5
Commit Graph

39888 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepesh Garg
6c23dea716 fix: Revert rate calculation 
(cherry picked from commit 6937a498e7)
 2022-03-25 07:31:08 +00:00
Deepesh Garg
4737cb10f3 fix: Add back calculation for discount 
(cherry picked from commit 067564bd26)
 2022-03-25 07:31:07 +00:00
Deepesh Garg
13e73f6a38 fix: Rate change issue on save and mapping from other doc 
(cherry picked from commit 13fcda5776)
 2022-03-25 07:31:07 +00:00
Deepesh Garg
8fe9dbc75c Merge pull request #30368 from frappe/mergify/bp/version-13-pre-release/pr-30365 
fix: Changing item prices on converting orders/receipts to invoices (backport #30365)
 2022-03-23 14:17:56 +05:30
Deepesh Garg
41b2d98c3f fix: Check if onload property exists in the form object 2022-03-23 13:57:23 +05:30
Deepesh Garg
7d3cdf527b fix: Add ignore pricelist for missing flows 
(cherry picked from commit 405dcb1d3c)
 2022-03-23 04:40:53 +00:00
Deepesh Garg
a9533ef814 fix: Changing item prices on converting orders/receipts to invoices 
(cherry picked from commit 66ca085e39)
 2022-03-23 04:40:52 +00:00
mergify[bot]
684e83faac fix: Future recurring period calculation for additional salary (#29581) (#30329) 
* fix: Future recurring period calculation for addl salary

* fix: future recurring period calculation

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
(cherry picked from commit cedabd7242)

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2022-03-21 15:00:07 +05:30
mergify[bot]
2148e7e32d fix: Payment Request Amount calculation in case of multicurrency (#30254) (#30326) 
(cherry picked from commit 9abd22b408)

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2022-03-21 14:57:25 +05:30
Ankush Menat
230d171c58 chore: add change log for v13.23.0 2022-03-20 15:18:33 +05:30
Deepesh Garg
1c36b1a923 Merge pull request #30293 from frappe/mergify/bp/version-13-pre-release/pr-30284 
fix: Cleanup and fixes in Dimension-wise Accounts Balance Report (backport #30284)
 2022-03-18 17:37:12 +05:30
mergify[bot]
ec79e13b61 fix: respect db multi_tenancy while fetching precision (#30301) (#30303) 
[skip ci]

(cherry picked from commit 5a9bf9ffd6)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-03-18 17:32:09 +05:30
Deepesh Garg
6c23b306d9 Merge pull request #30297 from frappe/mergify/bp/version-13-pre-release/pr-30266 
fix: Validate income/expense account in sales and purchase invoice (backport #30266)
 2022-03-17 18:54:50 +05:30
Deepesh Garg
0269bc9191 fix: Test case 
(cherry picked from commit 4237e5d928)
 2022-03-17 13:03:41 +00:00
Deepesh Garg
c0183289f5 fix: Validate income/expense account in sales and purchase invoice 
(cherry picked from commit 06936cf1c0)
 2022-03-17 13:03:41 +00:00
Deepesh Garg
c20fc51921 Merge pull request #30294 from frappe/mergify/bp/version-13-pre-release/pr-30261 
fix: Error in bank reconciliation statement (backport #30261)
 2022-03-17 18:11:14 +05:30
Deepesh Garg
9e8b8305e9 fix: Error in bank reco statement 
(cherry picked from commit fbcb413d96)
 2022-03-17 12:00:05 +00:00
Deepesh Garg
fe88cfb80d fix: Remove comments 
(cherry picked from commit cab69fe1f2)
 2022-03-17 11:58:11 +00:00
Deepesh Garg
eac07238d9 fix: Clean and fixes in Dimension-wise Accounts Balance Report 
(cherry picked from commit 08a06ce5c6)
 2022-03-17 11:58:10 +00:00
Ankush Menat
d8b7693ea9 Merge pull request #30291 from ankush/13_23_pre_release 
chore: merge version-13-hotfix to version-13-pre-release
 2022-03-17 16:31:00 +05:30
mergify[bot]
3b1033c315 test: fix holiday list creation causing flaky tests (backport #30260) (#30288) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2022-03-17 15:39:02 +05:30
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