Commit Graph

39730 Commits

Author SHA1 Message Date
Anupam
e7ac774bbc fix: review chnages 2021-12-24 14:12:53 +05:30
Anupam Kumar
662c412e8b Merge branch 'develop' into crm-carry-forward-communication-comments 2021-12-24 14:09:23 +05:30
Ankush Menat
7987a46509 chore: add running stock value difference in invariant report (#29012)
[skip ci]
2021-12-23 21:13:22 +05:30
Rucha Mahabal
ae929d7a63 fix(test): Leave Allocation validation against Leave Application after submit (#29005)
* fix(test): Leave Allocation validation against Leave Application after submit

* chore: clean-up Leave Allocation tests

* fix(test): set holiday list for leave allocation test
2021-12-23 19:18:05 +05:30
Anupam Kumar
f16a88e42c Merge branch 'develop' into crm-carry-forward-communication-comments 2021-12-23 03:02:58 +05:30
Saqib
f6d5534627 fix: set resolution by only if not on hold (#28995) 2021-12-22 19:05:18 +05:30
Ankush Menat
8dc1ce12d4 chore: simplify bug report form 2021-12-22 12:13:31 +05:30
Ankush Menat
db7aef2fef style: better labels for SLE fields (#28988)
* style: better labels for SLE fields

* style: rename stock queue field

[skip ci]

Co-Authored-by: marination <maricadsouza221197@gmail.com>
2021-12-21 17:39:27 +05:30
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
Anupam
107b405560 fix: test case 2021-12-21 13:35:15 +05:30
Anupam Kumar
c847130ae9 Merge branch 'develop' into crm-carry-forward-communication-comments 2021-12-21 12:52:09 +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
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
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
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
0ca467a28f fix: remove rounding of avg rating (#28945) 2021-12-18 16:16:47 +05:30
Anupam Kumar
321c95d024 Merge branch 'develop' into crm-carry-forward-communication-comments 2021-12-17 23:09:48 +05:30
Subin Tom
e85da7a03a fix: Add Invoice Number field to list view in Opening Inv Creation Tool (#28938) 2021-12-17 21:48:10 +05:30
Anupam Kumar
603b367568 Merge branch 'develop' into crm-carry-forward-communication-comments 2021-12-17 19:22:27 +05:30
Anupam
31ac1011b8 feat: made carry-forward comments/communication configurable and added test cases 2021-12-17 19:21:08 +05:30
mergify[bot]
c1a0f649cb fix: convert asynchronous field update to synchronous (#28930)
(cherry picked from commit 5adf85f5b7)

Co-authored-by: Dan Navarro on Ubuntu Work <danjeremynavarro@gmail.com>
2021-12-17 19:06:19 +05:30