Commit Graph

40371 Commits

Author SHA1 Message Date
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
Dany Robert
0ca467a28f
fix: remove rounding of avg rating (#28945) 2021-12-18 16:16:47 +05:30
Saqib
1abdcf2bea
Merge branch 'develop' into multiple-pricing-rule-fix 2021-12-18 12:13:33 +05:30
Dany Robert
e75295a151
Merge branch 'develop' into ledger-merger 2021-12-18 11:32:20 +05:30
Anupam Kumar
321c95d024
Merge branch 'develop' into crm-carry-forward-communication-comments 2021-12-17 23:09:48 +05:30
Dany Robert
ab7f38224f fix: remove db commit 2021-12-17 16:42:24 +00:00
Dany Robert
32e5db7cb8 chore: styling according to linter 2021-12-17 16:38:16 +00:00
Dany Robert
399446460a feat: tests 2021-12-17 16:18:42 +00:00
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 5adf85f5b7ba94591381b03709b1fee6aa9331a5)

Co-authored-by: Dan Navarro on Ubuntu Work <danjeremynavarro@gmail.com>
2021-12-17 19:06:19 +05:30
Dany Robert
b3a3367d1d feat: allow group accounts 2021-12-17 13:06:30 +00:00
Noah Jacob
b98c61f2a7 refactor: moved purpose table mandatory check to server 2021-12-17 13:47:39 +05:30
Noah Jacob
90d32006f4 fix(test): fixed test case not creating serials 2021-12-17 13:32:30 +05:30
Deepesh Garg
b139ee1777
Merge pull request #28911 from nextchamp-saqib/fix-ksa-pf
fix(ksa): enable ksa pos invoice print format
2021-12-17 13:04:28 +05:30
Deepesh Garg
238403d3f6
Merge pull request #28916 from deepeshgarg007/multicurrency_subscription
fix: Multicurrency invoices using subscription
2021-12-17 12:29:10 +05:30
Noah Jacob
450369dbae
Merge branch 'develop' into maint_sch_link_fix 2021-12-17 12:07:26 +05:30
Noah Jacob
9109660a69 test: added test for serial no. filters 2021-12-17 11:57:17 +05:30
Noah Jacob
4cb5b627a1
fix: mapping to maintenance visit gets erased (#28917)
* fix: mappings to maintenance visit gets erased

* test: mapping of schedule to visit
2021-12-16 23:06:48 +05:30
Ankush Menat
6ba8f7644d
chore: ledger invariant check report (#28921) 2021-12-16 22:31:31 +05:30
Deepesh Garg
6ab753015e fix: Add tests for multicurrency subscription 2021-12-16 17:38:29 +05:30
Deepesh Garg
0e4842b986 fix: Multicurrency invoices using subscription 2021-12-16 16:51:41 +05:30
Subin Tom
68beee2a00 fix: replaced sql query with frappe.qb 2021-12-16 13:26:21 +05:30
Saqib Ansari
564d23fa8d fix(ksa): enable ksa pos invoice print format 2021-12-16 11:19:03 +05:30
Subin Tom
9f235526d4 fix: Validation in POS for item batch no stock quantity 2021-12-15 22:34:44 +05:30