Karm Soni
538b54a2dc
fix: handle empty item_tax_rate in ItemTax class
...
(cherry picked from commit fc098a732b
2025-11-21 12:57:48 +00:00
Lakshit Jain
11eda0e051
Merge pull request #50676 from frappe/mergify/bp/version-16-beta/pr-50675
...
fix: ignore chunk if no valid invoices found (backport #50675 )
2025-11-21 18:27:34 +05:30
Smit Vora
cca315d072
Merge pull request #50679 from frappe/mergify/bp/version-16-beta/pr-50658
...
fix: handle zero rate actual taxes in calculate_taxes_and_totals (backport #50658 )
2025-11-21 17:10:21 +05:30
ljain112
843a38acfd
fix: handle zero rate actual taxes in calculate_taxes_and_totals
...
(cherry picked from commit ef37e6aa16
2025-11-21 11:14:41 +00:00
Sagar Vora
434d05f9cf
fix: ignore chunk if no valid invoices found
...
(cherry picked from commit f644c19760
2025-11-21 08:53:52 +00:00
ruthra kumar
71611f81c9
Merge pull request #50630 from frappe/mergify/bp/version-16-beta/pr-50623
...
fix: replace `this` with function path (backport #50623 )
2025-11-19 16:21:09 +05:30
Smit Vora
635047c290
fix: replace this with function path
...
(cherry picked from commit 2a1eb08b08
2025-11-19 10:49:36 +00:00
Mihir Kandoi
82ba11e432
Merge pull request #50616 from frappe/mergify/bp/version-16-beta/pr-50614
...
fix: redundant message on bom save (backport #50614 )
2025-11-19 12:55:56 +05:30
Mihir Kandoi
9374958473
fix: redundant message on bom save
...
(cherry picked from commit 074f07694f
2025-11-19 07:08:17 +00:00
ruthra kumar
fe73f43d8b
Merge pull request #50604 from frappe/mergify/bp/version-16-beta/pr-50524
...
fix: use dynamic account type to get average ratio balance (backport #50524 )
2025-11-18 17:44:25 +05:30
ruthra kumar
dd93af80e0
Merge pull request #50602 from frappe/mergify/bp/version-16-beta/pr-50516
...
fix(general_ledger): add translation for accounting dimension (backport #50516 )
2025-11-18 17:13:19 +05:30
Navin-S-R
a2fe72013f
fix: correct profit after tax calculation by reducing expenses from income
...
(cherry picked from commit f420371a7e
2025-11-18 11:22:47 +00:00
Navin-S-R
2b1f31bacb
fix: use dynamic account type to get average ratio balance
...
(cherry picked from commit 9118f08e7b
2025-11-18 11:22:47 +00:00
Logesh Periyasamy
e87e9b4769
fix(general_ledger): add translation for accounting dimension
...
(cherry picked from commit 113ff17c71
2025-11-18 11:16:36 +00:00
ruthra kumar
3830dc9099
Merge pull request #50586 from frappe/mergify/bp/version-16-beta/pr-50529
...
fix: unintended backported depends_on expression (backport #50529 )
2025-11-18 15:05:49 +05:30
rohitwaghchaure
42c1f95981
Merge pull request #50590 from frappe/mergify/bp/version-16-beta/pr-50585
...
fix: icons for workspace sidebar in ERPNext modules (backport #50585 )
2025-11-18 14:35:56 +05:30
Rohit Waghchaure
052ce11d0f
fix: icons for workspace sidebar in ERPNext modules
...
(cherry picked from commit 842546d917
2025-11-18 08:42:07 +00:00
Kavin
9cafee3b59
fix: unintended backported depends_on expression ( #50529 )
...
Co-authored-by: Kavin <78342682+kavin0411@users.noreply.github.com >
(cherry picked from commit 81a16286a1
2025-11-18 08:08:01 +00:00
rohitwaghchaure
b672744543
Merge pull request #50578 from rohitwaghchaure/fixed-hide-home-icon
...
fix: hide home icon
2025-11-17 21:16:43 +05:30
Rohit Waghchaure
4e1e2ee756
fix: hide home icon
2025-11-17 20:58:23 +05:30
rohitwaghchaure
6277dac209
Merge pull request #50577 from rohitwaghchaure/fixed-desktop-icons
...
fix: desktop icons
2025-11-17 19:58:55 +05:30
Rohit Waghchaure
9349dcc907
fix: desktop icons
2025-11-17 19:40:51 +05:30
rohitwaghchaure
2ea6921e20
Merge pull request #50575 from sokumon/desktop-icons
...
fix: add more icons
2025-11-17 19:37:41 +05:30
sokumon
12a2e14dae
fix: add more icons
2025-11-17 19:12:31 +05:30
Smit Vora
12008b775f
Merge pull request #50439 from ljain112/fix-lead-quotation
2025-11-17 19:08:31 +05:30
Smit Vora
5662801a9c
Merge pull request #50496 from ljain112/correct-grand-total
2025-11-17 19:05:45 +05:30
Lakshit Jain
91f3c82bdf
feat!: Item Wise Tax Details Table ( #48692 )
...
* fix: Add `Item Wise Tax Detail` Table and update related doctypes
* fix: remove setting item_wise_tax_details in client side
* fix: Remove redundant code for updating item_wise_tax_details after rename
* fix: Add 'dont_recompute_tax' field to Item Wise Tax Detail
* fix: update item_wise_tax_details after validations
* chore: remove redundant code from payment_entry.js
* fix: changes in POS for item_wise_tax_details
* fix: handle merge taxes
* fix: update test case and fix precision issue
* chore: remove debugging statement
* chore: remove redundant import
* chore: linters
* chore: remove redundant code and minor refactor
* fix: correct function args
* fix: fix test cases
* fix: item wise sales register report
* fix: remove dont recompute from item wise tax details and calculation for deduct
* fix: do not retain old rows
* fix: added validation for item wise tax details
* fix: tax merging for pos
* fix: vat audit report(regional report)
* fix: query issue in item-wise sales register
* fix: set other_charges using temp object
* fix: precision issue in validation
* fix: changes as per failing test cases
* fix: tax merging
* fix: set no_copy for item wise tax detail
* fix: correct select field in query and other charged in item_wise_purchase_register
* fix: do not include rows with missing item or tax in merge_taxes
* fix: respect row wise rounding
* chore: remove unused import
* chore: incorrect tuple creation
* fix: handle rounding adjustment
* fix: currency option in item wise tax detail doctype
* fix: patch to migrate item_wise tax_details to table
* chore: remove item_wise_tax_detail from taxes table
* fix: use base_tax_withholding_net_total instead of tax_withholding_net_total
* fix: implemet item_wise_tax_detail for e-invoice (italy)
* fix: fetch document by doctypes in migration patch
* fix: fix multiple syntax errors and inconsistent variable usage
* fix: remove deprecated settings and update item wise tax details flag
* fix: enhance validation for item wise tax details and handle discrepancies
* fix: increase chunk size for migration and improve item-wise tax detail calculations
* fix: delete existing item-wise tax details to prevent duplicates during migration
* fix: remove unnecessary docstatus filter from tax details query
* fix: streamline validation checks in item wise tax details adjustment
* fix: update additional fields to reference item and invoice attributes in tax detail queries
* fix: Restrict tax query to the selected invoices in vat audit report
* fix: use `base_tax_withholding_net_total` for calculation in patch
* fix: set tax row_id and idx to None instead of empty strings
* fix: remove unused precision parameter from rounding differences handler
* fix: update docstatus in item_wise_tax_details as per doc
* fix: remove empty on_update method from SalesOrder class
* fix: remove empty on_update method from PurchaseOrder class
* fix: incorporate zero cutoff in tax calculation logic
* fix: increase threshold for rounding diff
2025-11-17 19:02:31 +05:30
rohitwaghchaure
47b7214580
Merge pull request #50567 from sokumon/desktop-icons
...
feat: add newly created desktop icons
2025-11-17 17:33:32 +05:30
sokumon
768afd7968
feat: add newly created desktop icons
2025-11-17 17:10:00 +05:30
rohitwaghchaure
ec5849d8d2
Merge pull request #50492 from nabinhait/erpnext-workspace-sidebars
...
refactor: Workspace sidebars and desktop icons for erpnext modules
2025-11-17 16:55:23 +05:30
Rohit Waghchaure
fdbe7bc988
fix: desktop icon placing
2025-11-17 16:35:03 +05:30
Rohit Waghchaure
8ea5170fb8
fix: sidebars of erpnext modules
2025-11-17 15:25:50 +05:30
Mihir Kandoi
350539f5e6
Merge pull request #50562 from mihir-kandoi/gh50536
2025-11-17 14:53:29 +05:30
Mihir Kandoi
4cde0bfddd
fix: incorrect connection to delivery note on pick list
2025-11-17 14:34:16 +05:30
ruthra kumar
05ee4c0b0c
Merge pull request #50560 from frappe/mergify/copy/develop/pr-49788
...
feat: (Multi-Currency in Employee Advance, Expense Claim) update exchange rate of payment entry in gl entry & added exchange rate, base amount field in Advance Payment Ledger Entry (copy #49788 )
2025-11-17 14:07:35 +05:30
Rohit Waghchaure
56e44cfccb
fix: sidebar for selling and accounting modules
2025-11-17 13:55:01 +05:30
iamkhanraheel
054e7adeac
fix: conflicts
2025-11-17 13:37:25 +05:30
iamkhanraheel
9c2525a8f4
feat: add exchange rate & base field in advance payment ledger, set exchange rate in journal entry on every refresh
...
(cherry picked from commit 287cb621cd
2025-11-17 08:04:55 +00:00
iamkhanraheel
bacef2f135
fix: remove hrms dependent func which are moved to hrms module
...
(cherry picked from commit 038536e1cd
2025-11-17 08:04:54 +00:00
iamkhanraheel
78da4c38fa
feat: multiCurrency in epxense claim, set excahnge rate in advance & update it in gl entry
...
(cherry picked from commit a9ecf7c319
2025-11-17 08:04:54 +00:00
Rohit Waghchaure
334deccd2d
feat: workspace sidebars and desktop icons for erpnext modules
2025-11-17 13:20:57 +05:30
rohitwaghchaure
b5df39f47d
Merge pull request #50388 from rohitwaghchaure/feat-subcontracting-workspace
...
feat: subcontracting workspace and sidebar
2025-11-17 13:08:50 +05:30
Asmita Hase
8ca02e7fbb
Merge pull request #50538 from asmitahase/holiday-list-assignment
2025-11-17 12:11:49 +05:30
Asmita Hase
7362d783b1
Merge branch 'develop' into holiday-list-assignment
2025-11-17 11:53:56 +05:30
rohitwaghchaure
60f8654ad6
Merge pull request #50506 from mihir-kandoi/company-wise-valuation-method
...
feat: company wise valuation method
2025-11-17 11:49:09 +05:30
ruthra kumar
b2a0cdf4bc
Merge pull request #50552 from frappe/l10n_develop
...
fix: sync translations from crowdin
2025-11-17 11:27:49 +05:30
Khushi Rawat
c4b9268f9d
Merge pull request #50404 from khushi8112/company-details-popup-trigger
...
fix: show company-details popup only for the targeted print format/le…
2025-11-17 11:15:59 +05:30
Mihir Kandoi
316b6d6867
feat: company wise valuation method
2025-11-17 10:37:11 +05:30
Mihir Kandoi
5dcb766b9f
Merge pull request #50540 from aerele/support-52430
2025-11-17 10:10:48 +05:30
MochaMind
03bfbeb1cb
fix: Persian translations
2025-11-16 14:14:08 -08:00
