449 Commits

Author	SHA1	Message	Date
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
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
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
Nabin Hait	28d8557905	[fix] Taxes in itemised purchase register (#10494)	2017-08-22 15:30:45 +05:30
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
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