mergify[bot]
|
830edb8f52
|
fix: auto create asset due to message error (backport #45934) (#45952)
fix: auto create asset due to message error (#45934)
* fix: auto create asset due to message error
* fix: linters
(cherry picked from commit 6f1bc5225a)
Co-authored-by: 0xD0M1M0 <76812428+0xD0M1M0@users.noreply.github.com>
|
2025-02-19 15:43:53 +05:30 |
|
Ejaaz Khan
|
44e1ca9d05
|
fix: round sum amount in JE auditing PF (#45961)
(cherry picked from commit 941085000a)
|
2025-02-19 10:11:36 +00:00 |
|
Venkatesh
|
6a577438aa
|
fix(pos profile): check company while validating mandatory accounting dimension (#45974)
(cherry picked from commit 17a2f44290)
|
2025-02-19 10:10:20 +00:00 |
|
Nabin Hait
|
f043b46696
|
fix: patch for creating asset depreciation schedule records
(cherry picked from commit 7324dcb7c8)
# Conflicts:
# erpnext/patches/v15_0/create_asset_depreciation_schedules_from_assets.py
|
2025-02-19 10:08:12 +00:00 |
|
Khushi Rawat
|
a509568110
|
fix: reset location only if there is value in row item location field
(cherry picked from commit 2bb79197aa)
|
2025-02-19 10:02:33 +00:00 |
|
Khushi Rawat
|
6183b38089
|
fix: validate if no matching item found
(cherry picked from commit 44c1425e73)
|
2025-02-19 10:02:33 +00:00 |
|
Khushi Rawat
|
87f337b605
|
fix: link correct row item of purchase doc
(cherry picked from commit da1b4cb9ab)
|
2025-02-19 10:02:33 +00:00 |
|
Khushi Rawat
|
281431e041
|
fix: make purchase_receipt_item and purchase_invoice_item fields of data type
(cherry picked from commit 8af9dcb33e)
# Conflicts:
# erpnext/assets/doctype/asset/asset.json
|
2025-02-19 10:02:32 +00:00 |
|
rohitwaghchaure
|
be65cd4df6
|
Merge pull request #46005 from frappe/mergify/bp/version-15-hotfix/pr-45750
feat: added option to enforce free item qty in pricing rule (backport #45750)
|
2025-02-19 15:09:51 +05:30 |
|
Khushi Rawat
|
965dbb6d2b
|
Merge pull request #46006 from frappe/mergify/bp/version-15-hotfix/pr-45895
fix: do not reschedule depreciation for fully depreciated asset on scrap (backport #45895)
|
2025-02-19 14:24:55 +05:30 |
|
ruthra kumar
|
07d4725810
|
Merge pull request #46008 from frappe/mergify/bp/version-15-hotfix/pr-45904
fix: fetch child account data for selected parent (backport #45904)
|
2025-02-19 14:21:48 +05:30 |
|
Bhavansathru
|
e36b860a79
|
fix: fetch child account data for selected parent (#45904)
* fix: fetch child account data for selected parent
* fix: change reference name
---------
Co-authored-by: venkat102 <venkatesharunachalam659@gmail.com>
(cherry picked from commit 73e82b7afa)
|
2025-02-19 08:28:59 +00:00 |
|
Khushi Rawat
|
1e7c5ec0cb
|
fix: do not reschedule depreciation for fully depreciated asset on scrap
(cherry picked from commit fd4c4f98fa)
|
2025-02-19 07:37:42 +00:00 |
|
Mihir Kandoi
|
1abe1a1fd5
|
fix: set default value to 0 as per new logic
(cherry picked from commit 844f1636c0)
|
2025-02-19 07:21:54 +00:00 |
|
Mihir Kandoi
|
f782900a15
|
refactor: rename field
(cherry picked from commit f3d598881c)
|
2025-02-19 07:21:54 +00:00 |
|
Mihir Kandoi
|
fc2ec7c495
|
fix: add is_new in if condition
(cherry picked from commit 4dcac56486)
|
2025-02-19 07:21:53 +00:00 |
|
Mihir Kandoi
|
ad11208109
|
test: added test
(cherry picked from commit ac3259b8f1)
|
2025-02-19 07:21:53 +00:00 |
|
Mihir Kandoi
|
f63a9dbf9b
|
fix: tests
(cherry picked from commit 366ae85d85)
|
2025-02-19 07:21:53 +00:00 |
|
Mihir Kandoi
|
8fb9228871
|
feat: added option to enforce free item qty in pricing rule
(cherry picked from commit 19c01b1457)
|
2025-02-19 07:21:53 +00:00 |
|
rohitwaghchaure
|
617a24d61e
|
Merge pull request #45994 from frappe/mergify/bp/version-15-hotfix/pr-45980
fix: check if employee is currently working on another workstation (backport #45980)
|
2025-02-19 11:24:05 +05:30 |
|
ruthra kumar
|
6fad501aa0
|
Merge pull request #46001 from frappe/mergify/bp/version-15-hotfix/pr-45882
fix(quotation): fetch exchange rate on currency change (backport #45882)
|
2025-02-19 11:13:04 +05:30 |
|
venkat102
|
bd89c19c98
|
fix(quotation): fetch exchange rate on currency change
(cherry picked from commit 2f77a8bed1)
|
2025-02-19 05:21:57 +00:00 |
|
Mihir Kandoi
|
5bccf9f837
|
fix: throw correct exception
(cherry picked from commit 4487edb255)
|
2025-02-18 15:13:04 +00:00 |
|
Mihir Kandoi
|
22eaa14179
|
fix: check if employee is currently working on another workstation
(cherry picked from commit 8234e659c8)
|
2025-02-18 15:13:04 +00:00 |
|
rohitwaghchaure
|
d3d0aacd4c
|
Merge pull request #45993 from frappe/mergify/bp/version-15-hotfix/pr-45977
fix: millisecond issue for posting datetime (backport #45977)
|
2025-02-18 20:31:20 +05:30 |
|
rohitwaghchaure
|
69f5be65f6
|
Merge pull request #45975 from frappe/mergify/bp/version-15-hotfix/pr-45970
fix: serial no status for internal transfer delivery note (backport #45970)
|
2025-02-18 20:23:20 +05:30 |
|
rohitwaghchaure
|
508efd1322
|
Merge pull request #45990 from frappe/mergify/bp/version-15-hotfix/pr-45976
fix: slow query (backport #45976)
|
2025-02-18 20:22:51 +05:30 |
|
rohitwaghchaure
|
ecc2de2709
|
Merge pull request #45992 from frappe/mergify/bp/version-15-hotfix/pr-45971
fix: set sco_qty field of PO to non negative (backport #45971)
|
2025-02-18 20:22:39 +05:30 |
|
rohitwaghchaure
|
2e3b19ebb2
|
chore: fix conflicts
|
2025-02-18 20:11:02 +05:30 |
|
rohitwaghchaure
|
050bb1eef5
|
chore: fix conflicts
|
2025-02-18 20:10:30 +05:30 |
|
Rohit Waghchaure
|
42923656ee
|
fix: millisecond issue for posting datetime
(cherry picked from commit ac9e5c0163)
# Conflicts:
# erpnext/patches.txt
# erpnext/stock/utils.py
|
2025-02-18 14:39:39 +00:00 |
|
rohitwaghchaure
|
0acdae02c1
|
chore: fix conflicts
|
2025-02-18 20:00:08 +05:30 |
|
Mihir Kandoi
|
567fb8abd1
|
fix: set sco_qty field of PO to non negative
(cherry picked from commit dfc3dc4944)
|
2025-02-18 14:29:22 +00:00 |
|
Rohit Waghchaure
|
8306d6fdb6
|
fix: slow query
(cherry picked from commit 8cfab57fc8)
# Conflicts:
# erpnext/stock/doctype/packed_item/packed_item.json
|
2025-02-18 14:28:19 +00:00 |
|
ruthra kumar
|
20709f1b3e
|
Merge pull request #45979 from frappe/mergify/bp/version-15-hotfix/pr-45765
fix: add accounting dimensions section in sales order item (backport #45765)
|
2025-02-18 17:48:34 +05:30 |
|
ruthra kumar
|
52860cc566
|
chore: resolve conflict
|
2025-02-18 14:27:14 +05:30 |
|
Sugesh393
|
b32e4daf2b
|
fix: add accounting dimensions section in sales order item
(cherry picked from commit 7d47869f4b)
# Conflicts:
# erpnext/selling/doctype/sales_order_item/sales_order_item.json
|
2025-02-18 08:42:56 +00:00 |
|
Rohit Waghchaure
|
2b80c009b3
|
fix: serial no status for internal transfer delivery note
(cherry picked from commit 3333331a3d)
|
2025-02-18 08:22:03 +00:00 |
|
ruthra kumar
|
8da1348a48
|
Merge pull request #45973 from frappe/mergify/bp/version-15-hotfix/pr-45723
fix: validate payment request total of partly paid invoice (backport #45723)
|
2025-02-18 13:42:58 +05:30 |
|
Sugesh393
|
9a33b877f5
|
test: add unit test to validate payment request grand_total for partly paid invoice
(cherry picked from commit f8472c32d9)
|
2025-02-18 07:42:28 +00:00 |
|
Sugesh393
|
c8881a9358
|
fix: validate payment request total of partly paid invoice
(cherry picked from commit 899c18df18)
|
2025-02-18 07:42:28 +00:00 |
|
ruthra kumar
|
f6047d8491
|
Merge pull request #45968 from frappe/mergify/bp/version-15-hotfix/pr-45687
fix: add validation to allow equity account (backport #45687)
|
2025-02-18 12:12:09 +05:30 |
|
rethik
|
0d2115197e
|
fix: remove party type from validate
(cherry picked from commit f82837a4a2)
|
2025-02-18 06:16:03 +00:00 |
|
rethik
|
552b5a79ce
|
test: add unit test to validate account type and party type
(cherry picked from commit 9422ce5aee)
|
2025-02-18 06:16:02 +00:00 |
|
rethik
|
bb3eb81170
|
fix: add validate to allow equity account and party_type shareholder
(cherry picked from commit 2c8e3f3409)
|
2025-02-18 06:16:02 +00:00 |
|
rohitwaghchaure
|
7ab69cfe5f
|
Merge pull request #45956 from frappe/mergify/bp/version-15-hotfix/pr-45946
fix: provision to enable naming series for SABB (backport #45946)
|
2025-02-18 07:44:18 +05:30 |
|
rohitwaghchaure
|
43d32eb10e
|
chore: fix conflicts
|
2025-02-17 21:32:48 +05:30 |
|
rohitwaghchaure
|
697fdf5bc3
|
chore: fix conflicts
|
2025-02-17 21:30:15 +05:30 |
|
rohitwaghchaure
|
2f7f9c0bac
|
chore: fix conflicts
|
2025-02-17 21:29:22 +05:30 |
|
Rohit Waghchaure
|
8fbfe14c63
|
fix: provision to enable naming series for SABB
(cherry picked from commit fe43975cdd)
# Conflicts:
# erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
# erpnext/stock/doctype/serial_and_batch_bundle/test_serial_and_batch_bundle.py
# erpnext/stock/doctype/stock_settings/stock_settings.json
|
2025-02-17 11:31:46 +00:00 |
|