brotherton-erpnext

Author	SHA1	Message	Date
Afshan	42bc0a7db8	fix: documentation link for E Invoicing (#26684 )	2021-07-28 13:42:53 +05:30
Afshan	90c5cb0a31	fix: documentation link for E Invoicing (#26685 )	2021-07-28 13:42:33 +05:30
Afshan	868a6cb26d	fix: documentation link for E Invoicing (#26686 )	2021-07-28 13:42:13 +05:30
Deepesh Garg	9350249941	fix: Chnage fieldtype from data to check	2021-07-28 12:57:59 +05:30
rohitwaghchaure	36bf5c7ed4	Merge branch 'develop' into mr_allowance_feat	2021-07-28 11:52:57 +05:30
Deepesh Garg	1c9e516092	fix: GL Entries for discount amount with item qty greater than 1	2021-07-28 11:38:44 +05:30
Deepesh Garg	441adf763f	fix(minor): Consider grand total for threshold check	2021-07-28 10:51:50 +05:30
Deepesh Garg	64af124f88	fix(minor): Consider grand total for threshold check	2021-07-28 10:43:02 +05:30
Frappe PR Bot	3a39c0f19a	fix: force reload of Opportunity in patch (#26668 ) (#26681 ) (cherry picked from commit `ac2e139d5b`) Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>	2021-07-28 00:19:32 +05:30
Raffael Meyer	ac2e139d5b	fix: force reload of Opportunity in patch (#26668 )	2021-07-28 00:14:59 +05:30
rohitwaghchaure	c1eb5a06a3	Merge pull request #26679 from rohitwaghchaure/removed-remarks-field-from-ar-ap-report-develop fix: removed Remarks column from AR/AP report	2021-07-27 22:23:40 +05:30
Rohit Waghchaure	5d121c41f3	fix: removed Remarks column from AR/AP report	2021-07-27 22:22:56 +05:30
rohitwaghchaure	69983eb8ff	Merge pull request #26678 from rohitwaghchaure/fixed-dict-object-has-no-attr-develop fix: not able to add employee in the job card	2021-07-27 22:22:10 +05:30
Rohit Waghchaure	7903aeca7e	fix: not able to add employee in the job card	2021-07-27 22:19:41 +05:30
Rohit Waghchaure	56b81565fa	fix: added progress bar in repost item valuation	2021-07-27 22:11:30 +05:30
Deepesh Garg	5a7fad8a6a	feat: Enhancements in TDS	2021-07-27 18:55:14 +05:30
rohitwaghchaure	965b1fe4a0	Merge pull request #26675 from rohitwaghchaure/fixed-dict-object-has-no-attr fix: not able to add employee in the job card	2021-07-27 18:47:45 +05:30
rohitwaghchaure	82d0cfc68e	Merge pull request #26676 from rohitwaghchaure/fixed-dict-object-has-no-attr-pre fix: not able to add employee in the job card	2021-07-27 18:46:59 +05:30
Rohit Waghchaure	940356d28a	fix: not able to add employee in the job card	2021-07-27 18:45:17 +05:30
Rohit Waghchaure	af58ac9e10	fix: not able to add employee in the job card	2021-07-27 18:43:20 +05:30
Nabin Hait	11a1610781	Merge pull request #26661 from deepeshgarg007/tds_enhancements feat: Enhancements in Tax Withholding Category	2021-07-27 18:26:00 +05:30
Frappe PR Bot	b122a1eaa0	fix: reload manufacturing setting before patch (#26641 ) (#26670 ) (cherry picked from commit `c8d7a8c781`) Co-authored-by: Ankush <ankush@iwebnotes.com>	2021-07-27 16:59:06 +05:30
Ankush	7a97b6d6a8	fix: reload manufacturing setting before patch (#26641 ) (cherry picked from commit `c8d7a8c781`)	2021-07-27 11:19:33 +00:00
Anupam	ee1089ca4f	Merge branch 'develop' of https://github.com/frappe/erpnext into campaign-module	2021-07-27 16:49:24 +05:30
Anupam	f1c697ca75	fix: sider issue	2021-07-27 16:49:04 +05:30
Deepesh Garg	9d8efbe1db	Merge pull request #26651 from deepeshgarg007/exchange_rate_reval_fixes_v13_pre_release fix: Exchange rate revaluation posting date and precision fixes	2021-07-27 16:41:59 +05:30
Deepesh Garg	f28595cad0	Merge pull request #26650 from deepeshgarg007/exchange_rate_reval_fixes_v13 fix: Exchange rate revaluation posting date and precision fixes	2021-07-27 16:41:23 +05:30
Deepesh Garg	3ee61af676	Merge pull request #26628 from deepeshgarg007/exchange_rate_reval_fixes fix: Exchange rate revaluation posting date and precision fixes	2021-07-27 16:41:04 +05:30
Ankush	c8d7a8c781	fix: reload manufacturing setting before patch (#26641 )	2021-07-27 16:39:38 +05:30
Ankush Menat	dfdd1c6e02	feat: don't recompute taxes	2021-07-27 14:49:44 +05:30
Rohit Waghchaure	6b482ebb0f	fix: serial no and batch validation	2021-07-27 13:42:37 +05:30
Deepesh Garg	6e6823c3aa	feat: Enhancements in TDS	2021-07-27 10:59:25 +05:30
Deepesh Garg	2dbfb932b4	Merge pull request #26618 from nemesis189/supplier-invoice-importer-fix fix: Supplier invoice importer fix	2021-07-27 10:27:07 +05:30
Anuja Pawar	9302e0b6c5	Merge branch 'develop' into sa-vat-report	2021-07-27 10:18:53 +05:30
Deepesh Garg	831ce88d1c	Merge pull request #26643 from nemesis189/ignore-mandatory-in-payment-reconcilitation-pre-release fix:Ignore mandatory fields while creating payment reconciliation Journal Entry	2021-07-27 10:16:04 +05:30
Deepesh Garg	3fae0db8d9	Merge pull request #26550 from nemesis189/ignore-mandatory-in-payment-reconcilitation-v13 fix: Ignore mandatory fields while creating payment reconciliation Journal Entry	2021-07-27 10:15:39 +05:30
Deepesh Garg	af84ce9216	Merge pull request #26647 from deepeshgarg007/gst_sales_register_fix_v13 fix(India): Default value for export type	2021-07-27 10:12:33 +05:30
Deepesh Garg	2922fb52cc	Merge pull request #26616 from deepeshgarg007/gst_sales_register_fix fix(India): Default value for export type	2021-07-27 10:12:02 +05:30
Anupam Kumar	34353df48c	fix: sales pipeline graph issue (#26626 )	2021-07-27 09:47:44 +05:30
Jannat Patel	6c48a2ed79	fix: Removed set_status after cancel from Expense Claim and Employee Advance (#25901 ) * fix: removed set_status after cancel from hr doctypes * fix: semgrep on_submit issue * fix: sider * fix: spaces * fix: update flag for db_set	2021-07-27 09:41:55 +05:30
Jannat Patel	ae9d1d9617	fix: Salary component account filter (#26604 ) * fix: salary component account filter * fix: cleanup	2021-07-27 09:40:12 +05:30
Jannat Patel	aaea5edbdb	fix: Salary component account filter (#26605 ) * fix: salary component account filter * fix: cleanup	2021-07-27 09:39:33 +05:30
Ankush Menat	03a6c38f06	test: fix test due to rename change	2021-07-26 22:24:25 +05:30
marination	77f9f048b6	chore: test case for missing default warehouse on mapping	2021-07-26 21:33:17 +05:30
Marica	a4bafe2dbf	Merge branch 'develop' into pi-expense-account	2021-07-26 20:15:20 +05:30
marination	5c82af50f9	fix: Set Expense account from warehouse only if warehouse exists	2021-07-26 19:41:53 +05:30
Deepesh Garg	1b6c75bbb1	Merge pull request #26642 from deepeshgarg007/gstr_3b_missing_cess_develop fix: Add missing cess amount in GSTR-3B report	2021-07-26 19:21:29 +05:30
Deepesh Garg	61d014d249	Merge pull request #26644 from deepeshgarg007/gstr_3b_missing_cess_v13 fix: Add missing cess amount in GSTR-3B report	2021-07-26 19:20:50 +05:30
Deepesh Garg	23776600f3	Merge pull request #26544 from deepeshgarg007/gstr_3b_missing_cess fix: Add missing cess amount in GSTR-3B report	2021-07-26 19:20:42 +05:30
Deepesh Garg	8a6aa0d788	Merge pull request #26645 from deepeshgarg007/gst_reports_timeout_develop fix: GST Reports timeout issue	2021-07-26 19:20:12 +05:30
Deepesh Garg	6330318381	Merge pull request #26575 from deepeshgarg007/gst_reports_timeout fix: GST Reports timeout issue	2021-07-26 19:19:16 +05:30
Deepesh Garg	3fcc5e3134	fix: Convert null values to empty string on grouping	2021-07-26 19:09:09 +05:30
Deepesh Garg	19a0ca1980	fix: Ignore GL Entry on cancel	2021-07-26 19:08:56 +05:30
Deepesh Garg	356a55258e	fix: Exchange rate revaluation posting date and precision fixes	2021-07-26 19:08:45 +05:30
Deepesh Garg	dc2cd35b93	fix: Convert null values to empty string on grouping	2021-07-26 19:07:02 +05:30
Deepesh Garg	5749e52bf6	fix: Ignore GL Entry on cancel	2021-07-26 19:06:51 +05:30
Deepesh Garg	fb72df7dce	fix: Exchange rate revaluation posting date and precision fixes	2021-07-26 19:06:40 +05:30
Deepesh Garg	b23315a7e6	Merge branch 'develop' into exchange_rate_reval_fixes	2021-07-26 19:05:44 +05:30
Deepesh Garg	8d52a22709	fix: Additional discount calculations in Invoices (#26553 ) * fix: Additional discount calculations in Invoices * revert: Client side handling for Dynamic GST Rates * fix: Add update item tax template method back * fix: Revert refresh field * fix: add company change trigger	2021-07-26 19:00:57 +05:30
Deepesh Garg	cba847b051	fix: Test case for GSTR-3b report	2021-07-26 18:46:27 +05:30
Deepesh Garg	a661667e2a	fix(India): Default value for export type	2021-07-26 18:46:14 +05:30
Deepesh Garg	d066eab6cd	fix: Test case for GSTR-3b report	2021-07-26 18:38:50 +05:30
Noah Jacob	ba18a96b0c	test: test case for over transfer of materials	2021-07-26 18:12:40 +05:30
Noah Jacob	bc82344fc7	feat: over transfer allowance for material transfers	2021-07-26 18:12:37 +05:30
Anuja Pawar	abc63cffa8	fix: suggested changes	2021-07-26 18:11:38 +05:30
Deepesh Garg	0011585415	Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into gst_sales_register_fix	2021-07-26 17:21:13 +05:30
Deepesh Garg	5fe7d80a64	fix: GST Reports timeout issue	2021-07-26 17:13:28 +05:30
Deepesh Garg	19589b1e21	fix: GST Reports timeout issue	2021-07-26 17:05:48 +05:30
Deepesh Garg	c468e4a93d	fix: Add missing cess amount in GSTR-3B report	2021-07-26 16:58:07 +05:30
Deepesh Garg	00fd319531	fix: Add missing cess amount in GSTR-3B report	2021-07-26 16:52:54 +05:30
Subin Tom	50b76d04bf	fix:Ignore mandatory fields while creating payment reconciliation Journal Entry	2021-07-26 16:52:05 +05:30
Deepesh Garg	4e0664b548	Merge branch 'develop' into supplier-invoice-importer-fix	2021-07-26 16:48:11 +05:30
Subin Tom	ed68f11a46	fix: Supplier invoice importer fix pre release (#26636 ) * fix: Supplier Invoice Importer fix Co-authored-by: Subin Tom <subin-home@Subins-MacBook-Air.local>	2021-07-26 16:47:36 +05:30
Subin Tom	06fb0b93b5	fix: Supplier invoice importer fix v13 (#26633 ) * fix: Supplier Invoice Importer fix Co-authored-by: Subin Tom <subin-home@Subins-MacBook-Air.local>	2021-07-26 16:46:47 +05:30
Noah Jacob	64454a5dc8	fix: included company in Link Document Type filters for contact (#26576 ) (cherry picked from commit `cbddedab7b`)	2021-07-26 07:32:43 +00:00
Frappe PR Bot	4209b3bda9	fix: included company in Link Document Type filters for contact (#26576 ) (#26634 ) (cherry picked from commit `cbddedab7b`) Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>	2021-07-26 13:00:32 +05:30
Noah Jacob	cbddedab7b	fix: included company in Link Document Type filters for contact (#26576 )	2021-07-26 12:54:35 +05:30
Rohit Waghchaure	60a0b7fe77	Merge branch 'version-13-hotfix' into 'version-13-pre-release-13-8'	2021-07-26 11:34:57 +05:30
Rucha Mahabal	c676eaae57	fix: test	2021-07-25 23:11:18 +05:30
Rucha Mahabal	6bca87ddb9	fix: remove unnecessary imports	2021-07-25 21:34:51 +05:30
Deepesh Garg	67273b9551	fix: Convert null values to empty string on grouping	2021-07-25 21:26:22 +05:30
Rucha Mahabal	475d856d66	fix(style): longer titles overflowing	2021-07-25 20:39:51 +05:30
Rucha Mahabal	37198159aa	feat: Export chart option in desktop view	2021-07-25 20:28:01 +05:30
Deepesh Garg	a8bf61c14e	Merge branch 'develop' of https://github.com/frappe/erpnext into exchange_rate_reval_fixes	2021-07-25 19:58:04 +05:30
Deepesh Garg	c485d5c3b7	fix: Ignore GL Entry on cancel	2021-07-25 19:46:50 +05:30
Deepesh Garg	f4701c174a	fix: Exchange rate revaluation posting date and precision fixes	2021-07-25 19:46:20 +05:30
Ankush	cd12d95a24	fix: incorrect amount in work order required items table. (#26585 ) * fix: amount in work order not equal to rate * qty * fix: patch for amount in work order required items	2021-07-25 13:10:50 +05:30
Ankush	96caae1f56	fix: wrong operation time in Work Order (#26613 ) (#26617 ) * fix: wrong operation time in Work Order Top level item time operation was not considering the BOM.quantity Co-authored-by: Ankush Menat <ankush@iwebnotes.com> Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>	2021-07-25 13:01:21 +05:30
Rucha Mahabal	017ed3f5c1	fix: employee status server-side validation (#26615 )	2021-07-24 00:08:02 +05:30
rohitwaghchaure	9052a3b1a8	Merge pull request #26614 from rohitwaghchaure/fixed-serial-no-not-link-to-batch-error fix: serial no and batch validation	2021-07-23 23:38:02 +05:30
Subin Tom	fac88a3329	fix: Supplier Invoice Importer fix	2021-07-23 21:23:48 +05:30
Subin Tom	2fc39fcade	Merge branch 'develop' of https://github.com/frappe/erpnext into develop	2021-07-23 20:55:24 +05:30
rohitwaghchaure	9ef157b23b	fix: wrong operation time in Work Order (#26613 ) * fix: wrong operation time in Work Order Top level item time operation was not considering the BOM.quantity Co-authored-by: Ankush Menat <ankush@iwebnotes.com>	2021-07-23 20:44:34 +05:30
Deepesh Garg	328444b530	fix(India): Default value for export type	2021-07-23 20:28:02 +05:30
Anurag0911	4128aa7628	fix: syntax error (#26610 ) Removed "," at erpnext/public/js/controllers/taxes_and_totals.js:87	2021-07-23 16:52:42 +05:30
Rohit Waghchaure	45d506c489	fix: serial no and batch validation	2021-07-23 16:40:45 +05:30
GangaManoj	add2030553	fix: Sider issues	2021-07-23 03:58:27 +05:30
GangaManoj	aed39a23dc	fix: Rename tests	2021-07-23 03:45:59 +05:30
GangaManoj	13e7103ee0	fix: Add test to check if payment terms are fetched when creating a Purchase Invoice	2021-07-23 03:44:56 +05:30
GangaManoj	de6d960381	fix: Add test to check if payment terms are fetched when creating a Purchase Invoice	2021-07-23 03:36:37 +05:30
GangaManoj	9c07454f91	fix: Add test to check if payment terms are fetched when creating a Sales Invoice	2021-07-23 03:23:29 +05:30
GangaManoj	caa106b3bd	fix: Add test to check if payment terms are fetched when creating a Sales Invoice	2021-07-22 22:58:45 +05:30
Nabin Hait	595c7a6e61	fix: merge conflict	2021-07-22 17:11:20 +05:30
Nabin Hait	7551bcf421	bumped to version 13.7.1	2021-07-22 17:25:51 +05:50
rohitwaghchaure	ce3e877c40	fix: incorrect bom name (bp #26600 )	2021-07-22 16:10:58 +05:30
rohitwaghchaure	56c67743ab	fix: incorrect bom name (#26600 )	2021-07-22 16:10:06 +05:30
Ankush	5b32fa5ccd	fix: SQL error on fetching RM in production plan (bp #26592 ) * fix: SQL error on fetching RM in production plan * refactor: avoid passing by reference and mutations	2021-07-22 14:00:01 +05:30
Devin Slauenwhite	0d968fabfe	fix: missing parameter 'country'	2021-07-22 13:44:09 +05:30
marination	eecfc4c0ae	fix: Clean Serial No input on Server Side	2021-07-22 13:23:54 +05:30
Ankush	4ee6571784	fix: SQL error on fetching RM in production plan (#26592 ) * fix: SQL error on fetching RM in production plan * refactor: avoid passing by reference and mutations	2021-07-22 13:13:46 +05:30
Nabin Hait	13466bba90	Merge pull request #26588 from deepeshgarg007/tax_flow_fix_pre_release fix: Additional discount calculations in Invoices	2021-07-22 11:30:47 +05:30
Deepesh Garg	2ff0d3e0eb	fix: Test Cases	2021-07-22 10:43:16 +05:30
GangaManoj	4323f4bcac	fix: Modify set_payment_schedule() to include fetch_payment_terms_from_order()	2021-07-22 05:57:42 +05:30
Rucha Mahabal	1176761757	feat: Expand All nodes option in Desktop view	2021-07-21 23:19:47 +05:30
Deepesh Garg	9ab18b5341	fix: add company change trigger	2021-07-21 23:18:17 +05:30
Deepesh Garg	9fa92c912b	fix: Revert refresh field	2021-07-21 23:18:17 +05:30
Deepesh Garg	72eb72f66f	fix: Add update item tax template method back	2021-07-21 23:18:17 +05:30
Deepesh Garg	50b188214d	revert: Client side handling for Dynamic GST Rates	2021-07-21 23:18:17 +05:30
Deepesh Garg	f9da88cb15	fix: Additional discount calculations in Invoices	2021-07-21 23:17:56 +05:30
Deepesh Garg	c765073c2a	fix: Tests	2021-07-21 22:28:32 +05:30
Rohit Waghchaure	f3158ea448	fix: removed Remarks column from AR/AP report	2021-07-21 19:47:41 +05:30
rohitwaghchaure	ac6bfeaa8d	Merge pull request #26558 from rohitwaghchaure/fixed-incorrect-gross-profit-report fix: incorrect valuation rate calculation in gross profit report	2021-07-21 19:35:55 +05:30
Deepesh Garg	5a06019440	fix: GL For taxes if discount applied on Grand Total	2021-07-21 15:25:40 +05:30
Deepesh Garg	fc09d845c5	fix: Syntax Error	2021-07-21 15:25:09 +05:30
Deepesh Garg	55325ef3a3	Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into discount_accounting_v13	2021-07-21 14:27:05 +05:30
GangaManoj	4fa409e019	fix: Add mandatory_depends_on property for Discount Account	2021-07-21 14:26:52 +05:30
GangaManoj	45327e04db	fix: Tests	2021-07-21 14:26:52 +05:30
GangaManoj	1f6c05f013	fix: Make discount_account mandatory if discount accounting is enabled	2021-07-21 14:26:52 +05:30
GangaManoj	566e8f8499	fix: Create GL Entries for Additional Discount Account	2021-07-21 14:26:51 +05:30
Ganga Manoj	ed6ebdf5ed	fix: Filter for additional_discount_account Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>	2021-07-21 14:24:21 +05:30
Ganga Manoj	821b75f1b1	fix: Filter for additional_discount_account Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>	2021-07-21 14:24:21 +05:30
Ganga Manoj	f421dc7ca7	fix: GL Entry creation Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>	2021-07-21 14:24:21 +05:30
Ganga Manoj	e7e9bda123	fix: Use the item's project instead of the invoice's Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>	2021-07-21 14:24:21 +05:30
Ganga Manoj	b4a8bc8e4c	fix: Use the item's cost centre instead of the Invoice's Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>	2021-07-21 14:24:21 +05:30
GangaManoj	251f229601	fix: Add test for additional discount applied on taxes	2021-07-21 14:23:53 +05:30
GangaManoj	99cb89f449	fix: Switch debit and credit for ledger entries for discount applied on taxes for Purchase Invoice	2021-07-21 14:23:53 +05:30
GangaManoj	99652876d0	fix: Add test for additional discount applied on taxes	2021-07-21 14:23:53 +05:30
GangaManoj	d62af77ca8	fix: Remove unnecessary condition	2021-07-21 14:23:52 +05:30
GangaManoj	4da7c5882b	fix: Only display Additional Discount Account if Enable Discount Accounting is checked	2021-07-21 14:23:52 +05:30
GangaManoj	9dd2a9e897	fix: Create ledger entries for discount applied on taxes in make_tax_gl_entries	2021-07-21 14:23:52 +05:30
GangaManoj	ff25683378	fix: Filter options for Additional Discount Account	2021-07-21 14:23:52 +05:30
GangaManoj	03f2706971	fix: Add Additional Discount Account field	2021-07-21 14:23:52 +05:30
GangaManoj	d0d9e83ad2	fix: Check all expected GL Entries	2021-07-21 14:23:52 +05:30
GangaManoj	d6f409addc	fix: Sider issues	2021-07-21 14:23:52 +05:30
GangaManoj	38327fc177	fix: Make additional GL Entries for discount applied on taxes	2021-07-21 14:23:52 +05:30
GangaManoj	b64787ee9c	fix: Only display Additional Discount Account if Enable Discount Accounting is checked	2021-07-21 14:23:52 +05:30
GangaManoj	c1d65cfa8d	fix: Filter options for Additional Discount Account	2021-07-21 14:23:52 +05:30
GangaManoj	9e788cfdcd	fix: Add Additional Discount Account field	2021-07-21 14:23:52 +05:30
GangaManoj	38e87fce09	fix: Add tests for discount accounting	2021-07-21 14:23:51 +05:30
GangaManoj	fd2852e87e	fix: Create common function for discount accounting	2021-07-21 14:23:15 +05:30
GangaManoj	e06eb8e6a9	fix: Filter options for Discount Account	2021-07-21 14:22:26 +05:30
GangaManoj	377775ad8e	fix: Copy Discount Account from first row	2021-07-21 14:22:25 +05:30
GangaManoj	e2c83c3baf	fix: Display Discount Account only if Enable Discount Accounting is checked	2021-07-21 14:21:32 +05:30
GangaManoj	bde5c619db	fix: Add Discount Account field	2021-07-21 14:21:31 +05:30
GangaManoj	ee025b501f	fix: Filter options for Default Discount Account	2021-07-21 14:21:16 +05:30
GangaManoj	546c8d125c	fix: Move Default Discount Account field to Item Defaults	2021-07-21 14:21:16 +05:30
GangaManoj	613d08faad	fix: Copy discount account from first row to all Items	2021-07-21 14:21:15 +05:30
GangaManoj	cfb94175a2	fix: Filter Discount Account list	2021-07-21 14:20:32 +05:30
GangaManoj	d24b5f707a	fix: Add description for Enable Discount Accounting checkbox	2021-07-21 14:20:32 +05:30
GangaManoj	f48fa2e7f3	feat: Toggle display for discount accounting fields according to enable_discount_accounting	2021-07-21 14:20:06 +05:30
GangaManoj	cdfefa261e	feat: Assign Item's Default Discount Account if present	2021-07-21 14:20:06 +05:30
GangaManoj	acb9e207ec	feat: Add Default Discount Account field	2021-07-21 14:20:06 +05:30
GangaManoj	c4e5429560	feat: Filter list for Discount Account field in Items table	2021-07-21 14:20:06 +05:30
GangaManoj	f6a9374356	feat: Create GL Entries for discount accounting	2021-07-21 14:20:06 +05:30
GangaManoj	a6690a8a3d	feat(Sales Invoice): Add 'Discount Account' field in Items table	2021-07-21 14:20:06 +05:30
GangaManoj	e1dc6980d0	feat(Accounts Settings): Add 'Enable Discount Accounting' checkbox	2021-07-21 14:20:06 +05:30
Deepesh Garg	8a64a84d1a	fix: GST Reports timeout issue	2021-07-21 13:25:53 +05:30
rohitwaghchaure	6fbb2d3507	Merge pull request #26504 from 18alantom/fix-ig-portal-field-filter fix: check if field_filters is None	2021-07-21 11:28:14 +05:30
rohitwaghchaure	f60cba28ab	Merge pull request #26506 from 18alantom/bp-fix-ig-portal-field-filter fix: check if field_filters is None	2021-07-21 11:28:06 +05:30
Deepesh Garg	3e109840f9	Merge pull request #26464 from nemesis189/added-dispatch-address-to-sales feat: Added dispatch address fields in Sales Ord, Sales Inv, Delivery Note for Eway Bill	2021-07-21 10:52:10 +05:30
Rucha Mahabal	57514f7b1d	feat(Non Profit): API Endpoint to update halted Razorpay subscriptions (#26427 ) (#26564 ) * feat: Update Subscription Activated field to Subscription Status to accomodate Halted status * feat: API Endpoint to halt Razorpay subscription * fix: sider * fix: validation message * test: halted razorpay subscription	2021-07-21 00:46:34 +05:30
Rucha Mahabal	a758071532	feat(Non Profit): API Endpoint to update halted Razorpay subscriptions (#26427 ) * feat: Update Subscription Activated field to Subscription Status to accomodate Halted status * feat: API Endpoint to halt Razorpay subscription * fix: sider * fix: validation message * test: halted razorpay subscription	2021-07-21 00:24:09 +05:30
GangaManoj	46bed5e6cc	fix: Add mandatory_depends_on property for Discount Account	2021-07-20 22:03:44 +05:30
Subin Tom	013b352639	fix: Price list rate not fetched for return sales invoice fixed (#26559 ) Co-authored-by: Subin Tom <subin-home@Subins-MacBook-Air.local> Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>	2021-07-20 21:03:11 +05:30
Ganga Manoj	41705acbd9	fix: delete child docs when parent doc is deleted (#26518 ) * fix: Make code more readable * fix: Delete child table info when parent doc is deleted * fix: Sider issues * fix: Remove trailing whitespace	2021-07-20 20:48:57 +05:30
Subin Tom	2d225e621f	fix: Price list rate not fetched for return sales invoice fixed (#26560 ) Co-authored-by: Subin Tom <subin-home@Subins-MacBook-Air.local>	2021-07-20 20:41:04 +05:30
Rohit Waghchaure	c14aa45720	fix: incorrect valuation rate calculation in gross profit report	2021-07-20 18:19:15 +05:30
Rucha Mahabal	99de84ebe1	Merge branch 'develop' into fix-employee-onboarding-status	2021-07-20 12:22:10 +05:30
Suraj Shetty	85c8daae9c	fix: Pass doc and other parameters to properly prefill information - while creating customer from form dashboard	2021-07-20 10:24:14 +05:30
Suraj Shetty	c077314568	fix: Pass doc and other parameters to properly prefill information - while creating customer from form dashboard	2021-07-20 09:57:18 +05:30
GangaManoj	82d147ea62	fix: Tests	2021-07-20 05:16:33 +05:30
GangaManoj	59ee6958aa	fix: Make discount_account mandatory if discount accounting is enabled	2021-07-20 03:52:39 +05:30
GangaManoj	4105e27138	fix: Create GL Entries for Additional Discount Account	2021-07-20 03:46:02 +05:30
Ganga Manoj	1d830dfd92	fix: Filter for additional_discount_account Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>	2021-07-19 23:47:58 +05:30
Ganga Manoj	8fc9c13734	fix: Filter for additional_discount_account Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>	2021-07-19 23:46:38 +05:30
Ganga Manoj	0ea2934cd5	fix: GL Entry creation Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>	2021-07-19 23:44:55 +05:30
Ganga Manoj	63b7ecd0fe	fix: Use the item's project instead of the invoice's Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>	2021-07-19 23:44:21 +05:30
Ganga Manoj	980798c6fd	fix: Use the item's cost centre instead of the Invoice's Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>	2021-07-19 23:43:36 +05:30
Rucha Mahabal	89c5bb6066	fix: tests	2021-07-19 22:19:28 +05:30
Ankush	92273cade0	fix(ux): item description should fall back to name (#26339 ) (#26552 ) Don't set item description = item code from front end. This is already being set to item_name in before_insert and item_name is better fallback than item code for description. Also fixed wrong condition for erasing description while duplicating item.	2021-07-19 20:44:05 +05:30
Ankush	80e269887d	fix(ux): item description should fall back to name (#26339 ) Don't set item description = item code from front end. This is already being set to item_name in before_insert and item_name is better fallback than item code for description. Also fixed wrong condition for erasing description while duplicating item.	2021-07-19 20:42:44 +05:30
Anuja Pawar	ba31e3695f	Merge branch 'develop' into sa-vat-report	2021-07-19 20:40:25 +05:30
Subin Tom	ff9d631f15	fix:Ignore mandatory fields while creating payment reconciliation Journal Entry	2021-07-19 20:28:34 +05:30
Subin Tom	b24a149dbc	test: Updated test case for Eway bill	2021-07-19 14:37:12 +05:30
Deepesh Garg	cad1170782	fix: Add missing cess amount in GSTR-3B report	2021-07-19 14:36:54 +05:30
Deepesh Garg	2686d04800	fix: Typo and remove duplicate function	2021-07-18 17:54:35 +05:30
Anuja Pawar	2bbf48e835	Merge branch 'develop' into sa-vat-report	2021-07-18 11:13:25 +05:30
Devin Slauenwhite	d5ff636159	fix: missing parameter 'country'	2021-07-17 14:42:38 -04:00
GangaManoj	831f5edd02	fix: Remove unused imports	2021-07-17 22:55:24 +05:30
GangaManoj	cde0cc0678	fix: Fetch Payment Terms from Sales/Purchase Orders	2021-07-17 22:53:21 +05:30
Ganga Manoj	bfb7256143	Merge branch 'develop' into enable-discount-accounting	2021-07-17 20:01:09 +05:30
GangaManoj	d6956ff075	fix: Add test for additional discount applied on taxes	2021-07-17 19:49:42 +05:30
GangaManoj	228499369c	fix: Switch debit and credit for ledger entries for discount applied on taxes for Purchase Invoice	2021-07-17 19:49:16 +05:30
GangaManoj	99551e9b7f	fix: Add test for additional discount applied on taxes	2021-07-17 18:45:21 +05:30
GangaManoj	c4d2dc0da3	fix: Remove unnecessary condition	2021-07-17 17:47:20 +05:30
GangaManoj	c2ba6897b0	fix: Only display Additional Discount Account if Enable Discount Accounting is checked	2021-07-17 17:45:35 +05:30
GangaManoj	fa4c03e7a1	fix: Create ledger entries for discount applied on taxes in make_tax_gl_entries	2021-07-17 17:42:36 +05:30
GangaManoj	7bbc9a886d	fix: Filter options for Additional Discount Account	2021-07-17 17:41:06 +05:30
GangaManoj	87d448e039	fix: Add Additional Discount Account field	2021-07-17 17:40:43 +05:30
GangaManoj	b0f21824bc	fix: Check all expected GL Entries	2021-07-17 17:34:50 +05:30
Nabin Hait	11475487fb	fix: merge conflict	2021-07-16 15:58:50 +05:30
Nabin Hait	e079a1bb33	bumped to version 13.7.0	2021-07-16 15:41:33 +05:50
Rohit Waghchaure	56e4a88956	fix: added patch to fix missing FG item	2021-07-16 15:06:57 +05:30
Nabin Hait	9ddf33715e	Merge pull request #26513 from rohitwaghchaure/patch-to-fix-missing-fg-item fix: added patch to fix missing FG item	2021-07-16 15:05:23 +05:30
Noah Jacob	3362c080b6	fix: validation check when no conversion_factor (#26527 )	2021-07-16 15:00:08 +05:30
Rohit Waghchaure	13e9aa5956	fix: added patch to fix missing FG item	2021-07-16 14:34:24 +05:30
Rohit Waghchaure	0c6ca09e06	fix: added patch to fix missing FG item	2021-07-16 14:33:25 +05:30
Nabin Hait	f6d6897f34	Merge pull request #26525 from nabinhait/change-log-v13-7-0 chore: Added change log for v13.7.0	2021-07-16 13:09:31 +05:30
Nabin Hait	a0df79ee8c	chore: Added change log for v13.7.0	2021-07-16 13:07:39 +05:30
Rohit Waghchaure	df5c2b9aaf	fix: FG item not fetched in manufacture entry	2021-07-16 11:35:14 +05:30
GangaManoj	56cdcebbf4	fix: Sider issues	2021-07-16 02:23:55 +05:30
GangaManoj	6bff653cf0	fix: Sider issues	2021-07-16 02:18:45 +05:30
GangaManoj	857501cbe1	fix: Make additional GL Entries for discount applied on taxes	2021-07-15 22:03:46 +05:30
GangaManoj	40412f7e61	fix: Only display Additional Discount Account if Enable Discount Accounting is checked	2021-07-15 22:02:43 +05:30
GangaManoj	8e96e2d5a2	fix: Filter options for Additional Discount Account	2021-07-15 22:01:38 +05:30
GangaManoj	4f2bf98966	fix: Add Additional Discount Account field	2021-07-15 22:01:02 +05:30
Rucha Mahabal	8961a267f6	fix: sider	2021-07-15 19:32:15 +05:30
Rucha Mahabal	ee7eaf9c70	test: UI tests for org chart mobile fix(mobile): detach node before emptying hierarchy fix(mobile): sibling group not rendering for first level	2021-07-15 19:19:09 +05:30
Rohit Waghchaure	a748dd9261	feat: provision to make subcontracted purchase order from the production plan	2021-07-15 19:01:36 +05:30
Noah Jacob	d8668f78f4	fix: validation check when no conversion_factor (#26219 )	2021-07-15 18:32:15 +05:30
Afshan	9b9b18c286	fix: improving ux for additional discount field (#26502 )	2021-07-15 18:11:22 +05:30
Afshan	c66277e06b	fix: improving ux for additional discount field (#26495 )	2021-07-15 18:10:17 +05:30
Noah Jacob	26a9d38547	fix: WIP needs to be set before submit on skip_transfer (#26500 )	2021-07-15 16:50:41 +05:30
Noah Jacob	d319e10883	fix: set default operation time to 0 (#26511 )	2021-07-15 16:49:55 +05:30
Noah Jacob	6442b5df11	fix: set default operation time to 0 (#26510 )	2021-07-15 16:47:50 +05:30
Noah Jacob	2f775ee53c	fix: WIP needs to be set before submit on skip_transfer (#26507 )	2021-07-15 16:29:28 +05:30
Rohit Waghchaure	9997cce1ea	fix: FG item not fetched in manufacture entry	2021-07-15 15:32:21 +05:30
rohitwaghchaure	4d444559ff	Merge pull request #26508 from rohitwaghchaure/fixed-fg-items-not-added-for-batch-item fix: FG item not fetched in manufacture entry	2021-07-15 15:32:05 +05:30
Noah Jacob	eeecb25a02	fix: WIP needs to be set before submit on skip_transfer (#26499 )	2021-07-15 15:31:42 +05:30
Rohit Waghchaure	74b97b5ec9	fix: FG item not fetched in manufacture entry	2021-07-15 14:52:21 +05:30
Deepesh Garg	cc73e7d6fa	Merge pull request #26472 from deepeshgarg007/payment_entry_taxes_unallocated_amount_v13 fix: Unallocated amount in Payment Entry after taxes	2021-07-15 12:38:45 +05:30
Deepesh Garg	5ad759897f	Merge pull request #26471 from deepeshgarg007/payment_entry_taxes_unallocated_amount fix: Unallocated amount in Payment Entry after taxes	2021-07-15 12:38:32 +05:30
Deepesh Garg	1524e7f5ba	Merge pull request #26412 from deepeshgarg007/payment_entry_taxes_v12 fix: Unallocated amount in Payment Entry after taxes	2021-07-15 12:38:23 +05:30
Anuja Pawar	888d1f94ce	Merge branch 'develop' into sa-vat-report	2021-07-15 12:17:46 +05:30
18alantom	12f7befa13	fix: check if field_filters is None	2021-07-15 12:09:33 +05:30
18alantom	ca1169eeba	fix: check if field_filters is None	2021-07-15 12:03:41 +05:30
Rucha Mahabal	f004b404d1	test: UI tests for org chart desktop	2021-07-14 23:50:54 +05:30
marination	219623279f	fix: Paging buttons not working on item group portal page	2021-07-14 20:50:22 +05:30
marination	f40da4ac4c	fix: Paging buttons not working on item group portal page	2021-07-14 20:48:06 +05:30
Anuja Pawar	259947dae9	Merge branch 'develop' into sa-vat-report	2021-07-14 20:47:41 +05:30
Anuja Pawar	b43974a9a6	fix: more sider fixes	2021-07-14 20:37:48 +05:30
Marica	dbf835ced3	Merge branch 'develop' into paging-btns	2021-07-14 20:15:22 +05:30
marination	4c6e952902	fix: Paging buttons not working on item group portal page	2021-07-14 20:01:36 +05:30
Afshan	74d7baa80a	fix: filter by accounts with group by accounts (#26438 ) * fix: filter by accounts with group by accounts * fix: parsing json Co-authored-by: Saqib <nextchamp.saqib@gmail.com>	2021-07-14 19:59:11 +05:30
18alantom	9ea5072c52	fix: set item group as a persistent filter	2021-07-14 17:41:38 +05:30
18alantom	b24c0bfbf9	fix: show child item group items on portal	2021-07-14 17:41:32 +05:30
18alantom	e244560fb9	fix: set item group as a persistent filter	2021-07-14 17:40:10 +05:30
18alantom	7558e7f115	fix: show child item group items on portal	2021-07-14 17:40:04 +05:30
Marica	3f599b049c	Merge branch 'develop' into fix-item-group-portal-issues	2021-07-14 17:15:18 +05:30
Deepesh Garg	13fffeb97b	Merge pull request #26473 from deepeshgarg007/bootstrapped_gst_setup_develop feat(India): Bootstrapped GST Setup	2021-07-14 16:44:12 +05:30
Noah Jacob	03f4db0606	fix: validation check for batch for stock reconciliation type in stock entry(bp #26370 ) (#26488 ) * fix(ux): added filter for valid batch nos. * fix: not validating batch no if entry type stock reconciliation * test: validate batch_no	2021-07-14 16:28:54 +05:30
Noah Jacob	2c67894135	fix: validation check for batch for stock reconciliation type in stock entry(bp #26370 ) (#26487 ) * fix(ux): added filter for valid batch nos. * fix: not validating batch no if entry type stock reconciliation * test: validate batch_no	2021-07-14 16:28:40 +05:30
Noah Jacob	c932baeb32	fix: validation check for batch for stock reconciliation type in stock entry (#26370 ) * fix(ux): added filter for valid batch nos. * fix: not validating batch no if entry type stock reconciliation * test: validate batch_no	2021-07-14 16:25:42 +05:30
Kenneth Sequeira	513375f264	fix: Nested/Multi-level BOM help link (#26409 ) Updated the link for multi-level boms. Current link is broken.	2021-07-14 16:07:47 +05:30
Kenneth Sequeira	7a89033163	fix: update integration links in help.js (#26483 )	2021-07-14 16:07:31 +05:30
Kenneth Sequeira	24e08301bc	fix: update integration links in help.js (#26483 )	2021-07-14 16:02:49 +05:30
Saqib	72715956f1	fix: tds computation summary shows cancelled invoices (#26486 )	2021-07-14 15:56:20 +05:30
Anuja Pawar	c5d7a13513	fix: sider & translation fixes	2021-07-14 15:49:22 +05:30
18alantom	ddbf7c0020	fix: set item group as a persistent filter	2021-07-14 15:43:22 +05:30
Saqib	ac721ae147	fix: tds computation summary shows cancelled invoices (#26485 )	2021-07-14 15:20:14 +05:30
Anuja Pawar	b37ff0d3cf	fix: sider fixes	2021-07-14 15:06:56 +05:30
Jannat Patel	ccb52f19bc	fix: task status loop (#26006 ) Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2021-07-14 14:46:16 +05:30
Saqib	1c76154096	fix: tds computation summary shows cancelled invoices (#26456 )	2021-07-14 14:45:39 +05:30
Saqib	9c04079d04	fix: test fails due to improper gain loss account set (#26482 ) (#26484 )	2021-07-14 14:45:11 +05:30
Afshan	9168bb369a	fix: filter by accounts with group by accounts (#26439 )	2021-07-14 13:57:14 +05:30
Saqib	d86cdb4368	Merge branch 'develop' into payment_entry_taxes_unallocated_amount	2021-07-14 13:55:09 +05:30
Saqib	be773f4052	Merge branch 'develop' into bootstrapped_gst_setup_develop	2021-07-14 13:55:00 +05:30
Saqib	c978fdf3df	fix: test fails due to improper gain loss account set (#26482 )	2021-07-14 13:53:30 +05:30
Frappe	1dfb5eb535	feat: South Africa VAT report	2021-07-14 12:33:45 +05:30
Saqib	bb493a0602	Merge pull request #26159 from GangaManoj/asset-credit-note	2021-07-14 12:02:02 +05:30
Ganga Manoj	05d7c69aa2	fix: delete child docs when parent doc is deleted (#26239 )	2021-07-14 11:54:27 +05:30
Ganga Manoj	f4fc1384a5	fix(Issue): Calculate first_response_time based on working hours (#25991 )	2021-07-14 11:43:10 +05:30
Saqib	59bf2df28e	fix: pos item cart dom updates (#26461 )	2021-07-14 11:40:58 +05:30
Saqib	cbf7e1b676	fix: pos item cart dom updates (#26460 )	2021-07-14 11:40:47 +05:30
Anurag Mishra	adfdc71844	fix: Tax calculation for Recurring additional salary (#24206 ) * fix: Tax calculation for Recurring additional salary * fix: conflicts	2021-07-14 09:59:41 +05:30
rohitwaghchaure	96eb147bb6	Merge pull request #26457 from rohitwaghchaure/fixed-multi-currency-issue fix: multi-currency issue	2021-07-13 23:01:30 +05:30
GangaManoj	6357ffe4a1	fix: Create asset data	2021-07-13 22:31:01 +05:30
Deepesh Garg	7ff6865817	Merge pull request #26470 from deepeshgarg007/new_company_error_v13 fix: Errors on parallel requests creation of company for India	2021-07-13 20:30:06 +05:30
Deepesh Garg	75f66f78d7	Merge pull request #26420 from deepeshgarg007/new_company_error fix: Errors on parallel requests creation of company for India	2021-07-13 20:29:56 +05:30
GangaManoj	2f4c607fc8	fix: Add tests for discount accounting	2021-07-13 17:41:29 +05:30
Deepesh Garg	3b68735e25	Merge branch 'develop' into payment_entry_taxes_unallocated_amount	2021-07-13 17:33:06 +05:30
Deepesh Garg	1ee63f31e5	Merge branch 'develop' of https://github.com/frappe/erpnext into bootstrapped_gst_setup_develop	2021-07-13 16:51:47 +05:30
Deepesh Garg	2de11fbbc4	fix: Test Cases	2021-07-13 16:50:35 +05:30
Deepesh Garg	3ef394c556	fix: Test cases	2021-07-13 16:50:35 +05:30
Deepesh Garg	b2af6b4583	fix: Create mode of payment if doesn't exists	2021-07-13 16:50:35 +05:30
Deepesh Garg	8f6f86aff4	fix: Test cases for M-pesa	2021-07-13 16:50:35 +05:30
Deepesh Garg	779d2afa60	fix: Update account heads in GST test cases	2021-07-13 16:50:04 +05:30
Deepesh Garg	bb679cc036	fix: Add validate bank account method back	2021-07-13 16:49:21 +05:30
Deepesh Garg	2908f2ee20	fix: Revert Changes	2021-07-13 16:49:21 +05:30
Deepesh Garg	0dfea4d134	fix: Test Cases	2021-07-13 16:49:21 +05:30
Deepesh Garg	22683cf19b	fix: Tests	2021-07-13 16:49:21 +05:30
Deepesh Garg	b71497067d	chore: Add comments	2021-07-13 16:49:21 +05:30
Deepesh Garg	87f4df80ea	fix: Move tax categories up in country wise json	2021-07-13 16:49:21 +05:30
Deepesh Garg	ed54e4e276	fix: Check for tax category	2021-07-13 16:48:44 +05:30
Deepesh Garg	269510b98f	fix: Regional settings setup	2021-07-13 16:48:22 +05:30
Deepesh Garg	a72589cb7e	fix: Add accounts and templates for reverse charge	2021-07-13 16:48:06 +05:30
Deepesh Garg	0380cca3b7	fix: Add GST accounts to GST Settings	2021-07-13 16:47:38 +05:30
Deepesh Garg	96300fa791	fix: Add validation for GST Settings	2021-07-13 16:47:38 +05:30
Deepesh Garg	1001f29784	fix: Gracefully handle duplicate bank account name to make setup faster	2021-07-13 16:47:38 +05:30
Deepesh Garg	8ed1afd93d	fix: Remove redundant get_doc	2021-07-13 16:47:38 +05:30
Deepesh Garg	8fd2d8b5d0	fix: Ignore validations for Tax Setup	2021-07-13 16:47:38 +05:30
Deepesh Garg	a90e5fd2e1	fix: Issues on new company setup	2021-07-13 16:47:38 +05:30
Deepesh Garg	e166c264b4	fix: Update country-wise-tax JSON and tax setup	2021-07-13 16:47:38 +05:30
Deepesh Garg	3031535a24	fix: Add tax categories on company setup	2021-07-13 16:47:36 +05:30
Deepesh Garg	de8c6eb0da	fix: Item Tax templates for GST	2021-07-13 16:46:30 +05:30
Deepesh Garg	2a9726b09f	feat(India): Separate Input and Output GST tax accounts	2021-07-13 16:46:30 +05:30
Deepesh Garg	c00d851a88	fix: Unallocated amount for inclusive charges	2021-07-13 16:42:21 +05:30
Deepesh Garg	740d5c6c53	fix: Deduct included taxes from unallocated amount	2021-07-13 16:42:10 +05:30
Deepesh Garg	01c89eaad9	fix: Remove unintentional changes	2021-07-13 16:42:10 +05:30
Deepesh Garg	2f350bf450	fix: Remove unintentional changes	2021-07-13 16:42:10 +05:30
Deepesh Garg	9513d61a50	fix: Hide amount after tax fields	2021-07-13 16:42:10 +05:30
Deepesh Garg	51ae46f0de	fix: Unallocated amount in Payment Entry after taxes	2021-07-13 16:42:10 +05:30
Deepesh Garg	4478c547bf	fix: Unallocated amount for inclusive charges	2021-07-13 16:35:58 +05:30
Deepesh Garg	754f432d97	fix: Deduct included taxes from unallocated amount	2021-07-13 16:35:47 +05:30
Deepesh Garg	7c634f66ca	fix: Remove unintentional changes	2021-07-13 16:35:47 +05:30
Deepesh Garg	5179f85e63	fix: Remove unintentional changes	2021-07-13 16:35:47 +05:30
Deepesh Garg	5cc4a201cb	fix: Hide amount after tax fields	2021-07-13 16:35:47 +05:30
Deepesh Garg	f661d82c00	fix: Unallocated amount in Payment Entry after taxes	2021-07-13 16:35:47 +05:30
Deepesh Garg	2f89b5b38e	Merge pull request #26466 from deepeshgarg007/amended_doc_discount_v13 fix: Incorrect discount amount on amended document	2021-07-13 16:24:54 +05:30
Deepesh Garg	41c5357602	Merge pull request #26468 from deepeshgarg007/gstr_1_json_dpwnload_error_v13 fix: Unable to download GSTR-1 json	2021-07-13 16:17:52 +05:30
Deepesh Garg	fc20ff02d0	Merge pull request #26418 from deepeshgarg007/gstr_1_json_dpwnload_error fix: Unable to download GSTR-1 json	2021-07-13 16:17:37 +05:30
rohitwaghchaure	bd8699b8a9	Merge pull request #26458 from rohitwaghchaure/fixed-multi-currency-issue-pre fix: multi-currency issue	2021-07-13 16:05:36 +05:30
Deepesh Garg	fea29ae8cb	fix: Use update flag for company dependant fixtures	2021-07-13 16:05:05 +05:30
Deepesh Garg	7be9f8dab1	fix: Error on creation of company for India	2021-07-13 16:04:56 +05:30
Deepesh Garg	0bad696faf	fix: Unable to download GSTR-1 json	2021-07-13 15:46:58 +05:30
Deepesh Garg	fc9714b871	fix: Unable to download GSTR-1 json	2021-07-13 15:45:34 +05:30
Deepesh Garg	07d9f3f74b	fix: Incorrect discount amount on amended document	2021-07-13 15:35:59 +05:30
Rohit Waghchaure	4acbeecbbe	fix: multi-currency issue	2021-07-13 15:35:30 +05:30
Deepesh Garg	a5200d6a43	Merge pull request #26429 from deepeshgarg007/amended_doc_discount_develop fix: Incorrect discount amount on amended document	2021-07-13 15:34:32 +05:30
18alantom	a4eba7a409	fix: show child item group items on portal	2021-07-13 15:34:25 +05:30
Deepesh Garg	eef8e4a9d4	Merge pull request #26292 from deepeshgarg007/amended_doc_discount fix: Incorrect discount amount on amended document	2021-07-13 15:34:24 +05:30
Rohit Waghchaure	0d190bb930	fix: multi-currency issue	2021-07-13 15:32:39 +05:30
Subin Tom	5265ba39f0	feat: Added fields for dispatch address in Sales Order, Sales Invoice, Delivery Note for Eway Bill	2021-07-13 14:58:17 +05:30
Saqib	621927d9f9	fix: move the rename abbreviation job to long queue (#26462 )	2021-07-13 14:13:39 +05:30
Saqib	7c5711ddf4	fix: pos item cart dom updates (#26459 )	2021-07-13 14:09:06 +05:30
Rucha Mahabal	fc4079587b	Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into org-chart	2021-07-13 12:38:37 +05:30
Anupam Kumar	a8b6cf8114	fix: bank remittance report issue (#26398 )	2021-07-13 11:45:34 +05:30
rohitwaghchaure	84f23ac8d2	Merge pull request #26222 from 18alantom/teabox-cogs-by-item-group feat: report to show cogs by item groups	2021-07-13 11:24:59 +05:30
Deepesh Garg	4a2e4748ac	fix: Unallocated amount for inclusive charges	2021-07-13 11:22:55 +05:30
Noah Jacob	74b3fc1e1c	refactor: suggested changes	2021-07-13 11:05:53 +05:30
Noah Jacob	1e8f598ba5	fix: Sider	2021-07-13 11:05:53 +05:30
Noah Jacob	dd0a8f20e2	test: updated test cases	2021-07-13 11:05:53 +05:30
Noah Jacob	fedee0e8da	test: test cases for fetching customer group details	2021-07-13 11:05:53 +05:30
Noah Jacob	f07f7e9305	test: test case for fetching supplier group details	2021-07-13 11:05:53 +05:30
Noah Jacob	1cb2af00a8	feat: details fetched from customer group in customer	2021-07-13 11:05:53 +05:30
Noah Jacob	9965af166e	feat: details fetched from supplier group in supplier	2021-07-13 11:05:53 +05:30
Marica	73c9a21987	Merge branch 'develop' into supplier_defaults_fix	2021-07-13 10:31:10 +05:30
GangaManoj	8f7b0a1753	fix: Create common function for discount accounting	2021-07-13 03:01:02 +05:30
GangaManoj	65e2b9fee6	fix: Filter options for Discount Account	2021-07-13 02:14:18 +05:30
GangaManoj	81375aec1f	fix: Copy Discount Account from first row	2021-07-13 02:09:40 +05:30
GangaManoj	4b8918e8a7	fix: Display Discount Account only if Enable Discount Accounting is checked	2021-07-13 02:07:46 +05:30
GangaManoj	555852c5ef	fix: Add Discount Account field	2021-07-13 02:06:03 +05:30
GangaManoj	b85d3017a1	fix: Filter options for Default Discount Account	2021-07-13 01:45:20 +05:30
GangaManoj	0b7d8fb3af	fix: Move Default Discount Account field to Item Defaults	2021-07-13 01:45:20 +05:30
GangaManoj	4fcdc5d129	fix: Copy discount account from first row to all Items	2021-07-13 01:45:20 +05:30
GangaManoj	b22dba1146	fix: Filter Discount Account list	2021-07-13 01:45:20 +05:30
GangaManoj	0d5ad3b1bb	fix: Add description for Enable Discount Accounting checkbox	2021-07-13 01:45:20 +05:30
Deepesh Garg	30f771b26c	Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into payment_entry_taxes_v12	2021-07-12 23:34:13 +05:30
Deepesh Garg	855e9030f2	fix: Deduct included taxes from unallocated amount	2021-07-12 22:11:57 +05:30
Saqib	0683337f14	fix: incorrect response by variance & resolution by variance (#26173 )	2021-07-12 20:21:07 +05:30
Saqib	7fb64d1645	fix: exchange gain loss not set for advances linked with invoices (#26436 )	2021-07-12 18:33:16 +05:30
Deepesh Garg	1298956482	fix: Use update flag for company dependant fixtures	2021-07-12 18:29:52 +05:30
Nabin Hait	ca6e4bed9f	Merge pull request #26431 from nabinhait/reposting-optimization refactor: Optimized code for reposting item valuation	2021-07-12 15:42:24 +05:30
Nabin Hait	826d2b1e7b	Merge pull request #26433 from nabinhait/reposting-optimization-develop refactor: Optimized code for reposting item valuation	2021-07-12 15:42:14 +05:30
Saqib	a20999cfbc	fix: exchange gain loss not set for advances linked with invoices (#25369 )	2021-07-12 14:33:23 +05:30
Saqib	b75b556bbb	fix: move the rename abbreviation job to long queue (#26435 )	2021-07-12 14:32:37 +05:30
Saqib	9e1819d366	fix: move the rename abbreviation job to long queue (#26434 )	2021-07-12 14:31:57 +05:30
Nabin Hait	97bce3af9a	refactor: Optimized code for reposting item valuation	2021-07-12 13:33:08 +05:30
Nabin Hait	0003938f2b	refactor: Optimized code for reposting item valuation	2021-07-12 13:29:20 +05:30
Nabin Hait	01aada6c90	refactor: Optimized code for reposting item valuation	2021-07-12 13:28:19 +05:30
Nabin Hait	45e6cffa4f	refactor: Optimized code for reposting item valuation	2021-07-12 13:26:08 +05:30
Jannat Patel	b4ea185eca	fix: added company filter while fetching loans (#26295 ) * fix: added company filter while fetching loans * fix: added set_query in refresh * fix: quotes * fix: tests Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2021-07-12 13:15:41 +05:30
Jannat Patel	38994bd494	fix: Added Company filters for Loan (#26294 ) * fix: loan validations * fix: added company filter while fetching loans * fix: tests	2021-07-12 13:01:31 +05:30
rohitwaghchaure	e2c97b1a2b	Merge pull request #26351 from rohitwaghchaure/fixed-putaway-fixing-for-material-receipt-develop fix: stock entry with putaway rule not working	2021-07-12 12:49:25 +05:30
Nabin Hait	470c7e773f	fix: merge conflict	2021-07-12 12:45:49 +05:30
Deepesh Garg	4ff98cc171	fix: Incorrect discount amount on amended document	2021-07-12 11:27:28 +05:30
Afshan	7e05bea6a9	fix: dunning calculation of grand total when rate of interest is 0% (#26286 )	2021-07-12 11:11:58 +05:30
Afshan	10473b1195	fix: dunning calculation of grand total when rate of interest is 0% (#26285 )	2021-07-12 11:11:29 +05:30
Afshan	bf03671a33	fix(report): iterate on accounts only when accounts exist (#26391 )	2021-07-12 11:10:28 +05:30
Afshan	4b4ac7c051	fix(report): iterate on accounts only when accounts exist (#26390 )	2021-07-12 11:10:00 +05:30
Afshan	f60c3f0655	fix: error popup for COA errors (#26358 )	2021-07-12 11:07:30 +05:30
Afshan	6467632f60	fix: error popup for COA errors (#26357 )	2021-07-12 11:07:06 +05:30
Saqib	432d8efa3d	fix(pos): taxes amount in pos item cart (#26411 )	2021-07-12 10:47:40 +05:30
Ankush	caacd0ad2c	fix: stock levels disapperaing on refresh (bp #26305 ) refresh_section removes all sections with `custom` class, added different class to avoid this behaviour. # Conflicts: # erpnext/stock/doctype/item/item.js	2021-07-12 10:20:19 +05:30
Ankush Menat	22cb642831	chore: update test company FY	2021-07-12 10:09:50 +05:30
Ankush Menat	b99469cdab	fix: stock levels disapperaing on refresh refresh_section removes all sections with `custom` class, added different class to avoid this behaviour.	2021-07-12 10:09:50 +05:30
Noah Jacob	0be6583083	refactor: suggested changes	2021-07-12 09:18:19 +05:30
Noah Jacob	34a5cb9106	fix: Sider	2021-07-12 08:48:04 +05:30
Marica	f7748e4109	Merge pull request #26133 from marination/qi-rejection feat: Optionally allow rejected quality inspection on submission	2021-07-10 21:04:32 +05:30
marination	f67f13c384	chore: Test case for QI Rejection in Stock Entry - Use `get_single_value` instead of `get_doc` in validation - Test Case to check impact of stock settings on SE with rejected qi	2021-07-10 21:02:36 +05:30
Marica	9ba3fce4fd	fix: Consistent alert indicators	2021-07-10 21:02:28 +05:30
marination	654e9d85d1	fix: sider and semgrep	2021-07-10 21:02:19 +05:30
marination	9ac9a4ef21	feat: Optionally allow rejected quality inspection on submission	2021-07-10 21:02:03 +05:30
Deepesh Garg	e282effaed	fix: Error on creation of company for India	2021-07-10 20:23:52 +05:30
marination	c8a825c478	chore: Test case for QI Rejection in Stock Entry - Use `get_single_value` instead of `get_doc` in validation - Test Case to check impact of stock settings on SE with rejected qi	2021-07-10 18:26:36 +05:30
Deepesh Garg	77f2d2d01e	fix: Unable to download GSTR-1 json	2021-07-10 10:06:38 +05:30
Saqib	2e507b47a8	fix(Asset Repair): cancellation	2021-07-09 22:39:34 +05:30
GangaManoj	073b50f7fd	fix(Asset Repair): Rearrange fields	2021-07-09 22:38:58 +05:30
GangaManoj	fd7fb37697	fix(Asset Repair): Simplify code for Asset Repair creation in tests	2021-07-09 22:38:58 +05:30
GangaManoj	e328e3b48a	fix(Asset Repair): Edit description for total_repair_cost	2021-07-09 22:38:57 +05:30
GangaManoj	c8caafa680	fix(Asset Repair): Move filters for cost_center, warehouse and project to setup	2021-07-09 22:38:57 +05:30
GangaManoj	267fed2d23	fix(Asset): Add comment	2021-07-09 22:38:57 +05:30
GangaManoj	597016bb34	fix(Asset): Remove extra tabs	2021-07-09 22:38:57 +05:30
GangaManoj	7c37e83535	fix(Asset): Remove to_date field	2021-07-09 22:38:57 +05:30
GangaManoj	cba0966ec5	fix(Asset Repair): Change controller hooks	2021-07-09 22:38:57 +05:30
GangaManoj	81bcae7433	fix(Asset): Remove redundant code	2021-07-09 22:38:57 +05:30
GangaManoj	f3ae1dd23b	fix(Asset): Fix test	2021-07-09 22:38:57 +05:30
GangaManoj	18bbfdf343	fix(Asset Repair): Remove test that's no longer necessary	2021-07-09 22:38:56 +05:30
GangaManoj	39dba43b87	fix(Asset): Fix value_after_depreciation calculation	2021-07-09 22:38:56 +05:30
GangaManoj	3ba9fb32de	fix(Asset Repair): Replace asset_value with value_after_depreciation in tests	2021-07-09 22:38:56 +05:30
GangaManoj	72ea64f6ac	fix: Sider issues	2021-07-09 22:38:49 +05:30
GangaManoj	307fe43e08	fix: Remove changes made to Asset Maintenance	2021-07-09 22:38:02 +05:30
GangaManoj	55bca4cbc7	fix(Asset Repair): Revert Stock Entry on cancellation	2021-07-09 22:38:02 +05:30
GangaManoj	c34e6b1889	fix(Asset): Fix tests for Asset Repair	2021-07-09 22:38:02 +05:30
GangaManoj	ba9558527d	fix(Asset Repair): Return Depreciation Schedule to original state on cancellation	2021-07-09 22:37:08 +05:30
GangaManoj	6c2f4ce6a5	fix(Asset Repair): Increase stock quantity and decrease asset value on cancellation	2021-07-09 22:37:08 +05:30
GangaManoj	ad78888c86	fix(Asset Repair): Compute total_value instantly	2021-07-09 22:37:08 +05:30
GangaManoj	e921878633	fix: Rename 'Stock Item' to 'Asset Repair Consumed Item'	2021-07-09 22:37:08 +05:30
GangaManoj	852881e33e	fix(Asset Repair): Fix tests	2021-07-09 22:37:04 +05:30
GangaManoj	42fd7ffbc0	fix(Asset Repair): Set completion_date on changing repair_status to 'Completed'	2021-07-09 22:36:05 +05:30
GangaManoj	68e0c96c03	fix(Asset Repair): Prevent some fields from being copied on duplicating the doc	2021-07-09 22:36:05 +05:30
GangaManoj	399d17e40e	fix(Asset Repair): Make Error Description non-mandatory	2021-07-09 22:36:05 +05:30
GangaManoj	e755c74a60	fix(Asset Repair): Add Stock Entry field	2021-07-09 22:36:04 +05:30
GangaManoj	4004bcd436	fix(Asset Repair): Move Total Repair Cost to the Stock Consumption Details section	2021-07-09 22:36:04 +05:30
GangaManoj	bd1796cbb6	fix: Replace edit_dates with flags.increase_in_asset_life	2021-07-09 22:36:04 +05:30
GangaManoj	ae8cb335b6	fix(Asset Repair): Fix depreciation_amount calculation	2021-07-09 22:36:04 +05:30
GangaManoj	be536040df	fix: Add comments	2021-07-09 22:36:04 +05:30
GangaManoj	bd336c7d8e	fix(Asset): Add function to clear old depreciation schedule	2021-07-09 22:36:04 +05:30
GangaManoj	54cbc8324a	fix(Asset Repair): Create GL Entries for each item in Stock Items	2021-07-09 22:36:04 +05:30
GangaManoj	50826f16ee	fix(Asset): Replace asset_value with value_after_depreciation in Finance Books	2021-07-09 22:36:04 +05:30
GangaManoj	d354a301cb	fix(Asset Repair): Display value_after_depreciation in Finance Books	2021-07-09 22:36:04 +05:30
GangaManoj	9520efb941	fix(Asset Repair): Filter Warehouse by Company	2021-07-09 22:36:03 +05:30
GangaManoj	96de4fdf1f	fix(Asset Repair): Fix GL Entry creation	2021-07-09 22:36:03 +05:30
GangaManoj	71eaf3dbd8	fix(Asset Repair): Fix Sider issues	2021-07-09 22:36:03 +05:30
GangaManoj	75fbda10ad	fix(Asset Repair): Make Cost Center non-mandatory	2021-07-09 22:36:03 +05:30
GangaManoj	0aaf88cc0a	fix(Asset Repair): Uncheck allow_on_submit for all fields	2021-07-09 22:36:03 +05:30
GangaManoj	9779aa11fb	fix(Asset Repair): Use existing function from asset.py for fetching fixed_asset_account	2021-07-09 22:36:03 +05:30
GangaManoj	aff9709525	fix(Asset Repair): Add mandatory_depends_on condition for Purchase Invoice	2021-07-09 22:36:03 +05:30
GangaManoj	17fa121779	fix(Asset Repair): Filter Cost Center and Project by Company	2021-07-09 22:36:03 +05:30
GangaManoj	867fd02b2d	fix(Asset Repair): Add Company field	2021-07-09 22:36:03 +05:30
GangaManoj	5ab0cabf91	fix(Asset Repair): Make Stock Items and Warehouse mandatory if stock_consumption is checked	2021-07-09 22:36:03 +05:30
GangaManoj	654074ad7a	fix(Asset Repair): Add title to error messages	2021-07-09 22:36:03 +05:30
GangaManoj	fd272569aa	fix(Asset Repair): Display fields according to the state of the doc	2021-07-09 22:36:02 +05:30
GangaManoj	4e620c3b32	fix: Set asset_name as title	2021-07-09 22:35:49 +05:30
GangaManoj	65b2f9234b	fix(Asset Repair): Set company when creating Stock Entry	2021-07-09 22:15:58 +05:30
GangaManoj	2833903ce5	fix(Asset Repair): Add tests	2021-07-09 22:15:42 +05:30
GangaManoj	70de974496	fix(Asset): Add depreciation schedule details in create_asset()	2021-07-09 22:15:42 +05:30
GangaManoj	3f9f0ffdfe	fix(Asset Repair): Add Company in GL Entries	2021-07-09 22:15:42 +05:30
GangaManoj	c6ed66ec5b	fix(Asset Repair): Remove unnecessary condition	2021-07-09 22:15:42 +05:30
GangaManoj	794807ecc3	fix(Asset Repair): Only modify depreciation schedule if calculate_depreciation is checked	2021-07-09 22:15:42 +05:30
GangaManoj	97193a4632	fix: Sider issues	2021-07-09 22:15:10 +05:30
GangaManoj	4e284433d1	fix: Fix depreciation_amount calculation	2021-07-09 22:12:46 +05:30
GangaManoj	42c70fba3c	fix: Modify depreciation schedule when increase_in_asset_life is not a multiple of frequency_of_depreciation)	2021-07-09 22:11:50 +05:30
GangaManoj	58bc967073	fix: Rename 'Fixed Asset Depreciation Settings' to 'Fixed Asset Deafults'	2021-07-09 22:10:35 +05:30
GangaManoj	9e26f2d797	fix: Organize buttons	2021-07-09 22:08:56 +05:30
Kenneth Sequeira	862ce916ae	fix: Nested/Multi-level BOM help link (#26409 ) Updated the link for multi-level boms. Current link is broken.	2021-07-09 21:52:50 +05:30
Afshan	f4d45d60f4	Revert "fix: updated onboarding steps for selling module" (#26414 ) This reverts commit `446171acc4`.	2021-07-09 20:45:43 +05:30
Deepesh Garg	eae7c1891f	fix: Remove unintentional changes	2021-07-09 20:08:29 +05:30
Deepesh Garg	c13ac4ab11	fix: Remove unintentional changes	2021-07-09 20:00:55 +05:30
Anuja	446171acc4	fix: updated onboarding steps for selling module	2021-07-09 19:31:44 +05:30
GangaManoj	ef42e80065	fix: Sider issues	2021-07-09 19:25:54 +05:30
Deepesh Garg	171ee51507	fix: Hide amount after tax fields	2021-07-09 18:52:39 +05:30
Saqib	2098684bc0	fix(pos): taxes amount in pos item cart (#26410 )	2021-07-09 18:09:26 +05:30
Deepesh Garg	38fa3a3f89	fix: Unallocated amount in Payment Entry after taxes	2021-07-09 18:04:24 +05:30
Saqib	13d7043451	fix: column 'outstanding_amount' cannot be null (#26404 )	2021-07-09 15:33:14 +05:30
Saqib	fe4f58d0f6	fix(e-invoicing): allow export invoice even if no taxes applied (#26405 )	2021-07-09 15:32:54 +05:30
Saqib	8e8434a78a	fix: omit item discount amount for e-invoicing (#26353 ) (#26407 )	2021-07-09 15:32:28 +05:30
Marica	e6ce3bb7ff	Merge branch 'develop' into order-by-weightage-for-web-items-develop	2021-07-09 15:05:46 +05:30
Saqib	77e00403c8	fix: omit item discount amount for e-invoicing (#26353 )	2021-07-09 14:41:03 +05:30
Saqib	b199702977	fix(e-invoicing): allow export invoice even if no taxes applied (#26363 )	2021-07-09 14:37:34 +05:30
Saqib	47ccfd6c9d	fix: column 'outstanding_amount' cannot be null (#26371 )	2021-07-09 14:36:13 +05:30
Subin Tom	9ac63da457	fix: value fetching for custom field in POS (#26367 )	2021-07-09 14:35:11 +05:30
Marica	50170a8e62	Merge branch 'develop' into order-by-weightage-for-web-items-develop	2021-07-09 14:34:56 +05:30
Subin Tom	95a15ed85d	fix: value fetching for custom field in POS (#26366 )	2021-07-09 14:34:51 +05:30
Subin Tom	d53991857c	fix: Fixed Budget Variance Graph color from all black to default (#26368 )	2021-07-09 14:33:00 +05:30
marination	99f449939d	fix: Order Items by weightage in the web items query	2021-07-09 13:44:29 +05:30
Marica	eb0dea09bb	Merge pull request #26333 from marination/lcv-validate-invoice fix: Validate LCV for Invoices without Update Stock	2021-07-09 13:41:34 +05:30
marination	98173038b5	fix: Rename function and tweak logic - Dont validate PI on `else`	2021-07-09 13:38:23 +05:30
marination	86f5dfbb8f	fix: Validate LCV for Invoices without Update Stock	2021-07-09 13:38:15 +05:30
Marica	01be96adb2	Merge branch 'version-13-hotfix' into qi-rejection	2021-07-09 13:30:21 +05:30
marination	bf462abb00	fix: Rename function and tweak logic - Dont validate PI on `else`	2021-07-09 13:12:33 +05:30
Anurag Mishra	afafe406c8	Merge pull request #26388 from Anurag810/training_fix_v13 fix: Query for Training Event	2021-07-09 12:21:17 +05:30
Anurag Mishra	6949114569	Merge pull request #26389 from Anurag810/training_v13_fix fix: Query for Training Event	2021-07-09 12:20:57 +05:30
Saqib	f6f924b340	Merge branch 'develop' into asset-credit-note	2021-07-09 10:38:50 +05:30
Saqib	8f3c7ab402	fix: escape quotes while fetching customer emails (#26329 ) (#26376 )	2021-07-09 10:35:55 +05:30
GangaManoj	bf245e5e39	fix: Clear Payment Schedule if PI has default Payment Schedule, but linked PO doensn't	2021-07-09 01:44:34 +05:30
Rucha Mahabal	4582f28d0d	fix: sider	2021-07-09 01:25:26 +05:30
Rucha Mahabal	24b31c0bf9	fix(mobile): collapsed nodes not expanding	2021-07-09 01:03:02 +05:30
GangaManoj	5a62467a3e	feat: Fetch Payment Terms from linked Purchase Order	2021-07-09 00:53:42 +05:30
Rucha Mahabal	3888488b36	fix: precision for expected values in payment entry test	2021-07-08 23:21:48 +05:30
Rucha Mahabal	88929b055c	fix: precision for expected values in payment entry test	2021-07-08 19:27:53 +05:30
Rucha Mahabal	06fc9e7847	fix: sibling group expansion not working for root nodes	2021-07-08 18:44:53 +05:30
Alan	257cbd3b92	fix: track changes on batch (#26382 )	2021-07-08 18:44:30 +05:30
Anurag Mishra	a82e9e42e1	fix: query for training Event	2021-07-08 17:27:21 +05:30
Anurag Mishra	b6ff8917e8	fix: query for training Event	2021-07-08 17:25:37 +05:30
Rucha Mahabal	09c24c7949	fix: exclude active node while fetching sibling group	2021-07-08 17:05:40 +05:30
Rucha Mahabal	05ffc0d3e0	feat: use icon for connections on mobile view	2021-07-08 16:55:42 +05:30
Rucha Mahabal	a4132d7ec6	Merge branch 'develop' into fix-sla-test	2021-07-08 16:20:11 +05:30
Rucha Mahabal	091f41e986	fix: yet another fix for flaky SLA Test	2021-07-08 14:57:54 +05:30
Jannat Patel	42214999a6	Merge branch 'develop' into salary-slip-fix--develop	2021-07-08 13:44:12 +05:30
Jannat Patel	cf28950327	Merge pull request #26349 from Anurag810/salary-slip-fix--hotfix fix: payroll-entry minor fix	2021-07-08 13:43:55 +05:30
Anurag Mishra	8f945a9852	fix: Removed un-used flag	2021-07-08 13:06:04 +05:30
Anurag Mishra	fac420ee09	fix: Removed un-used flag	2021-07-08 13:05:14 +05:30
Rucha Mahabal	48018b8d8c	fix: do not sort by number of connections	2021-07-08 11:23:50 +05:30
Saqib	eaef371585	fix: escape quotes while fetching customer emails (#26329 )	2021-07-08 10:52:41 +05:30
Rucha Mahabal	df3bb9ea8c	perf: Optimise Rendering - optimise get_children function - use promises instead of callbacks - optimise selectors - use const wherever possible - use pure js instead of jquery for connectors for faster rendering	2021-07-08 09:53:31 +05:30
GangaManoj	cfff3b8726	fix: Test GL Entries made when an Asset is returned	2021-07-07 21:04:20 +05:30
GangaManoj	298b43c177	fix: Let create_item() make items that are fixed assets	2021-07-07 20:56:15 +05:30
Mohammad Hasnain Mohsin Rajan	00f90c50c0	chore: add product listing link in settings (#26026 ) * chore: add product listing link in settings * chore: add icon in workspace card Co-authored-by: Ankush <ankush@iwebnotes.com>	2021-07-07 18:21:12 +05:30
GangaManoj	3a7f25b218	fix: Make functions more readable	2021-07-07 15:59:52 +05:30
Saqib	9910968398	Merge branch 'develop' into enable-discount-accounting	2021-07-07 12:56:11 +05:30
Saqib	0b320b5909	Merge pull request #25798 from GangaManoj/asset-repair-refactor refactor: Asset Repair	2021-07-07 12:44:50 +05:30
Mohammad Hasnain Mohsin Rajan	290350c86f	chore: add product listing link in settings (#26026 ) * chore: add product listing link in settings * chore: add icon in workspace card Co-authored-by: Ankush <ankush@iwebnotes.com>	2021-07-07 12:10:02 +05:30
Rucha Mahabal	6eec251273	feat: handle multiple root / orphan nodes	2021-07-07 12:05:50 +05:30
Noah Jacob	a01264dae7	fix: stock_rbnb not defined (#26354 )	2021-07-07 11:07:19 +05:30
Rucha Mahabal	6d5ee25bba	fix: unnecessary variables	2021-07-07 09:43:28 +05:30
rohitwaghchaure	f130f8385e	Merge pull request #26332 from rohitwaghchaure/fixed-bom-stock-report-not-working fix: bom stock report not working	2021-07-07 00:22:03 +05:30
Rohit Waghchaure	dd1b2995a8	fix: stock entry with putaway rule not working	2021-07-07 00:16:35 +05:30
rohitwaghchaure	2bdc0e8993	Merge pull request #26350 from rohitwaghchaure/fixed-putaway-fixing-for-material-receipt fix: stock entry with putaway rule not working	2021-07-07 00:15:26 +05:30
Rohit Waghchaure	0bd190b885	fix: stock entry with putaway rule not working	2021-07-07 00:14:51 +05:30
GangaManoj	ca87745be1	fix: Rename get_gl_entries_on_asset_movement to get_gl_entries_on_asset_disposal_and_regain	2021-07-06 23:43:08 +05:30
Nabin Hait	d45ebaf61c	Merge pull request #26347 from ruchamahabal/fix-flaky-sla-test fix: flaky SLA test	2021-07-06 21:50:42 +05:30
Nabin Hait	11d56903e7	Merge pull request #25415 from deepeshgarg007/bootstraped_gst_setup feat(India): Bootstrapped GST Setup	2021-07-06 21:44:30 +05:30
Deepesh Garg	bd40669dab	Merge pull request #26289 from nemesis189/fixed-budget-variance-report-color fix: Fixed Budget Variance Graph color from all black to default	2021-07-06 20:36:00 +05:30
Deepesh Garg	67c7067778	Merge pull request #26300 from AfshanKhan/fix-account-selection-gst-settings-v13 fix: only "Tax" type accounts should be shown for selection in GST Settings	2021-07-06 20:33:41 +05:30
GangaManoj	3ea4f993b7	feat: Toggle display for discount accounting fields according to enable_discount_accounting	2021-07-06 20:22:13 +05:30
Afshan	4ba680a65e	Merge branch 'develop' into fix-account-selection-gst-settings	2021-07-06 19:52:12 +05:30
Saqib	422325bb74	test: fetching of previous sle (#26352 )	2021-07-06 18:37:12 +05:30
Deepesh Garg	3636efd7e6	Merge pull request #26355 from deepeshgarg007/flaky_test test: Purchase Invoice advance test case	2021-07-06 18:22:26 +05:30
Rucha Mahabal	ad06603392	fix: removing orphaned connectors	2021-07-06 18:16:49 +05:30
Saqib	f9e9d86955	test: fetching of previous sle (#26352 )	2021-07-06 18:09:21 +05:30
Noah Jacob	5e99aa7f65	fix: stock_rbnb not defined (#26354 )	2021-07-06 18:00:35 +05:30
Deepesh Garg	7f794cc0ea	fix: Purchase Invoice advance test case	2021-07-06 17:58:44 +05:30
Deepesh Garg	a62f94379b	Merge pull request #26324 from deepeshgarg007/bank_statement_import_fix_develop fix: Bank statement import	2021-07-06 17:25:21 +05:30
Afshan	11e0ed5f6e	Merge branch 'develop' into fix-account-selection-gst-settings	2021-07-06 17:21:19 +05:30
GangaManoj	657e9b5320	feat: Assign Item's Default Discount Account if present	2021-07-06 16:51:12 +05:30
Rucha Mahabal	e7fceb556d	Merge branch 'develop' into fix-flaky-sla-test	2021-07-06 16:38:46 +05:30
GangaManoj	ef667a9a64	feat: Add Default Discount Account field	2021-07-06 16:29:19 +05:30
GangaManoj	b08bb1f1a2	feat: Filter list for Discount Account field in Items table	2021-07-06 16:28:19 +05:30
Deepesh Garg	2f3f87dc66	Merge branch 'develop' into multi-company-deferred-revenue_develop	2021-07-06 16:14:25 +05:30
Deepesh Garg	26dc02aa38	Merge branch 'develop' into bank_statement_import_fix_develop	2021-07-06 16:14:13 +05:30
Deepesh Garg	381c05eb87	Merge pull request #26322 from deepeshgarg007/party_dashboard_develop fix: Do not consider cancelled entries in party dashboard	2021-07-06 16:13:49 +05:30
Noah Jacob	0734901a89	fix: stock_rbnb not defined (#26345 )	2021-07-06 15:56:10 +05:30
Deepesh Garg	8985231a96	fix: Rewrite tests	2021-07-06 15:34:47 +05:30
Afshan	a63796e6f0	Merge branch 'develop' into fix-account-selection-gst-settings	2021-07-06 14:38:26 +05:30
Afshan	c8eca8a448	fix: remove cancelled entries in consolidated financial statements (#26331 )	2021-07-06 14:37:57 +05:30
Afshan	53e3435770	fix: remove cancelled entries in consolidated financial statements (#26330 )	2021-07-06 14:37:21 +05:30
Anurag Mishra	f0b62f70d5	fix: payroll-entry minor fix	2021-07-06 13:40:22 +05:30
Anurag Mishra	1f5e2ba8e7	fix: payroll-entry minor fix	2021-07-06 13:36:23 +05:30
Mohammed Yusuf Shaikh	842674ce79	fix: Added a message to enable appontment booking if disabled (#26334 )	2021-07-06 13:34:32 +05:30
Rucha Mahabal	f67c95d32f	fix: flaky SLA test	2021-07-06 13:27:48 +05:30
Marica	dfe11aca6a	Merge pull request #26284 from marination/order-by-weightage-for-web-items fix: Order Items by weightage in the web items query	2021-07-06 13:20:08 +05:30
Afshan	d10c016a0b	Merge branch 'develop' into fix-account-selection-gst-settings	2021-07-06 11:56:39 +05:30
Deepesh Garg	96eb3be6df	fix: Debug Tests	2021-07-06 11:21:44 +05:30
Deepesh Garg	66c04ca984	fix: Debug tests	2021-07-06 10:56:42 +05:30
GangaManoj	cf7579e29f	feat: Create GL Entries for discount accounting	2021-07-06 00:36:06 +05:30
Deepesh Garg	32436eceda	fix: Debug tests	2021-07-05 23:34:09 +05:30
Deepesh Garg	c21d3d4865	fix: Debug tests	2021-07-05 22:47:59 +05:30
marination	44c1e8da06	chore: Test to block backdated reco causing future scarcity	2021-07-05 21:59:28 +05:30
marination	e8c9ab4b01	chore: Test for backdated reco qty reposting	2021-07-05 21:59:14 +05:30
marination	8c441263f8	fix: Sider	2021-07-05 21:59:04 +05:30
marination	4038977e2e	fix: Handle Stock Reco cancellation and limit reposting - Handled cancellation of reco with and without prior SLE - Repost / Recalculate balance qty only till next stock reco	2021-07-05 21:58:57 +05:30
marination	8418c4bfe0	fix: Include Stock Reco logic in update_qty_in_future_sle	2021-07-05 21:58:50 +05:30
marination	57d06a86f8	chore: Test to block backdated reco causing future scarcity	2021-07-05 21:56:57 +05:30
Deepesh Garg	8c1b764a90	fix: Debug tests	2021-07-05 21:49:10 +05:30
Afshan	668da102c9	Merge branch 'develop' into fix-account-selection-gst-settings	2021-07-05 21:35:23 +05:30
Marica	4f51b56928	Merge branch 'version-13-hotfix' into stock-reco-repost_qty	2021-07-05 20:26:01 +05:30
marination	fa9e67502c	chore: Test for backdated reco qty reposting	2021-07-05 20:23:00 +05:30
Deepesh Garg	9b6d9a41f4	fix: Test Cases	2021-07-05 17:08:27 +05:30
GangaManoj	6e0d83d925	feat(Sales Invoice): Add 'Discount Account' field in Items table	2021-07-05 15:09:05 +05:30
GangaManoj	be15e16b84	feat(Accounts Settings): Add 'Enable Discount Accounting' checkbox	2021-07-05 14:58:32 +05:30
Deepesh Garg	15b336df28	fix: Test cases	2021-07-05 14:45:33 +05:30
marination	c69bc54297	fix: Validate LCV for Invoices without Update Stock	2021-07-05 14:24:38 +05:30
Rohit Waghchaure	5638fbb1aa	fix: bom stock report not working	2021-07-05 13:54:05 +05:30
Deepesh Garg	db682d9e4c	fix: Create mode of payment if doesn't exists	2021-07-05 13:46:03 +05:30
Ankush Menat	03f7bf6589	test: variant BOM from template BOM	2021-07-05 12:26:14 +05:30
Richard Case	046e83bf50	fix: incorrect bom no. added for non-variant items on variant boms (#26320 )	2021-07-05 12:26:14 +05:30
Richard Case	75fdf79376	fix: incorrect bom no. added for non-variant items on variant boms (#26320 )	2021-07-05 10:56:34 +05:30
Deepesh Garg	a0599e5ac2	fix: Test cases for M-pesa	2021-07-05 10:09:42 +05:30
rohitwaghchaure	22c2d4f118	Merge pull request #26312 from rohitwaghchaure/fixed-employee-issue-in-job-card fix: allow to make job card without employee	2021-07-04 22:58:50 +05:30
Deepesh Garg	ddf87594a1	Merge pull request #26287 from deepeshgarg007/bank_statement_import_fix fix: Bank statement import	2021-07-04 20:34:10 +05:30
Deepesh Garg	9d295ca939	fix: Bank statement import	2021-07-04 20:33:36 +05:30
Deepesh Garg	ea5b7d38bb	Merge pull request #26277 from deepeshgarg007/multi-company-deferred-revenue fix: Auto process deferred accounting for multi-company setup	2021-07-04 20:32:22 +05:30
Deepesh Garg	5069095984	fix: Auto process deferred accounting for multi-company setup	2021-07-04 20:31:37 +05:30
Deepesh Garg	cd036e115b	Merge pull request #26231 from deepeshgarg007/party_dashboard fix: Do not consider cancelled entries in party dashboard	2021-07-04 20:30:34 +05:30
Deepesh Garg	802e63a9d7	fix: Do not consider cancelled entries in party dashboard	2021-07-04 20:29:41 +05:30
Rohit Waghchaure	3105332e3c	fix: allow to make job card without employee	2021-07-03 17:25:08 +05:30
Noah Jacob	8db974b1b9	test: updated test cases	2021-07-02 22:00:33 +05:30
Deepesh Garg	63096014a7	Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into bootstraped_gst_setup	2021-07-02 20:30:18 +05:30
Afshan	d06a95b6fa	Merge branch 'develop' into fix-account-selection-gst-settings	2021-07-02 19:32:12 +05:30
Rucha Mahabal	2fcd05aa82	fix: sider	2021-07-02 18:15:18 +05:30
marination	311e277204	fix: Sider	2021-07-02 18:11:13 +05:30
Anurag Mishra	73db919c99	fix: set query for training events (#26303 ) * fix: set query * fix: remove whitespace between function and params Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2021-07-02 17:55:42 +05:30
Anurag Mishra	0a79cfa170	fix: set query for training events (#26302 ) * fix: set query * fix: whitespace between function name and param Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2021-07-02 17:54:43 +05:30
marination	4503a38361	fix: Handle Stock Reco cancellation and limit reposting - Handled cancellation of reco with and without prior SLE - Repost / Recalculate balance qty only till next stock reco	2021-07-02 17:13:45 +05:30
GangaManoj	f8ee8058e7	fix(Sales Invoice): Reset disposal_date on returning the Asset	2021-07-02 15:45:52 +05:30
Afshan	b6076f772d	fix: only "Tax" type accounts should be shown for selection in GST Settings	2021-07-02 15:39:16 +05:30
Afshan	20f73d4c58	fix: only "Tax" type accounts should be shown for selection in GST Settings	2021-07-02 15:34:26 +05:30
GangaManoj	4cf3d9ac20	fix(Sales Invoice): Let invoice be created for Sold Assets if it's a return invoice	2021-07-02 15:25:04 +05:30
Ashish Shah	c0817838d9	fix: when lead is created with mobile_no, mobile_no value gets lost (#26298 ) Summary: When a Lead is created with mobile_no, mobile_no value gets lost (mobile_no value is overwritten by phone value) It is backport of https://github.com/frappe/erpnext/pull/26116 Steps to reproduce [1]Create a Lead. [2]Enter Person Name(lead_name): before_fix Under Contact section, enter Phone(phone): 11 and Mobile No.(mobile_no):22 [3]Save it [4] F12, cur_frm.doc.phone : 11 (correct) cur_frm.doc.mobile_no : 11 (incorrect, it should be 22) [5]Under Address & Contact section ,check contact_html it shows before_fix Phone: 11 (Primary label is missing) Phone: 22 (incorrect, it should be Mobile No:22, also Primary label is missing) Actual: mobile_no value is lost. it is overwritten by phone value following is image with error (before fix) ![image](https://user-images.githubusercontent.com/29812965/122664017-54b2e880-d1bc-11eb-8e4c-767a23ed7eb7.png) Expected: mobile_no value should be retained following is image after fix ![image](https://user-images.githubusercontent.com/29812965/122664037-64323180-d1bc-11eb-8f6f-7628cdaa7adc.png)	2021-07-02 15:16:42 +05:30
Ashish Shah	4e6805b04e	fix: When Lead is created with mobile_no, mobile_no value gets lost (it is overwritten by phon value) (#26116 ) Steps to reproduce [1]Create a Lead. [2]Enter Person Name(lead_name): XX under Contact section, enter Phone(phone): 11 and Mobile No.(mobile_no):22 [3]Save it [4] F12, cur_frm.doc.phone : 11 (correct) cur_frm.doc.mobile_no : 11 (incorrect) [5]Under Address & Contact section ,check contact_html it shows ty Phone: 22 (correct) Phone: 11 (in correct) Actual: mobile_no value is lost. it is overwritten by phone value Expected: mobile_no value should be retained	2021-07-02 13:35:04 +05:30
Anupam Kumar	877597bc16	fix: feating employee in payroll entry (#26271 )	2021-07-02 13:10:18 +05:30
Jannat Patel	0a15a03522	fix: lms progress issue (#26250 ) Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2021-07-02 13:06:56 +05:30
Jannat Patel	18533e381a	fix: lms progress issue (#26253 )	2021-07-02 12:57:06 +05:30
Mohammed Yusuf Shaikh	ad6f20c5c7	fix: Added permission for employee to book appointment (#26255 )	2021-07-02 12:32:22 +05:30
Mohammed Yusuf Shaikh	6c2f66b0a4	fix: Added permission for employee to book appointment (#26266 )	2021-07-02 12:21:44 +05:30
Mohammed Yusuf Shaikh	86f41839fe	fix: Added a message to enable appointment booking if disabled (#26233 ) * fix: Added a message to enable appointment booking if disabled * refactor: added translation for the message Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com> * fix: added missing import * fix: minor identation and space fix Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2021-07-02 12:19:24 +05:30
Jannat Patel	5173e74a04	fix: Project Portal Enhancements (#26290 ) * fix: project portal enhancements * fix: condition for pills	2021-07-02 11:48:46 +05:30
Saqib	f9c58934d8	Merge branch 'develop' into asset-repair-refactor	2021-07-02 11:19:47 +05:30
Ankush	8ebf32e18f	fix: undo changes to issue.py (#26291 ) The fix ported from v13 to develop is not valid because of the new generic SLA feature. Hard resetting the file to the previous version. `ec25d5938b`	2021-07-02 11:09:19 +05:30
Deepesh Garg	d4146a91d6	Merge pull request #25323 from m1ngaa/patch-1 Delete accounts (an empty file)	2021-07-01 23:38:56 +05:30
Deepesh Garg	991d3cdd76	fix: Incorrect discount amount on amended document	2021-07-01 21:17:17 +05:30
Subin Tom	d2c86bb9d7	fix: Fixed Budget Variance Graph color from all black to default	2021-07-01 19:59:08 +05:30
Saqib	49ef26075a	Merge branch 'develop' into asset-repair-refactor	2021-07-01 19:27:20 +05:30
Deepesh Garg	ba2c3c776f	fix: Bank statement import	2021-07-01 18:56:51 +05:30
Dany Robert	4e96563c92	Merge branch 'develop' into patch-5	2021-07-01 18:56:43 +05:30
Deepesh Garg	8a5c7ea9b4	Merge branch 'develop' into patch-4	2021-07-01 18:08:22 +05:30
marination	752f099e9d	fix: Order Items by weightage in the web items query	2021-07-01 17:20:24 +05:30
Jannat Patel	5a4251107c	feat: Project Portal Enhancements (#26090 ) * fix: project portal enhancements * fix: timesheet table and task nesting * fix: semgrep and link issue * fix: sider * fix: project details view title * fix: project progress pills * fix: website route rule for project * fix: multi level nesting * fix: added subject and indentation Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2021-07-01 17:17:34 +05:30
18alantom	865900fd2d	refactor: add type hints, remove comment, sort imports	2021-07-01 14:37:37 +05:30
Anuja Pawar	d8bc514226	fix: to fetch the correct field in Tax Rule (#25927 )	2021-07-01 14:06:01 +05:30
Nabin Hait	07a74abcc3	Merge branch 'develop' of https://github.com/frappe/erpnext into develop	2021-07-01 12:55:13 +05:30
Nabin Hait	fa006402b8	fix: merge conflict	2021-07-01 12:47:28 +05:30
Ankush	d45e307f02	test: fix expected test failure (#26275 ) reference: https://github.com/frappe/frappe/pull/13557	2021-07-01 12:38:09 +05:30
Nabin Hait	eee03fcbab	bumped to version 13.6.0	2021-07-01 12:57:13 +05:50
rohitwaghchaure	117cf4eca6	Merge pull request #26278 from rohitwaghchaure/fixed-employee-selection-issue-in-payroll-entry fix: employee selection not working in payroll entry	2021-07-01 12:31:45 +05:30
Nabin Hait	d7c4818a5d	Merge pull request #26281 from rohitwaghchaure/fixed-update-cost-not-working-for-draft-bom-pre fix: update cost not working in the draft BOM	2021-07-01 12:30:55 +05:30
Rohit Waghchaure	f99f872946	fix: update cost not working in the draft bom	2021-07-01 12:02:37 +05:30
Rohit Waghchaure	87b4e6ea32	fix: employee selection not working in payroll entry	2021-07-01 12:02:03 +05:30
rohitwaghchaure	c14fc9530c	Merge pull request #26279 from rohitwaghchaure/fixed-update-cost-not-working-for-draft-bom fix: update cost not working in the draft BOM	2021-07-01 11:57:32 +05:30
Rohit Waghchaure	a856624ccb	fix: employee selection not working in payroll entry	2021-07-01 11:56:55 +05:30
Rohit Waghchaure	0bfd56e615	fix: update cost not working in the draft bom	2021-07-01 11:50:48 +05:30
Deepesh Garg	68c697b354	fix: Auto process deferred accounting for multi-company setup	2021-07-01 09:31:31 +05:30
Dany Robert	4023ed8356	Merge branch 'develop' into patch-5	2021-06-30 22:43:00 +05:30
Nabin Hait	cf4e29a604	chore: Added change log for v13.6.0	2021-06-30 20:27:43 +05:30
Deepesh Garg	970d90f3b2	Merge pull request #25970 from GangaManoj/exchange-rate-difference-handling feat: Exchange rate difference handling in procurement cycle	2021-06-30 20:25:39 +05:30
Anupam	03f7609a8b	fix: moving campaign from selling to CRM	2021-06-30 18:18:03 +05:30
Anupam	8492bf040d	fix: feating employee in payroll entry	2021-06-30 17:17:43 +05:30
Deepesh Garg	cf7af62b05	fix: Code cleanup	2021-06-30 14:14:32 +05:30
Rohit Waghchaure	815e6ec846	fix: minor removed unused file	2021-06-30 11:35:50 +05:30
rohitwaghchaure	2a1d1e1cb1	Merge pull request #26240 from rohitwaghchaure/production-plan-sub-assembly-enhancement feat: provision to make subcontracted purchase order from the production plan	2021-06-30 11:15:11 +05:30
Rucha Mahabal	77b0b8a877	fix: edit node button overflowing	2021-06-30 02:29:16 +05:30
Rucha Mahabal	b8a18bfef1	feat: add arc to connectors in mobile view	2021-06-30 01:57:43 +05:30
Rucha Mahabal	a7507f7af6	refactor: use arcs instead of bezier curves for cleaner connectors	2021-06-30 01:46:10 +05:30
Rohit Waghchaure	46b67b901b	fix: incorrect valuation rate in stock reconciliation	2021-06-30 00:31:00 +05:30
Rucha Mahabal	7558b28b79	fix: revert changes in employee descendants query	2021-06-29 21:57:27 +05:30
Rucha Mahabal	c40b9d276e	feat: setup node edit action	2021-06-29 21:51:21 +05:30
Rucha Mahabal	f15e8b7f5a	refactor: add options to chart - method to return the node data - wrapper for showing the hierarchy	2021-06-29 21:26:47 +05:30
Deepesh Garg	a287b22b55	Merge pull request #26252 from deepeshgarg007/loan_security_pledge_on_cancel fix: Cancellation of Loan Security Pledges	2021-06-29 20:23:46 +05:30
Rohit Waghchaure	61690775a8	feat: provision to make subcontracted purchase order from the production plan	2021-06-29 19:59:20 +05:30
Rucha Mahabal	bcc998e8c2	chore: create separate files for Desktop and Mobile view and bundle assets	2021-06-29 19:15:08 +05:30
Rucha Mahabal	b7c61ff651	fix: don't refresh connections for same node - remove all connectors while expanding a group node	2021-06-29 18:21:42 +05:30
GangaManoj	b4b6c8e262	Revert "fix: Test" This reverts commit `feed97ec53`.	2021-06-29 17:58:39 +05:30
Rucha Mahabal	f5314293c6	feat: connectors for mobile node cards	2021-06-29 17:48:44 +05:30
Deepesh Garg	9181dde86a	fix: Cancelation of Loan Security Pledges	2021-06-29 17:18:39 +05:30
Rucha Mahabal	1f10a99910	fix: Employee Inactive status implications (#26245 )	2021-06-29 15:58:56 +05:30
Rucha Mahabal	91dcc07e26	fix: Employee Inactive status implications (#26244 )	2021-06-29 15:58:46 +05:30
Rucha Mahabal	8f2b8e47f7	fix: Employee Inactive status implications (#26243 )	2021-06-29 15:58:30 +05:30
Rucha Mahabal	25e8723032	fix: expanded node group interactions and visibility	2021-06-29 15:06:09 +05:30
Rucha Mahabal	6e3a7b4a75	feat(mobile): sibling node group expansion and rendering	2021-06-29 11:12:47 +05:30
Rohit Waghchaure	2d1c4fee1d	fix: allow to changes to date in the blanket order	2021-06-29 00:33:55 +05:30
GangaManoj	d748e7f49c	fix: Create common function for fetching conversion rate details of linked docs	2021-06-28 22:39:43 +05:30
GangaManoj	506d5ac3d5	fix: Make exchange rate handling more efficient	2021-06-28 22:39:43 +05:30
GangaManoj	8f52db788a	fix(Purchase Invoice): Improve test for exchange rate difference handling	2021-06-28 22:39:41 +05:30
GangaManoj	a826fb8f95	fix(Purchase Receipt): Remove print statements	2021-06-28 22:38:59 +05:30
GangaManoj	3f5e7bf6d7	fix(Purchase Invoice): Fetch Purchase Receipt details using a function	2021-06-28 22:38:59 +05:30
marination	feed97ec53	fix: Test	2021-06-28 22:38:21 +05:30
GangaManoj	5314445d58	fix(Purchase Receipt): Add test for exchange rate difference handling	2021-06-28 22:02:57 +05:30
GangaManoj	d97505b277	fix(Purchase Receipt): Resolve difference caused by change in exchange rate	2021-06-28 22:02:22 +05:30
GangaManoj	206313d69b	fix(Purchase Invoice): Add test for exchange rate difference handling	2021-06-28 22:02:20 +05:30
GangaManoj	6233eaa3bb	fix(Purchase Invoice): Fix condition	2021-06-28 22:00:49 +05:30
GangaManoj	785a71dcd2	fix(Purchase Invoice): Resolve difference caused by change in exchange rate	2021-06-28 22:00:49 +05:30
Saqib	4277e4c94b	fix: unreachable test case (#26234 )	2021-06-28 19:10:46 +05:30
Dany Robert	31afc61190	fix: Update test cases to suit values from exchangerate.host	2021-06-28 19:05:51 +05:30
Dany Robert	e9bc2f354b	feat: Increase number of supported currency exchanges Switch from frankfurter.app to exchange rate.host to accommodate more currency usage.	2021-06-28 19:01:52 +05:30
rohitwaghchaure	3c97839826	Merge pull request #26130 from rohitwaghchaure/develop-production-plan-fix-to-show-parent-warehouse fix: allow to select group warehouse while downloading materials from…	2021-06-28 17:18:55 +05:30
rohitwaghchaure	9bcc402f41	Merge pull request #26230 from rohitwaghchaure/fixed-fetch-bom-items-in-stock-reco-pre fix: fetch batch items in stock reconciliation	2021-06-28 15:18:07 +05:30
Saqib	40c90d03a4	fix(Asset Repair): cancellation	2021-06-28 11:42:28 +05:30
Deepesh Garg	7d7d797ffc	fix: Do not consider cancelled entries in party dashboard	2021-06-28 11:24:32 +05:30
Saqib	4b69563a56	Merge branch 'develop' into asset-repair-refactor	2021-06-28 11:07:58 +05:30
Deepesh Garg	ebc46c1e09	fix: Update account heads in GST test cases	2021-06-28 10:52:38 +05:30
Deepesh Garg	cf445eb7b4	fix: Add validate bank account method back	2021-06-26 23:59:47 +05:30
Deepesh Garg	1e5482cedd	fix: Revert Changes	2021-06-26 23:49:32 +05:30
Rohit Waghchaure	478360397d	fix: fetch batch items in stock reco	2021-06-26 22:31:03 +05:30
Rohit Waghchaure	5d5dc56f94	fix: removed values out of sync validation from stock transactions	2021-06-26 22:29:19 +05:30
rohitwaghchaure	c1853ddf73	Merge pull request #26226 from rohitwaghchaure/fixed-removed-values-out-of-sync-on-stock-transaction-submission fix: removed values out of sync validation from stock transactions	2021-06-26 22:28:42 +05:30
Rohit Waghchaure	170f2ad056	fix: removed values out of sync validation from stock transactions	2021-06-26 21:42:47 +05:30
Rohit Waghchaure	e5c47f8957	fix: fetch batch items in stock reco	2021-06-26 17:40:27 +05:30
GangaManoj	ca2dbcec59	fix(Asset Repair): Rearrange fields	2021-06-26 01:32:17 +05:30
Ankush Menat	6588a936d5	fix: order and time of operations for multilevel bom - Order of operations was being sorted by idx of individual operations in BOM table, which made the ordering useless. - This adds ordering that's sorted from lowest level item to top level item. - chore: remove dead functionality. There's no `items` table. Required item level operations get overwritten on fetching of items / operations e.g. when clicking on multi-level BOM checkbox. - test: add test for tree representation - feat: BOMTree class to get complete representation of a tree	2021-06-25 20:16:11 +05:30
Ankush Menat	9af3f12411	fix(ux): show bom in operations child table	2021-06-25 20:16:11 +05:30
Ankush Menat	b4e7ee0e45	chore: remove dead and py2 compatibility code form_grid_template doesn't exist	2021-06-25 20:16:11 +05:30
Ankush Menat	805ac4ffdf	fix: order and time of operations for multilevel bom - Order of operations was being sorted by idx of individual operations in BOM table, which made the ordering useless. - This adds ordering that's sorted from lowest level item to top level item. - chore: remove dead functionality. There's no `items` table. Required item level operations get overwritten on fetching of items / operations e.g. when clicking on multi-level BOM checkbox. - test: add test for tree representation - feat: BOMTree class to get complete representation of a tree	2021-06-25 16:44:57 +05:30
Ankush Menat	305bbc7619	fix(ux): show bom in operations child table # Conflicts: # erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json	2021-06-25 16:44:57 +05:30
Ankush Menat	923832c316	chore: remove dead and py2 compatibility code form_grid_template doesn't exist	2021-06-25 16:44:57 +05:30
18alantom	98c9b0e9ed	refactor: remove unused func, sider fixes	2021-06-25 16:13:09 +05:30
Marica	5474c09c70	Merge pull request #25886 from ankush/work_order_flat_ops fix: order and time of operations in multilevel BOM work order	2021-06-25 16:05:54 +05:30
Ankush Menat	9e43445f36	fix: order and time of operations for multilevel bom - Order of operations was being sorted by idx of individual operations in BOM table, which made the ordering useless. - This adds ordering that's sorted from lowest level item to top level item. - chore: remove dead functionality. There's no `items` table. Required item level operations get overwritten on fetching of items / operations e.g. when clicking on multi-level BOM checkbox. - test: add test for tree representation - feat: BOMTree class to get complete representation of a tree	2021-06-25 14:44:55 +05:30
Ankush Menat	6ec8875434	fix(ux): show bom in operations child table	2021-06-25 14:44:53 +05:30
Ankush Menat	ff4aadc657	chore: remove dead and py2 compatibility code form_grid_template doesn't exist	2021-06-25 14:43:49 +05:30
Deepesh Garg	8dd99c02cc	fix: Check for is None	2021-06-25 14:27:50 +05:30
Deepesh Garg	cae42b48f1	fix: Error while fetching item taxes	2021-06-25 14:27:43 +05:30
Deepesh Garg	6eb8d19cc9	fix: Check for is None	2021-06-25 14:02:12 +05:30
Deepesh Garg	cd36ba7e64	fix: Error while fetching item taxes	2021-06-25 14:02:04 +05:30
Deepesh Garg	e955a4ee72	fix: Check for is None	2021-06-25 13:38:06 +05:30
Deepesh Garg	2ca9b765ef	fix: Error while fetching item taxes	2021-06-25 13:34:00 +05:30
Ankush	532a224c44	fix: precision rate for packed items (#26046 ) (#26217 ) Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>	2021-06-25 13:28:01 +05:30
Noah Jacob	58daf5f916	fix: precision rate for packed items (#26046 )	2021-06-25 12:52:17 +05:30
Alan	37a25308ae	fix: add validation for 'for_qty' else throws errors (#25829 ) (#26214 ) * fix: add validation for 'for_qty' else throws errors * fix: check if for_qty is None * fix: check purpose * fix: add purpose to pick list get_doc * fix: set as read only to prevent se from picking up value * chore: undo changes to doctype modified timestamp	2021-06-25 12:40:38 +05:30
Subin Tom	43f85a2877	fix: changed profitability analysis report width (#26165 )	2021-06-25 11:38:11 +05:30
Deepesh Garg	3239f774bd	Merge pull request #26183 from deepeshgarg007/item_tax_fetch_fix_develop fix: User is not able to change item tax template	2021-06-25 10:46:14 +05:30
GangaManoj	dcb8a2895c	fix(Asset Repair): Simplify code for Asset Repair creation in tests	2021-06-24 22:30:08 +05:30
GangaManoj	c73e137bfa	fix(Asset Repair): Edit description for total_repair_cost	2021-06-24 22:27:30 +05:30
GangaManoj	b44e4121da	fix(Asset Repair): Move filters for cost_center, warehouse and project to setup	2021-06-24 22:25:45 +05:30
GangaManoj	289b449f2b	fix(Asset): Add comment	2021-06-24 22:21:08 +05:30
GangaManoj	f4e8e7d933	fix(Asset): Remove extra tabs	2021-06-24 22:18:59 +05:30
Deepesh Garg	7b7796c1ed	fix: Linting fixes	2021-06-24 21:13:18 +05:30
Deepesh Garg	8cdd7ce7b6	fix: Add python 3 compatible string types	2021-06-24 21:13:10 +05:30
Deepesh Garg	dce2676f7a	Merge branch 'develop' of https://github.com/frappe/erpnext into internal_transfer_payment_tax	2021-06-24 21:08:57 +05:30
Deepesh Garg	c151c67d97	fix: Flaky test	2021-06-24 21:08:19 +05:30
Alan	8958f55890	fix: add validation for 'for_qty' else throws errors (#25829 ) * fix: add validation for 'for_qty' else throws errors * fix: check if for_qty is None * fix: check purpose * fix: add purpose to pick list get_doc * fix: set as read only to prevent se from picking up value Co-authored-by: Ankush <ankushmenat@gmail.com> * chore: undo changes to doctype modified timestamp Co-authored-by: Ankush <ankushmenat@gmail.com>	2021-06-24 21:01:55 +05:30
Ankush	21e44b19f0	perf: don't query unless required (bp #26175 ) re-order conditionals so queries are not evaluated unless required. # Conflicts: # erpnext/stock/doctype/batch/batch.py	2021-06-24 20:58:07 +05:30
Ankush	2ea750eadd	perf: don't query unless required (#26175 ) re-order conditionals so queries are not evaluated unless required.	2021-06-24 20:29:18 +05:30
Noah Jacob	0ceec76d98	refactor: update cost updates operation time and hour rates in BOM (fp #25891 ) * refactor: updates hour_rate and operation time on update cost * refactor: hour_rates are updated in routing when updated in workstations * test: test cases for updating hour_rates and operation time in linked bom	2021-06-24 20:27:47 +05:30
Nabin Hait	67768faaef	Merge branch 'version-13-hotfix' into version-13-pre-release	2021-06-24 20:16:04 +05:30
Deepesh Garg	b4b76b75cd	Merge pull request #26176 from deepeshgarg007/item_tax_fetch_fix fix: User is not able to change item tax template	2021-06-24 19:55:49 +05:30
Deepesh Garg	970d2af7ad	Merge pull request #26211 from deepeshgarg007/include_dimension_filter fix: Account filter not working with accounting dimension filter	2021-06-24 19:55:12 +05:30
Deepesh Garg	1564d39bf4	Merge pull request #26188 from deepeshgarg007/internal_transfer_payment_tax_v13 fix: Taxes on Internal Transfer payment entry	2021-06-24 19:51:48 +05:30
Deepesh Garg	e3ca177828	fix: Remove debug flag	2021-06-24 19:51:23 +05:30
Deepesh Garg	bdba29bab5	fix: Account filter not working with accounting dimension filter	2021-06-24 19:48:11 +05:30
Ankush	5708b7140b	fix: batch nos in packed items (bp #26105 ) * test: batch info in packed_items * fix(ux): make packed items editable * refactor: allow custom table name for set_batch In some doctypes there are multiple child tables requiring batched items. This change makes the function a bit more flexible. * fix: Auto fetch batch_nos in packed_item table	2021-06-24 19:38:37 +05:30
Noah Jacob	ac0bc1f170	fix: precision rate for packed items (#26208 )	2021-06-24 19:36:17 +05:30
Saqib	b3a0a7b432	fix: too many writes while renaming company abbreviation (#26203 )	2021-06-24 19:30:10 +05:30
Saqib	64c6b34b94	fix: too many writes while renaming company abbreviation (#26142 )	2021-06-24 19:29:56 +05:30
Saqib	3b5978cdb8	Merge pull request #26093 from nextchamp-saqib/pr-item-gl-fix fix: purchase receipt gl entries with same item code	2021-06-24 19:29:08 +05:30
Deepesh Garg	1658107a92	fix: Linting fixes	2021-06-24 19:18:50 +05:30
Deepesh Garg	e21e435a0d	fix: Add python 3 compatible string types	2021-06-24 19:17:58 +05:30
Nabin Hait	a57976660a	fix: merge conflict	2021-06-24 19:14:33 +05:30
Ankush	7a63d782db	fix: batch nos in packed items (#26105 ) * test: batch info in packed_items * fix(ux): make packed items editable * refactor: allow custom table name for set_batch In some doctypes there are multiple child tables requiring batched items. This change makes the function a bit more flexible. * fix: Auto fetch batch_nos in packed_item table	2021-06-24 19:07:16 +05:30
Deepesh Garg	9382b1f154	fix: Flaky test	2021-06-24 19:03:22 +05:30

... 13 14 15 16 17 ...

29079 Commits