32507 Commits

Author	SHA1	Message	Date
Ankush Menat	24a7acaabc	chore: incorrect translations	2022-04-26 19:22:26 +05:30
Ankush Menat	dcc2243fbb	Merge pull request #30811 from marination/multiple-wh-acc ... chore: Warn users about multiple warehouse accounts	2022-04-26 18:18:11 +05:30
marination	e2a163d4e9	fix: Use account_type == 'Stock' to filter stock accounts	2022-04-26 17:50:51 +05:30
marination	44331f4f1f	chore: Warn users about multiple warehouse accounts ... - Get distinct accounts that warehouse value has been booked against - If same account as the one being set, ignore - If not same account or multiple accounts: warn user that it makes it harder to track mismatches	2022-04-26 17:43:33 +05:30
Rucha Mahabal	1cc8c79807	test: fix flaky carry forwarded leave expiry test (#30810)	2022-04-26 17:43:08 +05:30
Saqib Ansari	078f26bef3	Merge pull request #30808 from nextchamp-saqib/pos-search-ux-fix ... fix(pos): search field doesn't reset on checkout	2022-04-26 14:47:22 +05:30
Saqib Ansari	b1ac5ff9d2	fix(pos): number pad translations	2022-04-26 14:41:36 +05:30
Saqib Ansari	03a6103fe5	fix(pos): search field doesn't reset on checkout	2022-04-26 14:28:33 +05:30
Deepesh Garg	00ace8f62c	Merge branch 'develop' into accounting_dimension_consistency	2022-04-26 14:26:08 +05:30
Deepesh Garg	82a0635c66	fix: Consistent accounting dimensions across Sales and Purchase docs	2022-04-26 14:01:13 +05:30
ruthra kumar	b0ead459a0	feat: add payment terms status rpr to Selling homepage	2022-04-26 13:30:13 +05:30
Ankush Menat	88e257ff6d	fix: column name in party query	2022-04-26 11:47:05 +05:30
Ankush Menat	052171f51c	fix: date condition in tax rule	2022-04-26 11:47:05 +05:30
Ankush Menat	a90e7e32a4	fix: proper quoting in sql queries	2022-04-26 11:47:05 +05:30
Ankush Menat	7e555d3d8c	fix: item price query for postgres ... postgres doesn't like bad type comparisons and doesn't have `isnull` funciton	2022-04-26 11:47:02 +05:30
Ankush Menat	7d2587c0a9	fix: nullish check and table name	2022-04-26 11:03:32 +05:30
Ankush Menat	0fdfc1e76e	fix: only query fields that exist	2022-04-26 11:03:32 +05:30
Ankush Menat	ce75fe0ec4	fix: out of range date value	2022-04-26 11:03:32 +05:30
Ankush Menat	cdac2b8c63	fix: ignore duplicate fixtures	2022-04-26 11:03:32 +05:30
Ankush Menat	e1c1687661	refactor: use db agnostic CombineDatetime	2022-04-26 11:03:32 +05:30
Deepesh Garg	d3582ea399	fix: Allow multi-currency opening invoices	2022-04-25 18:18:39 +05:30
Deepesh Garg	4ffea617ef	Merge pull request #30754 from deepeshgarg007/round_off_account_cost_center ... fix: First preference to parent cost center rather than round off cost center	2022-04-25 17:06:19 +05:30
Deepesh Garg	3fa1c63479	test: Unit test for round off entry dimensions	2022-04-25 16:29:26 +05:30
Deepesh Garg	b1158bcb7c	Merge pull request #30799 from nextchamp-saqib/einv-cess-fix ... fix(india): cess value not considered while validating e-invoice totals	2022-04-25 14:39:15 +05:30
Deepesh Garg	f064e0b15e	Merge pull request #30642 from rahib-hassan/separate-discount-account ... feat: separate discount accounting for buying and selling	2022-04-25 14:07:20 +05:30
Saqib Ansari	8e6c7a6bf7	fix(india): cess value not considered while validating e-invoice totals	2022-04-25 14:02:46 +05:30
Deepesh Garg	02aaa6546c	chore: Remove dead code	2022-04-25 12:42:06 +05:30
Deepesh Garg	22bc107d70	Merge pull request #30778 from deepeshgarg007/accpunting_dimension_validate_ignore_new ... fix: Do not validate while creating accounting dimension	2022-04-25 12:30:51 +05:30
rahib-hassan	6c86067d90	Merge branch 'develop' into separate-discount-account	2022-04-25 12:17:50 +05:30
Ankush Menat	d6a43a39ae	test: tie breaking in SLEs (#30796) ... [skip ci]	2022-04-25 11:46:01 +05:30
Deepesh Garg	618fa0e8ea	Merge branch 'develop' into accpunting_dimension_validate_ignore_new	2022-04-24 20:55:50 +05:30
Deepesh Garg	afc6aa88f0	Merge pull request #30763 from deepeshgarg007/loan_reconciliation ... fix: Add loan doctypes in bank clearance	2022-04-24 20:55:29 +05:30
Deepesh Garg	c515abc392	test: Remove teardown method	2022-04-24 19:20:29 +05:30
Deepesh Garg	c312cd3725	fix: Check if accounting dimension exists	2022-04-24 18:11:32 +05:30
Deepesh Garg	783793deac	Merge branch 'develop' of https://github.com/frappe/erpnext into round_off_account_cost_center	2022-04-23 21:40:38 +05:30
Deepesh Garg	015812b0b8	fix: Add accounting dimensions for round off GL Entry	2022-04-23 21:40:08 +05:30
Deepesh Garg	d4d83f4bb6	test: Fixes in test case	2022-04-23 12:33:35 +05:30
Deepesh Garg	0eacc99ab7	test: Fixes in test case	2022-04-23 12:08:30 +05:30
Rucha Mahabal	deed9702cf	Merge pull request #30780 from ruchamahabal/promotion-enhancements	2022-04-22 22:33:39 +05:30
Rucha Mahabal	8e5327a0e0	fix: clear property child table on changing employee	2022-04-22 21:33:24 +05:30
Rucha Mahabal	9d158088ee	chore: remove unused Employee Transfer Property doctype	2022-04-22 20:20:12 +05:30
Rucha Mahabal	cfa4dfe7a8	fix: reset old CTC on promotion cancellation	2022-04-22 20:20:04 +05:30
Rucha Mahabal	9b93c63830	fix: tests	2022-04-22 17:54:32 +05:30
Wolfram Schmidt	43c1d63ab2	fix translation (#30781) ... fixed the short word for March in german language	2022-04-22 17:32:34 +05:30
Rucha Mahabal	788e0a1c6c	chore: format employee_property_update.js	2022-04-22 17:25:37 +05:30
Rucha Mahabal	ed04241cf4	Merge branch 'develop' into promotion-enhancements	2022-04-22 16:38:01 +05:30
Rucha Mahabal	833a33a94b	test: employee property update via Employee Promotion	2022-04-22 16:28:25 +05:30
Rucha Mahabal	a93867de19	feat: add CTC fields in Employee master and Promotion	2022-04-22 16:28:14 +05:30
marination	8d632e9b9c	style: Re-run pre-commit	2022-04-22 16:27:29 +05:30
marination	b848e61954	fix: Skip unpublished Variants with published templates in shopping cart quote validation	2022-04-22 16:25:56 +05:30
Devin Slauenwhite	53d8168dea	fix: linter format string after translation	2022-04-22 16:25:28 +05:30
Devin Slauenwhite	ea6d6e31b3	fix: linter trilaing whitespace	2022-04-22 16:25:21 +05:30
Devin Slauenwhite	48da3b4482	fix: sider issues	2022-04-22 16:23:18 +05:30
Devin Slauenwhite	b88d5d135e	fix(test): validate exception without website item	2022-04-22 16:23:07 +05:30
Devin Slauenwhite	86832fb7fe	test: assert error if quotation contains non website item	2022-04-22 16:22:58 +05:30
Devin Slauenwhite	678a1179d4	fix: shopping cart quotation without website item	2022-04-22 16:22:32 +05:30
Deepesh Garg	9bb132fdd3	fix: Do not validate while creating accounting dimension	2022-04-22 13:39:43 +05:30
Vladislav	e088e65871	fix: update translation (#30725) ... * Update ru.csv * Update ru.csv * Update ru.csv * Update ru.csv * Update ru.csv * Update ru.csv * Update ru.csv * Update ru.csv * Update ru.csv	2022-04-22 11:00:57 +05:30
Deepesh Garg	81b3342480	Merge pull request #30757 from nextchamp-saqib/einv-401-fix ... fix(india): 401 & 403 client error while generating IRN	2022-04-21 18:55:26 +05:30
Deepesh Garg	8a8476bb5c	test: Add test coverage for bank clearance	2022-04-21 18:53:18 +05:30
Ankush Menat	d5ab626a31	Merge pull request #30726 from ankush/dependent_gle_reposting ... fix: dependent gle reposting	2022-04-21 18:06:40 +05:30
Ankush Menat	ee3036651a	fix: batch_no filtering not working when batch no is also a number in scientific notation (#30770) ... [skip ci]	2022-04-21 16:34:31 +05:30
rahib-hassan	78c8e46511	Merge branch 'develop' into separate-discount-account	2022-04-21 15:06:58 +05:30
Deepesh Garg	c42547d40f	fix: Use parent cost center for Sales and Purchase Invoice	2022-04-21 13:26:44 +05:30
Marica	87f1617780	Merge branch 'develop' into field-filters-e-com	2022-04-21 12:32:33 +05:30
marination	c5d4bed932	test: setup e commerce settings before running invalid filtrs test	2022-04-21 12:29:30 +05:30
Rucha Mahabal	c3dc5d5ce7	fix: property addition not working for select fields	2022-04-21 08:17:00 +05:30
rahib-hassan	02e17dbded	fix: removed manual enable-discount-account method	2022-04-21 02:42:42 +05:30
rahib-hassan	2c78cc2014	fix: removed manual rollback - enable discount account	2022-04-21 02:40:59 +05:30
Deepesh Garg	3d0e68acaa	fix: select doctype as payment_document	2022-04-20 19:49:53 +05:30
Deepesh Garg	c3e27b5556	fix: Loan doctypes in bank reconciliation	2022-04-20 19:07:53 +05:30
marination	8981405a62	test: Field filter validation and Custom field as field filter ... - Test to block Item fields (which aren’t in Website Item) in E Commerce Settings as filters - Removed unnecessary function and setup in E Commerce Settings test - Removed commented useless test - Test to check custom field as filter	2022-04-20 18:50:47 +05:30
marination	6d750e185e	fix: Handle Multiselect field mapping separately ... - Map Multiselect child table to Website Item (copy rows)	2022-04-20 17:40:03 +05:30
rahib-hassan	13092bcc2d	fix: enable discount roll_back	2022-04-20 16:46:29 +05:30
rahib-hassan	1e143e7479	fix: use @change_settings to enable_discount_account	2022-04-20 16:06:55 +05:30
rahib-hassan	f3fa6ac4c2	fix: account setting seperation gl discount account creation	2022-04-20 16:01:12 +05:30
Rucha Mahabal	5411e69553	fix: filters not working in Shift Assignment Calendar view (#30752)	2022-04-20 14:56:06 +05:30
Saqib Ansari	ee8047aba3	fix(india): 401 & 403 client error while generating IRN	2022-04-20 14:14:29 +05:30
rahib-hassan	f058755ad3	fix: test cases updated	2022-04-20 13:24:15 +05:30
HENRY Florian	143786aaa0	fix: Must not be able to start Job Card if it is related to Work Order that is not started yet (#29072) ... * fix: Cannot start Job strat if related to Work Order not started yet * fix: Cannot start Job strat if related to Work Order not started yet * test * test * fix siders * PR review * chore: Code cleanup - Better short circuit for if condition (make it such that both conditions dont always have to be computed) - Remove `r.message` extraction by avoiding `then()` * chore: Remove unnecessary json change Co-authored-by: marination <maricadsouza221197@gmail.com>	2022-04-20 12:29:52 +05:30
marination	5660b335ba	fix: Mistyped variable name in patch	2022-04-20 12:25:59 +05:30
Deepesh Garg	0ac11a5b30	fix: First preference to parent cost center rather than round off cost center	2022-04-20 12:18:11 +05:30
Ankush Menat	9734329094	test: discard local future SLE cache between tests	2022-04-19 17:40:28 +05:30
Ankush Menat	700e864d90	fix: sort stock vouchers before reposting GLE	2022-04-19 17:40:26 +05:30
Ankush Menat	b24920c0e9	fix: correct sorting while updating bin	2022-04-19 17:38:36 +05:30
Ankush Menat	d2882ea436	test: use disposable item codes in tests ... dependency causes flake	2022-04-19 17:38:36 +05:30
Ankush Menat	8f519545b0	test: repost queue progress	2022-04-19 17:38:36 +05:30
Ankush Menat	ecdb49314f	fix: dependent GLE reposting	2022-04-19 17:38:36 +05:30
Ankush Menat	a2af2daca7	test: dependent GL entry reposting	2022-04-19 17:38:36 +05:30
Ankush Menat	afc5a55a23	refactor: repost error handling	2022-04-19 17:38:36 +05:30
FinByz Tech Pvt. Ltd	54a05075f3	fix(india): transporter name is null while generating e-way bill (#30736) ... (cherry picked from commit 6291b28c37f02380001ab68b3a660b2804383ab2)	2022-04-19 10:57:59 +00:00
Rucha Mahabal	789fa31b82	Merge branch 'develop' into shift-type-null-in-employee-checkin	2022-04-19 13:39:32 +05:30
Rucha Mahabal	3cddc1e97e	test: shift fetching when assignment has an end date	2022-04-19 13:39:03 +05:30
Rucha Mahabal	98cccf221e	fix: shift fetching fails in Employee Checkin if shift assignment has an end date ... Co-authored-by: Ejaaz Khan <ejaazrkhan@gmail.com>	2022-04-19 13:17:36 +05:30
Rucha Mahabal	7c547f152f	fix(patch): check if column is present while fixing reverse linking (#30737)	2022-04-19 12:18:46 +05:30
marination	d0cd194398	chore: Patch to copy custom fields (field filters) from Item to Website Item	2022-04-18 21:40:19 +05:30
Deepesh Garg	d96bfe13a8	Merge pull request #30721 from ruthra-kumar/bug_so_analysis_report ... fix: SO's without delivery note will also be fetched	2022-04-18 19:58:37 +05:30
marination	1e80b97915	refactor: Change Filter Fields table fieldtype to Autocomplete ... - Remove dynamic js fieldtype change to `Select`	2022-04-18 19:01:43 +05:30
marination	d35b37881b	fix: Validate field filter wrt to Website Item & re-use validation in Item Group	2022-04-18 18:51:48 +05:30
Marica	8a366309e1	Merge branch 'develop' into field-filters-e-com	2022-04-18 18:11:25 +05:30
marination	c993ac09df	fix: Query filter fields from Website Item instead of Item master ... - tweak `filters.py` to correctly query filter field values from Website Item - Use Website Item for filter field options in Settings and Item Group Field Filter table	2022-04-18 18:01:48 +05:30
rahib-hassan	bcfbb3e9c8	fix: code formatting	2022-04-18 15:04:47 +05:30
rahib-hassan	ebb7bc201b	fix: library import formatting	2022-04-18 14:53:45 +05:30
Deepesh Garg	264ec65255	Merge pull request #30728 from deepeshgarg007/pricing_rule_apply_mapped_doc ... fix: Price changing on creating Sales return from Delivery Note	2022-04-18 14:34:28 +05:30
rahib-hassan	52fd804aed	Merge branch 'develop' of github.com:rahib-hassan/erpnext into separate-discount-account	2022-04-18 14:13:46 +05:30
Deepesh Garg	9c081947ec	fix: Price changing on creating Sales retrun from Delivery Note	2022-04-18 10:21:15 +05:30
Deepesh Garg	5cdd0d6719	fix: Move tax withholding category field	2022-04-16 20:34:56 +05:30
Deepesh Garg	0a67b0239e	fix: Consistent customer and supplier forms	2022-04-16 19:43:59 +05:30
ruthra kumar	13487e2408	test: Sales order analysis report	2022-04-16 12:02:32 +05:30
Bhavesh Maheshwari	72757994f8	fix: process statement to_date override ... (cherry picked from commit 378d15d388ae9cac7a5f897af83c99605403503a)	2022-04-14 13:14:11 +00:00
ruthra kumar	e28e6726f1	fix: SO analysis rpt will fetch SO's without Delivery note as well	2022-04-14 18:37:46 +05:30
Ankush Menat	9af2d68945	refactor: convert queries to ORM/QB, add types	2022-04-14 18:05:38 +05:30
Ankush Menat	ba29323e11	test: increase assertions to cover all cases	2022-04-14 18:05:38 +05:30
Ankush Menat	e278ee359a	test: item attribute columns	2022-04-14 18:05:38 +05:30
Ankush Menat	febc74a21b	refactor: rewrite stock balance query to QB	2022-04-14 18:05:35 +05:30
Ankush Menat	8a499e95d3	test: uom conversion in stock balance report	2022-04-14 18:01:43 +05:30
Ankush Menat	af0ea7b532	test: assert balanaces against SLE	2022-04-14 18:01:42 +05:30
Ankush Menat	f4766ae4eb	test: opening balance in stock balance report	2022-04-14 18:01:42 +05:30
Ankush Menat	8b2432dfa0	test: stock balance report tests	2022-04-14 18:01:42 +05:30
Ankush Menat	64ac22af82	refactor: add filter type info	2022-04-14 18:01:42 +05:30
HENRY Florian	e6aa28ea14	fix: update translation (#30716) ... * fix: update translation * fix: update translation * fix: update translation * fix: update translation	2022-04-14 17:46:47 +05:30
Ankush Menat	15576c1ce8	Merge pull request #30707 from marination/values-out-of-sync-jv ... fix: Remove "Values Out of Sync" validation	2022-04-14 17:39:18 +05:30
Ankush Menat	0d64349142	Merge branch 'develop' into separate-discount-account	2022-04-14 17:29:28 +05:30
rahib-hassan	4130493b58	fix: Label typo	2022-04-14 16:03:08 +05:30
rahib-hassan	01fde15bd5	fix: dependent codes updated	2022-04-14 15:48:55 +05:30
rahib-hassan	0eff74c650	fix: tabspacing	2022-04-14 15:42:16 +05:30
Deepesh Garg	1659f1eb6d	Merge pull request #29963 from nabinhait/income-tax-computation ... feat: Income tax computation Report	2022-04-14 15:31:17 +05:30
Deepesh Garg	e2fa9f708e	Merge pull request #30710 from deepeshgarg007/advance_jv_allocation ... fix: Exchange gain and loss on advance Journal Entry allocation	2022-04-14 15:10:04 +05:30
Nabin Hait	cd2ab32242	fix: orginised code	2022-04-14 14:05:21 +05:30
Nabin Hait	bc7007d588	fix: get enabled deduction components ... Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>	2022-04-14 14:02:01 +05:30
Nabin Hait	d06b7378f8	fix: get enabled and submitted income tax slab ... Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>	2022-04-14 14:01:44 +05:30
Nabin Hait	67086e618d	fix: get enabled earning components ... Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>	2022-04-14 14:00:28 +05:30
Marica	87117313a1	Merge branch 'develop' into values-out-of-sync-jv	2022-04-14 13:41:27 +05:30
Deepesh Garg	c38be53ce8	test: Update customer in Sales Invoice	2022-04-14 13:26:47 +05:30
Suraj Shetty	11fa187263	Merge pull request #30715 from surajshetty3416/fix-exotel-call-log	2022-04-14 12:45:15 +05:30
Suraj Shetty	77599fe443	fix: Set correct options for link field ... issue introduced via https://github.com/frappe/erpnext/pull/30711	2022-04-14 12:32:31 +05:30
Deepesh Garg	86cfa3a53f	Merge pull request #30712 from frappe/mergify/bp/develop/pr-30700 ... fix: Payment reco query with max invoice and payment amount limit (backport #30700)	2022-04-14 12:32:11 +05:30
marination	d75d5ebe8d	chore: Remove Values Out of Sync from Repost hourly job ... - It runs after repost (after commiting), so it has 0 impact on repost itself - Just that scheduled job log shows up as failed, while actually repost is done and repost document is "Completed" - The check is inaccurate also, so best to remove this - Users cant do anything about it anyway. This just piles up phantom failed jobs unneccessarily	2022-04-14 12:30:06 +05:30
Deepesh Garg	065c38152a	Merge branch 'develop' of https://github.com/frappe/erpnext into item_wise_provisional_accounting	2022-04-14 12:04:21 +05:30
Deepesh Garg	ad171c6225	test: Update test case	2022-04-14 12:03:12 +05:30
Deepesh Garg	e6cb948a96	fix: Payment reco query with max invocie and payment amount limit ... (cherry picked from commit 4008c95ac6afc3b06a0a602e3f469db61e1f0453)	2022-04-14 05:42:17 +00:00
Deepesh Garg	972d9ec5b4	test: Update customer	2022-04-14 11:10:41 +05:30
Suraj Shetty	6e837bcdfc	style: Fix linter warning	2022-04-14 10:02:15 +05:30
Suraj Shetty	c272170b86	fix(call log): Convert Data to Link for type_of_call ... Convert `Data` to `Link` for type_of_call, employee_user_id and call_received_by fields	2022-04-14 09:51:54 +05:30
Deepesh Garg	31883b699d	fix: Exchange gain and loss on advance jv allocation	2022-04-13 20:52:25 +05:30
Ankush Menat	79fbc2c504	test: flaky PR close test (#30709)	2022-04-13 20:42:25 +05:30
Suraj Shetty	d890ee9495	Merge pull request #29962 from nemesis189/exotel-fixes ... fix: Exotel Call Log fixes	2022-04-13 20:36:03 +05:30
Suraj Shetty	ff41b8da4e	fix: Update received_by if "to" is changed	2022-04-13 20:12:08 +05:30
Suraj Shetty	cef28df8db	test: Do not overwrite frappe.form_dict to retain proxy reference ... Set frappe.local.form_dict instead	2022-04-13 19:10:19 +05:30
marination	89fab78027	fix: Remove "Values Out of Sync" validation from Journal Entry ... - Even if there is a difference there's not much a user can do - Checking it at the JV level is senseless. Blindly making users post another JV will lead to more error. - Users making JV are usually accountants who know what they are doing - The validation computes incorrect values for an account that contributes partially to warehouse's value.	2022-04-13 18:44:50 +05:30
Raffael Meyer	6453fb4cea	refactor!: remove DATEV integration (#30584) ... The DATEV integration follows the trend and moves into a separate app. - the DATEV Integration will be maintained at https://github.com/alyf-de/erpnext_datev (version-14 branch) - the German Compliance and Localization will be maintained at https://github.com/alyf-de/erpnext_germany	2022-04-13 09:24:19 +00:00
Marica	c5247a0767	Merge branch 'develop' into pp-wo-company	2022-04-13 11:52:15 +05:30
marination	6315acc450	fix: Map correct company to PO made via Prod Plan (subcontract)	2022-04-13 11:47:58 +05:30
Ankush Menat	bfaaebde0d	Merge branch 'develop' into separate-discount-account	2022-04-12 18:38:23 +05:30
Deepesh Garg	228195ba74	Merge pull request #30689 from deepeshgarg007/disabled_gl_dimensions ... fix: Do not show disabled dimensions in reports	2022-04-12 16:11:07 +05:30
Deepesh Garg	4f9b38a591	Merge pull request #30686 from nabinhait/ignore-permlevel-for-fields ... feat: Ignore permlevel for specific fields	2022-04-12 15:55:28 +05:30
Noah Jacob	8261b2bb4f	refactor: trigger generate schedule when any change made in items table (#29874) ... * refactor: trigger generate schedule when any change made in items table * chore: added serial validation on server side * test: serials updated in schedules after save * fix: schedule not generating after updating some fields * feat: generate_schedule is triggered on_save when items table is changed * test: updated tests to check other field changes on save * chore: removed serial validation function for schedules table and added no_of_visits validation function * test: updated for manually deleted schedele rows * refactor: updated validate_items_table_change to return bool * test: updated test_schedule_with_serials to cover validate_items_table_change * fix: linting	2022-04-12 15:30:49 +05:30
Deepesh Garg	9a1c560c82	fix: Do not show disabled dimensions in reports	2022-04-12 15:27:08 +05:30
marination	2777c5c67c	fix: Map Production Plan company in subassembly WO created from it	2022-04-12 14:30:01 +05:30
Nabin Hait	993c6c0de9	feat: Ignore permlevel for specific fields	2022-04-12 12:24:47 +05:30
Ankush Menat	60fb71bd2a	fix: ignore item-less maintenance visit for sr no (#30684)	2022-04-12 11:14:02 +05:30
Deepesh Garg	7d263e9ecf	Merge pull request #30651 from deepeshgarg007/gst_download_json_key_error ... fix: Download JSON for GSTR-1 report	2022-04-12 00:06:25 +05:30
Marica	014298a867	Merge pull request #30674 from marination/work-order-partial-transfer ... fix: Handle multiple item transfer in separate SEs against WO	2022-04-11 17:23:57 +05:30
Deepesh Garg	79b90118e1	Merge branch 'develop' into gst_download_json_key_error	2022-04-11 17:15:04 +05:30
Marica	3f8be3ac10	Merge branch 'develop' into work-order-partial-transfer	2022-04-11 16:49:22 +05:30
marination	5aa60bb651	test: Multiple RM transfer in separate Stock Entries ... - Added test and acceptance of 0 as For Quantity in test helper	2022-04-11 16:44:55 +05:30
Nabin Hait	e46898f5f5	fix: test cases	2022-04-11 16:37:34 +05:30
Nabin Hait	aad29ad572	fix: removed unused imports	2022-04-11 15:33:22 +05:30
marination	be2e5ce966	style: Missing Semicolon	2022-04-11 15:32:57 +05:30
Nabin Hait	c27e3ef03e	fix: Show message is no employee found	2022-04-11 15:30:26 +05:30
Deepesh Garg	553178bfe7	test: Add test	2022-04-11 15:29:20 +05:30
Nabin Hait	7072dda31f	fix: sider issues	2022-04-11 15:19:42 +05:30
Deepesh Garg	54eef3daad	Merge branch 'develop' of https://github.com/frappe/erpnext into deferred_revenue_default_account_fixes	2022-04-11 15:09:30 +05:30
Saqib Ansari	0373347a97	Merge branch 'develop' into separate-discount-account	2022-04-11 14:55:42 +05:30
Nabin Hait	c7848089ab	tests: Added unit tests for income tax computation report	2022-04-11 14:51:23 +05:30
Deepesh Garg	3ce64170db	feat: Item-wise provisional accounting for service items	2022-04-11 14:35:22 +05:30
rahib-hassan	a7a5742375	fix: merge conflict(patch)	2022-04-11 14:28:36 +05:30
marination	dfff4beaf4	fix: Handle multiple item transfer in separate SEs against WO ... - Check for pending qty in child items to show/hide "Start" button - If no qty needed to transfer (FG qty is fulfilled), but RM qty pending: map pending in SE with For Quantity = 0	2022-04-11 14:10:57 +05:30
Ankush Menat	c3e1f0e369	refactor: ignore mandatory fields during setup	2022-04-11 13:19:17 +05:30
Ankush Menat	086d31b59f	fix: dont validate currency exchange in setup ... Redues ~4-5 seconds of time and chances of setup failure.	2022-04-11 13:19:17 +05:30
Nabin Hait	e3a53590de	fix: Added filter to consider Tax Exemption Declaration if proof not submitted	2022-04-11 12:23:13 +05:30
Nabin Hait	535217a042	fix: Added income tax slab column	2022-04-11 12:23:13 +05:30
Nabin Hait	1f018a912b	fix: Get exemptions from declaration only if proof not submitted	2022-04-11 12:23:13 +05:30
Nabin Hait	b4900ef220	fix: duplicate exemption amount and rounded tax	2022-04-11 12:23:13 +05:30
Nabin Hait	a74eec01ea	fix: Added report link in the Payroll workspace	2022-04-11 12:23:13 +05:30
Nabin Hait	a9b5d990a4	fix: Removed designation filter	2022-04-11 12:23:13 +05:30
Nabin Hait	0480bb318e	fix: Modified column width	2022-04-11 12:23:13 +05:30
Nabin Hait	f9633bbd48	feat: Income Tax Computation Report	2022-04-11 12:23:11 +05:30
HENRY Florian	03c631d723	fix: update translation (#30654)	2022-04-11 10:49:18 +05:30
Deepesh Garg	227a711d70	Merge pull request #30585 from frappe/mergify/bp/develop/pr-30575 ... fix: Do not apply shipping rule for POS transactions (backport #30575)	2022-04-10 20:12:53 +05:30
Deepesh Garg	0f414d51f4	Merge pull request #30443 from frappe/mergify/bp/develop/pr-30438 ... fix: Incorrect default amount to pay for POS invoices (backport #30438)	2022-04-10 18:56:02 +05:30
Deepesh Garg	ddbd82af95	Merge pull request #30459 from frappe/mergify/bp/develop/pr-30385 ... fix(India): Auto tax fetching based on GSTIN (backport #30385)	2022-04-10 18:55:26 +05:30
Deepesh Garg	809117229d	Merge pull request #30626 from nextchamp-saqib/einv-utgst ... feat(india): e-invoicing for intra-state union territory transactions	2022-04-10 18:54:17 +05:30
Ankush Menat	8138e53cf3	test: flaky picklist tests	2022-04-10 17:50:57 +05:30
Deepesh Garg	a2937cffc7	fix: Implicit ignore pricing rule check on returns ... (cherry picked from commit 1b25a7fe765d334fce990d43224f8a790ccf8119)	2022-04-09 14:46:25 +00:00
Deepesh Garg	207bf85c74	Merge pull request #30488 from Havenir/fix-project-list-in-web-view ... fix: web form filters for project	2022-04-09 20:06:49 +05:30
Deepesh Garg	cbd8998fc1	Merge branch 'develop' into mergify/bp/develop/pr-30438	2022-04-09 20:03:23 +05:30
Deepesh Garg	02c6b898a6	Merge branch 'develop' into mergify/bp/develop/pr-30385	2022-04-09 19:57:59 +05:30
Deepesh Garg	e30cc8422c	fix: Resolve conflicts	2022-04-09 19:53:40 +05:30
Deepesh Garg	2e00678c76	Merge pull request #30542 from deepeshgarg007/disabled_tax_category ... fix: Ignore disabled tax categories	2022-04-09 19:52:31 +05:30
mergify[bot]	51d77cd85e	fix(pos): cannot change paid amount in pos payments (#30660)	2022-04-09 16:28:10 +05:30
Rucha Mahabal	cf2e6c6c08	fix: remove hardcoded employee fields that can be updated via Promotion	2022-04-09 13:15:37 +05:30
rahib-hassan	dc2944a041	fix[minor]: removed doc assignment	2022-04-09 03:55:25 +05:30
Suraj Shetty	199419db80	Merge branch 'develop' into exotel-fixes	2022-04-08 21:37:08 +05:30
Suraj Shetty	7ff5bc9e3d	test: Clean up form_dict ... To avoid failures like https://github.com/frappe/erpnext/runs/5887687369?check_suite_focus=true#step:12:783	2022-04-08 21:33:29 +05:30
rahib-hassan	ac16f3b71f	fix: lock timeout exceeded	2022-04-08 18:20:41 +05:30
Ankush Menat	af6b07f9b9	fix: block cancellation of SL/GL entries (#30652) ... Individual GL/SLEs aren't supposed to be cancelled by users.	2022-04-08 18:05:04 +05:30
rahib-hassan	ac7f1cbd87	fix: minor fix	2022-04-08 17:46:49 +05:30
rahib-hassan	2173c8b114	fix(pathces): added to patches.txt	2022-04-08 17:29:08 +05:30
rahib-hassan	35e875c111	fix(patch): enable discount account in buying and selling if exist in accounts settings	2022-04-08 17:27:53 +05:30
Ankush Menat	fcbd25f27a	chore: formatting	2022-04-08 17:24:10 +05:30
Deepesh Garg	b532ade383	fix: Download JSON for GSTR-1 report	2022-04-08 17:14:10 +05:30
rahib-hassan	171c60ff37	fix: removed discount account field from account settings	2022-04-08 16:50:56 +05:30
rahib-hassan	786887768e	fix: removed discount-accounting code from account settings	2022-04-08 16:50:36 +05:30
Jannat Patel	59ad7e037c	Merge pull request #30596 from pateljannat/remove-courses-template	2022-04-08 16:27:31 +05:30
Ankush Menat	d74181630a	test: prevent cancelling RIV of cancelled voucher	2022-04-08 14:57:55 +05:30
Ankush Menat	a281998bcb	fix: prevent deleting repost queue for cancelled transactions	2022-04-08 14:57:55 +05:30
Deepesh Garg	617deda2ff	Merge branch 'version-14-beta' into develop	2022-04-08 13:38:27 +05:30
Ankush Menat	49560d20bc	fix: remove bad defaults from BOM operation (#30644) ... [skip ci]	2022-04-08 11:23:02 +05:30
rahib-hassan	1babc5f367	feat: separated discount accounting settings for sales and purchase	2022-04-08 08:05:10 +05:30
Ankush Menat	8d57c853f3	feat: barcode scanning in quotation (#30637)	2022-04-07 21:40:03 +05:30
Ankush Menat	225deb949b	fix: use empty row when batch is scanned (#30638)	2022-04-07 21:38:18 +05:30
Sam	8fbfba4f2f	chore: class selectors for customizability (#30185) ... * Update project_row.html Really helpful those fields has own class when styling for mobile or desktop by using Website Settings --> HTML Header, Robots and Redirects * chore: skewercase	2022-04-07 19:27:27 +05:30
Rucha Mahabal	7ba66b0320	Merge branch 'develop' into multiple-shifts	2022-04-07 18:07:39 +05:30
Ankush Menat	f1fd4e5c27	test: cant_change validations on item	2022-04-07 17:30:12 +05:30
Ankush Menat	fba68541d6	refactor(Item): linked doc checking	2022-04-07 17:30:12 +05:30
Ankush Menat	2f1e98d1e8	feat: show Stock Reconciliation links on item dashboard	2022-04-07 17:30:12 +05:30
Sagar Vora	3b4754f3f6	fix: define tax_columns below consistency	2022-04-07 17:01:10 +05:30
Sagar Vora	fa4f57f470	fix: dont reassign mutable (list) to a different field	2022-04-07 16:51:27 +05:30
Deepesh Garg	18b1a93c7e	Merge pull request #30606 from deepeshgarg007/exchange_gain_loss_button ... fix: Exchange gain and loss button in Payment Entry	2022-04-07 16:49:05 +05:30
Deepesh Garg	c9d6618b9b	Merge pull request #30628 from deepeshgarg007/pricng_rule_test ... test: Pricing rule test for transactions	2022-04-07 16:37:02 +05:30
Ankush Menat	be04eaf723	fix: warehouse naming when suffix is present (#30621)	2022-04-07 13:21:08 +05:30
Deepesh Garg	22e8ae9dac	test: Pricing rule test for transactions	2022-04-07 13:20:53 +05:30
Saqib Ansari	45fca6bed7	feat(india): e-invoicing for intra-state union territory transactions	2022-04-07 13:09:05 +05:30
Ankush Menat	a6e26cce87	chore: broken translations	2022-04-07 13:07:14 +05:30
Deepesh Garg	f3e6a26d34	Merge pull request #30499 from ruthra-kumar/payment_terms_status_filter ... feat: 'customer' column and more filter to Payment terms status report	2022-04-07 13:01:16 +05:30
Rucha Mahabal	ec65af5f38	fix: show allocation history for earned leaves allocated via scheduler	2022-04-07 12:57:04 +05:30
Rucha Mahabal	6203ffc8fa	fix: make New Leaves Allocated read-only if policy assignment is linked to the allocation and leave type is earned leave	2022-04-07 12:57:04 +05:30
Rucha Mahabal	f8f1c3d8b5	fix: enable Track Changes in Leave Allocation	2022-04-07 12:57:04 +05:30
Ankush Menat	e4c6d6a1a6	fix: strip html tags before checking for empty description (#30619)	2022-04-07 12:53:10 +05:30
Deepesh Garg	8feb4f08c5	fix: Exchange gain and loss button in Payment Entry	2022-04-06 20:51:51 +05:30
Ankush Menat	8e425252c4	chore: typo	2022-04-06 18:27:41 +05:30
Ankush Menat	9e2d54f9a4	chore: broken translation ... [skip ci]	2022-04-06 18:21:28 +05:30
Ankush Menat	eebcf2a9f1	fix: only trigger onload checks on saved docs (#30603)	2022-04-06 18:13:55 +05:30
Deepesh Garg	9bf5f76ac8	fix: Deferred Revenue/Expense Account validation	2022-04-06 17:33:46 +05:30
Ankush Menat	8b090a9f7d	fix: hide pending qty only if original item is assigned (#30599)	2022-04-06 16:35:36 +05:30
Ankush Menat	ba42c87687	refactor: don't use pandas for basic reports (#30597)	2022-04-06 15:40:41 +05:30
Jannat Patel	bce1c2a028	fix: removed unused courses template	2022-04-06 14:44:10 +05:30
Ankush Menat	bb875fe217	fix: check null values in is_cancelled patch (#30594)	2022-04-06 14:20:39 +05:30
HENRY Florian	4895761d89	fix: update translation (#30474) ... * fix: update translation * fix: update translation * fix: update translation * fix: update translation * fix: update translation * fix: update translation * fix: update translation * fix: update translation * fix: update translation * fix: update translation	2022-04-06 14:00:05 +05:30
Deepesh Garg	a818acf66d	Merge pull request #30557 from deepeshgarg007/loan_repayment_issue ... fix: Issues on loan repayment	2022-04-06 11:36:53 +05:30
Rucha Mahabal	00ddb4c42a	Merge branch 'develop' into multiple-shifts	2022-04-06 11:22:46 +05:30
Rucha Mahabal	c5850e3923	Revert "feat: Scheduling Multiple shifts and Auto Attendance" (#30587)	2022-04-06 11:18:47 +05:30
Deepesh Garg	4c8dae40cd	Merge branch 'develop' into loan_repayment_issue	2022-04-06 10:57:25 +05:30
Deepesh Garg	b8df82d23c	Merge pull request #30555 from deepeshgarg007/party_account_user_perm ... fix: Ignore user perm for party account company	2022-04-06 10:57:13 +05:30
Rucha Mahabal	f208903250	feat: Scheduling Multiple shifts and Auto Attendance (#29955) ... * refactor: overlapping shifts validation - convert raw query to frappe.qb - check for overlapping timings if dates overlap - translation friendly error messages with link to overlapping doc * refactor: consider timeslots in `get_employee_shift` * fix: handle shift grace overlap while finding current shift * refactor: handle shifts spanning over 2 different days * fix: fetching shift on timing boundaries * refactor: rewrite docstrings and add type hints for functions * refactor: Allow multiple attendance records creation for different shifts * feat: auto attendance marking for multiple shifts on the same day * refactor: mark absent for employees with no attendance - break down into smaller functions - make it work with multiple shifts - this will mark employee as absent per shift, meaning employee can be present for one shift and absent for another on the same day * chore: sort imports, remove unused imports * refactor: Monthly Attendance Sheet - split into smaller functions - add type hints - get rid of unnecessary db calls and loops - add docstrings for functions * feat: add colors for attendance status to lessen the cognitive load - legend with colors and full form for status abbreviations * feat: show shift-wise attendance in monthly attendance sheet * test: monthly attendance sheet * style: format code with black * chore: ignore formatting changes in blame * test: fetching shifts in Employee Checkins * fix(test): make holiday list for shift and checkin tests * fix: tests * test: shift assignment creation * fix: attendance fixes - check half day attendance threshold before absent threshold to avoid half day getting marked as absent - round working hours to 2 digits for better accuracy - start and end dates for absent attendance marking * test: Shift Type with Auto Attendance setup and working fix test setups * refactor: Overlapping validation for Shift Request - commonify time overlap function between request and assignment - add tests for shift request overlap * chore: remove unused import * fix: add validation for overlapping shift attendance - skip auto attendance in case of overlapping shift attendance record - this case won't occur in case of shift assignment, since it will not allow overlapping shifts to be assigned - can happen if manual attendance records are created * test: validations for duplicate and overlapping shift attendance records * test: skip auto attendance * fix: skip validation for overlapping shift attendance if no shift is linked * test: add holiday related shift and attendance tests * test: add attendance sheet tests for employee filter, half days * fix: sider	2022-04-06 10:56:47 +05:30
Deepesh Garg	dec0c1b5bb	test: Ignore parent company account creation	2022-04-06 10:21:27 +05:30
Deepesh Garg	41a979ef34	Merge branch 'develop' of https://github.com/frappe/erpnext into party_account_user_perm	2022-04-06 10:15:16 +05:30
Deepesh Garg	631545aa32	fix: Use get instead of dot ... (cherry picked from commit 95298f04000c0299f35cdee7bce0f5f0d8c59525)	2022-04-06 04:31:13 +00:00
Deepesh Garg	714fc08150	fix: Do not apply shipping rule for POS transactions ... (cherry picked from commit c0ebcfb39331caa678d36cc4694490a2363f10a0) # Conflicts: # erpnext/public/js/controllers/taxes_and_totals.js	2022-04-06 04:31:13 +00:00
Deepesh Garg	ec6f7040f4	Merge branch 'develop' into mergify/bp/develop/pr-30385	2022-04-06 10:00:51 +05:30
Deepesh Garg	4727e774c0	Merge branch 'develop' into loan_repayment_issue	2022-04-06 10:00:34 +05:30
Suraj Shetty	ce583c9a81	Merge branch 'develop' into exotel-fixes	2022-04-05 19:48:44 +05:30
Marica	ff7d81020c	Merge pull request #30578 from marination/e-com-acessibility ... chore: Accessibility for E-commerce Doctypes	2022-04-05 18:11:59 +05:30
Saqib Ansari	c4b5fa8ed1	Merge pull request #30573 from frappe/mergify/bp/develop/pr-30382 ... fix: Added validation for single_threshold in Tax With Holding Category (backport #30382)	2022-04-05 15:52:28 +05:30
Saqib Ansari	7757790572	Merge pull request #30579 from nextchamp-saqib/eway-bill-dialog-fix ... fix: fetch from fields not working in eway bill dialog	2022-04-05 15:51:38 +05:30
Saqib Ansari	c8779aa446	fix: fetch from fields not working in eway bill dialog	2022-04-05 15:44:17 +05:30
Saqib Ansari	2451452434	Merge branch 'develop' into e-inv-paid-invoice-fix	2022-04-05 13:12:08 +05:30
marination	065623ce25	chore: Add Prices, Stock and E-com Settings access from Website Item	2022-04-05 12:30:02 +05:30
marination	d4301d6d2f	chore: Accessibility for E-commerce Doctypes ... - Add Website Item routing button and dashboard link in Item master - Group Item variant buttons together	2022-04-05 12:07:50 +05:30
ruthra kumar	16bfb930f8	test: added test cases for group filters	2022-04-05 11:08:09 +05:30
Rucha Mahabal	0e1528365d	fix: sider	2022-04-04 21:31:14 +05:30
Rucha Mahabal	bd077dbb3b	test: add attendance sheet tests for employee filter, half days	2022-04-04 21:26:42 +05:30
Rucha Mahabal	fec47632bc	test: add holiday related shift and attendance tests	2022-04-04 21:02:22 +05:30
Suraj Shetty	ca66224d57	Merge branch 'develop' into exotel-fixes	2022-04-04 20:22:06 +05:30
Suraj Shetty	01909d2e8c	test: Fix used frappe._dict to avoid AttributeError down the line ... ref: https://github.com/frappe/erpnext/runs/5816574721?check_suite_focus=true#step:12:880	2022-04-04 20:21:36 +05:30
Rucha Mahabal	7675542926	Merge pull request #30569 from ruchamahabal/fix-leave-alloc-update	2022-04-04 20:18:55 +05:30
Marica	3c3aca9568	Merge pull request #30522 from marination/redisearch-app-install ... feat: Redisearch with consent	2022-04-04 19:24:06 +05:30
Sherin KR	e796267214	fix: Validation for single threshold in Tax With Holding Category (#30382) ... (cherry picked from commit 0a2c72c594963f63551985a908c1c79302556e91)	2022-04-04 13:38:43 +00:00
Rucha Mahabal	793164ac2e	fix(test): set company for employee in leave allocation test setup	2022-04-04 19:08:27 +05:30
Rucha Mahabal	5499cecffd	test: leave allocation validations and total value for updates done before and after submission	2022-04-04 18:32:17 +05:30
Ankush Menat	a9811c601c	Merge pull request #30564 from rohitwaghchaure/fixed-rejected-warehouse-issue-for-pr ... fix: if accepted warehouse not selected during rejection then stock ledger not created	2022-04-04 18:26:17 +05:30
Suraj Shetty	117e5d05a3	Merge branch 'develop' into exotel-fixes	2022-04-04 18:21:46 +05:30
Rucha Mahabal	7b406f422d	Merge branch 'develop' into multiple-shifts	2022-04-04 18:14:49 +05:30
Marica	0a592e085c	Merge branch 'develop' into redisearch-app-install	2022-04-04 18:00:56 +05:30
Rohit Waghchaure	ac5df1abbe	test: test case to validate rejected qty without accepted warehouse	2022-04-04 17:57:57 +05:30
Rucha Mahabal	3538656a7d	fix: total leaves allocated not validated and recalculated on updates post submission	2022-04-04 17:52:30 +05:30
Ankush Menat	de83511091	fix(ux): refresh update to zero val checkbox (#30567)	2022-04-04 17:29:51 +05:30
ruthra kumar	b2ed9fd3fe	refactor: use group fields from Sales Order and Sales Order Items	2022-04-04 17:00:47 +05:30
Marica	569eff4f27	Merge branch 'develop' into redisearch-app-install	2022-04-04 16:10:01 +05:30
Saqib Ansari	fed66038b5	fix(pos): do not reset search input on item selection (#30537)	2022-04-04 15:59:16 +05:30
Rohit Waghchaure	0a71cabab1	fix: if accepted warehouse not selected during rejection then stock ledger not created	2022-04-04 15:42:59 +05:30
Ankush Menat	12c01e2975	fix: maintain FIFO queue even if outgoing_rate is not found (#30560)	2022-04-04 15:22:15 +05:30
ruthra kumar	e324d668d3	refactor: item filters are linked with group filters	2022-04-04 14:52:19 +05:30
Saqib Ansari	b91bf40f1b	fix: server error while viewing gst e-invoice	2022-04-04 14:40:07 +05:30
Ankush Menat	52eb0a93bb	Merge pull request #30528 from s-aga-r/is-subcontracted-fieldtype ... refactor!: change "is_subcontracted" field type from "Select" to "Check"	2022-04-04 14:01:20 +05:30
Ankush Menat	a896895a9e	fix: bulk fix (~330) missing translations	2022-04-04 13:59:51 +05:30
Sagar Sharma	e80cd29d2e	Merge branch 'develop' into is-subcontracted-fieldtype	2022-04-04 13:31:46 +05:30
Marica	bfb2fbea5f	Merge branch 'develop' into redisearch-app-install	2022-04-04 13:27:50 +05:30
Deepesh Garg	194605823e	fix: Issues on loan repayment	2022-04-04 13:25:35 +05:30
marination	397b46a08b	chore: Add TODOs(perf) for Redisearch Query	2022-04-04 13:24:56 +05:30
Saqib Ansari	92f632c4b1	Merge branch 'develop' into e-inv-paid-invoice-fix	2022-04-04 13:10:25 +05:30
marination	3445682563	fix: Payload incorrect data (pass item_group.name)	2022-04-04 12:33:25 +05:30
Deepesh Garg	18a3c5d536	fix: Ignore user perm for party account company	2022-04-04 12:32:33 +05:30
Saqib Ansari	0c26f9a8c8	fix(india): cannot generate e-invoice for is_pos invoices ... * If mode of payment > 18 characters, the e-invoice portal throws error	2022-04-04 12:28:09 +05:30
Ankush Menat	cf5f37e6d8	refactor: move schema change patch higher up	2022-04-04 12:15:26 +05:30
Ankush Menat	e8118fcdf1	fix: doctype layout based on expected tab-order	2022-04-04 12:06:35 +05:30
Ankush Menat	deca1aaf06	fix: dont fetch qty in reco if batch is required	2022-04-04 12:06:35 +05:30
Ankush Menat	f83a1c1989	fix: dont reset barcode in scan mode	2022-04-04 12:06:35 +05:30
Ankush Menat	1736ab57ac	feat: Barcode scanning in Stock Reconciliation ... [skip ci]	2022-04-04 12:06:35 +05:30
marination	7ef1ccbe84	fix: Add default score of 1 to Item Group Autocompleter ... - If score 0 is inserted into suggestions, RS does not consider that suggestion	2022-04-04 12:04:35 +05:30
marination	97e3a855f7	fix: Convert payload to string before adding to autocompleter	2022-04-04 11:32:49 +05:30
Rucha Mahabal	d9f00409b9	Merge branch 'develop' into multiple-shifts	2022-04-04 11:19:03 +05:30
Suraj Shetty	40d33b5fec	test: Use FrappeAPITestCase to track coverage	2022-04-04 11:15:29 +05:30
Rucha Mahabal	1d4b1c42f2	fix: skip validation for overlapping shift attendance if no shift is linked	2022-04-04 11:14:40 +05:30
marination	ea036e4958	fix: Better Exception Handling and vaeiabl naming ... - Function to handle RS exceptions (create log and raise error) - Handle `ResponseError` where it is anticipated - Misc: Better variables	2022-04-04 11:07:53 +05:30
Rucha Mahabal	62cdde9a84	test: skip auto attendance	2022-04-04 11:05:03 +05:30
Rucha Mahabal	277bda11dd	test: validations for duplicate and overlapping shift attendance records	2022-04-04 11:04:24 +05:30
Rucha Mahabal	83489be7d9	fix: add validation for overlapping shift attendance ... - skip auto attendance in case of overlapping shift attendance record - this case won't occur in case of shift assignment, since it will not allow overlapping shifts to be assigned - can happen if manual attendance records are created	2022-04-04 11:00:26 +05:30
Suraj Shetty	f4b8573e64	test: Fix erroneous code	2022-04-04 09:31:15 +05:30
Suraj Shetty	cfee53eb55	fix: Handle exception where no employee is returned	2022-04-04 07:38:15 +05:30
Suraj Shetty	39abfae5fe	chore: Remove unused code ... - and simplify get_call_log	2022-04-04 07:28:41 +05:30
Suraj Shetty	0e9ebad9c6	test: Refactor exotel test setup ... - Remove unnecessary code - Move test data to separate file - Make proper test assertions	2022-04-04 07:23:08 +05:30
Rucha Mahabal	7bd84f2696	chore: remove unused import	2022-04-03 23:58:04 +05:30
Rucha Mahabal	58fb2f7dde	refactor: Overlapping validation for Shift Request ... - commonify time overlap function between request and assignment - add tests for shift request overlap	2022-04-03 23:54:03 +05:30
Rucha Mahabal	6fffdcf0c7	test: Shift Type with Auto Attendance setup and working ... fix test setups	2022-04-03 22:37:10 +05:30
Rucha Mahabal	655c1dd6ab	fix: attendance fixes ... - check half day attendance threshold before absent threshold to avoid half day getting marked as absent - round working hours to 2 digits for better accuracy - start and end dates for absent attendance marking	2022-04-03 21:47:32 +05:30
Suraj Shetty	6644ebd52d	Merge branch 'develop' into exotel-fixes	2022-04-03 21:17:29 +05:30
Deepesh Garg	a7e125a540	chore: format patch file	2022-04-02 20:36:36 +05:30
Deepesh Garg	c58fde2fb2	fix: Add competitor field back	2022-04-02 20:03:46 +05:30
Deepesh Garg	7e185fb0f2	Merge branch 'develop' of https://github.com/frappe/erpnext into patch-3	2022-04-02 17:42:09 +05:30
Deepesh Garg	485f5cfdfe	fix: Resolve conflicts	2022-04-02 17:25:29 +05:30
Deepesh Garg	0f6d52c625	Merge branch 'develop' of https://github.com/frappe/erpnext into mergify/bp/develop/pr-30385	2022-04-02 17:24:19 +05:30
Subin Tom	e57e7bb02c	fix: added tests(fixed)	2022-04-02 17:16:56 +05:30
Ankush Menat	c8ead0a7ab	fix: dont send empty serial no in get_item_details ... [skip ci]	2022-04-01 21:11:03 +05:30
Ankush Menat	6a069d6efa	feat: dont trigger selector if all info is scanned	2022-04-01 21:11:03 +05:30
Ankush Menat	47f27a5171	refactor: move scan api to stock utils; add item_info	2022-04-01 21:11:03 +05:30
Ankush Menat	9bf427985f	fix!: remove barcode field triggers ... use "scan barcode" field instead for scanning [skip ci]	2022-04-01 21:11:03 +05:30
Ankush Menat	530f767098	revert: "fix: ignore circular dependencies on barcode scan" ... This reverts commit 98468fab18.	2022-04-01 21:11:03 +05:30
Ankush Menat	767b827b59	feat: return batch code while scanning serial no	2022-04-01 21:11:03 +05:30
marination	07f17453cd	fix: Use Payload in AutoCompleter (categories in search) and misc ... - Separate Item group and Item autocomplete dict definition - Add payload along with Item group, containing namke and route - Pass weightage while defining item group autocomplete dict (auto sort) - Use payload while getting results for categories in search - Remove check to show categories, always show - Search fields mandatory if reidsearch enabled - Code separation (rough)	2022-04-01 18:47:01 +05:30
Gavin D'souza	f8c9fba52d	fix: Handle changes in frappe's get_monthly_goal_graph_data API	2022-04-01 17:18:47 +05:30
Sagar Sharma	01c64915c8	chore: remove unwanted validation	2022-04-01 15:51:48 +05:30
Ankush Menat	6c5b01c60d	perf: index barcode for faster scans (#30543)	2022-04-01 15:27:46 +05:30
Alberto826	5d14e7860e	Fix: Remove trailing slash "/" from route (#30532) ... Routes with trailing slash "/" causes a redirect to port 8080 in docker host with reverse proxy. The Student Admission Row template has this issue.	2022-04-01 14:48:00 +05:30
Deepesh Garg	9a6a181f14	fix: Ignore disabled tax categories	2022-04-01 14:46:26 +05:30
Rucha Mahabal	65763275ae	fix: convert dates to datetime before comparing in leave days calculation and fix half day edge case (#30538)	2022-04-01 13:47:52 +05:30
Sagar Sharma	0a3cdc2623	chore: rename "is_subcontracted" field label to "Is Subcontracted"	2022-04-01 13:22:54 +05:30
Sagar Sharma	d074c93ac7	refactor!: change "is_subcontracted" field type from "Select" to "Check"	2022-04-01 13:22:44 +05:30
Ankush Menat	257623509d	perf: use cached single docs (#30536) ... frappe.local is request specific thread local, hence is almost as good as no caching.	2022-04-01 11:55:19 +05:30
Saqib Ansari	bfc34e1084	fix: check for debit credit difference even after round-off adjustment (#30050)	2022-04-01 11:03:16 +05:30
Deepesh Garg	8598d64d2c	Merge pull request #30502 from dj12djdjs/fix-pe-ex-rate-precision ... fix(accounts): payment entry exchange rate precision	2022-04-01 09:48:15 +05:30
Deepesh Garg	df06d263ae	Merge pull request #30510 from deepeshgarg007/tax_mapping ... fix: Taxes getting overriden from mapped to target doc	2022-04-01 09:43:19 +05:30
rohitwaghchaure	8d16c7f44b	Merge pull request #30527 from rohitwaghchaure/feat-pick-list-item-reference-in-delivery-note ... feat: minor, pick list item reference on delivery note item table	2022-03-31 20:22:49 +05:30
Rohit Waghchaure	2f51011f91	test: test case to check pick list name has mapped or not	2022-03-31 18:47:09 +05:30
Rohit Waghchaure	2f63ae2ee9	feat: minor, pick list item reference on delivery note item table	2022-03-31 18:43:42 +05:30
Deepesh Garg	02dab021c6	Merge pull request #30500 from deepeshgarg007/auto_tax_gst ... fix(India): Tax fetching based on tax category	2022-03-31 18:01:32 +05:30
marination	7e207c8901	fix: Call Redisearch index creation functions on enabling redisearch in settings	2022-03-31 16:29:18 +05:30
Marica	cd9d07028d	Merge branch 'develop' into bom-update-tool	2022-03-31 14:54:05 +05:30
Marica	901d8eac57	Merge pull request #30509 from marination/buying-validate-items ... fix: Add non-existent Item check and cleanup in `validate_for_items`	2022-03-31 14:52:34 +05:30
Saqib Ansari	9af353ffa9	Merge pull request #30461 from nextchamp-saqib/fix-asset-warehouse-validation ... fix(asset): do not validate warehouse on asset purchase	2022-03-31 14:15:16 +05:30
Deepesh Garg	e0631474c0	Merge branch 'develop' into auto_tax_gst	2022-03-31 13:52:10 +05:30
Deepesh Garg	544533ced2	Merge pull request #30486 from deepeshgarg007/account_currenct_change_test ... fix: Account currency validation	2022-03-31 13:39:04 +05:30
marination	93f6346cea	fix: (test) change expected exception due to https://github.com/frappe/frappe/pull/16454	2022-03-31 13:07:51 +05:30
marination	2fece523f6	chore: Added BOM std filters and update type in List View	2022-03-31 12:55:48 +05:30
Saqib Ansari	4623a1bc57	fix(test): Item MacBook does not exist	2022-03-31 12:48:00 +05:30
Marica	f482b184a0	Merge branch 'develop' into bom-update-tool	2022-03-31 12:42:56 +05:30
Rucha Mahabal	d45e286216	test: shift assignment creation	2022-03-31 12:15:38 +05:30
Deepesh Garg	4720969ce6	fix: Taxes getting overriden from mapped to target doc	2022-03-31 12:14:16 +05:30
marination	982a246eec	fix: Add non-existent Item check and cleanup in validate_for_items ... - Added a validation if invalid item code ia passed via data import/API, etc. - Used DB APIs instead of raw sql - Separated checks into separate functions - Added return types to functions - Better variable naming and removed redundant utils import in function	2022-03-31 11:47:20 +05:30
Saqib Ansari	199a6da960	perf: skip warehouse validation for non-stock items	2022-03-31 11:41:52 +05:30
Rucha Mahabal	e4cc0c1c87	fix: tests	2022-03-31 00:21:23 +05:30
Rucha Mahabal	97547da7ee	fix(test): make holiday list for shift and checkin tests	2022-03-31 00:17:32 +05:30
Devin Slauenwhite	62266b29aa	fix: exchange rate precision	2022-03-30 14:22:44 -04:00
Rucha Mahabal	af139193a5	test: fetching shifts in Employee Checkins	2022-03-30 23:27:49 +05:30
Ankush Menat	b981fae5a4	fix: remove naming series from bin, repost queue (#30497) ... Removing naming series from: 1. Bin 2. Repost queue These doctypes are not user facing and dont really need naming series. Current implementation of naming makes stock transaction sequential if these documents are to be created during submission.	2022-03-30 21:46:15 +05:30
Deepesh Garg	45f78977bf	Merge pull request #30493 from nabinhait/party-account-in-ar-ap-report ... feat: Receivable/Payable Account column and filter in AR/AP report	2022-03-30 21:16:32 +05:30
Deepesh Garg	d93edbc859	fix: make test record	2022-03-30 21:07:56 +05:30
Deepesh Garg	532961fad2	fix(India): Tax fetching based on tax category	2022-03-30 19:33:44 +05:30
ruthra kumar	7558f1b078	refactor: adding new filters and column to test cases	2022-03-30 18:50:18 +05:30
ruthra kumar	eaeadbc422	feat: additional filters in payment terms status report	2022-03-30 18:50:13 +05:30
marination	a945484af4	test: Added test for 2 more validations ... - Covers full validate function	2022-03-30 18:20:54 +05:30
marination	620575a901	fix: Type Annotations, Redundancy, etc. ... - Renamed public function`update_new_bom` to `update_new_bom_in_bom_items` - Replaced `get_cached_doc` with `get_doc` - Removed click progress bar (drive through update log) - Removed `bom_obj.update_new_bom()`, was redundant. Did same job as `update_new_bom_in_bom_items` - Removed `update_new_bom()` in `bom.py`, unused. - Prettier query formatting - `update_type` annotated as non optional Literal - Removed redundant use of JobTimeoutException - Corrected type annotations in `create_bom_update_log()`	2022-03-30 18:03:52 +05:30
mergify[bot]	89a9afab94	fix: cast array slice index integer while splitting serial_nos array (#30468) (#30496) ... (cherry picked from commit 3f3717952c94af428c3d4c919aceb6b8cbae7679) Co-authored-by: Anoop <anoop@earthianslive.com>	2022-03-30 17:00:28 +05:30
Sagar Vora	7bece37918	fix: update get_cached_value usage based on changes in definition	2022-03-30 15:35:56 +05:30
Saqib Ansari	5408980223	Merge pull request #30453 from rahib-hassan/fix-paymentorder-row-delete ... fix: enable row deletion in reference table	2022-03-30 15:31:54 +05:30
Rucha Mahabal	72501f2161	Merge branch 'develop' into multiple-shifts	2022-03-30 15:28:51 +05:30
Rucha Mahabal	baec607ff5	style: format code with black	2022-03-30 15:23:13 +05:30
Rucha Mahabal	acb27430ac	test: monthly attendance sheet	2022-03-30 15:14:31 +05:30
Saqib Ansari	291415d255	Merge pull request #30453 from rahib-hassan/fix-paymentorder-row-delete ... fix: enable row deletion in reference table	2022-03-30 15:00:16 +05:30
Saqib Ansari	03e6a6c699	Merge branch 'develop' into fix-asset-warehouse-validation	2022-03-30 14:58:49 +05:30
Rucha Mahabal	9ff1904aec	fix: explicitly check if additional salary is recurring while fetching components for payroll (#30489)	2022-03-30 14:47:11 +05:30
Ahmad	1fdc085d17	fix: web form filter for project	2022-03-30 13:23:30 +05:00
marination	ebf00946c9	fix: Semgrep ... - Explain explicit commits and skip semgrep - Format client side translated string correctly	2022-03-30 13:22:29 +05:30
Ankush Menat	8ab226a2fc	test: add class to uniquely id item dashboard (#30487)	2022-03-30 13:20:54 +05:30
marination	79495679e2	fix: Auto format bom_update_log.py	2022-03-30 13:08:58 +05:30
marination	1d1e925bcf	test: API hit via BOM Update Tool ... - test creation of log and it's impact	2022-03-30 13:01:01 +05:30
Deepesh Garg	d4cc7c553e	fix: Account currency validation	2022-03-30 12:43:18 +05:30
Marica	7e719a12f1	Merge pull request #30377 from marination/stock-entry-items-idx ... fix: Dont set `idx` while adding WO items to Stock Entry	2022-03-30 11:14:18 +05:30
Saqib Ansari	87dc9c6331	Merge pull request #30470 from nextchamp-saqib/fix-dn-credit-limit-validation ... fix: credit limit validation in delivery note	2022-03-30 11:08:25 +05:30
Marica	a51ba4cedf	Merge branch 'develop' into bom-update-tool	2022-03-30 10:36:15 +05:30
marination	b5ad626d23	fix: Linter	2022-03-30 10:22:05 +05:30
Saqib Ansari	6528218ac3	perf: skip warehouse validation for non-stock items	2022-03-29 18:43:33 +05:30
Ankush Menat	b80fac03af	fix: validate 0 transfer qty in stock entry (#30476)	2022-03-29 17:19:22 +05:30
Rucha Mahabal	41cfcdba44	feat: show shift-wise attendance in monthly attendance sheet	2022-03-29 16:10:46 +05:30
Rucha Mahabal	865204a541	feat: add colors for attendance status to lessen the cognitive load ... - legend with colors and full form for status abbreviations	2022-03-29 16:10:46 +05:30
Rucha Mahabal	e79d292233	refactor: Monthly Attendance Sheet ... - split into smaller functions - add type hints - get rid of unnecessary db calls and loops - add docstrings for functions	2022-03-29 16:10:41 +05:30
Rucha Mahabal	f2ee36579b	chore: sort imports, remove unused imports	2022-03-29 16:09:47 +05:30
Rucha Mahabal	4ef2911953	refactor: mark absent for employees with no attendance ... - break down into smaller functions - make it work with multiple shifts - this will mark employee as absent per shift, meaning employee can be present for one shift and absent for another on the same day	2022-03-29 16:09:39 +05:30
Rucha Mahabal	742c8f0790	feat: auto attendance marking for multiple shifts on the same day	2022-03-29 16:08:43 +05:30
Rucha Mahabal	cb3b330097	refactor: Allow multiple attendance records creation for different shifts	2022-03-29 16:05:36 +05:30
Rucha Mahabal	f6a12a902f	refactor: rewrite docstrings and add type hints for functions	2022-03-29 16:05:01 +05:30
Rucha Mahabal	e7cbb5fe6b	fix: fetching shift on timing boundaries	2022-03-29 16:02:42 +05:30
Rucha Mahabal	62e72752dc	refactor: handle shifts spanning over 2 different days	2022-03-29 16:02:17 +05:30
Rucha Mahabal	ace3f8a023	fix: handle shift grace overlap while finding current shift	2022-03-29 16:01:25 +05:30
Rucha Mahabal	625a9f69f5	refactor: consider timeslots in get_employee_shift	2022-03-29 16:01:18 +05:30
Rucha Mahabal	3711119a66	refactor: overlapping shifts validation ... - convert raw query to frappe.qb - check for overlapping timings if dates overlap - translation friendly error messages with link to overlapping doc	2022-03-29 15:59:56 +05:30
Ankush Menat	b12fe0f15b	fix: dont check for failed repost while freezing (#30472) ... [skip ci]	2022-03-29 13:54:26 +05:30
marination	fa3b953cf7	test: idx mapping correctness	2022-03-29 13:54:14 +05:30
Saqib Ansari	c122882884	fix: credit limit validation in delivery note	2022-03-29 13:36:00 +05:30
Marica	88a460b54e	Merge branch 'develop' into stock-entry-items-idx	2022-03-29 13:18:08 +05:30
Ankush Menat	0cb9cdb414	Merge branch 'develop' into fix-asset-warehouse-validation	2022-03-29 11:48:35 +05:30
Ankush Menat	76dce2eddc	fix: use name for links not item_code (#30462)	2022-03-29 11:21:03 +05:30
Saqib Ansari	b60fad6113	Merge branch 'develop' of https://github.com/frappe/erpnext into fix-asset-warehouse-validation	2022-03-29 10:50:21 +05:30
Saqib Ansari	136466d255	fix(asset): do not validate warehouse on asset purchase	2022-03-29 10:47:27 +05:30
Deepesh Garg	03952f8819	fix(India): Auto tax fetching based on GSTIN ... (cherry picked from commit 7cae669e814a958310ca1b8ee408450569c32d10) # Conflicts: # erpnext/patches.txt # erpnext/regional/india/setup.py # erpnext/selling/doctype/quotation/quotation.json	2022-03-29 04:56:49 +00:00
marination	639d380c1f	chore: Remove redundant idx query and value setting ... - idx can be removed from `select_columns` as it is already in the main query - setting idx to '' is not required as it is not used further	2022-03-28 21:00:00 +05:30
Ankush Menat	63d892454b	Merge branch 'develop' into bom-update-tool	2022-03-28 20:28:21 +05:30
Ankush Menat	40d7418dca	Merge branch 'develop' into stock-entry-items-idx	2022-03-28 20:21:21 +05:30
Ankush Menat	3821a97a75	Merge branch 'develop' into mergify/bp/develop/pr-30395	2022-03-28 20:14:19 +05:30
Ankush Menat	7ef54809be	Merge branch 'develop' into exotel-fixes	2022-03-28 19:55:39 +05:30
Ankush Menat	494bd9ef78	style: format code with black	2022-03-28 18:52:46 +05:30
Ankush Menat	8dff4d66a4	fix: bom valuation - handle lack of LPP (#30454)	2022-03-28 18:18:23 +05:30
Sagar Vora	77c36f6d22	fix: set options for Currency field Incoming Rate (#30384)	2022-03-28 17:55:23 +05:30
Raffael Meyer	c01fe74cf0	fix(patch): fix failing patches (#30427) ... * patch: reload Opportunity * patch: reload child tables before doctype	2022-03-28 17:53:54 +05:30
Saqib Ansari	eea183957a	Merge pull request #30419 from nextchamp-saqib/fix-item-tax-template-patch ... fix: move item tax to item tax template patch	2022-03-28 17:34:31 +05:30
rahib-hassan	500870b2b0	fix: enable row deletion in reference table	2022-03-28 15:25:01 +05:30
Ankush Menat	b58b1343bb	refactor: dont harcode "serial_no" field	2022-03-28 12:07:00 +05:30
Ankush Menat	98468fab18	fix: ignore circular dependencies on barcode scan	2022-03-28 12:07:00 +05:30
Ankush Menat	806f420ddd	fix: revert global flag added for erasing barcode ... This looked like a hack and doesn't even work anyway! how can row level barcode-item relation be maitnained on entire form?	2022-03-28 12:07:00 +05:30
Ankush Menat	17a2ceb5d1	style: prettier js	2022-03-28 12:07:00 +05:30
Ankush Menat	9f0e7949aa	fix: clean up if item is not found	2022-03-28 12:07:00 +05:30
Ankush Menat	32e44f5121	fix: correctly capture first serial no	2022-03-28 12:07:00 +05:30
Ankush Menat	b3c604d679	refactor: dont hardcode child table name	2022-03-28 12:07:00 +05:30
Ankush Menat	3a8656b3c8	refactor: split data update responsibilty to multiple functions ... Apply "single responsibilty principle"	2022-03-28 12:07:00 +05:30
Ankush Menat	c34847e801	refactor: dont hardcode child table "items"	2022-03-28 12:07:00 +05:30
Ankush Menat	893139f963	refactor: dont hardcode "scan_barcode" field	2022-03-28 12:07:00 +05:30
Ankush Menat	bd06ffab00	refactor: store scannned field as attr	2022-03-28 12:07:00 +05:30
Ankush Menat	2d15413c9e	refactor: transaction.js -> barcode_scanner.js	2022-03-28 12:07:00 +05:30
Ankush Menat	18abb28744	fix(barcode_scan): dont add duplicate serial nos	2022-03-28 12:07:00 +05:30
Ankush Menat	b06123bc65	fix: trigger table_add on new row	2022-03-28 12:07:00 +05:30
Ankush Menat	a270f12855	fix(UX): reduce duration of barcode scan toasts ... default is 7 which is bit too much when you're scanning lots of items, switched to 5 sec delay	2022-03-28 12:07:00 +05:30
Ankush Menat	69ae2661d2	fix: update picked qty on cancellation	2022-03-28 10:43:32 +05:30
Deepesh Garg	33fa14b6cf	fix: Resolve conflicts	2022-03-27 19:23:53 +05:30
Deepesh Garg	18c5b24ac1	fix: Update condition	2022-03-27 19:20:37 +05:30
Deepesh Garg	fc09377de2	fix: Resolve conflicts	2022-03-27 19:18:32 +05:30
Deepesh Garg	485e6b6a09	fix: Incorrect default amount to pay for POS invoices ... (cherry picked from commit a044e9268786b3395f2e33fd5b79e64bc60160a5) # Conflicts: # erpnext/public/js/controllers/taxes_and_totals.js	2022-03-27 12:31:36 +00:00
Ankush Menat	e401ad3f90	refactor: replace dead duplicate code	2022-03-26 19:33:00 +05:30
Ankush Menat	9daea6fa6c	perf: slimmer and faster before_tests	2022-03-26 19:33:00 +05:30
Saqib Ansari	4766732b56	Merge branch 'develop' into fix-item-tax-template-patch	2022-03-26 11:48:41 +05:30
Saqib Ansari	8e7c214e9e	Merge branch 'develop' into fix-minor-custom-cash-flow	2022-03-26 11:48:40 +05:30
Deepesh Garg	2e9648538e	fix: Check for onload property ... (cherry picked from commit 71402b43a776d4af98912223c8299c4fd8bfbbfe)	2022-03-25 16:23:44 +00:00
Rucha Mahabal	ffec9516fa	fix: do not update status to Paid if sanctioned amount is 0	2022-03-25 21:41:48 +05:30
Rucha Mahabal	2d915782cb	chore: sort imports	2022-03-25 21:41:48 +05:30
Rucha Mahabal	edf0c0030e	test: expense claim against fully and partially paid advances	2022-03-25 21:41:48 +05:30
Rucha Mahabal	0461223627	fix: Expense Claim conditions for Paid status ... - status doesn't change to Paid if the entire required amount is already covered via linked advances - status doesn't change to Paid if the claim is partially paid via advances - patch to update such uncancelled claims to Paid	2022-03-25 21:41:48 +05:30
Deepesh Garg	19b1b1f4ba	test: test for auto write-off amount ... (cherry picked from commit 6a50f36b3167d43b1e964d4f0cf96af587f1a4a2) # Conflicts: # erpnext/public/js/controllers/taxes_and_totals.js	2022-03-25 15:27:12 +00:00
Deepesh Garg	b2ac773cca	fix: Ignore for Purchase Invoices ... (cherry picked from commit d3fd2fd2c535733939ed69439301033052f45712)	2022-03-25 15:27:11 +00:00
Deepesh Garg	8cfa3a9ece	fix: Ignore for Purchase Invoices ... (cherry picked from commit ed38679d222e12709396fbb8dacbe9e25ea38ed7) # Conflicts: # erpnext/public/js/controllers/taxes_and_totals.js	2022-03-25 15:27:11 +00:00
Deepesh Garg	d04d3038f5	fix: Client side changes for POS Write off amount ... (cherry picked from commit 2e33e748ea248acface128f759d3982635024399) # Conflicts: # erpnext/public/js/controllers/taxes_and_totals.js	2022-03-25 15:27:10 +00:00
Deepesh Garg	f57f4af1d9	fix: Write off amount wrongly calculated in POS Invoice ... (cherry picked from commit ee4258e42c33899fae7b7add8a676274259a40e0)	2022-03-25 15:27:10 +00:00
Ankush Menat	0534cf6c9c	fix: show subassembly table always (#30422) ... [skip ci]	2022-03-25 19:03:33 +05:30
Saqib Ansari	80c7d7064b	Merge branch 'develop' into fix-minor-custom-cash-flow	2022-03-25 17:16:42 +05:30
Saqib Ansari	5450542fdb	fix: unsupported operand type(s) for +=: 'int' and 'NoneType'	2022-03-25 16:44:37 +05:30
Wolfram Schmidt	85b0d5fc77	fix: translations (#30387) ... fixed and added translation	2022-03-25 16:22:23 +05:30
Ankush Menat	f06ef17b5d	fix: copy has_batch_no and has_serial_no while duplicating	2022-03-25 16:18:58 +05:30
Ankush Menat	f4b39b87e3	fix(UX): use autocomplete for variant fields	2022-03-25 16:18:58 +05:30
Saqib Ansari	936267c934	fix: move item tax to item tax template patch	2022-03-25 15:45:13 +05:30
Saqib Ansari	33863cd6ab	Merge pull request #30324 from nextchamp-saqib/fix-pos-issues-again ... fix: multiple pos issues	2022-03-25 15:34:54 +05:30
Deepesh Garg	a9d992ac9f	Merge pull request #30338 from deepeshgarg007/bank_transaction_currency_symbol_fixes ... fix: Currency symbol in bank transactions	2022-03-25 14:39:01 +05:30
Deepesh Garg	97e102ceef	fix: Condition ... (cherry picked from commit 2e0e6ca6b177043f673c05472ac3069f060d1563)	2022-03-25 07:30:41 +00:00
Deepesh Garg	a83a0a03b1	fix: Revert rate calculation ... (cherry picked from commit 6937a498e71cffc56cad65141f561b4c8785d185)	2022-03-25 07:30:40 +00:00
Deepesh Garg	54cdff7947	fix: Add back calculation for discount ... (cherry picked from commit 067564bd260437290b7cb190fb1cdc02eb658d0a)	2022-03-25 07:30:40 +00:00
Deepesh Garg	174a6ec398	fix: Rate change issue on save and mapping from other doc ... (cherry picked from commit 13fcda57767c456dfca4c064c41ca4f80a1898b2)	2022-03-25 07:30:40 +00:00
Shadrak Gurupnor	c4854bb1b1	fix: failing broken patches (#30409) ... * fix: failing broken patches * refactor: simpler conditions [skip ci]	2022-03-25 12:49:37 +05:30
Saqib Ansari	9a0f5bff65	Merge branch 'develop' into fix-pos-issues-again	2022-03-25 10:52:08 +05:30
Saqib Ansari	16253a2f72	fix: set is_return & return_against in POS Invoice Reference table	2022-03-25 10:51:30 +05:30
Ankush Menat	788d492757	test: basic item and wh capacity dashboard tests	2022-03-25 10:51:19 +05:30
Ankush Menat	10d5fb8cd1	test: check printviews for all docs	2022-03-25 10:51:19 +05:30
Saqib Ansari	1b556d1c53	fix: test cases	2022-03-24 17:59:34 +05:30
Ankush Menat	d4ee31dc8f	fix: consider all existing PO items ... When this is sent from API/client side doesn't send temporary_name it can be flaky. Hence, use all available names for validation.	2022-03-24 17:58:22 +05:30
Saqib Ansari	cb4873c019	fix: sider issues	2022-03-24 17:56:27 +05:30
Saqib Ansari	cf51a0a1b8	fix(pos): cannot close the pos if sr. no. is sold & returned	2022-03-24 16:22:36 +05:30
Ankush Menat	5b1d6055e6	fix: subassembly items linked to temporary name ... Production Plan tables for po_items and sub_assembly_items are prepared client side so both dont exist at time of first save or modifying and hence any "links" created are invalid. This change retains temporary name so it can be relinked server side after naming is performed. Co-Authored-By: Marica <maricadsouza221197@gmail.com>	2022-03-24 15:00:05 +05:30
Ankush Menat	3d43c437ad	fix: only validate qty for main non-subassy items	2022-03-24 15:00:05 +05:30
Marica	d24458ab77	fix: (ux) Add is_group=0 filter on website warehouse (#30396) ... - It does not support group warehouses right now and it is misleading	2022-03-24 12:56:57 +05:30
Saqib Ansari	4aabe97565	Merge branch 'develop' into fix-pos-issues-again	2022-03-24 11:18:13 +05:30
Deepesh Garg	07c7ebfd99	Merge branch 'develop' into gst_state_number_unsetting	2022-03-23 22:04:13 +05:30
Ankush Menat	c9dcf31cf7	test: ensure super()setUpClass is called	2022-03-23 19:46:50 +05:30
Deepesh Garg	993cc287d5	Merge branch 'develop' into sales_person_dashboard	2022-03-23 16:11:22 +05:30
Ankush Menat	6418dc1606	fix: make auto created job cards "Open"	2022-03-23 15:50:46 +05:30
Ankush Menat	e1f5620654	fix: material transfer status should be before WIP	2022-03-23 15:50:46 +05:30
Ankush Menat	4aa74af90d	fix: ignore items without info for pending qty computation	2022-03-23 15:46:40 +05:30
Ankush Menat	be16fb9dbb	chore(DX): add sourceURL for debugging	2022-03-23 15:46:40 +05:30
marination	a787ebb732	fix: Dont set idx while adding WO items to Stock Entry ... - `idx` must be computed by base document's `self.append()` function, so do not set it	2022-03-23 14:59:27 +05:30
Deepesh Garg	78ca88d227	fix: Check if onload property exists in the form object	2022-03-23 13:55:05 +05:30
Deepesh Garg	c3f1ad78aa	Merge pull request #30361 from deepeshgarg007/tax_account_display ... fix: GST account not showing up in tax templates	2022-03-23 13:17:11 +05:30
Deepesh Garg	3a1e31592e	Merge branch 'develop' into ignore_price_list	2022-03-23 09:27:44 +05:30
Deepesh Garg	405dcb1d3c	fix: Add ignore pricelist for missing flows	2022-03-23 09:04:03 +05:30
Deepesh Garg	66ca085e39	fix: Changing item prices on converting orders/receipts to invoices	2022-03-22 23:03:41 +05:30
Deepesh Garg	57924599da	fix: GST account not showing up in tax templates	2022-03-22 18:26:58 +05:30
Saqib Ansari	f2ae63cbfd	fix(pos): remove returned sr. nos. from pos reserved sr. nos. list	2022-03-22 17:41:49 +05:30
Ankush Menat	f606d2ecc6	fix: flaky salary slip email test (#30358)	2022-03-22 17:36:18 +05:30
Ankush Menat	41db43cdc5	fix: consider full integer batch nos	2022-03-22 16:40:17 +05:30
Ankush Menat	a18c687844	fix: ignore already fetched serial no ... exclude_sr_nos is sent as JSON string of list, so load it before operating on it.	2022-03-22 16:40:17 +05:30
Subin Tom	b19305aa83	fix: used get_employees_with_number, strip_number methods	2022-03-22 16:22:09 +05:30
Deepesh Garg	ec04242d72	Merge pull request #30340 from deepeshgarg007/opening_too_field_fixes ... fix: Opening invoice tool field placement	2022-03-22 16:17:12 +05:30
Deepesh Garg	749ab9b799	Merge branch 'develop' into bank_transaction_currency_symbol_fixes	2022-03-22 16:16:03 +05:30
Marica	87a0b72c26	Merge pull request #30336 from marination/product-filter-lookup ... fix: Product Filters Lookup	2022-03-22 15:31:28 +05:30
Rucha Mahabal	0ae6561620	test: get leave allocation records query (#30342) ... Co-authored-by: Ankush Menat <ankush@frappe.io>	2022-03-22 15:14:05 +05:30
Ankush Menat	51873da4bc	test: dynamic current FY creation in before_tests	2022-03-22 14:23:56 +05:30
Ankush Menat	6b638a196b	chore: drop dead sample code	2022-03-22 14:23:56 +05:30
Ankush Menat	9a99f993bc	refactor: merge print settings custom fields	2022-03-22 14:23:56 +05:30
Ankush Menat	457d616966	refactor: remove dead duplicate code	2022-03-22 14:23:56 +05:30
Ankush Menat	f37316a266	refactor: use get_value instead of exists	2022-03-22 13:07:45 +05:30
barredterra	5c4eabf075	fix: usage of frappe.db.exists	2022-03-22 13:07:45 +05:30
Marica	387fa61a83	Merge branch 'develop' into product-filter-lookup	2022-03-22 12:13:46 +05:30
Deepesh Garg	01cd9e7c2e	Merge branch 'develop' into opening_too_field_fixes	2022-03-22 11:53:06 +05:30
Deepesh Garg	4e2f866a2a	Merge branch 'develop' into gst_state_number_unsetting	2022-03-22 11:52:55 +05:30
Deepesh Garg	645ed7d0fd	Merge branch 'develop' into sales_person_dashboard	2022-03-22 11:52:36 +05:30
Deepesh Garg	69a4b8c80b	Merge branch 'develop' into bank_transaction_currency_symbol_fixes	2022-03-22 11:52:20 +05:30
HarryPaulo	3eb5440aa9	fix: linters erros on report sales payments summary (#30345) ... * fix: wrong values for report and get change amout based on payment TYPE. * charcase for select field. * fix: linter check erros * fix: linters errors Co-authored-by: Ankush Menat <ankush@frappe.io>	2022-03-22 11:39:15 +05:30
Deepesh Garg	636e7f67eb	fix: Opening invoice tool field placement	2022-03-21 19:34:57 +05:30
Deepesh Garg	e78a445c24	fix: Currency symbol in bank transactions	2022-03-21 19:06:04 +05:30
marination	f6e64c2cac	fix: Product Filters Lookup ... - bind the right classes to the filter lookup field - make class names more descriptive - make filter lookup field more visible with white bg and border - bind lookup input field js in `views.js` - make filter lookup field functioning for atribute filters too - added placeholder to lookup field	2022-03-21 17:58:39 +05:30
Deepesh Garg	1b2c6a5b78	fix: Code cleanup	2022-03-21 17:06:23 +05:30
HarryPaulo	01fd3adedf	fix: report sales payments summary (#30264)	2022-03-21 16:57:27 +05:30
Deepesh Garg	9376d8d308	Merge pull request #30312 from alyf-de/refactor-sales-analytics ... refactor: sales analytics	2022-03-21 16:44:23 +05:30
Deepesh Garg	363e676a35	fix: Reset GST State number	2022-03-21 16:28:17 +05:30
Ankush Menat	d3be84bfe8	test: correct use of test decorator	2022-03-21 15:40:34 +05:30
Rucha Mahabal	95568210b2	fix(ux): warning for disabled carry forwarding in Policy Assignment (#30331)	2022-03-21 15:30:04 +05:30
Saqib Ansari	aff7408775	fix(pos): allow validating stock on save	2022-03-21 14:08:56 +05:30
Saqib Ansari	4afb47e869	fix(pos): specific case when serialized item not removed	2022-03-21 13:24:11 +05:30
Saqib Ansari	2f82e237ef	fix(pos): customer group filter in customer selector	2022-03-21 12:47:35 +05:30
Deepesh Garg	3a7776ea7f	fix: Contribution amount against invoices in Sales Person Dashboard	2022-03-21 12:04:18 +05:30
Saqib Ansari	d5fd8e0ba6	fix: prevent multiple save on applying coupon code	2022-03-21 11:36:30 +05:30
Deepesh Garg	1daaf6be2a	Merge pull request #30317 from deepeshgarg007/opening_gl_validation ... fix: P&L account validation on cancellation	2022-03-21 10:45:07 +05:30
Saqib Ansari	6dc7d6b085	Merge pull request #30287 from nextchamp-saqib/fix-cash-flow-query ... fix: custom cash flow mapper doesn't show any data	2022-03-21 10:32:42 +05:30
Deepesh Garg	28001ddf42	Merge pull request #30304 from deepeshgarg007/enable_ksa_vat_docs ... fix: Add permission for KSA VAT documents	2022-03-21 10:18:40 +05:30
Deepesh Garg	2ff6790283	fix: P&L account validation on cancellation	2022-03-21 09:43:31 +05:30
Raffael Meyer	0a015b7f70	refactor: remove redundant if-statement (#30311)	2022-03-20 19:29:41 +05:30
Ankush Menat	c2aad115c1	fix: disable deferred naming on SLE/GLE if hash method is used. (#30286) ... * fix: dont rename GLE/SLE that dont have naming series * test: tests for deferred naming of ledgers	2022-03-20 19:26:34 +05:30
HENRY Florian	ca8d757691	fix: clear "Retain Sample" and "Max Sample Quantity" in Item card if Has Batch No is uncheck (#30307)	2022-03-20 15:27:00 +05:30
barredterra	36df21067c	refactor: sales analytics	2022-03-20 03:58:24 +01:00
Ankush Menat	4859574233	perf: Single query to delete bins instead of N	2022-03-19 20:55:27 +05:30
Ankush Menat	684d9d66d1	test: warehouse conversion and treeview test	2022-03-19 20:55:27 +05:30
Ankush Menat	953afda01b	refactor(warehouse): raw query to ORM	2022-03-19 20:55:27 +05:30
Ankush Menat	4b695915f4	refactor: Use QB for serial fetching query	2022-03-19 20:55:27 +05:30
Ankush Menat	a585dff6fd	refactor: batch no filter handling	2022-03-19 20:55:27 +05:30
Ankush Menat	b9eec331e3	test: auto serial fetching	2022-03-19 20:55:27 +05:30
Ankush Menat	4f8bb91eae	fix: sort serial nos before sending	2022-03-19 20:55:27 +05:30
Ankush Menat	0a533d6ccc	fix: skip already selected serials in sr selector	2022-03-19 20:55:27 +05:30
Ankush Menat	5ec27c9055	fix: filter serial nos by selected batch number	2022-03-19 20:55:27 +05:30
Ankush Menat	f4c213379e	fix: set current qty as default qty for stock entry	2022-03-19 20:55:27 +05:30
mergify[bot]	c2cbd407c1	fix: Allow on Submit for Material Request Item Required Date (#30174) (#30308) ... * fix: Allow on Submit for Material Request Item Required Date * chore: whitespace (cherry picked from commit cca9668309711bf3ca517726a94df547c5a16bbb) Co-authored-by: Devarsh Bhatt <58166671+bhattdevarsh@users.noreply.github.com> Co-authored-by: Ankush Menat <ankushmenat@gmail.com>	2022-03-19 20:31:06 +05:30
Deepesh Garg	01638a01cb	Merge pull request #30292 from frappe/mergify/bp/develop/pr-30284 ... fix: Cleanup and fixes in Dimension-wise Accounts Balance Report (backport #30284)	2022-03-18 17:36:59 +05:30
Deepesh Garg	972d06555a	fix: Add permission for KSA Vat documents	2022-03-18 17:32:46 +05:30
Ankush Menat	5a9bf9ffd6	fix: respect db multi_tenancy while fetching precision (#30301) ... [skip ci]	2022-03-18 17:29:09 +05:30
Saqib Ansari	00bfee97c7	refactor: convert raw sql to frappe.qb	2022-03-18 14:31:30 +05:30
Deepesh Garg	8819ba07a9	Merge pull request #30266 from deepeshgarg007/expense_income_account_validation ... fix: Validate income/expense account in sales and purchase invoice	2022-03-17 18:32:34 +05:30
Deepesh Garg	5390d5e65a	Merge branch 'develop' into mergify/bp/develop/pr-30284	2022-03-17 18:02:57 +05:30
Deepesh Garg	4237e5d928	fix: Test case	2022-03-17 18:00:39 +05:30
marination	f3715ab382	fix: Test, Sider and Added button to access log from Tool	2022-03-17 17:43:12 +05:30
Deepesh Garg	a651a0ffc8	Merge pull request #30261 from deepeshgarg007/bank_reco_error ... fix: Error in bank reconciliation statement	2022-03-17 17:29:15 +05:30
Deepesh Garg	5f89cb2cca	fix: Remove comments ... (cherry picked from commit cab69fe1f298b44613be21c06591e868c24ee249)	2022-03-17 11:57:50 +00:00
Deepesh Garg	2dd0e20003	fix: Clean and fixes in Dimension-wise Accounts Balance Report ... (cherry picked from commit 08a06ce5c68023c41f53b584082b5e1c4ddb1f59)	2022-03-17 11:57:50 +00:00
rohitwaghchaure	da16ee159a	Merge pull request #30238 from KrithiRamani/bulk_create_PL_and_DN ... feat: Create single PL/DN from several SO.	2022-03-17 15:39:45 +05:30
Rucha Mahabal	f090e63e54	test: fix holiday list creation causing flaky tests (#30260)	2022-03-17 15:21:56 +05:30
marination	3e3af95712	fix: Sider and Linter	2022-03-17 15:03:20 +05:30
Saqib Ansari	119273e633	fix: custom cash flow mapper doesn't show any data	2022-03-17 14:47:50 +05:30
marination	8aff75f8e8	feat: List View indicators for Log and Error Log link in log	2022-03-17 12:58:09 +05:30
marination	cff91558d4	chore: Polish error handling and code sepration ... - Added Typing - Moved all job business logic to bom update log - Added `run_bom_job` that handles errors and runs either of two methods - UX: Replace button disabled until both inputs are filled - Show log creation message on UI for correctness - APIs return log document as result - Converted raw sql to QB	2022-03-17 12:32:37 +05:30
Ankush Menat	76187d175f	refactor: call repost directly during tests (#30277) ... enqueue(now=frappe.flags.in_test) is always true in test, this change avoids confusion.	2022-03-16 19:50:56 +05:30
marination	4283a13e5a	feat: BOM Update Log ... - Created BOM Update Log that will handle queued job status and failures - Moved validation and BG job to thus new doctype - BOM Update Tool only works as an endpoint	2022-03-16 19:47:25 +05:30
Noah Jacob	2a0ca7c91a	refactor: removed unrequired code and test for standalone delivery note serial return (#30276)	2022-03-16 19:27:47 +05:30
Ankush Menat	b93ce78df1	chore: dont supress errors server side ... not required after https://github.com/frappe/frappe/pull/16284	2022-03-16 17:50:34 +05:30
Krithi Ramani	a12895ec03	corrected spacing	2022-03-16 13:56:54 +05:30
Ankush Menat	b46d6e3c05	test: packed item return scenarios	2022-03-16 13:36:53 +05:30
Ankush Menat	b781e8b7d1	revert: "fix: updated packed_items getting fetched on Sales Return / Credit Note (#28607)" ... This reverts commit 20216fa9f1.	2022-03-16 13:36:53 +05:30
Deepesh Garg	2958f60b46	Merge pull request #30269 from deepeshgarg007/implicit_pricing_rule_enable_v2 ... fix: Do not update ignore pricing rule check implicitly	2022-03-16 12:32:25 +05:30
Krithi Ramani	0211f27e83	as per review comments - changed for loop	2022-03-16 12:28:30 +05:30
Deepesh Garg	1f79b47a17	fix: Do not update ignore prcing rule check implicitly	2022-03-16 11:55:43 +05:30
Saqib Ansari	e9e2679dff	Merge pull request #29984 from dj12djdjs/fix-rename-tool-msg ... fix: rename tool show fail message	2022-03-16 10:57:17 +05:30
Saqib Ansari	597bb2c7e8	feat: safely parse exception	2022-03-16 10:53:39 +05:30
Deepesh Garg	06936cf1c0	fix: Validate income/expense account in sales and purchase invoice	2022-03-16 09:02:04 +05:30
Krithi Ramani	e970616b51	removed semicolon for break statement	2022-03-15 21:52:34 +05:30
Krithi Ramani	9f7fee7a4f	Added new field in SO - % Picked	2022-03-15 21:40:51 +05:30
Samuel Danieli	bbe5739547	feat: add German translations	2022-03-15 17:03:30 +01:00
Krithi Ramani	a68213d82e	added new field - Picked Qty, in Sales Order Item	2022-03-15 20:18:23 +05:30
Saqib Ansari	1797b6013e	Merge pull request #30244 from nextchamp-saqib/fix-gl-representation ... fix: incorrect debit credit amount in presentation currency	2022-03-15 18:39:37 +05:30