Anupam Kumar
b37bc7252d
Merge branch 'develop' into crm-carry-forward-communication-comments
2021-12-21 15:48:41 +05:30
Development for People
076cb408db
fix: missed colon ( #28979 )
2021-12-21 15:48:31 +05:30
Anupam Kumar
27448b9009
Merge branch 'develop' into crm-carry-forward-communication-comments
2021-12-21 15:47:33 +05:30
Anupam
2abbf20da1
fix: test case
2021-12-21 14:13:40 +05:30
Ganga Manoj
1ed30ee7c7
fix: Reset value_after_depreciation on reversing journal entry during Asset return
2021-12-21 13:59:53 +05:30
Saqib
93068733d6
feat: new column 'Time taken to Deliver' in sales order analysis ( #28842 )
2021-12-21 13:58:48 +05:30
Deepesh Garg
98ac47caa4
fix: Add is reverse charge in country wise tax
...
(cherry picked from commit 7e912db4b13ee2b1b88a68fc6110eb527a0375d5)
2021-12-21 08:12:09 +00:00
Deepesh Garg
cbef04fded
chore: Remove patch comment
...
(cherry picked from commit 7c1bfe6b46ac3deedacfa666d0695b53b86ec3f6)
# Conflicts:
# erpnext/patches.txt
2021-12-21 08:12:08 +00:00
Deepesh Garg
12a65eef8a
fix: Is Reverse Charge check in Tax Category
...
(cherry picked from commit b33fd6acc769dbfaa43c665c19f378e8e041d010)
# Conflicts:
# erpnext/patches.txt
2021-12-21 08:12:08 +00:00
Anupam
107b405560
fix: test case
2021-12-21 13:35:15 +05:30
Marica
d7c4b8a383
Merge branch 'develop' into independent-manu-entry
2021-12-21 12:55:12 +05:30
Anupam Kumar
c847130ae9
Merge branch 'develop' into crm-carry-forward-communication-comments
2021-12-21 12:52:09 +05:30
marination
24a35c69c0
fix: Sider and Server side test
...
- args passed to wrong function
- missing space around '='
2021-12-21 12:52:03 +05:30
Saqib
da67403bbd
Merge branch 'develop' into so-days-taken-to-deliver
2021-12-21 12:41:48 +05:30
Subin Tom
98d417602f
fix: Added filter for dispatch address ( #28937 )
2021-12-21 12:35:44 +05:30
Anupam Kumar
a8637cc7b8
Merge branch 'develop' into crm-carry-forward-communication-comments
2021-12-21 11:27:47 +05:30
Anupam
e4ee55c9b9
fix: test case
2021-12-21 11:26:53 +05:30
Rucha Mahabal
92e86f2f09
fix: fetch appointment letter content in the same order as template ( #28968 )
2021-12-20 22:56:15 +05:30
Ankush Menat
d7148adee5
test: remove unnecessary creation of companies #28965
...
test: remove unnecessary creation of companies
2021-12-20 22:00:31 +05:30
Marica
d209e5d6c5
Merge branch 'develop' into independent-manu-entry
2021-12-20 21:55:38 +05:30
marination
8951a5c267
fix: Linter (imports)
2021-12-20 21:53:47 +05:30
marination
0f43792dbb
fix: Stock Ageing Report - Negative Opening Stock
...
- Consider negative opening stock in logic and neutralise it with +ve stock
- minor code refactor: class for FIFOSlots to generate chronological FIFO queue
2021-12-20 21:33:59 +05:30
Ankush Menat
2bb7bca464
test: bin qty on backdated SR
2021-12-20 20:05:49 +05:30
Ankush Menat
ff9a6e8e89
fix: correct bin qty on backdated transactions
...
When making a backdated transactions current balance qty depends on
evaluation of whole ledger inbetween, instead of doing that just fetch
the last sle's qty_after_transaction when future transactions are
detected against SLE
fix: don't update bin's actual_qty
1. it's already updated by repost_current_voucher
2. update if future sle exists
2021-12-20 20:05:49 +05:30
Anupam Kumar
66a10c0e73
Merge pull request #28440 from anupamvs/crm-lead-validate-cleanup-develop
...
fix: lead validate function cleanup
2021-12-20 18:12:57 +05:30
Deepesh Garg
c5c7777bd5
Merge pull request #28959 from deepeshgarg007/consolidated_balance_return_fix
...
fix: Error on viewing consolidated financial statement
2021-12-20 17:13:12 +05:30
Ankush Menat
f5d5281119
chore: drop deprecated qunit tests
2021-12-20 17:03:10 +05:30
Deepesh Garg
5d6199cf35
fix: Error on viewing consolidated financial statement
2021-12-20 16:54:52 +05:30
Anupam
c6a87125e9
feat: added forward communication comments check in CRM Settings
2021-12-20 14:14:44 +05:30
Anupam Kumar
ecafea9064
Merge branch 'develop' into crm-carry-forward-communication-comments
2021-12-20 13:37:00 +05:30
Pruthvi Patel
16a90d3e60
Update erpnext/controllers/accounts_controller.py
...
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
2021-12-20 13:24:19 +05:30
Pruthvi Patel
4d48ca4228
test: update_invoice_status
2021-12-20 13:23:14 +05:30
Ankush Menat
107b404105
chore: rename FifoValuation to FIFOValuation
2021-12-20 13:20:03 +05:30
Ankush Menat
745caf911a
perf: specify slots on FIFO queue
2021-12-20 13:20:03 +05:30
Ankush Menat
aa0e163b1f
test: hypothesis tests for FIFO queue
2021-12-20 13:20:03 +05:30
Ankush Menat
9d177433cb
fix: return consumed bin on collapsing queue
2021-12-20 13:20:03 +05:30
Ankush Menat
a00d8d02b2
refactor: outgoing rate and defaults for remove_stock
2021-12-20 13:20:03 +05:30
Ankush Menat
db1c0889d3
feat: get consumed bins from Fifo queue on pop
2021-12-20 13:20:03 +05:30
Ankush Menat
1833f7ab81
test: FifoValuation tests
2021-12-20 13:20:03 +05:30
Ankush Menat
e6e679cf7a
fix: round off if near zero while popping from queue
2021-12-20 13:20:03 +05:30
Ankush Menat
a71b476652
feat: repr, eq and iter for fifo queue
2021-12-20 13:20:03 +05:30
Ankush Menat
4b29fb6d08
refactor: move Fifo Valuation to a new class
2021-12-20 13:20:03 +05:30
Pruthvi Patel
0799f378b4
fix: consider Discounted status
2021-12-20 13:18:42 +05:30
Pruthvi Patel
6c96ed4e11
refactor: update_invoice_status with query builder
2021-12-20 13:18:42 +05:30
Anupam
0e0e4f723f
fix: test case
2021-12-20 09:48:40 +05:30
Anupam Kumar
87986aee39
Merge branch 'develop' into crm-carry-forward-communication-comments
2021-12-18 20:13:49 +05:30
Anupam
ba6a6bf391
Merge branch 'crm-carry-forward-communication-comments' of https://github.com/anupamvs/erpnext into crm-carry-forward-communication-comments
2021-12-18 20:13:18 +05:30
Anupam
5b40d9e7cd
fix: linter issues
2021-12-18 20:12:57 +05:30
Dany Robert
c68b2c3763
Merge branch 'develop' into currency-exchange-settings
2021-12-18 18:32:12 +05:30
Dany Robert
fb6bc05138
Merge branch 'develop' into ledger-merger
2021-12-18 17:06:31 +05:30
