CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-21 19:25:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,419 Commits 424 Branches 1,724 Tags
822a5a842b5eb049cd4dfececf569e79487b842a
Commit Graph

46419 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Gursheen Anand
a19b41d8c8 fix: party field in pdf html 
(cherry picked from commit b2d9380596)
 2024-01-22 09:51:30 +00:00
Gursheen Kaur Anand
1a46f60633 Merge pull request #39473 from frappe/mergify/bp/version-14-hotfix/pr-39229 
fix: use most reliable section reference per report line (backport #39229)
 2024-01-21 14:23:34 +05:30
David Arnold
3bdff18467 fix: use most reliable section reference per report line 
(cherry picked from commit b5be17c6df)
 2024-01-21 08:14:13 +00:00
Gursheen Kaur Anand
5c1bf1f3fa Merge pull request #39470 from frappe/mergify/bp/version-14-hotfix/pr-39424 
Revert "fix(minor): financial statements period end date" (backport #39424)
 2024-01-20 18:51:59 +05:30
Gursheen Kaur Anand
837fff4533 Revert "fix(minor): financial statements period end date" 
(cherry picked from commit 73625a2622)
 2024-01-20 12:29:22 +00:00
Gursheen Kaur Anand
f405a6c31d Merge pull request #39450 from frappe/mergify/bp/version-14-hotfix/pr-39449 
fix: unallocated amount after taxes and charges (backport #39449)
 2024-01-19 10:58:27 +05:30
Gursheen Anand
6895b74ecc fix: linting issue 
(cherry picked from commit 99b94af49f)
 2024-01-18 10:45:49 +00:00
Gursheen Anand
f7ba7361ca fix: set unallocated amount after base tax 
(cherry picked from commit e9bc63aacf)
 2024-01-18 10:45:49 +00:00
Nabin Hait
05a2fb3011 Merge pull request #39437 from frappe/mergify/bp/version-14-hotfix/pr-39429 
fix: composite asset capitalization using asset components (backport #39429)
 2024-01-17 22:05:19 +05:30
Nabin Hait
ac6020a940 fix: composite asset capitalization using asset components 
(cherry picked from commit 5df40661d2)
 2024-01-17 15:35:56 +00:00
Nabin Hait
9bcbd94bf1 Merge pull request #39421 from frappe/mergify/bp/version-14-hotfix/pr-39386 
fix: Cancel asset capitalisation record on cancellation of asset and vice-versa (backport #39386)
 2024-01-17 21:05:42 +05:30
Nabin Hait
4edb73d398 fix: resolved merge conflict 2024-01-17 17:36:42 +05:30
Nabin Hait
82732f976a Merge pull request #39432 from frappe/revert-39419-mergify/bp/version-14-hotfix/pr-39385 
Revert "fix: WDV as per IT Act: calculate yearly amount first and then split it based on months (backport #39385)"
 2024-01-17 17:32:38 +05:30
Nabin Hait
8014839795 Revert "fix: WDV as per IT Act: calculate yearly amount first and then split it based on months (backport #39385)" 2024-01-17 17:32:14 +05:30
Nabin Hait
8d1164f652 Merge pull request #39419 from frappe/mergify/bp/version-14-hotfix/pr-39385 
fix: WDV as per IT Act: calculate yearly amount first and then split it based on months (backport #39385)
 2024-01-17 17:29:32 +05:30
Nabin Hait
1dff96057c fix: Cancel asset capitalisation record on cancellation of asset and vice-versa 
(cherry picked from commit efe9f6656f)

# Conflicts:
#	erpnext/assets/doctype/asset_capitalization/asset_capitalization.py
 2024-01-17 06:44:52 +00:00
Nabin Hait
3989b97579 fix: WDV as per IT Act: calculate yearly amount first and then split it based on months 
(cherry picked from commit 22bd6a54b2)

# Conflicts:
#	erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py
 2024-01-17 06:44:25 +00:00
Deepesh Garg
bee90e56f5 Merge pull request #39410 from ljain112/fix-pr 
fix(Purchase Register): show bill_date and bill_no (#38742)
 2024-01-17 11:00:24 +05:30
ruthra kumar
5693979165 Merge pull request #39411 from frappe/mergify/bp/version-14-hotfix/pr-39402 
fix: project query controller logic (backport #39402)
 2024-01-17 10:57:36 +05:30
ruthra kumar
42c1de640c chore: resolve conflict 2024-01-17 10:36:29 +05:30
ruthra kumar
b35a83ee47 refactor: better ordering of query result 
(cherry picked from commit bfe42fdccb)

# Conflicts:
#	erpnext/controllers/queries.py
 2024-01-16 10:55:31 +00:00
ruthra kumar
98967ed584 fix(test): test case for project query 
(cherry picked from commit 3349dde5e2)
 2024-01-16 10:55:30 +00:00
ruthra kumar
f2e577bec7 fix: project query controller logic 
(cherry picked from commit 4eefb445a7)

# Conflicts:
#	erpnext/controllers/queries.py
 2024-01-16 10:55:30 +00:00
ljain112
4b197920c1 fix: show bill_date and bill_no in Purchase Register 2024-01-16 15:53:53 +05:30
ruthra kumar
f3628c7d1a Merge pull request #39392 from frappe/mergify/bp/version-14-hotfix/pr-39391 
fix: possible typerror in utils.js (backport #39391)
 2024-01-15 20:49:43 +05:30
ruthra kumar
4ea72f4b69 fix: possible typerror in utils.js 
and remove unwanted debugging statements

(cherry picked from commit 60b26ad8b2)
 2024-01-15 15:16:44 +00:00
ruthra kumar
46d846bf1a Merge pull request #39136 from frappe/mergify/bp/version-14-hotfix/pr-39125 
fix: ignore cancelled payments in Sales/Purchase Register (backport #39125)
 2024-01-15 14:49:22 +05:30
ruthra kumar
a6bc5cae90 fix: pass accounts as list to query 2024-01-15 14:10:55 +05:30
mergify[bot]
4af3159f62 ci: bump node in release workflow (backport #39377) (#39379) 
* ci: bump node in release workflow

(cherry picked from commit aef87cced7)

# Conflicts:
#	.github/workflows/release.yml

* chore: `conflicts`

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2024-01-15 12:11:17 +05:30
ruthra kumar
1ca8dd4349 Merge pull request #39374 from frappe/mergify/bp/version-14-hotfix/pr-39371 
fix: incorrect sql error if account name has '%' (backport #39371)
 2024-01-15 10:41:04 +05:30
ruthra kumar
9550ed84c0 Merge pull request #39105 from frappe/mergify/bp/version-14-hotfix/pr-39097 
refactor: flag to control loyalty point creation at invoice level (backport #39097)
 2024-01-15 09:59:30 +05:30
ruthra kumar
d0e3458c8c fix: incorrect sql error if account name has '%' 
(cherry picked from commit 641c3de0ca)
 2024-01-15 04:10:30 +00:00
rohitwaghchaure
55e790cd2f Merge pull request #39368 from frappe/mergify/bp/version-14-hotfix/pr-39224 
Update purchase_taxes_and_charges.json label Rate to Tax Rate (backport #39224)
 2024-01-14 11:59:59 +05:30
rohitwaghchaure
e9d2437c7a fix: modified date 
(cherry picked from commit 6827edb2c5)
 2024-01-14 05:57:43 +00:00