Nabin Hait
15b26d8b1a
Fixed merge conflicts
2016-09-02 14:29:57 +05:30
Nabin Hait
13b37c6346
Default letter head in report printing based on selected company
2016-09-02 11:25:42 +05:30
Rushabh Mehta
b2f0920346
[minor] new global for query report filters
2016-09-01 17:53:42 +05:30
Nabin Hait
4403cf71b5
Merge pull request #6152 from rohitwaghchaure/profitability_report
...
[Report] Profitability Analysis
2016-08-26 13:21:01 +05:30
Rohit Waghchaure
6462ba4e0b
minor changes
2016-08-26 12:42:52 +05:30
Neil Trini Lasrado
067245933e
Fixed Demo
2016-08-25 18:31:42 +05:30
Rohit Waghchaure
1e8732abc2
removed old report
2016-08-24 19:20:58 +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
1255a6627e
project based profitability Analysis
2016-08-24 18:01:39 +05:30
Rohit Waghchaure
78e08b8af5
[Report] Profitability Analysis
2016-08-24 18:00:22 +05:30
Rohit Waghchaure
fb432821bf
[Report] Cost center wise profitability
2016-08-24 18:00:22 +05:30
Nabin Hait
26f9673ad9
Merge pull request #6126 from rohitwaghchaure/multiyear_financial_statements
...
[Enhancement] Multi year financial statements
2016-08-23 11:32:08 +05:30
Rohit Waghchaure
ca4d9b54cd
fixed accumulated values for cash flow
2016-08-22 17:51:58 +05:30
Pawan Mehta
bee3b40725
Update gross_profit.py
2016-08-22 17:47:13 +05:30
pawan
18bb431baa
[fix] #6089
2016-08-22 17:27:22 +05:30
pawan
851e05672c
[fix] #6089
2016-08-22 14:25:17 +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
50f8262ac7
Currency fix in reports
2016-08-18 16:14:23 +05:30
Rohit Waghchaure
e78ef5f8c8
[Fix] No permission to read DocType for account user in bank reconciliation statement report
2016-08-11 00:46:15 +05:30
Rushabh Mehta
ec2d09c557
[minor] setting up website optional in setup wizard
2016-08-09 16:44:37 +05:30
Nabin Hait
c30c342bdf
[fix] Label for ageing cols in AR/AP report
2016-08-08 11:47:13 +05:30
Rushabh Mehta
9421a109cf
[fix] reports template
2016-07-29 18:52:00 +05:30
Rushabh Mehta
176b63b354
[fix] remove first row on mapping, fixes #5707
2016-07-14 17:43:48 +05:30
Rushabh Mehta
528e145a54
[docs] fixes #5697
2016-07-14 17:00:05 +05:30
Nabin Hait
221fa98b51
Payment Entry: Payment period based on invoice date
2016-07-04 11:42:24 +05:30
Nabin Hait
16d6959d01
Payment Entry included in Bank Reconciliation and related reports
2016-07-04 11:42:24 +05:30
Saurabh
7fecb50360
[enhance] rename warehouse account type to stock
2016-06-26 14:27:46 +05:30
Nabin Hait
a531ebea8a
Merge branch 'master' into develop
2016-06-21 16:44:05 +05:30
Rushabh Mehta
6e837599b1
[minor] added cost center to item wise sales register, fixes #5301
2016-06-08 16:35:10 +05:30
Rohit Waghchaure
690a0805f6
[Fixes] Purchase register, showing wrong value for total amount if tax has deducted.
2016-06-07 10:46:59 +05:30
Nabin Hait
9a5cf6000e
[fix] Test cases and editable fields settings for request for quotation
2016-06-01 12:54:26 +05:30
Nabin Hait
919b1b9d5b
Merge pull request #5408 from neilLasrado/hotfix-2
...
Fixed error in Gross Profit report
2016-05-31 17:41:19 +05:30
Neil Trini Lasrado
efccb8a704
Fixed error in Gross Profit report
2016-05-27 13:24:02 +05:30
Nabin Hait
0014aa9c26
[fix] Charts in report
2016-05-27 12:21:36 +05:30
Nabin Hait
591a5aba56
Added Project in GL Entry and General Ledger report
2016-05-26 17:51:20 +05:30
Nabin Hait
b46d021f2a
Charts on reports / activity page, deprecated financial analytics report
2016-05-26 15:26:01 +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
28bdff5a55
Pie chart for ageing analysis in accounts receivale/payable
2016-05-26 15:26:01 +05:30
Nabin Hait
ca90963d5b
Redesigned budgets
2016-05-23 13:04:26 +05:30
Nabin Hait
563bd056d7
Merge branch 'master' into develop
2016-05-20 12:18:28 +05:30
Saurabh
c0c8af06da
[fixes] set default bank account in bank reconciliation statement report
2016-05-19 12:32:08 +05:30
Nabin Hait
1daebc04d0
Merge pull request #5360 from neilLasrado/hotfix
...
Fixed reports
2016-05-18 10:39:19 +05:30
Neil Trini Lasrado
4668a69cf5
Fixed reports
2016-05-17 19:04:08 +05:30
Nabin Hait
825070e504
Merge pull request #5331 from nabinhait/multi-fix-55
...
Multiple fixes
2016-05-12 12:27:42 +05:30
Nabin Hait
b81ed45b2b
fixed conflict
2016-05-11 12:52:31 +05:30
Nabin Hait
b3a0e05bae
included path fixed in report print formats
2016-05-11 12:38:11 +05:30
Nabin Hait
3323d06be0
Mode of Payment columns and filters added in sales/purchase register
2016-05-10 13:17:02 +05:30
Nabin Hait
b78adcf279
Merge branch 'master' into develop
2016-04-29 18:26:46 +05:30
Neil Trini Lasrado
c33b5b74c6
Itemwise purchase and Itemwise sales
2016-04-29 18:21:51 +05:30
Rushabh Mehta
be2ee18de4
[fixed] frappe.require is now async 💥
2016-04-29 17:22:42 +05:30
Nabin Hait
6146cc1e33
Merge branch 'master' into develop
2016-04-29 11:44:55 +05:30
Nabin Hait
314246939f
[report][fix] Item-wise tax calculation if item appears multiple times in the same invoice
2016-04-28 17:32:36 +05:30
Nabin Hait
b7b7f0062d
[report][fix] Consider taxes only the tax contributed in invoice total
2016-04-28 17:31:27 +05:30
Neil Trini Lasrado
4c95ed49ed
Fixed Currency Symbol in Trial Balance and Trial Balance for Party reports
2016-04-27 13:09:17 +05:30
Anand Doshi
c6479bcbb6
Merge pull request #5264 from neilLasrado/hotfix
...
Fixed Currency Symbol in Trial Balance and Trial Balance for Party re…
2016-04-27 12:32:05 +05:30
Neil Trini Lasrado
b93d525c96
Fixed Currency Symbol in Trial Balance and Trial Balance for Party reports
2016-04-25 17:18:52 +05:30
Nabin Hait
85a2776e91
Depreciation Schedule considering already booked depreciations for existing asset and testcases
2016-04-20 17:57:12 +05:30
Nabin Hait
318fa287df
[report] Asset Depreciations and Balances
2016-04-20 17:57:12 +05:30
Nabin Hait
e58c26edca
[report] Added asset depreciation ledger report
2016-04-20 17:57:12 +05:30
Rushabh Mehta
0525387328
[enhancement] added reserved_qty_for_production in bin and updated item dashboard
2016-04-18 19:27:46 +05:30
Nabin Hait
972c25f78d
Fixed conflict
2016-04-14 18:25:53 +05:30
Nabin Hait
471908ab9f
Merge pull request #5194 from nabinhait/gross_profit_fix
...
Gross profit fix
2016-04-12 18:57:45 +05:30
Nabin Hait
f509d13d28
[fix] Get average selling rate based on group by
2016-04-12 17:01:39 +05:30
Nabin Hait
3912a31a6f
Merge pull request #5176 from nabinhait/ar_ap_print_currency
...
Currency column in AR/AP and Sales/Purchase register report
2016-04-11 17:13:04 +05:30
Nabin Hait
f945e10cce
Currency column in AR/AP and sales/purchase register report
2016-04-11 11:56:57 +05:30
Nabin Hait
94360cca20
[fix] received and delivered items to be billed report based on percentage billed
2016-04-04 17:40:33 +05:30
Nabin Hait
4f10f15686
[fix] Modified date changed in query report due to project field renaming
2016-04-01 17:59:06 +05:30
Rushabh Mehta
b2269dd326
[fix] back links from project web view
2016-03-23 18:29:00 +05:30
Nabin Hait
443a7c13e4
[fix][balance sheet] Check if previous fiscal year is closed
2016-03-21 14:38:32 +05:30
Umair Sayyed
8cbc076dc2
fixes in the Account Receivale print format - with Nabin
2016-03-17 15:12:31 +05:30
Neil Trini Lasrado
6e343e23d9
Renamed project_name to project
2016-03-15 17:50:53 +05:30
Nabin Hait
f853a92676
Fixes in AR/AP Print Format
2016-03-15 16:10:15 +05:30
Nabin Hait
3883e86ad7
[fix] Trial Balance report, showing rows with zero values
2016-03-10 12:01:01 +05:30
Anand Doshi
065d24b26d
Merge pull request #4951 from shreyasp/gross-profit-wn-sup17486
...
[Minor] Remove Warehouse column while user groups by 'Item code' in Gross profit report
2016-03-09 14:22:16 +05:30
shreyas
7c42995949
[Minor] Remove Warehouse column while user groups by 'Item code' in Gross profit report
2016-03-09 13:15:38 +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
patilsangram
a812d67837
[fixes]
2016-02-23 19:04:29 +05:30
patilsangram
bf2b511988
[Removed Stop Button from SO and PO]
2016-02-22 16:24:23 +05:30
Anand Doshi
620252cadb
[fix] validate Fiscal Year in Trial Balance
2016-02-15 12:03:04 +05:30
ShashaQin
bcc56a4557
Update gross_profit.py
...
Gross Profit report improvement
2016-02-04 11:45:00 +08:00
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
ShashaQin
15d7224335
Update balance_sheet.py
2016-02-02 19:05:42 +05:30
ShashaQin
1f51e71827
Update profit_and_loss_statement.py
2016-02-02 19:05:42 +05:30
Nabin Hait
002fa6c1d9
Merge pull request #4650 from RicardoJohann/patch-2
...
Accounts - Bank reconciliation - Workflow and labeling improvements
2016-01-20 17:03:06 +05:30
RicardoJohann
e095eeb084
Update bank_reconciliation_statement.py
2016-01-20 13:36:36 +08:00
RicardoJohann
6f9afffd8a
Update bank_reconciliation_statement.html
2016-01-20 12:15:20 +08:00
Nabin Hait
6d8688f8b4
[fix] Currency in Gross Profit report
2016-01-19 17:27:06 +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
Rushabh Mehta
7be0b47778
[minor] [fix] validate fiscal year in trial balance
2016-01-11 11:59:08 +05:30
Rushabh Mehta
eb961370ff
[translations] fixes #4532
2016-01-04 15:48:37 +05:30
Nabin Hait
b6b56453e1
[fix] Get defaults based on doctype or fieldname
2015-12-23 16:37:06 +05:30
Nabin Hait
afda26e4f3
Fixed conflict
2015-12-17 12:19:58 +05:30
Chris Ian Fiel
d6d354b5c3
By: nabinhait
...
Depreciation account is an expense account, it is debited while booking depreciation. Thats why Depreciation amount is coming as negative, I think it should be positive and added to the "Net Profit and Loss".
2015-12-17 09:42:12 +08:00
Chris Ian Fiel
7d310bd182
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2015-12-17 09:18:24 +08:00
Nabin Hait
8b33a6cdc0
Cleanup in cash flow
2015-12-16 16:09:43 +05:30
Nabin Hait
5e173c7106
Merge branch 'develop' of https://github.com/ccfiel/erpnext into ccfiel-develop
2015-12-15 17:39:55 +05:30
Nabin Hait
8bdf8e675f
[fix][report] General Ledger
2015-12-15 15:02:04 +05:30
Chris Ian Fiel
c80796cdd5
Cash Flow Report
2015-12-12 11:26:54 +08:00
