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

30761 Commits

Author SHA1 Message Date
Ankush Menat
c56d07dee3 fix: consider packed items too when reposting 2022-02-07 22:55:56 +05:30
Ritwik Puri
72a812f18b
fix: use item_code instead of parent field in bom_stock_calculated report (#29684) 2022-02-07 19:43:29 +05:30
Deepesh Garg
8417130788
Merge pull request #29660 from abhinavxd/patch-1 
fix: Add missing key in Loan
 2022-02-07 18:44:37 +05:30
Deepesh Garg
ef69d1fd38 test: Add test case for repayment against partially disbursed loans 2022-02-07 17:00:30 +05:30
Deepesh Garg
fab7f90e8f
Merge pull request #29460 from deepeshgarg007/loan_refund_jv 
feat: Refund entry against loans
 2022-02-07 14:37:47 +05:30
Deepesh Garg
8ece2845f2 fix: Add disbursement accounts to tests 2022-02-07 13:50:31 +05:30
Ankush Menat
5e6227e3d8
fix(ux): make stock entry type the title field (#29674) 2022-02-07 13:19:08 +05:30
Deepesh Garg
8d7331de8f Merge branch 'develop' of https://github.com/frappe/erpnext into loan_refund_jv 2022-02-07 12:49:34 +05:30
Deepesh Garg
cec971b5db
Merge pull request #29349 from alyf-de/disable-item-tax-category 
feat: option to disable Item Tax Template and Tax Category
 2022-02-07 11:01:03 +05:30
Umair Sayed
104a55aff1
feat: Tab views in Stocks and Accounts Settings (#29638) 
* tab views in Stocks and Accounts Settings. Clean-up in Selling and Buying Settings.

* chore: undo changes to creation timestamp

happened because of a bug in fw

Co-authored-by: Umair Sayed <umairsayed@Umairs-MacBook-Air-2.local>
 2022-02-07 10:42:55 +05:30
Deepesh Garg
36f4fb0585 fix: Incorrect tax template in Sales Invocie via data import 
(cherry picked from commit 20f321a88980d231f52702e3d32e122022316152)
 2022-02-06 16:24:26 +00:00
Deepesh Garg
0b9c066ef7
Merge pull request #29609 from deepeshgarg007/gstr_3b_export_zero_rated 
fix: Zero rated exports in GSTR-3B report
 2022-02-06 19:34:21 +05:30
Deepesh Garg
81b967851a
Merge pull request #29601 from deepeshgarg007/provisonal_loss_bs 
fix: Incorrect provisional profit and loss in balance sheet
 2022-02-06 19:33:12 +05:30
Deepesh Garg
5d09678954
Merge pull request #29659 from deepeshgarg007/zero_amount_status 
fix: Billing status for zero amount ref doc
 2022-02-06 19:22:31 +05:30
Deepesh Garg
8ff32da9bd
Merge branch 'develop' into gstr_3b_export_zero_rated 2022-02-06 19:11:03 +05:30
Ankush Menat
6459ceaea1 fix: dont show cancelled PO items in plan report 2022-02-06 19:05:12 +05:30
Deepesh Garg
3e6fade08d
Merge pull request #29641 from deepeshgarg007/jv_cancel_ignore 
fix: Ignore linked invoices on Journal Entry cancel
 2022-02-06 18:57:13 +05:30
Abhinav Raut
d0043bdbac fix: missing key in loan 2022-02-06 16:55:24 +05:30
Deepesh Garg
c5726fd3da fix: Add test case 2022-02-06 11:35:40 +05:30
Deepesh Garg
d679692472 fix: Billing status for zero amount ref doc 2022-02-06 11:35:23 +05:30
Ankush Menat
69c65afd72 test: regression test for LCV GL entries 2022-02-05 20:58:56 +05:30
Ankush Menat
8858c703a8 fix: ignore cancelled svd while updating GLE for PR 
This happens because LCV cancels and reposts entries so unless filtered
by non-cancelled entries you can randomly get old values.
 2022-02-05 20:58:56 +05:30
Marica
a49b755773
Merge branch 'develop' into packed-items-new-doc 2022-02-04 22:58:21 +05:30
Raffael Meyer
b5242df15b
Merge branch 'develop' into disable-item-tax-category 2022-02-04 18:10:39 +01:00
Rucha Mahabal
65923bd856
fix: enable Allow on Submit for 'Is Active' field in Salary Structure (#29630) 2022-02-04 22:34:11 +05:30
marination
bd41a99c8a fix: Regenerate packed items on newly mapped doc 
- Cannot determine action on newly mapped DN that hasnt been inserted
- Rows could have been deleted, updated, added, etc. before first save
- In this case , reset packing table
 2022-02-04 22:06:56 +05:30
Deepesh Garg
6f7ae62907 fix: Ignore linked invoices on Journal Entry cancel 2022-02-04 20:13:20 +05:30
Marica
79ab8e6459
Merge pull request #29456 from marination/product-bundle-packing-list-logic 
fix: Incorrect packing list for recurring items & code cleanup
 2022-02-03 22:09:52 +05:30
Marica
5e5a18f17c
Merge branch 'develop' into fix-web-portal 2022-02-03 21:59:57 +05:30
marination
017a882f90 fix: Remove cart.js from erpnext-web bundle 
- Due to it being in the bundle, controls bundle was required for Dialogs used in cart
- But this is exclusively used in `cart.html`
- It has no reason to load and break the login page
- Moved it back to where the html is, it is now back to being tightly coupled with its html
 2022-02-03 21:34:48 +05:30
Suraj Shetty
e652ab5f05 fix: Load control & dialog assets with cart.js 
Previously, control & dialog assets were getting loaded only on visiting "/cart", but since cart.js sets up various events on homepage, dialog related assets are required up-front.
 2022-02-03 20:06:24 +05:30
Wolfram Schmidt
68cea75909
chore: update de.csv #29575 
added missing translations in Company Master

Co-authored-by: Wolfram Schmidt <wolfram.schmidt@tueit.de>

[skip ci]
 2022-02-03 20:05:11 +05:30
Wolfram Schmidt
af7570410e
chore: update de.csv (#29624) 
minor translation error

[skip ci]
 2022-02-03 20:04:24 +05:30
Ankush Menat
ba847ef218
Merge branch 'develop' into provisonal_loss_bs 2022-02-03 17:18:00 +05:30
Ankush Menat
04f6426dbf
feat: show stock value difference in stock ledger report (#29607) 2022-02-03 17:14:57 +05:30
marination
f18ec2d947 fix: (Linter) import sequence 2022-02-03 17:07:11 +05:30
Marica
e9fc6c3249
Merge branch 'develop' into product-bundle-packing-list-logic 2022-02-03 17:02:57 +05:30
marination
4e7b4dc9a8 test: Packed Items test file 2022-02-03 17:01:33 +05:30
Ankush Menat
9b60e3f187
fix: default qty if not found 2022-02-03 15:26:57 +05:30
Sagar Sharma
be09551cfa test: add test case for multiple WO 
(cherry picked from commit 36609c50c0332498ee088e6f44759f7c2747c733)
 2022-02-03 09:50:08 +00:00
Sagar Sharma
360a06b9ba fix: ordered_qty for production-plan-item 
(cherry picked from commit 4e58c1da3ac1649d64377d53aec68e489a4a9d41)
 2022-02-03 09:50:07 +00:00
Ankush Menat
551f2967da
Merge pull request #27923 from marination/e-commerce-refactor-develop 
refactor: E-commerce (port to develop)
 2022-02-03 14:14:08 +05:30
gavin
7eb9dc01f8 fix: Ignore mandatory fields if exist (#27871) 
The goal of this fix is to not break the patch in case of customizations
In this particular case, it's regarding a customized Note DocType with
multiple custom mandatory fields
 2022-02-03 14:08:32 +05:30
Ankush Menat
bd3b47fd50 fix: remove stale doctypes and add msg for ecommerce refactor (#27700) 2022-02-03 14:06:31 +05:30
marination
f97642e975 fix: Qb query, use isin instead of in and access fields without dot notation due to reserved pypika keywords 2022-02-03 14:03:17 +05:30
Ankush Menat
41a95e5624
fix: ignore empty customer/supplier in item query (#29610) 
* fix: dont try to filter by customer/supplier if None

* test: item query with emtpy supplier
 2022-02-03 13:02:13 +05:30
marination
f47db26fa6 fix: Cart buttons not working 
- Add cart.js to web bundle
- Hide icon conditionally since now this file loads on every single page
 2022-02-03 12:54:59 +05:30
Deepesh Garg
233e6449fc fix: Zero rated exports in GSTR-3B report 2022-02-03 12:13:43 +05:30
Deepesh Garg
ed2c6b6637 fix: Incorrect provisional profit and loss in balance sheet 2022-02-02 22:36:45 +05:30
Marica
384e6b559b
Merge branch 'develop' into e-commerce-refactor-develop 2022-02-02 21:10:04 +05:30