ci2014
5d3e486415
Fix english typo in source code
...
Fix english typo in source code
2018-01-06 04:04:06 +01:00
Saurabh
eac2e369cf
[fix] setup alias for ifnull condition ( #12327 )
2018-01-05 12:48:08 +05:30
rohitwaghchaure
c5c6f82623
[Hotfix] Tax rate not showing in the report ( #12324 )
2018-01-05 12:16:16 +05:30
Saurabh
a6b41e855b
[fix] check if null for mode of payments ( #12264 )
2018-01-01 16:16:50 +05:30
rohitwaghchaure
dbb5ae9a9e
[fix] Closing balance showing at wrong side ( #12220 )
2017-12-28 13:15:21 +05:30
Nabin Hait
92615901a7
Fixed merge conflict
2017-12-25 13:41:04 +05:30
rohitwaghchaure
75789b65c2
[Fix] Sales payment summary report ( #12151 )
2017-12-25 11:26:15 +05:30
Nabin Hait
a5cc84f8af
Reverted gl entry splitting based on payment terms ( #12117 )
...
* Reverted gl entry splitting based on payment terms
* changed modified date
2017-12-21 11:37:18 +05:30
Vishal Dhayagude
7c57b6ecd8
[fix] Column Heading in received item to be billed report ( #12083 )
2017-12-19 11:23:34 +05:30
Nabin Hait
2a9dc9019a
Fixed closing debit/credit in general ledger report
2017-12-15 19:41:20 +05:30
Nabin Hait
9771b9376d
Merge branch 'master' into develop
2017-12-15 12:53:56 +05:30
Pawan Mehta
d6cb617520
Fix 11948 - Sales Payment Summary ( #11950 )
...
* [fix] #11948
* [fix] #11948
* [fix] #11948
* codacy issues
2017-12-14 18:04:31 +05:30
rohitwaghchaure
5759258dcf
[fix] Added total closing in general ledger ( #11961 )
2017-12-13 18:57:37 +05:30
pawan
1892454036
Add Total Row
2017-12-11 17:48:56 +05:30
Nabin Hait
5de499e5d5
Minor cleanups
2017-12-07 12:01:06 +05:30
pawan
271b7cd4f9
codacy issues
2017-12-07 12:01:00 +05:30
pawan
19f09b0b69
fix codacy issues
2017-12-07 12:00:06 +05:30
pawan
d8e91982ca
Fixed Merge conflict
2017-12-07 12:00:01 +05:30
Nabin Hait
c84476bd27
Fixed merge conflict
2017-12-06 14:17:51 +05:30
rohitwaghchaure
d52c64ff11
[fix] Show total for opening and closing dr/cr ( #11860 )
2017-12-06 13:14:28 +05:30
rohitwaghchaure
3a5ca927e7
[Fix] Asset depreciations and balances report showing wrong accumulated depreciation amount if multiple asset against same asset category ( #11848 )
...
* [Fix] Asset depreciations and balances report showing wrong accumulated depreciation amount if multiple asset against same asset category
* Update asset_depreciations_and_balances.py
2017-12-04 19:29:03 +05:30
Saurabh
34a0e90115
[fix] merge conflicts
2017-11-30 16:45:01 +05:30
Faris Ansari
ec3be9eebf
[hotfix] Party Type name ( #11797 )
2017-11-30 15:53:39 +05:30
Saurabh
ed4191ec5b
[fix] merge-conflicts
2017-11-22 18:01:56 +05:30
rohitwaghchaure
179e0c1d8d
Added party name in accounts receivable/payable report ( #11656 )
2017-11-20 11:18:55 +05:30
Nabin Hait
1c4653ed97
Merge branch 'develop' into payment-terms
2017-11-17 12:41:56 +05:30
Manas Solanki
eb3982044b
convert html into text in the taxes description as it can break the reports ( #11603 )
2017-11-16 14:11:39 +05:30
Pawan Mehta
bda07c6db4
Added Warehouse, Cost Center, Owner filters to Sales Register ( #11600 )
...
* [fix] #3668
* fix codacy space issue
2017-11-16 14:09:17 +05:30
Rushabh Mehta
d3f5d0961a
[feature] Opening Invoice Creation Tool ( #11589 )
...
* [enhance] Opening Invoice Tool create Opening Sales/Purchase Invoices
* [minor] added progress bar while creating invoice
* [minor] allow bulk upload for the invoices
* [minor] calculate item rate from net total
* [minor] added defaults for invoices fields, create gl entries only if grand_total is greater than 0
* [minor] check mandatory values before making opening invoices
* [minor] enable primary button if there is any error while creating invoices
* [minor] minor fixes, set company currency as invoice currency added tests
* [dashboard] added Opening Invoice Summery section in Dashboard
* [minor] added total invoices count on dashboard
* [minor] don't show dashboard if there are no opening invoices available
* [minor] added Opening Invoice Tools to Account's Tools section
* [minor] codecy fixes
* [fix] refactored general ledger and buttons on charts
* [fix] tests
2017-11-15 16:29:53 +05:30
tunde
ffa659fd2c
Merge branch 'develop' into payment-terms
2017-11-14 09:59:45 +01:00
Nabin Hait
15753074bf
Nestedset model fixes for changing parent and renaming ( #11467 )
2017-11-10 11:12:43 +05:30
Nabin Hait
e552a51266
Minor cleanups
2017-11-06 17:39:31 +05:30
pawan
436f7b980c
codacy issues
2017-11-06 17:39:31 +05:30
pawan
438dfc081b
fix codacy issues
2017-11-06 17:39:30 +05:30
pawan
d59225635d
remove old report
2017-11-06 17:39:30 +05:30
pawan
b699b86b76
Add Total Row
2017-11-06 17:39:30 +05:30
pawan
8d1d64aa29
[fix] #11449
2017-11-06 17:39:30 +05:30
pawan
e61a275651
[fix] #11427
2017-11-06 17:39:30 +05:30
Prateeksha Singh
6b26e391b8
use the new frappe charts :D ( #11391 )
2017-10-31 12:58:48 +05:30
tunde
09ce68ec19
Merge branch 'develop' into payment-terms
2017-10-19 17:47:31 +01:00
Saurabh
5fa2adcca9
Merge branch 'master' into develop
2017-10-18 16:23:44 +05:30
Prateeksha Singh
bfb108d722
Replace c3 ( #11112 )
...
* [charts] replace in asset.js
* replace in reports
2017-10-17 12:03:02 +05:30
Makarand Bauskar
80f333950b
[minor] fixed AttributeError: 'GrossProfitGenerator' object has no attribute 'grouped_data' ( #11195 )
2017-10-16 11:27:22 +05:30
tunde
3387d026b1
Merge branch 'develop' into payment-terms
2017-09-19 18:07:12 +01:00
Nabin Hait
bd4b80e3d8
Merge branch 'master' into develop
2017-09-19 12:05:41 +05:30
Nabin Hait
cf36534eed
Gross profit report considering returned items ( #10734 )
2017-09-18 19:13:45 +05:30
Saurabh
3f15bf9828
[fix] query fix for match conditions ( #10810 )
2017-09-18 15:27:24 +05:30
tundebabzy
c050c6945c
show error message if cannot get accounts details ( #10768 )
2017-09-13 15:27:30 +05:30
tunde
1255aa0f11
Merge branch 'develop' into payment-terms
2017-09-12 11:54:52 +01:00
Sagar Vora
d54d6bc572
[fix] use stock_qty in reports instead of qty to match with stock_uom ( #10727 )
2017-09-12 11:31:10 +05:30
Nabin Hait
f5cbb9c7b9
[fix] Actual amount for budget variance report
2017-09-11 13:58:15 +05:30
tunde
a19ea6e2f3
Merge branch 'develop' of https://github.com/frappe/erpnext into payment-terms
2017-08-29 15:26:50 +01:00
mbauskar
aaec42ebc2
resolved merged conflicts
2017-08-28 11:57:56 +05:30
Nabin Hait
bf4a974124
IMproved print format for AR/AP report ( #10528 )
2017-08-25 12:10:49 +05:30
Nabin Hait
caab582943
Tax breakup for actual amount and fixes in itemised purchase register ( #10515 )
...
* Tax breakup for actual amount and fixes in itemised pur register
* Rounding of itemised tax breakup amount
2017-08-24 16:22:28 +05:30
mbauskar
06f5ae0e78
Merge branch 'master' into develop
2017-08-23 13:06:43 +05:30
Saurabh
b903c86076
Merge pull request #10506 from nabinhait/hotfix677
...
Minor fix in itemised sales register
2017-08-23 11:13:31 +05:30
Nabin Hait
fcb2462902
Minor fix in itemised sales register
2017-08-23 09:44:33 +05:30
Nabin Hait
382f5eb1b1
Run sales/purchase register for one month by default ( #10493 )
2017-08-22 19:06:21 +05:30
tunde
d13fe18d30
Merge branch 'develop' into payment-terms
2017-08-22 14:18:11 +01:00
Nabin Hait
28d8557905
[fix] Taxes in itemised purchase register ( #10494 )
2017-08-22 15:30:45 +05:30
tunde
10fc880b06
Merge branch 'develop' into payment-terms
2017-08-21 18:27:46 +01:00
Nabin Hait
879e162cce
Additional GST related fields in Invoice and Sales/Purchase Register reort ( #10405 )
2017-08-21 08:28:55 +05:30
Nabin Hait
1f49f511aa
Tax rate in Itemised sales/purchase register and cleanups ( #10439 )
2017-08-21 08:05:12 +05:30
Nabin Hait
9275969b51
Payment Terms: doctypes, schedule, payments and more
...
fix payment terms template setup:
- add_fetch to correct credit_days and credit_months not credit_days_months
fixed bug in `make_customer_gl_entry` and `make_supplier_entry:
all sales invoice were failing because they were all attempting to
make gl entry from payment schedule. Same with purchase invoices
2017-08-20 16:51:29 +01:00
rohitwaghchaure
9ef1d0f5a5
[Fix] Balance sheet not working ( #10311 )
2017-08-08 11:23:25 +05:30
rohitwaghchaure
059f99e621
[Fix] Wrong avg. buying rate in the Gross Profit report ( #10110 )
2017-07-27 11:37:30 +05:30
Nabin Hait
8ad168ac67
Fixed merge conflict
2017-07-06 23:18:00 +05:30
rohitwaghchaure
bedb486c55
[Fix] Multi letter head showing in the print ( #9644 )
2017-07-06 14:50:38 +05:30
Makarand Bauskar
960208bae0
Merge pull request #9426 from tundebabzy/issue-9096
...
Gross Profit Does not display Reversal of sales invoice #9096
2017-07-03 15:23:21 +05:30
mbauskar
a06a600d0a
Merge branch 'master' into develop
2017-07-01 14:16:46 +05:30
Charles-Henri Decultot
53de2f1b57
Translation correction in P&L report ( #9436 )
2017-06-30 16:45:11 +05:30
mbauskar
22aaf0cbd0
[minor] fixed AttributeError: 'dict' object has no attribute 'company' in sales register
2017-06-30 16:43:25 +05:30
Rushabh Mehta
f4e908bd91
[minor] general_ledger.js
2017-06-27 11:56:30 +05:30
tunde
67cbeb1bb0
Merge branch 'develop' into issue-9096
2017-06-26 12:11:07 +01:00
Rushabh Mehta
919a74ad88
[gst] adde reports + docs
2017-06-22 22:32:08 +05:30
Rushabh Mehta
b3c8f44b3e
[wip] GST for India. Pending reports
2017-06-22 22:31:32 +05:30
tunde
96e629a635
adds credits notes to report since double entry for P or L affects sales
2017-06-22 10:04:33 +01:00
Rohit Waghchaure
a5f40941ae
[Enhance] Companywise perpetual inventory setting
2017-06-20 10:21:33 +05:30
mbauskar
f9e2bf1ab4
fixed merge conflicts
2017-06-15 13:42:47 +05:30
tundebabzy
5c9dd42547
fixes #9098 : don't skip calculation if income or expense is [] ( #9267 )
2017-06-14 14:57:34 +05:30
rohitwaghchaure
4c0f9dac94
Total amount not showing for credit note column in the print ( #9278 )
2017-06-14 12:54:48 +05:30
Makarand Bauskar
0da5f23db6
[minor] fixed Cannot read property 'default_letter_head' of undefined ( #9268 )
2017-06-14 12:52:13 +05:30
rohitwaghchaure
1b2b4a626f
[Fix] Accounts receivable report showing wrong currency for total amount against the customer ( #9276 )
2017-06-14 12:32:52 +05:30
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
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
Chris Ian Fiel
fde03453e4
Cash Flow Report
2015-12-12 10:54:56 +08:00
Chris Ian Fiel
826e18a29f
Cash Flow Report
2015-12-12 10:33:01 +08:00
Giovanni Lion
5de53eb0eb
Voucher dynamic link fix to allow links to work if user language is not english
2015-12-09 15:45:40 +08:00
Nabin Hait
7af5c4aefc
[fix] Print format for bank reco statement
2015-12-08 14:25:10 +05:30
Nabin Hait
9547b774f7
[fix] Fixed amounts not reflected in bank
2015-12-04 11:05:25 +05:30
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
ec1695dbe3
[fix] Bank Reconciliation in account currency
2015-11-30 15:23:46 +05:30
Anand Doshi
602e8253be
[enhancement] Int, Currency, Float, Percent as not null and default to 0
2015-11-19 13:23:36 +05:30
Anand Doshi
c5c6c0669f
[fix] gross profit
2015-11-12 11:07:32 +05:30
Nabin Hait
c3ced9a0b5
[fix][report] Buying amount for product bundle in Gross Profit report
2015-11-05 13:13:31 +05:30
Rushabh Mehta
58101e9e6c
Merge pull request #4272 from nabinhait/report-fix1
...
[report] Added delay in payment column
2015-11-04 13:18:42 +05:30
Nabin Hait
b4a51ec80b
[report] Added delay in payment column
2015-11-04 13:09:48 +05:30
Saurabh
b7f0a4961e
- no delivery / reserve warehouse in drop ship
...
- “Re-open” in DN / PR after “Stop” / “Close"
- check for closed status in reports
2015-11-04 12:03:54 +05:30
Saurabh
a8a91cca16
[feature] Close feature for Purchase Receipt and Delivery Note
2015-11-02 12:57:08 +05:30
Nabin Hait
fc9031924e
[fix] Field type of Age field converted to Int
2015-10-12 15:47:07 +05:30
Rushabh Mehta
83c0899c83
[fix] [minor] default ranges for demo
2015-10-02 11:31:37 +05:30
Nabin Hait
5c623dae4d
[fix] General Ledger report fixed
2015-10-01 11:22:15 +05:30
Anand Doshi
15d2c89939
Merge remote-tracking branch 'upstream/master' into develop
...
Conflicts:
erpnext/accounts/report/general_ledger/general_ledger.py
2015-09-30 17:13:58 +05:30
Anand Doshi
cd0989e051
Added method get_account_currency
2015-09-30 15:11:12 +05:30
Nabin Hait
44bd3b2601
[fix] Fetch gl entries in receivable/payable report only if party mentioned
2015-09-25 10:33:51 +05:30
Nabin Hait
1b6c00e2c7
[report] Trial Balance for Party
2015-09-25 09:18:03 +05:30
Rushabh Mehta
8f2b8afcb7
[fix] gl entry report if not filtered
2015-09-24 15:03:53 +05:30
Nabin Hait
262ac09305
[fix] Currency symbol fixed in Accounts receivable/payable report #4020
2015-09-17 13:24:14 +05:30
Anand Doshi
979326b0b1
minor fixes in multi-currency
2015-09-11 16:33:45 +05:30
Nabin Hait
2377cdfa4e
Fixed conflict
2015-09-09 18:45:41 +05:30
Nabin Hait
83dd3e14e5
[fix] Gross Profit report should not include return entries
2015-09-09 10:37:04 +05:30
Nabin Hait
4d62d7867e
[report] Bank Reconciliation Statement in account currency
2015-09-04 13:26:45 +05:30
Nabin Hait
76bb927337
Fixed conflict
2015-08-31 17:28:05 +05:30
Nabin Hait
699751c531
[report] Accounts Receivable / Payable in multi currency
2015-08-31 17:02:04 +05:30
Nabin Hait
06b15bfd63
[report] General Ledger in multi currency
2015-08-31 15:39:03 +05:30
Nabin Hait
1901ca5a45
[fix] Fixed gross profit report due to removal of designation field from Sales Team table
2015-08-31 12:02:50 +05:30
Nabin Hait
3a990d946d
[fix] In general ledger report, consider cost center in group by voucher
2015-08-24 17:21:01 +05:30
Rushabh Mehta
da24698cf7
[minor] in ap, ar renamed label for date as 'as on date' as it was confusing
2015-08-24 14:31:07 +05:30
Anand Doshi
e116cb596c
[hotfix] [report] payment period based on invoice date
2015-08-13 17:25:20 +05:30
Rushabh Mehta
1828c12481
[refactor] added dynamic link in journal entry, #3847
2015-08-12 12:28:33 +05:30
Anand Doshi
ba9dbb1b09
[minor] removed Link/DocType in Payment Period Based on Invoice Date
2015-08-03 11:05:45 +05:30
Rushabh Mehta
1e8025b327
[cleanup] yes/no selects changed to checks in Item
2015-07-29 11:38:33 +05:30
Anand Doshi
14859faf17
[minor] Accounts Payable Report Type='Script Report'
2015-07-24 17:30:39 +05:30
Nabin Hait
f666535223
[fix] gross profit report
2015-07-23 17:08:44 +05:30
Rushabh Mehta
fec61fe33e
[minor] fix report type for Accounts Payable
2015-07-23 10:39:13 +05:30
Nabin Hait
e2b8ccf1bb
[report] Letter Head option in General Ledger report
2015-07-21 12:02:36 +05:30
Neil Trini Lasrado
ed8cecbdd8
Sales BOM renamed to Product Bundle
2015-07-13 12:41:27 +05:30
Rushabh Mehta
f3b0b95b15
[fix] [filter] for general ledger
2015-07-13 10:24:25 +05:30
Rushabh Mehta
fc3d87181a
[fix] cart and general leger report
2015-07-10 10:11:07 +05:30
Nabin Hait
885c70984d
[fix] Always show Sales invoice in Gross profit report
2015-07-02 14:09:49 +05:30
Nabin Hait
be496bc91c
[fix] Trial Balance opening
2015-06-18 10:33:20 +05:30
Nabin Hait
59f063e5c3
[fix] opening balance in general ledger report
2015-06-18 10:33:20 +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
1ac9f2f50d
[fix] Opening balance in trial balance and general ledger based on is_opening
2015-06-17 15:09:40 +05:30
Nabin Hait
a123638d37
[fix][report] Payment period based on invoice date
2015-06-16 15:21:00 +05:30
Nabin Hait
810041cbe3
[fix] Fixed error due to performance upgrade cleanup
2015-06-15 10:20:11 +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
909f0c38f1
[report][enhancement] Payment period based on invoice date: show party columns and filter based on party
2015-06-09 18:42:52 +05:30
Nabin Hait
0b18a2d347
Reset values in tools like Payment Tool
2015-06-05 12:01:29 +05:30
Nabin Hait
352187bee6
purchase register fix
2015-06-03 12:06:19 +05:30
Nabin Hait
5359f2651a
[fix] sales register report
2015-06-03 11:24:37 +05:30
Nabin Hait
8908543a9c
In standard print format, item name will now honour 'Print Hide' property
2015-06-01 14:01:56 +05:30
Nabin Hait
6ee8c545e3
[fix] gross profit report
2015-05-29 10:39:09 +05:30
Nabin Hait
5b8db3729c
[fix] General ledger print format
2015-05-27 13:02:59 +05:30
Nabin Hait
d4c8dc2915
multiple minor fixes
2015-05-26 16:32:30 +05:30
Nabin Hait
f61f76ba45
[fix] gross profit report
2015-05-25 14:13:03 +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
0a705fe582
gross profit report fix
2015-05-19 11:12:06 +05:30
Nabin Hait
b45d4e0e16
In general ledger report opening amount is purely based on posting date
2015-05-12 17:40:14 +05:30
Nabin Hait
4b9b92ba2f
minor fix in report
2015-05-12 15:12:30 +05:30
Nabin Hait
a0b1124d6f
minor fix in report
2015-05-06 11:59:43 +05:30
Anand Doshi
e6ac87e86f
Gross Profit Report: Company filter should be reqd
2015-04-30 15:33:31 -07:00
Nabin Hait
2db8dc922a
fixed trial balance related to showing zero balance
2015-04-29 18:39:33 +05:30
Nabin Hait
6e59aca394
[enhancement] sort root accounts as assets, liability, equity, income, expense
2015-04-29 13:08:00 +05:30
Nabin Hait
59ab65ded6
fixed trial balance related to showing zero balance
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
Nabin Hait
47e5c764c3
[fix] accounts payable report
2015-04-28 16:45:32 +05:30
Rushabh Mehta
38c6b52770
[rename] group_or_ledger to is_group
2015-04-23 13:14:17 +05:30
Nabin Hait
b650d691a0
fixed conflict
2015-04-21 17:16:28 +05:30
Nabin Hait
5c7f0bcb32
Party filter and columns in general ledger report
2015-04-20 17:13:53 +05:30
Rushabh Mehta
92b253dceb
Update accounts_receivable.py
2015-04-18 12:13:57 +05:30
Nabin Hait
4743cbe002
issue fixed in accounts receivable report
2015-04-17 15:55:19 +05:30
Rushabh Mehta
9e6812cfab
Merge pull request #3108 from BhupeshGupta/fix_bank_reports
...
Add/Fix Bank Reports Filters
2015-04-17 14:17:22 +05:30
bhupeshg2
3f59615555
switch to tabs
2015-04-15 22:29:45 +05:30
bhupeshg2
e2e973f7be
Add reqd to bank clearance aummary report
...
Add filters if filters are in list form to get_account_list [erpnext.controllers.queries.get_account_list] query
2015-04-14 23:09:32 +05:30
Anand Doshi
68dfc934bf
[hotfix] [report] Received Items to be Billed
2015-04-14 11:56:42 -04:00
Rushabh Mehta
20bcf6aeff
[fixes] print_hide on stock uom and gross profit
2015-04-13 15:31:24 +05:30
Rushabh Mehta
b4c4351513
[report] fix via error report
2015-04-13 11:30:10 +05:30
Anand Doshi
0dc79f4de0
Merge remote-tracking branch 'frappe/v4.x.x' into develop
...
Conflicts:
.travis.yml
erpnext/__version__.py
erpnext/controllers/queries.py
erpnext/hooks.py
erpnext/selling/sales_common.js
erpnext/stock/doctype/bin/bin.py
erpnext/stock/doctype/stock_entry/stock_entry.js
erpnext/stock/doctype/stock_entry/stock_entry.py
erpnext/stock/stock_ledger.py
setup.py
2015-04-06 13:21:07 +05:30
Anand Doshi
6208c49859
Added Company field in various Query Reports
2015-03-30 15:21:20 +05:30
Nabin Hait
7057970c0c
purchase order items to be billed report
2015-03-26 11:05:13 +05:30
Nabin Hait
53450b08b0
Fixes in general ledger report
2015-03-24 13:13:25 +05:30
Anand Doshi
885e074697
Changed company name from Web Notes to Frappe Technologies
2015-03-03 14:56:43 +05:30
Nabin Hait
851c745fdf
Merge branch 'develop' of https://github.com/frappe/erpnext into v5.0
2015-02-26 12:32:04 +05:30
Nabin Hait
79ffc2b3a7
fix in financial statements
2015-02-25 18:32:25 +05:30
Nabin Hait
82e3e25cdb
fixes for base_rate, base_amount, tax_amount: mass search and replace
2015-02-24 10:02:28 +05:30
Rushabh Mehta
e8a37949cf
[issue fixes] + added fixtures for item attribute and operation
2015-02-20 20:10:11 +05:30
Nabin Hait
5690be103c
Replaced renamed total fields in code files
2015-02-12 16:09:11 +05:30
Nabin Hait
15cd12214e
Fixed conflict while merging v4 into v5
2015-02-10 16:37:18 +05:30
Nabin Hait
1dc8ff5220
item-wise tax distribution if amount entered in actual
2015-02-04 18:06:59 +05:30
Anand Doshi
b942cb86ae
[minor] auto-create Fiscal Year, loading, general ledger
2015-01-19 15:59:45 +05:30
Nabin Hait
e8500ad4e6
Multiple fixes
2015-01-10 16:05:17 +05:30
Anand Doshi
015fa7a1d1
[fix] escape quote in Accounts Receivable
2015-01-08 18:26:53 +05:30
Nabin Hait
23d2a53017
Code replacement for journal voucher renaming
2014-12-25 17:14:18 +05:30
Nabin Hait
e7d153624f
Table Field Renaming: code replace, JV and budget distribution renamed
2014-12-25 16:01:55 +05:30
Nabin Hait
abfc72ded4
Merge pull request #2450 from ankitjavalkarwork/fix2363
...
Add print formats for Acc. Receivable/Payable and Summary reports
2014-12-11 17:40:54 +05:30
Nabin Hait
d57b57a21d
Minor fix in accounts receivable report
2014-12-09 11:56:13 +05:30
ankitjavalkarwork
35db282765
Fix gross_profit.py, commonify and add elementwise grouping to report
2014-12-04 13:08:42 +05:30
Rushabh Mehta
ec9db4b799
[report] gross profit WIP
2014-12-04 12:37:39 +05:30
Rushabh Mehta
969069fbf9
[report] gross profit WIP
2014-12-04 12:37:39 +05:30