schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
48,118 Commits 322 Branches 1,581 Tags
09cefd9d63300bb74ed727a961be25b4c20892f2
Commit Graph

153 Commits

Author SHA1 Message Date
Deepesh Garg
9985a03f39 perf: Ignore is_opening column in GL Queries (#45327) 
* perf: Ignore is_opening column in GL Queries

* chore: Remove unwanted changes

* chore: Remove unwanted changes

* chore: Remove unwanted changes

* chore: Remove unwanted changes

* chore: Remove unwanted changes

* chore: Remove unwanted changes

(cherry picked from commit 993f40fa43)

# Conflicts:
#	erpnext/accounts/doctype/accounts_settings/accounts_settings.json
#	erpnext/accounts/doctype/accounts_settings/accounts_settings.py
 2025-02-07 10:06:07 +00:00
ljain112
510e3cebc9 fix: 'str' object has no attribute 'get_sql' 
(cherry picked from commit 9a43acb65c)
 2024-12-18 08:43:18 +00:00
ljain112
3a7e335d4b fix: using query.walk() for escaping 
(cherry picked from commit 5ea131c763)
 2024-12-17 15:09:08 +00:00
ljain112
8a9c457d37 fix: User permissions in financial statements 
(cherry picked from commit a626372d66)
 2024-12-17 15:09:08 +00:00
Ninad Parikh
8529eb4573 fix: Data Should be Computed in Backend to Maintain Consistent Behaviour (#44195) 
(cherry picked from commit 69bd90b038)
 2024-11-28 10:31:28 +00:00
Akhil Narang
4d34b1ead7 refactor(treewide): formatting and ruff fixes, + manually enabled F401 
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
 2024-04-10 17:13:31 +05:30
Gursheen Kaur Anand
837fff4533 Revert "fix(minor): financial statements period end date" 
(cherry picked from commit 73625a2622)
 2024-01-20 12:29:22 +00:00
Gursheen Anand
cbe15e159a fix: limit end date to current date 
(cherry picked from commit ab6e92aae1)
 2023-12-05 05:54:12 +00:00
mergify[bot]
043dc1b14b fix: asset depreciation ledger (backport #37991) (#37992) 
* 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>
 2023-11-08 23:36:17 +05:30
mergify[bot]
3044f46c52 fix: wrong currency on financial-statement based reports (#36524) 
fix: wrong currency on financial-statement based reports (#36524)

* add missing field options on financial_statement Total field

* format financial statement code

(cherry picked from commit ce25f9e8c9)

Co-authored-by: Naufal Afif <naufalafif58@gmail.com>
 2023-08-13 17:11:47 +05:30
Deepesh Garg
2912648151 fix: Group Account total not showing in Financial Statements 
(cherry picked from commit baf5cddd1b)
 2023-08-11 16:27:53 +00:00
mergify[bot]
5b562961e3 fix: root type in account map for balance sheet (#36303) 
* fix: root type in account map for balance sheet (#36303)

* fix: root type in account map

* fix: fetch gle by root type in consolidated financial statement

* refactor: consolidated financial statement gle query

* fix: filter accounts by root type

(cherry picked from commit 11bd15e580)

# Conflicts:
#	erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py

* chore: Resolve conflicts

---------

Co-authored-by: Gursheen Kaur Anand <40693548+GursheenK@users.noreply.github.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-08-01 10:14:34 +05:30
Deepesh Garg
800417eeed fix: Ignore account closing balance for financial statement 
(cherry picked from commit ccf1920a78)

# Conflicts:
#	erpnext/accounts/doctype/accounts_settings/accounts_settings.json
 2023-07-27 14:25:06 +00:00
mergify[bot]
d10e5e666b fix: Opening entries showing up incorrectly in TB report (#36135) 
fix: Opening entries showing up incorrectly in TB report (#36135)

* fix: Opening entries showing up incorrectly in TB report

* chore: Linting Issue

(cherry picked from commit 297c7e833c)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-07-14 18:46:28 +05:30
mergify[bot]
ebf3c0173e feat: Closing balance for period closing and reporting (#34257) 
* feat: Introduce opening entry for reporting

(cherry picked from commit 9739d8b52a)

* feat: Introduce opening entry for reporting

(cherry picked from commit b44a19bd1a)

* fix: Add patches to create accounting dimension in Closing Balance

(cherry picked from commit 36c08d0835)

* feat: Cascade closing balances on PCV submit

(cherry picked from commit c3f39c3f32)

# Conflicts:
#	erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py
#	erpnext/patches.txt

* feat: Add views in standard filter

(cherry picked from commit e18336ebe7)

* chore: Rewrite query using query builder

(cherry picked from commit 7fa7d6b5e4)

# Conflicts:
#	erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py

* feat: Add validations against period closing voucher

(cherry picked from commit f92c63fb10)

* fix: Order by issue in aggregation query

(cherry picked from commit 6607c8bd82)

* fix: Add patch to update closing balances

(cherry picked from commit a663df376c)

* fix: Closing balance entries for period closing voucher

(cherry picked from commit 436fc03eda)

* fix: Update patch to generate closing balance entries

(cherry picked from commit 95c9aafda9)

# Conflicts:
#	erpnext/patches.txt

* perf: Apply closing balance in Trial Balance report

(cherry picked from commit e5f603c9d9)

# Conflicts:
#	erpnext/accounts/report/trial_balance/trial_balance.py

* chore: Minor fixes

(cherry picked from commit c089c4156c)

# Conflicts:
#	erpnext/patches.txt

* fix: Aggregation with previous closing balance

(cherry picked from commit 4a2046dfb6)

# Conflicts:
#	erpnext/patches.txt

* test: Add static posting dates to tests

(cherry picked from commit 310f71c313)

* chore: Add index to period closing voucher column

(cherry picked from commit 5dabc98ba5)

* chore: rename Closing Balance to Account Closing Balance

(cherry picked from commit 3249a79f07)

* test: Add test case for closing balance

(cherry picked from commit f0267feca8)

* chore: Use account closing balance in set gl entries

(cherry picked from commit 0157fa15eb)

# Conflicts:
#	erpnext/accounts/report/financial_statements.py

* fix: Update patch

(cherry picked from commit 76775a3e49)

* fix: Account sub query

(cherry picked from commit 7f11373b58)

* chore: Simplify query

(cherry picked from commit 00fe3042b2)

# Conflicts:
#	erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py

* chore: Add missing validations

(cherry picked from commit 0aadb680eb)

* chore: Remove unnecessary list comprehension

(cherry picked from commit 44053db010)

# Conflicts:
#	erpnext/accounts/report/financial_statements.py

* fix: Ignore opening entries if PCV posted

(cherry picked from commit f9397a87ac)

# Conflicts:
#	erpnext/accounts/report/financial_statements.py

* fix: Don't validate if no GL Entry exists

(cherry picked from commit 528ab503f2)

* chore: Fix Typo

(cherry picked from commit 3fd95200da)

* fix: Validation for cancelation

(cherry picked from commit 30eb6c8512)

* fix: Partial trial balance view

(cherry picked from commit b7dcf27b01)

* fix: CS financial statement param

(cherry picked from commit f8cff09129)

* chore: Improve validation message

(cherry picked from commit 8ce1da111e)

* chore: Resolve conflicts

* chore: Resolve conflicts

---------

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-07-10 18:04:45 +05:30
Anand Baburajan
ed5f39c2c2 fix: handle empty FBs properly in TB and GL [v14] (#35189) 
fix: handle empty FBs properly in TB and GL
 2023-05-06 16:38:59 +05:30
Anand Baburajan
344c339484 fix: handle finance book properly in trial balance and general ledger [v14] (#35136) 
fix: handle FBs properly in general ledger and trial balance
 2023-05-03 07:11:01 +05:30
Rohit Waghchaure
69be22ba7c fix: select multiple values for accounting dimenssion 2022-05-14 17:19:34 +05:30
Ankush Menat
494bd9ef78 style: format code with black 2022-03-28 18:52:46 +05:30
Deepesh Garg
ed2c6b6637 fix: Incorrect provisional profit and loss in balance sheet 2022-02-02 22:36:45 +05:30
Nabin Hait
6099af5d00 fix: Fixed test case and sider issues 2022-01-31 17:43:37 +05:30
Nabin Hait
3dadfc9048 patch: Removed files and code related to old distributed cost center feature 2022-01-31 15:58:40 +05:30
Deepesh Garg
8a253ed1f3 Merge pull request #28238 from nextchamp-saqib/perf-financial-statements 
perf: improve financial statement loading time
 2021-11-09 16:29:58 +05:30
Ankush Menat
8fe5feb6a4 chore: remove all six compat code 2021-11-05 11:16:29 +05:30
Ankush Menat
897e90ac55 chore: remove past module dependencies 2021-11-05 11:16:29 +05:30
Ankush Menat
6098e92ba9 chore: remove utf-8 compat code 2021-11-05 11:16:29 +05:30
Saqib Ansari
b7a44fe0a3 perf: improve financial statement loading time 2021-11-03 18:17:31 +05:30
Chillar Anand
915b34391c chore: Clean up imports (#27302) 
* chore: Added isort to pre-commit config

* chore: Sort imports with isort

* chore: Clean up imports with pycln

* chore: Sort imports with isort

* chore: Fix import issues

* chore: Clean up sider issues

* chore: Remove import errors from flake8 ignore list

* chore: Clean up lint issues
 2021-09-02 16:44:59 +05:30
Ankush Menat
e46567192a fix: invalid escape sequences in regex 2021-09-01 16:57:17 +05:30
Ankush Menat
9891780f5a perf(minor): remove unnecessary comprehensions (port #25645) 2021-06-11 18:40:22 +05:30
Deepesh Garg
00e00e4e90 fix: Report summary showing inflated values when values are accumulated in Group Company (#25577) 
* fix: Report summary showing inflated values when values are accumullated in Group Company

* fix: Remove extra space

* fix: Translate strings

* fix: Remove unintended changes
 2021-05-07 12:16:44 +05:30
Deepesh Garg
82983369fa fix: Period list for exponential smoothing forecasting report (#24982) 2021-03-23 21:11:01 +05:30
Nabin Hait
ba1cca6b2d fix: Show accounts in financial statements upto level 20 (#23718) 2020-10-24 22:00:32 +05:30
Nabin Hait
111183d080 fix: Installation failed due to global variable (#23114) 2020-08-22 12:31:06 +05:30
Rohit Waghchaure
310ade7282 profit and loss report not working 2020-08-18 16:07:24 +05:30
Deepesh Garg
5beac7a0cc fix: Period list fixes in financial statements (#22677) 2020-07-15 12:17:43 +05:30
Deepesh Garg
7cb195b304 fix: Distributed cost center query 2020-07-10 13:33:50 +05:30
Deepesh Garg
5f4330621c Merge pull request #22231 from deepeshgarg007/financila_satement_immutable 
fix: Handle cancelled entries in financial statements
 2020-06-13 21:19:20 +05:30
Deepesh Garg
cc4943d54d fix: Distributed cost center query updation 2020-06-13 21:13:52 +05:30
Deepesh Garg
d80d442aa1 fix: Do not select cancelled entries in financial statements 2020-06-13 21:12:19 +05:30
Deepesh Garg
15231aa60d fix: Data not appearing properly for some fiscal_year in financial statemets 2020-06-13 19:26:39 +05:30
Karthikeyan S
e9ff6d3d52 feat(Cost Center): Distributed Cost Center (#21531) 
* feat: Distributed Cost Center

Squashed commit of the following:

commit 274236eb92dfddfd015583ee1e6b5e1937366d28
Author: Vignesh <kaviya.3111999@gmail.com>
Date:   Mon Mar 23 18:32:26 2020 +0530

    Fix: Indentation

commit beae0b9849f333dd1d9f29c27192ea7de2e4e809
Author: Vignesh <kaviya.3111999@gmail.com>
Date:   Mon Mar 23 18:26:50 2020 +0530

    The validations are added to distributed cost center.

commit 3f66943adacb5797338ef3510251bf6633be3dba
Author: Vignesh <kaviya.3111999@gmail.com>
Date:   Thu Mar 19 22:17:25 2020 +0530

    The distributed cost centers are shown with the percentage allocation in the reports

commit 1ac11df522096fa187d2f5863b4c970e18b37fac
Author: Vignesh <kaviya.3111999@gmail.com>
Date:   Thu Mar 19 13:36:04 2020 +0530

    The child table distributed cost center are added to cost center doctype and then validate percentage allocation.

* fix(Distributed Cost Center): validation and filters

* fix(Distributed Cost Center): financial statement query

* fix(Distributed Cost Center): add test cases

Co-authored-by: Vignesh S <svignesh0308@gmail.com>

* fix(Distributed Cost Center): budget variance, general ledger, profitability analysis reports.

* Merge branch 'develop' into develop-distributed-cost-center

* fix(Distributed Cost Center): Added DCC reflection in actual amount column of Budget Variance Report.

* Update creation field in general ledger report

Co-authored-by: Nabin Hait <nabinhait@gmail.com>

* creation field updated in gl_entries query

Co-authored-by: Nabin Hait <nabinhait@gmail.com>

Co-authored-by: KaviyaPeriyasamy <kaviya.3111999@gmail.com>
Co-authored-by: Vignesh S <svignesh0308@gmail.com>
Co-authored-by: KaviyaPeriyasamy <kaviyaperiyasamy22@gmail.com>
Co-authored-by: Kaviya Periyasamy <36359901+KaviyaPeriyasamy@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-06-08 12:20:21 +05:30
Rohit Waghchaure
e6147ed9bc feat: production forecasting using exponential smoothing method 2020-05-20 11:31:06 +05:30
Deepesh Garg
6c36cddbd3 Merge pull request #21188 from deepeshgarg007/dimension_filter_fix 
fix: Use separate condition for tree and normal doctype
 2020-04-07 15:23:36 +05:30
Deepesh Garg
62e9f83aab fix: Use separate condition for tree and normal doctype 2020-04-07 15:17:06 +05:30
Deepesh Garg
24a2c9b978 feat: Date range in financial statements (#21020) 
* feat: Date range in financial statements

* feat: Add date range filter in consolidated financial statement

* fix: Handle API changes in query_report

Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2020-04-07 12:16:25 +05:30
Deepesh Garg
433e58d131 feat: Add report summary in financial statements (#20876) 
* feat: Add report summary API for Balance Sheet  and PL report

* fix: Add summary cards in Cash flow report

* feat: Add report summary in consolidated financial statements

* fix: Remove accumulated values filter from P&L and cashflow report

* fix: set company default currency in profit and loss statement if no data

Co-authored-by: Prssanna Desai <prssud@gmail.com>
 2020-04-06 14:07:20 +05:30
Deepesh Garg
ed0965a572 feat: Nested set filtering for accounting dimension (#20860) 
* feat: Nested set filtering for accounting dimension

* fix: Remove print statement
 2020-03-17 10:53:24 +05:30
Deepesh Garg
30e766b228 fix: SQL query in financial statements 2020-02-05 12:12:47 +05:30
Deepesh Garg
589f2cd16c fix: Get only specified company accounts in financial statements (#20486) 2020-02-03 15:49:24 +05:30