Saurabh
797f2030f8
Merge branch 'master' into develop
2017-06-13 15:20:13 +05:30
Ashwini Save
7f14f28099
Account Receivable - Credit Note column added to print format. ( #9230 )
...
* Account Receivable - Credit Note column added to print Format.
* Review changes for translation: Account Receivable add credit note column
* Review changes for translation: Account Receivable add credit note column
* Review changes for translation: Account Receivable add credit note column
2017-06-13 11:18:39 +05:30
Nabin Hait
d0ac0bdc18
Merge branch 'master' into develop
2017-06-12 13:50:12 +05:30
rohitwaghchaure
97fd21a01d
[Fix] Accounts receivable summary report not loading data because credit note column was missing ( #9191 )
...
* [Fix] Accounts receivable summary report not loading data because credit note column was missing
* Create accounts_receivable_summary.py
2017-06-09 14:05:10 +05:30
Nabin Hait
a128b21baa
Fixed merge conflict
2017-06-07 12:17:17 +05:30
Nabin Hait
17378e8a29
Added a new column for Credit/Debit Note in AR/AP report ( #9123 )
2017-06-07 11:56:53 +05:30
Faris Ansari
ab74ca7fff
Lint and fix JS files
2017-05-30 12:54:42 +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
Faris Ansari
734d7795f8
Show party name in General Ledger print report ( #8760 )
2017-05-11 11:38:30 +05:30
Makarand Bauskar
464f108586
[minor] added currency in Totals for Trial Balance report ( #8757 )
...
* [minor] added currency in Totals for Trial Balance report
* [minor] used erpnext.get_default_currency to fetch the company currency
2017-05-10 19:40:36 +05:30
Ishan Loya
120ee275cc
Fix typo ( #8719 )
2017-05-06 12:48:22 +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
Nabin Hait
39bcb3de4b
Merge branch 'accumulated_header_std' of https://github.com/RicardoJohann/erpnext into RicardoJohann-accumulated_header_std
2017-04-25 16:13:54 +05:30
Nabin Hait
e3c122d8c4
AR report: filter based on customer group and credit days based on field. Fixed #8214
2017-04-24 19:06:07 +05:30
Rohit Waghchaure
dd70fbfdae
[fix] Letter head not showing in the report
2017-04-24 18:57:51 +05:30
mbauskar
bb2670d57a
[fixes] minor fixes in bank reconciliation form and report
2017-04-24 10:23:50 +05:30
mbauskar
1e05077b1f
[minor] sales register report fixes
2017-04-14 09:59:49 +05:30
mbauskar
2f9703c20e
[minor] set company_currency as account_currency in general ledger if party type is employee
2017-04-11 18:56:41 +05:30
Nabin Hait
731efe3a95
Minor fix in gross profit report
2017-04-03 12:11:36 +05:30
Nabin Hait
2c892c7e7f
Indentation fixed in gross profit report
2017-04-03 12:05:35 +05:30
Nabin Hait
b15d999147
Merge branch 'develop' into gross_profit_issue_v_8
2017-03-31 17:39:45 +05:30
Rushabh Mehta
cc8b2b2fdb
[fix] [refactor] demo for v8 and remove purchase common
2017-03-31 17:36:48 +05:30
Rohit Waghchaure
34b1dba9aa
[fix] get_valuation_rate takes 4 arguments 3 given in gross profit report
2017-03-31 12:44:10 +05:30
Ricardo Johann
033e2fa8b6
changed accumulated header
2017-03-31 02:18:54 -03:00
Nabin Hait
1f6bd0ad37
Fixed merge conflict
2017-03-30 13:15:22 +05:30
Ricardo Johann
3d1434afe7
Export total labels
2017-03-29 17:44:17 +05:30
Nabin Hait
77c970549b
In gross profit report, if incoming rate not found from last sle, consider average valuation rate
2017-03-28 12:20:31 +05:30
Rohit Waghchaure
faedf8274c
[fix] gross profit permission issue
2017-03-14 14:56:24 +05:30
Nabin Hait
1ed8bc4c36
Gross Profit report: Consider Sales team table only if grouped by sales person
2017-03-12 17:10:41 +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
b3ffd6b282
Merge pull request #7828 from rohitwaghchaure/update_user_roles_to_roles
...
Changed userrole to has role, commonify role editor of the user
2017-03-06 18:44:53 +05:30
Nabin Hait
e68f32cf19
UOM Conversion in selling
2017-03-06 16:41:13 +05:30
Rohit Waghchaure
611a70a12a
changes in the report roles
2017-03-06 16:36:46 +05:30
Rohit Waghchaure
e7485150a1
added roles in the report
2017-03-06 14:26:09 +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
Rushabh Mehta
e6aa3b435a
[minor] added make material request from Stock Entry and removed cur_frm
2017-02-09 17:47:22 +05:30
Nabin Hait
6ff0caa87a
Fixed merge conflict
2017-02-08 11:33:33 +05:30
Nabin Hait
6f93cd5bd0
Merge pull request #7692 from rohitwaghchaure/minor_fixes_v_7_2
...
Minor fixes
2017-02-08 11:21:54 +05:30
Rohit Waghchaure
b3489548a9
minor fix
2017-02-08 11:20:04 +05:30
Rohit Waghchaure
38f808cfae
[Fix] Buying rate in gross profit report
2017-02-01 13:34:06 +05:30
rohitwaghchaure
ea092a7b24
[Enhancement] Booking of an employee's expense claim ( #7267 )
...
* [Enhancement] Auto book of an employee's expense claim
* test cases
* documentation
* fixes and changes
* removed payable from employee and added into the company
* Added party in account, patch to update party type for customer and supplier accounts
* added party type in erpnext, fix patch
* fixed travis
2017-02-01 12:02:08 +05:30
Ricardo Johann
34354237fd
added project filter to gl and carry project filter from P&L
2017-01-24 06:46:07 -03:00
Nabin Hait
349d520ae2
Fixed merge conflict
2017-01-20 15:44:35 +05:30
Rohit Waghchaure
93c001455f
[Fix] Account user not able to access the report
2017-01-20 14:18:17 +05:30
Nabin Hait
1c91dc4589
Merge pull request #7475 from RobertSchouten/profitability_order
...
[fix] profiability analasyis orderby name
2017-01-17 12:39:24 +05:30
robert schouten
1a92d54dcb
[fix] profiability analasyis orderby cost center name
2017-01-13 14:52:11 +08:00
Nabin Hait
007c87ea63
Merge pull request #7440 from nabinhait/gle_repost_optimization
...
Optimization to reduce GLE reposting time for future stock transactions
2017-01-13 11:33:42 +05:30
robert schouten
d56627f2b7
[fix] profiability analasyis orderby project name
2017-01-13 11:53:43 +08:00
Nabin Hait
6e9d2a3c1f
fixed conflict
2017-01-09 17:21:34 +05:30
Kanchan Chauhan
f4832cf2b9
[Enhancement] Summary link on Accounts Payable and Accounts Receivable
2017-01-03 16:29:41 +05:30
Rohit Waghchaure
5a383e5cdd
[Enhancement] Consolidated billed report, changed type from query to script
2017-01-02 16:20:43 +05:30
Nabin Hait
9784d27317
Optimization to reduce GLE reposting time for future stock transactions
2016-12-30 16:21:35 +05:30
rohitwaghchaure
34e820d02d
[Enhancement] Added letter head for the report ( #7250 )
2016-12-20 16:54:24 +05:30
Rohit Waghchaure
f4074c2029
[Fix] Budget variance report
2016-12-12 16:48:14 +05:30
Nabin Hait
58667ab123
Fixed merge conflict
2016-12-09 15:49:24 +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
Nabin Hait
43df804176
Fixed renamed fieldname
2016-12-09 15:09:11 +05:30
Nabin Hait
7f3da5dbb1
Fixed merge conflict
2016-11-28 14:23:51 +05:30
Nabin Hait
50a240e758
Merge pull request #7061 from rohitwaghchaure/cost_center_issue
...
[Fix] Cost center group not showing data in the P&L report
2016-11-28 12:42:48 +05:30
Nabin Hait
a78c463e97
Multiple minor fixes
2016-11-27 16:32:41 +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
Nabin Hait
d855167b9b
Fixed merge conflict
2016-11-21 19:13:22 +05:30
Nabin Hait
651d8e996b
Merge pull request #7020 from nabinhait/balance_sheet_fix
...
Provisional Loss related fix in Balance Sheet. Fixed #6918
2016-11-21 19:06:42 +05:30
Nabin Hait
3d5ef804b2
Provisional Loss related fix in Balance Sheet. Fixed #6918
2016-11-21 18:53:05 +05:30
Nabin Hait
542bf8f7d4
Party filter and total row for opening and closing in trial balance for party report
2016-11-21 16:58:50 +05:30
Nabin Hait
c29c5210f9
Merge pull request #6972 from RobertSchouten/bankstatement
...
[fix] update bank recon statement printing for payment entries
2016-11-18 12:50:40 +05:30
robert schouten
0a1f3e4058
[fix] financial printing and add to profitability
2016-11-18 10:54:01 +08:00
robert schouten
a943535520
[fix] update bank recon statement printing for payment entries
2016-11-17 14:33:28 +08:00
Rushabh Mehta
4bfa0748cd
[merge] master
2016-11-16 11:28:23 +05:30
rohitwaghchaure
48cb3d89b6
[Fix] Opening balance calculation issue for balance sheet ( #6945 )
2016-11-16 11:18:49 +05:30
Rushabh Mehta
24f658d633
[fix] [minor] accounts receivable not translated ( #6943 )
2016-11-16 11:13:46 +05:30
Nabin Hait
95e6ccd419
Merge branch 'master' into develop
2016-11-14 12:42:26 +05:30
Rohit Waghchaure
387c2846aa
[Report] Company not found in the filter for making auto email report
2016-11-10 19:13:20 +05:30
Valmik
38cc16a806
[fix] minor typo
2016-11-08 14:11:12 +05:30
Nabin Hait
622c05cc60
Merge pull request #6724 from rohitwaghchaure/bank_clearance_report_issue
...
[Fix] No permission to read report Bank Clearance Summary for account user
2016-10-27 13:48:19 +05:30
Rohit Waghchaure
53a28eb39d
[Fix] No permission to read report Bank Clearance Summary for account user
2016-10-27 11:46:10 +05:30
Kanchan Chauhan
dc3198a11c
[Fix] Error in Balance Sheet Report
2016-10-26 13:05:08 +05:30
Kanchan Chauhan
025fbd8f14
Customer group added to Gross Profit report
2016-10-20 12:54:06 +05:30
Nabin Hait
0702fa2fc6
Fixed version conflict
2016-10-19 16:49:36 +05:30
Saurabh
afceac620c
[fix] calculate variance only for submitted budgets
2016-10-19 12:49:48 +05:30
Nabin Hait
437b32d32c
Added filter to show unclosed fiscal year's P&L balances in trail balance
2016-10-17 16:57:52 +05:30
Nabin Hait
425bdee0ec
Merge branch 'unclosed_finance' of https://github.com/RobertSchouten/erpnext into RobertSchouten-unclosed_finance1
2016-10-17 16:46:54 +05:30
Nabin Hait
5fd5a77750
Fixed version conflict
2016-10-03 14:13:50 +05:30
Nabin Hait
b498eb5f9e
Minor fix AR/AP
2016-10-01 15:51:59 +05:30
Rohit Waghchaure
c1a3e379d8
[Fixed] Accounts receivable concat issue
2016-09-30 13:18:06 +05:30
Nabin Hait
80499bb657
Fixed merge conflict
2016-09-29 14:18:53 +05:30
Nabin Hait
f1d2fd2436
[fix] Accounts Receivable report if negative write off in invoice
2016-09-29 13:03:10 +05:30
Rohit Waghchaure
7441a93a10
[Fix] sub-heading is missing in the excel sheet of the cash flow
2016-09-28 14:57:57 +05:30
Nabin Hait
706612bcd4
Fixed version conflict
2016-09-26 18:11:56 +05:30
Rushabh Mehta
fc800b3f2f
[enhance] added roles for portal users frappe/frappe#2091 ( #6452 )
2016-09-23 21:51:51 +05:30
pawan
09f1ee637e
[fix] #6371
2016-09-23 17:19:54 +05:30
Nabin Hait
e5c7d4b987
Fixed version conflict
2016-09-22 11:33:51 +05:30
Nabin Hait
a58a65457f
Sales Register report minor fix
2016-09-22 11:31:42 +05:30
Nabin Hait
0be6073f10
Fixed version conflict
2016-09-21 13:06:19 +05:30
Nabin Hait
aac32d644d
Fix in Sales Register for multiple mode of payments
2016-09-21 11:46:07 +05:30
Kanchan Chauhan
006a0e68bf
Against Voucher Type and Against Voucher added to GL
2016-09-19 13:44:52 +05:30
Rohit Waghchaure
b78eb2b6f2
[Fix] Financial Statements reports are running very slow
2016-09-14 13:33:27 +05:30
Nabin Hait
97b661f995
Merge pull request #6334 from RobertSchouten/patch-27
...
[fix] itemwise sales register add sales invoice to delivery note when…
2016-09-12 17:53:10 +05:30
Nabin Hait
1d8d93d9ad
Update balance_sheet.py
2016-09-12 17:43:14 +05:30
robert schouten
4fc70d962b
add customer and supplier names to some reports
2016-09-12 15:23:51 +08:00
robert schouten
ea3b342dde
fix display unclosed values for trial/balance/sheet
2016-09-12 14:37:58 +08:00
RobertSchouten
bd979ec1ed
[fix] itemwise sales register add sales invoice to delivery note when update stock
...
in item wise sales register put sales invoice into delivery note field when delivery note is null and update stock ticked
2016-09-12 09:46:10 +08:00
RobertSchouten
5ae21053bd
fix for closing balance typo
2016-09-06 15:44:09 +08:00
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
