mergify[bot] 55806c51f2

fix: Gross and Net Profit Report - incorrect calculation of totals ...

* fix: account group totals calculation to consider include_in_gross

(cherry picked from commit 8dcb9302b417618505ea24e5566c017eff451c1e)

* refactor: remove unused parameters

(cherry picked from commit 50822f207ec5272d4d71a2b6579693da2088105d)

* refactor: merge separate loops for calculating group / leaf node totals
rename function
remove return statement as the list is  mutated

(cherry picked from commit 1a3b9c5bdfb9fac04a3a7d8724e6b3c3b593ec19)

* fix: add total col for gross and net profit

(cherry picked from commit cb9b4fbb91f4b73916416167932064ef5965eed1)

---------

Co-authored-by: Anoop Kurungadam <anoop@earthianslive.com>

2023-05-25 18:12:50 +05:30

..

account_balance

style: format code with black

2022-03-28 18:52:46 +05:30

accounts_payable

fix: Filter fixes in Accounts Payable report

2022-10-26 21:18:50 +05:30

accounts_payable_summary

chore: remove utf-8 compat code

2021-11-05 11:16:29 +05:30

accounts_receivable

fix: Multiple accounting dimension filtering in AR/AP reports (#34464)

2023-03-17 15:51:33 +05:30

accounts_receivable_summary

refactor: Sales Partner column in AR and AR Summary Report

2023-01-04 12:41:02 +05:30

asset_depreciation_ledger

fix: don't include cancelled JVs in assdeprledger report

2023-04-05 06:04:43 +00:00

asset_depreciations_and_balances

fix: value of depreciable assets not updating after manual depr entry [develop] (#35020)

2023-04-25 12:45:05 +05:30

balance_sheet

chore: Remove unnecessary list comprehension

2023-03-19 19:46:01 +05:30

bank_clearance_summary

fix: Payment entry with TDS in bank reco statement (#34961)

2023-04-25 19:17:13 +05:30

bank_reconciliation_statement

perf: use get_cached_value instead of db.get_value in accounts module

2022-11-03 13:38:48 +05:30

billed_items_to_be_received

style: format code with black

2022-03-28 18:52:46 +05:30

budget_variance_report

fix: add translate function to string on budget_variance_report.js to match the variance word translated

2022-10-25 22:24:33 -06:00

cash_flow

chore: remove print statement

2022-12-20 10:00:53 +05:30

consolidated_financial_statement

fix: CS financial statement param

2023-03-23 19:12:42 +05:30

customer_ledger_summary

refactor: hidden columns to help framework handle user permissions

2022-12-24 10:30:30 +05:30

deferred_revenue_and_expense

fix: removed an unnecessary check which always evaluates to true

2023-01-21 06:15:51 +05:30

delivered_items_to_be_billed

style: format code with black

2022-03-28 18:52:46 +05:30

dimension_wise_accounts_balance_report

perf: use get_cached_value instead of db.get_value in accounts module

2022-11-03 13:38:48 +05:30

general_ledger

fix: handle empty FBs properly in TB and GL [develop] (#35190)

2023-05-08 16:54:00 +05:30

gross_and_net_profit_report

fix: Gross and Net Profit Report - incorrect calculation of totals

2023-05-25 18:12:50 +05:30

gross_profit

fix(Gross Profit): 'company' column is ambiguous in filter

2023-05-25 14:18:41 +05:30

inactive_sales_items

refactor: use CURRENT_DATE instead of CURDATE() (#31356)

2022-06-15 12:07:33 +05:30

item_wise_purchase_register

fix: use base_net_amount in case of missing stock qty (#33457)

2022-12-29 09:34:51 +05:30

item_wise_sales_register

fix: port option for additional_conditions in item wise sales register (#35187)

2023-05-15 13:24:39 +05:30

payment_ledger

refactor: additional filters and columns in Payment Ledger report (#34577)

2023-03-24 12:25:03 +05:30

payment_period_based_on_invoice_date

fix: bulk fix (~330) missing translations

2022-04-04 13:59:51 +05:30

pos_register

fix: subtract change_amount from paid_amount field on POS Register (#30922)

2022-05-09 15:14:57 +05:30

profit_and_loss_statement

style: format code with black

2022-03-28 18:52:46 +05:30

profitability_analysis

Ignore Cancelled GL Entries

2022-05-31 15:25:09 +12:00

purchase_invoice_trends

style: format code with black

2022-03-28 18:52:46 +05:30

purchase_register

fix: Accounting Dimension filtering for Sales and Purchase Report

2022-11-18 15:07:12 +05:30

received_items_to_be_billed

style: format code with black

2022-03-28 18:52:46 +05:30

sales_invoice_trends

style: format code with black

2022-03-28 18:52:46 +05:30

sales_partners_commission

feat: Grant commission on certain items only (#27467)

2021-11-30 17:54:18 +05:30

sales_payment_summary

refactor: DB independent quoting and truthy/falsy values (#31358)

2022-06-17 17:01:27 +05:30

sales_register

fix: Accounting Dimension filtering for Sales and Purchase Report

2022-11-18 15:07:12 +05:30

share_balance

style: format code with black

2022-03-28 18:52:46 +05:30

share_ledger

style: format code with black

2022-03-28 18:52:46 +05:30

supplier_ledger_summary

refactor: remove unrelated filters from Supplier Ledger Summary

2022-12-24 11:20:39 +05:30

tds_computation_summary

fix: Tax withholding net total for PI in reports

2022-11-29 13:10:31 +05:30

tds_payable_monthly

Revert "fix: Rate from LDC in TDS reports (#33699)"

2023-04-25 10:13:07 +05:30

trial_balance

fix: handle empty FBs properly in TB and GL [develop] (#35190)

2023-05-08 16:54:00 +05:30

trial_balance_for_party

fix: opening entry causing discepancy between stock and trial balance

2022-09-23 15:21:09 +05:30

trial_balance_simple

Renamed field and added finance book column in the trial balance simple report

2019-01-22 14:11:57 +05:30

__init__.py

moved modules inside erpnext folder

2013-12-11 10:43:52 +05:30

financial_statements.html

fix: Show total row in print format of financial statement

2020-07-15 16:37:21 +05:30

financial_statements.py

fix: handle empty FBs properly in TB and GL [develop] (#35190)

2023-05-08 16:54:00 +05:30

non_billed_report.py

style: format code with black

2022-03-28 18:52:46 +05:30

utils.py

refactor: Exchange rate revaluation to handle accounts with zero account balance (#33165)

2023-01-02 14:33:14 +05:30