brotherton-erpnext

Author	SHA1	Message	Date
marination	4be5b5c891	fix: Handle missing Account and Item in Opening Invoice Creation Tool	2020-10-08 19:51:42 +05:30
Deepesh Garg	c837b5f48c	Merge pull request #23014 from abhishekbalam/pricing_rule_on_condition feat(Accounts): Add Condition Field In Pricing Rule	2020-10-08 16:32:21 +05:30
Abhishek Balam	6d1af84fef	Merge branch 'develop' into budget	2020-10-08 16:23:36 +05:30
Saqib Ansari	3f28fb19aa	chore: validate is_group of child parent account before auto creating an account	2020-10-08 14:57:27 +05:30
Saqib	22b4c86a38	fix: cannot merge pos invoices with inclusive tax (#23541 ) * fix: cannot merge pos invoices with inclusive tax * fix: item rate calculation	2020-10-08 11:23:21 +05:30
michellealva	a9c2401a2d	fix: Typo in Accounts Setings	2020-10-07 15:13:57 +05:30
Abhishek Balam	937308854a	Merge branch 'develop' into pricing_rule_on_condition	2020-10-07 13:35:53 +05:30
Raffael Meyer	2acfc2a034	Merge branch 'develop' into validate_regional_germany	2020-10-06 16:53:52 +02:00
michellealva	2e425efae8	fix: blank option in the beginning	2020-10-06 15:15:29 +05:30
michellealva	a2aae5644e	fix(Budget): Change options in select field	2020-10-06 15:02:01 +05:30
Deepesh Garg	f183dd6d3a	Merge branch 'develop' into tax_fetch_quote	2020-10-06 13:27:28 +05:30
Mangesh-Khairnar	8d54d61c28	fix: handle payment completion via payment request	2020-10-05 22:37:31 +05:30
Deepesh Garg	5bf35e465e	Merge pull request #23220 from marination/account-add-rename feat: Validate and Update Child Company Accounts on Rename/Adding Account	2020-10-04 15:19:26 +05:30
Mangesh-Khairnar	1bef6a530c	fix: create payment entry against payment request	2020-10-04 13:01:11 +05:30
aakvatech	38ccf82604	fix: get_outstanding_invoices not ignoring the cancelled transactions Added is_cancelled=0 in 2 places for get_outstanding_invoices	2020-10-03 19:41:38 +03:00
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
Abhishek Balam	71c24c8a90	feat: add tests	2020-10-01 14:54:11 +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
Deepesh Garg	bc44bc64cc	fix: Add test	2020-09-29 18:39:45 +05:30
barredterra	81ad90c1d4	feat: validate sales invoice for germany	2020-09-29 11:54:57 +02:00
Marica	25f4c1636e	Merge branch 'develop' into account-add-rename	2020-09-29 13:18:54 +05:30
hasnain2808	a5e8e449ee	chore: Merge branch 'develop' into UAE-VAT-Format	2020-09-28 20:43:03 +05:30
hasnain2808	23c8966e81	Merge branch 'develop' into UAE-VAT-Format	2020-09-28 20:06:02 +05:30
Mangesh-Khairnar	8d12c3841f	fix: process transaction callback	2020-09-28 19:40:42 +05:30
hasnain2808	587bb05a37	feat(UAE VAT 21): Add desk page for UAE VAT 21	2020-09-28 14:52:29 +05:30
Mangesh-Khairnar	98658603dd	Merge branch 'develop' of https://github.com/frappe/erpnext into mpesa-integration	2020-09-28 02:10:53 +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
marination	8370d9b997	fix: Check Company in Payment Entry before selecting values	2020-09-24 11:51:03 +05:30
Deepesh Garg	cfc5e29127	fix: Post cancellation accounting entry on posting date instaed of current (#23361 )	2020-09-23 17:19:11 +05:30
Mangesh-Khairnar	4eb215badb	fix: bind callback callback for realtime event	2020-09-23 15:55:21 +05:30
Afshan	8be51e22c4	fix: escape apostrophe in cost centre and project if exist	2020-09-23 14:52:36 +05:30
marination	fd155408e5	fix: Check if account exists in parent company on rename - Check if child company is dependent on parent company - Check if account-to-be-renamed exists in parent, if yes, block - Revised Test basd on the same	2020-09-23 14:42:10 +05:30
Marica	ef2b5e8284	Merge branch 'develop' into pr-dn-return	2020-09-22 15:39:25 +05:30
Mangesh-Khairnar	97ab96c8bf	fix: handle api changes from callbacks	2020-09-22 12:58:32 +05:30
Rohan	e42f08085b	fix: use Plaid's new API (develop) (#23318 ) Co-authored-by: Mangesh-Khairnar <mkhairnar10@gmail.com>	2020-09-21 13:14:07 +05:30
Deepesh Garg	5c8dd6a0ed	Merge pull request #23355 from Anurag810/accounts_recievable fix: Cost Center filter in accounts receivable and payable report	2020-09-20 19:36:30 +05:30
Saqib	4b25eb4db4	fix: mode of payment not fetched if no account is set (#23334 ) Co-authored-by: Sagar Vora <sagar@resilient.tech>	2020-09-19 19:33:21 +05:30
Mangesh-Khairnar	a3ac4bf681	fix: create payment request via pos	2020-09-18 19:47:33 +05:30
Saqib	7126e179c3	fix: button click event not working in POS custom fields (#23358 )	2020-09-22 16:35:11 +05:30
Abhishek Balam	4e6733293f	fix(DocTypes): Reset "owner" values in DocTypes to Administrator (#23350 ) * fix: reset owner values in doctype to Administrator * fix: updated modified value * fix: also fixed modified by * fix: change modified_by to Administrator	2020-09-18 18:27:24 +05:30
Saqib	c29ee691d4	fix: button click event not working in POS custom fields (#23358 )	2020-09-18 15:27:17 +05:30
Anurag Mishra	170ecdc76e	fix: No handlefor Cost centers in Accounts Receivable	2020-09-18 13:26:46 +05:30
Deepesh Garg	5c04b2eea4	Merge pull request #23235 from Anurag810/custom_remark feat: added option to add custom remarks in payment entry	2020-09-16 13:38:04 +05:30
Deepesh Garg	2f50cb3e58	fix: Supplier trigger onload	2020-09-15 15:00:32 +05:30
Anurag Mishra	9397b7f58b	fix: requested changes	2020-09-15 12:36:01 +05:30
Deepesh Garg	36bc0577a2	fix: Item GL entries for purchase invoice (#23027 )	2020-09-15 09:44:46 +05:30
Rucha Mahabal	fcb6ba6ec7	fix: get_transaction_entries function arguments in Bank Statement Transaction Entry (#23051 )	2020-09-14 21:12:36 +05:30
Mangesh-Khairnar	40d3add63c	feat(payment-gateway-account): add additional payment channel	2020-09-14 15:14:36 +05:30
marination	02c550c07d	fix: Redundant imports	2020-09-11 16:22:54 +05:30
Marica	4153a9f8de	Merge branch 'develop' into pr-dn-return	2020-09-11 16:10:48 +05:30
marination	9533318832	chore: Tests for Rename and Add child Account	2020-09-11 16:09:27 +05:30
Saqib	cd89994b33	fix: multiple pos issues (#23297 ) * fix: returns can be made against unconsolidated invoices * fix: indentation * fix: mode of payment not fetching for pos returns * patch: default pos profile print format * fix: tests * chore: clean up retail desk page	2020-09-10 19:28:46 +05:30
Suraj Shetty	67095d239f	fix: Custom dashboard sections	2020-09-10 17:15:52 +05:30
marination	efb211af6d	chore: Fix Received/Delivered Items to Billed Logic	2020-09-09 16:24:11 +05:30
rohitwaghchaure	1d555f35a7	Merge pull request #23282 from deepeshgarg007/tds_bug fix: Apply TDS on Purchase Invoice creation from Purchase Order and Purchase Receipt	2020-09-08 16:59:29 +05:30
Deepesh Garg	f7731b0715	fix: TDS applicable on creating PI from get items button	2020-09-08 13:41:04 +05:30
Afshan	12ab8ebc95	fix: removed ignore permission flag	2020-09-08 12:55:42 +05:30
rohitwaghchaure	0cb805308f	Merge pull request #23256 from Mangesh-Khairnar/fix-adv-payment-payment-order fix: capture advance payments in payment order	2020-09-08 09:59:47 +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
Deepesh Garg	74ab1084b3	fix: Apply TDS on Purchase Invoice creation from Purchase Order and Purchase Receipt	2020-09-07 17:55:10 +05:30
Mangesh-Khairnar	7456ffca0f	fix: teardown created payment order	2020-09-04 19:59:01 +05:30
Mangesh-Khairnar	a76bf4d7af	fix: remove unused imports	2020-09-04 19:08:08 +05:30
Mangesh-Khairnar	d9e4883392	test: check payment order creation against payment entry	2020-09-04 18:55:14 +05:30
Mangesh-Khairnar	e1889d0c1b	fix(payment entry): update payment order status	2020-09-04 14:45:19 +05:30
Mangesh-Khairnar	8d8af94182	fix: capture advance payments in payment order	2020-09-04 12:17:56 +05:30
Deepesh Garg	b306fa355d	Merge pull request #23248 from deepeshgarg007/pda_account_filter fix: Account filter in Process Deferred Accounting doctype	2020-09-03 19:22:56 +05:30
Deepesh Garg	9b681770d0	fix: Account filter in Process Deferred Accounting doctype	2020-09-03 18:09:02 +05:30
michellealva	0857e6d669	fix: Add "Bank Clearance" and "Bank Reconciliation" in desk	2020-09-03 10:37:43 +05:30
Anurag Mishra	41f421d400	feat: added option to add custom remarks in payment entry	2020-09-02 13:47:18 +05:30
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
Afshan	1dc9a9b669	fix: reverse journal entry for multi-currency (#23165 ) * fix: reverse journal entry for multi-currency * fix: test case for reverse journal entry	2020-08-31 20:35:05 +05:30
marination	8938d1040d	fix: Rename/Update Child company Accounts as well	2020-08-31 18:18:10 +05:30
Deepesh Garg	bdc933b3d3	Merge pull request #22985 from deepeshgarg007/accounting_period_cancellation fix: Cancellation of accounting transactions within closed accounting period	2020-08-31 17:16:55 +05:30
marination	fdcda85f87	fix: Validate Missing Accounts in Child Companies - If parent account exists in Parent and now child, throw error	2020-08-31 16:10:52 +05:30
Deepesh Garg	56ddf41873	Merge pull request #23211 from michellealva/tax-cat feat: Allow Rename for Tax Category	2020-08-31 15:56:43 +05:30
michellealva	c71e37c988	feat: Allow Rename for Tax Category	2020-08-30 19:42:24 +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
Rucha Mahabal	8cdc3b5d91	Merge branch 'develop' into patch-9	2020-08-28 10:41:02 +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
prssanna	a324e9bd12	fix: remove text-muted and small class fromtree items	2020-08-27 19:26:14 +05:30
Suraj Shetty	a49af09705	fix: Primary button icon	2020-08-27 18:57:43 +05:30
Suraj Shetty	b6ebcd7559	refactor: Replace darkgray indicator with gray indicator	2020-08-27 18:57:18 +05:30
prssanna	744169833c	fix: replace indicator color darkgrey with darkgray	2020-08-27 17:06:10 +05:30
michellealva	ead2f6abf0	fix: Chage fiedtype of Customer's PO in Sales Invoice	2020-08-27 13:57:15 +05:30
Marica	e7fabb10e1	Merge branch 'develop' into general-ledger-filters	2020-08-27 11:59:01 +05:30
bhavesh95863	bb5d886930	fix: account & cost center filter by company	2020-08-26 18:23:21 +05:30
Abhishek Balam	dc9af639a7	fix: move condition field	2020-08-26 12:26:15 +05:30
Abhishek Balam	7d0bb25aca	fix: dont show message on condition syntax error	2020-08-26 12:22:31 +05:30
Michelle Alva	258b256dc6	fix: Add Delivery Note link in Sales Invoice Dashboard (#23161 )	2020-08-25 20:37:39 +05:30
Rushabh Mehta	ee921052c0	fix(minor): test dependencies	2020-08-25 14:35:49 +05:30
Rushabh Mehta	b5b8f9e72d	fix(minor): import	2020-08-25 14:14:23 +05:30
Rushabh Mehta	8ad0fa48bf	fix(minor): circular imports?	2020-08-25 12:24:31 +05:30
Rushabh Mehta	ff5d19609f	fix(hot): Pricing Rule encoding fixed	2020-08-25 11:59:57 +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
rohitwaghchaure	019d4debb2	fix: incorrect stock value in return case (#23102 )	2020-08-20 15:53:58 +05:30
Rucha Mahabal	434bab8003	fix: Print Language for Customer not set for Print Receipt in POS	2020-08-19 01:00:59 +05:30
Rohit Waghchaure	310ade7282	profit and loss report not working	2020-08-18 16:07:24 +05:30
Marica	847343af86	Merge branch 'develop' into general-ledger-filters	2020-08-18 13:40:45 +05:30
Michelle Alva	849b712770	fix: Change spelling of "Successful" (#23063 ) Before: Import Successfull After: Import Successful	2020-08-18 12:06:46 +05:30
Rucha Mahabal	035907a24f	fix: remove Request for Quotation link from Fiscal Year dashboard (#23040 )	2020-08-18 10:57:10 +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
Deepesh Garg	1067f7ed3e	fix: Price rule filtering in case of no doc	2020-08-17 23:47:58 +05:30
marination	eb241c6c42	fix: General Ledger filter validation	2020-08-17 12:57:56 +05:30
Afshan	5b45961b9d	fix: the JSON object must be str, bytes or bytearray, not "list" (#23047 ) Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-08-17 10:51:53 +05:30
Deepesh Garg	d9accededa	fix: filter pricing rules based on condition	2020-08-14 22:36:01 +05:30
Rucha Mahabal	5fb0e7184e	fix: list index out of range error while setting POS payment mode (#23018 )	2020-08-14 17:11:39 +05:30
bhavesh95863	a647bef682	fix: warehouse mandatory even update stock uncheck (#23023 )	2020-08-13 17:41:55 +05:30
Anupam K	b3bd780d46	fix: codasy dix	2020-08-13 17:07:15 +05:30
Abhishek Balam	a25760046f	fix: condition syntax validation readded, fetch item details if condition not met ignoring rule	2020-08-13 13:22:58 +05:30
Abhishek Balam	487aa30aef	fix: eval fail message fix	2020-08-13 12:19:34 +05:30
Deepesh Garg	ca898c6da3	fix: Condition fix	2020-08-13 11:54:18 +05:30
Deepesh Garg	cbde04d3da	fix: Pass doc instead of args	2020-08-13 11:47:41 +05:30
prssanna	bfb219612e	feat: enable total row in Gross Profit Report	2020-08-13 11:34:05 +05:30
Abhishek Balam	fdfab03c11	feat: add condition field in pricing rule	2020-08-12 20:33:54 +05:30
Nabin Hait	19ea7218d9	fix: Calculate taxes if tax is based on item quantity and inclusive on item price	2020-08-11 20:34:57 +05:30
Abhishek Balam	ee5b9c7691	feat(Accounting): Process Statement Of Accounts (#22901 ) * feat: Process Statement Of Accounts initial commit * fix: add jinja supported inputs for subject and body in email settings * feat: utils support in template, tested autoemail, fixed issues	2020-08-11 16:23:47 +05:30
Anupam Kumar	79d731dcd8	feat: Naming series for Sales/Purchase Return (#22942 ) * feat: adding return naming series * Update purchase_invoice.json Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-08-11 16:11:20 +05:30
Afshan	acc3d42cf0	fix: escape apostrophe in company name if exist (#22956 ) Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-08-11 14:40:44 +05:30
Rucha Mahabal	f7a7cc08d9	Merge branch 'develop' into escape-company-field	2020-08-11 10:22:32 +05:30
sahil28297	4e4a19d3e6	Merge pull request #22984 from saurabh6790/tax-template-issue fix: Susbcription in Sales Taxes and Charges Dashboard	2020-08-10 16:01:35 +05:30
Deepesh Garg	069a54e5c3	fix: Cancellation of accounting transactions within closed accounting period	2020-08-10 16:01:01 +05:30
marination	3beeeb589a	fix: Susbcription in Sales Taxes and Charges Dashboard	2020-08-10 15:55:02 +05:30
Saqib Ansari	cc5b49bff4	fix: [pos] minor bugs	2020-08-10 15:52:32 +05:30
Deepesh Garg	372abaa420	Merge pull request #22976 from marination/sales-taxes-dashboard fix: Susbcription in Sales Taxes and Charges Dashboard	2020-08-10 15:17:59 +05:30
marination	0f27500197	fix: Susbcription in Sales Taxes and Charges Dashboard	2020-08-10 15:17:58 +05:30
Saqib Ansari	f1091534cd	fix: [pos] minor bugs	2020-08-10 14:45:58 +05:30
Afshan	1f3cc7553c	fix: grand_total assigment before reference	2020-08-07 15:57:31 +05:30
Rucha Mahabal	8118dd9e62	fix: escape company field	2020-08-07 14:52:50 +05:30
Raffael Meyer	d854d39c00	fix: show only company's bank accounts	2020-08-06 15:09:22 +02:00
Deepesh Garg	44d62ad0d7	Merge pull request #22921 from ruchamahabal/fix-payment-entry-ref fix: condition for checking reference details for Payment Entry	2020-08-05 23:16:14 +05:30
Suraj Shetty	8d05514260	refactor: Format and sanitise user inputs to search queries. (#22922 ) * refactor: Sanitize whitelisted method inputs Co-authored-by: Prssanna Desai <prssud@gmail.com> Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com> * refactor: Format and sanitize tax_account_query inputs Co-authored-by: Nabin Hait <nabinhait@gmail.com> Co-authored-by: Prssanna Desai <prssud@gmail.com> Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com> * refactor: Validate and sanitize search inputs via decorator Co-authored-by: Nabin Hait <nabinhait@gmail.com> Co-authored-by: Prssanna Desai <prssud@gmail.com> Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com> * style: Minor formatting fix * refactor: Validate and sanitize search inputs using decorator * fix: Typo * fix: Remove unwanted import statement * refactor: Repalce validate_and_sanitize_search_inputs() with validate_and_sanitize_search_inputs Co-authored-by: Prssanna Desai <prssud@gmail.com> Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com> Co-authored-by: Prssanna Desai <prssud@gmail.com> Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com> Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-08-05 20:07:30 +05:30
Suraj Shetty	1923ef052c	refactor: Format and sanitise user inputs to search queries. (#22913 ) * refactor: Sanitize whitelisted method inputs Co-authored-by: Prssanna Desai <prssud@gmail.com> Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com> * refactor: Format and sanitize tax_account_query inputs Co-authored-by: Nabin Hait <nabinhait@gmail.com> Co-authored-by: Prssanna Desai <prssud@gmail.com> Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com> * refactor: Validate and sanitize search inputs via decorator Co-authored-by: Nabin Hait <nabinhait@gmail.com> Co-authored-by: Prssanna Desai <prssud@gmail.com> Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com> * style: Minor formatting fix * refactor: Validate and sanitize search inputs using decorator * fix: Typo * fix: Remove unwanted import statement * refactor: Repalce validate_and_sanitize_search_inputs() with validate_and_sanitize_search_inputs Co-authored-by: Prssanna Desai <prssud@gmail.com> Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com> Co-authored-by: Prssanna Desai <prssud@gmail.com> Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com> Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-08-05 19:42:25 +05:30
Rucha Mahabal	5da067b689	fix: condition for checking reference detail for Payment Entry	2020-08-05 18:18:57 +05:30
Nabin Hait	a042d4721e	fix: Bank Clearance of POS purchase invoice (#22882 )	2020-08-03 20:42:15 +05:30
Nabin Hait	a1d3537f2a	fix: Bank Clearance of POS purchase invoice (#22883 )	2020-08-03 20:42:00 +05:30
Rucha Mahabal	b7311c8fc1	fix: SQL query in accounts receivable, payable reports (#22888 )	2020-08-03 20:41:25 +05:30
Nabin Hait	5e548b4387	Dunning cleanup beta (#22899 ) * fix: Dunning cleanup * fix: Added dashboard for Dunning	2020-08-03 20:39:15 +05:30
Nabin Hait	48163e31c5	Dunning cleanup (#22898 ) * fix: Dunning cleanup * fix: Added dashboard for Dunning	2020-08-03 20:38:28 +05:30
Rucha Mahabal	b50b20458e	fix: TypeError while concatenating account number and name in COA (#22885 ) Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>	2020-08-03 15:51:57 +05:30
Deepesh Garg	2f2de2264d	Merge pull request #22887 from deepeshgarg007/subscription_test fix: Test case for subscription	2020-08-03 14:31:21 +05:30
Deepesh Garg	5572f8eb1e	fix: Test case for subscription	2020-08-03 13:40:11 +05:30
Shivam Mishra	de80553d89	Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui	2020-08-03 12:34:05 +05:30
Nabin Hait	826158c792	fix: Update modified timestamp in accounts settings (#22874 )	2020-08-03 09:34:55 +05:30
Nabin Hait	4cc99286c0	fix: Update modified timestamp in accounts settings (#22873 )	2020-08-03 09:33:31 +05:30
Deepesh Garg	01e0d50eba	Merge pull request #22854 from nabinhait/gl-balance-fix fix: Ignore cancelled gl entries to get account balance	2020-07-30 22:15:23 +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
Nabin Hait	38d5c2e04f	fix: Ignore cancelled gl entries to get account balance	2020-07-30 20:53:07 +05:30
Nabin Hait	9837285bf1	fix: Ignore cancelled gl entries to get account balance	2020-07-30 20:52:20 +05:30
Marica	c1e46d8131	Merge branch 'develop' into fix-payment-entry-wrong-bank-account-fetch-develop	2020-07-28 12:29:47 +05:30
Deepesh Garg	9119b4c538	fix: Unable to submit backdated stock transactions for different items (#22648 ) * fix: Unable to submit backdated stock transactions for different items * fix: Test cases * fix: Test Cases * fix: Test Cases * fix: Test for stock account JV * fix: Journal Entry Test	2020-07-28 08:49:44 +05:30
Deepesh Garg	fa28e600b5	fix: Unable to submit backdated stock transactions for different items (#22822 ) * fix: Unable to submit backdated stock transactions for different items * fix: Test cases * fix: Test Cases * fix: Test Cases * fix: Test for stock account JV * fix: Journal Entry Test * fix: Delete unwanted code	2020-07-28 08:49:21 +05:30
Anupam K	8718daa11e	Adding formatter in budget variance report	2020-07-25 23:56:11 +05:30
Deepesh Garg	c591b77613	Merge branch 'develop' into fix-payment-entry-wrong-bank-account-fetch-develop	2020-07-24 19:04:05 +05:30
Mangesh-Khairnar	762f6297f6	fix(payment-request): do not set guest as administrator (#22804 )	2020-07-24 18:05:13 +05:30
Mangesh-Khairnar	8721530b4b	fix(payment-request): do not set guest as administrator (#22801 )	2020-07-24 17:19:56 +05:30
Nabin Hait	a8efe8eb5f	Merge branch 'develop' into version-13-beta-pre-release	2020-07-24 11:15:13 +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
Nabin Hait	39969647ca	fix: Added missing project field in Purchase invoice (#22799 )	2020-07-24 09:48:54 +05:30
Deepesh Garg	9843e9f917	fix: Expnese claim outstanding while making payment entry (#22735 )	2020-07-23 20:58:57 +05:30
Deepesh Garg	76028cde6a	Merge branch 'develop' into fix-payment-entry-wrong-bank-account-fetch-develop	2020-07-23 19:05:17 +05:30
Abhishek Balam	d05a98517d	Fix: Increase Length Of "In Words" and "In Words (Company Currency)" fields (#22732 ) * new parent updating logic, made requested changes * fix: Increase Length of In Words fields Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-07-23 19:01:31 +05:30
Saqib	a6f98d48bc	refactor: POS workflow (#20789 ) * refactor: add pos invoice doctype replacing sales invoice in POS * refactor: move pos.py to pos invoice * feat: add pos invoice merge log doctype * feat: ability to merge pos invoices into a sales invoice * feat: [wip] new ui for point of sale * fix: pos.py moved to pos_invoice * feat: loyalty points for POS Invoice * fix: loyalty points on merging * feat: return against pos invoices * Merge 'fork/serial-no-selector' into refactor-pos-invoice * chore: status fix and set warehouse from pos profile * fix: naming series * feat: merge pos returns into credit notes * feat: add pos list action for merging into sales invoices * feat[UX]: add shortcuts & focus on search after customer selection * feat: stock validation from previous pos transactions * Merge 'fork/serial-no-selector' into refactor-pos-invoice * chore: fix df not found for base_amount precision * feat: serial no validation from previous pos transactions * chore: move pos.py into pos page * feat: pos opening voucher * feat: link pos closing voucher with opening voucher * chore: use map_doc instead of get_mapped_doc for better perf * feat: enforce opening voucher on pos page * feat: [ui] [wip] point of sale beta ui refactor * fix: auto fetching serial nos with batch no * feat: [ui] item details section for new pos ui * feat: remove item from cart * refactor: [ui] [wip] split point_of_sale into components * new payment component * new numberpad * fix pos opening status * move from flex to grids * fix: search from item selector * feat: loyalty points as payment method * feat: pos invoice status * fix a bug with invalid JSON * fix: loyalty program ui fixes * feat: past order list and past order summary * feat: (minor) setting discount from item details * fix: adding item before customer selection * feat: post order submission summary * save and open draft orders * fix: item group filter * fix: item_det not defined while submitting sle * fix: minor bugs * fix: minor ux fixes * feat: show opening time in pos ui * feat: item and customer images * feat: emailing and printing an invoice * fix: item details field edit shows empty alert * fix: (minor) ux fixes * chore: rename pos opening voucher to pos opening entry * chore: (minor) rename pos closing voucher and sub doctypes * chore: add patch for renaming pos closing doctypes * fix: negative stock not allowed in pos invoices* default is_pos in pos invoices* fix: transalation * fix: invoices not getting fetched on pos closing * fix: indentation * feat: view / edit customer info * fix: minor bugs * fix: minor bug * fix: patch * fix: minor ux issues * fix: remove uppercase status * refactor: pos closing payment reconciliation * fix: move pos invoice print formats to pos invoice doctype * fix: ui issues * feat: new child doctype to store pos payment mode details * fix: add to patches.txt * feat: search by serial no * chore: [wip] code cleanup * fix: item not selectable from cart * chore: [wip] code cleanup * fix: minor issues * loyalty points transactions * default payment mode * fix: minor fixes * set correct mop amount with loaylty points * editing draft invoices from UI * chore: pos invoice merge log tests * fix: batch / serial validation in pos ui and on submission * feat: use onscan js for barcode scan events * fix: cart header with amount column * fix: validate batch no and qty in pos transactions * chore: do not fetch closing balances as opening balance * feat: show available qty in item selector * feat: shortcuts * fix: onscan.js not found * fix: onscan.js not found * fix: cannot return partial items * fix: neagtive stock indicator * feat: invoice discount * fix: change available stock on warehouse change * chore: cleanup code * fix: pos profile payment method table * feat: adding same item with different uom * fix: loyalty points deleted after consolidation * fix: enter loyalty amount instead of loyalty points * chore: return print format * feat: custom fields in pos view * chore: pos invoice test * chore: remove offline pos * fix: cyclic dependency * fix: cyclic dependency * patch: remove pos page and order fixes * chore: little fixes * fix: patch perf and plural naming * chore: tidy up pos invoice validation * chore: move pos closing to accounts * fix: move pos doctypes to accounts * fix: move pos doctypes to accounts * fix: item description in cart * fix: item description in cart * chore: loyalty tests * minor fixes * chore: rename point of sale beta to point of sale * chore: reset past order summary on filter change * chore: add point of sale to accounting desk * fix: payment reconciliation table in pos closing * fix: travis * Update accounting.json * fix: test cases * fix: tests * patch loyalty point entries * fix: remove test * default mode of payment is mandatory for pos transaction * chore: remove unused checks from pos profile * fix: loyalty point entry patch * fix: numpad reset and patches * fix: minor bugs * fix: travis * fix: travis * fix: travis * fix: travis Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-07-23 18:51:26 +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
Shivam Mishra	1358efe896	feat: update icons	2020-07-23 17:02:32 +05:30
KanchanChauhan	2826fd3c20	feat: Dunning (#22559 ) * feat: Dunning * fix: Replaces spaces with tab Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-07-23 15:45:03 +05:30
Deepesh Garg	7ac4ad8410	fix: Error due to comma in Pricing rule name (#22741 ) * fix: Error due to commma in Pricing rule name * fix: Remove print statement * fix: Tests Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-07-23 12:12:55 +05:30
Deepesh Garg	9c49f2d886	feat: Enhancement in subscription (#22263 ) * feat: Add supplier in subscription doctype * fix: Code cleanup * fix: Add dynamic link in subscription invoices * fix: Multiple enhanccement in subscription * feat: Follow calendar months in subscription * fix: Test Cases and patch * fix: Patch * fix: Update patch and add fixes * fix: Update permission for subscription settings * fix: Patch and Test * fix: Add cost center dimension in Subscripiton	2020-07-23 11:11:23 +05:30
Deepesh Garg	7c50f421e1	fix: Move branch code back to bank account (#22725 ) * fix: Move branch code back to bank account * fix: Patch	2020-07-22 18:21:04 +05:30
Deepesh Garg	c7eadfceb0	fix: Multi currency payment reconciliation (#22738 ) * fix: Multi currency payment reconciliation * fix: Hide currency link fields	2020-07-22 17:59:37 +05:30
Rucha Mahabal	1fddc6d126	chore: Exported Accounts Module Dashboard (#22769 ) * chore: Exported Accounts Module Dashboards * chore: deleted dashboard fixtures for Accounts module	2020-07-22 16:11:06 +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
Rucha Mahabal	6b3110ed13	Merge branch 'develop' into expense-claim-payment-fix	2020-07-16 12:23:26 +05:30
Anurag Mishra	50902cf30c	Fix: Changes Requested	2020-07-16 12:21:46 +05:30
Suraj Shetty	11b0554ae9	Merge branch 'develop' into fix-financial-statement-print-format	2020-07-16 09:45:26 +05:30
Rohit Waghchaure	e0de0ac617	fix: not able to submit sales invoice	2020-07-15 17:13:43 +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
Anurag Mishra	c1636f8fab	fix: conversion rate as 1 if no conversion rate	2020-07-14 18:58:02 +05:30
rohitwaghchaure	eb2a42d9e1	Merge pull request #22589 from deepeshgarg007/rcm_fix fix: Do not add GST tax amount in grand total for reverse charge invoices	2020-07-14 13:42:48 +05:30
rohitwaghchaure	62fe2cac19	Merge pull request #22051 from deepeshgarg007/project-link-for-all-accounts fix: Project link not set in accounts other than profit and loss accounts	2020-07-13 18:09:41 +05:30
rohitwaghchaure	ac984eb37c	Merge branch 'develop' into project-link-for-all-accounts	2020-07-13 11:50:11 +05:30
Deepesh Garg	62d047bf9b	Merge branch 'develop' into payment_reco_cost_center_fix	2020-07-11 21:05:32 +05:30
Deepesh Garg	8cdf33f618	Merge pull request #22635 from deepeshgarg007/item_tax_test fix(travis): Item Tax template test	2020-07-11 21:04:31 +05:30
marination	a6c10b1bc0	fix: Pricing Rule breaks if no item_code	2020-07-10 20:09:58 +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	b74077faf5	fix(travis): Item Tax tempate template test	2020-07-09 19:50:41 +05:30
Michelle Alva	5d514fe4df	fix: grammatical fixes in module onboarding (#22580 ) * fix: grammatical fixes in module onboarding * fix: more grammatical changes for consistency * fix: Reorder Stock Onboarding * fix: update success message * fix: change order of stock onboarding steps Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-07-08 14:25:51 +05:30
rohitwaghchaure	41c9708f99	Merge branch 'develop' into project-link-for-all-accounts	2020-07-08 13:11:37 +05:30
rohitwaghchaure	37d828eda6	Merge pull request #22511 from deepeshgarg007/gl_entry_ignore_validation fix: Do not ignore validate methods on GL entry submit	2020-07-08 13:06:47 +05:30
Deepesh Garg	9071a7de82	fix: Add default cost center in payment reconciliation JV	2020-07-08 11:27:25 +05:30
Deepesh Garg	addd1e842b	Merge pull request #22568 from ahmadpak/develop fix: Item Tax Template permissions as per company	2020-07-08 10:08:53 +05:30
Marica	f4d0a3e7b0	Merge branch 'develop' into whitelist-query	2020-07-07 15:42:42 +05:30
rohitwaghchaure	546cfdaac2	Merge pull request #22601 from deepeshgarg007/payment_reco_company fix: Payment reco error in multi-company setup	2020-07-07 15:32:36 +05:30
Deepesh Garg	ca351e3549	fix: Pass company	2020-07-07 14:37:17 +05:30
Deepesh Garg	e2fdff5777	fix: Payment reco error in multicompany setup	2020-07-07 14:14:07 +05:30
Marica	7860d9e699	Merge branch 'develop' into whitelist-query	2020-07-07 11:53:19 +05:30
Deepesh Garg	05738bd29a	fix: Remove print statements	2020-07-06 13:40:48 +05:30
rohitwaghchaure	1cc1fd4f86	Merge pull request #22576 from marination/party-details fix: Check for Company before trying to fetch party details	2020-07-06 12:42:16 +05:30
Deepesh Garg	92a03aa5db	Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts	2020-07-06 12:37:28 +05:30
rohitwaghchaure	e5d9ebe32e	Merge pull request #22577 from deepeshgarg007/coa_fiscal_year_fix fix: Consider company fiscal year for getting balance	2020-07-06 12:34:56 +05:30
Deepesh Garg	be05c4e14a	fix: Codacy and minor fixes	2020-07-05 18:16:16 +05:30
Deepesh Garg	96d40ec9da	fix: Consider company fiscal for getting balalnce	2020-07-03 22:59:00 +05:30
marination	e27b996e38	fix: Check for Company before trying to fetch party details	2020-07-03 22:12:00 +05:30
mohammadahmad1990	015910b4c4	Company Field Added in Item Tax Template	2020-07-03 15:02:32 +05:00
Deepesh Garg	9ed0384bea	fix: Code cleanup	2020-07-03 14:54:41 +05:30
Deepesh Garg	3c004ad798	fix(GST): Do not add tax amount in grand total for reverse charge invoices	2020-07-02 21:18:29 +05:30
Afshan	bfffd9b01b	made "Subscription Section", "Auto Repeat" and Hub Publishing" collapsible by default (#22521 ) Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-07-02 15:11:45 +05:30
Chinmay D. Pai	ed0bb20e6f	chore: add query functions to whitelist Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>	2020-07-02 12:35:41 +05:30
Deepesh Garg	8230e41a42	fix: Insert instead of DB insert	2020-06-29 21:20:05 +05:30
Deepesh Garg	d1bf6e0277	fix: Do not ignore validate methods on GLL entry submit	2020-06-29 21:14:03 +05:30
Rohit Waghchaure	04cf2e029f	fix: letter head not found in opening invoice creation tool	2020-06-28 17:08:12 +05:30
rohitwaghchaure	69aa2e400a	Merge pull request #22412 from frappe/mergify/bp/version-13-beta-pre-release/pr-22223 feat: Accounting entries for service item in Purchase receipt (bp #22223)	2020-06-28 11:26:21 +05:30
Deepesh Garg	4c726b25ee	fix: Add view ledger button for cancelled docs (#22433 ) * fix: Add view ledger button for cancelled docs * fix: Add moddified to date in Stock Ledger	2020-06-25 15:37:04 +05:30
Deepesh Garg	8a55ec1580	fix: Add view ledger button for cancelled docs (#22432 ) * fix: Add view ledger button for cancelled docs * fix: Add moddified to date in Stock Ledger	2020-06-25 15:34:01 +05:30
Deepesh Garg	be9a8e1a14	Resolve merge conflicts	2020-06-24 18:47:58 +05:30
Deepesh Garg	faa0c5624e	fix: Update journal entry account timestamp	2020-06-24 18:45:16 +05:30
Deepesh Garg	2abd66da9d	fix: Update journal entry account timesstamp	2020-06-24 17:49:50 +05:30
Deepesh Garg	51ce1e1d4e	fix: Test Cases (cherry picked from commit `ded3ab1cd7`)	2020-06-24 05:38:33 +00:00
Deepesh Garg	12f1f8e111	fix: Move check from Stock Settings to Company Master (cherry picked from commit `53d5d16abb`)	2020-06-24 05:38:33 +00:00
Deepesh Garg	6e2ca779c5	feat: Accounting entries for service item in Purchase receipt (cherry picked from commit `c258ac82c5`)	2020-06-24 05:38:32 +00:00
rohitwaghchaure	d63c59ced4	Merge branch 'develop' into grn_posting	2020-06-24 10:23:23 +05:30
Deepesh Garg	7cc1cf36ca	feat: More controlled deferred revenue booking (#21671 ) * feat: More controller deferred revenue booking * fix: Query for last gl entry * fix: Accounting Dimension for Deferred entries * fix: Deferred revenue booking against paid invoices * fix: Don not update outstanding on Deferred Entry submission * fix: Naming fixes * feat: Deferred revenue/expense booking based on months * fix: Test case for fix monthly deferred revenue booking * fix: Typo * fix: Patch to update settings * fix: Test case to book deferred expense via journal entry * fix: Update field for better UX * fix: Codacy * fix: Change select field to checkbox	2020-06-23 09:57:56 +05:30
Marica	b073544e06	Merge branch 'develop' into fix-payment-entry-wrong-bank-account-fetch-develop	2020-06-23 02:24:35 +05:30
Rohit Waghchaure	aaed3b988f	added validation and clear fields for Apply Rule On Other (cherry picked from commit ebbbc85fc0f9aa418163f8344d3a234ecbe08488)	2020-06-22 14:52:30 +00:00
Poranut Chollavorn	e3973a4730	fix(pricing_rule): apply_on logic dont get cleanup (cherry picked from commit acf399c4e0c74458c17866be7d72788aeecbe829)	2020-06-22 14:52:29 +00:00
Deepesh Garg	be4fc1a78e	fix(UX): Notify user of expense account change in Purchase Invoice (#22193 )	2020-06-22 18:03:11 +05:30
Deepesh Garg	edd4aa6faa	Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts	2020-06-22 09:59:39 +05:30
Deepesh Garg	ded3ab1cd7	fix: Test Cases	2020-06-22 09:40:15 +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
Deepesh Garg	dee1c92df1	Merge pull request #22351 from kennethsequeira/purchase_inv_due fix: status error in purchase invoice	2020-06-20 11:58:19 +05:30
Deepesh Garg	c70eb30e7e	Merge branch 'develop' of https://github.com/frappe/erpnext into grn_posting	2020-06-20 11:56:25 +05:30
Deepesh Garg	53d5d16abb	fix: Move check from Stock Settings to Company Master	2020-06-20 11:55:56 +05:30
Kenneth Sequeira	b7c8037e9a	fix codacy	2020-06-19 22:33:51 +05:30
Anurag Mishra	289c82243f	feat: New Payroll module (#21990 ) * feat: Moved Document to Payroll Module * feat: Moved Reports to Payroll Module * feat: Moved Print fromat With Patch * feat: Moved Notifiction to Payroll Module and patches * feat: added dashboard and desk page to Payroll * feat: Payroll Dashboard * feat: Module onboarding * feat: Income tax Deductions Report * feat: Ecs Checklist Report * feat: Provident Fund Report * feat: Professional Fund report and commonified Code * feat: Total Payments Based On Payment Mode Report * fix: refactor and added chart Total Payments Based On Payment Mode * feat: Payroll Settings * fix: Bank remittance Report * feat(Payroll based on): Considered unmarked days * feat: Added Help for condition an formula in Salary structure * fix: requested changes * fix: rename report Ecs checklist to salary_payments_via_ecs * fix: renamed report report/total_payments_based_on_payment_mode * fix: added role via setup.py for regional report * feat: added All reports to desk page * fix: frappe.reload doc in all patches * fix: codacy * fix: frappe.reload_doctype for patches * patch: is_income_tax_component and component_type for salary component * fix: uncommented code * test: fixture * fix: test * test: test_payment_days_based_on_attendance	2020-06-19 19:17:57 +05:30
Marica	47a4567301	Merge branch 'develop' into purchase_inv_due	2020-06-19 18:44:53 +05:30
Kenneth Sequeira	02f3e045ab	fix: due date filter in purchase invoice	2020-06-19 18:22:04 +05:30
Deepesh Garg	aea450c36a	Revert "fix: update remark on submitting payment entry"	2020-06-19 17:29:49 +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	1b30ca6a36	fix: Codacy	2020-06-19 12:12:08 +05:30
Deepesh Garg	3c63f5b76b	Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts	2020-06-19 11:41:21 +05:30
Afshan	a9cdc7b696	style: moved project from reference section to accounting dimensions section (#22309 )	2020-06-19 11:11:33 +05:30
Prssanna Desai	82ddef58c0	feat: date filter for fiscal year (#21880 ) * feat: date filter for fiscal year * fix: rename fieldtypes to valid_for_fieldtypes * Update utils.py Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-06-18 18:18:41 +05:30
P-Froggy	c3b74affe3	fix: Set Value of wrong Bank Account Field in Payment Entry Company bank account was wrongly inserted into the field "Party Bank Account" in payment entry, instead of "Bank Account". Also changes the label of "Default Bank Account" to "Default Company Bank Account", like suggested in PR #20632	2020-06-18 01:48:37 +02:00
Kaviya Periyasamy	fec894f530	fix: modified time updated with the latest date (#22286 )	2020-06-17 17:39:12 +05:30
rohitwaghchaure	d8683d381b	Merge pull request #22205 from deepeshgarg007/fiscal_year_travis fix: Travis(develop)	2020-06-15 16:12:10 +05:30
Deepesh Garg	0d880079b1	fix: Validation for group cost center	2020-06-15 12:23:24 +05:30
Deepesh Garg	817cbc4b48	fix: Minor fixes in cost center	2020-06-15 12:07:04 +05:30
rohitwaghchaure	25f49d59c5	Merge pull request #22233 from deepeshgarg007/pi_billing_address fix: Billing address in for Purchase documents	2020-06-14 15:10:43 +05:30
Rohit Waghchaure	d6f9a51cbb	fix: item none not found while making sales invoice using opening invoice creation tool	2020-06-14 14:46:49 +05:30
Deepesh Garg	6760077674	fix: Billing address in for Purchase documents	2020-06-13 22:40:23 +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	c258ac82c5	feat: Accounting entries for service item in Purchase receipt	2020-06-12 18:33:42 +05:30
Deepesh Garg	7e974c9e2c	fix: Test Cases	2020-06-12 15:29:40 +05:30
Deepesh Garg	ca97e19b7e	Merge pull request #22203 from marination/account-tree fix: Check for Company before rendering tree in Account Tree	2020-06-12 10:02:41 +05:30
Deepesh Garg	9df4532d14	fix: Travis(develop)	2020-06-11 21:33:43 +05:30
marination	c9a6e4f151	fix: Check for Company before rendering tree in Account Tree	2020-06-11 19:54:44 +05:30
Abhishek Balam	44b8cf4fef	enable 'user cannot create' for payment request (#22044 ) Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-06-11 19:31:41 +05:30
Deepesh Garg	7d3c3b9a8b	Merge pull request #22188 from deepeshgarg007/payment_terms_outstanding fix: Update payment schedule based on payment terms	2020-06-10 22:17:37 +05:30
Deepesh Garg	a0fd97f2ac	fix: Update payment schedule based on payment terms	2020-06-10 22:15:27 +05:30
Deepesh Garg	f108574772	Merge pull request #22186 from deepeshgarg007/inter_warehouse_party_validation fix: Party validation for inter-warehouse transaction	2020-06-10 20:02:43 +05:30
Deepesh Garg	7963e2b708	fix: Party validation for inter-warehouse transaction	2020-06-10 19:57:49 +05:30
Deepesh Garg	6e0d6bd74c	Merge pull request #22184 from deepeshgarg007/item-wise-report-export fix: Item-wise sales and purchase register export	2020-06-10 18:48:35 +05:30
Deepesh Garg	08fee12266	fix: Item-wise sales and purchase register export	2020-06-10 18:33:24 +05:30
rohitwaghchaure	0233f94570	Merge pull request #22081 from deepeshgarg007/jv_list_view fix: Add total debit in Journal Entry list view	2020-06-10 14:17:13 +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
rohitwaghchaure	b3b5c96749	Merge pull request #22092 from marination/shippinng-address fix: Apply shipping rule without address too	2020-06-08 10:36:19 +05:30
Deepesh Garg	76ddf4f0b5	Merge pull request #22132 from deepeshgarg007/tds_monthly_cancelled_v13 fix: Cancelled entries in tds payable monthly report	2020-06-07 00:08:57 +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	cdd92d756d	fix: Cancelled entries in tds payable monthly report	2020-06-07 00:03:28 +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
marination	0c72249403	fix: Apply shipping rule without address too	2020-06-03 14:32:07 +05:30
Deepesh Garg	60f3a2b8e7	fix: Add total debit in Journal Entry list view	2020-06-02 18:26:43 +05:30
Deepesh Garg	3609ddedbb	fix: Purchase receipt item json	2020-05-30 12:03:37 +05:30
Deepesh Garg	c96bf870e4	fix: Test Cases	2020-05-30 11:46:39 +05:30
Deepesh Garg	8a4dc521cd	Revert 'fix: tests depending on global default company'	2020-05-30 11:40:16 +05:30
Deepesh Garg	36f7710356	Revert "fix: tests depending on global default company" This reverts commit `1f20c99ecf`.	2020-05-30 11:38:04 +05:30
Deepesh Garg	f8550790fa	This reverts commit `aa196c0a66`	2020-05-30 11:37:36 +05:30
Deepesh Garg	52baf8f863	fix: Test Cases	2020-05-29 17:20:03 +05:30
Deepesh Garg	c897e800ed	Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts	2020-05-29 11:04:20 +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
mergify[bot]	fd351f8268	fix: set fiscal year for Profit and Loss chart (#22006 ) (cherry picked from commit `4afda76015`) Co-authored-by: Shivam Mishra <scm.mymail@gmail.com>	2020-05-28 15:18:47 +05:30
Shivam Mishra	4afda76015	fix: set fiscal year for Profit and Loss chart	2020-05-28 15:06:38 +05:30
rohitwaghchaure	af91e13435	Merge pull request #22001 from nextchamp-saqib/price-rule-date-field-fix fix: transaction date not found in sales invoice	2020-05-28 14:38:13 +05:30
Deepesh Garg	cfcdd52bf4	fix: Inter-company Invoice currency for multicurrency transactions (#21984 )	2020-05-28 13:35:29 +05:30
Saqib Ansari	dd39ba0014	chore: tests	2020-05-28 13:11:04 +05:30
Saqib Ansari	603cc3d05e	fix: transaction date not found in sales invoice	2020-05-28 12:49:33 +05:30
Deepesh Garg	6fe3a24c5d	Merge pull request #21986 from deepeshgarg007/tds_computation_summary fix: TDS computation summary report	2020-05-27 22:49:42 +05:30
Deepesh Garg	33a08f1ea7	fix: TDS computation summary report	2020-05-27 22:44:50 +05:30
Deepesh Garg	c63b689497	fix: Total for ageing column 121-Above (#21972 ) (cherry picked from commit `152377f84d`)	2020-05-27 15:27:23 +00:00
Marica	8f1aed73fd	fix: Buying Module fixes (#21966 ) * fix: Buying Module fixes * fix: Delete Report files as well * fix: Add Purchase Order Analysis to Stock & Accounting	2020-05-27 20:57:02 +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
mergify[bot]	01dda8a000	fix: Filtering issues in opneing invoice creation tool (#21969 ) (#21979 ) (cherry picked from commit `0030b95595`) Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>	2020-05-27 20:50:20 +05:30
Deepesh Garg	152377f84d	fix: Total for ageing column 121-Above (#21972 )	2020-05-27 20:29:10 +05:30
Deepesh Garg	0030b95595	fix: Filtering issues in opneing invoice creation tool (#21969 )	2020-05-27 20:27:33 +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
Chinmay D. Pai	a7f39a9879	fix: set default posting_date value to None using mutable python defaults, and especially function calls, inside function definitions causes bugs that can be really hard to debug sometimes. please refrain from using such defaults. instead, using None is almost always a sane default. the values can then be manipulated inside the function instead. Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com> (cherry picked from commit `0d147b011e`)	2020-05-24 07:24:34 +00:00
Chinmay D. Pai	0d147b011e	fix: set default posting_date value to None using mutable python defaults, and especially function calls, inside function definitions causes bugs that can be really hard to debug sometimes. please refrain from using such defaults. instead, using None is almost always a sane default. the values can then be manipulated inside the function instead. Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>	2020-05-24 00:54:04 +05:30
Deepesh Garg	18ace30a81	fix: Project filter in Trial Baalance Report	2020-05-22 20:39:14 +05:30
Deepesh Garg	29c748184c	fix: Project filter in Trial Baalance Report	2020-05-20 22:15:12 +05:30
Marica	2b04e8eef0	fix: Validate Payment Gateway only if it exists in Payment Request. (#21805 )	2020-05-20 16:13:43 +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	ddec05ee07	Merge branch 'marination-stock-dashboard' into develop	2020-05-19 19:08:58 +05:30
Nabin Hait	8b686a5721	feat: stock module dashboard and onboarding	2020-05-19 19:08:30 +05:30
rohitwaghchaure	f128b1c0c5	refactor: changed the fieldtype from data to small text (#21782 )	2020-05-19 19:05:42 +05:30
Shivam Mishra	31f00b6052	refactor: rename dashboards in desk page	2020-05-19 15:56:47 +05:30
rohitwaghchaure	65c90959d1	fix: renamed manufacturing dashboards to manufacturing (#21776 )	2020-05-19 15:54:24 +05:30
Nabin Hait	9aae6f4793	feat: accounting dashboard + desk	2020-05-18 18:03:11 +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	ec8c28e487	Revert "fix(accounting): Allow 0 threshold in Tax Withholding Category"	2020-05-18 11:27:38 +05:30
Rucha Mahabal	e83d1d221d	Merge branch 'develop' into multi_company	2020-05-17 20:02:12 +05:30
Deepesh Garg	bf16956d10	Merge pull request #21656 from kevingdc/bugfix/tax-withholding-category-description fix(accounting): Tax Withholding Category Description default	2020-05-16 18:07:45 +05:30
Deepesh Garg	2a0e3e3515	fix: Remove strip	2020-05-16 18:07:03 +05:30
Deepesh Garg	2567815b03	Merge pull request #21655 from kevingdc/bugfix/zero-threshold-in-tax-withholding-category fix(accounting): Allow 0 threshold in Tax Withholding Category	2020-05-16 17:55:51 +05:30
rohitwaghchaure	7435174300	Merge pull request #21747 from rohitwaghchaure/fix-supplier-schema-save-issue fix: promotional scheme not able to save	2020-05-16 11:34:23 +05:30
Rohit Waghchaure	49dbbdc4cb	fix: promotional scheme not able to savce	2020-05-16 04:59:59 +05:30
Deepesh Garg	7be71c88f2	fix: Better validation message for group accounts (#21725 )	2020-05-15 19:23:41 +05:30
Deepesh Garg	1b821fec4b	Merge pull request #21742 from nextchamp-saqib/payment-remark-fix fix: update remark on submitting payment entry	2020-05-15 17:48:51 +05:30
Saqib Ansari	03d165ff79	fix: update remark on submitting payment entry	2020-05-15 16:39:02 +05:30
Deepesh Garg	a812ad7555	Merge pull request #21699 from nextchamp-saqib/pur-inv-status-fix fix: purchase inv shows overdue for fraction of outstanding	2020-05-15 15:46:23 +05:30
Saqib Ansari	940856cc16	fix: add tests for set_status	2020-05-15 14:30:24 +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
Rohan	200af04657	format: better error messages for invalid coupon codes (develop) (#21599 ) * format: better error messages for invalid coupon codes * fix: remove unnecessary docstatus check	2020-05-15 12:10:34 +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
Shivam Mishra	0fbc96cc8c	Merge pull request #21731 from prssanna/custom-chart-fix fix: add heatmap_year parameter to get	2020-05-14 18:27:07 +05:30
prssanna	39cb749f95	fix: add heatmap_year parameter to get	2020-05-14 18:25:58 +05:30
Saqib Ansari	13096cdbfe	fix: invalid conditional statement	2020-05-13 22:02:56 +05:30
Saqib	2b8f307ffe	Merge branch 'develop' into pur-inv-status-fix	2020-05-13 21:56:45 +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
Saqib	7adfc34a26	Merge branch 'develop' into pur-inv-status-fix	2020-05-13 14:02:19 +05:30
Deepesh Garg	cdeb897fff	fix: Account shortcut in desk page	2020-05-12 17:23:15 +05:30
Saqib Ansari	734bfcdfc2	fix: purchase inv shows overdue for fraction of outstanding	2020-05-12 14:11:33 +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
Chinmay Pai	30f26b4457	fix: do not setup charts if not setup_complete or no company found (#21670 ) * fix: do not setup charts if not setup_complete or no company found Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com> * chore: remove check for setup_complete moved the check for setup_complete to frappe Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com> * chore: return an empty dict from get_data if company not set Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>	2020-05-11 19:54:46 +05:30
Deepesh Garg	0defefda92	feat: Standard accounts dashboard	2020-05-11 12:14:46 +05:30
rohitwaghchaure	76dd10f48a	Merge pull request #21652 from rohitwaghchaure/fixed-branch-code-and-swift-number fix: wrong fieldname branch_code in add_fetch	2020-05-11 07:06:42 +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
Suraj Shetty	65d3ac814d	fix: Add accidentally removed function	2020-05-09 17:39:59 +05:30
Suraj Shetty	d53822f012	Merge pull request #21618 from scmmishra/sync-dashboards	2020-05-09 14:15:20 +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	9b70a0ac18	Merge pull request #21663 from deepeshgarg007/gross_net_profit fix: Gross and net profit report fix	2020-05-08 19:56:58 +05:30
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	9d81f97fe6	fix: Tax Withholding Category Description default This commit fixes a bug that happens when a Purchase Invoice uses a Tax Withholding Category without a category_name. The category_name is used as the tax description which is a required field. The bug was fixed by using the Tax Withholding Category's name as the description if the category_name is empty.	2020-05-08 18:01:18 +08:00
Kevin Chan	e29283630b	fix: Zero threshold in Tax Withholding Category This fixes a bug in Tax Withholding Category where if it has a threshold of 0, it doesn't apply to Purchase Invoices. The bug was fixed by updating the condition.	2020-05-08 17:45:08 +08:00
Rohit Waghchaure	7d4ccdf240	fix: wrong fieldname branch_code in add_fetch	2020-05-08 13:27:25 +05:30
rohitwaghchaure	b310d6f372	Merge pull request #21649 from anupamvs/payment-order-fix fix: Payment Order not allowing to create Payment Entry	2020-05-08 10:26:42 +05:30
Anupam K	8b52697723	Payment Order not allowing to create Payment Entry	2020-05-08 02:23:28 +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
Deepesh Garg	9513171d3f	Merge pull request #21624 from deepeshgarg007/reversse_gl_fix fix(minor): Reverse GL fix	2020-05-06 18:19:19 +05:30
Deepesh Garg	b821f22b7c	fix(minor): Reverse GL fix	2020-05-06 18:12:23 +05:30
Shivam Mishra	28436d2bc1	feat: added dashboard fixtures for accounts	2020-05-06 15:19:10 +05:30
Shivam Mishra	b2103f5470	feat: remove old fixtures	2020-05-06 15:18:43 +05:30
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	d46696fa03	fix: cannot make payment entry against shareholder (#21597 )	2020-05-05 16:10:47 +05:30
rohitwaghchaure	5210761e57	fix: heatmap not working for customer and supplier (#21578 ) Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-05-05 12:12:33 +05:30
Andy Zhu	f7a0b8b5b6	fix: fieldname update for 'Credit' and 'Debit' (#21405 ) * fix: fieldname update for 'Credit' and 'Debit' 'credit' updated to 'credit_in_account_currency' 'debit' updated to 'debit_in_account_currency' * Update journal_entry.py Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-05-04 12:09:28 +05:30
Deepesh Garg	095b5586a2	fix: Accounting Dimensions in Period Closing Voucher (#21564 )	2020-05-04 11:12:14 +05:30
Suraj Shetty	9a8512d01d	fix: NameError due to invalid variable	2020-05-03 20:17:47 +05:30
Suraj Shetty	9fffe254fc	refactor: Folio no validation	2020-05-03 19:10:02 +05:30
Mangesh-Khairnar	2f7861a9b8	feat: Process deferred accounting entry (#19658 ) * feat: process deferred accounting * feat: maintain entry for deferred accounting * feat: add check for automatic deferred accounting entry * feat: add build conditions for company and account * fix: create record for automatic processing of deferred accounting * feat: add custom naming series * fix: change the deferred revenue creation via hooks * fix: add client side validations * test: creation of gl entries on submission of process deferred accounting * fix: add multiple validations * patch(accounts-settings): set automatically process deferred accounting entry * fix: On cancel function for deferred entry * fix: Send email per process instead of per invoice * fix: Test cases * fix: Label * fix: Process deferred accounting fixes * fix: Error flag Co-authored-by: Nabin Hait <nabinhait@gmail.com> Co-authored-by: deepeshgarg007 <deepeshgarg6@gmail.com> Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>	2020-05-02 20:09:33 +05:30
Deepesh Garg	cea4eeaa53	fix: Reverse GL Entry on cancel fix	2020-05-02 18:05:33 +05:30
Deepesh Garg	f7966f444d	Merge pull request #21404 from abhishekbalam/develop feat(Accounts): Journal Entry Templates v1	2020-05-01 18:42:54 +05:30
Deepesh Garg	978de8779c	fix: Add multi currency check and proper account filters	2020-05-01 18:38:13 +05:30
Saqib	39805918d4	fix: accounts payable shows advance amount of other company (#21548 )	2020-05-01 18:15:13 +05:30
Deepesh Garg	662838adb3	fix: Party Type filter in payment entry list view (#21541 )	2020-05-01 15:00:55 +05:30
Deepesh Garg	db83c29079	Merge branch 'develop' into develop	2020-05-01 14:20:53 +05:30
Deepesh Garg	1a1b06cf59	Merge pull request #21539 from deepeshgarg007/trvis_child_table_validation_fix fix: Travis (develop)	2020-05-01 14:17:46 +05:30
Deepesh Garg	032814b86a	fix: Patch test	2020-05-01 13:26:26 +05:30
rohitwaghchaure	52005d1ea3	Merge pull request #21501 from nextchamp-saqib/validate-paid-inv-msg chore: validate and warn payment against paid invoices	2020-05-01 10:37:23 +05:30
Deepesh Garg	2dbd228eab	fix: Check is child table for POS profile user	2020-05-01 09:50:56 +05:30
rohitwaghchaure	260bf54c99	Merge pull request #21171 from nextchamp-saqib/rename-bank-reco chore: rename bank reconciliation to bank clearance	2020-05-01 09:33:52 +05:30
Saqib	dac51ea1cf	Merge branch 'develop' into validate-paid-inv-msg	2020-04-30 20:08:18 +05:30
Saqib Ansari	c604109287	chore: handle credit note validation	2020-04-30 13:23:59 +05:30
Saqib	a8779872ee	feat: force cost center renaming from cost center form (#21503 )	2020-04-30 11:28:43 +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
Saqib	078c95c438	fix: print heading field shown in gst section for india region (#21499 )	2020-04-30 10:57:38 +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
Saqib Ansari	769c0ce72b	chore: validate and warn payment against paid invoices	2020-04-29 15:19:08 +05:30
Abhishek Balam	b59e46d773	fix semicolons as per codacy review	2020-04-29 15:01:56 +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
Abhishek Balam	e35bb16436	added journal entry template to accounting desk page	2020-04-29 12:18:33 +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
Abhishek Balam	0c4ce4dbba	Merge branch 'develop' of https://github.com/frappe/erpnext into develop	2020-04-29 12:02:13 +05:30
Abhishek Balam	3b26b24af6	fix semicolons as per codacy review	2020-04-29 11:28:40 +05:30
Abhishek Balam	8dbc4e648b	rearranged fields in journal entry and journal entry type	2020-04-29 11:13:55 +05:30
Deepesh Garg	e006a76f8d	Merge pull request #21486 from rohitwaghchaure/not-able-to-make-payment-request-against-fees fix: payment request not able to make against fees	2020-04-29 09:36:37 +05:30
Rohit Waghchaure	50b4106d1d	fix: payment request not able to make against fees	2020-04-29 02:27:47 +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
Anoop	b5e7ea7ab8	Merge branch 'develop' into multi_company	2020-04-28 11:38:07 +05:30
Deepesh Garg	142af4b58a	fix: Default column width in Gross profit report	2020-04-28 11:17:45 +05:30
Deepesh Garg	57bfd38944	Merge pull request #21436 from deepeshgarg007/ewb_bill_error_message fix: E-Way bill error message	2020-04-27 15:04:32 +05:30
Deepesh Garg	fe7e6f5f53	fix: Test	2020-04-27 14:05:45 +05:30
Deepesh Garg	10aff8e118	fix: E-way bill fix in List view	2020-04-27 10:50:17 +05:30
Deepesh Garg	9979ceb96b	fix: E-way bill fix in sales invoice	2020-04-27 10:50:03 +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
Marica	5d5454ef1f	fix [ux]: Purchase Order Form Cleanup (#20932 ) * chore: Purchase Order Form Cleanup * fix: Get Items from popups cleanup * fix: Shift Set Target Warehouse next to Supply Raw Materials. Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-04-26 20:07:22 +05:30
Nabin Hait	58ee6c1e08	feat: Income tax slab (#21399 ) * Feat: Multiple tax as per new taxation rule * patch:for multiple tax slab, fix: payroll and exemption validation * Test: Fixture * feat: income tax slab with other charges and tax exempted deduction components * fix: added missing init file * fix: Patch fixed * fix: Patch fixed * fix: test fixes * fix: validate duplicate exemption declaration * fix: payment entry test case Co-authored-by: Anurag Mishra <mishranaman123@gmail.com>	2020-04-26 17:45:57 +05:30
Abhishek Balam	e4e23836e7	mandatory depends on for cheque no and date, fix typo	2020-04-26 13:06:55 +05:30
Abhishek Balam	84187fb8e9	Code cleanup and improvements requested in PR:21404	2020-04-26 05:00:36 +05:30
Abhishek Balam	539c67966f	rename je template account dt	2020-04-25 18:13:01 +05:30
Abhishek Balam	fb5fbd7e0c	Merge branch 'develop' of https://github.com/frappe/erpnext into develop	2020-04-25 17:59:00 +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
Abhishek Balam	d64438ff47	feat: Journal Entry Template	2020-04-25 03:13:50 +05:30
Abhishek Balam	291837e63d	Merge branch 'develop' of https://github.com/frappe/erpnext into develop	2020-04-25 02:46:00 +05:30
Abhishek Balam	7bbb77e66f	feat: Journal Entry Template	2020-04-25 02:45:45 +05:30
Diksha Jadhav	7b91617303	feat(accounting): show actual qty for warehouse in sales invoice	2020-04-25 00:02:32 +05:30
Saqib Ansari	40140c63dc	fix: rate gets overwritten when pricing rule is set	2020-04-24 14:51:56 +05:30
anoop	c02eceb989	style: intendation	2020-04-23 21:15:06 +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	b1e68bd022	fix: Rename bank account type doctypes (#21179 ) * fix: Rename bank account type doctypes Co-authored-by: Saqib <nextchamp.saqib@gmail.com>	2020-04-23 12:19:30 +05:30
Deepesh Garg	fa8396feb5	fix: Budget against accounting dimensions (#21268 ) * fix: Budget warning against custom accounting dimension * fix: Codacy Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-04-23 10:34:57 +05:30
Rucha Mahabal	d7304519e2	fix: conflicts	2020-04-23 00:52:47 +05:30
Nabin Hait	471cf95300	Update purchase_invoice_item.json	2020-04-22 11:46:31 +05:30
Chinmay Pai	8fb863da07	chore: remove oldfieldtype from purchase invoice item (#21365 ) fixes issue where framework expects data field type to be validated with options either set to "Email" or "Phone". removing oldfieldtype works for now, should be fixed inside framework Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>	2020-04-22 11:23:14 +05:30
Rohit Waghchaure	690855d3a1	fix: unsupported operand type issue in pricing rule	2020-04-22 02:49:48 +05:30
Marica	34bbd5b612	fix: Purchase Invoice Form Cleanup (#21230 ) * fix: Purchase Invoice Form Cleanup * fix: Made Supplier field mandatory Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-04-21 13:00:14 +05:30
Saqib	b61d2411b1	Merge branch 'develop' into rename-bank-reco	2020-04-20 12:21:22 +05:30
Saqib Ansari	9de76de621	fix: patch	2020-04-20 12:19:27 +05:30
Deepesh Garg	3cec5cbb0f	fix: Total amount field ordering in transactions (#21313 )	2020-04-18 22:13:48 +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
rohitwaghchaure	866867661e	Merge pull request #21204 from rohitwaghchaure/fixed_internal_issue_develop fix: minor issues	2020-04-18 02:08:26 +05:30
Mangesh-Khairnar	bd14a64bfb	fix: add label to gl entry	2020-04-17 19:52:47 +05:30
Nabin Hait	7eaa7f2e41	fix: requested qty for customer provided item and rate for sales (#21299 ) * fix: requested qty for customer provided item and rate for sales * fix: requested qty for material transfer * fix: customer provided item can be sales item * fix: requested qty test cases	2020-04-17 10:52:28 +05:30
Nabin Hait	03af0299a6	fix: requested qty calculation and some other small fixes (#21296 ) * fix: Made received qty readonly and no-copy * fix: Made release date mandatory * fix: requested qty calculation fix for UOM	2020-04-16 20:11:32 +05:30
anoop	93d0c78ca5	feat: multi-company billing sales onvoice - filter get items based on company utils - company filters in all get item helper methods utils - refactor appointemnt items	2020-04-16 13:01:43 +05:30
Deepesh Garg	44c0c6c159	Merge branch 'develop' into asset-cat-validation	2020-04-16 11:23:52 +05:30
Deepesh Garg	17ab1592c7	Merge pull request #21265 from vishdha/chart_account_v13 fix: Chart of account importer UX improved	2020-04-16 11:21:05 +05:30
vishdha	5b36d15927	fix: fix Transalation	2020-04-16 11:13:43 +05:30
Marica	20ce433652	Merge branch 'develop' into warehouse-fix-dev	2020-04-15 23:48:27 +05:30
Saqib Ansari	34640777cd	fix: pos not accessible without default customer	2020-04-15 22:10:43 +05:30
rohitwaghchaure	c3f994b15e	Merge pull request #21197 from marination/default-item-manufacturer feat: Provision to set Default Item Manufacturer	2020-04-15 16:35:08 +05:30
Saqib Ansari	55410e03e4	fix: tests depending on global default company	2020-04-15 12:57:55 +05:30
Saqib Ansari	1f20c99ecf	fix: tests depending on global default company	2020-04-14 19:40:25 +05:30
Rohit Waghchaure	d0f6f1808b	fix: minor issues	2020-04-14 17:26:58 +05:30
vishdha	5008be1db5	fix: message bold	2020-04-14 17:17:26 +05:30
vishdha	10a6f4bd05	fix: Chart of account importer UX improved	2020-04-14 17:17:26 +05:30
Saqib	b52cd59dc3	Merge branch 'develop' into project-link-for-all-accounts	2020-04-14 14:05:32 +05:30
Saqib Ansari	aa196c0a66	fix: travis	2020-04-14 14:03:02 +05:30
rohitwaghchaure	fc31dbef12	fix: on changing qty free item not removed (#21251 )	2020-04-14 12:53:54 +05:30
Faris Ansari	64f01bddc8	fix: Set Price List in case of User Permissions (#21237 ) Frontport of #18968	2020-04-14 11:51:48 +05:30
Vishal Dhayagude	b1c2f4ef22	fix: str object not callable (#21227 )	2020-04-14 11:42:52 +05:30
Rushabh Mehta	4c0484b60e	Merge pull request #20811 from ruchamahabal/healthcare_refactor refactor: Healthcare Module	2020-04-13 17:16:02 +05:30
Saqib	2e45076dcf	Merge branch 'develop' into asset-cat-validation	2020-04-12 13:39:43 +05:30
Rucha Mahabal	59e6c7730b	Merge branch 'develop' into healthcare_refactor	2020-04-10 20:32:37 +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	e2a5828f5e	Merge pull request #21193 from nextchamp-saqib/pay-entry-ux-fix chore: hide redundant base received amount	2020-04-10 20:17:56 +05:30
Deepesh Garg	669c5c6370	fix: Syntax Error	2020-04-10 20:15:53 +05:30
Deepesh Garg	550771058a	fix: Code styling	2020-04-10 20:14:29 +05:30
Rucha Mahabal	1ff0cfd4f9	fix: merge conflicts	2020-04-10 18:58:25 +05:30
Shivam Mishra	ebcc46d837	feat: updated desk pages (#21138 )	2020-04-10 18:52:05 +05:30
Saqib Ansari	c9d6630f17	fix: formatting	2020-04-10 12:43:54 +05:30
Saqib Ansari	debee1c977	fix: travis	2020-04-10 12:38:44 +05:30
Rucha Mahabal	41520f9fca	Merge branch 'develop' into healthcare_refactor	2020-04-09 19:16:31 +05:30
rohitwaghchaure	cf17809c3f	Merge pull request #21156 from marination/mr-customer-provided-to-stock-entry fix: Mapping Customer Provided Material Request to Stock Entry	2020-04-09 13:18:25 +05:30
Deepesh Garg	ef220c1989	Merge branch 'develop' into pay-entry-ux-fix	2020-04-09 12:54:33 +05:30
Marica	3e84ab1349	fix: Error on any new doc from Shipping Rule. (#21206 )	2020-04-09 12:01:10 +05:30
Saqib	683581edef	fix: cannot find accounting module while rendering breadcrumb (#21190 )	2020-04-08 11:49:06 +05:30
Saqib	f93dc8dd88	fix: [ux] enforce 'get references from' in payment order (#21175 )	2020-04-08 09:20:17 +05:30
marination	3e7a8abf29	feat: Provision to set Default Item Manufacturer - Is Default checkbox added in Item Manufacturer - Default Item Manufacturer and Part No fields added to Item Master - Manufacturer Part No field editable in all child tables with validation - Manufacturer and Part No auto fetched via get_item_details in child table	2020-04-07 21:00:57 +05:30
Saqib Ansari	e9b63e45b9	chore: hide redundant base received amount	2020-04-07 17:22:11 +05:30
Rucha Mahabal	21f5680914	fix: merge conflicts	2020-04-07 16:42:50 +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
Vishal Dhayagude	8ef0609fc7	fix: Make Sales Invoice paid when it create from shopping cart (#20879 ) Co-authored-by: Saqib <nextchamp.saqib@gmail.com>	2020-04-07 12:07:01 +05:30
Deepesh Garg	f3c44a97f0	Merge pull request #21100 from nextchamp-saqib/payment-req-status-fix fix: payment request status fixes	2020-04-07 10:13:08 +05:30
Saqib Ansari	ca3967d52f	feat: (minor) purchase register filters	2020-04-06 18:25:23 +05:30
Saqib Ansari	b2a84fe478	chore: rename bank reconciliation to bank clearance	2020-04-06 16:32:33 +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
Saqib Ansari	474222074b	fix: tests	2020-04-06 12:40:41 +05:30
Saqib Ansari	4de2416806	fix: change request status on payment entry cancel	2020-04-06 12:34:38 +05:30
Marica	b37f0bb052	Merge pull request #20864 from deepeshgarg007/po_supplier_skip feat: Allow PI creation without PO	2020-04-06 12:15:42 +05:30
Deepesh Garg	1958749382	fix(minor): Minor anti pattern fixes in Exchange rate revaluation doctype (#21147 ) * fix(minor): Minor anti pattern fixes in Exchange rate revaluation doctype * fix: Codacy	2020-04-06 10:21:50 +05:30
Saqib	63bdf5dc74	fix: [ux] credit to & debit to error message (#21132 ) Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-04-03 19:35:55 +05:30
marination	2a9a5352bb	fix: Test Cases and block expense on outward entry - Throw error if rate present against Customer Provided Item in DN and SI - Added test cases for Sales Invoice and Delivery Note - Allow SI and DN with 0 rate in Test	2020-04-03 18:25:21 +05:30
Saqib	e2c355f670	Merge branch 'develop' into payment-req-status-fix	2020-04-03 11:29:15 +05:30
Marica	5d14af52a5	Merge branch 'develop' into po_supplier_skip	2020-04-02 21:17:52 +05:30
Deepesh Garg	872fcb6cae	fix: Travis	2020-04-02 18:11:46 +05:30
Deepesh Garg	5dcd2c118e	Merge pull request #21096 from nextchamp-saqib/customer-group-price-list-in-pos fix: customer group price list not fetched in pos	2020-04-01 09:42:13 +05:30
Saqib Ansari	9a7851096c	fix: check if selling price exists then set it	2020-03-31 18:48:35 +05:30
Saqib Ansari	8ed7535e8a	fix: travis	2020-03-31 18:44:02 +05:30
Deepesh Garg	cf9347d2f5	fix: Undo unneccessary changes	2020-03-31 17:28:43 +05:30
Deepesh Garg	5fd456baa4	Merge branch 'develop' into customer-group-price-list-in-pos	2020-03-31 16:33:41 +05:30
Deepesh Garg	eeb9ba81d7	Merge branch 'develop' into project-link-for-all-accounts	2020-03-31 16:07:23 +05:30
Deepesh Garg	d45e0e0b5b	Merge branch 'develop' into billing-contact	2020-03-31 16:06:11 +05:30
Nabin Hait	95330c850c	Merge branch 'develop' into healthcare_refactor	2020-03-31 15:59:22 +05:30
Deepesh Garg	bdcc4b47d6	Merge pull request #21061 from anupamvs/customer-doctype-issue fix: Adding proper error message	2020-03-31 15:30:46 +05:30
Raffael Meyer	c19330df63	fix: account groups (#21070 )	2020-03-31 15:28:45 +05:30
Deepesh Garg	31ea093283	Merge branch 'develop' into customer-doctype-issue	2020-03-31 13:50:40 +05:30
Anupam Kumar	ee0dec8776	fix: email_to, party_type and party are not set in payment request when order made from portal (#21084 ) Co-authored-by: Anupam K <anupam@Anupams-MacBook-Air.local>	2020-03-31 10:51:09 +05:30
Deepesh Garg	f0760dee80	Merge branch 'develop' of https://github.com/frappe/erpnext into customer-doctype-issue	2020-03-30 15:05:34 +05:30
Deepesh Garg	56bc36f9e2	fix: Test cases	2020-03-30 15:05:20 +05:30
Deepesh Garg	f144b8b205	Merge branch 'develop' into po_supplier_skip	2020-03-30 13:07:03 +05:30
Deepesh Garg	025762f395	Merge pull request #21119 from rohitwaghchaure/fixed_parent_account_error_while_adding_equity_account_develop fix: not able to add equity account in the chart of accounts	2020-03-30 12:15:01 +05:30
Rohit Waghchaure	cdf80eb4ad	fix: not able to add equity account in the chart of accounts	2020-03-29 16:35:10 +05:30
Deepesh Garg	f528aef49c	Merge pull request #21089 from scmmishra/print-format-fix fix: total currency formatting in Acc Receivable and Payable	2020-03-28 21:27:56 +05:30
Deepesh Garg	1a2cf5cabe	fix: get_party_gle_currency failing if customer_name or supplier_name is passed	2020-03-28 21:26:16 +05:30
Deepesh Garg	c6b850eacb	fix: Improve message	2020-03-28 21:17:58 +05:30
Deepesh Garg	b5c6412ed4	Merge pull request #21101 from nextchamp-saqib/gl-entry-currency-fix fix: currency formatting in gl entry dr cr field	2020-03-28 18:56:49 +05:30
Saqib Ansari	c1678203f1	fix: currency formatting in gl entry dr cr field	2020-03-28 16:39:22 +05:30
Saqib Ansari	0ec01d98d6	fix: payment request status fixes	2020-03-28 16:11:23 +05:30
Saqib Ansari	8488ef8eb1	fix: customer group price list not fetched in pos	2020-03-28 14:07:09 +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
Anupam K	7ca28fdab5	fix: Adding proper error message	2020-03-26 15:54:15 +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
Anupam K	9725e43eed	fix: Adding proper error message	2020-03-26 00:17:09 +05:30
Deepesh Garg	bdcfab3a0f	fix: Update patch and bank form cleanup	2020-03-25 21:32:10 +05:30
Deepesh Garg	3cf70a6e79	Merge branch 'develop' of https://github.com/frappe/erpnext into P-Froggy-develop	2020-03-25 21:00:25 +05:30
Rucha Mahabal	1900a62c54	fix: Merge branch 'develop' into healthcare_refactor	2020-03-25 02:08:42 +05:30
Deepesh Garg	75225316f0	fix: Remove quick entry from accouting dimensions	2020-03-22 21:50:22 +05:30
Deepesh Garg	fa6454b9c5	fix: Update is_tree field in Tree doctypes (#20981 )	2020-03-19 11:01:23 +05:30
Nabin Hait	2e67c33657	Release testing fixes develop (#20987 ) * fix: Multiple fixes during pre-release testing * fix: Merge conflict	2020-03-19 10:59:32 +05:30
Prssanna Desai	b4909b8fd2	fix: set filters as argument filters if passed (#20975 )	2020-03-18 18:23:38 +05:30
Priyanka Gangar	2602c7ea38	Label changes in account settings develop (#20965 ) * fix: Account setting words switches to US Terminology * created united_states.js * Remove Unwanted Spaces * Remove all changes * Add spaces between arguments Co-authored-by: PriyankaGangar <pinka0925@gmail.com>	2020-03-17 19:39:30 +05:30
Deepesh Garg	745897c354	Merge pull request #20862 from alyf-de/skr04_groups fix(accounts): adjust account groups in SKR04	2020-03-17 17:27:16 +05:30
Nabin Hait	ddc3bb2251	fix: Multiple fixes for travis (#20924 ) * fix: Multiple fixes for travis * fix: Multiple fixes for travis * fix: Run dashboard patch if table already exists * fix: Multiple fixes for travis * fix: deletion of auto-created batch	2020-03-17 17:04:18 +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	e7aefc1163	fix: Add check to skip PR in supplier master	2020-03-17 11:44:02 +05:30
Deepesh Garg	eeb1922e37	fix: Add check to skip SO and DN in customer master	2020-03-17 11:43:34 +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	d1bc74d650	Merge pull request #20958 from deepeshgarg007/mode_of_payment_fix fix: Mode of payment not fetcched in Item wise purchase register	2020-03-16 22:43:09 +05:30
Don-Leopardo	2b6a20aab5	fix: sql injection (#20818 )	2020-03-16 22:36:44 +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	0a74261a94	Merge pull request #20920 from deepeshgarg007/c_form_fix fix: Get invoice details only if invoice is selected	2020-03-16 15:56:32 +05:30
Raffael Meyer	1433436670	fix(accounts): add account_type and tax_rate to some VAT accounts (#20940 ) * Add account_type and tax rate to some VAT accounts * fix indentation	2020-03-16 15:45:05 +05:30
Rucha Mahabal	200cb34ecf	Merge branch 'develop' into healthcare_refactor	2020-03-12 19:44:27 +05:30
Shivam Mishra	aecf9d6168	Merge branch 'develop' into desk-settings-card	2020-03-12 17:13:03 +05:30
Saqib Ansari	af1221bcbd	chore: add tests and remove test based on allow_cost_center_for_bs_accounts	2020-03-12 17:04:17 +05:30
Shivam Mishra	451382e08e	feat: update desk pages	2020-03-12 16:34:34 +05:30
Ronel Cabrera	fcb54762a1	feat(Contacts): select billing contact for sales invoice	2020-03-12 16:58:59 +08:00
Rucha Mahabal	72993d6828	Merge branch 'develop' into healthcare_refactor	2020-03-12 12:52:38 +05:30
Saqib	6ec4618914	fix: travis (#20903 )	2020-03-11 16:04:00 +05:30
Saqib Ansari	706c239cf6	fix: remove enable_allow_cost_center_in_entry_of_bs_account	2020-03-11 15:17:10 +05:30
Saqib Ansari	0a42d81993	fix: cannot find get_allow_cost_center_in_entry_of_bs_account	2020-03-11 14:27:40 +05:30
Saqib Ansari	91b307e7f8	fix: project link not set in accounts other than profilt and loss accounts	2020-03-11 13:59:15 +05:30
Prssanna Desai	4fd61c3f83	fix: parameters un get function for accounts dashboard (#20847 )	2020-03-11 12:37:56 +05:30
Shivam Mishra	1fd1852c6a	Merge branch 'develop' into yet-another-desk	2020-03-10 18:20:27 +05:30
Deepesh Garg	4b20e852ea	fix: Get invoice details only if invoice is selected	2020-03-10 10:36:05 +05:30
Deepesh Garg	9f28a3124c	Merge pull request #20890 from deepeshgarg007/itemised_purchase_register fix: HSN code not visible in GST Itemised Purchase register	2020-03-10 10:05:31 +05:30
Deepesh Garg	5e58666091	fix: HSN code not visible in GST Itemised Purchase register	2020-03-09 22:38:41 +05:30
Saqib	f866ed9679	fix: [pos] customer group filter resets on syncing offline invoices (#20873 )	2020-03-09 18:30:47 +05:30
Rucha Mahabal	27512c86ae	refactor: Healthcare utils	2020-03-09 17:29:23 +05:30
Raffael Meyer	f669f30c08	add missing equity accounts	2020-03-06 16:17:06 +01:00
Deepesh Garg	1943fb0de4	feat: Allow PI creation without PO	2020-03-06 18:50:11 +05:30
Raffael Meyer	7b7513ab2b	adjust groups	2020-03-06 12:32:49 +01:00
Saqib	b978d79573	fix: show uom in print formats instead of stock uom (#20843 ) Co-authored-by: Saqib Ansari <saqibansari@Saqibs-MacBook-Pro.local>	2020-03-06 11:03:46 +05:30
Shivam Mishra	0310366d5a	fix (cleanup): remove incomplete dependencies data	2020-03-05 11:28:40 +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	cd96be9993	fix: Excel support and UX fixes for chart of accounts importer (#20703 ) * fix: Excel support and UX fixes for chart of accounts importer * fix: Linting Errors * fix: Blank chart preview * fix: Added template types for download * fix: Description on template selection * fix: Linting fixes * fix: Move logic for download template to dialog	2020-03-02 18:57:21 +05:30
Deepesh Garg	cc2771baa7	fix: Total amount not displayed in Journal Entry (#20794 ) * fix: Total amount not displayed in Journal Entry * fix: Update paid_to_received field * fix: set total amount Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-03-02 18:09:19 +05:30
Saurabh	19df2ffbd8	[bug][fix]: set status to object instead of variable (#20790 )	2020-03-02 17:50:05 +05:30
Shivam Mishra	8a8e8d6c5c	feat: added base pages for desk	2020-03-02 16:56:31 +05:30
Marica	ed25ec7ee5	chore: Item Price and Product Bundle Form cleanup (#20772 ) * chore: Item Price and Product Bundle Form cleanup * fix: Trailing comma	2020-03-02 15:51:14 +05:30
Saqib	ff52d16fb3	chore: control reposting of future gl entries with flags (#20774 )	2020-03-02 15:19:18 +05:30
Saqib	7b8c3dee3d	fix: reconciled entries showing in bank reco (#20787 )	2020-03-02 15:01:06 +05:30
P-Froggy	f1014bb978	Merge branch 'develop' of https://github.com/P-Froggy/erpnext into develop	2020-03-02 00:21:12 +01:00
P-Froggy	313efe9b32	fix: add missing semicolon	2020-03-02 00:21:08 +01:00
P-Froggy	3bf04154b1	Merge branch 'develop' into develop	2020-03-02 00:18:23 +01:00
P-Froggy	f9b3e4be78	Merge branch 'develop' of https://github.com/P-Froggy/erpnext into develop	2020-02-28 20:46:41 +01:00
P-Froggy	266e689c4f	fix: Show swift number and branch code in quick entry of bank doctype	2020-02-28 20:46:36 +01:00
P-Froggy	393a626834	fix: Allow only bank accounts of the respective party in payment entry	2020-02-28 20:45:48 +01:00
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
Saqib	fb35a54bee	perf: improve gl entry submission (#20676 ) * perf: improve gl entry submission * perf: add indexes * fix: replace *kwargs with args * fix: syntax error * fix: remove cypress * fix: travis * chore: remove purchase invoice from status updater * fix: set_staus args Co-Authored-By: Nabin Hait <nabinhait@gmail.com> * fix: only update status for invoices & fees Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-02-27 18:32:19 +05:30
Deepesh Garg	f444f451ac	fix: Remove debug statement	2020-02-27 16:04:01 +05:30
Deepesh Garg	50b3472eba	fix: Journal Entry not being fetched in Bank Reconciliation	2020-02-27 16:01:47 +05:30
Deepesh Garg	fe18b92b61	fix: Mandatory bank account error fix (#20733 ) * fix: Mandatory bank account error fix * fix: SQL condition	2020-02-26 17:17:02 +05:30
Nabin Hait	2bd6ac56c6	Merge branch 'develop' into develop	2020-02-26 13:21:38 +05:30
rohitwaghchaure	aa3ba41e83	fix: same free item not working for pricing rule (#20712 )	2020-02-26 12:51:46 +05:30
Deepesh Garg	5a2f22258a	Merge pull request #20592 from byugandhara/develop fix: Changes done to get valid customer and employee list on payment entry form(#20498)	2020-02-26 12:17:47 +05:30
Saqib	3957ac1408	perf: search for customer's return invoices then filter out gl_entries (#20709 ) Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-02-26 11:36:55 +05:30
Deepesh Garg	d1d0a50a70	feat: Loan management and accounting (#19035 ) * fix: Create Loan Management module * fix: Move loan doctype for hr module to loan management * fix: Add loan dashboard * fix: Move loan application form hr module to loan management * fix: Move Loan Type from hr to loan management * fix: Move salary slip loan from hr to loan management * fix: Create loan security pledge doctype * fix: Create loan security type doctype * fix: Create Loan security doctype * fix: Add customer in loan_common.js * fix: Import patch for loan * fix: Add security pledging in loan doctype * fix: Add loan application pledge doctype * fix: Add logic for security pledgeing in loan * fix: Add logic for security pledging in loan application * fix: Rename Loan security doctype to Loan Security Pledge * fix: Add doctype for loan security * fix: Fixes in loan and loan application * fix: Add doctypes for loan repayment * fix: Fixes in loan and loan application * fix: Move loan repayment report from HR module to loan management * fix: Create doctype for loan security price * fix: Create doctype for loan security shortfall * fix: Make fields in Loan shortfall readonly * fix: Make loan type submittable * fix: Add daily job for loan security revaluation in hooks.py * fix: Add loan management module * fix: Doctype for loan disbursement Entry * fix: GL entry fix for loan disbursement * fix: Add company currency options in Loan related doctypes * fix: Changes in Loan Doctypes * fix: Allow miltiple loan securities in Loan Security Pledge * fix: Add proposed pledges in Loan Application * fix: Add test cases for loan * fix: Interest Accrual Entry for loans * fix: Remove loan from journal entry * fix: Update triggers in loan_common.js * fix: Accrual Entries for loan Interest * fix: Proposed Pledges for loan application * fix: Update items in loan management module * fix: Allow multiple disbursements against a loan * fix: Add loan security code in loan security master * fix: Allow multiple securities in a single pledge * fix: Spelling and label fixes * fix: Replace date in loan security price with datetime * fix: Add dashboard to loan master * fix: Move Repayment Schedule from HR to Loan Management * fix: Add back jobs for loan accrual entries * fix: Multiple fixes in loan * fix: Multiple fixes in loan application * fix: Loan Reapayment for term loans * fix: Interest Accural Entries for term loans * fix: Changes in Loan Doctypes * fix: Add test case for term loan repayment * fix: Add custom button to update loan security price and trigger shortfall * fix: Usability fixes in Loan management * fix: Multiple usablity and doctype fixes * fix: Muliple bug and usability fixes in loan * fix: Test case fixes for loan repayment from Salary * fix: Codacy fixes * fix: Test Case fixes * fix: Minor fix in validate_repayment_method * fix: Test case and codacy fixes * fix: Provide consistent naming series to loan doctypes * fix: Loan Application fix * fix: Loan Application Dashboard * fix: Add doctypes to process loan interest accural and loan security price * fix: Provision to make loan topup * fix: Pledge and unpledge statuses and doctype for loan securit unpledge * fix: Multiple fixes in Loan Cycle * fix: Add missing dashboards to loan doctypes * fix: Add Loan Manager role to loan doctypes * fix: Loan Process fixes * fix: Loan Security Unpledge fixes * fix: UX, List and dashboards fixes * fix: Minor fixes * fix: Minor fixes * fix: Status on additional loan security * fix: Codacy fixes * fix: Multiple fixes in loan * fix: Rename Process Loan Security Price to Process Loan Security Shortfall * fix: Loan Repayment and Closure report * fix: Loan Security Status report and minor fixes * fix: Multiple UX fixes * fix: Test Case fixes and UX fixes * fix: Currency symbol fixes in Salary Slip Loan * fix: Make loan account details read only * fix: Changes in loan security price updation * fix: Sanctioned Loan Amount doctype * fix: Updates in process loan interest accrual * fix: Pass loan doc instead of loan name * fix: Fixes in process loan interest accrual * fix: Add missing semicolon * fix: Test case * fix: Test case * fix: Sandbox method to get proposed pledges * fix: Sandbox method * fix: Nonetype fix in loan sanction limit * fix: GL entry fixes * fix: Update maximum loan amount on loan security pledging * fix: Round off loan amounts * fix: Loan Security unpledging * fix: Interest amount for loan closure * fix: Due date for loan repayments * fix: API fixes for loan disbursement method * fix: Disable quick entry for sanctioned loan amount * fix: Add misssing translations for validations and codecleanup * fix: Translation fixes and code cleanup * fix: Test Cases * fix: Loan Interest Accrual test case	2020-02-26 10:44:24 +05:30
Deepesh Garg	7f2ad5dd82	Merge pull request #20714 from rohitwaghchaure/account_dashboard_not_working_issue fix: account dashboard not working	2020-02-26 10:18:03 +05:30
Deepesh Garg	0ebace5da2	fix: Update paid amount for pos return (#20543 ) * fix: Paid amount updation for pos return * fix: Remove console * fix: Styling * fix: get default mode of payment from POS profile * fix: Add test cases * fix: Codacy	2020-02-25 13:21:16 +05:30
Rohit Waghchaure	ebdf80ddb5	fix: account dashboard not working	2020-02-24 18:45:47 +05:30
Saqib	ca7f53b4ea	chore: SINV set_status remove redundant function calls (#20660 ) * chore: SINV set_status remove redundant function calls * Update erpnext/accounts/doctype/sales_invoice/sales_invoice.py Co-Authored-By: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com> Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>	2020-02-20 12:32:05 +05:30
Saqib	cfe2db6d77	fix: mandatory on hold comment for purchase invoice (#20666 )	2020-02-20 12:29:44 +05:30
Deepesh Garg	ad246a4415	Merge pull request #19856 from alyf-de/skr03_gnucash feat(accounts): add german CoA "SKR03" (GnuCash)	2020-02-19 19:21:51 +05:30
Deepesh Garg	0a6314ab92	Merge pull request #20659 from deepeshgarg007/plaid_fix_develop fix: Plaid fixes and enhancements	2020-02-18 18:09:01 +05:30
Deepesh Garg	16445305d5	fix: Styling and minor fixes	2020-02-18 18:04:09 +05:30
racitup	547a0bb909	fix: attempt at pymysql InternalError 1054 about clearance_date in field list when removing payments from bank transactions	2020-02-18 17:49:57 +05:30
racitup	719678957a	fix: Bank Reconciliation Bank Account and Bank Account No field names	2020-02-18 17:49:45 +05:30
racitup	1548e20b78	fix: KeyError about bank_account_no due to non-existent field: #20343	2020-02-18 17:49:08 +05:30
racitup	7cda218af3	fix: pymysql.err.InternalError about t2.bank_account_no due to removal of field from Journal Entry Account table: #20343	2020-02-18 17:48:54 +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
rohitwaghchaure	0abc181360	Merge pull request #20638 from nextchamp-saqib/pos-mode-of-pay-fix fix: disabled mode of payments fetches in sales invoices	2020-02-18 12:38:06 +05:30
Deepesh Garg	15ff6a594b	feat: Inter warehouse stock transfer on valuation rate with taxation (#20083 ) * fix: Validation for target warehouse * feat: Get items on valuation rate in delivery note on Internal transfers * fix: Create Inter company purchase receipt from delivery note * feat: Inter company stock transfer on valuation rate with taxation * fix: Add from warehouse in purchase invoice * fix: Use get_value instead of get_cached_value * fix: Get incoming rate instead of valuation rate * fix: GL entry for from warehouse in purchase receipt * fix: GL Entries fixes in purchase invoice * fix: Address and tax fetching fixes * fix: Add test case for stock transfer via purchase receipt * fix: Code cleanup, added validations and test cases * fix: Validation for supplier warehouse * fix: Test Cases * fix: Change validation condition * fix: Address fixes while creating Purchase Receipt from delivery note * fix: Set taxes while creating Purchase Receipt from Delivery Note * fix: Update set_missing_value function Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-02-18 12:28:41 +05:30
P-Froggy	3cb9f4ab73	Add address and contact fields to bank Address and contact fields are enabled for DocType Bank	2020-02-18 02:14:03 +01:00
P-Froggy	4cc929cabb	Move SWIFT-number and branch-code from bank account to bank The bank's SWIFT-Number and branch-code should be a field in bank DocType, not in bank account DocType.	2020-02-18 00:38:46 +01:00
thefalconx33	23e728612f	fix: disabled mode of payments fetches in sales invoices	2020-02-17 14:15:20 +05:30
Yugandhara	ad645afeb2	fix: Changes done to get valid customer and employee list on payment entry form	2020-02-15 10:56:41 +05:30
Raffael Meyer	0fac1f9429	Add groups for account types "Bank" and "Cash"	2020-02-12 13:59:48 +01:00
Raffael Meyer	cad404c355	Merge branch 'develop' into skr03_gnucash	2020-02-12 13:58:53 +01:00
Deepesh Garg	c688f9f584	Merge pull request #20559 from rohitwaghchaure/added_indexing_on_columns_to_fix_performance_issue_develop fix: added indexing on columns to fix performace issue	2020-02-11 10:12:49 +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
Rohit Waghchaure	50886f02c3	fix: added indexing on columns to fix performace issue	2020-02-10 15:56:56 +05:30
rohitwaghchaure	7d2c8cffb0	fix: pricing rule not working on item groups (#20547 ) Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>	2020-02-09 21:23:53 +05:30
Deepesh Garg	30e766b228	fix: SQL query in financial statements	2020-02-05 12:12:47 +05:30
Pranav Nachnekar	6c14a08631	fix: disallow quick entry for doctypes with tree view (#20452 )	2020-02-03 17:05:26 +05:30
Deepesh Garg	9e1fbaf59e	fix: Label and UX fixes while creating payment entry against customer (#20465 ) * fix: Label and UX fixes while creating payment entry against customer * fix: filter	2020-02-03 15:58:50 +05:30
Saqib	4fca6cae34	feat: add tax category in pos profile (#20413 ) * feat: add tax category in pos profile * fix: review fixes	2020-02-03 15:53:27 +05:30
Deepesh Garg	589f2cd16c	fix: Get only specified company accounts in financial statements (#20486 )	2020-02-03 15:49:24 +05:30
Deepesh Garg	cce3ac9f79	fix: Move E-Way bill button under create	2020-02-02 21:25:58 +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
Faris Ansari	8e131c7cad	fix: Remove translated strings from test	2020-01-30 13:03:05 +05:30
Raffael Meyer	e21cd5e7f1	fix: account number for "Kasse"	2020-01-29 23:39:55 +01:00
Raffael Meyer	3716434218	fix: add missing account types	2020-01-29 22:21:19 +01:00
Suraj Shetty	da2c69e836	fix(translations): Incorrect syntax	2020-01-29 15:34:06 +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
Pranav Nachnekar	3fb48ebf61	fix: discounting not applied on sales invoice created by subscriptions (#20431 )	2020-01-28 12:52:13 +05:30
Marica	4e7625bd8f	fix: Column 'project' in where clause is ambiguous (#20438 ) * fix: Column 'project' in where clause is ambiguous * fix: Fixed alias in query	2020-01-28 12:43:38 +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
Saqib	9cb02bf2e1	fix: incorrect status for fraction of outstanding amount (#20369 )	2020-01-27 14:22:43 +05:30
Saqib	9291df4d4c	fix: wrong outstanding invoices fetched against employee (#20373 )	2020-01-24 16:22:49 +05:30
Deepesh Garg	60e8d52f32	Merge pull request #20401 from deepeshgarg007/general_ledger_sort fix: Order GL entries by creation time in General ledger	2020-01-24 13:19:39 +05:30
Rohit Waghchaure	8996b7d8a4	delete the auto created batch	2020-01-23 17:44:19 +05:30
deepeshgarg007	fdba26d476	fix: Order GL entries by creation time in General ledger	2020-01-23 17:42:57 +05:30
Rohit Waghchaure	4f4dbf1996	fix: unlink references from batch on cacnellation of stock transactions	2020-01-23 12:45:45 +05:30
rohitwaghchaure	5056c8bcb4	fix: not able to import chart of account if parent account is missing (#20368 )	2020-01-21 15:32:26 +05:30
Saqib	eea0ffcb38	fix: account not added to child company (#20361 )	2020-01-21 15:25:51 +05:30
Saqib	bcb6130bbe	fix: hide total amount field from journal entry PF (#20324 )	2020-01-16 13:38:43 +05:30
sahil28297	32d643ed3c	fix(patch): reload tax category (#20308 )	2020-01-15 18:57:54 +05:30
Saqib	617a24191f	fix: get existing payment req amount only from unpaid req (#20289 )	2020-01-15 16:36:13 +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
Saqib	1218160c70	fix: payment entry can be created against on hold PI (#20270 )	2020-01-14 12:07:24 +05:30
Deepesh Garg	16b8673554	Merge pull request #20257 from nextchamp-saqib/revery-jv-fix fix: remove default customer as party type	2020-01-13 13:48:55 +05:30
thefalconx33	f04d054faa	fix: remove default customer as party type	2020-01-13 12:43:49 +05:30
rohitwaghchaure	d4d7d211ea	feat: report to show difference between stock and account value (#20186 )	2020-01-09 15:05:05 +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
Deepesh Garg	ef0d26c161	feat: Validity for Item taxes (#20135 ) * feat: Validity for Item taxes * fix: Trigger for gst hsn code * fix: Sort taxes based on validity * fix: Validation for item tax template and filters based on validity * fix: Add missing semicolon * fix: Validate tax template only if item code available * fix: Do not validate or filter item tax template if no item taxes applied * fix: Consider item group for validating taxes * fix: Test cases for item tax validation * fix: Item tax template filtering fixes * fix: Add missing semicolon * fix: Remove unnecessary query	2020-01-06 15:34:15 +05:30
rohitwaghchaure	b5f91bea90	Merge pull request #20195 from rohitwaghchaure/fixed_party_type_in_payment_request fix: incorrect party type in payment request	2020-01-06 15:16:42 +05:30
Rohit Waghchaure	8641f9ce77	fix: party type in payment request	2020-01-06 15:07:06 +05:30
Syed Mujeer Hashmi	03bf1a875f	feat: Allow write-off for Fees doctype Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>	2020-01-04 13:26:42 +05:30
rohitwaghchaure	52c5fb33d7	Merge pull request #20169 from rohitwaghchaure/fix_pricing_rule_issue_for_ignore_pricing_rule_develop fix: ignore pricing rule for other item group	2020-01-02 19:24:37 +05:30
Rohit Waghchaure	660a78b877	fix: ignore pricing rule for other item group	2020-01-02 17:31:09 +05:30
deepeshgarg007	473b478883	fix: Show closing row in general ledger print	2020-01-02 12:22:04 +05:30
Raffael Meyer	5d6fada431	feat: add accounts and account types	2020-01-01 22:55:54 +01:00
Javier Wong	5cc7648e9c	[Fix] Allow Print Before Pay in POS (#20151 ) Print Button does not show even when Print Before Pay is enabled in the POS Profile.	2019-12-31 17:07:37 +05:30
Saqib	cb7043fd9d	fix: party account currency not fetched from account for SO (#20146 )	2019-12-31 13:55:13 +05:30
Marica	5483f1a27e	fix: Field 'other_charges_calculation' column type changed. (#20141 )	2019-12-30 22:20:02 +05:30
Rucha Mahabal	3ac39ba28d	fix: format currency field in bank and cash payment voucher print format (#20137 )	2019-12-30 15:18:07 +05:30
Saqib	7e57ede35b	fix: unpaid invoices are created even if current invoice is paid (#20081 )	2019-12-27 13:02:13 +05:30
Deepesh Garg	1a2e4fa36d	Merge pull request #20087 from nextchamp-saqib/pay-reco-fix fix: undefined dr_or_cr_notes in case of party type Employee	2019-12-27 08:13:09 +05:30
thefalconx33	81d0861506	fix: undefined dr_or_cr_notes in case of party type Employee	2019-12-26 14:42:11 +05:30
thefalconx33	6291ca8e40	fix: only show doctypes which impact accounting in accounting period	2019-12-26 13:55:35 +05:30
Saqib	7519436260	Merge pull request #19876 from rohitwaghchaure/provision_to_select_custom_fields_in_pos feat: provision to select the custom fields in the online POS	2019-12-26 13:40:43 +05:30
Rohit Waghchaure	682273a00b	feat: provision to select the custom fields in the online POS	2019-12-26 11:59:19 +05:30
Mitchy25	fee8340f98	fix: Bank Reconciliation Allows to Over Reconcile (#19461 ) * Update bank_reconciliation.py * fix: improve error message while over reconciling * fix: only check over-reconciliation when against payment entry Co-authored-by: Saqib <thefalconx33@gmail.com>	2019-12-24 18:02:18 +05:30
Don-Leopardo	ec258a43d9	perf: Asset Depreciations and Balances report (#18022 )	2019-12-24 17:35:53 +05:30
Pranav Nachnekar	b972f763f3	fix: added validation for cost center (#19932 ) * fix: add validation for cost centers in sales invoice * use `get_cached_value` for getting compnay, formatting of error message	2019-12-24 16:46:46 +05:30
rohitwaghchaure	08433c2919	fix: supplier email id field not showing in the notification for purchase cycle doctypes (#20071 )	2019-12-24 13:03:47 +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
Deepesh Garg	f5bd920e8f	Merge pull request #19955 from deepeshgarg007/employee_advance_return feat: Capture return amount against Employee Advance via Journal Entry	2019-12-24 11:52:20 +05:30
Deepesh Garg	2b3482d5dd	fix: Do not validate accounting dimensions if from repost (#20042 ) * fix: Do not check for accounting dimensions in case of repost * fix: Do not validate accounting dimensions if from repost	2019-12-23 17:58:50 +05:30
Saqib	9078607600	fix: paid amount gets overwritten by get_outstanding_invoices (#20050 )	2019-12-23 16:25:16 +05:30
Saqib	4f18d2548d	fix: none type object updates AR report row (#19958 )	2019-12-23 16:01:38 +05:30
Saqib	1263515a92	fix: exchange rate not fetching correctly (#20010 )	2019-12-23 15:51:31 +05:30
Deepesh Garg	06e7cf3caa	Merge pull request #20009 from nextchamp-saqib/pi-payable-filter fix: bad credit to filter in purchase invoice	2019-12-23 14:50:56 +05:30
thefalconx33	ee10f2f50d	fix: bad query for debit_to field in sales invoice	2019-12-23 13:07:00 +05:30
Deepesh Garg	704235565e	Merge pull request #20012 from nextchamp-saqib/share-transfer-perm fix: no role has cancelling permission for share transfer doctype	2019-12-21 17:23:15 +05:30
thefalconx33	7e68f050d9	fix: account manager doesn't have cancel submit perm for share transfer	2019-12-20 14:50:25 +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
thefalconx33	e9cb561d8d	fix: no role has cancelling permission for share transfer doctype	2019-12-19 13:18:46 +05:30
thefalconx33	9d9a78442e	fix: bad filter query	2019-12-19 13:10:57 +05:30
Rohit Waghchaure	2ae79b8ac2	fix: Pricing Rule Discount for Product	2019-12-18 17:53:21 +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	5d0c42e2a1	Merge pull request #19943 from nextchamp-saqib/gl-precision-fix fix: gl entries doesn't filter based on debit precision	2019-12-17 17:23: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
rohitwaghchaure	86b2956ac0	Merge pull request #19946 from rohitwaghchaure/pricing_rule_not_working_for_product_discount fix: pricing rule not working for product discount	2019-12-16 14:44:22 +05:30
Rohit Waghchaure	8bd84b28ca	fix: schedule date	2019-12-16 12:29:07 +05:30
Rohit Waghchaure	21fe97e723	fix: pricing rule not working for production discount	2019-12-16 11:15:53 +05:30
deepeshgarg007	c05bd1964f	feat: Capture return amount against Employee advance via Journal Entry	2019-12-15 21:22:28 +05:30
Suraj Shetty	586390db81	Merge branch 'develop' into fix-profit-and-loss-statement	2019-12-14 22:49:53 +05:30
rohitwaghchaure	b2f65366cf	Merge pull request #19941 from deepeshgarg007/pricing_rule_fix fix: Price rule filtering fix	2019-12-13 16:01:16 +05:30
thefalconx33	bfc43d3b15	fix: gl entries doesn't filter based on debit precision	2019-12-13 15:41:19 +05:30
deepeshgarg007	8c9c6ec919	fix: Price rule filtering fix	2019-12-13 13:47:15 +05:30
Deepesh Garg	859b464a57	Merge pull request #19904 from prssanna/file-upload-fix fix: Bank statement not getting attached in Bank Reconciliation	2019-12-12 15:19:54 +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
prssanna	2ef26fbb07	fix: empty fname and fcontent of uploaded file	2019-12-11 14:21:04 +05:30
Saqib	664d0d89b5	fix: incorrect account mapping for child companies (#19887 ) * fix: incorrect account mapping for child companies on adding account to parent company * Update account.py	2019-12-10 21:32:17 +05:30
Deepesh Garg	6e2c13f4c8	feat(regional): Auto state wise taxation for GST India (#19469 ) * feat(regional): Auto state wise taxation for GST India * fix: Update gst category on addition of GSTIN * fix: Codacy and travis fixes * fix: Travis * fix(test): Update GST category only if GSTIN field available * fix: Test Cases * fix: Do not skip accounts if place of supply is not present * fix: Auto GST taxation for SEZ Party types * fix: Automatic taxation for multi state * fix: Codacy and travis fixes * fix: Auto GST template selection in Sales Order * fix: Move inter state check and source state to tax category * fix: Remove unique check from tax template * fix: Remove unique check from tax template * fix: Address fetching logic in Sales * fix: fecth tax template on company address change * fix: fetch company gstin on address change * fix: company_gstin set value fix * fix: Mutiple fixes and code refactor * fix: Add missing semicolon * fix: Company address fetching in sales invoice * fix: Remove print statement * fix: Import functools * fix: Naming fixes and code cleanup * fix: Iteritems compatibility for python 3	2019-12-10 15:55:05 +05:30
Deepesh Garg	ce42f48bfb	fix: Append expense account only if expense account exists (#19880 )	2019-12-10 12:15:33 +05:30
Saqib	7e958da6d6	fix: sales order reqd only checks for stock items (#19865 )	2019-12-09 17:23:19 +05:30
Saqib	39e4f75a76	fix: get outstanding invoices btn working on submitted payment entry (#19858 )	2019-12-09 13:16:35 +05:30
Deepesh Garg	b63101250c	fix: Rounding Adjustment GL entry fix (#19838 ) * fix: Rounding Adjustment GL entry fix * fix: Spacing in tab * fix: Comment fix	2019-12-09 13:03:24 +05:30
Raffael Meyer	af9c5fda9e	rename CoA	2019-12-07 14:22:51 +01:00
Raffael Meyer	05d708b51c	add some missing accounts Aktive Rechnungsabgrenzung Passive Rechnungsabgrenzung Kasse Verblk. aus Lohn und Gehalt Erlöse	2019-12-07 14:21:22 +01:00
Raffael Meyer	d86cefe1a5	first draft	2019-12-07 13:10:44 +01:00
Nabin Hait	d285e9b7bd	optimize: Optimization of Receivable report filtered based on sales person (#19796 )	2019-12-04 15:30:58 +05:30
Nabin Hait	acdd5081da	fix: Service start and end date validation for deferred accounting (#19805 )	2019-12-04 15:30:01 +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
Saqib	d635bda29b	fix selling setting label for sales order reqd (#19775 )	2019-12-03 17:05:06 +05:30
Khushal Trivedi	73129e6ac8	fix:Pricing Rule error AttributeError: 'str' object has no attribute 'get' (#19774 ) * fix: date validation on inpatient record, else condition removing on clinical prcd templ which is not req * fix:Pricing Rule error AttributeError: 'str' object has no attribute 'get' #19770 * fix:Pricing Rule error AttributeError: 'str' object has no attribute 'get' #19770	2019-12-03 17:03:45 +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
rohitwaghchaure	d76529e6ca	Merge pull request #19748 from deepeshgarg007/version-12-serial-no-fix fix: Serial no validation against sales invoice	2019-11-29 16:34:58 +05:30
deepeshgarg007	c51dd2989e	fix: Validation msg	2019-11-29 15:56:16 +05:30
deepeshgarg007	45f57f273c	fix: Serial no validation against sales invoice	2019-11-29 15:56:08 +05:30
rohitwaghchaure	b59a25b02b	Merge pull request #19746 from rohitwaghchaure/fixed_customer_selection_issue_in_sales_invoice_healthcare_module fix: please specify customer error in sales invoice if patient is blank	2019-11-29 14:29:31 +05:30
Mangesh-Khairnar	92b9d7383d	fix: show create payment request for so that are not billed	2019-11-29 14:22:52 +05:30
Rohit Waghchaure	bf8fe06f86	fix: please specify customer error in sales invoice if patient is blank	2019-11-29 14:14:11 +05:30
Marica	8f48896261	fix: Permission issue in Stock Entry (#19738 )	2019-11-28 19:39:49 +05:30
Anurag Mishra	f3b393f5e0	fix: UOM was not fetching in purchase invoice (#19732 ) * fix: UOM was not fetching in purchase invoice * fix: Changes requested Co-authored-by: Marica <maricadsouza221197@gmail.com>	2019-11-28 18:52:16 +05:30
Deepesh Garg	7cdde93645	fix: Validation for parent cost center (#19664 ) * fix: Validation for parent cost center * fix: Minor modification in condition * fix: Update test cases for invalid cost center creation	2019-11-28 18:37:51 +05:30
Joseph Marie Alba	5c2ba0ef9c	Fix: Logic bug (#19692 ) account_groups = [accounts[d]["account_type"] for d in accounts if accounts[d]['is_group'] not in ('', 1)] - if accounts[d]['is_group'] not in ('', 1) is wrong because it returns false even if the account is a group. - should be if accounts[d]['is_group'] not in ('', 0) However, the correction provided here: account_groups = [accounts[d]["account_type"] for d in accounts if accounts[d]['is_group'] == 1] is more consistent with the prior statement that extracts ledger (and not group) accounts. account_types = [accounts[d]["account_type"] for d in accounts if not accounts[d]['is_group'] == 1]	2019-11-28 18:33:20 +05:30
Deepesh Garg	9f3276046f	fix: Account type in Handling Difference in Inventory account (#19674 ) * fix: Account type in Handling Difference in Inventory account * fix: Add Stock Adjustment account * fix: Rename account to stock adjustment	2019-11-28 18:29:33 +05:30
Shivam Mishra	2512962f55	fix: handle None case for get_shipping_amount_from_rules (#19723 )	2019-11-28 16:46:58 +05:30
rohitwaghchaure	1511154aa8	fix: removed stock value and account balance out of sync validation (#19729 ) * fix: revert value out of sync feature * fix: removed stock value and account balance out of sync validation	2019-11-28 16:43:39 +05:30
Deepesh Garg	31a4fa5dd3	Merge pull request #19606 from deepeshgarg007/shareholder_refactor refactor: Share Transfer code cleanup and refactor	2019-11-26 07:54:57 +05:30
Nabin Hait	a7d168c05f	fix: merge conflict	2019-11-25 18:12:56 +05:30
Nabin Hait	35e8d1e1d7	Stock acc bal sync msg (#19676 ) * fix: Prefilled JV via Account Balance and Stock Value mismatch error message - Make JV button will route to Journal Entry and add rows in child table * fix: make journal entry to sync stock and account balance * fix: translated action label	2019-11-25 14:02:51 +05:30
Nabin Hait	2fd6814cbf	Merge branch 'marination-account_stock_sync_error' into develop	2019-11-25 12:46:45 +05:30
Nabin Hait	1ed1c4e6a4	fix: make journal entry to sync stock and account balance	2019-11-25 12:33:40 +05:30
Saqib	f37a46edea	Fixed Asset Refactor Review fixes (#19665 ) * fix: fixed asset item creation ux fixes * fix: auto creation of asset ux fixes * fix: [LCV] incorrect condition when checking assets linked with PR * fix: bulk update assets * refac: remove company level cwip enabling * cwip can be enabled only on category level * fix: #19649	2019-11-22 16:32:50 +05:30
Saqib	1919af2ff1	Fixed Asset Refactor Review fixes (#19666 ) * fix: fixed asset item creation ux fixes * fix: auto creation of asset ux fixes * fix: [LCV] incorrect condition when checking assets linked with PR * fix: bulk update assets * refac: remove company level cwip enabling * cwip can be enabled only on category level * fix: #19649	2019-11-22 16:32:34 +05:30
Nabin Hait	aff4a67954	Merge branch 'account_stock_sync_error' of https://github.com/marination/erpnext into marination-account_stock_sync_error	2019-11-22 15:14:32 +05:30
Mangesh-Khairnar	b10526dd86	fix: consider taxes in the grand total (#19631 )	2019-11-22 12:28:33 +05:30
Nabin Hait	7af153da50	fix: Multiple fixes related to landed cost accounting (#19656 )	2019-11-22 11:35:14 +05:30
Nabin Hait	046137caa2	fix: Multiple fixes related to landed cost accounting (#19657 )	2019-11-22 11:34:50 +05:30
Rucha Mahabal	45e9dd9c51	fix(Journal Entry): default Cash Entry account not getting fetched	2019-11-20 11:40:38 +05:30
rohitwaghchaure	26c46282e8	Merge pull request #19618 from nextchamp-saqib/pos_fix fix: stock qty not displayed in pos	2019-11-19 19:41:25 +05:30
rohitwaghchaure	a85ddf2fb4	fix: performance issue of sales invoice while save/submit (#19598 ) * fix: performace issue of sales invoice while save/submit * Cached price list data, item group child data, added indexing for blanket order	2019-11-19 18:47:48 +05:30
Nabin Hait	9db9edca2c	fix(expense claim): fetch outstanding documents based on party account type	2019-11-19 18:44:54 +05:30
thefalconx33	353f73a153	fix: stock qty not displayed in pos	2019-11-19 18:37:21 +05:30
Deepesh Garg	ee69f707a9	Merge pull request #19600 from rohitwaghchaure/make_email_queue_issue_in_pos fix: 'NoneType' object has no attribute 'replace' in POS	2019-11-19 09:47:55 +05:30
deepeshgarg007	0debcf9f2f	fix: Share existing condition logic	2019-11-18 22:12:29 +05:30
deepeshgarg007	9c1c4ef3dd	refactor: Share transfer cancellation and code cleanup	2019-11-18 17:52:19 +05:30
marination	6ef057a2a3	fix: Prefilled JV via Account Balance and Stock Value mismatch error message - Make JV button will route to Journal Entry and add rows in child table	2019-11-18 15:55:32 +05:30
Rohit Waghchaure	466702200f	fix: 'NoneType' object has no attribute 'replace' in POS	2019-11-18 14:57:55 +05:30
Deepesh Garg	87c6718d90	fix: Book valuation expense in specified account rather than expense included in valuation account (#19590 ) * fix: Book valuation expense in specified accout rather than expense included in valuation account * fix: Remove undefined variable * fix: Test cases * fix: Test Case	2019-11-18 12:34:30 +05:30
Saqib	d995609ffa	Fixed asset refactor (#19369 ) * refactor: Asset Movement with multiple assets using table * refactor: Create Asset Movement from Asset List & Linking PR/PI with Asset * feat: Auto create asset on Purchase checkbox * refactor: LCV for asset created via PR/PI * refactor: get asset category accounts from item master * refactor: Purchase Receipt for asset purchasing * refactor: Purchase Invoice for asset purchasing * fix: post-refactor delete fixes * refactor: moved asset validation from pr/pi on asset submission * fix: Asset Category should be defined for auto purchasing assets * fix: undo serial_no_update removal (for non asset item) from LCV * fix: remove duplicate calls from item.js * fix: args position of all occurrence of get_asset_category_account() * fix: test cases * fix: landed cost voucher validations * refactor: test case for auto creation of asset * fix: removed invalid assertions * fix: patch errors on travis * fix: codacy fixes * fix: PI Items not fetching details from item * fix: asset movement from list view having default purpose 'Receipt' * chore: msgprint for selecting item code first while creating asset manually * fix: alert messages * minor: asset movement fixes * fix: lcv was made against submitted assets * minor: ux fixes * refac: move specific asset validation to SINV * chore: remove make_purchase_invoice from asset form * make asset movement on asset submission * add PR & PI queries based on item code * refac: not allow last movement cancellation * move asset movement creation on asset submission * asset movement naming series * add tests * fix: code review changes * chore: remove unecessary asset movement updation * refac: setting latest location while making asset movements * Added extra validations * fix: form dashboard make lcv button * fix: auto asset movement creation validation * fix: allow lcv against other items after removing submitted assets * chore: remove unwanted condition * fix: mismatch debit credit on purchase of asset with valuation tax * chore: toggle required field based on movement type * chore: fix lcv error message * fix: travis failing * fix: travis failing test * fix: wrong conditions after merge * fix: cannot cancel assets * fix: travis failing* fix change in deletion of assets * fix: codacy * fix: process cancellation of assets * refac: cancellation of pr only deletes auto created assets * fix: incorrect query	2019-11-18 11:46:55 +05:30
deepeshgarg007	57bd1308eb	fix: Validation messages code cleanup	2019-11-15 08:25:48 +05:30
prssanna	74bbcb539f	fix: Ignore period closing voucher entries in accounts dashboard	2019-11-14 22:47:58 +05:30
Marica	c9e8a1bf96	fix: Account Balance and Stock Value out of sync error message (#19526 ) * fix: Account Balance and Stock Value out of sync error message Added 'Make Adjustment Entry' button and enhanced message * fix: Split message and changed routing for translation	2019-11-14 16:13:43 +05:30
Nabin Hait	ec082754b4	fix: One serial no can be tagged in multiple invoices if used against different items (#19580 )	2019-11-14 13:28:24 +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
Marica	d00c59830e	feat: Disable CWIP Accounting checkbox added in Company and Asset Category (#19262 ) * feat: Disable CWIP Accounting checkbox added in Company and Asset Category Asset Settings is removed completely Disable CWIP Accounting checkbox will give priority to Asset Category * fix: Changed checkbox name to 'Enable Capital Work in Progress Accounting' - checkbox will be disabled by default - Enabling it in Company will globally enable it - When globally disabled , it's value on the asset category will be considered * chore: Added patch to set pre-existing CWIP checkbox value into new checkbox * fix(test): Asset * fix: Asset Test and Patch * fix(test): Opening Invoice Creation Tool * Update asset.py * fix: Patch and other fixes	2019-11-12 19:17:43 +05:30
Deepesh Garg	3cc3b57926	fix: Expense claim paid through employee advance getting fetched as outstanding in Payment Entry (#19427 ) * fix: Expense claim paid through employee advance getting fetched as outstanding in Payment Entry * fix: Codacy * fix: Minor UX fixes * fix: Also credit payable amount in case of advance payment * fix: Against voucher in GL enrty	2019-11-12 14:32:50 +05:30
deepeshgarg007	929676fceb	fix: Validation logic code cleanup	2019-11-12 12:00:30 +05:30
Mitchy25	a227b9a9a6	Fix Bank Reconcilaition for Payment Entries (#19190 ) * Fix Bank Reconciliation with Payment Entries * Update bank_reconciliation.js	2019-11-11 17:29:53 +05:30
Nabin Hait	32936024a0	patch: set default for add taxes from item tax template	2019-11-11 15:44:27 +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
Deepesh Garg	7a23057eab	feat: Enhancement in landed cost voucher (#19252 ) * feat: Enhancement in landed cost voucher * fix: Make GL entries based on ledgers in Landed cost voucher * fix: Patch to update expense account in Landed Cost Voucher and Stock Entry * fix: Ability to select expense account in Stock Entry * fix: Renaming and test case fixes * fix: Test Cases * fix: Additional cost in Stock Entry * fix: Changed filters and test case fixes * fix: Upadte filters in stokc entry expense account filter * fix: company filter	2019-11-08 12:52:54 +05:30
Deepesh Garg	7aef9f3b43	fix: Accounting Dimension custom fields should be admin owned (#19525 ) * fix: Accounting Dimension custom fileds should be admin owned * fix: Update query * fix: Travis	2019-11-08 12:42:38 +05:30
Nabin Hait	628701f1a5	fix: Accounts mandatory depending on share transfer type (#19523 )	2019-11-07 18:05:40 +05:30
Marica	e37a67245e	fix: Sales and Purchase Invoice Status, Payment Reconciliation Credit/Debit Note (#19388 )	2019-11-07 12:52:23 +05:30
Mitchy25	a5776d16b4	fix: Version 12 Bank Reconciliation fix (#19182 ) * Fix Bank Reconciliation Change fixes Bank Rec upload as well as the duplicatation of bank_account and company filters * Update bank_reconciliation.js Removing incorrect fix to filters. Filters are loaded from Bank Transaction List. * Update bank_reconciliation.js	2019-11-06 19:04:54 +05:30
Deepesh Garg	02b9472152	Merge pull request #19490 from prssanna/dashboard-fix fix: fix dashboard with date range	2019-11-06 18:17:08 +05:30
Marica	1beed7db72	fix: Added 'status' field in Payment Entry (#19507 )	2019-11-06 18:12:29 +05:30
rohitwaghchaure	0c12eded05	Merge pull request #19505 from rohitwaghchaure/credit_limit_not_defined_in_accounts_receivable_report fix: unknown column credit limit in accounts receivable report	2019-11-06 17:26:35 +05:30
Deepesh Garg	f67833f249	Merge pull request #19492 from gavindsouza/invoice-creation-tool-py3 fix: invoice creation tool of invoices with no paid and outstanding amounts	2019-11-06 16:40:04 +05:30
rohitwaghchaure	6a50c92087	Update accounts_receivable.js	2019-11-06 16:34:17 +05:30
rohitwaghchaure	e123ec6b45	fix: incorrect number of entries while making deferred revenue entry (#19473 )	2019-11-06 15:25:00 +05:30
Saqib	01c19d3b93	internal issues (#19496 ) * fix: user remark mandatory in quick entry but not in form * fix: preview salary slip btn showing in draft and unsaved states * minor: removed unecessay comma * fix: department analytics report showing departments of all companies	2019-11-06 14:41:16 +05:30
Rohit Waghchaure	dec5bead9c	fix: unknown column credit limit in accounts receivable report	2019-11-06 13:13:31 +05:30
Gavin D'souza	05710804cf	fix: invoice creation tool of invoices with no paid and outstanding amounts	2019-11-04 14:45:11 +05:30
prssanna	7e2b030052	fix: fix dashboard with date range	2019-11-04 13:07:27 +05:30
Ashish Shah	28710cdf99	fix: coupon code changes suggested by prasad (#19352 ) * changes suggested by prasad * codacy correction	2019-10-31 16:09:06 +05:30
Suraj Shetty	77e4cf89f8	fix: Pass parent_acc_name (#19450 )	2019-10-31 15:57:31 +05:30
Anurag Mishra	a11e738801	feat: Stock value and account balance sync. (#19233 ) * feat: Allow user to sync stock_value and account_balance jv if perpetual inventory is checked * fix(test): Sales Invoice * fix(test): Purchase Invoice * fix(test): Delivery Note * fix: more test_case * fix(test): Stock Entry * fix(test): Purchase Receipt * fix(more-test): Stock Entries * fix(more-test): Sales Invoice and Delivery Note * fix: tests for delivery note * fix: tests for stock reconciliation * refactor: stock and account balance function * fix(more-test): Warehouse * fix(test): Landed Cost Voucher * fix: changes requested	2019-10-31 15:55:03 +05:30
rohitwaghchaure	3270ba6d8c	Merge pull request #19421 from rohitwaghchaure/account_not_set_for_dasboard_chart_v12 fix: 'NoneType' object is not iterable	2019-10-29 11:30:22 +05:30
Anurag Mishra	07b908c0c5	patch: Missing Patch for item Tax template	2019-10-28 16:00:24 +05:30
Rohit Waghchaure	8916916a03	fix: 'NoneType' object is not iterable	2019-10-28 13:00:18 +05:30
Jai Chavan	9f483c1fa9	fix: Spelling of Variance	2019-10-26 18:45:01 +05:30
Pranav Nachnekar	d5166861de	fix:setting incorrect field for party bank account Previously ![wrong](https://user-images.githubusercontent.com/6195660/67369702-0671c000-f569-11e9-9916-a1d1a0c3ddd1.gif) Corrected ![corrected](https://user-images.githubusercontent.com/6195660/67369663-f9ed6780-f568-11e9-859b-cbfa9857b39e.gif)	2019-10-23 07:46:00 +00:00
Saurabh	48eff90d1f	fix: Don't show make jv button if equity or liability account and asset account not specified (#19350 )	2019-10-21 16:03:28 +05:30
Nabin Hait	f2d37a7280	fix: Removed inter-company account filter for inter-company journal entry (#19308 )	2019-10-21 13:36:47 +05:30
Nabin Hait	8232bd01d6	fix: Positive qty in sales return print (#19310 )	2019-10-21 13:36:26 +05:30
deepeshgarg007	737ec6b26e	fix: Travis	2019-10-20 17:36:36 +05:30
Rohit Waghchaure	66072fec5a	fixed conflicts	2019-10-15 14:18:59 +05:30
ashish-greycube	cf24191fe5	feat: affiliate sales partner referral code and coupon code	2019-10-15 11:44:45 +05:30
ashish-greycube	74dc3c99de	feat: coupon_code and referral_sales_partner functionality	2019-10-15 11:44:45 +05:30
Saqib	66762380ed	fixes: internal issues (#19201 ) * fix: Delivery Trip now has editable start address. * fix: default party type not set in Journal Entry * fix: maintainence visit purpose table not fetching item name * fix: maintainence visit purpose table not fetching item name	2019-10-11 11:09:10 +05:30
Mangesh-Khairnar	1d781f13b2	fix: fetch allocated amount for individual invoice (#19259 )	2019-10-11 11:06:11 +05:30
Deepesh Garg	2d064ee67a	fix: Remove bold property from disable checkbox (#19280 )	2019-10-11 10:43:38 +05:30
Kenneth Sequeira	a54b7542f1	fix: sales invoice labels (#19267 )	2019-10-10 18:50:39 +05:30
Faris Ansari	38ac7f7350	Enhancements to Supplier Portal (#19221 ) * fix: Add Purchase Order to portal * fix: Create Customer or Supplier on first login Based on default role set in Portal Settings, a Customer or Supplier will be created when the user logs in for the first time. * fix: Styling for transaction_row * fix: Styling for RFQ page * fix: Add Purchase Invoice route - Make Purchase Invoice from PO * fix: minor - Admissions for Student role - Remove print statement	2019-10-09 11:41:33 +05:30
Deepesh Garg	41a6548acb	fix: Label and dependes on fixes in Bank Account (#19245 )	2019-10-04 16:22:00 +05:30
Deepesh Garg	894604201b	Merge pull request #19242 from thefalconx33/git-issues fix: ‘EmployeeAdvance’ object has no attribute ‘conversion_rate’	2019-10-03 22:39:04 +05:30
thefalconx33	4723da0251	fix: #19239	2019-10-03 13:06:43 +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
Deepesh Garg	91aa671a23	Merge pull request #19137 from marination/invoice-discounting fix: Outstanding Amount field of Discounted Invoices Table in Invoice Discounting	2019-09-30 12:43:09 +05:30
Deepesh Garg	296bf9ef42	chore: Add standard chart of accounts template for El Salvador (#19151 ) * chore: Add standard chart of accounts template for El Salvador * fix: Renane template file	2019-09-30 11:02:49 +05:30
Rohan	e19e16fbf1	fix: remove internal fields from print (#19101 )	2019-09-30 10:54:01 +05:30
Nabin Hait	2a10b02c68	Merge branch 'develop' into invoice-discounting	2019-09-30 10:10:50 +05:30
Himanshu	25ab1e41df	fix(Contact): mobile_no re-introduced and travis fixes (#19009 ) * fix: mobile_no re-introduced * fix: test cases * fix: set email as primary * fix: add primary email and phone * fix: utils for contact creation * chore: remove = from dict	2019-09-30 10:08:15 +05:30
Nabin Hait	001edb4464	refactor: Reposting utility of Stock ledger (#19155 )	2019-09-26 16:44:35 +05:30
sahil28297	a9ff4f6688	fix(Report): Sales Register	2019-09-26 13:58:00 +05:30
Marica	54becbb33a	fix: Codacy fix(whitespaces)	2019-09-26 11:24:34 +05:30
marination	a877115ff4	fix: Minor changes Added value in fetch from and removed client side code	2019-09-26 11:08:39 +05:30
marination	e7f67592a8	fix: Made outstanding amount field read only and added validation Made the field editable so that outstanding amount can be adjusted	2019-09-26 10:58:02 +05:30
marination	ed004018d6	fix: Outstanding Amount field of Discounted Invoices Table in Invoice Discounting It wrongly fetched grand total from sales invoice instead of outstanding amount.	2019-09-26 10:58:02 +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
Rucha Mahabal	824376a045	fix(Journal Entry): Opening Entry not fetching accounts (#19148 )	2019-09-24 19:13:55 +05:30
Deepesh Garg	d9e9d562f8	fix: Travis (develop) (#19140 ) * fix: Travis * fix: Syntax Error	2019-09-24 11:44:52 +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
Mangesh-Khairnar	a44e8afe71	feat: add bank account in payroll entry (#19021 ) * fix(journal-entry): change fieldname from bank account no to bank account * fix: add payroll entry in bank dashboard * fix: fetch account from bank account * fix: minor changes * patch: check for bank account no column before updating * fix: use rename field function	2019-09-20 18:19:47 +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
rohitwaghchaure	ad5fc07652	Merge pull request #19084 from rohitwaghchaure/offline_pos_currency_conversion_issue_for_v11 fix: plc conversion issue for offline pos	2019-09-17 13:24:41 +05:30
Rohit Waghchaure	094612dc02	fix: plc conversion issue for offline pos	2019-09-17 13:04:28 +05:30
Deepesh Garg	c5c3860c5c	fix: Mandatory accounting dimensions while creating asset depreciation entry (#19073 ) * fix: Mandatory accounting dimensions while creating asset depreciation entry * fix: Consider account types while assigning accounting dimensions	2019-09-17 12:50:28 +05:30
rohitwaghchaure	6de526ff42	fix: not able to change the account type in parent company account head (#19083 )	2019-09-17 12:49:52 +05:30
Nabin Hait	b50b5095ad	fix: Added field disabled instead of enabled in cost center (#19065 )	2019-09-16 19:44:37 +05:30
Mangesh-Khairnar	dce04b7335	fix: filter for payment order (#19070 )	2019-09-16 19:40:27 +05:30
Sammish Thundiyil	a2a9b39794	modified: erpnext/accounts/doctype/account/account.json (#19032 )	2019-09-16 13:29:25 +05:30
Nabin Hait	c2a9b14c96	fix: Invalid reference doctypes for accounting dimensions (#19027 ) * fix: Invalid reference doctypes for accounting dimensions * fix: Add server side validation for accounting doctypes * fix: set fieldname and label before insert	2019-09-16 13:26:37 +05:30
rohitwaghchaure	87000977d5	Merge pull request #19061 from rohitwaghchaure/user_can_edit_rate_and_discount_in_offline_pos_develop fix: user can able to change rate and discount even if they don't have permissions	2019-09-16 11:50:52 +05:30
Rohit Waghchaure	a9435cc6b0	fix: user can able to change rate and discount even if they don't have permission	2019-09-16 11:15:22 +05:30
rohitwaghchaure	4a323463f7	fix: for pos, paid amount has not considered the tax amount due to which outstanding amount showing for the pos invoices (#19039 )	2019-09-13 18:36:57 +05:30
Nabin Hait	93a9c08116	fix: Allocate payment amount in reference table on change of payment amount (#19041 )	2019-09-13 15:48:50 +05:30
Rucha Mahabal	72949e7f73	fix: share transfer validations for journal entry (#19018 ) * fix share transfer validations for journal entry * fix: share transfer test * fix: tests	2019-09-13 11:05:40 +05:30
Nabin Hait	a5dfe0725f	fix: payment against shareholder (#19019 )	2019-09-12 19:17:24 +05:30
Sammish Thundiyil	504e52ff46	refactor: cost center (#19011 ) * modified: erpnext/accounts/doctype/cost_center/cost_center.json * fix: removed unique property from cost_center_name	2019-09-12 13:48:41 +05:30
Nabin Hait	1d1858a8b0	Show draft future payments as well	2019-09-11 18:39:49 +05:30
Nabin Hait	ff09b412f4	feat: Allowed multiple payment requests against a reference document (#18988 )	2019-09-11 12:43:27 +05:30
Nabin Hait	a035428d43	fix: handling of key does not exists error	2019-09-10 14:51:02 +05:30
Sahil Khan	d2315e5c5c	Merge branch 'develop' into version-12	2019-09-10 14:38:39 +05:30
Sammish Thundiyil	bcda12f4bb	modified: erpnext/accounts/doctype/mode_of_payment/mode_of_payment.json (#18829 )	2019-09-10 14:11:02 +05:30
Anurag Mishra	89d3bc0b54	fix: sales invoice return print format overideing the meta default print format	2019-09-09 15:58:25 +05:30
Prssanna Desai	ddfbb07c3b	fix: fix accounts balance timeline dashboard chart source (#18942 ) * fix: fix accounts balance timeline dashboard chart source * fix: pass chart_name to get function instead of chart object	2019-09-06 15:38:06 +05:30
Nabin Hait	4ce38059ac	feat: Company wise credit limit	2019-09-06 14:33:10 +05:30
Marica	a93b665427	fix: Print Format 'Point of Sale' removed from Sales invoice Print Format List (#18937 ) 'Point of Sale' Print Format for offline POS ,now doesn't appear in the Print Format Labels List in Sales Invoice for v12.	2019-09-05 18:26:45 +05:30
Nabin Hait	b847731482	Merge branch 'feat-customer-credit-limit' of https://github.com/Mangesh-Khairnar/erpnext into Mangesh-Khairnar-feat-customer-credit-limit	2019-09-05 16:47:08 +05:30
Nabin Hait	b5bd91417d	fix: Print/PDF of AR/AP report after refactoring (#18931 )	2019-09-05 16:43:20 +05:30
Raffael Meyer	48d1463825	fix(CoA): SKR04 (#18820 ) - move debitors into receivables - move creditors into payables - rename "C - Verb." to "C-Verbindlichkeiten" for consitency - move "Erlösschmälerungen" into a root of type "Expense" - move "Erhaltene Boni" and "Erhaltene Rabatte" into a root of type "Income"	2019-09-05 15:15:28 +05:30
hendrik	c257ce82c5	Party accounts if don't have default company (#18771 ) Add check for get_default company	2019-09-05 15:14:09 +05:30
Nabin Hait	16a7ec95dc	fix: tax category is optional argument	2019-09-05 13:01:15 +05:30
Nabin Hait	b03fa8a441	Merge branch 'develop' into feat-customer-credit-limit	2019-09-05 12:34:34 +05:30
Nabin Hait	561a2e966e	Update accounts_receivable.py	2019-09-04 11:02:48 +05:30
rohitwaghchaure	a9b0c55bcb	Merge pull request #18914 from rohitwaghchaure/pos_search_item_not_working fix: offline pos item search not working	2019-09-04 06:02:34 +05:30
Rohit Waghchaure	93bad51659	fix: offline pos item search not working	2019-09-03 23:29:41 +05:30
Rucha Mahabal	1e2dc2c8f1	feat: Employee Incentive and Retention Bonus added in Salary Slip (Additional Salary) (#18647 ) * feat: employee incentive and retention bonus added in additional salary * fix: added salary component field, logic improved * fix: codacy review	2019-09-03 20:45:52 +05:30
Nabin Hait	1ab75db0ac	refactor: Accounts Receivable / Payable report (#18906 )	2019-09-03 16:07:46 +05:30
Nabin Hait	e85c320501	Merge branch 'develop' into feat-customer-credit-limit	2019-09-03 14:20:17 +05:30
Deepesh Garg	c174e4d01a	fix: Default message from Payment Gateway Account not fetching (#18848 )	2019-09-03 14:17:41 +05:30
Mangesh-Khairnar	4bcc221ee3	Merge branch 'develop' of https://github.com/frappe/erpnext into feat-customer-credit-limit	2019-09-02 23:18:56 +05:30
deepeshgarg007	402d82b4c5	fix: Remove delete_doc from tests	2019-09-02 14:37:18 +05:30
Himanshu Warekar	711d1acffd	fix: remove references of mobile_no	2019-09-02 13:31:10 +05:30
Himanshu Warekar	81472e4c08	Merge branch 'contacts-ref' of https://github.com/hrwx/erpnext into contacts-ref	2019-09-02 13:21:29 +05:30
Himanshu Warekar	b8f23c2657	fix: fix query for contacts	2019-09-02 13:20:27 +05:30
Suraj Shetty	4a8710ef75	Merge pull request #18611 from surajshetty3416/fix-paid-amount fix: Paid amount 0 while creating advanced payment entry	2019-09-02 08:38:34 +05:30
Mangesh-Khairnar	79525327f0	feat: bypass credit limit check	2019-08-29 19:50:23 +05:30
Nabin Hait	d8c262fd5c	fix: Translations of strings (#18825 )	2019-08-23 16:32:58 +05:30
Mangesh-Khairnar	fe579c2efd	fix: show a descriptive message on submission of duplicate account (#18486 ) * fix: show a descriptive message on submission of duplicate account * Update account.py	2019-08-23 16:31:20 +05:30
Mangesh-Khairnar	d94a389dd3	chore: remove unwanted code (#18645 )	2019-08-23 16:31:09 +05:30
Nabin Hait	6e7b9b5cb7	Update sales_invoice.py	2019-08-23 12:27:05 +05:30
Anurag Mishra	db88476f8b	feat: refactor invoice_discounting (#18629 ) * feat: refactor invoice_discountig * Update invoice_discounting.py * Update invoice_discounting.js	2019-08-23 11:27:00 +05:30
rohitwaghchaure	88ee7d8dbe	fix: POS Sync Issue (#18807 )	2019-08-23 11:13:58 +05:30

... 16 17 18 19 20 ...

6616 Commits