Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
38,619 Commits 3 Branches 0 Tags 1 GiB
7a5d75b68d
Commit Graph

38 Commits

Author SHA1 Message Date
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
Deepesh Garg
57e326e7d0
fix: Consolidated balance sheet showing incorrect values (#26975) 2021-08-21 17:59:11 +05:30
Ankush Menat
4551d7d602
chore: mass trailing whitespace and EOF fixes 2021-08-19 13:43:28 +05:30
Afshan
53e3435770
fix: remove cancelled entries in consolidated financial statements (#26330) 2021-07-06 14:37:21 +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
Saqib
384f4b5b7e
fix: can't open general ledger from consolidated financial report (#25542) 2021-05-04 12:33:49 +05:30
Ankush Menat
000fa824d3
fix: use account_name only in consolidated report 
Don't use account_number and only rely on account_name for preparing
consolidated financial statement.

Related issue: ISS-20-21-10217
 2021-03-10 15:23:48 +05:30
rohitwaghchaure
164ffac4ef fix: Consolidated Financial Statement report not works if child company account not present in parent company (#24580) 
Fixed conflicts
 2021-02-12 17:33:07 +05:30
barry86m
5b381ac5b7
fix: consolidated financial statement sums values into wrong parent 
fix proposed by Andriesvn in bug report

closes #22180
 2020-09-08 00:27:57 +01:00
Nabin Hait
111183d080
fix: Installation failed due to global variable (#23114) 2020-08-22 12:31:06 +05:30
Deepesh Garg
1f3fe59e36
fix: Default period start date and period end date for financial statements (#22011) 2020-05-28 18:36:21 +05:30
Deepesh Garg
fa2eecc5fc fix: Report summary fix in consolidated financial statement for report type Profit and Loss 2020-04-28 13:12:22 +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
ba44f28202 fix: Filtering fixes in financial statement 2020-01-31 09:08:29 +05:30
Deepesh Garg
ef41a0eda5 fix: Finance book filtering in financial statements (#20410) 
* fix: Finance book filtering in financial statements

* fix: Use IS NULL instead of ifnull
 2020-01-27 15:18:51 +05:30
Saurabh
90d7a8888f fix: pass missing argument while generating consolidated financial statement for cash flow type (#18398) 2019-07-22 11:22:34 +05:30
Rohit Waghchaure
5f9793e081 fix: finance book filters includes the gl data which don't have finance book 2019-06-18 21:09:52 +05:30
Rohit Waghchaure
7aee809571 fix: If finance book filter is not set then show all the entries 2019-04-16 19:35:18 +05:30
Frappe Bot
eb4969d24f Merge branch 'staging' into develop 2018-11-15 09:26:03 +00:00
Rohit Waghchaure
704796b1cb Code optimization for consolidated financial statement report 2018-11-15 13:46:18 +05:30
Rohit Waghchaure
9d0f90975b [Fix] Consolidated financial statement report currency conversion issue 2018-11-15 12:55:20 +05:30
Rohit Waghchaure
a95697f506 Added currency filter in consolidated financial statement report 2018-11-14 19:55:44 +05:30
Ameya Shenoy
da10f6ebd8
Merge branch 'staging' into develop 2018-10-04 11:51:30 +00:00
Rohit Waghchaure
ea0ef95539 [Fix] Consolidated Financial Statement report 2018-09-28 17:05:55 +05:30
Nabin Hait
1e7c32b909
Payroll fixes and more (#15475) 
* fix(payroll): multiple minor fixes related to salary structure

* Added GSTR-1 and GSTR-2 report in Accounts module page

* delete asset movement records on cancellation of Purchase Receipt

* Update consolidated_financial_statement.py

* minor fix

* minor fix

* add filters on item prices report (#15495)
 2018-09-26 18:01:00 +05:30
Suraj Shetty
bfc195dd8b Changes to support refactor in frappe pg-poc branch (#15287) 
* Remove quotes from sql to make it compatible with postgres as well

* Fix queries
- Replace mysql specifc queries with standard ones

* Make repo URL chages to test pg-poc

* Add root passowrd to test site config

* Fix quotes issue

* Remove debug flag from a pricing rule query

* Remove python 3.6 version from travis.yml

* Fix improper query issue

* Fix incorrect query

* Fix a query

- This fix need to be changed when we will  start supporting postgres
since date_format is not supported by postgres

* Get price list map as dict

* Convert price_list_currency_map to dict
 2018-09-21 10:20:52 +05:30
Saif
772dc6e82c Various permission fixes (#15448) 
* Removed test letter head from Consolidated Financial Statement

* Removed incorrect role permissions
 2018-09-20 13:20:17 +05:30
rohitwaghchaure
7e36aa4162
Merge pull request #15150 from rohitwaghchaure/fix_consolidated_balance_sheet_report 
[Fix] Consolidated balance sheet report
 2018-08-15 19:41:41 +05:30
Rohit Waghchaure
cafd61de85 [Fix] Consolidated balance sheet report 2018-08-15 16:18:46 +05:30
Rushabh Mehta
708e47aadf optimize(various) 2018-08-08 16:37:31 +05:30
rohitwaghchaure
83a2612a18 [Fix] Consolidated Financial Statement report (#14537) 2018-06-15 18:03:50 +05:30
Rohit Waghchaure
c89a84b61e Fixed data not displaying in financial reports 2018-05-28 15:01:57 +05:30
Rohit Waghchaure
f61e94e162 Changed condition of finance book in reports 2018-05-18 09:10:07 +05:30
Rohit Waghchaure
8e4f676c8c [Fix] onload set default employee, leave approver, company 2018-05-16 19:55:52 +05:30
Nabin Hait
dc75be8b6c Show company column in order in consolidated financial statement 2018-04-26 12:16:38 +05:30
Rohit Waghchaure
26decaad6c [Fix] Profit and loss statment 2018-04-26 12:16:38 +05:30
rohitwaghchaure
efff6e53de Consolidated financial statement (#13678) 
* added fields to support treeview

* tree file added, nestedset implemented

* patch added to reload doc and configure lft rgt

* Added consolidated financial statement report
 2018-04-26 12:16:18 +05:30