29645 Commits

Author	SHA1	Message	Date
Sagar Vora	8d9d0987fe	fix: incorrect status being set in Invoices (#28019) ... Co-authored-by: Pruthvi Patel <pruthvipatel145@gmail.com>	2021-10-20 19:15:35 +05:30
Rucha Mahabal	261f80c5ca	fix: avoid resetting employee on amending timesheets (#28025)	2021-10-20 16:58:32 +05:30
Nabin Hait	2ef4844a3c	feat: Tax for recurring additional salary (#27459) ... * fix: Logic for tax calculation on recurring additional salary * fix: Get actual amount always in case of overwritten additional salary even if based on payment days * feat: Test case added for recurring additional salary * fix: use query builder to get additional salaries instead of raw SQL * fix: query formatting and remove trailing spaces Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2021-10-20 15:50:30 +05:30
Govind S Menokee	4f2cf43db7	YTD and MTD Messed up in Salary Slip ... The filter for YTD, MTD etc are based on employee name. This seems like an amateur mistake. It should be based on employee id. (cherry picked from commit efc292a5ddc00e433d75b87d6b3378455bac4438)	2021-10-20 07:11:26 +00:00
Jannat Patel	9a409df8fa	Merge pull request #27728 from itechstro/develop ... fix: Employee Leave Balance report should only consider ledgers of transaction type Leave Allocation	2021-10-20 12:27:22 +05:30
Jannat Patel	d81f811349	fix: map missing fields in opportunity (#27904)	2021-10-20 10:53:39 +05:30
Chillar Anand	73ae504721	fix(healthcare): Add patch for removing healthcare doctypes (#27995) ... * fix(healthcare): Add patch for healthcare doctypes * fix: Update healthcare patch * fix: Reload stale doctypes * fix: Reload doc fix	2021-10-19 18:59:23 +05:30
Deepesh Garg	21ba9ac744	fix: Totals row incorrect value in GL Entry (#27867) ... (cherry picked from commit ebe68c1a7a47f5e711cc9fc1d40c07e140b76888)	2021-10-19 09:38:40 +00:00
Dany Robert	d734da9337	Merge branch 'develop' into patch-8	2021-10-19 14:14:07 +05:30
Ankush Menat	393749a611	fix: dont recompute item wise taxes from front end	2021-10-19 14:13:34 +05:30
Dany Robert	4c499e804a	fix: wrong vat amount	2021-10-19 14:12:59 +05:30
Noah Jacob	e08a0992b2	Merge branch 'develop' into maint_schedule_fix	2021-10-19 13:12:45 +05:30
Noah Jacob	af1b9e100e	fix: changes in schedules gets overwritten on save	2021-10-19 12:08:32 +05:30
Himanshu	7717b99edb	feat: add enabled field in UOM (#27993)	2021-10-19 10:19:40 +05:30
Dany Robert	1aa34d1780	fix: incorrect VAT Amount in UAT VAT 201 report	2021-10-18 18:46:45 +05:30
Rucha Mahabal	8eacaddde7	fix: flaky Org Chart Test (#27971)	2021-10-18 11:06:16 +05:30
Saqib	ac381d21fe	fix: sider	2021-10-18 10:43:15 +05:30
Deepesh Garg	9c54d6df13	Merge pull request #27967 from deepeshgarg007/account_name_number_error ... fix: Account number and name incorrectly imported using COA importer	2021-10-18 09:16:09 +05:30
Deepesh Garg	46e80095c6	Merge pull request #27934 from deepeshgarg007/tds_round_off_error ... fix: TDS round off not working from second transaction	2021-10-18 08:53:37 +05:30
Deepesh Garg	30e6f4dfed	Merge pull request #27970 from deepeshgarg007/gstr_1_interstate_internal_transfer ... fix (India): Interstate internal transfer invoices not visible in GSTR-1	2021-10-18 08:52:41 +05:30
Deepesh Garg	b7a08535b5	fix: TDS round off not working from second transaction	2021-10-16 20:58:24 +05:30
Deepesh Garg	d9d42b13ab	fix: Interstate internal transfer invoices not visible in GSTR-1	2021-10-16 17:09:37 +05:30
Deepesh Garg	17a8649500	fix: Account number and name incorrectly import using COA importer	2021-10-15 21:19:41 +05:30
Subin Tom	f3cf36f613	fix: POS Profile payment methods table (#27956) ... Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>	2021-10-15 12:39:52 +05:30
GangaManoj	0b8cb5dd47	fix: Add missing digit	2021-10-15 04:56:00 +05:30
GangaManoj	fdeb273fa0	fix: Sider issues	2021-10-15 04:53:23 +05:30
GangaManoj	60aae4423d	fix: Add missing digit	2021-10-15 04:03:30 +05:30
GangaManoj	371b621364	fix: Compare date strings	2021-10-15 04:02:27 +05:30
GangaManoj	e9d310a13e	fix: Format tests	2021-10-15 01:45:53 +05:30
Ganga Manoj	5a0289a810	Merge branch 'develop' into fix-depr-after-sale	2021-10-14 22:37:07 +05:30
GangaManoj	968be70bd1	fix: Remove PR creation from all tests in TestDepreciationBasics	2021-10-14 22:33:35 +05:30
GangaManoj	09215a9781	fix: Remove PR creation from all tests for Depreciation Methods	2021-10-14 22:32:55 +05:30
GangaManoj	4bf01bb4b7	fix: Move Purchase Receipt creation to setUpClass	2021-10-14 22:32:54 +05:30
Marica	c0e632842a	Merge pull request #27962 from marination/clean-serial-no-logic ... fix: Retain space inside Serial no string while cleaning serial nos	2021-10-14 20:17:42 +05:30
Ankush Menat	4437eb0c4b	fix: remove bad description (#27963)	2021-10-14 20:03:37 +05:30
marination	a9341672cf	test: Include serial no with spaces in it in sanitation test	2021-10-14 19:49:13 +05:30
Marica	8cf188d9c0	fix: Use strip instead of lstrip and rstrip ... Co-authored-by: Ankush Menat <ankushmenat@gmail.com>	2021-10-14 19:21:41 +05:30
marination	41035b0330	fix: Retain space inside Serial no string while cleaning serial nos	2021-10-14 18:31:37 +05:30
Ankush Menat	9c1d828b1b	chore: formatting	2021-10-14 17:18:24 +05:30
rohitwaghchaure	1233725b64	Merge pull request #27957 from rohitwaghchaure/patch-to-enable-scheduler-job ... fix: patch to enable scheduled job for reposting	2021-10-14 17:14:43 +05:30
rohitwaghchaure	230a5d4b39	Update enable_scheduler_job_for_item_reposting.py	2021-10-14 16:57:54 +05:30
Ankush Menat	3f97413814	chore: formatting	2021-10-14 16:45:27 +05:30
Saqib	1f70dd6e98	fix: value_after_depreciation calculation (#27954)	2021-10-14 16:23:12 +05:30
Rohit Waghchaure	efc60ec2b5	fix: patch to enable scheduled job for reposting	2021-10-14 16:03:48 +05:30
Marica	ee25ba07a2	Merge pull request #27947 from marination/si-dn-sn-mismatch ... fix: Improve error message for Serial No mismatch between SI and DN	2021-10-14 13:49:04 +05:30
Jannat Patel	8de5f1f04d	Merge pull request #27850 from pateljannat/auto-attendance-issue ... fix: exclude inactive employees from auto attendance	2021-10-14 12:48:22 +05:30
Ganga Manoj	8cc81a96fc	Merge branch 'develop' into fix-depr-after-sale	2021-10-14 03:12:44 +05:30
GangaManoj	e8986df3ca	fix: Move test for Finance Books to Depreciation test suite	2021-10-13 21:36:10 +05:30
GangaManoj	83ec9879ee	fix: Add test to validate available_for_use_date	2021-10-13 21:21:50 +05:30
GangaManoj	749d1b6ee6	fix: Enable cwip accounting	2021-10-13 20:49:07 +05:30
GangaManoj	8ea1ad9232	fix: Only validate against JV if it's not a reverse depreciation entry	2021-10-13 20:47:39 +05:30
marination	60f35ad8a2	fix: Remove trailing space and line break in translatable string	2021-10-13 16:50:10 +05:30
marination	646acb6b46	fix: Improve error message for Serial No mismatch between SI and DN	2021-10-13 16:41:11 +05:30
Noah Jacob	2bb383b178	fix: not authorized to update entries after freezing accounts (#27937) ... * fix: not authorized to update entries after freezing accounts * fix: Add test case * fix(patch): patched to requeue failed reposts(check_freezing_date) * chore: misc fixes Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com> Co-authored-by: Ankush Menat <ankushmenat@gmail.com>	2021-10-13 16:20:08 +05:30
Shariq Ansari	790c1cda6f	fix: Removing unused fields from workspace JSON files #27612 ... fix: Removing unused fields from workspace JSON files	2021-10-13 16:18:20 +05:30
Deepesh Garg	bd310e2816	Merge pull request #27783 from hrwX/subscription_generation_fix_develop ... fix(Subscription): reorder updation of end date	2021-10-13 15:21:50 +05:30
Deepesh Garg	bd8dda2de4	Merge pull request #27497 from nemesis189/taxjar-nexus-update ... fix: TaxJar update - added nexus list, making api call only for nexus	2021-10-13 15:08:48 +05:30
Deepesh Garg	bd8cfb2e30	fix: Move product tax category folder to taxjar settings	2021-10-13 13:40:53 +05:30
Jannat Patel	00f7f97dc9	Merge branch 'develop' into auto-attendance-issue	2021-10-13 13:28:25 +05:30
Deepesh Garg	2d19e2d54b	fix: Patch	2021-10-13 13:24:19 +05:30
Deepesh Garg	2b9b158448	Merge pull request #27907 from nemesis189/gst-setts-hsn-wise-tax-breakup ... feat: HSN based tax breakup table check in GST Settings	2021-10-13 12:07:29 +05:30
Deepesh Garg	ca0067212d	fix: TDS round off not working from second transaction	2021-10-13 12:00:25 +05:30
Deepesh Garg	0b263c5100	Merge pull request #27927 from Anuja-pawar/invoice-sections ... fix: minor ux fixes in Sales & Purchase Invoice	2021-10-12 23:05:48 +05:30
Deepesh Garg	b990d5b112	Merge pull request #27545 from nextchamp-saqib/pay-received-amt-fix ... fix: cannot add deductions in internal transfer payment entry	2021-10-12 23:04:04 +05:30
Deepesh Garg	3b9514d6e1	fix: Update message string	2021-10-12 21:49:51 +05:30
Anuja Pawar	b7769c733e	Merge branch 'develop' into invoice-sections	2021-10-12 21:32:01 +05:30
Anuja Pawar	d181cc42a1	fix: set collapsible & print hide	2021-10-12 20:57:08 +05:30
Ankush Menat	4ebae7c5dc	Merge branch 'develop' into optimize-get-item-details	2021-10-12 20:39:49 +05:30
Ankush Menat	7bafa11d57	fix: undo changes to allow negative stock flag	2021-10-12 20:39:10 +05:30
Marica	b6da7ff1b1	Merge pull request #27914 from marination/avoid-auto-customer-creation-website ... fix: Avoid automatic customer creation on website user login	2021-10-12 20:24:12 +05:30
Deepesh Garg	6f107da165	perf: Add indexes in stock queries and speed up bin updation #27758 ... perf: Add indexes in stock queries and speed up bin updation	2021-10-12 20:15:55 +05:30
Ankush Menat	8d69ec72a6	fix: remove transaction commit from tests	2021-10-12 16:17:15 +05:30
Ankush Menat	acdb26a4bb	refactor: rollback after full test	2021-10-12 16:17:15 +05:30
Ankush Menat	06fa35a9c1	test: add custom TestCase class and use in stock	2021-10-12 16:17:15 +05:30
Anuja Pawar	2bc1ca993a	fix: keeping sections consistent across sales & purchase invoice	2021-10-12 14:52:40 +05:30
Deepesh Garg	c6a56a8f53	Merge pull request #27884 from nextchamp-saqib/invalid-gl-entry-patch-fix ... fix: patch fails if accounts are frozen	2021-10-12 13:44:18 +05:30
Deepesh Garg	3750a88568	fix: Status check for closed loans (#27896) ... * fix: Status check for closed loans * fix: Incorrect maximum loan amount update * fix: Linting issues	2021-10-12 13:40:31 +05:30
Saqib Ansari	c7fc609236	perf: skip insertion of stock ledger entry	2021-10-12 13:30:40 +05:30
Saqib Ansari	eb3aae870f	perf: get total company stock only for purchase order	2021-10-12 13:29:32 +05:30
Saqib Ansari	7b691beabb	perf: fetch mode of payments data in single query	2021-10-12 13:28:31 +05:30
marination	a780f78f38	fix: Sider, Linter ... - Moved return to next line - Space between function import and body	2021-10-12 13:28:12 +05:30
Saqib Ansari	a500252570	perf: skip get_pricing_rules if no pricing rule exists	2021-10-12 13:25:55 +05:30
Afshan	569dc5f6b1	fix: add cost center in gl entry for advance payment entry (#27840)	2021-10-12 13:23:20 +05:30
Saqib Ansari	c103f72fad	fix: rollback on exception	2021-10-12 13:13:48 +05:30
Deepesh Garg	5d4c919c5c	fix: Update pacthes.txt	2021-10-12 13:04:25 +05:30
Deepesh Garg	af14ba43de	fix: Linting issues	2021-10-12 12:58:42 +05:30
Deepesh Garg	8355af6dcf	fix: Incorrect maximum loan amount update	2021-10-12 12:44:40 +05:30
Chillar Anand	401e22fb8d	fix(accounts): Fix issue with fetching loyalty point entries (#27892)	2021-10-12 10:28:36 +05:30
Anuja Pawar	e1967870a9	Merge pull request #27906 from Anuja-pawar/accounts-settings ... fix(Accounts Settings): Update label	2021-10-12 10:27:23 +05:30
GangaManoj	a7ec007dcf	fix: Add tests to validate item	2021-10-12 01:33:46 +05:30
GangaManoj	d8aaf3d389	fix: Add tests to validate Asset values	2021-10-12 01:07:11 +05:30
marination	d824a90fac	fix: Avoid automatic customer creation on website user login	2021-10-11 23:14:28 +05:30
Ankush Menat	ad444153cc	fix: force reload custom field doctype (#27909) ... custom_field.json has the same modified key in both versions but not the same content. This can happen again if something is backported, safe solution is to force reload.	2021-10-11 22:14:28 +05:30
Subin Tom	fc4facc5dc	added new section in gst settings page	2021-10-11 18:19:58 +05:30
Subin Tom	530de12b07	feat: HSN wise tax breakup check in GST Settings	2021-10-11 17:33:41 +05:30
Noah Jacob	4bbe434d43	Merge pull request #27800 from noahjacob/buy_on ... refactor: updated buying onboarding tours.	2021-10-11 15:33:58 +05:30
Dany Robert	7acdcc70ad	fix: v12 migrate error - unknown column ‘mandatory_depends_on’ (#27897) ... * fix: v12 doesn't have mandatory_depends_on field * fix: move update_vehicle_no_reqd_condition to v13 * fix: move update_vehicle_no_reqd_condition to v13 * fix: file name missing .py * refactor!: add back empty line * fix: linters issue	2021-10-11 15:05:55 +05:30
rohitwaghchaure	3f99a87e3d	Merge pull request #27863 from rohitwaghchaure/multi-currency-issue-for-consolidated-report ... fix: consolidated report not consider company currency	2021-10-11 14:06:08 +05:30
Deepesh Garg	3337ae120c	fix: Status check for closed loans	2021-10-11 13:12:02 +05:30
Deepesh Garg	1aba3592fa	Merge pull request #27369 from Havenir/ksa-vat ... feat(regional): KSA E-Invoicing and VAT Report	2021-10-11 12:16:51 +05:30
Ankush Menat	0a3dd3e954	fix: bom item query #27890 ... fix: bom item query	2021-10-11 12:10:33 +05:30
Chillar Anand	f0c4ea14a9	fix(hr): Update expense account after company is updated (#27843)	2021-10-11 11:59:26 +05:30
Subin Tom	ea2038489f	fix: 'Taxjar' type fix	2021-10-11 11:11:01 +05:30
Subin Tom	1b25e69af4	fix: patch fixes- force reload doc, check for company	2021-10-11 10:20:23 +05:30
Ahmad	cb2213ef0c	refactor: make strings translate	2021-10-10 21:17:59 +02:00
Rohit Waghchaure	19d14da0d4	fix: opening balance to calculate 'Unclosed Fiscal Years Profit / Loss (Credit)'	2021-10-10 14:00:25 +05:30
Saqib Ansari	353ad5f6ff	feat: handle exceptions	2021-10-10 11:47:48 +05:30
Saqib Ansari	b0aa4a6e1c	fix: patch fails if accounts are frozen	2021-10-10 11:42:39 +05:30
GangaManoj	4918e9533b	fix: Add tearDownClass()	2021-10-10 03:51:35 +05:30
GangaManoj	ef3f2fcb3a	fix: Replace setUp() with setUpClass()	2021-10-10 03:50:45 +05:30
Himanshu	4f5d82c817	Merge branch 'develop' into subscription_generation_fix_develop	2021-10-09 09:39:27 +01:00
Himanshu	44306bd0e5	Update subscription.py	2021-10-09 09:37:54 +01:00
Jannat Patel	128709155b	Merge branch 'develop' into auto-attendance-issue	2021-10-08 20:15:40 +05:30
Ankush Menat	6019f60d0a	fix(perf): index creation on voucher_detail_no (#27866) ... voucher_detail_no is supposed to have an index, it was added on on_doctype_update function of table, however this function is only called if DocType itself is updated and `on_update` is called on DocType. Stock ledger Entry doctype hasn't changed since addition of this index in function. Before: Lack of this index was causing full table scan in get_future_sle_to_fix function. (~50 seconds in a reposting job) After: Single row is fetched (~0.5 second in full reposting job) Learnings: 1. Add simple indexes via doctype only 2. For complex indexes always change doctype.json file for it to take effect.	2021-10-08 16:12:15 +05:30
Deepesh Garg	fabbf68e0e	Merge pull request #27872 from 18alantom/fix-make-billing-address-not-read-only ... fix: remove readonly from billing address	2021-10-08 15:07:15 +05:30
18alantom	41fefa356f	fix: remove readonly from billing address	2021-10-08 14:31:13 +05:30
yadavyk	d3d4a3da62	fix: Salary Slip Label fixes (#27865) ... Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2021-10-08 13:39:33 +05:30
Kenneth Sequeira	90a249527d	fix: update dead links in help_links.js (#27860)	2021-10-08 13:27:16 +05:30
mergify[bot]	e85c6e3fc5	fix: SO delivery Date not getting set via data import (#27862) (#27864) ... * fix: SO delivery Date not getting set via data import * fix: logic to add delivery dates * fix: linting issue Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com> Co-authored-by: Afshan <afshan13k@gmail.com> (cherry picked from commit d9a219850a02539f82929b5d5490554835fcde8b) Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>	2021-10-08 13:19:56 +05:30
Rohit Waghchaure	dc4206428d	fix: consolidated report not consider company currency	2021-10-08 12:10:35 +05:30
Anuja Pawar	5cc3ea0aa7	fix(Payment Reconciliation): minor ux fixes (#27779) ... * fix: minor fixes * fix: Linters check * fix: sider check * fix: kept unallocated payment amount hidden in allocation * fix: removed Add row button from the tables (redundant) Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com> Co-authored-by: Saqib <nextchamp.saqib@gmail.com>	2021-10-07 21:09:15 +05:30
Kenneth Sequeira	07c680d7cc	fix: help links for purchase cycle and JV (#27856)	2021-10-07 20:27:10 +05:30
Kenneth Sequeira	646fd29f0e	fix: update help links for Sales Invoice page (#27853)	2021-10-07 18:38:37 +05:30
rohitwaghchaure	e740fec8d0	Merge pull request #27851 from rohitwaghchaure/option-to-set-size-for-multi-select-dialog ... feat: option to set the width for the multi-select dialog box	2021-10-07 17:38:19 +05:30
Rohit Waghchaure	69ffddf747	feat: option to set the width for the multi-select dialog box	2021-10-07 17:33:58 +05:30
Jannat Patel	c07dfbc08b	Merge branch 'develop' into auto-attendance-issue	2021-10-07 17:22:28 +05:30
pateljannat	921b4be348	fix: exclude inactive employees from auto attendance	2021-10-07 17:12:46 +05:30
Saqib	64c1347d1e	refactor!: remove abbreviation renaming (#27766) ... Co-authored-by: Ankush Menat <ankush@iwebnotes.com>	2021-10-07 07:05:34 +00:00
Subin Tom	eaa3614155	fix: patch fix added reload_doctype	2021-10-07 12:20:56 +05:30
Himanshu	951ab9f78f	Merge branch 'develop' into subscription_generation_fix_develop	2021-10-06 19:22:40 +01:00
Chillar Anand	772d4753e7	refactor: Clean up mutable defaults and add CI check (#27828) ... * refactor: Clean up mutable defaults and add CI check	2021-10-06 16:58:48 +00:00
hrwx	ae657c7e4e	fix: create past invoices	2021-10-06 17:32:39 +01:00
Subin Tom	3ece05a9f7	fix: linters fix	2021-10-06 21:35:04 +05:30
Subin Tom	7114659ecc	fix: improved on_update method, added validation for tax calculation, sandbox mode checks	2021-10-06 21:31:19 +05:30
Sagar Vora	656015d99d	test: use test_dependencies instead of duplication	2021-10-06 16:46:01 +01:00
Sagar Vora	fc375c5bde	fix: remove newline	2021-10-06 16:46:01 +01:00
hrwx	0f03b19109	fix: reorder updation of end date	2021-10-06 16:46:01 +01:00
Alan	d4b2471cea	fix: use ceil in case of whole uoms for reorder qty (#27834) ... * fix: use ceil in case of whole uoms for reorder qty * fix: cache uom query	2021-10-06 18:16:33 +05:30
Sagar Vora	d36849e4f8	test: optimise test_component_amount_dependent_on_another_payment_days_based_component (#27836)	2021-10-06 17:13:34 +05:30
Marica	ff7506d4a6	fix: revert "fix: missing link in dashboard missing on SI from DN" (#27832)	2021-10-06 13:35:22 +05:30
Marica	2691a15c91	Merge pull request #27360 from FHenry/dev_fix_27359 ... fix: missing link in dashboard missing on SI from DN	2021-10-06 13:04:50 +05:30
GangaManoj	273fccf0dd	fix: Add test for depreciation on return of sold Asset	2021-10-06 02:08:28 +05:30
GangaManoj	adebf2d71b	fix: Adjust depreciation_amount in final row	2021-10-06 02:04:05 +05:30
GangaManoj	f51bd44929	fix: Unlink Depreciation Entry made on sale if the Asset is returned	2021-10-06 01:18:05 +05:30
GangaManoj	62fea8a5aa	fix: Rename tests	2021-10-05 21:38:39 +05:30
Deepesh Garg	91bf40d692	Merge pull request #27811 from frappe/mergify/bp/develop/pr-27792 ... fix: COA Importer showing blank validations (backport #27792)	2021-10-05 21:23:21 +05:30
Afshan	cec66d2d10	fix: removed redundant piece of code (#27817)	2021-10-05 19:14:39 +05:30
Deepesh Garg	fee54023a6	Merge branch 'develop' into mergify/bp/develop/pr-27792	2021-10-05 17:22:24 +05:30
Noah Jacob	ae5b2f37b1	Merge pull request #27813 from ankush/maintenance_random_period ... fix: ignore random periodicity in validations	2021-10-05 16:57:43 +05:30
mergify[bot]	233bf5dd29	fix: using DN for transfer w/o internal customer (backport #27798) (backport #27805) (#27807) ... * fix: using DN for transfer w/o internal customer (backport #27798) (#27805) * fix: using DN for transfer w/o internal customer (#27798) This used to be work before though not "advertised", since a lot of users have started using it as feature, it can't be broken now. (cherry picked from commit df1f8fddf6e2f4106c1a2778614ba9a1dc5ff67e) * fix(ux): use toast instead of popup Co-authored-by: Ankush Menat <ankush@iwebnotes.com> (cherry picked from commit fa944382c53bdeeb92f2dcc876e2c11ed03e20cc) # Conflicts: # erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py * fix: resolve conflict * fix: resolve conflicts Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> Co-authored-by: Ankush Menat <ankush@iwebnotes.com>	2021-10-05 16:16:21 +05:30
Ankush Menat	3d3655ed73	fix: ignore random periodicity in validations	2021-10-05 15:52:11 +05:30
Deepesh Garg	a2b5e678fe	fix: Use get_list instead of get_all to avoid perm issues ... (cherry picked from commit 9507b2d752a40c0dd9e8b43ae3ef64435457c85e)	2021-10-05 09:49:05 +00:00
Deepesh Garg	020f94532b	fix: COA Importer showing blank validations ... (cherry picked from commit 0660d6ed01e0668ce828cf9bae9790aead874233)	2021-10-05 09:49:05 +00:00
Anupam	340859cb3c	fix: broken lead form actions	2021-10-05 15:11:45 +05:30
Noah Jacob	3132dcd94a	fix: batch_no not mapped from PR to Stock Entry (#27794)	2021-10-05 14:40:40 +05:30
Deepesh Garg	aa0698078f	Merge pull request #27660 from rtdany10/patch-8 ... fix: tax rate being overridden in case of 0.00	2021-10-05 14:11:27 +05:30
Noah Jacob	f5e0cad6a1	refactor: updated onboarding cards and tours	2021-10-05 13:24:22 +05:30
Alan	7da777880b	fix: add (uom, brand) Item details in an Item Price (#27561) ... * fix: add (uom, brand) and update (uom) Item details in an Item Price * fix: order of query interpolation args Co-authored-by: Marica <maricadsouza221197@gmail.com> * fix: named interpolation, remove item price * fix: sql error Co-authored-by: Marica <maricadsouza221197@gmail.com> Co-authored-by: Ankush Menat <ankush@iwebnotes.com>	2021-10-05 12:35:23 +05:30
Ganga Manoj	ad03eb25df	fix: Only calculate first_respone_time if SLA is set (#27789) ... Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>	2021-10-05 12:26:59 +05:30
Saqib	74c8e7bb97	Merge branch 'develop' into pay-received-amt-fix	2021-10-05 11:14:41 +05:30
Saqib	065a2ce983	fix(asset): expected value after useful life validation (#27539)	2021-10-05 11:14:16 +05:30
GangaManoj	38c7e42f0c	fix: Delete linked Transaction Deletion Record docs on deleting company	2021-10-05 10:14:01 +05:30
Alan	5c372202d5	fix: set item uom as stock_uom if it isn't set (#27623) ... * fix: set item uom as stock_uom if it isn't set	2021-10-04 22:38:04 +05:30
Sagar Vora	09ccdee2db	feat: add total_billing_hours to Sales Invoice (fp #26783) (#27742) ... * feat: add `total_billing_hours` to Sales Invoice * fix: re-save doctypes * fix: indentation * fix: replace reference to old function	2021-10-04 16:41:24 +05:30
Rucha Mahabal	5905cf9002	refactor!: Removed healthcare module from ERPNext (#27362) ... * chore: Removed healthcare module * chore: Removed healthcare demo, patch files * chore: Rename imports from erpnext to healthcare * chore: Added healthcare deprecation warning patch * chore: Removed healthcare module code in other modules * chore: Code clean up * refactor: Remove sales invoice custom js related to healthcare * fix: sider Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2021-10-04 15:46:40 +05:30
Komal-Saraf0609	b483f173a6	fix: Merge "Accounting Ledger" and "Accounts Receivable" in "View" button (#27769) ... * fix: Added a new button "View" and merged "Accounting Ledger" and "Accounts Receivable" into it * fix: sider issues * chore: dead code	2021-10-04 15:42:43 +05:30
Saqib	9051735529	perf: fetching of account balance in chart of accounts (#27661)	2021-10-04 11:44:46 +05:30
Saqib Ansari	1b7414e948	fix: cannot add deductions in internal transfer payment entry	2021-10-04 11:24:02 +05:30
Deepesh Garg	4abb43a425	Merge pull request #27749 from GangaManoj/fix-pe-payment-term ... fix: Display appropriate message for Payment Term discrepancies in Payment Entry	2021-10-04 11:06:20 +05:30
Deepesh Garg	a1c4c62fac	Merge pull request #27739 from nextchamp-saqib/sla-migrate-fix ... fix: sync_jobs fails	2021-10-04 11:04:12 +05:30
Rucha Mahabal	01bea14622	fix: sider	2021-10-04 09:58:38 +05:30
ChillarAnand	a1d3a09d3c	Merge branch 'develop' into care	2021-10-04 09:46:34 +05:30
Deepesh Garg	da47fe2cfb	fix(India): Internal transfer check fix ... (cherry picked from commit f0af24fc6d26040fa34fd7248bf38301897d9ca1)	2021-10-03 08:09:39 +00:00
Deepesh Garg	f109f6fd16	fix: Linting issues ... (cherry picked from commit ff570f48a0ba56925528eb8696b8b7d862252d8f)	2021-10-02 16:10:09 +00:00
Deepesh Garg	237b1a91de	fix: Remove unwanted comments ... (cherry picked from commit e4b89d2fcd6c1eb788f94ad5f9563ccec07a0f2a)	2021-10-02 16:10:09 +00:00
Deepesh Garg	9244fe563a	fix: Chart Of Accounts import button not visible ... (cherry picked from commit 3529622a0d28e9cdd6e602b5450ca79d13cfa0ed)	2021-10-02 16:10:08 +00:00
Deepesh Garg	197e97d9d6	Merge pull request #27665 from nextchamp-saqib/trim-custom-field-length ... fix: trim sales invoice custom field lengths	2021-10-02 21:36:38 +05:30
GangaManoj	9f14695743	fix: Display appropriate message if different Payment Terms are used in PE and its Payment References	2021-10-02 21:02:07 +05:30
Marica	4e7ec8a068	fix: Hero Slider Control & Alignment fixes (#27611) ... * fix: Creating unique hash for slider id instead of slider name * fix: Fixed alignment of Title, Subtitle, Action Button * chore: linter fix	2021-10-02 17:06:33 +05:30
mergify[bot]	418b9f8545	feat(HR): Some Enhancements and Onboarding (backport #25741) (#27741) ... * feat(HR): Some Enhancements and Onboarding (#25741) * feat: Hr settings restructure * feat: remove validation and make As warning * feat: made leave policy Assignment feild read only * feat: send leave Notification via 'Notification' * patch: for field name change * feat: removed defaults value for removed field * feat: removed leave Notification fields * feat: better label and description * feat: Hr Module onboarding and Onboarding slides * fix: sider, test, translations * chore: remove unnecessary code formatting changes * refactor: HR Onboarding * refactor: HR Settings * revert: Notification changes * chore: remove unnecessary descriptions from leave type * fix: linter issues Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com> (cherry picked from commit 4837238f3dbbad336bcd21fcbfa19b438cbad16a) # Conflicts: # erpnext/hr/doctype/employee/employee.js * fix: conflicts * fix: conflicts Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com> Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2021-10-02 13:28:39 +05:30
Saqib Ansari	7ac02de613	fix: sync_jobs fails	2021-10-02 11:34:47 +05:30
Alan	ece446ffe5	fix: update variant qty in BOM, Create Work Order dialog (#27686)	2021-10-01 20:32:13 +05:30
Goh Yan Chang	632f7848a3	Update employee_leave_balance.py ... fix: Employee Leave Balance report showing wrong figures	2021-10-01 16:30:33 +08:00
mergify[bot]	b9942ad639	feat: Tracking Multi-round interview (#25482) (#27724) ... * feat: Tracking Multi-round interview * fix: releted to scheduler event and formating * fix: job applicant UI/UX and conflicts * test: Interview Round * fix(test): Employee referral, Employee Onboarding, Job Offer * fix: sider * feat: set default value in Hr settings * feat: added validation for designation * test: Interview * test: Added validatiolns for skill * test: Interview feedback * fix: sider * fix: remove unnecessary validations and form label cleanups * chore: clean-up Interview Round and Interview Type doctype * fix: remove redundant Rating Value, only keep Rating * fix: update interview details on feedback submission - make interview feedback submission dialog minimizable * fix: show submit feedback button only if feedback doesn't exist * refactor: Interview and Feedback statuses and workflow * fix(HR Settings): clean up interview settings * refactor: Interview * refactor: Interview Feedback, remove unnecessary validations * chore: update notification messages * chore: remove unnecessary formatting changes in attendance list and leave application * refactor: Job Applicant to Interview mapping * chore: sorted imports * chore: sorted imports * fix: sider issues * fix: linter issues * fix: sider issues * fix: tests * fix: sorted imports * fix: tests, sider * fix: therapy plan test * fix: sider issues * feat: Include From Time and To Time fields in Interview for cleaner data * feat: Interview Calendar * fix: allow renaming masters * fix: add more fields to list view and standard filter * fix: validate overlapping interviews * fix: update tests * fix: linter issues * refactor: replace reminder messages with Email Templates * fix: sider issues Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com> (cherry picked from commit 57e66f958cd57d66a6fd3b19f6cd3593eab63666) Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>	2021-10-01 13:15:40 +05:30
Ankush Menat	a04f9c904e	fix: option to limit reposting in certain timeslot (#27725)	2021-10-01 13:05:36 +05:30
Rucha Mahabal	9e08229b7b	fix(Org Chart): use attribute selectors instead of ID selector for node IDs with special characters (#27717) ... * fix(Org Chart): use attribute selectors instead of ID selector for node IDs with special chars * fix: UI tests	2021-09-30 18:32:10 +05:30
marination	cbffbc3894	fix: reload doc in patch	2021-09-30 14:53:47 +05:30
HENRY Florian	0bc213ed17	Merge branch 'develop' into dev_fix_27359	2021-09-30 11:08:44 +02:00
Marica	b1a4e040be	Merge branch 'develop' into scan-batch	2021-09-30 14:22:45 +05:30
marination	73ac3e0c40	fix: Add patch to patches.txt for https://github.com/frappe/erpnext/pull/27554	2021-09-30 14:22:01 +05:30
Marica	754626a102	fix: Delete accidental __init__.py file	2021-09-30 14:12:19 +05:30
Marica	cc143bca0d	fix: Maintenance Schedule child table status for legacy data (#27554) ... * fix: Maintenance Schedule child table status for legacy data * fix: Include legacy draft schedules in patch * fix: Pre-commit formatting	2021-09-30 14:08:45 +05:30
Marica	c75c709114	Merge branch 'develop' into scan-batch	2021-09-30 14:07:54 +05:30
marination	abf450dc70	fix: Increment batch qty if pre-existing batch is scanned	2021-09-30 14:03:40 +05:30
Saqib Ansari	83cc597594	fix: do not set length for date field	2021-09-30 12:37:04 +05:30
mergify[bot]	9df5df4d94	fix: wrong company selected when marking attendance for all employees (#27685) (#27707) ... * fix: wrong company selected when marking attendance for all employees * fix: enable caching for repeated queries of the same employee (cherry picked from commit b478e72cefbdffd3e906fdd1ef822becdead78d7) Co-authored-by: Mohammed Yusuf Shaikh <49878143+mohammedyusufshaikh@users.noreply.github.com>	2021-09-30 12:07:38 +05:30
Ankush Menat	4685ed5a8c	fix: distribution of additional costs in mfg stock entry (#27629) ... * refactor: remove unnecessary list comprehensions * fix: correct cost distribution logic While apportioning costs same condition should be present on both sides so total value is representative of all items to be apportioned. Here while calculating incoming_items_cost only FG items are considered, but while apportioning all items with to_warehouse are considered. Solution: only apportion additional cost on FG items * test: test cost distribution * fix: patch for additional cost fix(patch): consider PCV while patching - consider Period closing voucher while patching - recomute rates for SLE of affected stock entries consider only FG/scrap item SLEs for recomputation of rates * fix: remove client side logic for addn cost All of this is done in python code hence removed client side code.	2021-09-30 09:58:59 +05:30
Deepesh Garg	f1a669c2f7	fix: Test case ... (cherry picked from commit 23863c7663a94e32e32812301a7efca79575c470)	2021-09-30 03:06:02 +00:00
Deepesh Garg	774cd68f4c	fix: Test Case ... (cherry picked from commit 846d128c5d536b5003dc3055f3239e6f92a3146c)	2021-09-30 03:06:01 +00:00
Deepesh Garg	13d2e7b198	fix: Deferred revenue entries post account freezing ... (cherry picked from commit e2eb72eb5ba1aaadddf8278dd77bfe75a178ef01)	2021-09-30 03:06:00 +00:00
rohitwaghchaure	104d107659	Merge pull request #27701 from rohitwaghchaure/minor-added-project-name-in-purchase-order-analysis ... fix: added project name in the purchase order analysis	2021-09-29 23:41:31 +05:30
Rohit Waghchaure	c1f9997a67	fix: added project name in the purchase order analysis	2021-09-29 23:26:19 +05:30
Saqib	a84cd2674c	Merge branch 'develop' into trim-custom-field-length	2021-09-29 19:56:56 +05:30
Saqib Ansari	f1fcb385f5	patch: trim sales invoice custom field lengths	2021-09-29 19:56:02 +05:30
Deepesh Garg	b39f8a6215	fix: Ignore user permission for Represents Company field in Sales and Purchase docs (#27684) ... * fix: Ignore user permission for Represents Company field in Sales and Purchase docs * fix: Ignore user permission for fiscal year company	2021-09-29 15:54:35 +05:30
Subin Tom	254b20bc09	minor fixes	2021-09-29 13:34:50 +05:30
Dany Robert	2b4959fb3b	fix: return tax rate since fetch is removed	2021-09-29 13:01:40 +05:30
Subin Tom	d3bb920e71	fix: dt instead of document in set_value query	2021-09-29 11:26:04 +05:30
Subin Tom	8675ca5bdd	fix: using db.exists and get_value instead of get_doc	2021-09-29 11:11:55 +05:30
Saqib	0b040c7437	fix: cannot delete a project if linked with sales order (#27536)	2021-09-28 18:13:01 +05:30
Saqib	424efd41e5	feat(regional): toggle for reduced depreciation rate as per IT Act (#27600)	2021-09-28 18:12:02 +05:30
Subin Tom	0a28fed679	fix: patch fix, fields disabling	2021-09-28 13:54:01 +05:30
Alan	72c081fd8f	fix: apply price list after batch or serial no insertion (#27566)	2021-09-28 12:56:26 +05:30
Alan	b91333afdd	fix: set item.qty as mandatory in picklist (#27680)	2021-09-28 06:41:37 +00:00
GangaManoj	c84c983073	fix: Categorize into test suites	2021-09-28 01:22:38 +05:30
Noah Jacob	5c249decbb	fix(ux): added exception of template item in filters (#27560)	2021-09-27 22:34:27 +05:30
Ganga Manoj	28bdd6d2e3	Merge branch 'develop' into fix-depr-after-sale	2021-09-27 22:18:04 +05:30
GangaManoj	40ec2d622b	fix: Add tests for depreciation	2021-09-27 22:14:42 +05:30
GangaManoj	fdd9e6cc3c	fix: Replace asset.schedules with asset.get('schedules')	2021-09-27 22:14:16 +05:30
Deepesh Garg	cc5dd5c67d	feat: TDS deduction using journal entry and other fixes (#27451) ... * fix: TDS deduction using journal entry * fix: Multi category application against single supplier * refactor: TDS payable monthly report * fix: Server side handling for default tax withholding category * fix: Supplier filter for Journal Entry * refactor: TDS computation summary report	2021-09-27 21:43:20 +05:30
marination	596cf3951d	fix: Batch scans get overwritten on the same row	2021-09-27 15:06:46 +05:30
Saqib	b68ac24cd5	chore: add shipping address in eway bill test (#27662)	2021-09-27 15:03:58 +05:30
Saqib	f2fca59ba7	fix: cannot set custom label for 'total' field in print format (#27664)	2021-09-27 14:28:16 +05:30
Shariq Ansari	18918e1b4f	chore: linter fix	2021-09-27 14:08:44 +05:30
Saqib Ansari	a7df4227da	fix: trim sales invoice custom field lengths	2021-09-27 13:56:16 +05:30
Shariq Ansari	0de735f20b	fix: Fixed alignment of Title, Subtitle, Action Button	2021-09-27 13:50:19 +05:30
Subin Tom	54754f4eb8	fix: updated patch, add fields only if fields are checked	2021-09-27 12:51:54 +05:30
Saqib	711395db22	fix: linting errors	2021-09-27 12:26:18 +05:30
Saqib	1f8ad72418	fix: indentation	2021-09-27 12:21:06 +05:30
Saqib	30f59b09fd	chore: log modified invoices	2021-09-27 12:20:16 +05:30
ChillarAnand	765a9bb731	refactor: Remove sales invoice custom js related to healthcare	2021-09-27 07:34:54 +05:30
Saqib Ansari	18e5d59d24	fix: unknown column 'ref_exchange_rate'	2021-09-26 20:26:45 +05:30
Dany Robert	5ce6a4c107	fix: tax rate being overridden in case of 0.00 ... Tax rate could be different for different expenses. Therefore, rate is kept as 0.00 and tax amount entered manually. But fetching used to override the rate(upon saving) and mess up the amount.	2021-09-26 18:31:27 +05:30
Saqib	e8ff649298	Merge branch 'develop' into fix-32644	2021-09-26 17:07:46 +05:30
Saqib Ansari	e6b4d33f4b	chore: hide exchange gain loss if empty	2021-09-26 17:07:13 +05:30
Saqib Ansari	beebfb323a	patch: invalid gain loss gl entry	2021-09-26 16:58:55 +05:30
Saqib	f8c1c73953	fix: local variable 'fiscal_year_details' referenced before assignment (#27656)	2021-09-26 16:27:56 +05:30
Saqib Ansari	78ad50efc2	fix: cost center in exchange gain loss gl entry	2021-09-26 16:08:15 +05:30
Saqib Ansari	dd2d039ca8	chore: hide exchange gain loss if empty	2021-09-26 15:51:03 +05:30
Saqib Ansari	64efe8bf15	fix: setting of gain/loss if party account is in company currency	2021-09-26 15:46:13 +05:30
escix	dafe99b6e2	fix: holiday message reminder ... Minor grammatical change	2021-09-26 11:09:13 +05:30
GangaManoj	796ed947ce	fix: Reverse depreciation entry made on sale if asset that was set to be sold in the future gets returned	2021-09-25 19:11:29 +05:30
GangaManoj	b9fb59da58	fix: Reset depreciation schedule on returning asset	2021-09-25 19:04:16 +05:30
Sagar Vora	c8b9a55e96	feat: add Partly Paid status in Invoices (#27625)	2021-09-22 12:11:35 +05:30
Frappe PR Bot	2af6ea68ae	fix: remove unknown field employee_name from query (bp #27634) ... * fix: remove unknown field employee_name from query * fix: remove unknown fieldname Co-authored-by: root <root@vultr.guest> Co-authored-by: Ankush Menat <ankushmenat@gmail.com> (cherry picked from commit 9ebabb86b3d28e2c94eb2761f1864c88b6eb1e59) Co-authored-by: Bhavesh Maheshwari <34086262+bhavesh95863@users.noreply.github.com>	2021-09-21 20:33:09 +05:30
Ankush Menat	c302c7ab42	fix: remove bad default for anniversary reminders (#27632) ... 🤦	2021-09-21 17:51:46 +05:30
Marica	9110223341	fix: (ux) Use subassembly schedule date while making WO from Prod Plan (#27628) ... - Set subassemply WO's planned start date from Production Plan	2021-09-21 16:50:14 +05:30
Kenneth Sequeira	abded895f3	fix: update default KSA VAT rate for setup (#27614)	2021-09-21 10:58:18 +05:30
François de Ryckel	5c400da4e2	Update training_result.js (#27615) ... cur_frm is deprecated	2021-09-21 09:29:15 +05:30
GangaManoj	7ab3b9dd5a	fix: Add test for depreciation on sale of a depreciated Asset	2021-09-21 07:11:40 +05:30