mirror of
https://github.com/frappe/erpnext.git
synced 2026-06-06 05:39:12 +00:00
* fix: asset depreciation ledger (#37991) * fix: include opening acc depr while calculating asset depr ledger report * chore: include opening acc depr properly in acc depr amt * chore: add cost_center in asset depr ledger report * fix: handle finance books properly in asset depr ledger report * chore: rename 'include default book entries' to 'include default FB entries' (cherry picked from commit9a171db97f) # Conflicts: # erpnext/accounts/report/balance_sheet/balance_sheet.js # erpnext/accounts/report/cash_flow/cash_flow.js # erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.js # erpnext/accounts/report/trial_balance/trial_balance.js # erpnext/translations/pl.csv # erpnext/translations/tr.csv * chore: fix conflict in balance_sheet.js * chore: fix conflict in cash_flow.js * chore: fix conflict in consolidated_financial_statement.js * chore: fix conflict in trial_balance.js * chore: fix conflict in tr.csv * chore: fix conflict in pl.csv --------- Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com> (cherry picked from commit043dc1b14b)
This commit is contained in:
@@ -1260,7 +1260,7 @@ In Value,În valoare,
|
||||
"In the case of multi-tier program, Customers will be auto assigned to the concerned tier as per their spent","În cazul unui program cu mai multe niveluri, Clienții vor fi automat alocați nivelului respectiv în funcție de cheltuielile efectuate",
|
||||
Inactive,Inactiv,
|
||||
Incentives,stimulente,
|
||||
Include Default Book Entries,Includeți intrări implicite în cărți,
|
||||
Include Default FB Entries,Includeți intrări implicite în cărți,
|
||||
Include Exploded Items,Includeți articole explodate,
|
||||
Include POS Transactions,Includeți tranzacțiile POS,
|
||||
Include UOM,Includeți UOM,
|
||||
|
||||
|
Can't render this file because it is too large.
|
Reference in New Issue
Block a user