nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-06 06:58:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,505 Commits 458 Branches 1,746 Tags
a3f05cb0e71e8549bd59e330c721ab6c6a44eaf7
Commit Graph

46505 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nabin Hait
0d41631ae4 Merge pull request #39453 from nabinhait/asset-depr-income-tax-act 
fix: Asset Depreciation WDV as per Income Tax Act
 2024-01-25 16:06:22 +05:30
ruthra kumar
560af95931 Merge pull request #39497 from frappe/mergify/bp/version-14-hotfix/pr-35330 
refactor: cr/dr note should be standalone even when created from another invoice (backport #35330)
 2024-01-25 13:25:35 +05:30
mergify[bot]
1e32c6207e fix: default enable closing stock balance (backport #39551) (#39553) 
fix: default enable closing stock balance (#39551)

(cherry picked from commit d1fb90edff)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-01-25 12:51:48 +05:30
rohitwaghchaure
822a5a842b Merge pull request #39548 from rohitwaghchaure/fix-do-not-delete-batch-implicitly 
fix: do not delete batches implicitly
 2024-01-25 12:33:28 +05:30
Rohit Waghchaure
9a5995a3e5 fix: do not delete batches implicitly 2024-01-25 11:58:07 +05:30
Nabin Hait
941f8824e5 fix: linter issue 2024-01-25 11:40:44 +05:30
ruthra kumar
22c13b1b83 Merge pull request #39537 from frappe/mergify/bp/version-14-hotfix/pr-39331 
fix: Payment Terms Status for Sales Order report show all payment terms from orders (not only when there is a payment terms template) (backport #39331)
 2024-01-24 16:33:50 +05:30
Florian HENRY
295395918c fix: Payment Terms Status for Sales Order report should show all payment terms from order not only this comming from template 
(cherry picked from commit 6c8f52b26f)
 2024-01-24 10:42:57 +00:00
ruthra kumar
2c431f394e chore: resolve conflicts 2024-01-24 16:11:14 +05:30
rohitwaghchaure
924fc8f0a8 Merge pull request #39530 from frappe/mergify/bp/version-14-hotfix/pr-39525 
fix: email list for auto reorder material request (backport #39525)
 2024-01-24 14:49:18 +05:30
Rohit Waghchaure
780c069268 fix: email list for auto reorder material request 
(cherry picked from commit 764f3422a0)
 2024-01-24 07:07:05 +00:00
rohitwaghchaure
f4123e1863 Merge pull request #39528 from rohitwaghchaure/fixed-not-able-to-edit-change-address 
fix: not able to edit / change address from portal
 2024-01-24 12:19:45 +05:30
rohitwaghchaure
a1559ed0c2 Merge pull request #39526 from frappe/mergify/bp/version-14-hotfix/pr-39521 
fix: not able to edit address through portal (backport #39521)
 2024-01-24 12:16:57 +05:30
Rohit Waghchaure
e3fdb6f55c fix: not able to edit / change address from portal 2024-01-24 12:15:55 +05:30
Rohit Waghchaure
b310a55727 fix: not able to edit address through portal 
(cherry picked from commit b046d980ad)
 2024-01-24 06:20:29 +00:00
Raffael Meyer
16dc8232f2 Merge pull request #39514 from barredterra/refactor-batch-v14 2024-01-23 19:01:53 +01:00
barredterra
dd3b77ae28 refactor(Batch): use const instead of var 2024-01-23 15:08:49 +01:00
barredterra
c759406ebb fix(Batch): reload doc after splitting 
to show updated qty
 2024-01-23 15:08:33 +01:00
ruthra kumar
e70f0f6d8d refactor: handle dynamic dimension in order query 
(cherry picked from commit 7c2cb70387)
 2024-01-23 11:59:31 +00:00
ruthra kumar
9a3bde9350 refactor: update dimensions, only if provided 
(cherry picked from commit ec0f17ca8b)
 2024-01-23 11:59:31 +00:00
ruthra kumar
51bc225fe5 refactor: dynamic dimension filters in pop up 
(cherry picked from commit f8bbb0619c)
 2024-01-23 11:59:31 +00:00
ruthra kumar
15db7b8ae4 test: dimension inheritance on adv allocation 
(cherry picked from commit fcf4687c52)
 2024-01-23 11:59:30 +00:00
ruthra kumar
d4828f3cf5 refactor: pass dimensions on advance allocation 
(cherry picked from commit cbd443a78a)
 2024-01-23 11:59:30 +00:00
ruthra kumar
ec58c309d2 test: dimension inheritance in PE reconciliation 
(cherry picked from commit 6148fb024b)
 2024-01-23 11:59:30 +00:00
ruthra kumar
a919702319 refactor: pass dimension values to Gain/Loss journal 
(cherry picked from commit c44eb432a5)

# Conflicts:
#	erpnext/accounts/utils.py
 2024-01-23 11:59:29 +00:00
ruthra kumar
de948f23c1 test: dimension inheritance for cr note reconciliation 
(cherry picked from commit ba5a7c8cd8)
 2024-01-23 11:59:29 +00:00
ruthra kumar
c1591ec8e1 chore: test dimension filter output 
(cherry picked from commit e3c44231ab)
 2024-01-23 11:59:29 +00:00
ruthra kumar
c3ffb7a4c4 refactor: apply dimension filters on cr/dr notes 
(cherry picked from commit 188ff8cde7)
 2024-01-23 11:59:28 +00:00
ruthra kumar
937262b572 refactor: Credit Note and its Exc gain/loss JE inherits dimensions 
(cherry picked from commit ab939cc6e8)
 2024-01-23 11:59:28 +00:00
ruthra kumar
41c074d0bb fix: typo's and parameter changes 
(cherry picked from commit 0ec17590ae)
 2024-01-23 11:59:28 +00:00
ruthra kumar
ecd36501af refactor: partial change on outstanding invoice popup 
(cherry picked from commit 2154502955)
 2024-01-23 11:59:28 +00:00
ruthra kumar
8f87c588ec refactor: replace sql with query builder for Jourals query 
(cherry picked from commit 9c5a79209e)
 2024-01-23 11:59:28 +00:00
ruthra kumar
dac422a0e1 refactor: pass dimension details to query 
(cherry picked from commit 5dc22e1811)

# Conflicts:
#	erpnext/accounts/utils.py
 2024-01-23 11:59:27 +00:00
ruthra kumar
b2db6d0546 refactor: set query filters for dimensions 
(cherry picked from commit ad8475cb8b)
 2024-01-23 11:59:27 +00:00
ruthra kumar
3d62bce885 refactor: pass dimension filters to query 
(cherry picked from commit ff60ec85b8)

# Conflicts:
#	erpnext/controllers/accounts_controller.py
 2024-01-23 11:59:27 +00:00
ruthra kumar
66cadb8b9f refactor: handle dimension filters 
(cherry picked from commit c1fe4bcc64)
 2024-01-23 11:59:26 +00:00
ruthra kumar
81b87ef2e2 refactor: column break in dimension section 
(cherry picked from commit 20576e0f47)
 2024-01-23 11:59:26 +00:00
ruthra kumar
4114c0e854 refactor: dimensions filter section in payment reconciliation 
(cherry picked from commit 20e0acc20a)
 2024-01-23 11:59:26 +00:00
ruthra kumar
b25e8ae14c refactor: update dimension doctypes in hooks 
(cherry picked from commit cfb3d87267)
 2024-01-23 11:59:25 +00:00
ruthra kumar
5c9ad21a3f refactor: dimensions section in allocation table in reconciliation 
(cherry picked from commit 1cde804c77)
 2024-01-23 11:59:25 +00:00
ruthra kumar
956f05238a refactor: Payment btn criteria for Cr/Dr notes 
(cherry picked from commit 60eee564bf)
 2024-01-23 06:36:09 +00:00
ruthra kumar
1aeeac4d06 refactor: criteria for Credit Note Issued and Debit Note Issued 
(cherry picked from commit 8f695123cd)
 2024-01-23 06:36:09 +00:00
ruthra kumar
fecab1338e refactor(test): payments to invoice with -ve outstanding 
(cherry picked from commit f6e4ac2b62)
 2024-01-23 06:36:09 +00:00
ruthra kumar
03040c1c7f refactor(test): ledger entries will be against itself 
(cherry picked from commit 0e2fb1188a)
 2024-01-23 06:36:08 +00:00
ruthra kumar
43b40d92e5 refactor(test): return invoice will have -ve outstanding 
(cherry picked from commit b30c1e1abf)
 2024-01-23 06:36:08 +00:00
ruthra kumar
014fcfa611 refactor: remove return_against for cr/dr note filter 
(cherry picked from commit 00878707ae)
 2024-01-23 06:36:08 +00:00
ruthra kumar
0a6af795c4 refactor: cr notes will post for itself 
(cherry picked from commit db76e8a277)
 2024-01-23 06:36:08 +00:00
rohitwaghchaure
5be99295da Merge pull request #39491 from frappe/mergify/bp/version-14-hotfix/pr-39488 
fix: UOM needs to be whole number not being checked in quotations (backport #39488)
 2024-01-23 11:54:47 +05:30
Rohit Waghchaure
55c9cc3f26 fix: UOM needs to be whole number not being checked in quotations 
(cherry picked from commit aaf83da3e9)
 2024-01-22 11:55:27 +00:00
Gursheen Kaur Anand
be56c1838b Merge pull request #39482 from frappe/mergify/bp/version-14-hotfix/pr-39462 
fix: party field in PDF for AP / AR reports (backport #39462)
 2024-01-22 17:06:09 +05:30