55326 Commits

Author SHA1 Message Date
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
l0gesh29
231479a6e2 fix(ledger-summary-report): show party group and territory 2025-11-17 13:42:43 +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)

# Conflicts:
#	erpnext/accounts/doctype/advance_payment_ledger_entry/advance_payment_ledger_entry.json
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
MochaMind
14c5245037 fix: sync translations from crowdin (#50503)
* fix: Persian translations

* fix: Bosnian translations

* fix: Hungarian translations

* fix: French translations

* fix: Arabic translations

* fix: Polish translations

* fix: Turkish translations

* fix: Indonesian translations

* fix: Persian translations

* fix: Spanish translations
2025-11-16 15:08:37 +01:00
Mihir Kandoi
42002d0aa1 Merge pull request #50507 from mihir-kandoi/company-wise-default-warehouses 2025-11-16 17:10:11 +05:30
Mihir Kandoi
84af60da7f feat: company wise default warehouses 2025-11-16 16:51:51 +05:30
rohitwaghchaure
c4882f6f26 fix: validation to check company in Sales Forecast and MPS (#50545) 2025-11-16 15:08:31 +05:30
Mihir Kandoi
e5e26cd92a feat: phantom bom (#50351)
* feat: add phantom bom settings in bom doctype

* feat: new explosion logic for production plan, subcontracting and work order/manufacturing

* feat: modify explosion logic in reports and bom creator

* fix: failing test

* feat: add convert to phantom item support in bom creator

* test: added test cases

* fix: always fetch rm rate if phantom bom

* refactor: PP phantom explosion logic

* fix: report test cases

* feat: add phantom item in description of item if phantom item in bom tree

* fix: hide create button if bom is phantom

* fix: bugs found by coderabbit
2025-11-16 15:08:08 +05:30
Mihir Kandoi
9b303a2272 Merge pull request #50235 from mihir-kandoi/sre-sco
feat: stock reservation for subcontracting order
2025-11-16 13:06:21 +05:30
Rohit Waghchaure
80b6c226b2 fix: validation to check company in Sales Forecast and MPS 2025-11-16 12:58:29 +05:30
Pugazhendhi Velu
8b38578914 fix(stock-entry): prevent default warehouse from overriding parent warehouse 2025-11-16 06:07:55 +00:00
Raffael Meyer
4bd3b00e5f refactor: remove unused import (#50543) 2025-11-15 19:34:44 +00:00
Raffael Meyer
38287afc05 fix: mark role profile names as translatable (#50542) 2025-11-15 19:26:12 +00:00
Raffael Meyer
f57d7f39bc fix: mark navbar item as translatable (#50541) 2025-11-15 19:11:39 +00:00
Raffael Meyer
9a989a84fb fix: use dummy translations for custom field labels (#49875) 2025-11-15 19:34:13 +01:00
Asmita Hase
3ce6da3b71 feat: half day in holiday list 2025-11-15 18:35:14 +05:30
Asmita Hase
0af4515afd feat: specify half day in holiday list 2025-11-15 18:35:12 +05:30
Smit Vora
68cdadf11a feat: support custom financial statements (#49098)
Co-authored-by: Abdeali Chharchhoda <abdealiking786@gmail.com>
2025-11-15 09:59:01 +05:30
Navin-S-R
f420371a7e fix: correct profit after tax calculation by reducing expenses from income 2025-11-14 14:12:29 +05:30
Navin-S-R
9118f08e7b fix: use dynamic account type to get average ratio balance 2025-11-14 14:05:47 +05:30
Mihir Kandoi
b98f4611e6 fix: wrong currency in Subcontracting Order Service Item (#50517) 2025-11-14 05:21:06 +00:00
PUGAZHENDHI V
4f720b3969 fix(period closing voucher): add title to error log (#50498) 2025-11-13 21:25:44 +05:30
Pugazhendhi Velu
3a0e1e8ef9 fix: add return status for purchase receipt 2025-11-13 15:29:27 +00:00
rohitwaghchaure
75533ea7d8 Merge pull request #50515 from rohitwaghchaure/fixed-sales-forecast-manual
fix: do not allow to add rows manually
2025-11-13 18:16:34 +05:30
Rohit Waghchaure
019f8103f3 fix: do not allow to add rows manually 2025-11-13 16:34:31 +05:30
rohitwaghchaure
b79f88a0a6 Merge pull request #50513 from rohitwaghchaure/fixed-seasonal-method
fix: change seasonal method
2025-11-13 15:47:41 +05:30
Diptanil Saha
ef7a3419fa Merge pull request #50510 from ljain112/fix-supplier-quick-entry 2025-11-13 15:26:48 +05:30