29079 Commits

Author	SHA1	Message	Date
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)  Expected: mobile_no value should be retained following is image after fix 	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
Deepesh Garg	acbf56f162	Merge pull request #26182 from deepeshgarg007/gstr_1_export_invoices_error_develop ... fix: Export invoices not visible in GSTR-1 report	2021-06-24 18:43:40 +05:30
Deepesh Garg	11591b3e3e	Merge pull request #26202 from nextchamp-saqib/pr-item-gl-fix-v13 ... fix: purchase receipt gl entries with same item code	2021-06-24 18:36:23 +05:30
Anuja Pawar	a50196bcd9	fix: dunning permission error in payment entry (#26204)	2021-06-24 18:25:16 +05:30
rohitwaghchaure	27797ffa46	Merge pull request #24523 from rohitwaghchaure/sub-operation-new-branch ... Feat: Job Card Enhancements	2021-06-24 18:19:42 +05:30
Rohit Waghchaure	2330c41cca	fix: total time calculation	2021-06-24 18:14:19 +05:30
Rohit Waghchaure	57307443f0	is corrective job card	2021-06-24 18:14:19 +05:30
Rohit Waghchaure	c878389050	fix: or condition filter in the get_all	2021-06-24 18:14:18 +05:30
Jannat Patel	6a9798f305	fix: update leave allocation after submit (#26191) ... * fix: update leave allocation after submit v13 * fix: test * fix: test	2021-06-24 18:11:33 +05:30
Rohit Waghchaure	fcab53b238	fix: skip job card	2021-06-24 18:07:31 +05:30
Rohit Waghchaure	6e81489095	feat: Job Card Enhancements	2021-06-24 18:07:30 +05:30
Saqib Ansari	f6dce4df73	test: service item purchase with perpetual inventory enabled	2021-06-24 17:41:52 +05:30
Saqib Ansari	1ca8f6a51d	fix: purchase receipt gl entries with same item code	2021-06-24 17:41:44 +05:30
Saqib	c10fea8a59	Merge branch 'develop' into pr-item-gl-fix	2021-06-24 17:39:36 +05:30
Saqib	2980db30ce	Merge pull request #26157 from nextchamp-saqib/pos-fixes-9 ... refactor(pos): use pos invoice item name as unique identifier	2021-06-24 17:38:41 +05:30
Saqib	81d164134d	Merge pull request #26198 from nextchamp-saqib/pos-fixes-9-v13 ... refactor(pos): use pos invoice item name as unique identifier	2021-06-24 17:37:51 +05:30
Afshan	9dc625c1c9	fix: validate product bundle for existing transactions before deletion (#25978)	2021-06-24 17:36:39 +05:30
Deepesh Garg	79daed00c1	Merge pull request #26201 from noahjacob/shipping_address_fix_v13 ... fix: fetch preferred shipping address (bp #26132)	2021-06-24 17:35:34 +05:30
Deepesh Garg	755ebdf582	Update party.js	2021-06-24 17:35:14 +05:30
Deepesh Garg	e693cceb58	Merge pull request #26132 from noahjacob/shipping_address_fix ... fix: fetch preferred shipping address	2021-06-24 17:31:21 +05:30
Deepesh Garg	f84f8d5260	Update party.js	2021-06-24 17:29:55 +05:30
Noah Jacob	da82bd4b51	refactor: update cost updates operation time and hour rates in BOM (#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 17:23:21 +05:30
Noah Jacob	dbdf2515cd	fix: fetches correct preferred shipping address	2021-06-24 17:06:18 +05:30
Nabin Hait	5b462ad11a	fix: merge conflict	2021-06-24 15:36:51 +05:30
Nabin Hait	b5d1a7731c	bumped to version 13.5.2	2021-06-24 15:55:50 +05:50
Nabin Hait	c1954ec72a	Merge pull request #26195 from deepeshgarg007/deferred_revenue_error ... fix: Error while booking deferred revenue	2021-06-24 15:35:02 +05:30
Nabin Hait	7a8a449ed4	Merge pull request #26197 from deepeshgarg007/deferred_revenue_error_pre_release ... fix: Error while booking deferred revenue	2021-06-24 15:34:58 +05:30
GangaManoj	e21d44c5c3	fix(Asset): Remove to_date field	2021-06-24 15:04:44 +05:30
Saqib Ansari	3b12601461	fix: sider issues	2021-06-24 15:03:04 +05:30
Saqib Ansari	e39c3f2e69	fix: add missing semicolons	2021-06-24 15:02:59 +05:30
Saqib Ansari	ea70f6f933	fix: hide images from cart & details	2021-06-24 15:02:53 +05:30
Saqib Ansari	54cc1dedf2	refactor(pos): use pos invoice item name as unique identifier	2021-06-24 15:02:43 +05:30
Saqib Ansari	4d3e748c00	fix: sider issues	2021-06-24 15:01:33 +05:30
Marica	bf3e191570	Merge pull request #26193 from marination/country-modal-cart-v13-release ... fix: Address Card issues in e-commerce	2021-06-24 14:57:39 +05:30
GangaManoj	2fdb923953	fix(Asset Repair): Change controller hooks	2021-06-24 14:56:34 +05:30
Deepesh Garg	f79a72dbf3	fix: Error while booking deferred revenue	2021-06-24 14:49:09 +05:30
Saqib	73aaa1c275	Merge branch 'develop' into pos-fixes-9	2021-06-24 14:31:19 +05:30
Saqib Ansari	8aa0e31bb4	fix: add missing semicolons	2021-06-24 14:29:22 +05:30
Afshan	7fd44907ba	feat: fetching of qty as per received qty from PR to PI (#26184)	2021-06-24 14:26:36 +05:30
Ankush	98e98d25e6	fix(Work Order): added freeze when trying to stop work order (#26192) (#26196) ... * fix: added freeze when trying to stop work order * fix(ux): add freeze message Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>	2021-06-24 14:24:28 +05:30
Noah Jacob	b2b7369874	fix(Work Order): added freeze when trying to stop work order (#26192) ... * fix: added freeze when trying to stop work order * fix(ux): add freeze message	2021-06-24 14:21:35 +05:30
Deepesh Garg	ca2e914715	fix: Error while booking deferred revenue	2021-06-24 14:14:46 +05:30
marination	820a579051	chore: Test for Item visibility in multiple item group pages	2021-06-24 13:57:18 +05:30
marination	4f0e6cd911	fix: Sider	2021-06-24 13:57:00 +05:30
marination	f913838373	fix: Consider Table Multiselect fields in Query engine ... - Since table multiselect fields were not handled, the query tried searching for this child field in item master - This broke the query - On trying to reload or go back to all-products page with field filters that are table mutiselect, page breaks	2021-06-24 13:56:49 +05:30
marination	9f305e983c	fix: Filters did not consider Website Item Group	2021-06-24 13:56:35 +05:30
marination	ea2408744a	fix: Consider Website Item Groups in Item group page product listing ... - Passed an argument to query engine to know when query is for item group page - If for item group page, get data with regards to website item group table - This query should be fast since there's one filter and that shortens the table beforehand - This data is merged with the results from the Item master (results only considering item attributes and field filters) - The combined data is then sorted as per weightage Co-authored-by: Gavin D'souza <gavin18d@gmail.com>	2021-06-24 13:56:15 +05:30
marination	5884f1aeb0	fix: (style) Address card buttons hover state	2021-06-24 13:50:29 +05:30
marination	26bec9d7b4	fix: Country Link field in 'Add address' website modal auto-clears	2021-06-24 13:50:18 +05:30
Marica	ce99701150	Merge pull request #26170 from marination/web-item-group ... fix: Website item group logic for product listing in Item Group pages	2021-06-24 13:28:18 +05:30
GangaManoj	550fe8ae39	fix(Asset): Remove redundant code	2021-06-24 13:22:26 +05:30
Rucha Mahabal	e81775d6f7	chore: remove unused import	2021-06-24 13:18:49 +05:30
Jannat Patel	ca8c3b90f0	fix: Update leave allocation after submit (#25975) ... * update leave allocation after submit * fix: leave allocation update after submit * fix: circular dependency * fix: replaced update with submit in tests * fix: replaced update with submit in tests * fix: updating total leaves allocated	2021-06-24 13:13:03 +05:30
marination	a4f5dcaa9a	chore: Test for Item visibility in multiple item group pages	2021-06-24 13:08:20 +05:30
Rucha Mahabal	357657fa73	chore: create a separate controller file for EmployeeBoardingController	2021-06-24 13:00:50 +05:30
GangaManoj	60a44ae1e6	fix(Asset): Fix test	2021-06-24 12:44:13 +05:30
Marica	6b15a05de4	Merge pull request #26187 from marination/country-modal-cart ... fix: Address Card issues in e-commerce	2021-06-24 12:25:21 +05:30
Rucha Mahabal	c5c858e428	Merge branch 'develop' into fix-employee-onboarding-status	2021-06-24 12:24:44 +05:30
Deepesh Garg	437e972108	Merge pull request #26143 from deepeshgarg007/gstr_1_export_invoices_error ... fix: Export invoices not visible in GSTR-1 report	2021-06-24 12:15:29 +05:30
Deepesh Garg	ab7a16a952	Merge pull request #26180 from deepeshgarg007/pi_billing_address_develop ... fix: Billing address not fetched in Purchase Invoice	2021-06-24 12:13:17 +05:30
Deepesh Garg	5b119ac4a4	Merge pull request #26178 from deepeshgarg007/payroll_accounting_dimension_develop ... fix: Accounting Dimensions for payroll entry accrual Journal Entry	2021-06-24 12:12:37 +05:30
Deepesh Garg	9d8e8f8bdf	fix: Do not show received amount after tax for internal tarnsfers	2021-06-24 12:02:39 +05:30
Deepesh Garg	bd9317956b	fix: Taxes on Internal Transfer payment entry	2021-06-24 12:02:32 +05:30
marination	bbe64b5604	fix: (style) Address card buttons hover state	2021-06-24 12:01:12 +05:30
Rucha Mahabal	a9b5dc6030	fix: chart not visible for First Response Time reports (#26032) (#26185)	2021-06-24 11:53:28 +05:30
Ganga Manoj	604f0b8f01	fix: message on successful creation of opening invoices (#25998)	2021-06-24 11:04:27 +05:30
marination	f5fa1ee4b6	fix: Country Link field in 'Add address' website modal auto-clears	2021-06-24 11:03:32 +05:30
Rucha Mahabal	7dbb032468	fix: chart not visible for First Response Time reports (#26032)	2021-06-24 10:41:56 +05:30
Deepesh Garg	269962a8dc	fix: Check if item tax template exists	2021-06-24 10:40:07 +05:30
Deepesh Garg	808f83f385	fix: Make item tax templates optional	2021-06-24 10:39:58 +05:30
Deepesh Garg	94d460412a	fix: User is not able to change item tax template	2021-06-24 10:39:49 +05:30
Deepesh Garg	5e49bee755	Merge pull request #26083 from deepeshgarg007/payroll_accounting_dimension ... fix: Accounting Dimensions for payroll entry accrual Journal Entry	2021-06-24 10:38:42 +05:30
Deepesh Garg	2dc90dd8ac	fix: Export invoices not visible in GSTR-1 report	2021-06-24 10:37:19 +05:30
Deepesh Garg	03b629c851	Merge pull request #26100 from deepeshgarg007/pi_billing_address ... fix: Billing address not fetched in Purchase Invoice	2021-06-24 10:29:01 +05:30
Deepesh Garg	7bef18f3d8	fix: Remove unintentional changes	2021-06-24 10:28:25 +05:30
Deepesh Garg	c8a6b31f06	Merge branch 'develop' of https://github.com/frappe/erpnext into pi_billing_address_develop	2021-06-24 10:27:16 +05:30
Deepesh Garg	da7f45130b	fix: Billing address not fetched in Purchase Invoice	2021-06-24 10:25:24 +05:30
Deepesh Garg	5f5bbf622a	Merge pull request #26179 from deepeshgarg007/sales_order_billed_qty_develop ... fix: Incorrect billed qty in Sales Order analytics	2021-06-24 10:22:07 +05:30
Deepesh Garg	4cf0b02ddc	Merge pull request #26095 from deepeshgarg007/sales_order_billed_qty ... fix: Incorrect billed qty in Sales Order analytics	2021-06-24 10:21:57 +05:30
Deepesh Garg	70823b6d9a	fix: Incorrect billed qty in Sales Order analytics	2021-06-24 10:21:17 +05:30
Deepesh Garg	c451f43f64	fix(minor): Translation and linting issues	2021-06-24 10:18:46 +05:30
Deepesh Garg	3da0541000	fix: Accouting Dimensions for payroll entry accrual Journal Entry	2021-06-24 10:18:36 +05:30
Afshan	53fefd7513	feat: fetching of qty as per received qty from PR to PI (#25837)	2021-06-24 10:09:02 +05:30
Deepesh Garg	3007c9900b	Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into payroll_accounting_dimension	2021-06-23 23:06:15 +05:30
Deepesh Garg	7e006496dd	fix: Check if item tax template exists	2021-06-23 22:52:51 +05:30
Deepesh Garg	c9c1d10435	fix: Make item tax templates optional	2021-06-23 22:47:29 +05:30
GangaManoj	dce2113736	fix(Asset Repair): Remove test that's no longer necessary	2021-06-23 22:26:45 +05:30
GangaManoj	2f5f9d8566	fix(Asset): Fix value_after_depreciation calculation	2021-06-23 22:19:05 +05:30
Deepesh Garg	1f7b95f390	fix: User is not able to change item tax template	2021-06-23 20:56:27 +05:30
marination	078826d510	fix: Sider	2021-06-23 20:12:59 +05:30
marination	f913e0dd05	fix: Consider Table Multiselect fields in Query engine ... - Since table multiselect fields were not handled, the query tried searching for this child field in item master - This broke the query - On trying to reload or go back to all-products page with field filters that are table mutiselect, page breaks	2021-06-23 20:06:11 +05:30
Noah Jacob	b4b6288596	fix: fetches correct preferred shipping address	2021-06-23 17:05:44 +05:30
rohitwaghchaure	b4863bfa50	Merge pull request #25696 from rohitwaghchaure/incorrect-serial-no-qty-valuation-report ... feat: Incorrect valuation rate report for serialized items	2021-06-23 16:52:51 +05:30
marination	1b9b72d12e	fix: Filters did not consider Website Item Group	2021-06-23 16:03:24 +05:30
Deepesh Garg	0bfffddac4	fix: Test Cases	2021-06-23 15:37:17 +05:30
marination	d802d73973	fix: Consider Website Item Groups in Item group page product listing ... - Passed an argument to query engine to know when query is for item group page - If for item group page, get data with regards to website item group table - This query should be fast since there's one filter and that shortens the table beforehand - This data is merged with the results from the Item master (results only considering item attributes and field filters) - The combined data is then sorted as per weightage Co-authored-by: Gavin D'souza <gavin18d@gmail.com>	2021-06-23 14:24:13 +05:30
Jannat Patel	9ec0ded28f	fix: Staffing plan vacancies data type issue (#25941) ... * fix: staffing plan vacancies data type issue * fix: translation issue * fix: removed greater than 0 condition	2021-06-23 14:05:10 +05:30
Jannat Patel	da66cefefc	fix: staffing plan vacancies data type issue (#25936) ... * fix: staffing plan vacancies data type issue * fix: translation issue * fix: removed greater than 0 condition * fix: sider Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2021-06-23 14:04:48 +05:30
GangaManoj	80399802c6	fix(Asset Repair): Replace asset_value with value_after_depreciation in tests	2021-06-23 13:26:47 +05:30
Deepesh Garg	35e11fbea6	fix: Tests	2021-06-23 13:17:01 +05:30
Anurag Mishra	d021db1cb1	fix: Training event (#26164) ... Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2021-06-23 12:59:43 +05:30
Deepesh Garg	208b5f9e73	chore: Add comments	2021-06-23 12:44:56 +05:30
Deepesh Garg	40a4330ec1	fix: Move tax categories up in country wise json	2021-06-23 12:38:37 +05:30
Jannat Patel	44815393b3	fix: job applicant link issue (#25934)	2021-06-23 12:28:02 +05:30
Jannat Patel	0354ec6363	fix: job applicant link issue (#25933) ... Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2021-06-23 12:27:45 +05:30
Anurag Mishra	11c155e6ce	feat: Employee Grievance (#25705) (#26162) ... * feat: Employee Grievance * feat: link to desk and automatic unsuspend * test: Employee Grievance * fix: Sider and Translation * fix: sider * fix: formatting * feat: changes requested * feat: Employee Grievance * feat: link to desk and automatic unsuspend * test: Employee Grievance * fix: Sider and Translation * fix: sider * fix: formatting * feat: changes requested * fix: patch test and sider issue * fix: make Employee Responsible non-mandatory since there cannot be an employee responsible for all sorts of grievances - show pay cut and suspension buttons only if Employee Resposible is set - some label changes * feat: added subject field for more context - set title for documents - added list view settings - refactor suspend and unsuspend functions - add submit and cancel perms for system and hr managers - fix tests * fix: sider issues * fix: removed suspension and paycut * fix:sider * fix: test * fix: test * fix: resolved Conflicts * fix: sider * fix: remove debugging print statements * fix: validation message * fix: unnecessary comma Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com> Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2021-06-23 12:13:32 +05:30
GangaManoj	88348e2da7	fix(Sales Invoice): Print appropriate message if Asset isn't specified when the Item is a Fixed Asset	2021-06-23 11:57:53 +05:30
Deepesh Garg	e8817f97d6	Merge pull request #26150 from nemesis189/changed-profitability-analysis-report-width ... fix: Changed profitability analysis report width	2021-06-23 11:36:43 +05:30
Deepesh Garg	673470705b	Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into bootstraped_gst_setup	2021-06-23 11:33:15 +05:30
GangaManoj	32d7b1f6ad	fix(Sales Invoice): Fix GL Entry creation for Return Invoices linked with Assets	2021-06-23 11:24:05 +05:30
Anurag Mishra	fc98abece9	feat: Employee Grievance (#25705) ... * feat: Employee Grievance * feat: link to desk and automatic unsuspend * test: Employee Grievance * fix: Sider and Translation * fix: sider * fix: formatting * feat: changes requested * feat: Employee Grievance * feat: link to desk and automatic unsuspend * test: Employee Grievance * fix: Sider and Translation * fix: sider * fix: formatting * feat: changes requested * fix: patch test and sider issue * fix: make Employee Responsible non-mandatory since there cannot be an employee responsible for all sorts of grievances - show pay cut and suspension buttons only if Employee Resposible is set - some label changes * feat: added subject field for more context - set title for documents - added list view settings - refactor suspend and unsuspend functions - add submit and cancel perms for system and hr managers - fix tests * fix: sider issues * fix: removed suspension and paycut * fix:sider * fix: test * fix: test * fix: resolved Conflicts * fix: sider * fix: remove debugging print statements * fix: validation message * fix: unnecessary comma Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2021-06-23 11:21:38 +05:30
Saqib	46ae97dfd3	Merge branch 'develop' into pr-item-gl-fix	2021-06-23 11:02:48 +05:30
Saqib	5a824cad81	fix: cannot cancel payment entry if linked with invoices (#26075)	2021-06-23 11:02:05 +05:30
Saqib	08c269510e	Merge branch 'develop' into pos-fixes-9	2021-06-23 10:15:07 +05:30
GangaManoj	8127208774	fix(Sales Invoice): Reset Asset status on issuing Credit Note	2021-06-22 23:12:56 +05:30
GangaManoj	721ff9438a	Merge branch 'develop' into asset-credit-note	2021-06-22 22:45:11 +05:30
marination	ea2c02738d	fix: Include Stock Reco logic in update_qty_in_future_sle	2021-06-22 21:44:50 +05:30
Saqib Ansari	75ce023170	fix: hide images from cart & details	2021-06-22 21:18:44 +05:30
Saqib Ansari	3b225b13e8	refactor(pos): use pos invoice item name as unique identifier	2021-06-22 21:18:20 +05:30
Deepesh Garg	dc6e4f12c6	Merge pull request #26076 from nextchamp-saqib/export-round-off-fix ... fix(e-invoicing): IRN generation for export invoices with round off	2021-06-22 20:45:24 +05:30
Deepesh Garg	7b0d86ead5	fix: Do not show received amount after tax for internal tarnsfers	2021-06-22 20:38:35 +05:30
Deepesh Garg	2af8c171c1	fix: Taxes on Internal Transfer payment entry	2021-06-22 19:48:08 +05:30
Noah Jacob	ce72d0c2c1	fix: fixed rounding off ordered percent to 100 in condition (#26148)	2021-06-22 17:54:16 +05:30
Noah Jacob	c05496a5a7	fix: fixed rounding off ordered percent to 100 in condition (#26152)	2021-06-22 17:53:53 +05:30
GangaManoj	2e45965405	fix(Asset Repair): Fix Sider issues	2021-06-22 17:24:14 +05:30
GangaManoj	859c8c92f7	fix: Remove changes made to Asset Maintenance	2021-06-22 17:16:12 +05:30
Subin Tom	a446d61e10	fix: Changed profitability analysis report width	2021-06-22 16:51:15 +05:30
GangaManoj	2ea325c0c3	fix(Asset Repair): Revert Stock Entry on cancellation	2021-06-22 16:33:10 +05:30
Subin Tom	219a87d530	fix: disable sales order cancellation if linked to draft invoice (#26125)	2021-06-22 16:28:58 +05:30
GangaManoj	3a44d88866	fix(Asset): Fix tests for Asset Repair	2021-06-22 16:28:29 +05:30
Subin Tom	e3a697c582	fix: disable sales order cancellation if linked to draft invoice (#26104)	2021-06-22 16:27:53 +05:30
Subin Tom	889140fd8c	fix: sql syntax error in get_project_name method (#26147)	2021-06-22 16:26:19 +05:30
GangaManoj	3b0eac79bf	fix(Asset Repair): Compute total_value	2021-06-22 16:26:09 +05:30
Saqib	4b4eb990a9	Merge branch 'develop' into asset-repair-refactor	2021-06-22 16:21:13 +05:30
Subin Tom	943b46a759	fix: sql syntax error in get_project_name method (#26145)	2021-06-22 14:26:36 +05:30
Deepesh Garg	cfdda21dd2	fix: Export invoices not visible in GSTR-1 report	2021-06-22 13:03:22 +05:30
marination	c212d7fafd	fix: Sort website products by weightage mentioned in Item master	2021-06-22 11:20:23 +05:30
Marica	703c30f5f8	fix: Consistent alert indicators	2021-06-22 11:20:17 +05:30
Dany Robert	884dd9764b	Merge branch 'develop' into patch-4	2021-06-22 11:18:17 +05:30
GangaManoj	d0d5fedd48	fix(Sales Invoice): Print appropriate message if item.asset is missing when the Item is a Fixed Asset	2021-06-22 00:22:08 +05:30
GangaManoj	5b07e58412	fix(Sales Invoice): Let invoice be created for Sold Assets if it's a return invoice	2021-06-21 23:51:09 +05:30
GangaManoj	600333875a	fix(Sales Invoice): Let item.asset be copied on duplicating the doc	2021-06-21 23:41:35 +05:30
rohitwaghchaure	82adb4f16e	Merge pull request #26118 from rohitwaghchaure/fixed-linking-between-mr-and-sq-develop ... fix: material request and supplier quotation not linked if supplier quotation created from supplier portal	2021-06-21 22:36:03 +05:30
Rucha Mahabal	cce19db826	feat: org chart mobile interactions	2021-06-21 21:55:50 +05:30
marination	f97206b3cb	fix: Sort website products by weightage mentioned in Item master	2021-06-21 19:38:37 +05:30
GangaManoj	5776a962b3	fix(Asset Repair): Return Depreciation Schedule to original state on cancellation	2021-06-21 18:57:11 +05:30
marination	ea0dea46e0	fix: sider and semgrep	2021-06-21 16:51:12 +05:30
marination	49ec0e5ac3	feat: Optionally allow rejected quality inspection on submission	2021-06-21 16:18:35 +05:30
rohitwaghchaure	6a07869e55	Update production_plan.js	2021-06-21 15:41:30 +05:30
Noah Jacob	38f105eaee	test: test cases for fetching customer group details	2021-06-21 15:40:13 +05:30
Rohit Waghchaure	00c05108b2	fix: allow to select group warehouse while downloading materials from production plan	2021-06-21 15:39:49 +05:30
rohitwaghchaure	d6eacf556d	Merge pull request #26126 from rohitwaghchaure/production-plan-fix-to-show-parent-warehouse ... fix: allow to select group warehouse while downloading materials from production plan	2021-06-21 15:39:13 +05:30
Noah Jacob	acef77fb53	test: test case for fetching supplier group details	2021-06-21 15:39:05 +05:30
rohitwaghchaure	8347eb1dba	Update production_plan.js	2021-06-21 15:38:44 +05:30
Noah Jacob	89215e44a4	feat: details fetched from customer group in customer	2021-06-21 15:37:17 +05:30
Noah Jacob	ffe306c2f6	feat: details fetched from supplier group in supplier	2021-06-21 15:36:46 +05:30
GangaManoj	91a99e0d89	fix(Asset Repair): Increase stock quantity and decrease asset value on cancellation	2021-06-21 15:22:02 +05:30
GangaManoj	f88a13b292	fix(Asset Repair): Compute total_value instantly	2021-06-21 15:02:40 +05:30
Rohit Waghchaure	01faa9ca11	fix: rate not able to change in purchase order	2021-06-21 14:56:38 +05:30
GangaManoj	a34bf5edec	fix: Rename 'Stock Item' to 'Asset Repair Consumed Item'	2021-06-21 14:55:34 +05:30
Rohit Waghchaure	773aabae44	fix: allow to select group warehouse while downloading materials from production plan	2021-06-21 14:54:27 +05:30
GangaManoj	b081d79332	fix(Asset Repair): Fix tests	2021-06-21 14:52:00 +05:30
rohitwaghchaure	3956f82e7c	Merge pull request #26122 from rohitwaghchaure/fix-rate-not-able-to-change ... fix: rate not able to change in purchase order	2021-06-21 13:40:29 +05:30
Nabin Hait	27f0495156	Merge branch 'version-13' into develop	2021-06-21 11:28:58 +05:30
Nabin Hait	94484d7766	bumped to version 13.5.1	2021-06-21 11:48:57 +05:50
Afshan	127d637b3d	fix: check for duplicate payment terms in Payment Term Template (#25999)	2021-06-21 11:24:45 +05:30
Ankush	7dae0fbe95	fix: status indicator for delivery notes (bp #26062) ... On list view `per_returned` isn't fetched i.e. `undefined` which become 0 hence the list view indicator is false. This "computation" is already done by status updater, so relying on doc.status is better than redefining it.	2021-06-21 11:19:47 +05:30
Saqib Ansari	9b54aee43e	test: service item purchase with perpetual inventory enabled	2021-06-21 11:18:56 +05:30
Saqib Ansari	d329e27346	Merge branch 'develop' of https://github.com/frappe/erpnext into pr-item-gl-fix	2021-06-21 11:18:45 +05:30
Ankush	e78364c191	fix: status indicator for delivery notes (#26062) ... On list view `per_returned` isn't fetched i.e. `undefined` which become 0 hence the list view indicator is false. This "computation" is already done by status updater, so relying on doc.status is better than redefining it.	2021-06-21 11:15:16 +05:30
Saqib	d8d3e536e0	Merge branch 'develop' into export-round-off-fix	2021-06-21 10:52:12 +05:30
Saqib	fb89008a13	fix(pos): unsupported operand type -=: for 'float' and 'NoneType' (#26097)	2021-06-21 10:49:09 +05:30
Saqib	7ff19ebec8	fix(pos): unsupported operand type -= for 'float' and 'NoneType' (#26096)	2021-06-21 10:48:50 +05:30
Saqib Ansari	99531a35e0	fix(pos): unsupported operand type -= for 'float' and 'NoneType'	2021-06-21 10:47:23 +05:30
Rohit Waghchaure	582f187726	fix: rate not able to change in purchase order	2021-06-21 00:59:02 +05:30
GangaManoj	740df95c58	fix(Asset Repair): Set completion_date on changing repair_status to 'Completed'	2021-06-20 17:44:35 +05:30
Rohit Waghchaure	f0dfea1d47	fix: test case for Project Profitability report	2021-06-20 15:31:25 +05:30
Rohit Waghchaure	e5fb23972a	fix: available qty for consumption	2021-06-20 15:28:25 +05:30
Rohit Waghchaure	110e152fa3	fix: purchase invoice qty change not recalculate the consumed qty and added test cases for purchase invoice	2021-06-20 15:28:23 +05:30
Rohit Waghchaure	6bbc8ec3e8	fix: code cleanup and convert public method to private for subcontracting class	2021-06-20 15:27:04 +05:30
Rohit Waghchaure	d755b29943	fix: toggle consumed qty field based on condition	2021-06-20 15:27:04 +05:30
Rohit Waghchaure	21b58ef045	fix: semgrep error	2021-06-20 15:27:04 +05:30
Rohit Waghchaure	7b7ceaadd9	feat: subcontract code refactor and enhancement	2021-06-20 15:27:01 +05:30
Rohit Waghchaure	9e616b09a2	fix: material request and supplier quotation not linked if sq created from supplier portal against rfq	2021-06-20 15:17:20 +05:30
rohitwaghchaure	ab3cd7e283	Merge pull request #26023 from rohitwaghchaure/fixed-linking-between-mr-and-sq ... fix: material request and supplier quotation not linked if supplier quotation created from supplier portal	2021-06-20 15:16:32 +05:30
Rucha Mahabal	c1ba35b25b	feat: Organizational Chart	2021-06-20 12:42:06 +05:30
Rohit Waghchaure	3d7f660bec	fix: test case for Project Profitability report	2021-06-20 10:20:35 +05:30
Rohit Waghchaure	f5db407461	fix: available qty for consumption	2021-06-19 23:19:45 +05:30
Rohit Waghchaure	5cc3f14506	fix: purchase invoice qty change not recalculate the consumed qty and added test cases for purchase invoice	2021-06-19 23:16:23 +05:30
Rohit Waghchaure	ddb0ec261a	fix: code cleanup and convert public method to private for subcontracting class	2021-06-19 23:16:23 +05:30
Rohit Waghchaure	2fb5291785	fix: toggle consumed qty field based on condition	2021-06-19 23:16:22 +05:30
Rohit Waghchaure	9a2db0b5b1	fix: semgrep error	2021-06-19 23:16:22 +05:30
Rohit Waghchaure	a94b89727c	feat: subcontract code refactor and enhancement	2021-06-19 23:16:22 +05:30
rohitwaghchaure	1c846c5be7	Merge pull request #26114 from rohitwaghchaure/fixed-stock-entry-submission-performance-v13-hotfix ... fix: time out while submitting the stock transactions with more than 50 Items	2021-06-19 18:51:47 +05:30
Rohit Waghchaure	4d81d45a0e	fix: time out while submitting the stock transactions with more than 50 items	2021-06-19 16:15:08 +05:30
rohitwaghchaure	a2bb1b8acd	Merge pull request #26081 from rohitwaghchaure/fixed-stock-entry-submission-performance ... fix: time out while submit / cancel the stock transactions with more than 50 Items	2021-06-19 16:14:14 +05:30
Rohit Waghchaure	8c844e4515	fix: material request and supplier quotation not linked if sq created from supplier portal against rfq	2021-06-19 16:08:26 +05:30
GangaManoj	23876c0854	fix(Asset Repair): Prevent some fields from being copied on duplicating the doc	2021-06-19 15:23:06 +05:30
GangaManoj	012b9eaeff	fix(Asset Repair): Make Error Description non-mandatory	2021-06-19 15:18:54 +05:30
GangaManoj	7db7988e4c	fix(Asset Repair): Add Stock Entry field	2021-06-19 14:54:30 +05:30
GangaManoj	09ba6f6477	fix(Asset Repair): Move Total Repair Cost to the Stock Consumption Details section	2021-06-19 14:06:45 +05:30
GangaManoj	da8da9fa4e	fix: Replace edit_dates with flags.increase_in_asset_life	2021-06-19 14:00:26 +05:30
GangaManoj	2b93e54e1f	fix(Asset Repair): Fix depreciation_amount calculation	2021-06-19 13:45:37 +05:30
GangaManoj	93b9752771	fix: Add comments	2021-06-19 13:06:27 +05:30
Dany Robert	ba288274f2	fix: ignore permission to update call log	2021-06-19 12:31:12 +05:30
Rohit Waghchaure	8520edc952	fix: time out while submitting the stock transactions with more than 50 items	2021-06-19 00:55:35 +05:30
Deepesh Garg	52992b345f	Merge pull request #26106 from deepeshgarg007/loan_repay_via_salary ... fix: Sanctioned loan amount limit check	2021-06-18 23:30:54 +05:30
Deepesh Garg	81c97c13ce	fix: Sanctioned loan amount limit check	2021-06-18 19:57:53 +05:30
Deepesh Garg	22e75725ea	fix: Sanctioned loan amount limit check	2021-06-18 17:25:37 +05:30
Anurag Mishra	ef6e005c04	Merge pull request #26071 from Anurag810/training_event_fixes_2.0 ... fix: Training event	2021-06-18 15:44:56 +05:30
Ankush	4e88dcf956	fix: auto unlink warehouse from item on delete (#26073) (#26101) ... * fix: auto unlink warehouse from item on delete * fix: sider * refactor: use delete_doc * test: add test for unlinking warehouse from item * refactor: add msgprint to inform user of unlink * refactor: cleanup and reuse extant functions * fix: don't delete row, update table Co-authored-by: Alan <2.alan.tom@gmail.com>	2021-06-18 14:48:30 +05:30
Ankush	584fe32900	fix: escaped warehouse value for sql query (bp #26049) ... Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>	2021-06-18 14:47:30 +05:30
Ganga Manoj	3d8f82459b	fix(Issue): reset response_by and resolution_by if SLA is removed (#25997)	2021-06-18 11:42:28 +05:30
Anuja Pawar	b066fe9519	fix: insufficient permission for dunning error (#26092)	2021-06-18 11:29:07 +05:30
Saqib	5633834ef7	Merge branch 'develop' into export-round-off-fix	2021-06-18 11:25:21 +05:30
Saqib	cceabff6e1	Merge branch 'develop' into pr-item-gl-fix	2021-06-18 11:24:54 +05:30
Rohit Waghchaure	7fc50ba460	fix: timeout while cancelling stock reconciliation	2021-06-18 10:45:53 +05:30
Deepesh Garg	a58b571ccb	fix: Billing address not fetched in Purchase Invoice	2021-06-18 10:45:35 +05:30
rohitwaghchaure	3bb9f4a742	Merge pull request #26098 from rohitwaghchaure/enqueue-cancel-action-in-stock-reco ... fix: timeout while cancelling stock reconciliation	2021-06-18 10:44:59 +05:30
Rohit Waghchaure	ef97269386	fix: timeout while cancelling stock reconciliation	2021-06-18 10:11:53 +05:30
GangaManoj	94dfd0e318	fix(Asset): Add function to clear old depreciation schedule	2021-06-18 09:59:45 +05:30
GangaManoj	354116142a	fix(Asset Repair): Create GL Entries for each item in Stock Items	2021-06-18 09:53:18 +05:30
Suraj Shetty	6894cc2832	Merge pull request #26088 from surajshetty3416/refactor-website-routing	2021-06-17 20:43:23 +05:30
Deepesh Garg	59e2e4989b	fix: Incorrect billed qty in Sales Order analytics	2021-06-17 19:58:16 +05:30
Eben van Deventer	ddef85ae97	fix: Correct South Africa VAT Rate (#25894) ... On 1 April 2018 South Africa increased the VAT rate from 14% to 15%, this proposed change seeks to update the default parameters for a fresh ERPNext installation.	2021-06-17 18:43:30 +05:30
Deepesh Garg	ceb9d9e870	Merge branch 'develop' into patch-3	2021-06-17 18:26:42 +05:30
Alan	f9390f596d	fix: auto unlink warehouse from item on delete (#26073) ... * fix: auto unlink warehouse from item on delete * fix: sider * refactor: use delete_doc * test: add test for unlinking warehouse from item * refactor: add msgprint to inform user of unlink * refactor: cleanup and reuse extant functions * fix: don't delete row, update table	2021-06-17 18:13:23 +05:30
Deepesh Garg	d3ccb024f8	Merge pull request #26078 from nemesis189/fixed-label-rate-for-purchase-invoice-item-v13 ... fix: removed extra space from label rate	2021-06-17 17:19:17 +05:30
Saqib Ansari	61675f1a43	fix: purchase receipt gl entries with same item code	2021-06-17 13:05:43 +05:30
GangaManoj	05c70ac584	fix(Asset): Replace asset_value with value_after_depreciation in Finance Books	2021-06-17 13:02:02 +05:30
Deepesh Garg	510077b3d4	fix(minor): Translation and linting issues	2021-06-17 11:21:21 +05:30
Deepesh Garg	b8442816ca	Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into payroll_accounting_dimension	2021-06-17 11:19:12 +05:30
Suraj Shetty	00332d1834	Merge branch 'develop' of github.com:frappe/erpnext into refactor-website-routing	2021-06-17 09:47:16 +05:30
GangaManoj	66d4e2ba51	fix(Asset Repair): Display value_after_depreciation in Finance Books	2021-06-17 08:28:19 +05:30
Anupam	dc448c2f51	refactor: lead	2021-06-17 00:28:03 +05:30
Deepesh Garg	913e92c29f	Merge pull request #26044 from GangaManoj/account-multiselect-gl ... feat(General Ledger): Implement multi-account selection	2021-06-16 22:33:50 +05:30
Deepesh Garg	5c19a9251f	fix: Accouting Dimensions for payroll entry accrual Journal Entry	2021-06-16 22:14:29 +05:30
Subin Tom	6f9de8c86f	fix: removed extra space from label rate	2021-06-16 20:01:29 +05:30
Subin Tom	c03a947e98	fix: removed extra space from label rate	2021-06-16 19:47:55 +05:30
Saqib Ansari	2be7e90e78	fix(e-invoicing): IRN generation for export invoices with round off	2021-06-16 19:00:34 +05:30
GangaManoj	41b7c1aec0	fix(General Ledger): Improve account filter	2021-06-16 14:40:14 +05:30
Afshan	3b1b4684ba	fix: check for duplicate payment terms in Payment Term Template (#26003)	2021-06-16 14:30:45 +05:30
Afshan	8c73f6f19e	fix(pos): pos loyalty card alignment (#26051)	2021-06-16 14:28:26 +05:30
Afshan	d5c172590f	fix(pos): pos loyalty card alignment (#26050)	2021-06-16 14:28:03 +05:30
Saqib	60ce00531d	fix: label for enabling ledger posting of change amount (#26070)	2021-06-16 14:25:55 +05:30
GangaManoj	86f689e54a	fix(General Ledger): Get account_currency accurately	2021-06-16 14:23:02 +05:30
Anurag Mishra	b1c72da7d7	fix: Training event	2021-06-16 14:08:32 +05:30
Saqib	1fd80992d7	fix(pos): 'NoneType' object is not iterable (#26066)	2021-06-16 13:27:34 +05:30
Ankush	fd84847f2b	fix: syntax fixes for native class (#26064)	2021-06-16 11:14:40 +05:30
Deepesh Garg	d70c6996f2	Merge pull request #25951 from nextchamp-saqib/invoice-opening-pnl-validation ... fix: opening invoices can alter profit and loss of a closed year	2021-06-16 10:52:40 +05:30
GangaManoj	34997789cd	fix(Asset Repair): Filter Warehouse by Company	2021-06-16 10:48:07 +05:30
GangaManoj	6d6aee29e8	fix(Asset Repair): Fix GL Entry creation	2021-06-16 10:42:37 +05:30
GangaManoj	491763fa27	fix(Asset Repair): Fix Sider issues	2021-06-16 08:45:54 +05:30
GangaManoj	a33e751b0f	fix(Asset Repair): Make Cost Center non-mandatory	2021-06-16 08:35:50 +05:30
GangaManoj	abb0c769a4	fix(Asset Repair): Uncheck allow_on_submit for all fields	2021-06-16 08:33:05 +05:30
GangaManoj	c61bbc5915	fix(Asset Repair): Use existing function from asset.py for fetching fixed_asset_account	2021-06-16 08:26:02 +05:30
GangaManoj	94ac52c47d	fix(Asset Repair): Add mandatory_depends_on condition for Purchase Invoice	2021-06-16 08:18:45 +05:30
GangaManoj	71c60f75d7	fix(Asset Repair): Filter Cost Center and Project by Company	2021-06-16 08:13:36 +05:30
GangaManoj	9e07b7d4a7	fix(Asset Repair): Add Company field	2021-06-16 08:07:06 +05:30
GangaManoj	bf52f55870	fix(Asset Repair): Make Stock Items and Warehouse mandatory if stock_consumption is checked	2021-06-16 07:56:40 +05:30
GangaManoj	695cd70994	fix(Asset Repair): Add title to error messages	2021-06-16 07:50:03 +05:30
GangaManoj	14ea9ebcb7	fix(Asset Repair): Display fields according to the state of the doc	2021-06-16 07:03:32 +05:30
GangaManoj	53a9ac4466	fix(General Ledger): Condense account_conditions	2021-06-16 04:10:29 +05:30
GangaManoj	79dc0f0afc	fix: Remove console.log()	2021-06-16 03:37:11 +05:30
Deepesh Garg	fb9cb78980	Merge pull request #26045 from GangaManoj/filter-cc-project ... fix(General Ledger): Filter Cost Center and Project drop-down lists by Company	2021-06-15 21:18:49 +05:30
Nabin Hait	0950481253	fix: merge conflict	2021-06-15 20:18:06 +05:30
Nabin Hait	24a88f6cf6	bumped to version 13.5.0	2021-06-15 20:18:40 +05:50
Nabin Hait	1e2df2c109	fix(pos): 'NoneType' object is not iterable	2021-06-15 19:53:57 +05:30
Nabin Hait	b2f2d0e749	chore: Added change log for v13.5.0	2021-06-15 19:44:06 +05:30
Noah Jacob	b5a1491176	fix: escaped warehouse value for sql query (#26049)	2021-06-15 12:44:04 +05:30
Deepesh Garg	95bc141531	Merge pull request #26056 from deepeshgarg007/gst_taxtable_value_with_discount_v13 ... fix(India): Taxable value for invoices with additional discount	2021-06-15 12:05:16 +05:30
GangaManoj	285bc60684	fix(Asset Repair): Set asset_name as title	2021-06-15 12:02:07 +05:30
GangaManoj	d4acf87feb	fix(Asset Repair): Make Accounting Dimensions section collapsible	2021-06-15 11:37:17 +05:30
Deepesh Garg	433815daba	fix: Update einvoice json test	2021-06-14 20:43:51 +05:30
Deepesh Garg	4afda3c89c	fix(India): Taxable value for invoices with additional discount	2021-06-14 20:43:42 +05:30
Deepesh Garg	5149101045	Merge pull request #26037 from deepeshgarg007/payment_entry_auto_tax_fixes ... fix: Auto tax calculations in Payment Entry	2021-06-14 20:39:41 +05:30
Deepesh Garg	bbf6121bb5	fix: Revert unintended changes	2021-06-14 20:09:31 +05:30
Deepesh Garg	ac52daa14f	fix: Import throw	2021-06-14 20:09:23 +05:30
Deepesh Garg	5ef9a62917	fix: Add separate function to validate payment entry taxes	2021-06-14 20:09:17 +05:30
Deepesh Garg	302855e160	fix: Auto tax calculations in Payment Entry	2021-06-14 20:09:10 +05:30
Deepesh Garg	4cd0f6ce23	fix: Revert unintended changes	2021-06-14 20:01:04 +05:30
Saqib	80077d215f	fix: patch for adding doctype to sla (#26053)	2021-06-14 19:34:25 +05:30
Himanshu	ec25d5938b	feat(SLA): Apply SLA to any document (#22449)	2021-06-14 19:05:52 +05:30
Deepesh Garg	cf1fc40b06	Merge pull request #25906 from deepeshgarg007/gst_taxtable_value_with_discount ... fix(India): Taxable value for invoices with additional discount	2021-06-14 17:11:08 +05:30
Marica	ff1360a8e6	Merge branch 'develop' into subcontracted-rm-to-transfer-report-develop	2021-06-14 16:48:57 +05:30
GangaManoj	75b30efb05	fix(General Ledger): Filter Project drop-down list by Company	2021-06-14 16:42:27 +05:30
GangaManoj	27ec51f021	fix(General Ledger): Filter Cost Center drop-down list by Company	2021-06-14 16:41:56 +05:30
marination	5d082b05a9	fix: Flaky test for Report Subcontracted Raw materials to be transferred	2021-06-14 16:31:45 +05:30
marination	3b070d1b05	fix: Flaky test for Report Subcontracted Raw materials to be transferred	2021-06-14 14:51:33 +05:30
Deepesh Garg	9eac4d0af6	fix: Import throw	2021-06-14 14:44:19 +05:30
Deepesh Garg	8718013c96	fix: Add separate function to validate payment entry taxes	2021-06-14 14:34:44 +05:30
GangaManoj	0511ffcf30	fix(General Ledger): Implement multi-account selection	2021-06-14 13:22:44 +05:30
Nabin Hait	580b4d50b5	Merge pull request #26027 from ruchamahabal/add-inactive-status-to-employee ... feat: add Inactive status to Employee	2021-06-14 12:34:33 +05:30
Nabin Hait	ad58182395	Merge pull request #26030 from ruchamahabal/add-inactive-status-to-employee-v13 ... feat: add Inactive status to Employee	2021-06-14 12:33:28 +05:30
Suraj Shetty	d1902dfadb	Merge branch 'develop' of github.com:frappe/erpnext into refactor-website-routing	2021-06-14 12:25:49 +05:30
Deepesh Garg	856484aeb0	Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into gst_taxtable_value_with_discount	2021-06-14 11:29:41 +05:30
Deepesh Garg	580346360f	fix: Auto tax calculations in Payment Entry	2021-06-14 11:16:39 +05:30
Marica	d37912fff1	Merge branch 'develop' into subcontracted-rm-to-transfer-report-develop	2021-06-12 16:00:14 +05:30
Anoop	28cdff10cf	fix: update linked Customer on Patient update only if Link Customer to Patient is enabled (#25926)	2021-06-12 14:17:04 +05:30
Rucha Mahabal	cf349aadf9	fix: unable to enter score in Assessment Result details grid (#25945) (#26031)	2021-06-12 14:05:12 +05:30
Rucha Mahabal	0ed33aa4e8	fix: unable to enter score in Assessment Result details grid (#25945)	2021-06-12 13:40:58 +05:30
Rucha Mahabal	17550fb4bf	feat: add Inactive status to Employee	2021-06-12 13:36:47 +05:30
Rucha Mahabal	efd7d584b2	feat: add Inactive status to Employee	2021-06-12 13:34:20 +05:30
Rucha Mahabal	a38147a8ba	feat: add Inactive status to Employee	2021-06-12 13:33:21 +05:30
Anupam Kumar	400205cc8a	fix: payroll entry employee detail issue (#25968) ... * fix: payroll entry employee detail issue * fix: review changes	2021-06-12 12:30:53 +05:30
Ankush Menat	348f04ca82	fix: syntax error in serial/batch selector (#26024)	2021-06-11 21:01:30 +05:30
Ankush Menat	9891780f5a	perf(minor): remove unnecessary comprehensions (port #25645)	2021-06-11 18:40:22 +05:30
Marica	19d36be624	Merge branch 'develop' into subcontracted-rm-to-transfer-report-develop	2021-06-11 17:50:43 +05:30
Marica	d7d5c4c329	Merge pull request #26011 from marination/subcontracted-rm-to-transfer-report ... fix: Report Subcontracted Raw Materials to be Transferred	2021-06-11 17:50:30 +05:30
marination	ea3e61d3b0	fix: Test	2021-06-11 17:29:55 +05:30
marination	c4d851e45f	fix: Test	2021-06-11 17:27:43 +05:30
Ankush Menat	a424c0c023	test(perf): eliminate repeat creation of HSN codes (bp #25947)	2021-06-11 16:49:39 +05:30
Ankush Menat	a9c84f749a	perf(minor): remove unnecessary comprehensions (#25645)	2021-06-11 16:00:48 +05:30
Ankush Menat	5bb89b0ead	test(perf): eliminate repeat creation of HSN codes (#25947)	2021-06-11 15:57:01 +05:30
marination	a4ed6a3519	fix: Sider	2021-06-11 12:51:36 +05:30
marination	c5da51dd7a	fix: Report Raw Materials to be Transferred	2021-06-11 12:51:10 +05:30
marination	ec4a3723cc	fix: Sider	2021-06-11 12:47:06 +05:30
rohitwaghchaure	387de3f3fa	Merge pull request #26015 from rohitwaghchaure/fixed-timeout-error-in-repost-item-valuation-develop ... fix: timeout error in the repost item valuation	2021-06-11 12:18:13 +05:30
rohitwaghchaure	da28db3698	Merge pull request #26016 from rohitwaghchaure/fixed-conversion-factor-issue-develop ... fix: custom conversion factor field not mapped from job card to stock entry	2021-06-11 12:17:54 +05:30
rohitwaghchaure	49f3e5bbd5	Merge pull request #26017 from rohitwaghchaure/donot-copy-difference-account-develop ... fix: on click of duplicate button system has not copied the difference account	2021-06-11 12:17:36 +05:30
Rohit Waghchaure	17408c6388	fix: on click of duplicate button system copy the difference account from first row	2021-06-11 10:58:00 +05:30
Rohit Waghchaure	9cfd3adad9	fix: custom conversion factor field not mapped from job card to stock entry	2021-06-11 10:56:44 +05:30
Rohit Waghchaure	b103b24ae1	fix: timeout error in the repost item valuation	2021-06-11 10:55:05 +05:30
Rohit Waghchaure	f310501d7d	fix: filter type for item query	2021-06-11 10:53:07 +05:30
marination	687ad9b942	fix: Report Raw Materials to be Transferred	2021-06-10 21:18:19 +05:30
Nabin Hait	42d72b55b8	Merge branch 'version-13-hotfix' into version-13-pre-release	2021-06-10 20:26:31 +05:30
Nabin Hait	d17217c4e2	Merge pull request #25831 from deepeshgarg007/tds_advance_payment_v13 ... feat: Tax deduction against advance payments	2021-06-10 20:25:30 +05:30
gavin	46cc089f8b	Merge branch 'develop' into payroll-emp-detail	2021-06-10 20:15:28 +05:30
Nabin Hait	27299cfcc5	Merge branch 'version-13-hotfix' into version-13-pre-release	2021-06-10 19:45:38 +05:30
Anupam	32ebb1001e	fix: review chnages	2021-06-10 19:32:00 +05:30
Deepesh Garg	48f2839079	fix: Sort account balances by account name	2021-06-10 19:00:50 +05:30
Deepesh Garg	3b34fc4cce	Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into tds_advance_payment_v13	2021-06-10 18:57:31 +05:30
Deepesh Garg	5434dd048b	Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into dynamic_gst_rates	2021-06-10 18:56:39 +05:30
Deepesh Garg	0d49b6c211	Merge pull request #26004 from gavindsouza/patch-tests-v13 ... ci: Update Patch tests (backport)	2021-06-10 18:52:27 +05:30
Saqib	9a67141bfb	fix(einvoicing): service item check (#26010)	2021-06-10 18:48:55 +05:30
Deepesh Garg	9a243ed469	fix: Sort account balances by account name	2021-06-10 18:16:46 +05:30
Deepesh Garg	a5c3427293	fix: Sort account balances by account name	2021-06-10 18:09:49 +05:30
Deepesh Garg	88176e65e4	fix: Check for gst_hsn_code	2021-06-10 17:31:28 +05:30
walstanb	8f5ae0470d	fix: syntax error in stock entry	2021-06-10 16:35:27 +05:30
Gavin D'souza	137d08a9d7	fix: Manually link_fields from flags before rename_doc	2021-06-10 15:09:17 +05:30
Gavin D'souza	96f8ebc308	fix(patch): Handle NULL values from fieldtype change	2021-06-10 15:08:55 +05:30
Gavin D'souza	3dfbfe87e9	chore: Drop < v10 patches from list ... v7 backup was restored and upgraded to latest v10.x.x branch. The patches run uptil the upgrade are removed in this change. This means only existing v10 sites are allowed direct upgrade to v13 and newer There are older version patches still left since they're being used in later ERPNext versions too.	2021-06-10 15:07:56 +05:30
Gavin D'souza	aedf25ba46	chore: Drop old patches ... v7 backup was restored and upgraded to latest v10.x.x branch. The patches run uptil the upgrade are removed in this change. This means only existing v10 sites are allowed direct upgrade to v13 and newer	2021-06-10 15:07:39 +05:30
rohitwaghchaure	8975c5241e	Merge pull request #25988 from rohitwaghchaure/donot-copy-difference-account ... fix: on click of duplicate button system has not copied the difference account	2021-06-10 14:39:56 +05:30
rohitwaghchaure	64cc60f97a	Merge pull request #25946 from gavindsouza/patch-tests ... ci: Update Patch tests	2021-06-10 14:11:08 +05:30
Deepesh Garg	882913ca4e	Merge pull request #26000 from GangaManoj/gst-settings-card ... fix: Only display GST card in Accounting Workspace if it's in India	2021-06-10 12:46:15 +05:30
Deepesh Garg	d063f9a5d1	fix: GL Entry ordering	2021-06-10 12:26:21 +05:30
GangaManoj	076bd5eaab	fix: Only display GST card in Accounting Workspace if it's in India	2021-06-10 12:08:44 +05:30
Deepesh Garg	701cba7f03	Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into gst_taxtable_value_with_discount	2021-06-10 12:04:38 +05:30
Deepesh Garg	edecd5b0c6	fix: Update einvoice json test	2021-06-10 12:04:30 +05:30
Deepesh Garg	0b5fe1b5eb	fix: Failing test case	2021-06-10 10:34:49 +05:30
Deepesh Garg	911818a9e2	fix: Add multiple fixes	2021-06-09 22:55:10 +05:30
Saqib	42557c4ad3	feat: cost-center wise period closing entry (#25766)	2021-06-09 19:48:31 +05:30
Saqib	26f0609390	feat: enable/disable gl entry posting for change given in pos (#25822)	2021-06-09 19:47:28 +05:30
Deepesh Garg	9e648183db	fix: Test case	2021-06-09 18:26:16 +05:30
Deepesh Garg	7dabb6be30	Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into tds_advance_payment_v13	2021-06-09 18:10:55 +05:30
Deepesh Garg	b57ebba3fd	fix: Validate negative allocated amount in Payment Entry (#25799)	2021-06-09 17:56:41 +05:30
Deepesh Garg	4c1dad8207	fix: Debug tests	2021-06-09 14:18:23 +05:30
Deepesh Garg	8090965162	fix: Debug test	2021-06-09 13:45:42 +05:30
Deepesh Garg	758db793be	Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into tds_advance_payment_v13	2021-06-09 13:39:07 +05:30
Deepesh Garg	bf5f87c2fe	Merge pull request #25969 from deepeshgarg007/inernal_transfer_invoices_ignore ... fix: Ignore internal transfer invoices from GST Reports	2021-06-09 13:32:52 +05:30
Deepesh Garg	be631d1caf	Merge pull request #25986 from nextchamp-saqib/einvoicing-service-item-check ... fix(e-invoicing): service item check	2021-06-09 13:00:43 +05:30
Anupam Kumar	21b8e2f0d8	fix: hiding Rounding Adjustment field (#25380) ... * fix: hiding Rounding Adjustment field * fix: updating purchase_invoice.json	2021-06-09 12:57:21 +05:30
Deepesh Garg	9a282aa593	Merge pull request #25858 from alyf-de/item-tax-templates ... feat: Item Tax Templates for Germany	2021-06-09 12:50:27 +05:30
Rohit Waghchaure	99b583f688	fix: on click of duplicate button system copy the difference account from first row	2021-06-09 00:06:35 +05:30
Saqib Ansari	18eed58fc5	fix(e-invoicing): service item check	2021-06-08 20:52:14 +05:30
Jannat Patel	6b8c123fd9	fix: Quiz timer (#25983) ... * fix: quiz timer * fix: pass time bound parameter * fix: sider	2021-06-08 18:57:49 +05:30
Rucha Mahabal	5ed2ef493a	Merge pull request #25984 from pateljannat/quiz-fixes-v13 ... fix: Quiz fixes v13	2021-06-08 18:57:24 +05:30
pateljannat	7ace06ac21	fix: sider	2021-06-08 18:26:23 +05:30
walstanb	646f0c3b53	fix: variable declaration	2021-06-08 17:54:34 +05:30
Saqib	6eeaf9b933	Merge branch 'version-13-hotfix' into asset-repair-refactor	2021-06-08 17:26:50 +05:30
Ganga Manoj	0ea4d850e1	fix: Allow all System Managers to delete company transactions (#25834)	2021-06-08 17:23:44 +05:30
pateljannat	bbf07d9214	fix: quiz timer issues	2021-06-08 17:05:44 +05:30
Deepesh Garg	e4fcc5562f	refactor: Advance taxes and charges calculation	2021-06-08 16:35:47 +05:30
Sagar Vora	062e247353	test: remove unused imports	2021-06-08 14:43:28 +05:30
Sagar Vora	ca205be5ac	fix: tests	2021-06-08 14:43:28 +05:30
Sagar Vora	0e5e1350b2	perf: use frappe.get_value with wildcard instead of another frappe.get_doc call	2021-06-08 14:43:28 +05:30
Sagar Vora	74818c7b62	fix: improve filter for from_date; validation for joining and relieving date	2021-06-08 14:43:28 +05:30
Sagar Vora	447c978757	fix: choose correct Salary Structure Assignment when getting data for formula eval	2021-06-08 14:43:28 +05:30
Sagar Vora	5b1e7a61b8	test: remove unused imports	2021-06-07 19:34:02 +05:30
Sagar Vora	7f5378d98a	fix: tests	2021-06-07 18:40:54 +05:30
Anuja Pawar	d4398fd84a	fix: update cost center from pos (#25971)	2021-06-07 16:20:21 +05:30
18alantom	6f79c4c348	fix: add account filter	2021-06-07 13:58:45 +05:30
18alantom	23b907df1a	fix: use stock value diff for calculation	2021-06-07 13:52:26 +05:30
rohitwaghchaure	cf7baeab16	Merge pull request #25956 from rohitwaghchaure/fixed-conversion-factor-issue ... fix: custom conversion factor field not mapped from job card to stock entry	2021-06-07 11:45:44 +05:30
Deepesh Garg	6f2dacc60c	Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into tds_advance_payment_v13	2021-06-06 19:31:50 +05:30
Deepesh Garg	7a20c3b92a	fix: Ignore internal transfer inoices from GST Reports	2021-06-06 19:23:21 +05:30
Deepesh Garg	18be767f75	fix: Remove invalid test	2021-06-06 13:25:34 +05:30
Anupam	bf0528413d	fix: payroll entry employee detail issue	2021-06-06 13:12:13 +05:30
Saqib	d689068d82	Merge pull request #25928 from nextchamp-saqib/pos-fixes-8 ... fix(pos): multiple pos issues	2021-06-06 11:25:29 +05:30
Saqib Ansari	3f32969bee	fix(pos): broken image in item details section	2021-06-06 11:18:20 +05:30
Saqib Ansari	bc46a9772d	fix(pos): cash shortcuts not working	2021-06-06 11:11:07 +05:30
Saqib Ansari	a85c2c16b4	fix(pos): item rate precision in item selector	2021-06-06 11:07:20 +05:30
Deepesh Garg	3646c301ed	fix: Linting issues	2021-06-05 13:21:03 +05:30
Deepesh Garg	e8a78bd43d	fix: Add test cases	2021-06-05 13:16:39 +05:30
Deepesh Garg	8a7e283926	feat: Item Taxes based on net rate	2021-06-04 22:53:26 +05:30
barredterra	572b6df0f2	Merge branch 'version-13-hotfix' into item-tax-templates	2021-06-04 16:55:11 +02:00
gavin	203a363cd6	Merge branch 'develop' into patch-tests	2021-06-04 20:13:15 +05:30
Gavin D'souza	102afe7de1	fix: Manually link_fields from flags before rename_doc	2021-06-04 20:11:34 +05:30
Gavin D'souza	ac99c719bc	Revert "fix(patch): Reload linked doctypes before renaming dt" ... This reverts commit 4e2e8daca9 because although it fixed it locally, didn't seem to do anything for erpnext CI	2021-06-04 20:10:26 +05:30
Gavin D'souza	4e2e8daca9	fix(patch): Reload linked doctypes before renaming dt	2021-06-04 17:56:28 +05:30