f78bf4c6ef
fix: Test cases
3 years ago
be5e6f02ae
Merge branch 'develop' of https://github.com/frappe/erpnext into term_loan_enhancement
3 years ago
88df5ce530
fix: tests ( #29051 )
* fix(test): create salary slip as per timesheet dates for Project Profitability
* fix(test): reload salary slip before checking for payment days
3 years ago
087ebcae5a
Merge pull request #29014 from ankush/rename_sr_no
fix!: disable renaming on serial nos
3 years ago
2248841d8a
Merge pull request #29054 from frappe/mergify/bp/develop/pr-28996
fix: Issues in Bank Reconciliation tool (backport #28996 )
3 years ago
6405699821
Merge branch 'develop' into mergify/bp/develop/pr-28996
3 years ago
27b157de22
Merge pull request #29057 from deepeshgarg007/unit_test_fixes
fix: Deferred revenue test case
3 years ago
18eb47f693
Merge pull request #28555 from marination/independent-manu-entry
fix: Validate Finished Goods for Independent Manufacture entries as well
3 years ago
6f933db3cc
fix: Deferred revenue test case
3 years ago
095a6e186f
fix: rename non existent doctype field to the right one ( #29055 )
3 years ago
057cfb22d6
fix: Remove debug statement
(cherry picked from commit becb39da902e7e113c3dacb7eee7921144b8e99d)
3 years ago
d807d78313
fix: Issues in Bank Reconciliation tool
(cherry picked from commit ff183ee895fb0dd1ca595eb76e2286695063315a)
3 years ago
02b9541b43
Merge branch 'develop' into independent-manu-entry
3 years ago
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
3 years ago
7d0340e660
fix: Sider
3 years ago
b8c212aaef
Merge pull request #28966 from marination/stock-ageing-negative-stock
fix: Stock Ageing Report - Negative Opening Stock
3 years ago
d02dcb6433
Merge pull request #29009 from deepeshgarg007/deferred_service_start_date_validate
fix: Start date validation for deferred invoices
3 years ago
09f26d8258
Merge branch 'develop' into stock-ageing-negative-stock
3 years ago
6ca978c18b
fix: Linter (extra line after import)
3 years ago
3607f51610
Merge pull request #29021 from anupamvs/project-form-custom-btn-grouping
fix: grouping project form custom buttons
3 years ago
077e2c6467
Update erpnext/projects/doctype/project/project.js
3 years ago
098f72e7ec
test: Stock Ageing FIFO Slot generation
3 years ago
0eb38a4b13
Merge branch 'develop' into stock-ageing-negative-stock
3 years ago
c007f84ade
chore: Added .md file to explain stock ageing business logic
3 years ago
25f4de80b3
fix: filter out Claimed employee advances in Expense Claim ( #29046 )
3 years ago
878fd377c2
chore: Use frappe.qb for query
3 years ago
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
3 years ago
44407e63d8
Merge pull request #28978 from frappe/mergify/bp/develop/pr-28935
fix: Is Reverse Charge check in Tax Category (backport #28935 )
3 years ago
3b9bea7937
Merge branch 'develop' of https://github.com/frappe/erpnext into mergify/bp/develop/pr-28935
3 years ago
8e4ea7e997
fix: Merge Conflicts
3 years ago
bb6d1de221
Merge pull request #29033 from frappe/fix-iss-29032
fix: avoid `"string" in None` condition
3 years ago
85d47e809b
Merge pull request #29027 from frappe/mergify/bp/develop/pr-28953
fix(UX): Optimize rate updation on changing price list (backport #28953 )
3 years ago
52397c9771
fix: avoid `"string" in None` condition
3 years ago
6eb3d6a814
fix: Conflicts
3 years ago
2d0208ba1f
fix: Add round floats for price list rate
(cherry picked from commit b60fbf5ba95350e79463f922b0e8dce518780383)
3 years ago
d19369b198
fix: Recalculate taxes irrespective of price list rate changed or not
(cherry picked from commit 233f79bf960381b1c2bd753d783afd3020b377e0)
# Conflicts:
# erpnext/public/js/controllers/transaction.js
3 years ago
4756fbc253
fix: Linting issues
(cherry picked from commit 0980c2f9816b3e4a11b5410b5997a72b1cad28fd)
3 years ago
ab09dc545e
fix(UX): Optimize rate updation of changing price list
(cherry picked from commit 6087d5a6038d6e636ce1ba006ebd59e820b3cd8e)
3 years ago
cfb6b26e47
fix: contact duplication on converting lead to customer ( #29001 )
* fix: contact duplication on converting lead to customer
* fix: added test case
3 years ago
9c4455f77c
fix: Removed ERPNext Integration Settings Workspace ( #29023 )
3 years ago
87a98f8120
Merge branch 'develop' into project-form-custom-btn-grouping
3 years ago
6eeea0a77a
fix: ignore links while setting default notification templates in Settings ( #29019 )
3 years ago
9c0f6d1306
fix: sider issue
3 years ago
a6d6de6c4f
fix: grouping project form custom buttons
3 years ago
7987a46509
chore: add running stock value difference in invariant report ( #29012 )
[skip ci]
3 years ago
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
3 years ago
7ad149f9fe
fix: Start date validation for deferred invoices
3 years ago
f6d5534627
fix: set resolution by only if not on hold ( #28995 )
3 years ago
8dc1ce12d4
chore: simplify bug report form
3 years ago
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>
3 years ago
Deepesh Garg
Rucha Mahabal
Ankush Menat
Deepesh Garg
Marica
Development for People
Raffael Meyer
Anupam Kumar
Shariq Ansari
Saqib