rohitwaghchaure
2e207d651d
Merge pull request #46354 from mihir-kandoi/46351
...
fix: recalculate_amount_difference_field patch
2025-03-06 13:27:43 +05:30
rohitwaghchaure
93779c88d2
Merge pull request #46355 from mihir-kandoi/46348
...
fix: rename_sla_fields patch
2025-03-06 13:18:01 +05:30
Mihir Kandoi
95d1976931
fix: check if set_landed_cost_based_on_purchase_invoice_rate is enabled before running patch
2025-03-06 13:11:31 +05:30
Mihir Kandoi
0492b941ff
fix: recalculate_amount_difference_field patch
2025-03-06 12:58:53 +05:30
Mihir Kandoi
e8d4a487c6
fix: rename_sla_fields patch
2025-03-06 12:57:27 +05:30
rohitwaghchaure
137090ca77
Merge pull request #46339 from rohitwaghchaure/fixed-report-incorrect-sabb
...
fix: doctype name
2025-03-05 21:16:49 +05:30
Rohit Waghchaure
d039310d80
fix: doctype name
2025-03-05 18:07:17 +05:30
Ejaaz Khan
38aa7cab8a
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 >
2025-03-05 12:36:59 +00:00
Sugesh G
8caf7f275e
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 >
2025-03-05 18:06:42 +05:30
Diptanil Saha
35512d40bb
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.
2025-03-05 17:41:43 +05:30
Khushi Rawat
f50d479bfd
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
2025-03-05 17:39:24 +05:30
rohitwaghchaure
cb004709ff
Merge pull request #46330 from rohitwaghchaure/fixed-support-33209
...
fix: Accounting Period validation throwing for different companies
2025-03-05 16:40:07 +05:30
Prateek Karamchandani
4f559b6df2
fix: allow variant uom to differ from template uom ( #45850 )
2025-03-05 16:37:42 +05:30
Mihir Kandoi
58ed697ba5
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
2025-03-05 16:33:57 +05:30
Venkatesh
4ef7e6424a
fix: set stock adjustment account in difference account ( #45606 )
...
* fix: set stock adjustment account in difference account
* fix(stock entry): fetch stock difference account for manufacture entry
2025-03-05 16:32:03 +05:30
rohitwaghchaure
6c0b18b19f
Merge pull request #46313 from mihir-kandoi/st33100
...
fix: production analytics report
2025-03-05 16:23:13 +05:30
Rohit Waghchaure
b1508efca2
fix: Accounting Period validation throwing for different companies
2025-03-05 16:19:47 +05:30
mergify[bot]
82c0995f2e
fix: Close and Reopen buttons dissapear after saving changes (backport #46048 ) ( #46325 )
...
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 >
(cherry picked from commit 506dd3c6b9benkebdani@users.noreply.github.com >
2025-03-05 16:18:56 +05:30
Diptanil Saha
c4eb577a76
chore: erpnext demo url update ( #46327 )
2025-03-05 15:47:20 +05:30
Corentin Forler
a700345cee
refactor: Remove duplicate inherited method ( #46030 )
...
The method add_taxes_from_item_tax_template is defined identically in the erpnext.taxes_and_totals class, that erpnext.TransactionController extends.
2025-03-05 15:38:05 +05:30
0xD0M1M0
104f60cc57
fix: Naming of Purchase Amount ( #46051 )
...
* fix: Naming of Purchase Amount
* fix: linters
2025-03-05 15:24:23 +05:30
Mihir Kandoi
6cc3d67835
feat: add new Closed and Stopped rows
2025-03-05 15:14:54 +05:30
Diptanil Saha
926e4ecc4f
fix: adding cost center on pos invoice items while applying product discount ( #46082 )
2025-03-05 15:14:31 +05:30
Lakshit Jain
1f685efcaf
fix: consolidate gl entries by project in General Ledger Report ( #46314 )
2025-03-05 15:08:52 +05:30
Sugesh G
425fb12e91
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
2025-03-05 14:47:22 +05:30
Fab
c5f90c823d
Merge pull request #45840 from gms-electronics/40254-italian-einvoice
...
fix:[regional] Italian einvoice xml generated with wrong prices (#40254 )
2025-03-05 14:45:54 +05:30
rohitwaghchaure
70128881a8
Merge pull request #45947 from mihir-kandoi/st31369
...
fix: set landed cost based on purchase invoice rate
2025-03-05 14:31:31 +05:30
rohitwaghchaure
694098a578
Merge pull request #45761 from rohitwaghchaure/fixed-support-31024
...
fix: incorrect batch picked in the pick list
2025-03-05 14:19:53 +05:30
Mihir Kandoi
961258a4ce
fix: use else instead of unnecessary elif
2025-03-05 13:56:10 +05:30
Mihir Kandoi
772e9ecfaa
fix: production analytics report
2025-03-05 13:48:34 +05:30
Raffael Meyer
94547188bf
feat(Sales Invoice): add items row via "Fetch Timesheet" ( #46071 )
2025-03-05 13:21:40 +05:30
Diógenes Souza
89bcdd6fa5
fix: Wrong Overdue Status in Sales Invoices (Floating-point arithmetic) ( #46146 )
...
* fix: Wrong Overdue Status in Sales Invoices (Floating-point arithmetic)
* style: after run pre-commit
2025-03-05 13:16:45 +05:30
Venkatesh
2d26bff870
fix: use value from currency exchange when exchange api is disabled ( #46137 )
2025-03-05 13:15:20 +05:30
Mihir Kandoi
3bb6a311de
Merge branch 'develop' into st31369
2025-03-05 12:48:19 +05:30
rohitwaghchaure
27446a68b7
Merge pull request #45987 from mihir-kandoi/st31052-3
...
fix: rename some sla fields
2025-03-05 12:45:53 +05:30
Nabin Hait
5513e24b00
fix(workspace): enable is_query_report on purchase reports ( #46249 )
...
* fix(workspace): enable is_query_report on purchase reports
* fix: resolved conflict
---------
Co-authored-by: venkat102 <venkatesharunachalam659@gmail.com >
2025-03-05 12:30:09 +05:30
Khushi Rawat
4a542b22a4
fix: depreciation and balances report correction ( #46259 )
2025-03-05 12:29:23 +05:30
Lakshit Jain
88fcdbb81e
fix: only include submitted docs for internal received quantity validation ( #46262 )
2025-03-05 12:27:47 +05:30
ruthra kumar
0f6062efee
Merge pull request #46294 from ruthra-kumar/temporary_exclude_old_prs
...
ci: dont lock really old pull requests
2025-03-05 12:26:22 +05:30
Sudharsanan Ashok
6117706ab5
feat(received items to be billed): add company and date filters ( #46271 )
...
* feat(received items to be billed): add company and date filters
* feat(delivered to be billed): add company and date filters
* feat: add company and date conditions
* chore: remove debugger
2025-03-05 12:25:43 +05:30
rohitwaghchaure
65a229abb1
Merge pull request #46226 from mihir-kandoi/refactor_sc_feilds
...
refactor: rename subcontracting fields
2025-03-05 12:25:08 +05:30
rohitwaghchaure
93fe9203da
Merge pull request #46258 from mihir-kandoi/46196
...
fix: delivery note from sales order uom conversion mistake
2025-03-05 12:20:59 +05:30
Frappe PR Bot
4c810a878c
fix: sync translations from crowdin ( #46287 )
...
* fix: French translations
* fix: Arabic translations
* fix: Persian translations
* fix: Bosnian translations
* fix: Portuguese, Brazilian translations
* fix: Thai translations
* fix: Croatian translations
2025-03-05 12:19:53 +05:30
Kunhi
a8d1cbc1c3
fix: Add company filter at get_invoice method ( #46238 )
2025-03-05 12:18:17 +05:30
Mihir Kandoi
01b5fb2f91
Merge branch 'develop' into st31052-3
2025-03-05 12:14:01 +05:30
Mihir Kandoi
ceaf217341
Merge branch 'develop' into st31369
2025-03-05 12:13:13 +05:30
rohitwaghchaure
62837099fc
Merge pull request #46046 from mihir-kandoi/st32237-2
...
perf: optimize query in project.py
2025-03-05 12:10:16 +05:30
rohitwaghchaure
2b703c233b
Merge pull request #46068 from mihir-kandoi/st32081
...
fix: use valuation method from settings in stock ageing report
2025-03-05 12:07:46 +05:30
Priyansh Shah
59e99f167d
fix: Include additional account types for Expense Account in LCV ( #46206 )
...
fix: additional account types in filters for the Expense account selection
2025-03-05 12:07:25 +05:30
ruthra kumar
bb12551599
ci: dont lock really old pull requests
...
temporary change. mergify incorrectly triggers backport for really old
pull requests
2025-03-05 12:01:43 +05:30
