Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
41,182 Commits 3 Branches 0 Tags 1 GiB
c122882884
Commit Graph

41182 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepesh Garg
8819ba07a9
Merge pull request #30266 from deepeshgarg007/expense_income_account_validation 
fix: Validate income/expense account in sales and purchase invoice
 2022-03-17 18:32:34 +05:30
Deepesh Garg
5390d5e65a
Merge branch 'develop' into mergify/bp/develop/pr-30284 2022-03-17 18:02:57 +05:30
Deepesh Garg
4237e5d928 fix: Test case 2022-03-17 18:00:39 +05:30
Deepesh Garg
a651a0ffc8
Merge pull request #30261 from deepeshgarg007/bank_reco_error 
fix: Error in bank reconciliation statement
 2022-03-17 17:29:15 +05:30
Deepesh Garg
5f89cb2cca fix: Remove comments 
(cherry picked from commit cab69fe1f298b44613be21c06591e868c24ee249)
 2022-03-17 11:57:50 +00:00
Deepesh Garg
2dd0e20003 fix: Clean and fixes in Dimension-wise Accounts Balance Report 
(cherry picked from commit 08a06ce5c68023c41f53b584082b5e1c4ddb1f59)
 2022-03-17 11:57:50 +00:00
rohitwaghchaure
da16ee159a
Merge pull request #30238 from KrithiRamani/bulk_create_PL_and_DN 
feat: Create single PL/DN from several SO.
 2022-03-17 15:39:45 +05:30
