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
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
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
Saqib Ansari
2be5104848
fix: cannot save debit note with zero quantity
2021-12-23 11:52:10 +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
Saqib Ansari
04ea42ce52
fix(sales-invoice): cannot create debit note with zero qty
2021-12-22 13:23:42 +05:30
Ankush Menat
8dc1ce12d4
chore: simplify bug report form
2021-12-22 12:13:31 +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