rohitwaghchaure
8c96e06e19
Merge pull request #16629 from Anurag810/gross-and-net-profit-report
...
feat: Gross and Net Profit Report
2019-03-04 16:57:21 +05:30
Saurabh
3dd7ddd838
Merge branch 'master' into develop
2019-02-21 18:25:29 +05:30
Rohit Waghchaure
90691dc0d8
(Profit and Loss Statement, fix): for parent account value was showing as zero
2019-02-21 17:18:28 +05:30
Anurag Mishra
a032f0528e
new report gross-and-net-profit-report
2019-02-11 13:12:44 +05:30
Frappe Bot
fdd5d54d41
Merge branch 'staging' into develop
2019-01-05 09:11:15 +00:00
Charles-Henri Decultot
94e35e7a7e
Fix #15917 ( #16311 )
2019-01-01 22:25:13 +05:30
Ameya Shenoy
ea42980de6
Merge branch 'staging' into develop
2018-11-06 11:17:24 +00:00
rohitwaghchaure
9eafe8c23e
Update financial_statements.py
2018-11-06 13:28:18 +05:30
Nabin Hait
614b042ed3
fix(encoding): Fixed encoding issue in financial statements
2018-11-06 11:48:51 +05:30
Ameya Shenoy
8075a576f9
Merge branch 'staging' into develop
2018-11-05 06:53:27 +00:00
Zarrar
16d45c8e2e
safe encode non ascii characters ( #15755 )
2018-11-02 13:17:24 +05:30
Charles-Henri Decultot
a89bce0b6e
Encoding correction ( #15877 )
2018-11-01 13:18:49 +05:30
Saurabh
6a916943aa
fix(P&L): sql query
2018-10-26 13:46:52 +00:00
Ameya Shenoy
7658bdc00a
Merge branch 'staging' into develop
2018-10-23 08:06:15 +00:00
Ameya Shenoy
a0e533ede5
Merge branch 'master' into staging-fixes
2018-10-22 10:37:14 +00:00
Nabin Hait
91eac5a7cf
fix(report): Optimization for financial statements
2018-10-22 15:05:40 +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
Nabin Hait
3a342e8d93
fix(report): project filter in financial statement
2018-09-07 14:17:57 +05:30
Nabin Hait
b479a87031
fix(report): Cost center filters in financial statements and general ledger
2018-09-07 13:17:23 +05:30
Zarrar
93577665f2
[Enhance] Multiselect for Cost Center and Project ( #15208 )
...
* add filter for Cost Center, make CC & Project multiselect field
* update queries according to project/cost_center multiselect
* add multiselect filter for cost_center and project
* update query according to multiselect
2018-08-27 12:08:53 +05:30
Rushabh Mehta
708e47aadf
optimize(various)
2018-08-08 16:37:31 +05:30
Rohit Waghchaure
9a9974f5c3
[Fix] 'ascii' codec can't encode error in balance sheet report
2018-08-07 16:51:56 +05:30
Nabin Hait
eed3d4c1b3
Fixed Merge Conflict
2018-07-31 12:36:16 +05:30
rohitwaghchaure
91d2ace9bb
Account no + account name in trial balance and financial statements reports ( #15038 )
2018-07-30 10:38:51 +05:30
Rohit Waghchaure
c89a84b61e
Fixed data not displaying in financial reports
2018-05-28 15:01:57 +05:30
Achilles Rasquinha
efb731941d
ran 2to3, evaluation ( #13499 )
...
* ran 2to3, evaluation
* Update update_gstin.py
* Update accounts_receivable_summary.py
2018-05-23 11:31:24 +05:30
Rohit Waghchaure
f61e94e162
Changed condition of finance book in reports
2018-05-18 09:10:07 +05:30
Rohit Waghchaure
f689d01a0c
Added finance book in Asset Depreciation Ledger report, fixed asset issue
2018-05-17 23:29:37 +05:30
Nabin Hait
b9fed2aa38
Removed company from Finance Book and related changes
2018-05-09 15:10:29 +05:30
Gaurav Naik
a78a0e241f
Added finance book filtering logic to financial_statements.py
2018-05-09 15:03:40 +05:30
Nabin Hait
af98f5d14d
Sort accounts by account number in financial statements ( #13423 )
2018-04-02 10:14:32 +05:30
Achilles Rasquinha
9050998e06
[FIX] use text_type instead of unicode, use cmp from past.builtins
2018-03-08 12:55:41 +05:30
Achilles Rasquinha
96698c9a77
Use range instead xrange ( #13128 )
...
* Use range instead of xrange
* convert float to int
2018-02-28 16:12:51 +05:30
Achilles Rasquinha
a3555aa7bd
[FIX] sorting multiple compares
2018-02-23 17:22:07 +05:30
tundebabzy
c89782502c
Report presentation currency ( #12670 )
...
* Add new Select to filters
* get the currencies from database rather than hardcoded
* label report columns:
- If presentation currency is available in filters, use it or
- If company is available in filters, use it or
- use default company currency
* add new function - get_currency
* tweak new function `get_currency`
* add new function `convert` to convert a value to another currency
* add new function `convert_to_presentation_currency`
* clean up `get_currency` first pass
* memoise the exchange rates
* limit fetched GL entries to to_date
* check if account type is p&l or not and use appropriate exchange rate based on that
* change EXCHANGE RATE to a dict, use for memoisation
* rename EXCHANGE_RATE
* cache exchange rates and use them as needed
* add docstrings
* add presentation currency logic to financial statement reports
* move new functions from `general_ledger.py` to new module
* clean up
* PEP 8 clean up
* move function to util.py
* PEP 8 clean up
* remove presentation currency option from cashflow
* adjust currency as needed
* allow users to save presentation currency in Accounts Settings
* add new function `get_presentation_currency_list`
* refactor query_report modules with no promises
* Revert "allow users to save presentation currency in Accounts Settings"
This reverts commit 3b58a6296cf3f7b4d80ac55b03f9d5d4887b796b.
* show print page in correct currency
* Update utils.py
2018-02-12 15:04:50 +05:30
tundebabzy
c050c6945c
show error message if cannot get accounts details ( #10768 )
2017-09-13 15:27:30 +05:30
rohitwaghchaure
9ef1d0f5a5
[Fix] Balance sheet not working ( #10311 )
2017-08-08 11:23:25 +05:30
Charles-Henri Decultot
53de2f1b57
Translation correction in P&L report ( #9436 )
2017-06-30 16:45:11 +05:30
rohitwaghchaure
177a26849d
[fix] Trial balance not working ( #8937 )
2017-05-19 18:56:25 +05:30
Rushabh Mehta
6799e27390
[fix] chart of accounts root sorting, #8784 , #8897 ( #8904 )
2017-05-18 16:21:21 +05:30
Nabin Hait
932423ecba
Balance Sheet always shows accumulated values from previous fiscal year ( #8668 )
2017-05-04 12:12:29 +05:30
Nabin Hait
d5d8db7a3f
Cleanup on financial statement PR
2017-04-25 16:26:33 +05:30
Ricardo Johann
033e2fa8b6
changed accumulated header
2017-03-31 02:18:54 -03:00
Ricardo Johann
3d1434afe7
Export total labels
2017-03-29 17:44:17 +05:30
Nabin Hait
33fb6ae323
Fixed merge conflict
2017-03-08 11:18:15 +05:30
Rohit Waghchaure
9f4317e9b8
minor fix
2017-03-06 23:42:45 +05:30
Nabin Hait
5079c9ef47
Fixed merge conflict
2017-02-22 15:31:31 +05:30
Rohit Waghchaure
49523d7f80
[Fix] Company fiscal year issue in financial statement
2017-02-21 14:20:26 +05:30
Nabin Hait
9784d27317
Optimization to reduce GLE reposting time for future stock transactions
2016-12-30 16:21:35 +05:30
Nabin Hait
b00df641e0
Fixed period end date if year starts in the middle of the month
2016-12-09 15:09:11 +05:30
Rohit Waghchaure
bca0d73e1c
[Fix] Cost center group not showing data in the P&L report
2016-11-25 14:54:34 +05:30
Rohit Waghchaure
b78eb2b6f2
[Fix] Financial Statements reports are running very slow
2016-09-14 13:33:27 +05:30
Rohit Waghchaure
6462ba4e0b
minor changes
2016-08-26 12:42:52 +05:30
Rohit Waghchaure
5794ffd43d
added filters project and cost center in profit and loss statement, open profit and loss statement on click of cost center/project in profitability analysis
2016-08-24 19:12:14 +05:30
Rohit Waghchaure
ca4d9b54cd
fixed accumulated values for cash flow
2016-08-22 17:51:58 +05:30
Rohit Waghchaure
26b646f8a3
Added validation for fiscal year
2016-08-21 17:14:12 +05:30
Rohit Waghchaure
4275c30059
[Enhancement] Multi year financial statements
2016-08-19 18:04:32 +05:30
Nabin Hait
44c1b8e63b
Line/Bar chart in Balance Sheet / Profit and Loss statement
2016-05-26 15:26:01 +05:30
Nabin Hait
443a7c13e4
[fix][balance sheet] Check if previous fiscal year is closed
2016-03-21 14:38:32 +05:30
Nabin Hait
3883e86ad7
[fix] Trial Balance report, showing rows with zero values
2016-03-10 12:01:01 +05:30
Nabin Hait
acb28954ff
[fix][report] Show group rows with zero values if there are values against children
2016-03-04 12:32:44 +05:30
Nabin Hait
bd7f48cfd4
[report] Financial Statements: Accumulated periodic balance based on filters
2016-02-02 19:05:43 +05:30
ShashaQin
cc6ce5beac
Update financial_statements.py
2016-02-02 19:05:42 +05:30
Nabin Hait
226a101119
[fix] Currency symbol based on account/company currency, not based on Global Defaults
2016-01-12 11:56:40 +05:30
Nabin Hait
8b33a6cdc0
Cleanup in cash flow
2015-12-16 16:09:43 +05:30
Chris Ian Fiel
826e18a29f
Cash Flow Report
2015-12-12 10:33:01 +08:00
Rushabh Mehta
29cca2352c
[hot] [fix] trial balance report
2015-12-01 18:17:33 +05:30
Nabin Hait
8c4e043747
[feature] Allowed custom root accounts in Chart of Accounts
2015-12-01 10:34:43 +05:30
Nabin Hait
e91025c0aa
[fix] Opening balance in trial balance and general ledger based on is_opening
2015-06-17 15:35:06 +05:30
Nabin Hait
6b01abe9ad
[report][performance] Speed increased by approx 10 times in Trial Balance, General Ledger, AR/AP, Balance Sheet and P&L Statement
2015-06-14 20:59:28 +05:30
Nabin Hait
4c924bb76c
totals etc should not be clickable
2015-05-21 13:38:03 +05:30
Rushabh Mehta
555fa4fbc2
[fix] totals etc should not be clickable
2015-05-20 17:21:53 +05:30
Pratik Vyas
803e998e9d
Fix merge mistakes
2015-05-19 13:08:54 +05:30
Pratik Vyas
1a84d8ecd2
Merge branch 'develop'
2015-05-19 12:23:52 +05:30
Nabin Hait
6e59aca394
[enhancement] sort root accounts as assets, liability, equity, income, expense
2015-04-29 13:08:00 +05:30
Rushabh Mehta
0590cdceab
[enhancement] sort root accounts as assets, liability, equty, income, expense
2015-04-29 12:26:15 +05:30
Anand Doshi
885e074697
Changed company name from Web Notes to Frappe Technologies
2015-03-03 14:56:43 +05:30
Nabin Hait
79ffc2b3a7
fix in financial statements
2015-02-25 18:32:25 +05:30
Nabin Hait
fd90571d49
fiscal year validation in financial statement
2014-08-06 17:25:23 +05:30
Anand Doshi
cb86d597b7
Report: Trial Balance
2014-07-22 19:49:16 +05:30
Anand Doshi
5f0459c321
Fixes to Financial Statements
2014-07-21 16:13:06 +05:30
Anand Doshi
f457bce0e7
Changed localize_date to formatdate
2014-07-21 12:03:04 +05:30
Anand Doshi
db4ba39824
Better handling of ignore zero values
2014-07-21 11:43:19 +05:30
Anand Doshi
825d014616
Commonfied code for Financial Statements and added Profit and Loss Statement
2014-07-21 11:43:18 +05:30
