mirror of
https://github.com/frappe/erpnext.git
synced 2026-06-09 08:02:51 +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 commit 9a171db97f)
# 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>
This commit is contained in:
@@ -1260,7 +1260,7 @@ In Value,ಮೌಲ್ಯ,
|
||||
"In the case of multi-tier program, Customers will be auto assigned to the concerned tier as per their spent","ಮಲ್ಟಿ-ಟೈರ್ ಪ್ರೋಗ್ರಾಂನ ಸಂದರ್ಭದಲ್ಲಿ, ಗ್ರಾಹಕರು ತಮ್ಮ ಖರ್ಚುಗೆ ಅನುಗುಣವಾಗಿ ಆಯಾ ಶ್ರೇಣಿಗೆ ಸ್ವಯಂ ನಿಯೋಜಿಸಲಾಗುವುದು",
|
||||
Inactive,ನಿಷ್ಕ್ರಿಯವಾಗಿದೆ,
|
||||
Incentives,ಪ್ರೋತ್ಸಾಹ,
|
||||
Include Default Book Entries,ಡೀಫಾಲ್ಟ್ ಪುಸ್ತಕ ನಮೂದುಗಳನ್ನು ಸೇರಿಸಿ,
|
||||
Include Default FB Entries,ಡೀಫಾಲ್ಟ್ ಪುಸ್ತಕ ನಮೂದುಗಳನ್ನು ಸೇರಿಸಿ,
|
||||
Include Exploded Items,ಸ್ಫೋಟಗೊಂಡ ವಸ್ತುಗಳನ್ನು ಸೇರಿಸಿ,
|
||||
Include POS Transactions,ಪಿಒಎಸ್ ಟ್ರಾನ್ಸಾಕ್ಷನ್ಸ್ ಸೇರಿಸಿ,
|
||||
Include UOM,UOM ಸೇರಿಸಿ,
|
||||
|
||||
|
Can't render this file because it is too large.
|
Reference in New Issue
Block a user