brotherton-erpnext

Author	SHA1	Message	Date
casesolved-co-uk	2cb0da8780	fix: rewrite to allow referring to existing sections and reduce to single amount column	2021-05-13 12:53:10 +00:00
casesolved-co-uk	1c37390899	fix: Change & simplify query to cater for zero rate tax entries	2021-05-13 12:53:10 +00:00
casesolved-co-uk	442a0de094	fix: finalise query, fix bugs, put Add Columns back	2021-05-13 12:53:10 +00:00
casesolved-co-uk	ece00287ea	Refactor for Journal Entries (payroll)	2021-05-13 12:53:10 +00:00
casesolved-co-uk	3027cc7da6	fix: minor bug and tidy	2021-05-13 12:53:10 +00:00
casesolved-co-uk	5d9217ab29	fix: minor bugs and improvements	2021-05-13 12:53:10 +00:00
casesolved-co-uk	8e413651c2	fix: major refactor to monkey-patch into the QueryReport class	2021-05-13 12:53:10 +00:00
casesolved-co-uk	dba4b3cd13	feat: add run mode, add tests, various fixes	2021-05-13 12:53:10 +00:00
Richard Case	ef8ab135c9	develop: progress tax detail report	2021-05-13 12:53:10 +00:00
casesolved-co-uk	a5d47f70b8	Fleshed out report setup functionality	2021-05-13 12:53:10 +00:00
casesolved-co-uk	3503598735	Initial commit of Tax Detail report and report builder	2021-05-13 12:53:10 +00:00
Deepesh Garg	8e748f8451	fix: Parameter for get_filtered_list_for_consolidated_report in consolidated balance sheet	2021-05-13 15:21:51 +05:30
Deepesh Garg	95e05fbdac	fix: Parameter for get_filtered_list_for_consolidated_report in consolidated balance sheet	2021-05-13 14:59:28 +05:30
Saqib	27cf19a19f	feat(pos): show POS reserved stock in stock projected qty report (#25593 ) * feat(pos): consider POS reserved stock in stock projected qty report * chore: remove unwanted string formats	2021-05-07 13:37:42 +05:30
Deepesh Garg	00e00e4e90	fix: Report summary showing inflated values when values are accumulated in Group Company (#25577 ) * fix: Report summary showing inflated values when values are accumullated in Group Company * fix: Remove extra space * fix: Translate strings * fix: Remove unintended changes	2021-05-07 12:16:44 +05:30
Saqib	384f4b5b7e	fix: can't open general ledger from consolidated financial report (#25542 )	2021-05-04 12:33:49 +05:30
Saqib	076020643d	fix: empty payment term column in accounts receivable report (#25556 )	2021-05-04 12:26:49 +05:30
Afshan	6d3305c446	fix: added total column	2021-04-21 15:34:58 +05:30
Rohit Waghchaure	cb6494876f	feat: purchase receipt creation from purchase invoice	2021-04-10 10:49:30 +05:30
Afshan	c42318ec24	chores: clean up	2021-04-09 17:44:30 +05:30
Afshan	31b5dfe9ee	feat: Dimension-wise Accounts Balance Report	2021-04-09 16:52:14 +05:30
Saqib	0586b7db79	feat: discount configuration on early payments (#24586 ) Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-03-31 15:03:53 +05:30
Deepesh Garg	82983369fa	fix: Period list for exponential smoothing forecasting report (#24982 )	2021-03-23 21:11:01 +05:30
Ankush Menat	59fdee4dfa	Merge branch 'develop' into consolidated_report_acc_name_fix	2021-03-10 16:35:59 +05:30
Ankush Menat	000fa824d3	fix: use account_name only in consolidated report Don't use account_number and only rely on account_name for preparing consolidated financial statement. Related issue: ISS-20-21-10217	2021-03-10 15:23:48 +05:30
Afshan	e314b8b209	fix: general ledger report (#24770 )	2021-03-09 20:31:57 +05:30
Afshan	1002e36c53	fix: removed unused import	2021-03-08 14:39:19 +05:30
Afshan	fa932e2a3e	fix: sending proper arguments for report	2021-03-08 14:36:40 +05:30
UrvashiKishnani	27ea23223d	fix: total row in AR/AP summary report	2021-03-04 09:21:25 +04:00
rohitwaghchaure	164ffac4ef	fix: Consolidated Financial Statement report not works if child company account not present in parent company (#24580 ) Fixed conflicts	2021-02-12 17:33:07 +05:30
Jannat Patel	0a7939277c	fix: dynamic links for reports (#24462 ) * fix: dynamic links for reports * fix: revert changes for payment period report * fix: link doctypes	2021-02-11 20:11:06 +05:30
Anuja Pawar	ffb36aac8f	fix: fixing item_code not found error in the report (#24483 )	2021-02-05 23:35:47 +05:30
Suraj Shetty	0a8939e1c1	Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui	2021-01-29 08:56:22 +05:30
Deepesh Garg	b4be292217	fix: Item valuation for internal stock transfers (#24200 ) * fix: Item valuation for internal stocktransfers * fix: Consider conversion factor for invoices * fix: Add missing set warehouse fields * fix: Add validations and other fixes * fix: Fixes in flow * fix: Internal sales item link in Purchase Invoice * fix: Debugging * fix: Debug travis * fix: Remove commented code * fix: Rate forcing in sales order * fix: Unreallized profit in Sales Register * fix: Item wise gst sales register fix * fix: From warehouse in Purchase Order * fix: Target field in Sales Invoice * fix: remove self * fix: GST Purchasse register and other fixes * fix: Add shipping_address to no field map * fix: Ref doc map * fix: Test Cases * fix: address mapping between sales and purchase document * fix: Import Error * fix: Tax updation for internal invoices * fix: Purchase Order and Invoice linking * fix: Internal Party validation fix * fix: validation * fix(india): GST Taxes for intra state transfer * fix(india): GST Taxes for intra state transfer Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-01-28 13:09:56 +05:30
Jannat Patel	953960b193	Merge branch 'develop' into item-wise-purchase-registry-item-name-error	2021-01-19 10:44:49 +05:30
Suraj Shetty	bbc6bfd3c3	Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui	2021-01-19 09:34:06 +05:30
pateljannat	6bec696396	fix: item_group fallback	2021-01-18 16:21:56 +05:30
pateljannat	fa2b0d43bd	fix: handled invoices with no item_code	2021-01-18 15:27:40 +05:30
Anuja P	47b42e6441	fix: Translation fixes	2021-01-14 21:20:00 +05:30
Anuja P	5ead7ee6cf	fix:Payment Period based on invoice date report fix/refactor	2021-01-14 20:58:34 +05:30
Afshan	91e3c07d77	fix: assest depreciation ledger	2020-12-28 19:42:46 +05:30
Suraj Shetty	f2511c84b5	Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui	2020-12-14 09:05:48 +05:30
Mohammad Hasnain Mohsin Rajan	f8d6726990	fix(acc recv report): columns mismatch (#24109 ) Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-12-11 13:28:23 +05:30
Suraj Shetty	dc13d4b0fc	Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui	2020-12-11 12:57:04 +05:30
Rushabh Mehta	fec8dba16c	fix(merge): merge develop	2020-12-08 16:23:09 +05:30
Rucha Mahabal	fa950662b9	fix: import statement	2020-12-08 12:32:19 +05:30
Rucha Mahabal	db0bbfac97	feat(reports): get item details from Item doctype instead of the Transaction	2020-12-08 12:20:07 +05:30
marination	724e16bca1	chore: Use JSON style response and use ORM - Use JSON style response for report columns - Use ORM instead of frappe.db.sql - Remove returned % from list view	2020-11-30 12:55:30 +05:30
Marica	9b897c4073	Merge branch 'develop' into pr-dn-return	2020-11-19 12:21:38 +05:30
Shivam Mishra	bed717b442	Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui	2020-11-12 11:32:59 +05:30
Anurag Mishra	91fdb7aa69	feat: added column cost_center to receivable reports (#23835 )	2020-11-09 20:20:05 +05:30
marination	28dd90f3dc	Merge branch 'develop' of https://github.com/frappe/erpnext into pr-dn-return	2020-11-02 15:16:31 +05:30
Saqib	a51d9e3259	fix: pos register shows cancelled documents (#23747 )	2020-10-28 17:08:47 +05:30
Marica	cf8698fb0b	Merge branch 'develop' into pr-dn-return	2020-10-27 15:34:51 +05:30
Nabin Hait	ba1cca6b2d	fix: Show accounts in financial statements upto level 20 (#23718 )	2020-10-24 22:00:32 +05:30
Shivam Mishra	55f52e8135	Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui	2020-10-13 20:09:22 +05:30
Marica	50b708f615	Merge branch 'develop' into pr-dn-return	2020-10-13 16:57:11 +05:30
aakvatech	617892db20	feat: Add company and correct filter in bank statement reconciliation report filters If you have multi company scenario and many bank accounts that are no longer active, then it becomes difficult in bank statement reconciliation report to filter the account to reconcile and it also shows disabled accounts so futher confusion is created. https://github.com/frappe/erpnext/issues/23613	2020-10-13 08:18:59 +03:00
Saqib	ebbe285872	feat: (report) POS Register (#23313 ) * feat: pos register report * feat: group by fields in pos register * chore: add paid amount column * fix: (minor) remove redundant group by label	2020-10-12 17:02:31 +05:30
rohitwaghchaure	3c77a4697b	Merge pull request #23471 from rohitwaghchaure/fixed-currency-issue-in-pl-report fix: currency symbol in profit and loss report	2020-10-03 10:32:00 +05:30
rohitwaghchaure	d65e050f4b	Update profit_and_loss_statement.py	2020-09-30 18:17:21 +05:30
Rohit Waghchaure	b428e4c493	fix: currency symbol in profit and loss report	2020-09-30 17:44:35 +05:30
Deepesh Garg	23313538df	Merge pull request #23465 from abhishekbalam/currency_in_trial_balance fix(Accounts): Add Currency filter in Trial Balance report	2020-09-30 13:16:16 +05:30
Abhishek Balam	001e7e9df9	fix: remove default value	2020-09-30 10:39:26 +05:30
Abhishek Balam	42d8db59f0	fix: add currency select to Trial Balance	2020-09-30 01:32:42 +05:30
Shivam Mishra	9a4d603403	Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui	2020-09-25 11:44:37 +05:30
Afshan	8be51e22c4	fix: escape apostrophe in cost centre and project if exist	2020-09-23 14:52:36 +05:30
Marica	ef2b5e8284	Merge branch 'develop' into pr-dn-return	2020-09-22 15:39:25 +05:30
Anurag Mishra	170ecdc76e	fix: No handlefor Cost centers in Accounts Receivable	2020-09-18 13:26:46 +05:30
marination	efb211af6d	chore: Fix Received/Delivered Items to Billed Logic	2020-09-09 16:24:11 +05:30
barry86m	5b381ac5b7	fix: consolidated financial statement sums values into wrong parent fix proposed by Andriesvn in bug report closes #22180	2020-09-08 00:27:57 +01:00
rohitwaghchaure	3312956890	Merge pull request #23019 from prssanna/gross-profit-total feat: enable total row in Gross Profit Report	2020-09-02 12:18:41 +05:30
rohitwaghchaure	6a51f3929b	Merge pull request #23054 from marination/general-ledger-filters fix: General Ledger filter validation	2020-09-01 17:53:32 +05:30
Anupam Kumar	232cb37ebf	Merge branch 'develop' into variance-report-fix	2020-09-01 09:31:22 +05:30
Syed Mujeer Hashmi	b23840bf7b	fix: Filter out cancelled entries in customer ledger summary Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>	2020-08-29 23:09:18 +05:30
Suraj Shetty	f39bb116cc	Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui	2020-08-27 19:27:49 +05:30
Marica	e7fabb10e1	Merge branch 'develop' into general-ledger-filters	2020-08-27 11:59:01 +05:30
Deepesh Garg	07ee7a5bd6	Merge branch 'develop' into dims_in_gl_report	2020-08-24 20:23:19 +05:30
Suraj Shetty	6f9f40992c	Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui	2020-08-23 16:33:50 +05:30
Nabin Hait	111183d080	fix: Installation failed due to global variable (#23114 )	2020-08-22 12:31:06 +05:30
Rohit Waghchaure	310ade7282	profit and loss report not working	2020-08-18 16:07:24 +05:30
Glen Whitney	b2604d1f77	fix(General Ledger): include Accounting Dimension columns in report Prior to this commit, custom Accounting Dimensions are not (by default) shown or even considered in generating a General Ledger report. Moreover, as they are not considered, they are not used to distinguish GL Entry lines in the same voucher with the same Account when the "Group By" value is "Group by Voucher (Consolidated)". This situation leads to lines with different values for the accounting dimension to be ganged together in the General Ledger view of a Journal entry, making the entry difficult for an accountant to read. This commit alleviates the problem by adding a checkbox to control whether Accounting Dimension columns are considered in the General Ledger report. When they are considered, they are displayed and also included in the key that distinguishes lines in the "Group by Voucher (Consolidated)" mode. Resolves #23033.	2020-08-17 20:43:56 +00:00
marination	eb241c6c42	fix: General Ledger filter validation	2020-08-17 12:57:56 +05:30
Anupam K	b3bd780d46	fix: codasy dix	2020-08-13 17:07:15 +05:30
prssanna	bfb219612e	feat: enable total row in Gross Profit Report	2020-08-13 11:34:05 +05:30
Rucha Mahabal	b7311c8fc1	fix: SQL query in accounts receivable, payable reports (#22888 )	2020-08-03 20:41:25 +05:30
Shivam Mishra	11111cd9a9	Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui	2020-07-30 21:29:02 +05:30
Anupam K	8718daa11e	Adding formatter in budget variance report	2020-07-25 23:56:11 +05:30
Afshan	91fe10666e	fix: buying price for non stock item in gross profit report (#22616 ) * fix: buying price for non stock item in gross profit report * fix: refactor query	2020-07-24 09:49:17 +05:30
Shivam Mishra	f59d927f73	feat: update summary items	2020-07-23 17:02:32 +05:30
Shivam Mishra	840550e25f	refactor: change sequence for profit and loss statement	2020-07-23 17:02:32 +05:30
Nabin Hait	493b581862	fix: Ignore cancelled entries in trial balance opening	2020-07-21 12:47:16 +05:30
Deepesh Garg	d81372a39c	Merge pull request #22734 from deepeshgarg007/custom_cash_flow fix: Period list api changes for custom cash flow report	2020-07-18 20:35:28 +05:30
Deepesh Garg	07f8e749be	fix: Period list api changes for custom cash flow report	2020-07-18 19:47:33 +05:30
Suraj Shetty	34617744e1	fix: Show total row in print format of financial statement	2020-07-15 16:37:21 +05:30
Deepesh Garg	5beac7a0cc	fix: Period list fixes in financial statements (#22677 )	2020-07-15 12:17:43 +05:30
Deepesh Garg	e99091fd4f	Merge pull request #22644 from deepeshgarg007/dcc_query fix: Distributed cost center query	2020-07-10 13:35:34 +05:30
Deepesh Garg	7cb195b304	fix: Distributed cost center query	2020-07-10 13:33:50 +05:30
Afshan	fd28f1071e	style: arrangements of filters for reports (#22636 )	2020-07-10 11:25:39 +05:30
Deepesh Garg	95a497cffb	Merge branch 'develop' of https://github.com/frappe/erpnext into cost_center_fix	2020-06-20 12:33:41 +05:30
Deepesh Garg	bef80b7981	fix: Test	2020-06-20 12:32:30 +05:30
Marica	383807f72e	feat: Selling Desk, Dashboard and Onboarding (#22055 ) * feat: Selling Desk, Dashboard and Onboarding * chore: Selling Onboarding and fixes in Other onboardings * chore: Dashboard and Number card Fixtures * fix: Escape filters and Reposition Accounts Dashboard shortcut. Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-06-19 15:33:21 +05:30
Deepesh Garg	5f4330621c	Merge pull request #22231 from deepeshgarg007/financila_satement_immutable fix: Handle cancelled entries in financial statements	2020-06-13 21:19:20 +05:30
Deepesh Garg	cc4943d54d	fix: Distributed cost center query updation	2020-06-13 21:13:52 +05:30
Deepesh Garg	d80d442aa1	fix: Do not select cancelled entries in financial statements	2020-06-13 21:12:19 +05:30
Deepesh Garg	f3261794d9	Merge pull request #22230 from deepeshgarg007/financial_statement_to_date_v13 fix: Data not appearing properly for some fiscal_year in financial statements	2020-06-13 19:27:38 +05:30
Deepesh Garg	15231aa60d	fix: Data not appearing properly for some fiscal_year in financial statemets	2020-06-13 19:26:39 +05:30
Deepesh Garg	08fee12266	fix: Item-wise sales and purchase register export	2020-06-10 18:33:24 +05:30
Karthikeyan S	e9ff6d3d52	feat(Cost Center): Distributed Cost Center (#21531 ) * feat: Distributed Cost Center Squashed commit of the following: commit 274236eb92dfddfd015583ee1e6b5e1937366d28 Author: Vignesh <kaviya.3111999@gmail.com> Date: Mon Mar 23 18:32:26 2020 +0530 Fix: Indentation commit beae0b9849f333dd1d9f29c27192ea7de2e4e809 Author: Vignesh <kaviya.3111999@gmail.com> Date: Mon Mar 23 18:26:50 2020 +0530 The validations are added to distributed cost center. commit 3f66943adacb5797338ef3510251bf6633be3dba Author: Vignesh <kaviya.3111999@gmail.com> Date: Thu Mar 19 22:17:25 2020 +0530 The distributed cost centers are shown with the percentage allocation in the reports commit 1ac11df522096fa187d2f5863b4c970e18b37fac Author: Vignesh <kaviya.3111999@gmail.com> Date: Thu Mar 19 13:36:04 2020 +0530 The child table distributed cost center are added to cost center doctype and then validate percentage allocation. * fix(Distributed Cost Center): validation and filters * fix(Distributed Cost Center): financial statement query * fix(Distributed Cost Center): add test cases Co-authored-by: Vignesh S <svignesh0308@gmail.com> * fix(Distributed Cost Center): budget variance, general ledger, profitability analysis reports. * Merge branch 'develop' into develop-distributed-cost-center * fix(Distributed Cost Center): Added DCC reflection in actual amount column of Budget Variance Report. * Update creation field in general ledger report Co-authored-by: Nabin Hait <nabinhait@gmail.com> * creation field updated in gl_entries query Co-authored-by: Nabin Hait <nabinhait@gmail.com> Co-authored-by: KaviyaPeriyasamy <kaviya.3111999@gmail.com> Co-authored-by: Vignesh S <svignesh0308@gmail.com> Co-authored-by: KaviyaPeriyasamy <kaviyaperiyasamy22@gmail.com> Co-authored-by: Kaviya Periyasamy <36359901+KaviyaPeriyasamy@users.noreply.github.com> Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-06-08 12:20:21 +05:30
Deepesh Garg	c01b4aa2e5	Merge pull request #22131 from deepeshgarg007/tds_monthly_cancelled fix: Cancelled entries in tds payable monthly report	2020-06-07 00:08:17 +05:30
Deepesh Garg	57f9d43c43	fix: Cancelled entries in tds payable monthly report	2020-06-07 00:01:20 +05:30
Deepesh Garg	7135a75e5e	fix: Error when no data is present in AR/AP reeport	2020-06-03 21:51:21 +05:30
Saqib	3c460364b5	fix: disposed asset creates inconsistencies in asset depr report (#22021 )	2020-05-29 10:18:06 +05:30
Deepesh Garg	1f3fe59e36	fix: Default period start date and period end date for financial statements (#22011 )	2020-05-28 18:36:21 +05:30
Marica	c2aabb0fbf	fix: Buying Module fixes (#21965 ) * fix: Buying Module fixes * fix: Delete Report files as well * fix: Add Purchase Order Analysis to Stock & Accounting	2020-05-27 20:56:39 +05:30
Deepesh Garg	152377f84d	fix: Total for ageing column 121-Above (#21972 )	2020-05-27 20:29:10 +05:30
Deepesh Garg	ed2c1803df	fix: Post Dated unallocated amount not considered in Advance Amount in AR/AP summary (#21837 ) * fix: Post Dated unallocateed amount not considered in Advance Amount in AR/AP summary report * fix: Add future payment filter in AR/AP summary * fix: Show unallocated future payments only till current creation date * fix: Remove extra query * fix: Remove debug * fix: Condition	2020-05-27 12:46:12 +05:30
Deepesh Garg	3a723dd815	Merge pull request #21940 from deepeshgarg007/acc_dim_report_filter fix: Do not add filters in report on accounting dimension creation if it already exists	2020-05-26 19:30:43 +05:30
Deepesh Garg	11ea0b1289	fix: Do not add filters in report on accounting dimension creation if it already exists	2020-05-26 19:23:45 +05:30
Afshan	c0b4ec52de	fix: UX date range field separated in from and to date fields. (#21765 ) * fix for issue #21419 * changing group by filter to default Group by Voucher (Consolidated) * divided date range to seperate from and to date * divided date range to seperate from and to date for purcase and sales register	2020-05-26 18:20:47 +05:30
Saqib	48e4abf43f	fix: fetch depreciation amount only if depr entry is made (#21893 )	2020-05-25 19:21:08 +05:30
Deepesh Garg	29c748184c	fix: Project filter in Trial Baalance Report	2020-05-20 22:15:12 +05:30
Rohit Waghchaure	e6147ed9bc	feat: production forecasting using exponential smoothing method	2020-05-20 11:31:06 +05:30
Deepesh Garg	1b1787c61a	fix: Against voucher in General Ledger	2020-05-19 20:51:30 +05:30
Nabin Hait	31b8be6c41	Merge branch 'accounts_dashboard' of https://github.com/deepeshgarg007/erpnext into deepeshgarg007-accounts_dashboard	2020-05-18 11:31:30 +05:30
Deepesh Garg	7d61c03af4	fix: Add missing dimensions in GL entries (#21689 ) * fix: Add misssing dimensions in GL entries * fix: Add project filter in trial balance report * fix: Use current dimensions instead of dimensions from asset	2020-05-15 12:58:48 +05:30
Deepesh Garg	33f654ebfe	Merge branch 'develop' of https://github.com/frappe/erpnext into accounts_dashboard	2020-05-14 22:57:27 +05:30
Deepesh Garg	8bbac6defc	fix: Onboarding and Dashboard for accounts module	2020-05-14 22:57:11 +05:30
Afshan	bd7e535885	Fix: Set General Ledger 'Group By' filter as 'Group by Voucher(Consolidated)' when opened from Invoice (#21673 ) * fix for issue #21419 * changing group by filter to default Group by Voucher (Consolidated)	2020-05-13 19:48:42 +05:30
Deepesh Garg	c6bd012e72	Merge branch 'develop' of https://github.com/frappe/erpnext into accounts_dashboard	2020-05-12 11:30:07 +05:30
Deepesh Garg	0defefda92	feat: Standard accounts dashboard	2020-05-11 12:14:46 +05:30
Deepesh Garg	e720882410	Merge pull request #21642 from kevingdc/bugfix/fix-budget-variance-report fix(accounting): fix incorrect output in Budget Variance Report	2020-05-10 17:27:46 +05:30
Deepesh Garg	b81bd5f70c	fix: Formatting fixes	2020-05-10 17:24:11 +05:30
Kevin Chan	bc05855805	fix: Simplify get_dimension_account_month_map This commit updates get_dimension_account_month_map to no longer show the actual expense when there is no budget. This also removes the other functions and queries related to it. Spaces are also converted to tabs.	2020-05-09 16:02:11 +08:00
Deepesh Garg	3392e6b80c	fix: User filters instead of hardcoded values	2020-05-08 19:53:09 +05:30
Deepesh Garg	8d9f86f781	fix: Gross and net profit report fix	2020-05-08 19:45:57 +05:30
Kevin Chan	b3ee6314f9	fix: Fix Budget Variance Report This commit fixes a bug in Budget Variance Report where it combines the actual expense amounts across different fiscal years. This was fixed by updating the function and queries for computing the actual expense amounts.	2020-05-07 18:39:47 +08:00
Kevin Chan	52189cba86	style: Improve formatting This commit improves indentations and makes sql queries more readable.	2020-05-07 17:49:32 +08:00
rohitwaghchaure	54a6c64b0f	fix: against voucher no not all records showing in case of Group By Voucher (consolidated) (#21592 )	2020-05-05 16:17:15 +05:30
Saqib	39805918d4	fix: accounts payable shows advance amount of other company (#21548 )	2020-05-01 18:15:13 +05:30
Saqib	090e6093f2	fix: list index out of range error (#21467 ) * fix: list index out of range error * fix: condititon	2020-04-30 11:04:44 +05:30
Deepesh Garg	2a9c5badc6	feat: Immutable ledger (#18740 ) * fix: Reverse GL entry on cancellation of document * fix: Removed set posting time field for multiple docs * fix: Stop future reposting and reverse entry for purchase receipt and delivery note * fix: Change is_cancelled field from select to check * Revert "fix: Removed set posting time field for multiple docs" This reverts commit 81fb808db7da69ab1e58ba226c0cd0b77e5b90c8. * fix: Multiple fixes in GL Entry * fix: Remove future reporting from doctypes * fix: Canceled entry filters in Stock Ledger and General Ledger Report * fix: Remove print statement * fix: Validation for back dated entries * fix: Codacy fixes * fix: Add ignore links to multiple doctypes * fix: Codacy Fixes * fix: Ignore GL Entry and Stock Ledger entry while cancel * fix: Test case fixes * fix: Patch * fix: Codacy * fix: Budget Test Cases * fix: Patch * fix: Patch * fix: Multiple test cases * fix: changes in make_reverse_entry function * fix: Update patch * fix: Test Cases * fix: Test Case fixes * fix: Move patch upward in patches.txt * fix: Budget Test Cases * fix: Test Case and codacy * fix: Patch * fix: Minor label and UX fixes * fix: Move freezing date check * fix: Test Cases * fix: Test cases * fix: Test Cases * fix: Test Case * fix: Remove update_gl_entries_after function * fix: Remove update_gl_entries_after function * fix: Test Cases * fix: Fiscal Year wise backdated entry * fix: Update entries only for current SLE * fix: Remove is_cancelled * fix: Test Cases * fix: Test cases * fix: Test Cases * fix: Uncomment account and stock balance sync logic * fix: Stock balance and Account balance out of sync fixes * fix: Test Cases * fix: Test cases for POS, Stock Reco and Purchase Receipt * fix: Stock Reco tests * fix: Test stock reco precision * fix: Test stock reco for fifo precision * fix: Test stock reco for fifo precision * fix: Stock Entry test case Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-04-30 10:38:58 +05:30
Deepesh Garg	0d8f66dafa	Merge pull request #21493 from deepeshgarg007/item_wise_sale_purchase fix: Group by filter fix in item wise sales and purchase register	2020-04-29 12:36:08 +05:30
Deepesh Garg	3d8dadaab6	fix: Group by filter fix in item wise sales and purchase register	2020-04-29 12:05:56 +05:30
Deepesh Garg	428978762b	Merge pull request #21461 from deepeshgarg007/consolidate_statement_fix fix: Report summary fix in consolidated financial statement for report type Profit and Loss	2020-04-28 13:30:12 +05:30
Deepesh Garg	fa2eecc5fc	fix: Report summary fix in consolidated financial statement for report type Profit and Loss	2020-04-28 13:12:22 +05:30
Deepesh Garg	558f6aa4cb	Merge pull request #21456 from deepeshgarg007/gross_profit_width fix: Default column width in Gross profit report	2020-04-28 12:35:50 +05:30
Deepesh Garg	142af4b58a	fix: Default column width in Gross profit report	2020-04-28 11:17:45 +05:30
Deepesh Garg	d78cf97250	feat: Allow tax withholding category selection at invoice level (#20870 ) * feat: Allow tax withholding category selection at invoice level * fix: Linitng fixes * feat: TDS calculation using common PAN * fix: Add provision to deduct Lower TDS in purchase invoice * fix: Consider only ref docs company while computing TDS * fix: Default permission fixes * fix: Add validation for dates in fiscal year * fix: Undefined variable	2020-04-26 20:08:52 +05:30
Nabin Hait	ad16e61bc2	fix: Valid warehouse in woocommerce syncing and other small fixes (#21407 ) * fix: Valid warehouse in woocommerce syncing * fix: dmall fixes in gross & net profit report * fix: company is required for getting party details * fix: None issue while getting raw material rate based on last purchase rate	2020-04-25 14:52:05 +05:30
Deepesh Garg	525204bc50	feat: Payment allocation based on payment terms (#20945 ) * feat: Payment allocation based on payment terms * fix: Add desccription for checkbox Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-04-23 16:07:36 +05:30
Deepesh Garg	6298bbb1eb	Merge pull request #21328 from rohitwaghchaure/fixed-account-name-in-gl_print fix: account name not showing in the gl print	2020-04-18 20:40:50 +05:30
Rohit Waghchaure	9793500154	fix: account name not showing in the gl print	2020-04-18 19:02:07 +05:30
Mangesh-Khairnar	bd14a64bfb	fix: add label to gl entry	2020-04-17 19:52:47 +05:30
Deepesh Garg	470679f227	fix: SQL ssyntax error	2020-04-10 20:22:42 +05:30
Deepesh Garg	9b312bfbd0	Merge branch 'develop' of https://github.com/frappe/erpnext into purchase-register-filters	2020-04-10 20:19:30 +05:30
Deepesh Garg	6c36cddbd3	Merge pull request #21188 from deepeshgarg007/dimension_filter_fix fix: Use separate condition for tree and normal doctype	2020-04-07 15:23:36 +05:30
Deepesh Garg	62e9f83aab	fix: Use separate condition for tree and normal doctype	2020-04-07 15:17:06 +05:30
Deepesh Garg	24a2c9b978	feat: Date range in financial statements (#21020 ) * feat: Date range in financial statements * feat: Add date range filter in consolidated financial statement * fix: Handle API changes in query_report Co-authored-by: Saqib <nextchamp.saqib@gmail.com>	2020-04-07 12:16:25 +05:30
Saqib Ansari	ca3967d52f	feat: (minor) purchase register filters	2020-04-06 18:25:23 +05:30
Deepesh Garg	433e58d131	feat: Add report summary in financial statements (#20876 ) * feat: Add report summary API for Balance Sheet and PL report * fix: Add summary cards in Cash flow report * feat: Add report summary in consolidated financial statements * fix: Remove accumulated values filter from P&L and cashflow report * fix: set company default currency in profit and loss statement if no data Co-authored-by: Prssanna Desai <prssud@gmail.com>	2020-04-06 14:07:20 +05:30
Deepesh Garg	e86f6d0738	Merge branch 'develop' into print-format-fix	2020-03-27 21:39:16 +05:30
Shivam Mishra	cf6a814328	fix: total currency formatting	2020-03-27 19:15:59 +05:30
Deepesh Garg	d74bcad7af	fix: Added hidden GL column in general ledger (#21021 ) Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-03-26 13:37:40 +05:30
Deepesh Garg	ff7bbd2d38	fix: Party Name not visible in statement of accounts (#20913 ) * fix: Party name in Statement Of Accounts * Update general_ledger.html Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-03-17 17:00:06 +05:30
Deepesh Garg	ed0965a572	feat: Nested set filtering for accounting dimension (#20860 ) * feat: Nested set filtering for accounting dimension * fix: Remove print statement	2020-03-17 10:53:24 +05:30
Deepesh Garg	07116c7922	fix: Mode of payment not fetcched in Item wise purchase register	2020-03-16 22:36:32 +05:30
Deepesh Garg	5e58666091	fix: HSN code not visible in GST Itemised Purchase register	2020-03-09 22:38:41 +05:30
Deepesh Garg	6dc335d898	Merge pull request #20824 from scmmishra/report-options feat: update profit and loss for new report summary API	2020-03-04 16:07:31 +05:30
Deepesh Garg	12aa35aa43	fix: Label and UX fixes in AP/AP reports (#20803 )	2020-03-02 19:10:29 +05:30
Deepesh Garg	5707c9a731	fix: Item Wise report query fix (#20760 )	2020-02-28 12:28:54 +05:30
Saqib	8cf841ce60	fix: wrong calculation of depreciation eliminated for a period (#20502 )	2020-02-27 19:09:34 +05:30
Deepesh Garg	0ce9e0cc1f	feat: Group by AR/AP report (#20573 ) * feat: Group by AR/AP report * fix: Do not consider total row in charts * fix: Subtotal row for last party	2020-02-18 16:07:34 +05:30
Deepesh Garg	9462ba6559	feat: Group by item wise sales register (#20251 ) * fix: Group by sales register report * fix: Remove group-by item * fix: Grand total query fix * fix: Remove debug param * fix: Code cleanup and commonification * fix: Add group by functionality to purchase register * fix: Changes in total row display * fix: Minor fixes * fix: Add total row * fix: Do not calculate total for rate	2020-02-10 17:59:17 +05:30
Deepesh Garg	30e766b228	fix: SQL query in financial statements	2020-02-05 12:12:47 +05:30
Deepesh Garg	589f2cd16c	fix: Get only specified company accounts in financial statements (#20486 )	2020-02-03 15:49:24 +05:30
rohitwaghchaure	ffa74ad5c1	Merge pull request #20478 from deepeshgarg007/finance-book-filter-new fix: Do not show any finance book record if no finance book filter is applied	2020-01-31 13:19:16 +05:30
Deepesh Garg	34c33baa82	fix: Cash flow filter fix	2020-01-31 11:16:30 +05:30
Deepesh Garg	ba44f28202	fix: Filtering fixes in financial statement	2020-01-31 09:08:29 +05:30
Deepesh Garg	ce04526db8	fix: Do not show any finance book record if no finance book filter is applied	2020-01-30 15:33:51 +05:30
Suraj Shetty	2f67647f7b	Merge branch 'develop' of https://github.com/frappe/erpnext into fix-incorrect-translations	2020-01-29 15:06:50 +05:30
Suraj Shetty	48e9bc3fc9	fix: Incorrect translation syntax	2020-01-29 15:06:18 +05:30
Deepesh Garg	ef41a0eda5	fix: Finance book filtering in financial statements (#20410 ) * fix: Finance book filtering in financial statements * fix: Use IS NULL instead of ifnull	2020-01-27 15:18:51 +05:30
deepeshgarg007	fdba26d476	fix: Order GL entries by creation time in General ledger	2020-01-23 17:42:57 +05:30
Shivam Mishra	a59c2ce17a	fix: profit and loss indicator bug	2020-01-14 17:55:49 +05:30
Shivam Mishra	748c3d9e8b	feat: update profit and loss for new report summary API	2020-01-14 17:31:19 +05:30
Marica	287f491f7b	fix: Employee name in Report trial balance for party (#20223 ) * fix: Employee name in Report trial balance for party * fix: Add account filter in trial balance for party report Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>	2020-01-09 13:35:06 +05:30
deepeshgarg007	473b478883	fix: Show closing row in general ledger print	2020-01-02 12:22:04 +05:30
Don-Leopardo	ec258a43d9	perf: Asset Depreciations and Balances report (#18022 )	2019-12-24 17:35:53 +05:30
Saqib	977489697d	Merge pull request #19973 from deepeshgarg007/budget_variance_dimension feat: Dynamic filters for dimensions in budget variance report	2019-12-24 12:57:50 +05:30
Saqib	4f18d2548d	fix: none type object updates AR report row (#19958 )	2019-12-23 16:01:38 +05:30
Deepesh Garg	c408628ef2	Merge pull request #19979 from deepeshgarg007/sales_register_upgrade fix: Update sales register report	2019-12-19 13:53:15 +05:30
deepeshgarg007	be8c406808	fix: Update sales register report	2019-12-17 22:27:23 +05:30
deepeshgarg007	e65ada2807	feat: Dynamic filters for dimensions in budget variance report	2019-12-17 17:54:34 +05:30
rohitwaghchaure	86babbe3ac	Merge pull request #19970 from rohitwaghchaure/fixed_incorrect_outstanding_amount_showing_in_the_ap_ar_report_v13 fix: incorrect outstanding amount showing in the AP/AR report	2019-12-17 17:15:45 +05:30
Rohit Waghchaure	0f583b8c5a	fix: incorrect outstanding amount shwoing in the AP/AR report	2019-12-17 12:48:02 +05:30
Suraj Shetty	586390db81	Merge branch 'develop' into fix-profit-and-loss-statement	2019-12-14 22:49:53 +05:30
Suraj Shetty	f95267041d	fix: Financial statement report - Hidden column should note be considered in the report - Remove hardcoded currency formatting - Remove duplicate letterhead in the report (print_template already adds one) - Remove extra quotes from Total Amount text	2019-12-12 13:06:17 +05:30
Nabin Hait	d285e9b7bd	optimize: Optimization of Receivable report filtered based on sales person (#19796 )	2019-12-04 15:30:58 +05:30
Deepesh Garg	dfd82d22c8	Merge pull request #19792 from nabinhait/ar-summary-based-on-terms feat: Receivable / payable summary based on payment terms	2019-12-04 11:25:28 +05:30
Nabin Hait	e176c3c1d1	feat: Receivable / payable summary based on payment terms	2019-12-03 16:56:48 +05:30
Deepesh Garg	8d31171ff8	fix: Party name field in trial balacne for party report (#19789 )	2019-12-03 16:31:07 +05:30
Deepesh Garg	03d1394540	fix: Unable to see parties with negative balance in AR/AP Summary (#19776 )	2019-12-03 15:12:44 +05:30
Deepesh Garg	06a6fa4cfc	feat: Accounts Payable report based on payment terms (#19672 )	2019-11-29 16:56:27 +05:30
Nabin Hait	732d6afad5	fix: Show AR summary based on outstanding (#19573 )	2019-11-13 18:49:23 +05:30
Nabin Hait	3a72cb46bc	fix: Set due date in accounts receivable based on payment terms (#19563 )	2019-11-13 17:58:10 +05:30
Deepesh Garg	082bfb8cb3	Merge pull request #19567 from deepeshgarg007/balance_sheet_develop fix: Accumulated Values filter disappearing	2019-11-13 17:46:46 +05:30
deepeshgarg007	5ea4328359	fix: Accumulated Values filter disappearing	2019-11-13 13:23:49 +05:30
Nabin Hait	8bd2d4d35e	fix(trial balance): Show opening and closing of group account in single column (#19509 )	2019-11-11 10:59:20 +05:30
rohitwaghchaure	6a50c92087	Update accounts_receivable.js	2019-11-06 16:34:17 +05:30
Rohit Waghchaure	dec5bead9c	fix: unknown column credit limit in accounts receivable report	2019-11-06 13:13:31 +05:30
Jai Chavan	9f483c1fa9	fix: Spelling of Variance	2019-10-26 18:45:01 +05:30
Sahil Khan	c5a6e9da15	Merge branch 'develop' into version-12	2019-10-02 16:36:54 +05:30
Deepesh Garg	b54f0fb388	fix: Party column empty in accounts receivable/ payable summary (#19205 )	2019-09-30 15:19:56 +05:30
sahil28297	a9ff4f6688	fix(Report): Sales Register	2019-09-26 13:58:00 +05:30
Rucha Mahabal	132323462c	fix(Report): Sales Register (#19166 )	2019-09-25 16:03:45 +05:30
Nabin Hait	2064dfc5a9	fix: Handling payments against credit/debit notes and party currency (#19154 )	2019-09-24 19:52:33 +05:30
Mangesh-Khairnar	1e6e1dd451	enhancement(tds-monthly-payable): remove zero value transaction (#19141 )	2019-09-24 19:46:06 +05:30
Mangesh-Khairnar	5dcf2c669f	chore: remove unlinked letter head references (#19138 )	2019-09-24 09:53:06 +05:30
Anurag Mishra	2c60f6419e	feat: missmatching amount in GST Sales report and itemised sales report (#19116 )	2019-09-20 23:00:09 +05:30
rohitwaghchaure	30f3354a7a	Merge pull request #19114 from marination/report-fix fix: Report 'Payment Period based On Invoice Date'	2019-09-19 19:01:05 +05:30
marination	8590112faa	fix: Report 'Payment Period based On Invoice Date'	2019-09-19 17:48:23 +05:30
rohitwaghchaure	d019d28bc9	fix: Customer Ledger Summary report not working on python 3 (#19092 )	2019-09-17 18:45:59 +05:30
Nabin Hait	1d1858a8b0	Show draft future payments as well	2019-09-11 18:39:49 +05:30
Nabin Hait	b5bd91417d	fix: Print/PDF of AR/AP report after refactoring (#18931 )	2019-09-05 16:43:20 +05:30
Nabin Hait	561a2e966e	Update accounts_receivable.py	2019-09-04 11:02:48 +05:30
Nabin Hait	1ab75db0ac	refactor: Accounts Receivable / Payable report (#18906 )	2019-09-03 16:07:46 +05:30
Nabin Hait	d8c262fd5c	fix: Translations of strings (#18825 )	2019-08-23 16:32:58 +05:30
Nabin Hait	bcb0f6038e	fix: Single gl entry should only be considered once either in opening or closing entry (#18792 )	2019-08-21 14:47:33 +05:30
rohitwaghchaure	16dda1a991	fix: group by voucher consolidated showing incorrect data for deferred entries (#18779 )	2019-08-20 12:37:32 +05:30
Anurag Mishra	bc5712a1b3	fix: validated cost center in financial_statement (#18733 ) * fix: validated cost center in financial_statement * Update financial_statements.py	2019-08-19 10:24:44 +05:30
Rohit Waghchaure	c5d41af10f	fix: sequence of customer name and contact in the AR report	2019-08-14 18:49:19 +05:30
deepeshgarg007	4c652396d0	fix: Opening balance not getting calculated in trail_balance_report	2019-07-29 14:57:33 +05:30
deepeshgarg007	6dd5f74671	fix: Remove dimensions from boot	2019-07-26 09:14:42 +05:30
deepeshgarg007	ada1ac8013	fix: Added default dimension and filter in bootinfo	2019-07-26 09:14:42 +05:30
deepeshgarg007	f56284b0c1	Dynamic link issue fix in Bank reconciliation statement	2019-07-25 12:47:32 +05:30
Mangesh-Khairnar	0bbfca8142	fix: payment document link fix (#18301 )	2019-07-22 11:49:18 +05:30
Saurabh	90d7a8888f	fix: pass missing argument while generating consolidated financial statement for cash flow type (#18398 )	2019-07-22 11:22:34 +05:30
Deepesh Garg	8fcd426dab	Merge pull request #18350 from rohitwaghchaure/added_payment_terms_in_accounts_payble_summary_develop feat: added payment terms filter in the accounts payable summary	2019-07-16 08:39:30 +05:30
Rohit Waghchaure	4c0dffe687	feat: added payment terms filter in the accounts payable summary	2019-07-16 02:00:41 +05:30
rohitwaghchaure	3643d67249	Merge pull request #18023 from fproldan/fix_by_voucher_order_develop fix: General Ledger Group by Voucher not ordering by posting_date for develop	2019-07-14 17:23:54 +05:30
Deepesh Garg	91417646b1	Fix: Add fieldtype as currency	2019-07-12 12:24:05 +05:30
Shivam Mishra	020f405367	Merge branch 'develop' into cash-flow-chart	2019-07-11 10:12:45 +05:30
deepeshgarg007	285701d9f1	fix: Add missing Cost Center filter in cash flow statement	2019-07-10 22:22:14 +05:30
Shivam Mishra	f2f1e81a3f	feat: added chart to cash-flow report	2019-07-10 20:28:52 +05:30
Don-Leopardo	365a572073	Merge branch 'develop' into fix_by_voucher_order_develop	2019-07-10 10:52:59 -03:00
Suraj Shetty	61d8088be4	fix: Return fieldtype so that the client-side can format chart values (#18211 )	2019-07-10 17:05:25 +05:30
deepeshgarg007	6bb5ade667	fix: Add accounting dimensions to various reports and fixes	2019-07-07 21:24:45 +05:30
Deepesh Garg	a37c51f93e	Merge pull request #18149 from deepeshgarg007/trial_balance_dimensions fix: Add filters for accounting dimensions in trial balance report	2019-07-03 22:00:25 +05:30
Shivam Mishra	bb02c5105e	fix: format values for charts	2019-07-03 19:22:21 +05:30
deepeshgarg007	58b4644c1a	fix: Add filtesr for accounting dimensions in trial balance report	2019-07-03 18:08:41 +05:30
Don-Leopardo	85e2fd965a	Merge branch 'develop' into fix_by_voucher_order_develop	2019-07-03 08:15:08 -03:00
Nabin Hait	34c551d9a5	fix: Missing commits from hotfix branch (#17997 ) * fix: merge conflict * fix: restored missing set_gst_state_and_state_number function * fix: style linting as per codacy * fix: Fixes related to customer/lead merging * fix: merge conflict * fix: Fixes related to customer/lead merging * fix: Assign isue/opportunity to user * fix: Assign isue/opportunity to user * fix: Replaced Invoice type by GST Category * fix: merge conflict * fix: merge conflict * fix: test cases * fix: test cases	2019-07-03 10:34:31 +05:30
Don-Leopardo	46b21f88e1	Merge branch 'develop' into fix_by_voucher_order_develop	2019-07-02 14:03:45 -03:00
Rohit Waghchaure	2fa6224f8f	fix: accounts receivable / payable not working if the company is not seletced in filter	2019-07-01 11:55:12 +05:30
rohitwaghchaure	4c2eb0f13b	Merge pull request #17981 from rohitwaghchaure/added_include_default_finance_book_in_reports_develop fix: finance book filters includes the gl data which don't have finance book	2019-06-29 15:06:34 +05:30
Don-Leopardo	c3f6bed650	Merge branch 'develop' into fix_by_voucher_order_develop	2019-06-27 18:09:19 -03:00
Nabin Hait	40d25f4010	fix: Show close button if per_ordered is less than 99.999999 (#18067 )	2019-06-26 10:57:45 +05:30
NahuelOperto	4448e2d66b	fix order in general ledger	2019-06-21 08:50:37 -03:00
Faris Ansari	2632107129	fix: User MultiSelectList control for Party filter (#17943 ) * fix: User MultiSelectList control for Party filter The comma based filter wouldn't work for values that had comma in them * fix: Replace with MultiSelectList in reports * fix: Parse json instead of string split	2019-06-19 12:15:37 +05:30
Rohit Waghchaure	5f9793e081	fix: finance book filters includes the gl data which don't have finance book	2019-06-18 21:09:52 +05:30
Rohit Waghchaure	b821af44b6	fix: revert group by voucher general ledger changes	2019-06-17 07:42:53 +05:30
rohitwaghchaure	a030138df8	fix: trial balance opening balance not showing in the debit side for the liability account (#17944 )	2019-06-14 11:57:14 +05:30
Anurag Mishra	122cdaf87b	fix: column width (#17935 )	2019-06-14 11:29:18 +05:30
Anurag Mishra	ff99cea1c4	Merge branch 'develop' into report_trial_balance_fix	2019-06-11 14:17:54 +05:30
rohitwaghchaure	ba715feb7f	Merge pull request #17899 from rohitwaghchaure/general_ledger_group_by_voucher_consolidated_issue_develop fix: debit and credit showing in the same row if the group by is set as group by voucher (consolidated)	2019-06-11 11:39:48 +05:30
Anurag Mishra	0ef811d92d	Merge branch 'develop' into report_trial_balance_fix	2019-06-11 11:14:02 +05:30
Anurag Mishra	acae7a903b	fix: requested changes	2019-06-11 11:12:28 +05:30
Rohit Waghchaure	ef5dd87928	fix: debit and credit showing in the same row if the group by is set as group by voucher (consolidated)	2019-06-10 18:34:18 +05:30
Rohit Waghchaure	5f41a3333b	fix: accounts receivable for PDC not showing 120 days column	2019-06-10 18:15:43 +05:30
Anurag Mishra	fd19678bc7	fix: show cost center in print fromat of report trial balance	2019-06-06 18:37:10 +05:30
Prasann Shah	829172c267	[Add] GSTIN filters in hsn wise summary and itemised reports	2019-06-06 12:08:09 +05:30
Nabin Hait	68eaaa068b	fix: Removed unwanted total row from financial statement and general ledger print (#17860 )	2019-06-05 20:29:24 +05:30
Rohit Waghchaure	8309582cca	fix: report Payment Period Based On Invoice Date not working	2019-06-03 18:23:54 +05:30
deepeshgarg007	55b894bfef	Merge branch develop into dimensions	2019-06-01 23:13:36 +05:30
deepeshgarg007	480586152b	fix: Label translations	2019-05-30 22:34:00 +05:30
deepeshgarg007	da2e456f70	fix: Add translations for missing labels in AR report	2019-05-30 22:30:32 +05:30
deepeshgarg007	a8cb00f31f	fix: Styling and test case fixes	2019-05-28 16:03:08 +05:30
deepeshgarg007	adccb2c3a4	fix: Remove print statements	2019-05-28 12:24:28 +05:30
deepeshgarg007	f5b6ee9ae7	fix: Multiple fixes in accounting doctype	2019-05-28 12:15:56 +05:30
deepeshgarg007	d330519f7c	fix: Merge branch develop into dimensions	2019-05-25 18:18:08 +05:30
rohitwaghchaure	0c2e3c77a3	fix: range 4 for ageing filter added in the AP/AR report (#17715 )	2019-05-23 15:27:47 +05:30
Deepesh Garg	9982576ea6	Merge pull request #17678 from rohitwaghchaure/show_opening_entries_gl_report_v12 feat: added checkbox in the filter of general ledger to show opening entries	2019-05-20 15:20:53 +05:30
Rohit Waghchaure	97d2a46052	feat: added checkbox in the filter of general ledger to show opening entries	2019-05-20 12:28:57 +05:30
deepeshgarg007	a4c9134d33	fix: Inactive Sales Item report fixes	2019-05-17 16:19:15 +05:30
Nabin Hait	6b9d64ce1d	refator: Payroll processing and tax calculation (#17617 ) * refactor: Payroll processing and tax calculation * fix: payroll test cases * fix: Codacy fixes * fix: payroll test cases * fix: removed unwanted code	2019-05-16 11:23:04 +05:30
deepeshgarg007	60f4dd0736	Merge branch 'develop' of https://github.com/frappe/erpnext into dimensions	2019-05-14 15:51:12 +05:30
deepeshgarg007	d9a22726f1	fix: Make territory filter mandatory	2019-05-14 14:36:40 +05:30
deepeshgarg007	4dcba49b5f	fix: Do not append row if item is sold within days since last order	2019-05-14 08:53:24 +05:30
deepeshgarg007	e64c357216	fix: Commified function to get dimensions	2019-05-14 08:50:45 +05:30
deepeshgarg007	0c874d915b	fix: Indentation fixes	2019-05-12 18:38:57 +05:30
deepeshgarg007	7c12cfcb63	fix: Show all territories and items in inactive sales item report	2019-05-12 18:38:49 +05:30
deepeshgarg007	d83cf65be1	fix: Added dimensions in financial reports and general ledger	2019-05-12 18:34:23 +05:30
Rohit Waghchaure	7bee502d72	fix: get totals of gross profit amount on call of the method get_invoiced_item_gross_margin	2019-05-08 15:38:34 +05:30
Rohit Waghchaure	1d6f2c3b5d	feat: Get invoiced item's gross margin using API	2019-05-08 15:38:05 +05:30
deepeshgarg007	6c6b24011f	Merge branch 'develop' of https://github.com/frappe/erpnext into inactive-items-fix-develop	2019-05-02 23:03:59 +05:30
Rushabh Mehta	27a30c842d	fix: simplify sort condition	2019-05-02 09:23:56 +05:30
Nabin Hait	7ca243094e	Merge branch 'develop' into coa-sorting	2019-05-02 00:58:56 +05:30
deepeshgarg007	db999e293b	fix: Rename Inactive Items report to Inactive Sales Item	2019-05-01 14:06:06 +05:30
Rushabh Mehta	43958dcd11	fix(minor): chart of accounts sorting and message	2019-05-01 13:53:05 +05:30
Rohit Waghchaure	c181064782	fix: Trial balance finance book issue	2019-04-25 17:51:09 +05:30
Nabin Hait	8624957cbc	Merge pull request #17291 from prasadarr/listing-fixes fix: Allow system manager to access share ledger	2019-04-22 15:35:35 +05:30
Nabin Hait	d21bacfc21	fix: Total row alignment in AR report	2019-04-20 10:58:58 +05:30
Prasad R	e1a6022c8c	fix: Allow system manager to access share ledger	2019-04-19 10:57:21 +05:30
Rohit Waghchaure	376db4f6b7	fix: credit amount in account's currency not be consider if debit amount is present in the general ledger	2019-04-18 22:06:22 +05:30
Rohit Waghchaure	7aee809571	fix: If finance book filter is not set then show all the entries	2019-04-16 19:35:18 +05:30
Nabin Hait	89206e74d0	fixed merge conflict	2019-04-11 12:31:14 +05:30
Mangesh-Khairnar	1934a76cd8	feat: Add status field in multiple reports linked with purchase order and sales order creation (#17107 ) * enhancement: add status field in ordered itemd to be delivered * enhancement: add status field in purchase order itemd to be received * enhancement: add a status column in the billed reports	2019-04-08 16:29:59 +05:30
Nabin Hait	e0a9835f30	Merge pull request #16987 from SaiFi0102/Party-Ledger-Summary-Fix fix(Party Ledger Summary): Show all adjustment entries as columns	2019-04-04 11:45:36 +05:30
Nabin Hait	9ee417888e	Merge pull request #17092 from nabinhait/ar-ap-print fix: Show Sales Person in AR/AP print is optional	2019-04-04 11:02:26 +05:30
deepeshgarg007	5ad7b655cf	fix: Divide by zero exception handling	2019-04-03 09:11:03 +05:30
Nabin Hait	51d08786dc	fix: Show Sales Person in AR/AP print is optional	2019-04-01 16:24:23 +05:30
deepeshgarg007	4092ead41e	fix: fetch account only if available	2019-03-29 16:19:04 +05:30
Nabin Hait	d4e038b6ca	Merge branch 'hotfix' of https://github.com/frappe/erpnext into develop	2019-03-29 12:41:48 +05:30
Rohit Waghchaure	9da14747aa	fix: accounts receivable summary	2019-03-29 09:26:40 +05:30
Saurabh	84a18f5b18	Merge branch 'master' into develop	2019-03-28 13:54:34 +05:30
Faris Ansari	843b7f6dd5	fix: Reorder Currency column to fix print (#17008 ) Every Financial Report's 2nd column is Currency, which is an implicit requirement to Print them properly. In this case, Income column was not printed. This fixes that.	2019-03-25 15:50:36 +05:30
Rohit Waghchaure	4ed7d035cb	fix: incorrect paid amount in accounts receivable summary report	2019-03-25 15:37:25 +05:30
Frappe Bot	b07a5d449d	Merge branch 'master' into develop	2019-03-23 07:25:03 +00:00
Saif Ur Rehman	7d1c1aa28f	fix(Party Ledger Summary): Show all adjustment entries as columns Consider only Income Account or Expense Account account type for adjustment amounts Check if GL Entry's is_opening == "Yes"	2019-03-22 17:18:32 +05:00
Rushabh Mehta	da87a491ab	Merge pull request #16816 from finbyz/hotfix fix: Rounding adjustment in Rounded Total	2019-03-22 12:51:09 +05:30
Saurabh	3c95387926	Merge branch 'master' into develop	2019-03-20 14:39:49 +05:30
Rohit Waghchaure	a322687897	fix: Accounts receivable report, remarks showing in the sales person column	2019-03-19 18:10:08 +05:30
rohitwaghchaure	4904ce649e	Merge pull request #16952 from rohitwaghchaure/fixed_accounts_receivable_summary_advance_amt fix: advance amount is not calculating properly	2019-03-19 15:26:41 +05:30
Rohit Waghchaure	1a6e01542a	fix: advance amount is not calculating properly	2019-03-19 15:06:01 +05:30
Himanshu Warekar	642a5b69f5	fix: change customer to supplier	2019-03-18 21:53:33 +05:30
Himanshu	ac199580af	fix(Customer Ledger): ambiguous error in where clause (#16914 ) fix for error "InternalError: (1052, u"Column 'company' in where clause is ambiguous")" in Customer Ledger Summary	2019-03-18 15:44:54 +05:30
Rohit Waghchaure	ace95d5a67	feat: added cost center filter in AR/AP reports	2019-03-18 12:21:00 +05:30
Deepesh Garg	2ae7ed4cf0	fix: Gross profit report fix (#16935 )	2019-03-17 09:49:24 +05:30
Frappe Bot	7e67a400cd	Merge branch 'master' into develop	2019-03-08 09:39:33 +00:00
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
Anurag Mishra	02138b6bfc	fix: gross depends upon now report type	2019-03-04 14:46:28 +05:30
Deepesh Garg	44ff41188d	fix: Selling and buying amount precision fix (#16764 )	2019-03-04 12:56:27 +05:30
Deepesh Garg	40743840b7	fix: Print letter head only if checked in Print Settings (#16789 ) Letter head is printed in financial statements even if option is not checked ![letter head option](https://user-images.githubusercontent.com/42651287/53430759-26baa080-3a15-11e9-948a-bc95700a18d2.png)	2019-03-04 12:53:11 +05:30
Anurag Mishra	f3bdeedc68	minor fixes	2019-03-04 12:27:41 +05:30
Frappe Bot	8f0660ab31	Merge branch 'master' into develop	2019-03-01 09:22:36 +00:00
FinByz Tech Pvt. Ltd	6635583103	fix: Rounding adjustment in Rounded Total In Purchase Receipt and GST Purchase Receipt report, the Rounded Total column doesn't display rounding adjustment of Base Grand Total. So, we have created a fix for that rounding adjustment.	2019-03-01 11:57:06 +05:30
Rohit Waghchaure	c21cda2790	Removed validation for group by voucher in general ledger	2019-02-28 16:20:45 +05:30
Anurag Mishra	a9a1552e32	refactor	2019-02-27 14:10:24 +05:30
Saurabh	3dd7ddd838	Merge branch 'master' into develop	2019-02-21 18:25:29 +05:30
Nabin Hait	e797ec7463	Merge pull request #16746 from deepeshgarg007/gross_profit fix: Decimal point issue in gross profit print	2019-02-21 18:07:14 +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
deepeshgarg007	14ff6bfc32	fix: Decimal point issue in gross profit print	2019-02-21 12:08:32 +05:30
Sagar Vora	cc6e51c62d	Merge branch 'master' into develop	2019-02-19 18:09:49 +05:30
Nabin Hait	e4f73929c4	fix: AR/AP report based on account type	2019-02-19 17:11:50 +05:30
Anurag Mishra	61f981ae05	Changes Requested	2019-02-18 11:43:32 +05:30
Frappe Bot	74fd5daeb2	Merge branch 'master' into develop	2019-02-15 10:22:33 +00:00
Nabin Hait	1c6a1dd5c0	Merge branch 'hotfix' into general-ledger-fix	2019-02-14 18:37:40 +05:30
Anurag Mishra	4f0fd38209	refractor	2019-02-13 16:46:05 +05:30
Sagar Vora	551f52fd25	Merge branch 'master' into develop	2019-02-12 16:41:24 +05:30
Nabin Hait	6447069e50	fix: show values in account/party currency based in actual entry, no conversion	2019-02-12 16:41:20 +05:30
Nabin Hait	ab50211e18	fix: show project even if PI is directly created	2019-02-11 18:25:18 +05:30
Anurag Mishra	aaa57026ac	Merge branch 'gross-and-net-profit-report' of https://github.com/Anurag810/erpnext into gross-and-net-profit-report	2019-02-11 17:02:59 +05:30
Anurag Mishra	f70d4089bc	fix: codacy	2019-02-11 17:02:20 +05:30
Sagar Vora	4e92414850	Merge branch 'hotfix' into gross-and-net-profit-report	2019-02-11 16:00:28 +05:30
Anurag Mishra	a032f0528e	new report gross-and-net-profit-report	2019-02-11 13:12:44 +05:30
Aditya Hase	2a3c39f38a	fix(py3): Convert dict.values() to list for indexing	2019-02-08 12:02:57 +05:30
Aditya Hase	a86a569787	fix(py3): Convert dict.values() to list for indexing	2019-02-07 22:21:06 +05:30
Sagar Vora	f97c5dad82	Merge branch 'staging' into develop	2019-01-29 18:39:14 +05:30
Nabin Hait	3b8623e207	Merge pull request #16491 from adityahase/ar-fix fix(ar-summary): Changes to column list to match recent changes	2019-01-29 11:28:02 +05:30
Nabin Hait	e8190473f5	Merge branch 'staging-fixes' into unicode	2019-01-29 11:13:04 +05:30
Nabin Hait	596c1b3489	Merge pull request #16220 from SaiFi0102/Party-Ledger-Summary feat: Party Ledger Summary Report	2019-01-25 11:22:55 +05:30
rohitwaghchaure	7e4cf62a15	Merge pull request #16370 from rohitwaghchaure/show_outward_entries_in_negative Show outward entries in negative for Bank Clearance Summary report	2019-01-24 22:13:40 +05:30
Aditya Hase	a40c43e414	fix(ar-summary): Changes to column list to match recent changes	2019-01-24 19:13:32 +05:30
Frappe Bot	e415cce1a9	Merge branch 'staging' into develop	2019-01-23 08:19:00 +00:00
Nabin Hait	4ef578e1c4	Merge pull request #16406 from rohitwaghchaure/newchanges_in_tds_reports fix: Multiple fixes in the reports	2019-01-23 12:05:36 +05:30
Aditya Hase	f3c22f342c	fix(unicode): Import unicode_literals in every file	2019-01-22 18:36:10 +05:30
Sagar Vora	4d1a9b10ed	Merge branch 'staging' into develop	2019-01-22 15:56:39 +05:30
Rohit Waghchaure	ddd9136d10	Renamed field and added finance book column in the trial balance simple report	2019-01-22 14:11:57 +05:30
Aditya Hase	d157ae17b7	fix(ar-summary-report): Changes to column list to match recent changes in AR report	2019-01-22 13:37:54 +05:30
deepeshgarg007	3565395e7a	Merge branch 'email_digest' of https://github.com/deepeshgarg007/erpnext into email_digest	2019-01-21 15:03:51 +05:30
deepeshgarg007	aab6d0e028	fix(email_digest): Linkes annual income and annual expense to profit and loss statement	2019-01-21 15:01:40 +05:30
deepeshgarg007	ff1078f271	fix(minor): fetch payment terms if voucher nos are available	2019-01-21 09:43:56 +05:30
Deepesh Garg	f7fe08c487	Merge branch 'develop' into email_digest	2019-01-20 16:53:41 +05:30
Saif Ur Rehman	31d58eac01	fix(Party Ledger Summary): Added Supplier/Customer Name column	2019-01-19 15:28:53 +05:00
Saif Ur Rehman	55566b7f8e	fix(Party Ledger Summary): Codacy fix	2019-01-19 15:12:08 +05:00
Saif Ur Rehman	fcaed12a53	Merge branch 'Party-Ledger-Summary' of https://saifi0102@github.com/SaiFi0102/erpnext.git into Party-Ledger-Summary	2019-01-19 13:18:23 +05:00
Nabin Hait	bace4d3e6d	Merge pull request #16358 from adityahase/naming-series feat(naming): Deferred naming for SLE and GL Entry	2019-01-18 10:55:30 +05:30
Nabin Hait	bef2c22d23	Fix: merge conflict	2019-01-18 10:15:47 +05:30
Rohit Waghchaure	fa7ee0b3b6	Added dafult bank account in the customer/supplier	2019-01-17 15:45:27 +05:30
Nabin Hait	873442a55d	Merge branch 'staging-fixes' into Party-Ledger-Summary	2019-01-16 17:52:45 +05:30
Nabin Hait	28ccaa3c88	Merge branch 'staging-fixes' into Gross-Profit-Return-Fix	2019-01-16 17:49:22 +05:30
Saif Ur Rehman	fccb1e55ec	fix(Gross Profit Report): corrected fieldnames in return invoice query	2019-01-16 14:36:55 +05:00
Rohit Waghchaure	affeb3dfec	Added on account amount field in Accounts Payable/Receivable Summary	2019-01-15 17:38:31 +05:30
Rohit Waghchaure	1a4c1e11cb	Fix: total invoiced amount in Accounts Receivable Summary report showing blank	2019-01-15 17:01:34 +05:30
Rohit Waghchaure	bdee57ca8d	Added finance book in trial balance and fixed cost center not working issue in trial balance	2019-01-15 15:52:52 +05:30
Saif Ur Rehman	f86123ad5a	feat(Party Ledger Summary): Include columns for discount and other adjustments	2019-01-15 15:18:43 +05:00
Rohit Waghchaure	df7215dcb2	Added supplier name in the tds report	2019-01-15 14:48:06 +05:30
Nabin Hait	187bdf08a6	Merge pull request #16319 from SaiFi0102/Gross-Profit-Exclude-Opening-Invoice fix: Exclude Opening Invoice from Gross Profit Report and Company Dashboard Chart	2019-01-10 10:55:41 +05:30
deepeshgarg007	720020319f	fix(Codacy): removed unused variable	2019-01-09 21:56:45 +05:30
deepeshgarg007	c039f70496	Test Cases for account balance report	2019-01-09 21:56:45 +05:30
deepeshgarg007	8621869d24	Created multiple reports and linked them to email digest	2019-01-09 21:56:45 +05:30
Rohit Waghchaure	701c762a68	Show outward entries in negative for Bank Clearance Summary report	2019-01-09 14:21:03 +05:30
Nabin Hait	142d8aa973	Merge pull request #16321 from rohitwaghchaure/fixed_bank_clearance_negtive_value_amt fix: negative amount showing in the bank clearance summary report	2019-01-08 20:25:26 +05:30
Saurabh	afec3ca89a	Merge branch 'staging' into develop	2019-01-08 17:09:36 +05:30
Nabin Hait	4e3e784691	Merge pull request #16335 from deepeshgarg007/accounts-receivable-fix perf: Customer contact column in accounts receivable report	2019-01-08 11:52:20 +05:30
Deepesh Garg	7c45f45ebc	fix: Divide by zero exception fix in item wise purchase register (#16247 ) * Do not prepare row if stock quantity is not available * Update item_wise_purchase_register.py	2019-01-08 08:34:28 +05:30
Aditya Hase	0c16424d7d	fix(naming): Use creation instead of name to order SLEs	2019-01-08 00:09:36 +05:30
Sagar Vora	1310c238a9	Merge pull request #16350 from rohitwaghchaure/code_cleanup_general_ledger fix: replaced str to cstr in genral ledger report	2019-01-07 14:28:27 +05:30
Sagar Vora	fbadb19d93	Merge branch 'staging-fixes' into Gross-Profit-Exclude-Opening-Invoice	2019-01-07 13:55:43 +05:30
Rohit Waghchaure	ed6725172d	Replaced str to cstr in genral ledger report	2019-01-06 20:07:18 +05:30
Frappe Bot	fdd5d54d41	Merge branch 'staging' into develop	2019-01-05 09:11:15 +00:00
deepeshgarg007	eabf260706	fix :Test cases for accounts receivable report	2019-01-04 12:34:28 +05:30
deepeshgarg007	9de81cda77	Added Customer contact column in accounts Receivable	2019-01-04 10:54:24 +05:30
Rohit Waghchaure	1ff1fc4725	[Fix] Negative amount showing in the bank clearance summary	2019-01-02 17:56:08 +05:30
Saif Ur Rehman	016f29f09b	fix: error due to passing None in scrub	2019-01-02 16:22:22 +05:00
Saif Ur Rehman	e194a655df	fix: is_opening != 'Yes'	2019-01-02 16:09:34 +05:00
Charles-Henri Decultot	94e35e7a7e	Fix #15917 (#16311 )	2019-01-01 22:25:13 +05:30
Saif Ur Rehman	fac6b59627	Exclude opening invoices in Gross Profit Report	2019-01-01 16:33:22 +05:00
Nabin Hait	137a24f457	Merge pull request #16253 from chdecultot/sales_summary_correction [Fix] Filter cancelled and draft payments in sales payment summary	2018-12-31 12:02:19 +05:30
Charles-Henri Decultot	e87eb07e16	Correction for Travis	2018-12-27 17:38:57 +00:00
Charles-Henri Decultot	8d71015bf8	Cleanup journal entries	2018-12-27 16:43:26 +00:00
Charles-Henri Decultot	b7339d7dcb	Test travis	2018-12-27 15:30:56 +00:00
Charles-Henri Decultot	43c7bd57e4	Cancel existing payment entries for data integrity in test	2018-12-27 14:43:30 +00:00
Charles-Henri Decultot	641d3e0073	Add own records	2018-12-27 13:43:56 +00:00
Charles-Henri Decultot	0f9c47c242	Remove pricing rule from items	2018-12-27 10:10:18 +00:00
Charles-Henri Decultot	02aa9fb240	Understand Travis	2018-12-27 08:46:29 +00:00
Charles-Henri Decultot	d7777696d7	Corrections for Travis	2018-12-26 14:08:00 +00:00
Charles-Henri Decultot	9c1db688d1	Ignore pricing rule for Travis	2018-12-26 10:33:42 +00:00
Charles-Henri Decultot	899b9b1ea7	Codacy correction	2018-12-26 08:56:11 +00:00
Charles-Henri Decultot	9d31452c25	Remove ununsed variable	2018-12-26 08:38:42 +00:00
Charles-Henri Decultot	ed94317df9	Test cases	2018-12-26 08:36:32 +00:00
Rushabh Mehta	5d11abb0a2	fix(escaping): accounts_receivable.py	2018-12-24 16:03:24 +05:30
Frappe Bot	1b7c583c48	Merge branch 'staging' into develop	2018-12-21 05:46:23 +00:00
Charles-Henri Decultot	813485023b	Filter cancelled and draft payments	2018-12-20 14:04:00 +00:00
Nabin Hait	0866b2b75a	Update accounts_receivable.py	2018-12-20 14:11:20 +05:30
deepeshgarg007	b645c2c75e	Rebase using staging-fixes and resolved conflicts	2018-12-19 18:47:36 +05:30
deepeshgarg007	530453e4fc	Added temp variables for outstanding, credit_note_amt instead of function calling	2018-12-19 18:43:07 +05:30
deepeshgarg007	5de603c6af	breaked up code into multiple functions	2018-12-19 18:43:06 +05:30
deepeshgarg007	4ac8fcf4af	Added test case for Accounts receivable report based on payment terms	2018-12-19 18:43:06 +05:30
deepeshgarg007	a944f88b94	Removed column for pdc date	2018-12-19 18:43:06 +05:30
deepeshgarg007	17544d7ad6	Refactored accounts receivable report for payment terms	2018-12-19 18:43:06 +05:30
deepeshgarg007	e7a91b9526	Credit note fix	2018-12-19 18:43:06 +05:30
deepeshgarg007	f98adf2be5	Changed columns and added currency conditions	2018-12-19 18:43:06 +05:30
deepeshgarg007	b6c083706a	Allocation of credit note amount and pdc in payment terms	2018-12-19 18:43:06 +05:30
deepeshgarg007	24f8d3ed0c	Add columns based on payment terms	2018-12-19 18:43:06 +05:30
deepeshgarg007	a8ab9b5c3d	Accounts Receivable report based on payment terms	2018-12-19 18:43:06 +05:30
Saif Ur Rehman	b53231595d	Using same filter for Sales Person from Accounts Receivable Added Customer/Supplier Ledger Summary in Accounts Module page	2018-12-12 15:46:50 +05:00
Saif Ur Rehman	b07d108bee	feat: Supplier Ledger Summary	2018-12-12 05:45:49 +05:00
Saif Ur Rehman	41236ed0e5	feat: Customer Ledger Summary report	2018-12-12 05:12:20 +05:00
Frappe Bot	fb2fdc4f4e	Merge branch 'staging' into develop	2018-12-11 09:55:01 +00:00
Pawan Mehta	377511165e	Simple Trial Balance (#16060 )	2018-12-10 21:55:01 +05:30
Frappe Bot	5b50b2848d	Merge branch 'staging' into develop	2018-12-10 13:08:33 +00:00
Saif	b52bd9c093	AR/AP Report Enhancement (#16175 ) * Modified AR/AP print format * Filter Sales Person based on either Customer or Voucher's assigned Sales Person * -Added Sales Person column to Accounts Receivable Summary -Added all filters in AR/AP Summary Report as in AR/AP Report -Reordered filters for better grouping -Fixed a bug that customer_name was not unset after removing Customer from filter	2018-12-10 17:56:42 +05:30
Ameya Shenoy	fe1f532bc0	Merge branch 'staging' into develop	2018-11-28 08:28:37 +00:00
Ameya Shenoy	2806d83362	Merge branch 'master' into staging-fixes	2018-11-28 08:12:48 +00:00
Nabin Hait	f642f86982	Merge branch 'hotfix' into accounts_receivable_summary_print_issue	2018-11-27 17:56:49 +05:30
Rohit Waghchaure	10bcd5113c	[Fix] Accounts receivable summary print is not working	2018-11-27 16:25:35 +05:30
Nabin Hait	212a29ae2c	Merge pull request #16028 from rohitwaghchaure/not_able_to_view_general_ledger [Fix] Not able to view general ledger for purchase invoice	2018-11-26 19:57:24 +05:30
Nabin Hait	25e60f3934	Merge pull request #16044 from ESS-LLP/fix-trial-balance fix: Trial Balance print	2018-11-26 19:56:27 +05:30
deepeshgarg007	5dbb9f5312	Accounts receivable summary print fix	2018-11-23 19:54:08 +05:30
Ranjith	1879e91148	fix: Trial Balance	2018-11-21 16:04:05 +05:30
Saif Ur Rehman	23eef11cf5	Fixed get_buying_amount in Gross Profit report: To handle the case where there may be multiple invoices for a single delivery	2018-11-21 15:32:37 +05:00
Rohit Waghchaure	770a13ebc3	[Fix] Not able to view general ledger for purchase invoice	2018-11-20 13:01:52 +05:30
Frappe Bot	8c7373dfd0	Merge branch 'staging' into develop	2018-11-15 09:45:05 +00:00
Frappe Bot	eb4969d24f	Merge branch 'staging' into develop	2018-11-15 09:26:03 +00:00
Nabin Hait	0aca5aad14	Merge pull request #15976 from deepeshgarg007/summary [Fix] Accounts receivable summary print format showing zero values	2018-11-15 14:52:16 +05:30
Rohit Waghchaure	704796b1cb	Code optimization for consolidated financial statement report	2018-11-15 13:46:18 +05:30
Rohit Waghchaure	9d0f90975b	[Fix] Consolidated financial statement report currency conversion issue	2018-11-15 12:55:20 +05:30
Rohit Waghchaure	a95697f506	Added currency filter in consolidated financial statement report	2018-11-14 19:55:44 +05:30
Frappe Bot	b5c7b96a73	Merge branch 'staging' into develop	2018-11-13 11:33:31 +00:00
deepeshgarg007	7bc6f3843a	Fix for accounts Receivable Summary Showing zero values	2018-11-13 16:54:54 +05:30
rohitwaghchaure	ab76ff0836	Added new option group by voucher(consolidated) in the general ledger report (#15957 )	2018-11-12 16:58:24 +05:30
Frappe Bot	1ff9c691b7	Merge branch 'staging' into develop	2018-11-09 10:21:07 +00:00
Shreya Shah	3f6eb6b393	fix: If party type is Shareholder, set appropriate name field (#15916 )	2018-11-08 11:51:13 +05:30
Shreya Shah	c704630d5f	fix: Return default if company not found (#15915 )	2018-11-06 17:24:45 +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
Ameya Shenoy	4a75d58d89	Merge branch 'master' into staging-fixes	2018-11-05 06:45:04 +00:00
Zarrar	16d45c8e2e	safe encode non ascii characters (#15755 )	2018-11-02 13:17:24 +05:30
Navdeep Ghai	768513f2f9	fixed divided by zero error (#15885 )	2018-11-02 12:19:05 +05:30
Charles-Henri Decultot	a89bce0b6e	Encoding correction (#15877 )	2018-11-01 13:18:49 +05:30
Ameya Shenoy	f3f997f232	Merge branch 'staging' into develop	2018-10-31 13:51:52 +00:00
Ameya Shenoy	961849beb4	Merge branch 'master' into staging-fixes	2018-10-31 13:43:12 +00:00
Shreya Shah	0c0e49a421	fix: Fix fieldnames in template (#15860 )	2018-10-31 18:00:09 +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
rohitwaghchaure	e2afbb7abe	Merge pull request #15703 from SaiFi0102/AR-AP-PDC-Fix [For staging-fixes] Fixed PDC data in AR/AP report	2018-10-17 15:57:28 +05:30
Ameya Shenoy	d1c467bcf5	Merge branch 'staging' into develop	2018-10-17 09:44:39 +00:00
Ameya Shenoy	77b60928bf	Merge branch 'master' into staging-fixes	2018-10-17 09:39:31 +00:00
rohitwaghchaure	b7debc8573	Merge pull request #15365 from SaiFi0102/AR-AP-PDC-Fix Fixed PDC data in AR/AP report	2018-10-16 11:27:53 +05:30
rohitwaghchaure	a5a926967b	Update accounts_receivable.py	2018-10-16 11:27:23 +05:30
Bibin	7844b79274	[Bug-Fix] accounts_receivable.html (#15688 ) * Update accounts_receivable.html In the print format and PDF the total was showing as 0 (Zero) , when I made these changes it fixed the issue * Update accounts_receivable.html	2018-10-15 18:25:26 +05:30
Ameya Shenoy	606c504f28	Merge branch 'staging' into develop	2018-10-15 12:25:03 +00:00
rohitwaghchaure	0d2a4c6a59	[Fix] TDS Payable Monthly report is not working (#15666 )	2018-10-15 11:09:17 +05:30
deepeshgarg007	42510a411f	[Bug-Fix]V11 Accounts Receivable print showing zero values (#15667 ) * Bug Fix * Print report bug fixes	2018-10-15 11:08:04 +05:30
Ameya Shenoy	f90af80344	Merge branch 'staging' into develop	2018-10-11 06:58:53 +00:00
Saurabh	99c064305f	Merge branch 'master' into staging-fixes	2018-10-09 17:55:33 +05:30
Shreya Shah	8a4bcefec4	fix(accounts-receivable): Column values in Print and PDF (#15621 )	2018-10-08 18:34:01 +05:30
Shreya Shah	5b34d00bc0	fix(accounts-receivable): Column values in Print and PDF (#15622 )	2018-10-08 18:20:51 +05:30
Ameya Shenoy	1d5dc73dfd	Merge branch 'staging' into develop	2018-10-05 09:10:30 +00:00
Shreya Shah	deb9f0e03c	Merge pull request #15594 from shreyashah115/tds-report Handle IndexError if no data found	2018-10-05 14:11:43 +05:30
Shreya	0d7bd43367	Handle IndexError if no data found	2018-10-05 13:22:09 +05:30
Ameya Shenoy	da10f6ebd8	Merge branch 'staging' into develop	2018-10-04 11:51:30 +00:00
Rohit Waghchaure	18678696db	Fix issue after merging hotfix into staging-fixes	2018-10-04 16:33:43 +05:30
Ameya Shenoy	7d929c508f	Merge branch 'master' into staging-fixes	2018-10-04 09:25:07 +00:00
Shreya	cbb112f2db	Fix filter error	2018-10-03 17:37:40 +05:30
deepeshgarg007	719701f2a4	Enhancement in Budget Variance and other reports (#15455 ) * Enhanced Budget Variance report and added filters and columns in other reports * Update budget_variance_report.js * Changes in budget variance report * Spacing in column names	2018-10-02 12:52:13 +05:30
Zarrar	e4c9ac3961	[Minor] Cash Flow report - custom (#15522 ) * python 2-3 fix for filter * pass filters while fetching data to financial statement report	2018-09-30 21:19:01 +05:30
Rohit Waghchaure	ea0ef95539	[Fix] Consolidated Financial Statement report	2018-09-28 17:05:55 +05:30
Suraj Shetty	6ea3de9521	Fix quote issues (#15497 ) * Fix quotes issues * Remove frappe.db.escape - Handle escape in the update_linked_doctypes method	2018-09-26 18:15:53 +05:30
Nabin Hait	1e7c32b909	Payroll fixes and more (#15475 ) * fix(payroll): multiple minor fixes related to salary structure * Added GSTR-1 and GSTR-2 report in Accounts module page * delete asset movement records on cancellation of Purchase Receipt * Update consolidated_financial_statement.py * minor fix * minor fix * add filters on item prices report (#15495)	2018-09-26 18:01:00 +05:30
rohitwaghchaure	0cf0ebf08b	[Refactored] Asset Depreciation Ledger report based on GL entries (#15415 ) * [Refactored] Asset Depreciation Ledger report is based on GL entries * Provision to make manual JV from the asset if Calculate Depreciation is disabled	2018-09-26 15:24:49 +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
Saurabh	75d90b9d8f	a[resolved] merge-conflicts	2018-09-20 13:28:23 +05:30
Saif	772dc6e82c	Various permission fixes (#15448 ) * Removed test letter head from Consolidated Financial Statement * Removed incorrect role permissions	2018-09-20 13:20:17 +05:30
rohitwaghchaure	550fc695f1	[Fix] Precision issue in the accounts receivable report (#15440 )	2018-09-19 19:03:40 +05:30
RicardoJohann	267e806d7f	added description field and changed to one filter datepicker (#15425 )	2018-09-18 10:48:20 +05:30
Zlash65	2619596917	pass filters as parameter	2018-09-13 12:56:04 +05:30
Nabin Hait	9fde97cdd2	Fixed merge conflict	2018-09-12 15:45:20 +05:30
Zarrar	8dade79002	return blank if no data found (#15387 )	2018-09-12 14:24:23 +05:30
Saif Ur Rehman	423549e084	Fixed PDC data in AR/AP report: -Get PDC date from posting_date instead of reference date since posting_date is the date at which the post dated cheque can be cleared -Get PDC data from submitted documents only	2018-09-08 15:48:55 +05:00
Nabin Hait	3a342e8d93	fix(report): project filter in financial statement	2018-09-07 14:17:57 +05:30
Zarrar	525a005b78	TDS Monthly report & TDS Computation Summary report (#15204 ) * tds computation report added * tds computation logic added * minor changes to commonify code * tds payable monthly report added * initial logic for monthly tds calculation added * added field for supplier type and pan * changes related to pan and entity type * date filter fix and cleanup	2018-09-07 13:27:10 +05:30
Nabin Hait	b479a87031	fix(report): Cost center filters in financial statements and general ledger	2018-09-07 13:17:23 +05:30
Sanjay Kumar	1b49f3a4e7	Allow cost center in entry of balance sheet accounts (#14972 ) * Allow Cost Center In Entry of Balance Sheet Account * Add parent cost center in get payment entry * Add Tests for Allow Cost Center In Entry of Balance Sheet Account * Add tests for cost center wise account and party balance * set parent cost center in taxes * 1. Remove copy parent cost_center to child 2. Improve update party and account balance functionality on cost_center change 3. Add cost_center filter to get_outstanding_documents * fix Codacy and Travis issue	2018-09-06 14:39:35 +05:30
Zarrar	2705af488d	[Minor] [Staging] POS Profile (#15321 ) * update modified date to load field display_items_in_stock * stop dialog from popping up if no loyalty program found * warehouse not used for not is_pos type invoice	2018-09-05 17:20:07 +05:30
Nabin Hait	a804d6d487	Fixed merge conflict	2018-08-29 13:34:58 +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
Mario Monroy	fbc3df3247	Fix indentation accounts_receivable.py (#15203 )	2018-08-23 11:10:15 +05:30
Bassam Ramadan	1ff2315899	Trial balance and payable accounts reports and sales return fixes (#15000 ) * adding supplier type filter to payable accounts and payable accounts summary reports adding supplier type filter to payable accounts and payable accounts summary reports as customer group at receivable accounts and summary reports as its important and easier to put this filter * fix trial balance opening and closing values the removed mathematical operations was causing showing incorrect values at opening and closing columns where the total row was correct so the operation deleted to view the correct values to be equal to the total row and to stop confusing the user due to different values between the total row and the the values in front of each account * fix for supplier type filter field on payable accounts reports rename the supplier type filter field to supplier group in payable accounts and summary reports * fix for paid amount in returned sales invoice the current paid amount not change from source value if you deleted any item if the invoice contain for example 3 items and you only need to return on item the current steps is to open the original invoice and press on make return then you delete the unwanted items but in this case the paid amount will not change and you will get an alert from the system until you change it manually but with this modification it works very well. * fixing trial balance values and totals fixing trial balance opening and closing ( DR - CR ) values and totals	2018-08-20 17:58:28 +05:30
Saif	e3947296e8	Group by Voucher fix in General Ledger Report (#15169 ) * -Group by Voucher requires ordering the query not grouping the query -Summing fields is not necessary since grouping by 'name' is the same as getting individual entries * Group by Voucher show groups with totals at the end of group	2018-08-20 17:49:29 +05:30
rohitwaghchaure	7e36aa4162	Merge pull request #15150 from rohitwaghchaure/fix_consolidated_balance_sheet_report [Fix] Consolidated balance sheet report	2018-08-15 19:41:41 +05:30
Rohit Waghchaure	cafd61de85	[Fix] Consolidated balance sheet report	2018-08-15 16:18:46 +05:30
Zarrar	3523b779aa	rounding off fixes and conversion fix (#15140 )	2018-08-14 16:28:14 +05:30
Faris Ansari	4809f86035	fix(report): field -> fieldname, dateutil -> frappe.datetime (#15106 )	2018-08-14 10:56:18 +05:30
rohitwaghchaure	88b0a1305f	Code optimization for accounts receivable report to avoid timeout error (#15114 ) * Code optimization for accounts receivable report to avoid timeout error * Added index for party_type	2018-08-14 10:51:13 +05:30
Rushabh Mehta	708e47aadf	optimize(various)	2018-08-08 16:37:31 +05:30
rohitwaghchaure	8f0acf30bf	Merge pull request #15101 from rohitwaghchaure/ascii_issue_in_balance_sheet [Fix] 'ascii' codec can't encode error in balance sheet report	2018-08-07 16:53:21 +05:30
Rohit Waghchaure	9a9974f5c3	[Fix] 'ascii' codec can't encode error in balance sheet report	2018-08-07 16:51:56 +05:30
Saurabh	824b388631	Resolved merge conflicts	2018-08-07 13:01:11 +05:30
Shreya Shah	f0ef673498	Accounts receivable aging based on supplier due date (#15080 ) * Accounts receivable aging based on supplier due date (#13801) * Remove spaces	2018-08-06 14:42:35 +05:30
Rohit Waghchaure	15f52e7b71	[Fix] Incorrect tax amount calculation because of same fieldname in the code	2018-08-06 14:29:34 +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
Nabin Hait	fa06ee80e9	Fixed merge conflict	2018-07-27 12:54:00 +05:30
Yaqin Shurrab	cc56ff5c37	Get the correct Summation of Closing Balances (#14990 ) Fix total raw values for Closing Credit and Closing Debit	2018-07-27 11:13:00 +05:30
rohitwaghchaure	20d3bef3c3	[Fix] Deducted tax amount adding up in the total amount in the GST Itemised Purchase Register report (#14994 )	2018-07-27 11:03:53 +05:30
Faris Ansari	5e096df5ae	columnDef => column	2018-07-20 16:35:51 +05:30
Faris Ansari	e7f864a4dd	Return early if filters not initialized	2018-07-20 16:31:01 +05:30
Faris Ansari	5986d59b01	Financial Reports - Update formatter for use with DataTable - Fetch Currency from filters and fallback to company currency	2018-07-20 15:11:55 +05:30
Prateeksha Singh	627d0d58be	[fiscal-year] use to_date property	2018-07-18 18:09:28 +05:30
Prateeksha Singh	8ecfaaa707	[fix] format fiscal year docname to proper date before using 🤦 (#14955 )	2018-07-18 18:03:27 +05:30
Saurabh	d7897f1c53	Resolved merge conflicts	2018-07-18 17:08:16 +05:30
Faris Ansari	9e874af9ba	Query report print (#14935 ) * QueryReport - Only print visible columns in report - Use get_columns_for_print method instead of directly accessing report.columns * Query Report - Replace frappe.query_report_filters_by_name with new API	2018-07-18 09:28:44 +05:30
rohitwaghchaure	a3e070bc6b	[Fix] Invoices not showing in the gross profit report against which sales return entry has created (#14914 )	2018-07-16 18:11:19 +05:30

... 9 10 11 12 13 ...

1667 Commits