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
400b579f1a
Merge pull request #29670 from frappe/mergify/bp/develop/pr-29635
...
fix: Incorrect tax template in Sales Invoice via data import (backport #29635 )
2022-02-07 10:42:31 +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
Rucha Mahabal
4e3a13117e
Merge branch 'develop' into fix-earned-leaves-allocation
2022-02-06 20:31:48 +05:30
Rucha Mahabal
e25544f94e
fix(test): add ignore duplicates flag to allocation function
2022-02-06 20:30:46 +05:30
Ankush Menat
f089d39675
refactor: better method name
...
Co-authored-by: gavin <gavin18d@gmail.com>
2022-02-06 20:12:15 +05:30
Ankush Menat
3e5f940686
test: e2e test for LIFO valuation
2022-02-06 20:12:15 +05:30
Ankush Menat
61c5ad44d3
refactor: get incoming fifo/lifo rate functions
...
Re-use same logic for computing incoming rate.
2022-02-06 20:12:15 +05:30
Ankush Menat
97e18a1cd0
feat: allow selecting LIFO valuation
2022-02-06 20:12:11 +05:30
Ankush Menat
9c49d2d3aa
feat: LIFOValuation class for handling LIFO
2022-02-06 20:12:11 +05:30
Ankush Menat
b855030e7c
refactor: valuation class to allow extending
2022-02-06 20:12:11 +05:30
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
d1f5753885
test: check when PR moves stock from neg to pos
2022-02-05 23:35:28 +05:30
Ankush Menat
c88c368880
fix: dont ignore items that dont have SVD
...
When items go from negative to positive stock value diff can be zero but
item might have taxes / need divisional loss adjustment.
2022-02-05 22:54:18 +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
Rucha Mahabal
a52ba0a544
fix: linter
2022-02-05 16:40:55 +05:30
Rucha Mahabal
63ee4f1b64
test: earned leave allocation for passed months and allocation on month-end
2022-02-05 16:05:54 +05:30
Rucha Mahabal
25c7f850b1
fix: earned leaves not allocated if assignment is created on month-end
2022-02-05 16:05:46 +05:30
Marica
772336bb43
Merge pull request #29642 from marination/packed-items-new-doc
...
fix: Regenerate packed items on newly mapped doc
2022-02-04 23:00:10 +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
Saqib Ansari
9432d8edd1
Merge branch 'develop' into bug_invoice_creation_throws_typeerror
2022-02-04 10:20:43 +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
4d5749ba7d
Merge pull request #29625 from frappe/fix-web-portal
...
fix: Load control & dialog assets with `cart.js`
2022-02-03 22:04:33 +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
6f2c9c692c
ci: workflow dispatch options ( #29611 )
2022-02-03 17:30:42 +05:30
