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

39750 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anupam Kumar
1c0fa3c231
Merge branch 'develop' into crm-carry-forward-communication-comments 2021-12-28 10:34:16 +05:30
Rucha Mahabal
25f4de80b3
fix: filter out Claimed employee advances in Expense Claim (#29046) 2021-12-27 21:15:40 +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
Deepesh Garg
44407e63d8
Merge pull request #28978 from frappe/mergify/bp/develop/pr-28935 
fix: Is Reverse Charge check in Tax Category (backport #28935)
 2021-12-26 12:16:28 +05:30
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
Deepesh Garg
85d47e809b
Merge pull request #29027 from frappe/mergify/bp/develop/pr-28953 
fix(UX): Optimize rate updation on changing price list (backport #28953)
 2021-12-26 10:18:32 +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
Rucha Mahabal
6eeea0a77a
fix: ignore links while setting default notification templates in Settings (#29019) 2021-12-24 17:20:23 +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
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
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
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