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

30254 Commits

Author SHA1 Message Date
Marica
27b157de22
Merge pull request #29057 from deepeshgarg007/unit_test_fixes 
fix: Deferred revenue test case
 2021-12-28 14:43:53 +05:30
Marica
18eb47f693
Merge pull request #28555 from marination/independent-manu-entry 
fix: Validate Finished Goods for Independent Manufacture entries as well
 2021-12-28 14:36:32 +05:30
Deepesh Garg
6f933db3cc fix: Deferred revenue test case 2021-12-28 14:16:19 +05:30
Development for People
095a6e186f
fix: rename non existent doctype field to the right one (#29055) 2021-12-28 14:08:22 +05:30
Deepesh Garg
057cfb22d6 fix: Remove debug statement 
(cherry picked from commit becb39da902e7e113c3dacb7eee7921144b8e99d)
 2021-12-28 08:11:18 +00:00
Deepesh Garg
d807d78313 fix: Issues in Bank Reconciliation tool 
(cherry picked from commit ff183ee895fb0dd1ca595eb76e2286695063315a)
 2021-12-28 08:11:18 +00:00
Marica
02b9541b43
Merge branch 'develop' into independent-manu-entry 2021-12-28 13:26:00 +05:30
marination
22809a2838 fix: Avoid Impact on Repack Entry 
- Repack entries must be considered for fg/scrap checkbox auto set
- This must be avoided only for Manufacture entries, due to confusion between scrap and fg
- No scrap in repack, so its straight forward
 2021-12-28 13:23:27 +05:30
marination
7d0340e660 fix: Sider 2021-12-28 13:06:35 +05:30
Anupam Kumar
6b9dfaea72
Merge branch 'develop' into crm-carry-forward-communication-comments 2021-12-28 12:45:48 +05:30
Marica
b8c212aaef
Merge pull request #28966 from marination/stock-ageing-negative-stock 
fix: Stock Ageing Report - Negative Opening Stock
 2021-12-28 12:23:55 +05:30
Deepesh Garg
d02dcb6433
Merge pull request #29009 from deepeshgarg007/deferred_service_start_date_validate 
fix: Start date validation for deferred invoices
 2021-12-28 12:05:34 +05:30
Marica
09f26d8258
Merge branch 'develop' into stock-ageing-negative-stock 2021-12-28 11:50:00 +05:30
marination
6ca978c18b fix: Linter (extra line after import) 2021-12-28 11:46:46 +05:30
Deepesh Garg
3607f51610
Merge pull request #29021 from anupamvs/project-form-custom-btn-grouping 
fix: grouping project form custom buttons
 2021-12-28 11:08:36 +05:30
Deepesh Garg
077e2c6467
Update erpnext/projects/doctype/project/project.js 2021-12-28 11:08:13 +05:30
Anupam Kumar
1c0fa3c231
Merge branch 'develop' into crm-carry-forward-communication-comments 2021-12-28 10:34:16 +05:30
MohsinAli
a0863d1cb1
feat: Add currency in import download statement 
Add currency in bank statement import
 2021-12-28 10:27:19 +05:30
Rucha Mahabal
baa12bcee6 fix: convert raw queries with frappe ORM 2021-12-28 10:04:14 +05:30
Rucha Mahabal
8226ea65c8 fix: linter issues 2021-12-28 08:54:05 +05:30
Rucha Mahabal
3c8ed4f737
Merge branch 'develop' into multiple-cost-centers-against-employee 2021-12-28 08:40:48 +05:30
marination
098f72e7ec test: Stock Ageing FIFO Slot generation 2021-12-28 02:33:54 +05:30
Marica
0eb38a4b13
Merge branch 'develop' into stock-ageing-negative-stock 2021-12-28 01:29:01 +05:30
marination
c007f84ade chore: Added .md file to explain stock ageing business logic 2021-12-28 01:27:24 +05:30
Rucha Mahabal
25f4de80b3
fix: filter out Claimed employee advances in Expense Claim (#29046) 2021-12-27 21:15:40 +05:30
marination
878fd377c2 chore: Use frappe.qb for query 2021-12-27 21:09:05 +05:30
Rucha Mahabal
21b07385ba
fix: flaky HR tests (#29017) 
* fix(test): use root company in Expense Claim tests

* fix(test): set Holiday List for Leave Allocation

* fix(test): set Holiday List for company
 2021-12-27 16:57:36 +05:30
Wolfram Schmidt
8415ec4d0c
Update de.csv 
Especially to allign Sales Orders (Aufträge) Sales Invoices (Ausgangsrechnungen) to Purchase Orders (Bestellungen) Purchase Invoice (Eingangsrechnungen). Both are a definate opposite and are kept short.
 2021-12-26 12:46:11 +01:00
Deepesh Garg
3b9bea7937 Merge branch 'develop' of https://github.com/frappe/erpnext into mergify/bp/develop/pr-28935 2021-12-26 10:25:52 +05:30
Deepesh Garg
8e4ea7e997
fix: Merge Conflicts 2021-12-26 10:23:36 +05:30
Deepesh Garg
bb6d1de221
Merge pull request #29033 from frappe/fix-iss-29032 
fix: avoid `"string" in None` condition
 2021-12-26 10:19:47 +05:30
Raffael Meyer
52397c9771
fix: avoid "string" in None condition 2021-12-26 02:15:57 +01:00
Deepesh Garg
6eb3d6a814
fix: Conflicts 2021-12-25 09:04:34 +05:30
Deepesh Garg
2d0208ba1f fix: Add round floats for price list rate 
(cherry picked from commit b60fbf5ba95350e79463f922b0e8dce518780383)
 2021-12-24 14:03:48 +00:00
Deepesh Garg
d19369b198 fix: Recalculate taxes irrespective of price list rate changed or not 
(cherry picked from commit 233f79bf960381b1c2bd753d783afd3020b377e0)

# Conflicts:
#	erpnext/public/js/controllers/transaction.js
 2021-12-24 14:03:48 +00:00
Deepesh Garg
4756fbc253 fix: Linting issues 
(cherry picked from commit 0980c2f9816b3e4a11b5410b5997a72b1cad28fd)
 2021-12-24 14:03:47 +00:00
Deepesh Garg
ab09dc545e fix(UX): Optimize rate updation of changing price list 
(cherry picked from commit 6087d5a6038d6e636ce1ba006ebd59e820b3cd8e)
 2021-12-24 14:03:47 +00:00
Anupam Kumar
cfb6b26e47
fix: contact duplication on converting lead to customer (#29001) 
* fix: contact duplication on converting lead to customer

* fix: added test case
 2021-12-24 19:13:28 +05:30
Shariq Ansari
9c4455f77c
fix: Removed ERPNext Integration Settings Workspace (#29023) 2021-12-24 18:52:35 +05:30
Anupam Kumar
87a98f8120
Merge branch 'develop' into project-form-custom-btn-grouping 2021-12-24 17:37:37 +05:30
Nabin Hait
f867f1974a fix: get fallback cost center from Employee/Department 2021-12-24 17:34:34 +05:30
Rucha Mahabal
6eeea0a77a
fix: ignore links while setting default notification templates in Settings (#29019) 2021-12-24 17:20:23 +05:30
Anupam
9c0f6d1306 fix: sider issue 2021-12-24 16:51:50 +05:30
Nabin Hait
f152a40b28 feat: Provision to assign multiple payroll cost centers against a single employee 2021-12-24 16:23:33 +05:30
Anupam
a6d6de6c4f fix: grouping project form custom buttons 2021-12-24 15:34:24 +05:30
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
Deepesh Garg
7ad149f9fe fix: Start date validation for deferred invoices 2021-12-23 14:39:20 +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
Pruthvi Patel
617f7565ce
Merge branch 'develop' into fix-invoice-statuses 2021-12-21 22:16:14 +05:45
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
Saqib
7f786e44a1
Merge branch 'develop' into pos-batch-no-stock-validation 2021-12-21 17:05:43 +05:30
Saqib
c3a9ca09d1
chore: remove extra whitespace 2021-12-21 17:05:36 +05:30
Saqib
9c8f523537
fix: typo 2021-12-21 17:01:10 +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
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