ruthra kumar
133dca1824
refactor: handle stocked items
...
(cherry picked from commit ee93ed8c97
2025-03-08 06:36:32 +00:00
ruthra kumar
eb0df50f1b
refactor: handle stocked items
...
(cherry picked from commit 7ff3977394
2025-03-08 06:36:32 +00:00
ruthra kumar
5761cfb3d5
refactor: set tr currency dr & cr directly on parent document
...
(cherry picked from commit e9af567033
2025-03-08 06:36:32 +00:00
ruthra kumar
568b582b6a
refactor: use highest precision for storing exc rate
...
(cherry picked from commit b115bf2e2a
2025-03-08 06:36:31 +00:00
Shariq Ansari
d115c1c156
Merge pull request #46365 from frappe/mergify/bp/version-15-hotfix/pr-46352
...
fix: Allow rename prospect doctype (backport #46352 )
2025-03-07 17:12:22 +05:30
Nabin Hait
4e688778dc
chore: linter issue
2025-03-07 10:28:52 +05:30
Mihir Kandoi
b5890c1d55
Merge pull request #46376 from frappe/mergify/bp/version-15-hotfix/pr-46374
2025-03-06 23:00:13 +05:30
Mihir Kandoi
6419d020a1
fix: rare precision issue preventing submission of subcontracting order
...
(cherry picked from commit 33b71544db
2025-03-06 16:46:04 +00:00
Nabin Hait
60364f6dc9
chore: conflicts
2025-03-06 18:14:09 +05:30
mergify[bot]
23c4252b9b
fix: change fieldname for cash_flow to export (backport #46353 ) ( #46366 )
...
fix: change fieldname for cash_flow to export (#46353 )
fix: change fieldname for cash_flow
Co-authored-by: Sanket322 <shahsanket322003.com>
(cherry picked from commit 606dcb0ad1113279972+Sanket322@users.noreply.github.com >
2025-03-06 18:12:31 +05:30
mergify[bot]
c816f9bd0a
fix: validate accounting dimension company in Journal Entry & Stock Entry (backport #46204 ) ( #46369 )
...
fix: validate accounting dimension company in Journal Entry & Stock Entry (#46204 )
* fix: validate accounting dimension company in journal entry and stock entry
* test: update test cases to validate company-based accounting dimension
* fix(test): ensure 'Pick List' company matches 'Delivery Note' to prevent test failures
* chore: remove redundant lines of code
(cherry picked from commit 7b6ebad9e6122002510+Bhavan23@users.noreply.github.com >
2025-03-06 18:12:06 +05:30
Shariq Ansari
de46165768
fix: Allow rename prospect doctype ( #46352 )
...
fix: allow rename prospect doctype
(cherry picked from commit 884709deb8
2025-03-06 11:50:08 +00:00
Justine Jay
5cc251a172
fix: auto email report creation ( #46343 )
...
* fix(financial_statements): mandatory based on filter_based_on value
* fix(financial_statements.js): include options for multiselect
2025-03-06 17:18:26 +05:30
rohitwaghchaure
9c9c8c9356
Merge pull request #46358 from frappe/mergify/bp/version-15-hotfix/pr-46354
...
fix: recalculate_amount_difference_field patch (backport #46354 )
2025-03-06 14:53:08 +05:30
Mihir Kandoi
8e65b0ec0c
chore: resolve conflicts
2025-03-06 14:13:55 +05:30
rohitwaghchaure
7080e1422d
Merge pull request #46357 from frappe/mergify/bp/version-15-hotfix/pr-46355
...
fix: rename_sla_fields patch (backport #46355 )
2025-03-06 13:48:54 +05:30
Mihir Kandoi
7047fe2681
fix: check if set_landed_cost_based_on_purchase_invoice_rate is enabled before running patch
...
(cherry picked from commit 95d1976931
2025-03-06 07:58:38 +00:00
Mihir Kandoi
f247f02e49
fix: recalculate_amount_difference_field patch
...
(cherry picked from commit 0492b941ff
2025-03-06 07:58:37 +00:00
Mihir Kandoi
7bc7557018
fix: rename_sla_fields patch
...
(cherry picked from commit e8d4a487c6
2025-03-06 07:49:12 +00:00
rohitwaghchaure
e72264f448
Merge pull request #46346 from frappe/mergify/bp/version-15-hotfix/pr-46339
...
fix: doctype name (backport #46339 )
2025-03-05 21:44:40 +05:30
Rohit Waghchaure
1dcbdf3257
fix: doctype name
...
(cherry picked from commit d039310d80
2025-03-05 15:48:13 +00:00
Mihir Kandoi
5d6730a059
Merge pull request #46345 from frappe/mergify/bp/version-15-hotfix/pr-45693
...
fix: uom reverts to default upon selecting do not explode (backport #45693 )
2025-03-05 21:09:04 +05:30
Mihir Kandoi
6b1d20970e
fix: uom reverts to default upon selecting do not explode ( #45693 )
...
* fix: uom reverts to default upon selecting do not explode
* fix: logical error failing tests
(cherry picked from commit 58ed697ba5
2025-03-05 15:21:58 +00:00
ruthra kumar
9875489758
Merge pull request #46340 from frappe/mergify/bp/version-15-hotfix/pr-46020
...
fix(pos): get parent item group without user permission (backport #46020 )
2025-03-05 18:40:04 +05:30
ruthra kumar
939cf321f7
Merge pull request #46338 from frappe/mergify/bp/version-15-hotfix/pr-45403
...
feat: create sales invoice print format (backport #45403 )
2025-03-05 18:39:43 +05:30
Sugesh G
29f3aac925
fix(pos): get parent item group without user permission ( #46020 )
...
* fix(pos): get parent item group without user permission
* feat: add item group filter based on user permission
---------
Co-authored-by: venkat102 <venkatesharunachalam659@gmail.com >
(cherry picked from commit 8caf7f275e
2025-03-05 12:42:03 +00:00
Ejaaz Khan
1a382ebe86
feat: create sales invoice print format ( #45403 )
...
* feat: create sales invoice print format
* fix: linter issue
* style: remove border from table
* refactor: change label to uppercase and show taxes
* refactor: format date and add translation on label
* refactor: remove default header and format labels
* refactor: change label style and small fix
* chore: Qty in title case
---------
Co-authored-by: Nabin Hait <nabinhait@gmail.com >
(cherry picked from commit 38aa7cab8a
2025-03-05 12:38:03 +00:00
mergify[bot]
6c1ceff8ee
fix: exclude already consumed purchase receipt items from asset capitalization (backport #46329 ) ( #46336 )
...
* fix: exclude already consumed purchase receipt items from asset capitalization (#46329 )
* feat: link purchase receipt row item to capitalization
* fix: avoid fetching already consumed stock and asset items during capitalization
* fix(patch): added patch to link purchase receipt item to stock item child table
* fix: added nosemgrep
* refactor: rename to
(cherry picked from commit f50d479bfd142375893+khushi8112@users.noreply.github.com >
2025-03-05 18:07:14 +05:30
mergify[bot]
1e85f69072
fix: replacing serial and batch bundle on pos with auto fetch serial nos (backport #46236 ) ( #46337 )
...
fix: replacing serial and batch bundle on pos with auto fetch serial nos (#46236 )
* fix: replacing serial and batch bundle on pos with auto fetch serial nos
* fix: reserved serial no
added a check to look for serial no in reserved serial nos list before removing it as there might be a situation where an item is returned which was already consolidated.
(cherry picked from commit 35512d40bbdiptanil@frappe.io >
2025-03-05 18:00:31 +05:30
rohitwaghchaure
1992c2639c
Merge pull request #46333 from frappe/mergify/bp/version-15-hotfix/pr-46330
...
fix: Accounting Period validation throwing for different companies (backport #46330 )
2025-03-05 17:03:24 +05:30
Mihir Kandoi
8f278ab7c7
Merge pull request #46317 from frappe/mergify/bp/version-15-hotfix/pr-45947
...
fix: set landed cost based on purchase invoice rate (backport #45947 )
2025-03-05 16:58:41 +05:30
Mihir Kandoi
7a33bf41d8
Merge pull request #46331 from frappe/mergify/bp/version-15-hotfix/pr-46313
...
fix: production analytics report (backport #46313 )
2025-03-05 16:45:33 +05:30
Rohit Waghchaure
6df9cf327d
fix: Accounting Period validation throwing for different companies
...
(cherry picked from commit b1508efca2
2025-03-05 11:11:04 +00:00
Mihir Kandoi
5e06e4acce
fix: patch
2025-03-05 16:32:26 +05:30
Mihir Kandoi
7749814571
feat: add new Closed and Stopped rows
...
(cherry picked from commit 6cc3d67835
2025-03-05 10:54:36 +00:00
Mihir Kandoi
6f760d197d
fix: use else instead of unnecessary elif
...
(cherry picked from commit 961258a4ce
2025-03-05 10:54:36 +00:00
Mihir Kandoi
5668795884
fix: production analytics report
...
(cherry picked from commit 772e9ecfaa
2025-03-05 10:54:36 +00:00
mergify[bot]
aaf35c5df9
fix: Naming of Purchase Amount (backport #46051 ) ( #46324 )
...
fix: Naming of Purchase Amount (#46051 )
* fix: Naming of Purchase Amount
* fix: linters
(cherry picked from commit 104f60cc5776812428+0xD0M1M0@users.noreply.github.com >
2025-03-05 16:18:50 +05:30
mergify[bot]
6aa8803068
fix: consolidate gl entries by project in General Ledger Report (backport #46314 ) ( #46321 )
...
fix: consolidate gl entries by project in General Ledger Report (#46314 )
(cherry picked from commit 1f685efcaf108322669+ljain112@users.noreply.github.com >
2025-03-05 16:18:42 +05:30
Ben Kebdani
506dd3c6b9
fix: Close and Reopen buttons dissapear after saving changes ( #46048 )
...
* fix: Close and Reopen buttons dissapear after saving changes
* style: linter issue
---------
Co-authored-by: Nabin Hait <nabinhait@gmail.com >
2025-03-05 15:34:55 +05:30
mergify[bot]
9a433a6750
fix: adding cost center on pos invoice items while applying product discount (backport #46082 ) ( #46322 )
...
fix: adding cost center on pos invoice items while applying product discount (#46082 )
(cherry picked from commit 926e4ecc4fdiptanil@frappe.io >
2025-03-05 15:22:46 +05:30
mergify[bot]
e3ce17bd6e
fix:[regional] Italian einvoice xml generated with wrong prices ( #40254 ) (backport #45840 ) ( #46318 )
...
Merge pull request #45840 from gms-electronics/40254-italian-einvoice
fix:[regional] Italian einvoice xml generated with wrong prices (#40254 )
(cherry picked from commit c5f90c823dfabian.thobe@mwv.vc >
2025-03-05 15:19:41 +05:30
mergify[bot]
836fd8fbc4
fix: consider journal entry and return invoice in paid_amount calculation (backport #46129 ) ( #46319 )
...
fix: consider journal entry and return invoice in paid_amount calculation (#46129 )
* fix: consider journal entry and return invoice in paid_amount calculation
* test: add new unit test to consider journal entry and return invoice in paid_amount calculation
(cherry picked from commit 425fb12e9173237300+Sugesh393@users.noreply.github.com >
2025-03-05 15:07:36 +05:30
Mihir Kandoi
fe8c9a3605
chore: resolve conflicts
2025-03-05 14:54:40 +05:30
Mihir Kandoi
941d67a0b6
chore: resolve conflicts
2025-03-05 14:48:41 +05:30
mergify[bot]
5a3073c4c1
fix: incorrect batch picked in the pick list (backport #45761 ) ( #46315 )
...
fix: incorrect batch picked in the pick list
(cherry picked from commit e1b7688a17rohitw1991@gmail.com >
2025-03-05 14:48:01 +05:30
Mihir Kandoi
8f2fdcae88
fix: patch
...
(cherry picked from commit 1230127d24
2025-03-05 09:02:36 +00:00
Mihir Kandoi
a09c57f0d1
fix: revert last commit
...
(cherry picked from commit 154e9813c4
2025-03-05 09:02:35 +00:00
Mihir Kandoi
7b13d8cd98
fix: fiscal year error
...
(cherry picked from commit 7cf8e498c4
2025-03-05 09:02:34 +00:00
Mihir Kandoi
ee41e55343
perf: patch
...
(cherry picked from commit a41024813b
2025-03-05 09:02:34 +00:00