Rucha Mahabal
f090e63e54
test: fix holiday list creation causing flaky tests (#30260) 2022-03-17 15:21:56 +05:30
Saqib Ansari
119273e633 fix: custom cash flow mapper doesn't show any data 2022-03-17 14:47:50 +05:30
Ankush Menat
76187d175f
refactor: call repost directly during tests (#30277) 
enqueue(now=frappe.flags.in_test) is always true in test, this change avoids
confusion.
 2022-03-16 19:50:56 +05:30
Noah Jacob
2a0ca7c91a
refactor: removed unrequired code and test for standalone delivery note serial return (#30276) 2022-03-16 19:27:47 +05:30
Ankush Menat
b93ce78df1 chore: dont supress errors server side 
not required after https://github.com/frappe/frappe/pull/16284
 2022-03-16 17:50:34 +05:30
Krithi Ramani
a12895ec03 corrected spacing 2022-03-16 13:56:54 +05:30
Ankush Menat
b46d6e3c05 test: packed item return scenarios 2022-03-16 13:36:53 +05:30
Ankush Menat
b781e8b7d1 revert: "fix: updated packed_items getting fetched on Sales Return / Credit Note (#28607)" 
This reverts commit 20216fa9f1.
 2022-03-16 13:36:53 +05:30
Deepesh Garg
2958f60b46
Merge pull request #30269 from deepeshgarg007/implicit_pricing_rule_enable_v2 
fix: Do not update ignore pricing rule check implicitly
 2022-03-16 12:32:25 +05:30
Krithi Ramani
0211f27e83 as per review comments - changed for loop 2022-03-16 12:28:30 +05:30
Deepesh Garg
1f79b47a17 fix: Do not update ignore prcing rule check implicitly 2022-03-16 11:55:43 +05:30
Saqib Ansari
e9e2679dff
Merge pull request #29984 from dj12djdjs/fix-rename-tool-msg 
fix: rename tool show fail message
 2022-03-16 10:57:17 +05:30
Saqib Ansari
e1edf50756
Merge pull request #30265 from scdanieli/patch-1 
feat: add German translations
 2022-03-16 10:54:24 +05:30
Saqib Ansari
597bb2c7e8
feat: safely parse exception 2022-03-16 10:53:39 +05:30
Deepesh Garg
06936cf1c0 fix: Validate income/expense account in sales and purchase invoice 2022-03-16 09:02:04 +05:30
Krithi Ramani
e970616b51 removed semicolon for break statement 2022-03-15 21:52:34 +05:30
Krithi Ramani
9f7fee7a4f Added new field in SO - % Picked 2022-03-15 21:40:51 +05:30
Samuel Danieli
bbe5739547
feat: add German translations 2022-03-15 17:03:30 +01:00
Krithi Ramani
a68213d82e added new field - Picked Qty, in Sales Order Item 2022-03-15 20:18:23 +05:30
Saqib Ansari
1797b6013e
Merge pull request #30244 from nextchamp-saqib/fix-gl-representation 
fix: incorrect debit credit amount in presentation currency
 2022-03-15 18:39:37 +05:30
Deepesh Garg
fbcb413d96 fix: Error in bank reco statement 2022-03-15 18:20:11 +05:30
Saqib Ansari
12d99ed69a test: foreign_account_balance_after_exchange_rate_revaluation 2022-03-15 17:56:42 +05:30
Marica
b73948660a
Merge pull request #30258 from marination/sub-category-routing 
fix: Sub-Category Routing in Item Group Page Listing pills
 2022-03-15 17:29:39 +05:30
marination
8264d6b0bc 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
 2022-03-15 16:53:46 +05:30
Saqib Ansari
7b0a97d679
fix(pos): loyalty points in case of returned pos invoice (#30242) 2022-03-15 15:54:37 +05:30
mergify[bot]
e8310c6dec
fix: Job Card sub operations status and list view (backport #30243) (#30256) 
* fix: show status in job card list view in Draft mode

(cherry picked from commit fa32fc3c832196004154055ac1b2334d6202c261)

* fix: job card - sub operations table status misbehaviour on pause / resume Job Card

(cherry picked from commit 7b8723445ee695e88590bb833f60a0c4731106fa)

Co-authored-by: Anoop Kurungadam <anoop@earthianslive.com>
 2022-03-15 15:48:15 +05:30
Krithi Ramani
f33a725a9e fixed spacings 2022-03-15 15:35:51 +05:30
Rucha Mahabal
3218ccbb96
fix: Leave Policy Assignment creation patch (#30215) 2022-03-15 11:43:27 +05:30
Rucha Mahabal
b03b9ac99f
fix: salary slip amount rounding errors (#30248) 2022-03-15 11:39:15 +05:30
Deepesh Garg
8add8eb058
Merge pull request #30230 from deepeshgarg007/vat_amount_in_ksa 
fix: KSA E-Invoice QR Code showing wrong VAT amount
 2022-03-14 21:47:22 +05:30
Deepesh Garg
07715118cf
Merge pull request #30206 from deepeshgarg007/implicit_pricing_rule_enable 
fix: Do not update ignore prcing rule check implicitly
 2022-03-14 21:46:24 +05:30
Saqib Ansari
83a5fae591 fix: incorrect debit credit amount in presentation currency 2022-03-14 20:14:46 +05:30
Deepesh Garg
e33d4713cd
Update erpnext/regional/saudi_arabia/utils.py 
Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com>
 2022-03-14 18:35:49 +05:30
Ankush Menat
8e559f01c8 test: refactor BOM quality template test 2022-03-14 18:28:08 +05:30
Ankush Menat
dc257665f1 ci: allow stable branch merge for release 
[skip ci]
 2022-03-14 18:25:13 +05:30
Florian HENRY
9415229e8d 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:25:00 +05:30
Ankush Menat
f1a7e3b9ad ci: skip tests on CSV 
[skip ci]
 2022-03-14 18:22:07 +05:30
Wolfram Schmidt
7537dac2a4 fix: translation for accounting 
"Aufwand" rather than "Auslage". This is commonly used in accounting.
 2022-03-14 18:22:07 +05:30
Deepesh Garg
1faca0eb5a
Merge branch 'develop' into vat_amount_in_ksa 2022-03-14 17:36:16 +05:30
Krithi Ramani
466df6bdb7 to enable selection of SO irrespective of customer,removed validation for customer 2022-03-14 17:29:02 +05:30
Ankush Menat
07712af357
Merge pull request #30233 from frappe/mergify/copy/develop/pr-30216 
fix: max_qty validation condition in WO (copy #30216)
 2022-03-14 17:22:30 +05:30
Krithi Ramani
61eb9b6c68 feat: Create single PL/DN from several SO. New PR from latest develop to avoid rebase 2022-03-14 17:20:49 +05:30
Deepesh Garg
25a128220a
Merge pull request #30207 from deepeshgarg007/trail_balance_for_party 
fix: Do not consider cancelled entries
 2022-03-14 17:19:34 +05:30