31034 Commits

Author	SHA1	Message	Date
marination	5fb5a757cf	refactor: (ux) Accepted/Rejected/Received Qty UX	2021-11-08 13:23:42 +05:30
ahmadpak	8df50cf1e0	update(Print Format): Sales Invoice ... - KSA VAT Invoice Customer Identification Number Added	2021-11-08 09:29:33 +03:00
Ankush Menat	db3193dcab	chore: remove migration_hash (#28263)	2021-11-08 10:57:20 +05:30
mergify[bot]	c0b889b94d	fix: auto update price list rate (#28255) (#28256) ... * fix: auto update price list rate * fix: hide field when auto insert isn't enabled (cherry picked from commit bb3957eba35a5204a1a01e412dee596532bd525e) Co-authored-by: Sagar Sharma <63660334+s-aga-r@users.noreply.github.com> [skip ci]	2021-11-07 17:42:51 +05:30
Dany Robert	01e7076b65	Merge branch 'develop' into currency-exchange-settings	2021-11-06 09:59:00 +05:30
Ankush Menat	8fe5feb6a4	chore: remove all six compat code	2021-11-05 11:16:29 +05:30
Ankush Menat	897e90ac55	chore: remove past module dependencies	2021-11-05 11:16:29 +05:30
Ankush Menat	6098e92ba9	chore: remove utf-8 compat code	2021-11-05 11:16:29 +05:30
mergify[bot]	25f647f067	fix: Bulk update of valid upto field wasn't working (bp #28242) ... * fix: Bulk update of valid upto field wasn't working Check in dates for the price list was failing because valid_upto field was string. Converting to date fixed the problem. * chore: extend fix and cleanup whitespace Co-authored-by: Ankush Menat <ankush@frappe.io> (cherry picked from commit 95a5ef1d416d54ecf0f557586b341b0dce2a0b05) Co-authored-by: fatihustaoglu <46131068+fatihustaoglu@users.noreply.github.com>	2021-11-04 21:46:48 +05:30
Raffael Meyer	114028e473	feat: replace newline in remarks (DATEV report) (#28152)	2021-11-04 21:44:24 +05:30
marination	0aa237f38c	test: Stock Entry from JC correctness (items mapping and qty)	2021-11-04 20:14:28 +05:30
Marica	51fb543f67	Merge branch 'develop' into se-required-items-from-jc	2021-11-08 18:05:11 +05:30
Dany Robert	4716523c77	fix: sider issues	2021-11-04 05:38:00 +00:00
Dany Robert	4a0f2175ad	fix: pre-commit issues	2021-11-04 05:25:48 +00:00
Dany Robert	1f8be84985	fix : remove mutable data structures from argument defaults	2021-11-04 05:12:09 +00:00
Dany Robert	e65a76b214	chore: clean up	2021-11-04 05:04:10 +00:00
Dany Robert	08b2735a79	fix: make fields editable only when service provider is custom	2021-11-04 05:01:37 +00:00
Dany Robert	7291d9f236	feat: option for preconfigured selectable service providers	2021-11-03 14:13:22 +00:00
Saqib Ansari	b7a44fe0a3	perf: improve financial statement loading time	2021-11-03 18:17:31 +05:30
Dany Robert	d869b3933b	Merge branch 'frappe:develop' into currency-exchange-settings	2021-11-03 18:15:27 +05:30
Anupam	7044ae5e39	fix: testcases:	2021-11-03 17:41:04 +05:30
Noah Jacob	cb064b06ad	fix: added job_card_item link in material request (#28222) ... * fix: added job_card_item links in material request * fix: add no copy to row references	2021-11-03 11:53:57 +00:00
marination	3da03028f3	fix: Pull Items that are in JC in Stock Entry against JC ... - Check if items pulled in stock entry are present in Job Card - Code cleanup and removed redundant checks Co-authored-by: Gavin D'souza <gavin18d@gmail.com>	2021-11-03 17:05:57 +05:30
Anuja Pawar	0d65a6e333	Merge branch 'develop' into gst-category	2021-11-03 15:49:22 +05:30
Anupam	cc15cf6ae2	fix: linter isuue	2021-11-03 13:54:46 +05:30
Anupam Kumar	8ebc412e8b	Merge branch 'develop' into manufacturing-work-order-stop	2021-11-03 13:41:37 +05:30
Anupam	ba47bd02b6	fix: sider isuue	2021-11-03 13:41:22 +05:30
Anupam	9b4c7e4796	fix: validate job card	2021-11-03 13:27:50 +05:30
Saqib	a5902fa3f8	Merge pull request #28187 from hrwX/subscription_active_fixes ... fix: do not generate multiple invoices	2021-11-03 11:40:39 +05:30
Anuja Pawar	3c4484fbf9	Merge branch 'develop' into gst-category	2021-11-02 23:30:16 +05:30
Anuja Pawar	f2fbcc8124	fix: sider	2021-11-02 23:29:06 +05:30
Anupam	9c0906f1b5	fix: test cases	2021-11-02 20:43:00 +05:30
Deepesh Garg	11e90cc0be	Merge pull request #28205 from deepeshgarg007/lower_deduction_validation_fix ... fix: Error on LDC creation	2021-11-02 20:27:18 +05:30
Deepesh Garg	66348e1a03	fix: Error on LDC creation	2021-11-02 20:26:40 +05:30
Marica	91112c49e1	Merge pull request #28202 from marination/serial-no-popup-with-scanner ... fix: Serial Nos not set in the row after scanning in popup	2021-11-02 20:17:48 +05:30
hrwx	2bce193b81	Merge branch 'develop' of https://github.com/frappe/erpnext into subscription_active_fixes	2021-11-02 14:05:10 +00:00
Saqib	ec0a72423a	fix: Calculate depreciation_amount accurately (#27585)	2021-11-02 18:45:03 +05:30
marination	734b57deec	fix: Serial Nos not set in the row after scanning in popup ... - Avoid whitspaces while calculating length of serial nos	2021-11-02 18:34:55 +05:30
Noah Jacob	857d87da97	fix: replaced "=" with "in" for multiple statuses in query #28193 ... fix: replaced "=" with "in" for multiple statuses in query	2021-11-02 17:52:45 +05:30
Saqib	7681600b5e	fix: test wdv method for indian region	2021-11-02 17:47:44 +05:30
hrwx	890a786858	fix: do not generate multiple invoices	2021-11-02 11:58:01 +00:00
GangaManoj	f047c6ffc8	fix: Test for WDV	2021-11-02 16:43:31 +05:30
Anuja Pawar	d72709dd81	fix(Payment Entry): splitting outstanding rows as per payment terms (#27946)	2021-11-02 16:28:46 +05:30
marination	48886ee705	chore: Add comment above fix for future reference	2021-11-02 15:57:41 +05:30
marination	048210a8f6	fix: Remove warehouse filter on Batch field for Material Receipt	2021-11-02 15:49:58 +05:30
Anupam	e36da4d137	fix: linter issues	2021-11-02 12:53:00 +05:30
Anupam	59e4fd980c	fix: linter issues	2021-11-02 12:46:00 +05:30
Anupam	530a0f481e	fix: added testcase	2021-11-02 12:39:13 +05:30
Smit Vora	e2d866d6a2	fix: regional(India) totalValue for ewaybill	2021-11-01 15:55:19 +05:30
Ankush Menat	1eab3a44f6	fix(ux): stock levels take time after item merge ... Item merge creates a repost and depending on number of entries it can take from 1 to n hours for it to finish. (depending upon queued up reposts) Added message so users don't feel confused till this operation is finished.	2021-11-01 15:32:59 +05:30
Ankush Menat	f7ffe04a4b	fix: use warehouse to find company	2021-11-01 14:13:56 +05:30
Ankush Menat	a0727b2e82	fix: pass company while fetching valuation rate ... If company is not supplied and valuation rate is 0, then default company is used for checking if perpetual inventory is enabled or not. This makes little sense as different companies can have different setting for perpetual inventory.	2021-11-01 14:13:56 +05:30
Anupam Kumar	623776dd48	feat: added company field in prospect (#28139) ... * feat: added company field in prospect * fix: review changes	2021-11-01 13:37:31 +05:30
Anuja Pawar	dd3cadd46b	fix: update set_value query	2021-11-01 11:38:02 +05:30
Anuja Pawar	19f78c2f31	Merge branch 'develop' into gst-category	2021-11-01 11:30:23 +05:30
Deepesh Garg	ddcdf64f35	Merge pull request #28156 from kennethsequeira/ind-tx ... fix: update tax template name for 18% GST	2021-10-31 18:53:40 +05:30
Anupam	264b0df9ff	fix: sider issue	2021-10-31 16:11:11 +05:30
Anupam	55e97dce8a	fix: sider issue	2021-10-31 14:45:36 +05:30
Anupam	e290fe0721	fix: sider issue	2021-10-31 14:42:10 +05:30
Anupam	5d4c5652af	feat: added confirm dialog on closing of workorder	2021-10-31 14:20:03 +05:30
Rohit Waghchaure	cae29b71d8	fix: patch update_category_in_ltds_certificate	2021-10-31 09:24:07 +05:30
ahmadpak	2a5beec885	new (Print Format): KSA VAT Invoice	2021-10-30 17:18:45 +03:00
Deepesh Garg	fb9e72cc8a	Merge pull request #28162 from deepeshgarg007/pan_field_missing_error ... fix: Error for missing PAN no field	2021-10-30 19:29:26 +05:30
Deepesh Garg	541c892f97	fix: Error for missing PAN no field	2021-10-30 18:22:46 +05:30
Kenneth Sequeira	ad5cf467c0	fix: update tax template name for 18% GST	2021-10-30 13:07:36 +05:30
Anuja Pawar	f9e7dc3f62	Merge branch 'develop' into gst-category	2021-10-29 21:32:49 +05:30
Anuja Pawar	bc1e7bc15f	fix: re-writing sql query with ORM methods	2021-10-29 21:32:20 +05:30
Anuja Pawar	1a6e98ed48	fix(Payment Reconciliation): clear child tables on company/party change (#28008)	2021-10-29 20:52:47 +05:30
Ganga Manoj	15e9b5170d	fix: Make status filter optional (#28126)	2021-10-29 18:07:11 +05:30
Anupam	23af036894	feat: provision to close the Work Order	2021-10-29 17:27:17 +05:30
Deepesh Garg	eb720d18c3	Merge pull request #28145 from deepeshgarg007/coa_import_is_group ... fix: COA importer importing all accounts as group	2021-10-29 17:04:20 +05:30
Ankush Menat	ff9cfe0d14	fix: sort by creation to break tie	2021-10-29 16:56:15 +05:30
Ankush Menat	f4b60a48f5	refactor: simplify sr no fetching	2021-10-29 16:56:15 +05:30
Ankush Menat	2aa019ae4c	fix: fetch serial nos from ledger unconditionally	2021-10-29 16:56:15 +05:30
Noah Jacob	deb6b38fab	refactor: replaced db.sql with qb	2021-10-29 16:56:15 +05:30
Noah Jacob	b44945380d	fix: incorrect amount of serial_nos fetched	2021-10-29 16:56:15 +05:30
Subin Tom	75a76e634d	fix: POS consolidated invoice rounded total issue (#28006)	2021-10-29 16:45:04 +05:30
Deepesh Garg	8ccd3fee9e	fix: COA importer importing all accounts as group	2021-10-29 16:08:52 +05:30
Deepesh Garg	199fc52917	Merge pull request #27994 from rtdany10/patch-8 ... fix: incorrect VAT Amount in UAT VAT 201 report	2021-10-29 14:42:02 +05:30
Deepesh Garg	7180d76b36	Merge pull request #28135 from deepeshgarg007/accounting_dimension_userperm ... fix: Accounting Dimension filters not honouring user permissions	2021-10-29 14:39:58 +05:30
Marica	292419bc9e	fix: Skip empty rows while updating unsaved BOM cost (#28136) ... - Dont try to get valuation rate if row has no item code - Dont try to add exploded items if row has no item code	2021-10-29 13:49:27 +05:30
Ankush Menat	afe09d4e80	test: remove unnecessary creation of new company (#28137)	2021-10-29 13:45:07 +05:30
Deepesh Garg	aa9e78bed1	fix: Accounting Dimension filters not honouring user permissions	2021-10-29 12:45:19 +05:30
Anuja Pawar	4589f39875	Merge branch 'develop' into gst-category	2021-10-29 12:41:04 +05:30
Deepesh Garg	d0e2b52f51	Merge pull request #28122 from nemesis189/consolidated-finan-report-empty-list-error ... fix: Consolidated Financial Report throws error for empty equity data list	2021-10-29 12:11:16 +05:30
Deepesh Garg	051aaa708d	fix: Ignore PO on So cancel	2021-10-29 11:35:34 +05:30
Anuja Pawar	d23b7a77b8	Merge branch 'develop' into gst-category	2021-10-28 23:22:03 +05:30
Ganga Manoj	61757c17ae	Merge branch 'develop' into unlink-po-on-cancelling-so	2021-10-28 21:06:00 +05:30
GangaManoj	d24cfff388	fix: Remove unused imports	2021-10-28 20:06:48 +05:30
GangaManoj	1a9d2684e2	fix: Remove debugger	2021-10-28 19:27:45 +05:30
GangaManoj	8844fdbf23	fix: Remove print statements	2021-10-28 19:26:09 +05:30
Deepesh Garg	812249e5d1	Merge branch 'develop' of https://github.com/frappe/erpnext into lower_deduction_cetificate_fixes	2021-10-28 19:01:51 +05:30
Deepesh Garg	09a5616e2d	fix: Rewrite patch using query builder	2021-10-28 19:01:24 +05:30
marination	8502ccb5b2	chore: Add comment hinting to reason	2021-10-28 16:53:45 +05:30
marination	27236b7e9e	fix: Remove RM Cost column as cost is not retrievable from Job card	2021-10-28 16:45:23 +05:30
Deepesh Garg	8e2b4ef456	Merge branch 'develop' into unlink-po-on-cancelling-so	2021-10-28 14:44:34 +05:30
Ankush Menat	b01635e1da	refactor!: remove hub #28117 ... refactor!: remove hub	2021-10-28 14:07:15 +05:30
Subin Tom	d786855d94	fix: Consolidated Financial Report throws error for empty equity data list	2021-10-28 13:19:19 +05:30
Saqib	f530764105	Merge branch 'develop' into fix-depr-after-sale	2021-10-28 12:43:51 +05:30
Faris Ansari	c8d0d9ece9	Merge pull request #28048 from netchampfaris/print-format-builder-templates ... feat: Taxes template for selling/buying doctypes	2021-10-28 12:33:21 +05:30
Saqib	cc7a21eafa	Merge branch 'develop' into fix-depr-after-sale	2021-10-28 12:04:07 +05:30
Anupam Kumar	4787a75208	fix: opportunity link is missign from customer (#28110)	2021-10-28 11:13:11 +05:30
Ganga Manoj	8774862c8d	Merge branch 'develop' into fix-depr-after-sale	2021-10-28 02:15:26 +05:30
Deepesh Garg	c5a16a999c	Merge pull request #28114 from deepeshgarg007/fs_auto_email_report ... fix: Autoemail report not showing dynamic report filters	2021-10-27 19:58:26 +05:30
Ankush Menat	d81b87d9b3	fix(ux): make qty 1 by default in WO	2021-10-27 19:46:06 +05:30
Ankush Menat	2221c9ed89	fix: don't show blocked supplier in autocomplete	2021-10-27 19:46:06 +05:30
Ankush Menat	5902762ec8	fix(ux): alternative item two way validation	2021-10-27 19:46:06 +05:30
Ankush Menat	5f9bd9b8e9	fix: remove bad hardcoded max value	2021-10-27 19:46:06 +05:30
Deepesh Garg	3a6894fb9c	fix: Autoemail report not showing dynamic report filters	2021-10-27 19:39:18 +05:30
Saqib	a261d08dd8	fix: reset temporary flag after use	2021-10-27 18:30:37 +05:30
Saqib	470c07c6e9	Merge branch 'develop' into fix-depr-after-sale	2021-10-27 16:02:38 +05:30
Ankush Menat	e0cf45e7ec	fix(ux): misleading label for image fields (#28107)	2021-10-27 15:27:33 +05:30
Saqib	cc07c71bbd	Merge branch 'develop' into fix-so-cancellation-message	2021-10-27 15:19:18 +05:30
Ganga Manoj	c9f3ea5fea	fix: Remove pointless buttons from Payment Order ... fix: Remove pointless buttons from Payment Order	2021-10-27 15:16:38 +05:30
Saqib	2e61c5eb55	Merge branch 'develop' into fix-depr-after-sale	2021-10-27 15:12:51 +05:30
hendrik	f24ed6723e	fix(general_ledger): Order by in case Group by Account (#28093) ... * Update general_ledger.py Fix order_by_statement if filter group by: Group by Account * chore: whitespace Co-authored-by: Ankush Menat <ankushmenat@gmail.com> Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>	2021-10-27 14:38:20 +05:30
Afshan	f0bdf9426b	Merge branch 'develop' into gst-category	2021-10-27 14:13:26 +05:30
Deepesh Garg	af9ead84e9	Merge pull request #28080 from deepeshgarg007/payment_terms_precision_validate ... fix: Payment Terms validation precision	2021-10-27 11:48:23 +05:30
Summayya Hashmani	0806e32049	fix(ux): add naming series to ERPNext setting workspace (#28090) ... * fix(ux): add naming series to setting workspace * fix: doctype link to naming series Co-authored-by: Ankush Menat <ankushmenat@gmail.com> Co-authored-by: Summayya <frappe@Summayyas-MacBook-Air.local> Co-authored-by: Ankush Menat <ankushmenat@gmail.com>	2021-10-27 11:46:10 +05:30
Saqib	879a1fca76	perf(minor): improve sales invoice submission (#27916) ... * perf: skip get_pricing_rules if no pricing rule exists * perf: fetch mode of payments data in single query * perf: get total company stock only for purchase order * perf: skip insertion of stock ledger entry * fix: undo changes to allow negative stock flag * fix: sider Co-authored-by: Ankush Menat <ankushmenat@gmail.com> Co-authored-by: Ankush Menat <ankush@iwebnotes.com>	2021-10-27 11:42:50 +05:30
Alan	05831b18ad	fix: update production plan status #27567 ... fix: update production plan status	2021-10-27 11:36:37 +05:30
mergify[bot]	25d1c1ce86	fix: add filter to query to avoid send reminder for zero years (#28092) (#28096) ... Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com> (cherry picked from commit 8cad23b8fb4d830a5703e107c371ae9319bc003d) Co-authored-by: gsi-maruiz <62341390+gsi-maruiz@users.noreply.github.com>	2021-10-27 11:21:26 +05:30
Dany Robert	2920f2f614	fix: change modified timestamp to apply changes on migrate #28095 ... fix: change modified timestamp to apply changes on migrate	2021-10-27 11:17:48 +05:30
Ankush Menat	479ecb8de0	test: picklist item grouping	2021-10-27 11:10:52 +05:30
Ankush Menat	6942900555	refactor: use defaultdict and enumeration	2021-10-27 11:10:52 +05:30
Diksha Jadhav	f2d136e574	feat(pick list): group items based on item code and warehouse before printing picklist	2021-10-27 11:10:52 +05:30
Dany Robert	882da2f98b	Merge branch 'develop' into currency-exchange-settings	2021-10-27 10:48:04 +05:30
Ankush Menat	6ec047cba9	fix(ux): overbiling message in SO->SI, PO->PI (#28088)	2021-10-27 10:30:05 +05:30
GangaManoj	78825f2c6c	fix: Add extra line	2021-10-27 06:18:24 +05:30
GangaManoj	4789c3423d	fix: Linters	2021-10-27 05:25:32 +05:30
GangaManoj	06c505ddc2	fix: Linters	2021-10-27 05:23:01 +05:30
GangaManoj	07b25c4275	fix: Import statements	2021-10-27 05:20:31 +05:30
GangaManoj	54a0f5d04f	fix: Make import statements fit conventions	2021-10-27 05:15:44 +05:30
GangaManoj	6dbc47f225	fix: Rename variables	2021-10-27 05:09:44 +05:30
GangaManoj	7454167725	fix: Remove redundant code	2021-10-27 05:08:11 +05:30
GangaManoj	69e011bf6a	fix: Add test to check if SO can be cancelled after linked Work Order has been submitted	2021-10-27 05:07:16 +05:30
GangaManoj	29fc4da4c6	fix: Create Maintenance Visit	2021-10-27 04:47:26 +05:30
GangaManoj	9ec24d4915	fix: Add test to check if SO can be cancelled after linked Maintenance Visit has been submitted	2021-10-27 04:46:59 +05:30
GangaManoj	80ce3e6de7	fix: Add test to check if SO can be cancelled after linked Maintenance Schedule has been submitted	2021-10-27 04:17:21 +05:30
GangaManoj	60119f5ce5	fix: Remove redundant validations	2021-10-26 21:42:58 +05:30
GangaManoj	aac574579a	fix: Add test to check if SO can be cancelled when linked DN has been submitted	2021-10-26 21:42:58 +05:30
GangaManoj	21798d8836	fix: Add test to check if SO can be cancelled when linked SI has been submitted	2021-10-26 21:42:58 +05:30
GangaManoj	cde0dae987	fix: Add flag for reverse depreciation entries	2021-10-26 21:04:06 +05:30
Deepesh Garg	7ab7753bfa	Merge branch 'develop' of https://github.com/frappe/erpnext into lower_deduction_cetificate_fixes	2021-10-26 20:56:40 +05:30
GangaManoj	82bf5e5539	fix: Replace post_depreciation_entries() with make_depreciation_entry()	2021-10-26 20:53:47 +05:30
Deepesh Garg	a87c201785	Merge pull request #28054 from deepeshgarg007/tax_withholding_category_filters ... fix(minor): Filters and validations in Tax Withholding Category	2021-10-26 20:51:24 +05:30
Deepesh Garg	0c28b477af	Merge pull request #28074 from deepeshgarg007/pan_field_hide_develop ... fix: Move PAN field from standard doctype to fixtures for India	2021-10-26 20:44:11 +05:30
Deepesh Garg	6b22894275	Merge pull request #28052 from deepeshgarg007/company_address_update ... fix: Auto update company address check on linking with company	2021-10-26 20:40:13 +05:30
Deepesh Garg	277dfeaf4e	Merge pull request #28057 from deepeshgarg007/company_change_fixes ... fix: Update receivable/payable account on company change	2021-10-26 20:36:52 +05:30
Deepesh Garg	0136aedfdc	Merge pull request #28055 from deepeshgarg007/payment_entry_ux ... fix(UX): Add mandatory depends on condition for reference no and date fields	2021-10-26 20:02:34 +05:30
Deepesh Garg	1165a8ac3a	Merge branch 'develop' into company_change_fixes	2021-10-26 19:52:45 +05:30
Deepesh Garg	89d5e494dd	fix: Reload customer and supplier doctype	2021-10-26 19:51:03 +05:30
Deepesh Garg	9c1705205f	fix: Payment Terms validation precision	2021-10-25 20:06:24 +05:30
Ganga Manoj	0515b4b6f6	Merge branch 'develop' into fix-depr-after-sale	2021-10-25 19:11:19 +05:30
Anuja Pawar	59b5987030	Merge branch 'develop' into gst-category	2021-10-25 18:28:06 +05:30
Deepesh Garg	8f6600b27a	fix: Repayment schedule revert on cancel	2021-10-25 16:21:26 +05:30
Subin Tom	fc8307621c	fix: POS Closing Entry without linked invoices (#28042)	2021-10-25 13:18:08 +05:30
Deepesh Garg	cd4b20313e	fix: Test case fixes and linting issues	2021-10-25 11:21:55 +05:30
Anuja Pawar	a1213006a1	Merge branch 'develop' into gst-category	2021-10-25 10:50:03 +05:30
GangaManoj	9e7022830e	fix: Only add additional depreciation schedule row on sale if depreciation_amount > 0	2021-10-25 01:34:42 +05:30
Deepesh Garg	e3ae8d5a1e	fix: Move PAN field from standard doctype to fixtures for India	2021-10-24 17:24:25 +05:30
Deepesh Garg	b812660e40	Merge branch 'develop' of https://github.com/frappe/erpnext into term_loan_enhancement	2021-10-24 16:54:58 +05:30
Noah Jacob	fdaf93f76c	refactor: shows opening balance from filtered from_date (#26877) ... * refactor: shows opening balance from filtered from_date * refactor: opening balance considered from filtered from_date in stock ledger * fix: check if stock reco is opening and misc cleanups	2021-10-23 21:04:42 +05:30
Deepesh Garg	bf13d183d8	fix: Replace section code with tax withholding category in LDC	2021-10-23 19:00:03 +05:30
Deepesh Garg	e6e804e7d7	fix: Get LTDS based on tax withholding category	2021-10-23 18:58:41 +05:30
Deepesh Garg	dcae9ba86e	fix: Unsecured loan status update	2021-10-23 18:06:34 +05:30
Deepesh Garg	7f2dde7d94	fix: Check for supplier name ... (cherry picked from commit 944e3d467c5ab0a2a4a76a8b532e53bca77f8e61)	2021-10-23 07:47:18 +00:00
Deepesh Garg	881e091b85	fix: Check for other properties ... (cherry picked from commit b7befe49dc83b938b74b7a63d31787734d7857f8)	2021-10-23 07:47:18 +00:00
Deepesh Garg	2ea4c95f86	fix: Error in TDS computation summary ... (cherry picked from commit f12deae24b7ab164edd0868a1254bdf28bfeac09)	2021-10-23 07:47:18 +00:00
Anuja Pawar	6a3bd882b4	fix: sider	2021-10-22 20:44:49 +05:30
Anuja Pawar	4f53837624	fix: sider	2021-10-22 20:43:54 +05:30
Anuja Pawar	59c31bb124	fix: check if gst_category exist	2021-10-22 19:26:31 +05:30
Deepesh Garg	1a5f0da6ca	fix: Loan repayment schedule date	2021-10-22 10:46:56 +05:30
Raffael Meyer	2bdaf7bb23	fix: don't reset rates in Timesheet Detail when Activity Type is cleared (#28056) ... * fix: don't reset rates when activity type is cleared * refactor: suggestions from review Co-authored-by: Sagar Vora <sagar@resilient.tech> * refactor: suggestions from review (fix) * style: fix sider * fix: sider issue Co-authored-by: Sagar Vora <sagar@resilient.tech>	2021-10-21 23:53:04 +05:30
Deepesh Garg	65025fb628	fix: Update receivable/payable account on company change	2021-10-21 19:30:06 +05:30
Deepesh Garg	a20058a343	fix(minor): Add mandatory depends on condition for reference no and date fields	2021-10-21 17:52:13 +05:30
Deepesh Garg	7733afc0ae	fix(minor): Filters and fixes in Tax Withholding Category	2021-10-21 16:13:00 +05:30
Deepesh Garg	c6d06816cf	fix: Auto update company address check on linking with company	2021-10-21 15:37:59 +05:30
Faris Ansari	8b547e39a8	feat: Taxes template for selling/buying doctypes ... Depends on the new Print Format Builder frappe/frappe#14134	2021-10-21 12:06:02 +05:30
Alan	2849297471	refactor: move process loss report to manufacturing (#28043) ... * refactor: move process loss report to manufacturing * test: fix process loss report test Co-authored-by: Ankush Menat <ankush@iwebnotes.com>	2021-10-21 11:07:47 +05:30
mergify[bot]	1a31d5856f	fix: useless validation message (#28029) (#28046) ... Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com> (cherry picked from commit 152f9b0a432361f1c801364d1c85c42a16691a8a) Co-authored-by: Devin Slauenwhite <devin.slauenwhite@gmail.com>	2021-10-21 11:05:50 +05:30
Mohammed Yusuf Shaikh	03bfc77940	feat: employee initial work history updated when transfer is performed (#27768) ... * feat: employee initial work history updated when transfer is performed * fix: sider * fix: remove commit statement * fix: tests and code formatting * fix: tests Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2021-10-21 10:15:09 +05:30
rohitwaghchaure	871cb1157f	fix: consolidated report issue #28035 ... fix: consolidated report issue	2021-10-20 21:08:15 +05:30
Rohit Waghchaure	311bafb23b	fix: incorrect fieldname	2021-10-20 20:51:57 +05:30
Ankush Menat	da3635b94f	test: execute manufacturing reports	2021-10-20 20:35:11 +05:30
Ankush Menat	126ba16740	fix: remove debug from query	2021-10-20 20:35:11 +05:30
Ankush Menat	8221e7e01f	fix: remove employee_name from job card summary ... This field doesn't exist and it's moved on individual line level logs.	2021-10-20 20:35:11 +05:30
Deepesh Garg	8116b9b62f	fix: Updates in term loan processing	2021-10-20 19:55:00 +05:30
Deepesh Garg	ddacff38ba	Merge pull request #28002 from ankush/dont_recompute_item_tax ... fix: dont recompute item wise taxes from front end	2021-10-20 19:19:44 +05:30
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
marination	fd6f3c6b88	Merge branch 'develop' of https://github.com/frappe/erpnext into e-commerce-refactor-develop	2021-10-12 18:24:21 +05:30
marination	8f0b9c9406	fix: Show Offers section only if offers exist	2021-10-12 18:16:17 +05:30
marination	0a703740bb	feat: Offer Display ... - Added offers section in website item - Added more roles to website item - Fixed attachment limit issue in website item - Created Website Offer child doctype - Added offers listing in Item full page view - style fixes	2021-10-12 18:16:03 +05:30
Hussain Nagaria	c69de2d7a8	chores: Add function params and remove unused imports	2021-10-12 18:15:07 +05:30
Hussain Nagaria	4309239d6c	feat: Show Recent Searches	2021-10-12 18:14:43 +05:30
Hussain Nagaria	34f3a6629f	feat: Show brand line in search results	2021-10-12 18:14:29 +05:30
Hussain Nagaria	9ee13ba86b	feat: Add brand line display setting	2021-10-12 18:14:16 +05:30
Hussain Nagaria	55d2bf0ff9	chore: Add placeholder image	2021-10-12 18:14:04 +05:30
Hussain Nagaria	70b164e7dd	chore: Add query clean-up	2021-10-12 18:13:51 +05:30
Hussain Nagaria	ffc8616c63	refactor: Use global redis connection	2021-10-12 18:13:37 +05:30
Hussain Nagaria	ba25460edf	chore: Make it a little beautiful	2021-10-12 18:13:27 +05:30
Hussain Nagaria	f3421554ad	feat: Add Category autocomplete with config in settings	2021-10-12 18:02:24 +05:30
Hussain Nagaria	8e55c95ecc	feat: Make search index fields configurable ... - Move indexing logic to separate file - Add more validation logic for 'search index fields' field	2021-10-12 18:02:09 +05:30
Hussain Nagaria	3160187825	feat: Add search fields field	2021-10-12 17:58:01 +05:30
Hussain Nagaria	e82833f14a	feat: Basic Query + Autocomplete	2021-10-12 17:57:46 +05:30
Hussain Nagaria	0c47f3a876	feat: Add basic autocomplete using redisearch	2021-10-12 17:57:19 +05:30
marination	71f4b98d0c	chore: Sider and Semgrep	2021-10-12 17:52:54 +05:30
marination	1d94914102	feat: Discount Filters ... - Discount filters in filters section - Code cleanup	2021-10-12 17:46:03 +05:30
marination	60261852b2	feat: Slashed Prices and Discount display ... - Registered mrp and price after discounts - slashed price with discount in listing, item page and wishlist - removed redundant imports - renamed method to `get_web_item_qty_in_stock` to get Website Item stock - adjusted styles for resizing - made add to cart button full width on cards	2021-10-12 17:38:36 +05:30
marination	3d5f029e51	fix: Sider and Tests	2021-10-12 17:33:22 +05:30
marination	c842305be0	feat: Customer Ratings & Reviews Full Page ... - Created macros for repetitive snippets - Created Customer Reviews full page - View more button to reveal 10 more reviews at a time - Common function to get reviews with start and end	2021-10-12 17:30:03 +05:30
marination	b15ff57a66	feat: (wip) Ratings and Reviews ... - Added Ratings and Reviews section in Item full page view - Added provision to write a review with popup - Created Item Review Doctype to store User-Item unique reviews - Added privision to enable/disable wishlist and reviews in e commerce settings - Hide cart and wishlist actions everywhere (even navbar) depending on settings - Moved some more inline css to scss - Small logic fixes TODO: Reviews full page view with paging	2021-10-12 17:27:32 +05:30
marination	07d7cf01b4	fix: Remove unnecessary css variable and hover state ... - Removed wish-red variable - Removed hover state from remove wishlist item button in card - Removed inline css from wishlist item card	2021-10-12 17:26:10 +05:30
marination	25ffafae81	feat: Product Details Tabbed Section and Add to Wishlist in Item Full Page ... - Add to Wishlist button next to add to cart - Beautified Product Specifications table section - Product Specifications can be optionally in a tabbed section with custom tabs added - Removed hard coded gray bg to allow custom theme overwrites - Fixed resizing issues in Item Full Page view - Cleaned up inline styles and ported to scss	2021-10-12 17:25:51 +05:30
marination	cd117149e1	fix: Sider	2021-10-12 17:24:15 +05:30
marination	59514408b9	feat: Wishlist Page ... - Navbar icon with badge count for wishlist - Wishlist page with cards - Cards can be moved to cart or removed in a click - Separated all wishlist related methods into wishlist.js - Made a common js method(util) to add/remove wishlist items - Bug fix: Make sure items are removed from session user's wishlist	2021-10-12 17:23:55 +05:30
marination	96cc5068b2	feat: Wishlist from card actions ... - Add remove items from wishlist - Wishlist icon at nav bar - Animate wishlist icon in card and navbar - Remember wished state after refresh as well	2021-10-12 17:23:12 +05:30
marination	4f64d1c7f2	feat: Animate Add to Cart List interactions (UX) ... - Increased qty in cart on clicking add to cart for existing item - Simplified macro arguments - Navbar cart icon animation - Explore button for template item in card - Add to cart button animation	2021-10-12 17:18:51 +05:30
marination	16b9c8c383	feat: Card Actions and Wishlist ... - Rough UI for card actions - Wishlist doctype - Indicators on card based on stock availability	2021-10-12 17:18:06 +05:30
marination	d7130e31fe	feat: Shop by Category ... - Added Shop by Category Page - Tabbed sections for item fields in Shop by Category Page - Added Shop by Category Section in E commerce Settings - Nested Navigation & Breadcrumbs in Item group pages - Added scrollable & clickable Sub categories in Item Group page - Made breadcrumbs slightly dynamic in Item Page - Added image to Brand doctype	2021-10-12 17:00:30 +05:30
marination	22f41a17b7	chore: Removed Shopping Cart Module ... - Moved all files and web templates from Shopping Cart to E-commerce module - Made Shopping Cart module obsolete - Moved select E-commerce related files from Portal to E-commerce module - Minor cleanups - Fixed Shopping Cart and Product Configurator tests	2021-10-12 16:54:11 +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
marination	37a246e738	chore: Patches for Website Item ... - Patch to make website item from item - Patch to move Products and Shopping Cart Settings into E Commerce Settings - Patch to move products in Homepage from Item to Website Item - Minor cleanup, replacing/removing references to Item website fields (obsolete)	2021-10-12 16:16:17 +05:30
marination	f1ce418bdc	fix: Hide Attribute filters if 'Hide Variants' is enabled in E Commerce Settings ... - Hide Attribute filters if 'Hide Variants' is enabled in E Commerce Settings - Consider 'Hide Variants' in ProductQuery Engine - Added docstrings - Remove `get_e_commerce_settings`, redundant	2021-10-12 16:09:50 +05:30
marination	b38339c979	fix: Sider and indexing (minor)	2021-10-12 16:06:13 +05:30
marination	025574d9b5	chore: Removing Item's Website section & references ... - Removed old onboarding slide json and `create_onboarding_docs` methods - Removed website sections from Item master - Removed references to item website fields - Shifted Item doctype website methods to Website Item - Removed WebsiteGenerator from Item doctype - Website Items in Homepage Products section - Removed redundant code from item_group.py - Fix: Item field filters won’t appear in website	2021-10-12 16:03:19 +05:30
marination	eef9cf152f	chore: Drive E-commerce via Website Item ... - Removed Shopping Cart Settings - Portal fully driven via E Commerce Settings - All Item listing querying will happen via ProductQuery engine only - Product Listing via Website Items - removed redundant code - Moved all website logic from Item to Website Item	2021-10-12 15:48:06 +05:30
marination	939b0dd67d	feat: E-commerce Refactor ... - Created "Website Item" to handle website related information - Publishing Item new flow - Created "E Commerce Settings" - Removed Products Settings	2021-10-12 15:16:21 +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
Afshan	4c16bd5c73	Merge branch 'develop' into fix-so-cancellation-message	2021-10-05 11:52:48 +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
GangaManoj	6e5a3c0ea4	fix: Display draft invoices only once in error message	2021-10-02 02:15:17 +05:30
GangaManoj	99edc9c83a	fix: Display message to delete linked invoices in the draft state	2021-10-02 02:03:29 +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
GangaManoj	249672c35d	fix: Add depreciation_schedule details in create_asset()	2021-09-21 07:11:40 +05:30
GangaManoj	700e78d69b	fix: Remove extra brackets	2021-09-21 07:11:40 +05:30
Ganga Manoj	eb8122baba	Merge branch 'develop' into fix-depr-after-sale	2021-09-21 06:29:41 +05:30
GangaManoj	3c8879e777	fix: Calculate depreciation_amount accurately	2021-09-21 06:07:06 +05:30
GangaManoj	244d9dee04	fix: Correct expected_values	2021-09-21 06:06:21 +05:30
Abdullah A. Zaqout	6d8e869a92	fix(pos): check if item exists before fetching available qty (#27581)	2021-09-20 21:35:37 +05:30
Anuja Pawar	190c2d84da	fix: reference row added in allocation table (#27602)	2021-09-20 21:32:38 +05:30
GangaManoj	e77534fe13	fix: Unlink PO on cancelling SO	2021-09-20 21:18:18 +05:30
Ganga Manoj	41678faeee	Merge branch 'develop' into unlink-po-on-cancelling-so	2021-09-20 21:16:31 +05:30
Shariq Ansari	3e8e6ac4e2	fix: Creating unique hash for slider id instead of slider name	2021-09-20 20:52:08 +05:30
GangaManoj	8396f24e70	fix: Unlink PO on cancelling SO	2021-09-20 19:01:46 +05:30
Ankush Menat	4f01115f2f	Merge pull request #27601 from ankush/overbill_warn ... fix(ux): warn when overbilling allowance was bypassed due to role	2021-09-20 17:42:29 +05:30
Ankush Menat	21a955d20b	fix(ux): better error message ... Co-authored-by: Saqib <nextchamp.saqib@gmail.com>	2021-09-20 17:14:35 +05:30
Ankush Menat	5e4fbba753	refactor: add guard clause in for loop ... Reduce overly indented code/improve readability.	2021-09-20 16:40:51 +05:30
Ankush Menat	43bf82b58b	fix: warn when overbilling checks are skipped.	2021-09-20 16:31:20 +05:30
Subin Tom	0ff7367f39	fix: Tax Breakup table headers fix (#27596)	2021-09-20 16:13:36 +05:30
Saqib	ef66beec51	fix(plaid): query to check if bank account exists	2021-09-20 15:33:29 +05:30
ChillarAnand	aa580769a6	chore: Code clean up	2021-09-20 15:27:43 +05:30
Ankush Menat	648b2d72a5	perf: extract loop invariant db calls	2021-09-20 15:27:12 +05:30
Deepesh Garg	f07ff92a35	fix: Improvements in COA Importer (#27584)	2021-09-20 11:12:39 +05:30
GangaManoj	164a2ad28d	fix: Calculate depreciation_left accurately	2021-09-20 04:33:30 +05:30
Frappe PR Bot	4f7af79c31	fix: PO/PINV - Check if doctype has company_address field before setting the value (#27441) (#27576) ... Co-authored-by: Vama Mehta <vama.mehta@inqubit.in> (cherry picked from commit 666eaae6ce976c5d820b3b9f91d23a0ed28a263a) Co-authored-by: vama <vamagithub@gmail.com>	2021-09-18 13:34:27 +05:30
rohitwaghchaure	bf2a590332	fix: View Stock / Accounting Ledger button not showing in the stock entry (#27570)	2021-09-17 18:39:21 +05:30
Saqib	e03d9aa889	fix: unecessary keyword args were passed in mapper functions (#27563)	2021-09-17 13:03:27 +05:30
Subin Tom	d49346ac45	fix: Tax breakup based on items, missing GST fields (#27524) ... * fix: Tax breakup based on items * fix: added gst fields,warehouse validation to pos inv,patch * fix: tax breakup test fix, eway bill hsn fix Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>	2021-09-17 10:39:03 +05:30
Marica	41f11eca72	fix: Remove duplicates from customer_code field (#27555)	2021-09-17 10:27:29 +05:30
Ahmad	0ab57d49c1	fix: pre-commit hooks	2021-09-17 01:54:59 +05:00
Ahmad	9dae36b81d	fix: pre-commit hooks	2021-09-17 01:51:32 +05:00
Ahmad	4ec733fcc0	fix: pre-commit hooks	2021-09-17 01:46:45 +05:00
Ahmad	f1e5a64c61	refactor (regional): KSA utils	2021-09-17 01:33:32 +05:00
Ahmad	05321d7f4e	Update erpnext/regional/saudi_arabia/utils.py ... Co-authored-by: Saqib <nextchamp.saqib@gmail.com>	2021-09-17 01:28:52 +05:00
Ahmad	95b3b9c8f5	Update erpnext/regional/saudi_arabia/utils.py ... Co-authored-by: Saqib <nextchamp.saqib@gmail.com>	2021-09-17 01:27:37 +05:00
Ahmad	940db71a82	fix: indentations	2021-09-17 01:14:41 +05:00
Subin Tom	5c18654113	fix: Renamed child table doctype, delete taxes for non nexus state	2021-09-17 00:10:41 +05:30
Deepesh Garg	c9c8957250	feat: Merge POS invoices based on customer group (#27471) ... * feat: Merge POS invoices based on customer group * fix: Linting Issues * fix: fieldname Co-authored-by: Saqib <nextchamp.saqib@gmail.com>	2021-09-16 19:33:57 +05:30
Saqib	5eba1ccd51	fix: no validation on item defaults (#27393) ... * fix: no validation on item defaults * fix: cache value while validating * test: item default company relation * fix: reorder validations * refactor: add guard conditions on update_defaults * test: add default warehouse for item group * fix: validate item defaults for item groups Co-authored-by: Ankush Menat <ankush@iwebnotes.com>	2021-09-16 17:31:37 +05:30
Marica	9b388883d3	fix: Validate if item exists on uploading items in stock reco (#27538) ... * fix: Validate if item exists on uploading items in stock reco - Uploading non existent item in stock reco and then changing warehouse or batch gave an error - Check for non existent item * chore: translation Co-authored-by: Ankush Menat <ankushmenat@gmail.com>	2021-09-16 15:47:17 +05:30
Ankush Menat	78fe92542c	fix(ProdPlan): Get SubAssy Items does not work (#27537) ... * fix(ProdPlan): Get SubAssy Items does not work This button wasn't working unless the document was saved already. * fix: make form dirty when subassy item are fetched	2021-09-16 15:34:50 +05:30
Subin Tom	11bd42467e	Update erpnext/erpnext_integrations/taxjar_integration.py ... Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>	2021-09-16 14:42:15 +05:30
Subin Tom	435a5e4fa3	Update erpnext/erpnext_integrations/doctype/taxjar_settings/taxjar_settings.js ... Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>	2021-09-16 14:42:06 +05:30
Subin Tom	486d7c3a39	Update erpnext/erpnext_integrations/doctype/taxjar_settings/taxjar_settings.py ... Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>	2021-09-16 14:41:48 +05:30
Subin Tom	0e527311b9	Update erpnext/erpnext_integrations/taxjar_integration.py ... Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>	2021-09-16 14:41:38 +05:30
Rucha Mahabal	866763c16a	fix(minor): Employee filter in Unpaid Expense Claims report (#27530)	2021-09-16 00:05:16 +05:30
rohitwaghchaure	e6a1ad8016	fix: not able to submit stock entry with 350 items (#27523)	2021-09-15 20:42:47 +05:30
Ankush Menat	70c203d19e	test: automated test for running all stock reports (#27510) ... * test: automated test for running all stock reports These test do not assert correctness, they just check that "execute" function is working with sane filters. * test: make report execution test modular	2021-09-15 19:24:35 +05:30
Frappe PR Bot	29dab0699c	fix(minor): Remove b2c limit check from CDNR Invoices (#27516) (#27520) ... * fix(minor): Remove b2c limit check from CDNR Invoices * fix: Remove unnecessary format (cherry picked from commit 978028c880445362afc0cfca9118424174541cc7) Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>	2021-09-15 19:12:02 +05:30
Noah Jacob	5e0b21582a	fix: table data deleted on submitted maintenance schedule (#27513)	2021-09-15 17:37:52 +05:30
Frappe PR Bot	d4d5e2786f	fix: Maintain same rate in Stock Ledger until stock become positive (#27227) (#27478) ... * fix: Maintain same rate in Stock Ledger until stock become positive * fix: Maintain same rate in Stock Ledger until stock become positive (cherry picked from commit 10754831c33b3459d5a45c98f875afa48a444627) Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-09-15 17:07:58 +05:30
rohitwaghchaure	c5a77f60ed	feat: provision to add scrap item in job card (#27483)	2021-09-15 16:45:57 +05:30
Frappe PR Bot	6e7945fbb7	fix: Tags getting fetched correctly in Get Supplier in RFQ (Request For Quotation) (#27499) (#27506) ... * fix: Tags getting fetched correctly in Get Supplier in RFQ( Request For Quotation ) #26343 * fix: Linting issues * fix: remove unnecessary caching [skip ci] Co-authored-by: Vama Mehta <vama.mehta@inqubit.in> Co-authored-by: Ankush Menat <ankush@iwebnotes.in> (cherry picked from commit 50fe23308acad58ab2db2056ea6dd163913725ef)	2021-09-15 11:10:11 +05:30
Deepesh Garg	759f2b7920	fix: Autoname for customer and supplier (#27398)	2021-09-15 10:24:26 +05:30
Deepesh Garg	625626b973	fix: Values with same account and different account number in consolidated balance sheet report (#27493)	2021-09-15 10:10:54 +05:30
rohitwaghchaure	2e2985e4f1	fix: calculate operating cost based on BOM Quantity (#27464) ... * fix: calculate operating cost based on BOM Quantity * fix: added test cases	2021-09-15 00:37:41 +05:30
Subin Tom	3bb60a439a	fix: sales_tax attribute in api call before submit	2021-09-14 22:04:57 +05:30
Subin Tom	b01fe1c3e2	fix: TaxJar update - nexus, selective api call	2021-09-14 20:42:47 +05:30
Deepesh Garg	c53b78e712	fix: Patch for updating tax withholding category dates (#27489)	2021-09-14 20:28:48 +05:30
Ankush Menat	fea51f4082	chore: isort ... [skip ci]	2021-09-14 19:04:47 +05:30
Marica	de9f78350b	Merge branch 'develop' into job-card-excess-transfer	2021-09-14 16:50:06 +05:30
marination	469bb8d977	test: Work Order Material Transfer against Job Card ... - Tests for multiple items transfer and excess transfer against JC - Remove unused __future__ imports - Changed Copyright year - Sider: (js) Added space before if	2021-09-14 16:27:39 +05:30
Ahmad	8a42570c96	refactor(regional): moved methos to region specific utils for KSA	2021-09-14 14:45:23 +05:00
Ahmad	de01066ef5	Update erpnext/regional/saudi_arabia/setup.py ... Method name updated Co-authored-by: Saqib <nextchamp.saqib@gmail.com>	2021-09-14 14:29:45 +05:00
Ahmad	0950713e4c	Update erpnext/regional/saudi_arabia/setup.py ... Method name updated Co-authored-by: Saqib <nextchamp.saqib@gmail.com>	2021-09-14 14:29:33 +05:00
Ahmad	6985ca210e	Refactor erpnext/regional/__init__.py ... Co-authored-by: Saqib <nextchamp.saqib@gmail.com>	2021-09-14 14:28:57 +05:00
Ahmad	b5b61b3a3d	Update erpnext/regional/report/ksa_vat/ksa_vat.py ... String made translatable Co-authored-by: Saqib <nextchamp.saqib@gmail.com>	2021-09-14 14:26:44 +05:00
DeeMysterio	aa82624f31	Merge pull request #27281 from DeeMysterio/party-specific-items ... feat: link items to supplier / customer	2021-09-14 13:58:18 +05:30
Shariq Ansari	9aa6f52edd	fix: Webform Permission for custom doctype (#26232) ... * fix: Webform Permission for custom doctype * fix: sider fix * fix: app check condition for getting correct list_context * chore: Better naming convention * test: Added test case to check permission for webform of custom doctype * chore: linting issue * chore: linting issue * fix: sider fix * test: minor changes * chore: linter and better naming method * chore: linter fix Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-09-14 12:49:08 +05:30
marination	9520215e2b	feat: Handle Excess/Multiple Item Transfer against Job Card ... - Hide MR/Material Transfer buttons in JC if cancelled - Show MR/Material transfer buttons if pending to transfer or excess transfer allowed - Renamed ‘Transferred Qty’ to ‘FG Qty from Transferred Raw Materials’ in JC - Set status to Completed in JC in case of excess transfer too - During excess transfer against JC, avoid negative ‘For Quantity’. Set to 0 instead - Job card section and excess transfer allowance checkbox in Manufacturing Settings - Renamed ’Allow Multiple Material Consumption’ to ‘Allow Continuous Material Consumption’ (fiedname is same) - Secured denominator variables in `get_transfered_raw_materials` to avoid ZeroDivisionError	2021-09-14 12:33:21 +05:30
Chillar Anand	95460d9818	fix(HR): Ignore invalid fields when updating employee details (#27456)	2021-09-14 12:00:34 +05:30
Faris Ansari	1c1b476d67	perf: Optimize get_attribute_filters (#26729) ... * perf: Optimize get_attribute_filters * fix: handle when filter attributes are undefined * chore: unused imports Co-authored-by: Ankush Menat <ankush@iwebnotes.com>	2021-09-14 11:41:19 +05:30
Rucha Mahabal	b98740b44a	fix: employee advance return through multiple additional salaries (#27438) ... * fix: employee advance return through multiple additional salaries * test: test repay unclaimed amount from salary * fix: sorting in imports	2021-09-14 11:20:15 +05:30
Deepesh Garg	c7ceb37b63	Merge pull request #27465 from nextchamp-saqib/so-analytics-report-fix ... fix: cancelled sales invoices are considered in billed qty calculation	2021-09-14 10:05:36 +05:30
Saqib Ansari	44139fbac5	fix: cancelled sales invoices are considered in billed quantity calculation	2021-09-13 16:50:11 +05:30
Saqib	a5baf909b7	fix: editable price list rate field in sales transactions (#27455)	2021-09-13 15:50:20 +05:30
Rucha Mahabal	bab644a249	fix(Payroll): incorrect component amount calculation if dependent on another payment days based component (#27349) ... * fix(Payroll): incorrect component amount calculation if dependent on another payment days based component * fix: set component amount precision at the end * fix: consider default amount during taxt calculations * test: component amount dependent on another payment days based component * fix: test	2021-09-13 13:24:27 +05:30
Saqib	7292f5476d	feat: (get_items_from) filter material request item in purchase order (#27449)	2021-09-13 12:13:43 +05:30
Ankush Menat	d743c41b54	fix(ux): apply proper filtering in stock reports (#27411) ... * fix(ux): apply proper filtering in stock reports Stock Balance: apply company filter to warehouse field Stock Ageing: apply company filter to warehouse field * fix: unnecessary parens Co-authored-by: Alan <2.alan.tom@gmail.com>	2021-09-12 16:38:18 +05:30
Ankush Menat	6ef879fca2	fix(ux): clean invalid fields from variant setting (#27412)	2021-09-12 16:36:51 +05:30
Frappe PR Bot	a52d4c25ff	fix: fail migration due to None type during v13_0.update_returned_qty_in_pr_dn (#27430) (#27436) ... * fix: fail migration due to None type * fix: incorrect key: value pair in filter. Co-authored-by: Ankush Menat <ankush@iwebnotes.com> (cherry picked from commit becf471a3a238cfaa20a8940e0106c7e0e0386c2) Co-authored-by: Devin Slauenwhite <devin.slauenwhite@gmail.com>	2021-09-11 17:54:55 +05:30
Sagar Vora	dae0a1c1d6	fix: Template Error due to use of single quote (#27433)	2021-09-11 17:54:21 +05:30
Ankush Menat	62fc544280	test: basic tests for controllers/queries (#27422)	2021-09-10 12:46:35 +05:30
Anuja Pawar	a58e309297	fix: fix to fetch customers and billing email in PSOA (#27363)	2021-09-09 19:37:52 +05:30
Subin Tom	8b4c57ee09	fix: pos payment mode selection issue (#27409)	2021-09-09 19:33:34 +05:30
Anupam Kumar	7edac5a5d7	fix: removing duplicate currency() from sales_invoice.js (#27410)	2021-09-09 19:17:01 +05:30
Noah Jacob	acdb10377f	refactor: .doc missing and empty row on new doc (#27408) ... * refactor: .doc missing and empty row on new doc * fix: let -> const	2021-09-09 18:54:00 +05:30
Ankush Menat	678335f8ac	fix: job card overlap unknown column jc.employee (#27403) ... * fix: incorrect query for job card overlap * test: employee overlap in job cards * test: simplify/refactor job card tests	2021-09-09 12:24:23 +05:30
Deepesh Garg	9104796eb8	Merge pull request #27258 from deepeshgarg007/tds_validity ... feat: Validity dates in Tax Withholding Rates	2021-09-09 12:17:36 +05:30
Anuja Pawar	3576668638	fix: added Show Remarks checkbox in AR & AP reports (#27374)	2021-09-09 11:57:29 +05:30
Deepesh Garg	e7e2ce1271	fix: Linting Issues	2021-09-09 11:36:57 +05:30
Deepesh Garg	c33bbd4f39	fix: Test Case	2021-09-09 11:13:29 +05:30
rohitwaghchaure	295020451f	fix: added delivery date filters to get sales orders in production plan (#27367)	2021-09-08 19:28:30 +05:30
Alan	81d3524d27	fix: auto complete sales order rows in production plan (#27352) ... * fix: auto complete sales order rows in production plan * fix: sider	2021-09-08 16:48:42 +05:30
Saqib	9c27f9be1e	fix: document naming rule not working for subscription invoices (#27386)	2021-09-08 16:47:04 +05:30
Dany Robert	fa819f2fb0	fix: General Ledger translation issues (#27298) ... * fix: remove translations from GL report options Options need not be translated, their display label gets translated client side. * fix: make group by options translatable * ci: semgrep rule for translated options in report Co-authored-by: Ankush Menat <ankush@iwebnotes.com>	2021-09-08 16:28:05 +05:30
Saqib	df3e4ce1c0	fix: scan barcode fields input length (#27389) ... * fix: undo unintentional changes * fix: scan barcode fields input length	2021-09-08 16:04:13 +05:30
Deepesh Garg	ee1486209d	Merge branch 'develop' of https://github.com/frappe/erpnext into tds_validity	2021-09-08 11:33:42 +05:30
Marica	61a1356109	fix: Check if Item is serialised before trying to fetch SN and set SO in it (#27358)	2021-09-07 14:42:17 +05:30
rohitwaghchaure	058d98342a	fix: missed to add voucher_type, voucher_no to get GL Entries (#27368) ... * fix: missed to add voucher_type, voucher_no to get gl entries * test: get voucherwise details utilities Co-authored-by: Ankush Menat <ankush@iwebnotes.com>	2021-09-07 12:14:40 +05:30
Deepesh Garg	8f6d22b7ea	Merge pull request #27373 from deepeshgarg007/gstin_filter_issue ... fix: GSTR-1 Reports not showing any data	2021-09-07 11:09:14 +05:30
Deepesh Garg	6dfcc1e2ae	fix: Remove print and debug	2021-09-07 11:08:30 +05:30
Deepesh Garg	e1f55df4d7	fix: GSTR-1 Reports not showing any data	2021-09-07 11:07:22 +05:30
Mohammed Yusuf Shaikh	d795e55694	feat(CRM): Sales Pipeline Analytics Report and Opportunity Summary by Sales Stage Report (#26639) ... * feat: Sales Pipeline Analytics Report * fix: sider Issues and added tests * fix: Semgrep Issue * feat: Opportunity Summary by Sales Stage Report * fix: add some checks and tests * fix: sider issues and test * fix: additional checks for error handling and minor changes * fix: remove unused conditions * fix: Changes mentioned on PR * fix: currency conversions and other changes * fix: remove unused imports * fix: correction for failing test case * fix: recorrected failing test case * fix: sider issues and resolve test case errors * fix: rewrite query using query builder * fix: test case changes * fix: sider fixes and other changes * fix: clear data before running test * fix: test case fixed * refactor: code formatting - smaller functions - variable and function naming * refactor: improve code formatting * fix: linter issues * fix: linter issues * fix: change indentation to tabs * fix: linter issues * fix: naming, code formatting * fix: quarterly values not showing up in Sales Pipeline Analytics * fix: typo in tests Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2021-09-07 10:49:34 +05:30
Ahmad	69470fc15a	Merge branch 'develop' into ksa-vat	2021-09-07 00:02:12 +05:00
Anupam Kumar	88c9fe35bd	fix: employee remider settings (#27365)	2021-09-07 00:15:58 +05:30
Ahmad	87380d021d	feat(regional): QR Code generation for Saudi Arabia Sales Invoices	2021-09-06 23:36:55 +05:00
Ahmad	b42d63e526	Merge remote-tracking branch 'refs/remotes/havenir/ksa-vat' into ksa-vat	2021-09-06 23:26:52 +05:00
Ahmad	cb0c2d1477	feat(Regional): KSA VAT Report	2021-09-06 23:25:20 +05:00
ChillarAnand	c8565c7090	chore: Removed healthcare module code in other modules	2021-09-06 20:47:27 +05:30
Anupam Kumar	b0d970001a	feat: multi-currency in Opportunity (#26590) ... * feat: multi-currency * refactor: lead form * fix: test case for opportunity item * fix: removing local changes * fix: test cases * fix: test cases * fix: review changes * fix: reverting lead.json chnages * fix: toggle display for currency fields * review changes * fix: test case * fix: linter issues * fix: unused import * feat: grand total in opportunity * fix: patch * fix: sort imports * fix: reload opportunity item doctype Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2021-09-06 16:54:28 +05:30
Florian HENRY	aa7ee3ca03	fix: link in dashboard missing on SI from DN	2021-09-06 11:40:44 +02:00
Ankush Menat	14b01619de	fix: patch failure for vat audit report (#27355)	2021-09-06 13:47:56 +05:30
Marica	0f2a52078c	fix: Dont fetch Stopped/Cancelled MRs in Stock Entry Get Items dialog (#27326)	2021-09-06 13:14:09 +05:30
Deepesh Garg	25d208aa8a	fix: GL Entries on advance TDS allocation	2021-09-06 10:37:41 +05:30
Dany Robert	f46022993c	Merge branch 'develop' into currency-exchange-settings	2021-09-05 19:50:19 +05:30
Deepesh Garg	51d9572fe7	fix: Hardcode fiscal year and posting date	2021-09-05 17:56:12 +05:30
Deepesh Garg	ceaa804f04	fix: Presentation currency conversion in reports (#27316)	2021-09-05 17:21:29 +05:30
Dany Robert	c8d313b992	Merge branch 'develop' into currency-exchange-settings	2021-09-04 17:57:05 +05:30
rtdany10	06340ad08a	feat: button to restore default settings	2021-09-04 17:53:51 +05:30
rtdany10	227466c365	chore: clean up layout and code	2021-09-04 14:04:56 +05:30
rohitwaghchaure	7b4a65484a	fix: manually added weight per unit reset to zero after save (#27330)	2021-09-03 22:00:14 +05:30
Ankush Menat	73b3a2f685	chore: whitespace	2021-09-03 21:57:38 +05:30
Deepesh Garg	092d41ecda	fix: Debug CI	2021-09-03 20:04:18 +05:30
rtdany10	a86d9c91d0	chore: code clean up	2021-09-03 19:21:06 +05:30
Deepesh Garg	41392acd18	Merge branch 'develop' of https://github.com/frappe/erpnext into tds_validity	2021-09-03 19:19:35 +05:30
Dany Robert	d56c8d44a6	Merge branch 'develop' into currency-exchange-settings	2021-09-03 18:47:12 +05:30
rtdany10	d8b8032de1	feat: init CES default values	2021-09-03 15:50:05 +05:30
rtdany10	e093863c9e	feat: fetch api details from settings	2021-09-03 15:03:47 +05:30
Deepesh Garg	8f5a77446e	Merge pull request #27279 from deepeshgarg007/gstr_1_cdnr_unregistered_json_develop ... feat: CDNR Unreg json generation	2021-09-03 13:55:00 +05:30
Deepesh Garg	a06a70d1a4	fix: Patch error and tests	2021-09-03 13:13:37 +05:30
Deepesh Garg	79d250845e	fix: Patch	2021-09-03 13:13:37 +05:30
Deepesh Garg	2b34028acd	fix: Patch and linting errors	2021-09-03 13:13:37 +05:30
Ganga Manoj	64fcd1a092	fix: make datetime objects readable (#27301) ... * fix: Make datetime objects readable * fix: Remove unused imports	2021-09-03 12:54:47 +05:30
Subin Tom	798b464ee3	fix: braintree payment processed twice (#27300)	2021-09-03 12:30:57 +05:30
Saqib	98696c0ec9	Merge pull request #27306 from GangaManoj/fix-selling-settings ... fix: Move related fields together in Selling Settings	2021-09-03 12:30:02 +05:30
Ankush Menat	d1fe060e4a	fix: south africa vat patch failure (#27323) ... reload doc is necessary on new doctypes	2021-09-03 12:02:32 +05:30
Shariq Ansari	e68c55ce83	fix: Removing first Spacer from home page (#27321)	2021-09-03 11:00:33 +05:30
ChillarAnand	66e92d423e	chore: Added healthcare deprecation warning patch	2021-09-02 20:02:11 +05:30
rtdany10	ff19113677	feat: currency exchange settings	2021-09-02 19:52:12 +05:30
ChillarAnand	e913e277d9	chore: Rename imports from erpnext to healthcare	2021-09-02 19:47:39 +05:30
GangaManoj	ebdc568e85	fix: Rename 'Action if Same Rate is Not Maintained' to 'Action if Same Rate is Not Maintained Throughout Sales Cycle'	2021-09-02 19:32:51 +05:30
Deepesh Garg	e1fffdb262	fix: Linting issues	2021-09-02 19:10:49 +05:30
Deepesh Garg	c85242e03d	Merge branch 'develop' of https://github.com/frappe/erpnext into gstr_1_cdnr_unregistered_json_develop	2021-09-02 18:59:59 +05:30
Deepesh Garg	e8a5dc371b	fix: Add payment entry custom fields	2021-09-02 18:56:04 +05:30
ChillarAnand	5d4133ecac	chore: Removed healthcare demo, patch files	2021-09-02 18:25:36 +05:30
ChillarAnand	bcb3f0fedb	chore: Removed healthcare module	2021-09-02 18:14:34 +05:30
Ankush Menat	eec40513be	fix: minor linting issues (#27314) ... * fix: syntax error in gratuity * fix: unpacking None into three variables * fix: unexpected kwarg for delete_accounting_dimensions	2021-09-02 17:42:45 +05:30
Ankush Menat	60185c8c71	chore: linting ... [skip ci]	2021-09-02 17:36:05 +05:30
Chillar Anand	915b34391c	chore: Clean up imports (#27302) ... * chore: Added isort to pre-commit config * chore: Sort imports with isort * chore: Clean up imports with pycln * chore: Sort imports with isort * chore: Fix import issues * chore: Clean up sider issues * chore: Remove import errors from flake8 ignore list * chore: Clean up lint issues	2021-09-02 16:44:59 +05:30
Ankush Menat	b25d28e023	fix(patch): delete stale shopify doctypes (#27313)	2021-09-02 14:53:06 +05:30
Saqib	366012817f	Merge branch 'develop' into fix-selling-settings	2021-09-02 11:13:52 +05:30
Saqib	a158b825fc	Merge pull request #27124 from GangaManoj/gross-profit-product-bundle ... feat: Improve Product Bundle handling	2021-09-02 11:12:56 +05:30
Devin Slauenwhite	43c476ddf7	fix: (Backport-develop) track salary slip ytd gross salary. (#27242) ... * fix: track salary slip ytd gross salary. * fix: ytd gross salary unique label * Revert "fix: ytd gross salary unique label" This reverts commit a68b387ac21e32c250d042caf75ef301b5a49a1a. * fix: gross ytd salary unique label	2021-09-02 09:39:35 +05:30
Anupam Kumar	c25367f107	Merge pull request #27292 from anupamvs/comany-name-field-issue-develop ... fix: mapping for company name lead->contact	2021-09-02 09:32:47 +05:30
Rucha Mahabal	f828d853e3	fix: Org Chart fixes (#27290) ... * fix(org chart): multiple root nodes not expanding on clicking Expand All * fix: unstable filter inserts duplicate nodes	2021-09-01 23:07:26 +05:30
GangaManoj	799d67d785	fix: Only display 'Role Allowed to Override Stop Action' if 'Maintain Same Rate Throughout Sales Cycle' is checked	2021-09-01 22:55:10 +05:30
GangaManoj	f2a7fbd126	fix: Remove redundant description	2021-09-01 22:49:05 +05:30
GangaManoj	06484321d1	fix: Move related fields to the same section	2021-09-01 22:48:09 +05:30
Deepesh Garg	d5a736d11e	test: Update test case	2021-09-01 21:15:24 +05:30
Ankush Menat	dea5c34d8d	chore: whitespace	2021-09-01 19:59:22 +05:30
Ankush Menat	81eb6fde07	Merge pull request #27288 from ankush/strict_linting ... chore: cleanup linting errors and introduce strict linting checks	2021-09-01 19:32:49 +05:30
Raffael Meyer	605f73b4d4	feat: add voucher-specific data to DATEV export (bp #26589) (#27287) ... * feat: add voucher-specific data to datev export * refactor: def instead of lambda	2021-09-01 19:27:54 +05:30
rohitwaghchaure	2a8cd05b44	fix: production plan UX and validation message (#27278)	2021-09-01 19:16:03 +05:30
Marica	9506c14d35	fix: Zero division error while fetching unconsumed materials (#27293) ... `	2021-09-01 18:49:12 +05:30
Jannat Patel	696fa6c8fe	Merge branch 'develop' into comany-name-field-issue-develop	2021-09-01 18:25:46 +05:30
Anupam	821f6a6178	fix: mapping for company name lead->contact	2021-09-01 17:49:05 +05:30
Ankush Menat	b147b85e6a	chore: whitespace / eof fixes	2021-09-01 16:57:21 +05:30
Ankush Menat	e46567192a	fix: invalid escape sequences in regex	2021-09-01 16:57:17 +05:30
GangaManoj	bc79084dac	fix: Add Product Bundle field in Items table	2021-09-01 16:06:47 +05:30
GangaManoj	bbb9fa4bf8	fix: Remove Rate from field_no_map	2021-09-01 16:00:59 +05:30
GangaManoj	471fd9718c	fix: Set Product Bundle's Delivery Dates in SO as Bundle Items' Delivery Dates in PO	2021-09-01 15:36:07 +05:30
Ankush Menat	55b24345a0	fix: remove unused format from query ... doctype is not used in query and parent alone is enough to identify packed items.	2021-09-01 15:33:37 +05:30
Ankush Menat	7d9819f352	fix: remove duplicate imports	2021-09-01 15:33:35 +05:30
GangaManoj	4d8f833cc9	fix: Remove Add Row and Delete Row options for Packed Items table	2021-09-01 15:20:40 +05:30
GangaManoj	17a6a9b036	fix: Uncheck read-only for Packed Items table	2021-09-01 15:13:29 +05:30
GangaManoj	816ba55b74	fix: Make Rate read-only by default	2021-09-01 15:11:08 +05:30
Ankush Menat	2d62c500c4	fix: undefined variables	2021-09-01 15:05:00 +05:30
Ankush Menat	9fec0a5c68	refactor: itemgetter instead of assigned lambda	2021-09-01 15:02:29 +05:30
Ankush Menat	010060d92e	chore: correct indentation	2021-09-01 15:02:29 +05:30
Ankush Menat	694ae81618	fix: remove bare excepts	2021-09-01 15:02:28 +05:30
Alan	9dc0843cbd	fix: translate labels (#27282) ... [skip ci]	2021-09-01 12:58:34 +05:30
Deepesh Garg	8b644d8889	fix: Report and JSON generation for Advances received	2021-09-01 10:28:15 +05:30
Deepesh Garg	5e22405c45	feat: CDNR Unreg json generation	2021-09-01 10:26:55 +05:30
Deepesh Garg	b6d0b17ed6	fix: Linting and patch fixes	2021-09-01 10:11:18 +05:30
Deepesh Garg	d06221ad7a	fix: Advance TDS test case	2021-09-01 10:05:10 +05:30
GangaManoj	0e457265b7	fix: Test Product Bundle price calculation	2021-09-01 02:50:29 +05:30
GangaManoj	0c3d3bb357	fix: Test if Product Bundles are mapped properly on creating a Sales Order	2021-09-01 02:33:53 +05:30
GangaManoj	912bfb234f	fix: Test if Product Bundles in SOs are replaced with their child items on creating POs	2021-09-01 02:09:46 +05:30
Ganga Manoj	82118975e2	Merge branch 'develop' into gross-profit-product-bundle	2021-08-31 22:08:10 +05:30
Rucha Mahabal	ef76f62bc1	fix: Healthcare Service Unit fixes (#27273) ... * fix: validate service unit setup against practitioner schedule * fix: service unit properties getting overwritten	2021-08-31 21:06:53 +05:30
GangaManoj	65796853f3	fix: Map Packed Items to Items table of PO	2021-08-31 20:31:22 +05:30
Ankush Menat	c1d986a0c6	fix: revert "refactor: simplify initialize_previous_data" (#27270) ... This reverts commit 2f5624e588541103adb4a3170f2886590dcee42e.	2021-08-31 19:43:42 +05:30
Afshan	763450dcf8	Revert "fix: add child item groups into the filters (#26997)" (#27266) ... This reverts commit c60d5523bc.	2021-08-31 19:07:20 +05:30
Frappe PR Bot	81fb493850	fix: payment terms on Sales Order when Invoice Portion field is empty (#27259)	2021-08-31 19:01:03 +05:30
Anuja Pawar	3e404f15ff	refactor: payment reconciliation tool (#27128)	2021-08-31 18:59:29 +05:30
Deepesh Garg	c37cec9b9d	fix(minor): Incorrect unallocated amount on type receive (#27262)	2021-08-31 18:50:23 +05:30
GangaManoj	eb24e87637	fix: Replace Product Bundles in the Items table with their child items	2021-08-31 18:44:29 +05:30
Frappe PR Bot	6281c33dd4	fix: pos payment methods not setting rounded_total (#27260)	2021-08-31 18:39:51 +05:30
Subin Tom	7004944cc0	feat: Taxjar Integration update (#27143) ... * feat: Taxjar Integration update * added taxable_amount,taxable_amount fields in setup.py * Update taxjar_integration.py Sider issues fix * Sider issues fix * Sider issues fix * sider issue fix: unused import * sider issue fix * Update erpnext/erpnext_integrations/taxjar_integration.py Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com> * Removed permission for 'All' Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>	2021-08-31 18:33:16 +05:30
Deepesh Garg	5e10e10329	feat: Validity dates in Tax Withholding Rates	2021-08-31 18:23:28 +05:30
Anurag Mishra	ab47409e91	feat: Full and Final Settlement and Gratuity Fix (#26364) ... * feat: Full and Final Settlement * removed option to pay via salary slip * feat: Create JV * test:fnf * fix: tracking asset movement * fix: sider and test * fix: changes Requested * fix: changes requested * fix: valication for Asset * fix: add filter for reference document only if relevant field is present * fix: doctype cleanup - add more fields to the list view and standard filter - set title field - incorrect field labels * feat: add list view settings for FNF * fix: incorrect reference type set in Journal Entry * fix: validation message * chore: add Full and Final Statement link to Workspace Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2021-08-31 17:59:26 +05:30
Jannat Patel	48f2e5ac1d	fix: email digest original_user issue (#27191)	2021-08-31 17:43:30 +05:30
Frappe PR Bot	e958ae9002	feat: color and leave type in leave application calendar (#27246) (#27255) ... * feat: color and leave type in leave application calendar * fix: sider + use cstring (cherry picked from commit 366eb86fdfd9bb204bce677b01b8d5bb5ffa4d6d) Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>	2021-08-31 17:34:48 +05:30
Dany Robert	94dcbf851a	fix: update get_exchange_rate for test mode (#26847) ... * fix: no api calls on test mode * fix: make api call, but return 1.0 incase of invalid currency * feat: patch request.get * fix: clear cache after test * fix: add missing test_exchange_value * fix: avoid api call in implicit function call during test * fix: returning 1 while in test causes failure Returning 1.00 causes failure of exchange rate tests. * chore: retab * chore: style	2021-08-31 17:19:12 +05:30
Alan	88aa7b824e	fix: pass labels through translation function (#27252)	2021-08-31 15:16:04 +05:30
Chillar Anand	88d849320f	fix(payroll): Fixed issue with accessing last salary slip for new employee (#27247)	2021-08-31 14:42:21 +05:30
GangaManoj	a067d55865	fix: Add Product Bundle field in Items table	2021-08-30 20:07:06 +05:30
GangaManoj	055ac82b39	fix: Remove Bundle Items table	2021-08-30 20:04:24 +05:30
Rucha Mahabal	1682402a9f	refactor: Healthcare Redesign Changes (#27236)	2021-08-30 18:26:56 +05:30
Dany Robert	5fd04101d4	fix: Stock Ageing report issues for serialized items (#27228) ... * fix: incorrect calculation in get_range_age * fix: remove serial numbers not in stock from fifo_queue * refactor: make serial_no condition explicit * refactor: reduce code duplication Co-authored-by: Ankush Menat <ankush@iwebnotes.com>	2021-08-30 18:11:33 +05:30
Deepesh Garg	fd467e6d32	fix: Correct company address not getting copied from Purchase Order to Invoice (#27217) ... * fix: Correct company adderess not getting copied from Purchase Order to Invoice * fix: Linting issues	2021-08-30 17:53:59 +05:30
Ankush Menat	7d2a0fe38e	Merge pull request #27197 from marination/supplier-primary-address ... feat: (consistency) Add Primary Address and Contact section in Supplier	2021-08-30 14:03:09 +05:30
Subin Tom	9cb642238f	fix: expense claim reimbursed amount update (#27204)	2021-08-30 13:17:22 +05:30
Rucha Mahabal	212eb4bc1a	feat(Healthcare): Capacity for Service Unit, concurrent appointments based on capacity, Patient Appointments (#27219) ... * feat(Healthcare): Capacity for Service Unit, concurrent appointments based on Capacity, Patient enhancements * fix: appointment test Co-authored-by: Anoop <3326959+akurungadam@users.noreply.github.com>	2021-08-30 13:10:18 +05:30
Marica	fbcf82f788	Merge branch 'develop' into supplier-primary-address	2021-08-30 12:51:37 +05:30
marination	7b78473da3	fix: Indentation and removed f-strings ... - Sider: fixed indentation in js - Dont use f-strings in queries	2021-08-30 12:50:24 +05:30
Deepesh Garg	f5cdbf161d	fix: LTV ratio comparison (#27207)	2021-08-28 14:55:51 +05:30
François de Ryckel	327071cb90	replace cur_frm with frm (#27210)	2021-08-28 14:55:11 +05:30
GangaManoj	e44567754d	fix: Display Packed/Bundle Items table only if it exists	2021-08-27 20:16:13 +05:30
GangaManoj	a2b394b195	fix: Enable Print Hide for Bundle Items	2021-08-27 20:06:22 +05:30
GangaManoj	a7be02fe32	fix: Only add Item to packed_items list if it's not already there	2021-08-27 20:02:36 +05:30
Devin Slauenwhite	072151e16d	feat: Payment reconciliation on accounts module workspace (#25925) ... * feat: add payment reconciliation to accounting workspace * fix: update modified and duplicate the link Co-authored-by: Ankush Menat <ankush@iwebnotes.com>	2021-08-27 19:44:57 +05:30
marination	2a3ef03388	fix: Popup stale build and data consistency ... - Include `supplier_quick_entry.js` in erpnext.bundle.js - Create primary supplier address on update - Set newly created address (quick entry) in Supplier and Customer - Clear address set in supplier and customer on delete (dependency)	2021-08-27 18:06:51 +05:30
Shadrak Gurupnor	7433757489	fix: patches were breaking during migration (#27200) ... * fix: patches were breaking during migrating * fix: patches were breaking during migration	2021-08-27 18:00:16 +05:30
Rucha Mahabal	5f3ec8230f	Merge pull request #27102 from anupamvs/prospect ... feat(CRM): Prospect to group Leads	2021-08-27 16:48:41 +05:30
Shadrak Gurupnor	17e0fa7a8b	fix: patches were breaking while migrating (#27195) ... * fix: patches were breaking while migrating * fix: Removed duplicate function Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-08-27 16:42:25 +05:30
Rucha Mahabal	e170ad2df3	chore: add more fields to Prospect list view	2021-08-27 16:26:12 +05:30
Anupam Kumar	212921aace	Merge branch 'develop' into prospect	2021-08-27 15:57:10 +05:30
marination	bf72ec0598	feat: (consistency) Add Primary Address and Contact section in Supplier ... - The same is present in customer and is inconsistent with supplier - Helps quickly create primary address and contact via quick entry	2021-08-27 15:51:31 +05:30
Kamal Johnson	a285b5b78b	feat: Accounts, Selling & Assets Onboarding cleanup (#27112) ... * refactor: company form fields arrangement * refactor: accounts onboarding steps * refactor: re-arrange fields & modify labels in company form * feat: onbording steps for accounts module * fix: updated onboarding steps for selling module * fix: remove unwanted steps from accounts * feat: add more onboarding steps * feat: Refactor onboarding-module for accounting workspace * feat: Add basic asset onboarding steps * feat: Add basic asset item form tour * feat: Add basic selling onboarding-steps * feat: Add basic form tour for purchase recipt * feat: Add basic form tour for existing asset * feat: Adding asset category form tour * feat: Add form tour for asset category * feat: Refactor sales taxes and charges template form tour with new method * refactor: Remove old form tour for accounts settings * refactor: Change asset category form tour with new tour method * refactor: Change asset item form tour with new tour method * refactor: Change purchase receipt form tour with new tour method * refactor: Change asset form tour with new tour method * refactor: Remove old form tour for selling settings * refactor: general fix/typo in onboarding steps * Apply suggestions from code review Co-authored-by: Nabin Hait <nabinhait@gmail.com> * refactor: Remove old form tour method for sales order. * fix: removed duplicate section break * fix: Removed duplicate fields Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com> Co-authored-by: Anuja <anuja.pawar20@gmail.com> Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com> Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-08-27 15:47:11 +05:30
Saqib	08188f2ac7	Merge branch 'develop' into gross-profit-product-bundle	2021-08-27 15:41:41 +05:30
Saqib	987746592c	fix: period closing voucher tests (#27198)	2021-08-27 15:41:26 +05:30
Saqib	8008598eb2	Merge branch 'develop' into gross-profit-product-bundle	2021-08-27 14:48:54 +05:30
Anupam	d701ad5313	fix: using frm instead of cur_frm	2021-08-27 13:09:52 +05:30
Rucha Mahabal	71b7c63ec0	feat: Ability to schedule onboarding and separation activities (#26738) ... * refactor: employee onboarding form clean-up * feat: ability to schedule onboarding / separation tasks * feat: skip holidays while setting boarding activity dates * chore: remove unused child table - Employee Onboarding Activity * fix: tests * fix: employee separation test	2021-08-27 11:12:24 +05:30
rohitwaghchaure	e6799d78ef	fix: operation time auto set to zero (#27188)	2021-08-27 10:46:45 +05:30
GangaManoj	535dd2d36d	fix: Move Packed Items table right below the Items table	2021-08-27 02:47:11 +05:30
GangaManoj	4353c5e339	fix: Disable Add Row and Delete Row for Bundle Items	2021-08-27 02:32:34 +05:30
GangaManoj	bdbd4f83ab	fix: Create separate section for Bundle Items	2021-08-27 02:29:47 +05:30
GangaManoj	20cfe60e84	feat: Populate Bundle Items table	2021-08-27 01:49:58 +05:30
GangaManoj	efd8a8b28e	feat: Add Bundle Items table	2021-08-27 01:49:28 +05:30
GangaManoj	681c92d646	fix: Make Sales Order field editable so the PO can be linked with an SO later	2021-08-27 01:48:46 +05:30
GangaManoj	c33f5cad01	fix: Hide Rate of Bundle Items while printing	2021-08-27 01:21:52 +05:30
GangaManoj	99e6e2ce3f	fix: Make Rate column read only by default	2021-08-27 01:15:01 +05:30
GangaManoj	6c03af815e	fix: Display Bundle Items right below the Items table	2021-08-27 01:14:23 +05:30
GangaManoj	e506cd6a2f	fix: Enable Fetch If Empty for Rate	2021-08-27 01:06:48 +05:30
GangaManoj	d4405c5e52	fix: Calculate Product Bundle price based on the prices of its child items	2021-08-27 01:02:34 +05:30
Deepesh Garg	ae7ec8e44d	fix: Base amount in tax gl entry	2021-08-26 23:51:09 +05:30
Frappe PR Bot	a1737c9a0c	fix: Production Plan: load document defaults for plan items & remove name column from listview (#26584) (#27184) ... (cherry picked from commit 69d88a921273c9e0ea29d7131232686a0be7bb78) Co-authored-by: Richard Case <64409021+casesolved-co-uk@users.noreply.github.com>	2021-08-26 23:04:54 +05:30
Pawan Mehta	db69d1dc00	fix: fetch from more than one sales order in Maintenance Visit (#26924) ... * [fix] #26336 * fix(ux): make customer field reqd for fetching SO Co-authored-by: Ankush Menat <ankush@iwebnotes.com>	2021-08-26 22:54:24 +05:30
Chillar Anand	f1b77360ee	feat(healthcare): Added Treatment Plan Template feature (#26557) ... * feat: Added doctypes for treatment plan template * feat: Added child doctype * feat: Added validations for patient age * chore: Clean up treatment plan template * fix: Limit plan items to templates * Added multiselectdialogbox for treatment plan template * Add template name as autoname * Clean up code * Cleanup lint issues * Clean up code * Added tests for tpt filters * Added test records * Fix order of fields * Added tests for care plan template * Added age property for patient * Clean up code * Clean up list view * Clean up code * Fix lint issues * Clean up test records * Code cleanup no-docs * chore: Code cleanup * chore: Use ORM instead of raw sql * fix: Make treatment plan item fields mandatory * fix: Added healthcare roles in permissions rules * fix: Added filters for symptoms, diagnosis * fix: Show applicable treatment plans button only if patient is present * fix: Fix key error issues * fix: Fix issues with filters in plan templates * chore: Fix age filters * refactor: appending treatment plan items * fix: treatment plan test Co-authored-by: Jannat Patel <31363128+pateljannat@users.noreply.github.com> Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2021-08-26 22:15:30 +05:30
Rohan	16eed07a0f	fix: use Stripe's Price API for plan-price information (#26107) ... * fix: use Stripe's new Plan API for price information * patch: use inbuilt function to rename field * fix: patch call Co-authored-by: Ankush Menat <ankush@iwebnotes.com> Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-08-26 21:47:00 +05:30
Noah Jacob	422f67a4c9	refactor: update manufacturing module onboarding (#26945) ... * refactor: updated manufacturing onboarding cards * refactor: added form tours * refactor: updated form tours and card descriptions * Fix: Case of description Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-08-26 21:40:48 +05:30
Lovin Maxwell	f91faac7cd	fix: Pricing Rule on Transaction Based on Coupon (#26949)	2021-08-26 20:54:02 +05:30
Ankush Menat	ae55eab599	chore: remove deprecated and empty QUnit tests (#27179) ... * chore: remove deprecated and empty QUnit tests * ci: fix UI test config Testing library was added on Frappe, in order to reuse command testing library has to be installed during setup process.	2021-08-26 20:43:06 +05:30
Ankush Menat	a9852a5483	fix(ux): hide irrelevant fields for asset items (#26274)	2021-08-26 20:02:51 +05:30
Deepesh Garg	4b1f165429	fix: Use reverse debit and credit to get net amount in GL Entries (#27174) ... * fix: Use reverse debit and credit to get net amount in GL Entries * fix: Remove unused import	2021-08-26 18:34:15 +05:30
Ankush Menat	c07dce940e	fix: don't allow BOM's item code at any level of child items (#27157) ... * refactor: bom recursion checking * fix: dont allow bom recursion if same item_code is added in child items at any level, it shouldn't be allowed. * test: add test for bom recursion * test: fix broken prodplan test using recursive bom * test: fix recursive bom in tests	2021-08-26 18:33:42 +05:30
Marica	73b686a498	Merge pull request #27169 from marination/internal-customer-util ... fix: Remove duplicate `create_internal_customer` utility	2021-08-26 16:42:28 +05:30
Ankush Menat	e7109c18db	fix: negative qty validation on stock reco cancellation (#27170) ... * test: negative stock validation on SR cancel * fix: negative stock setting ignored in stock reco In stock reconcilation cancellation negative stock setting is ignored as `db.get_value` is returning string `'0'` which is not casted to int/bool for further logic. This causes negative qty, which evantually gets caught by reposting but by design this should stop cancellation. * test: typo and minor refactor	2021-08-26 16:40:45 +05:30
marination	501b91a608	fix: internal customer util returns str not doc object	2021-08-26 16:18:23 +05:30
Marica	e11bfe7da4	Merge pull request #27111 from 18alantom/feat-bom-process-loss-fp ... feat: add provision for process loss in manufac (frontport #26151)	2021-08-26 16:10:05 +05:30
marination	45edfd9d50	fix: Remove duplicate create_internal_customer util ... - Introduced via https://github.com/frappe/erpnext/pull/27086	2021-08-26 15:53:52 +05:30
Anupam	de488f68c0	adding test cases	2021-08-26 15:27:18 +05:30
Saqib	8ed6338336	refactor!: remove e_invoice utils (#27167)	2021-08-26 13:27:16 +05:30
18alantom	b389b8c3ad	fix: prevent over riding scrap table values, name kwargs, set currency	2021-08-26 13:15:57 +05:30
Marica	f4dc9ee2aa	fix: Don't create inward SLE against SI unless is internal customer enabled (#27086) ... * fix: Dont create inward SLE against SI unless is internal customer enabled - Check if is internal customer enabled apart from target warehouse - Test to check if inward SLE is made if target warehouse is accidentally set but customer is not internal * test: Use internal customer for delivery of bundle items to target warehouse - created `create_internal_customer` util - reused it in delivery note and sales invoice tests - use internal customer for target warehouse test in delivery note	2021-08-26 13:12:51 +05:30
18alantom	e20d21924c	Merge branch 'develop' into feat-bom-process-loss-fp	2021-08-26 13:05:59 +05:30
Deepesh Garg	e2af9d5761	Merge pull request #27039 from nextchamp-saqib/common-party-acc ... feat: common party accounting	2021-08-26 12:58:59 +05:30
rohitwaghchaure	fe4540d74d	fix: allow to change rate manually in case of stand-alone credit note (#27036) ... Co-authored-by: Marica <maricadsouza221197@gmail.com>	2021-08-26 12:52:36 +05:30
Anuja Pawar	baa548a3df	fix(regional): minor fixes and test for South Africa VAT report (#26933) ... * fix: added test and minor fixes * fix: sider fixes * fix: sider * fix: test fixes Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com> Co-authored-by: Saqib <nextchamp.saqib@gmail.com>	2021-08-26 12:48:43 +05:30
Rucha Mahabal	642b4c805c	fix: Fee Validity fixes (#27156) ... * chore: update Fee Validity form labels * fix: first appointment should not be considered for Fee Validity * fix: Fee Validity test cases * fix: appointment test case	2021-08-26 12:15:49 +05:30
Anupam	fbac514929	feat: prospect permission	2021-08-26 12:14:29 +05:30
Brian Pond	1a919773d7	fix: Customers 'primary_address' not updated automatically (#26798) (#26799) ... * Fix for Issue #26798 This PR is a fix for GitHub Issue 26798: https://github.com/frappe/erpnext/issues/26798 TLDR: When an Address is updated, and that Address is a Customer's Primary Address, update the Read Only field `customer.primary_address` * Update address.py Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>	2021-08-26 11:57:28 +05:30
Anupam Kumar	c8f22e5524	fix: removing toggle_display for address and contact HTML (#27152)	2021-08-26 10:46:55 +05:30
Ahmad	9cc451fc7d	feat(Regional): KSA VAT Report	2021-08-26 07:35:59 +05:00
Anupam	efdeee4d1f	fix: conflicts	2021-08-26 00:15:35 +05:30
Saqib Ansari	be7a38b662	fix: cost center in test_sales_invoice_against_supplier	2021-08-25 21:35:32 +05:30
Ashish Shah	b99c011947	fix: unable to create manual / auto asset depreciation entry when cost_center is mandatory (#26912) ... Summary : unable to create manual / auto asset depreciation entry when cost_center is mandatory Reason: Though we are calculating value for depreciation_cost_center, it is not passed in credit_entry(it is passed in debit_entry) and this prevents creation of manual / auto asset depreciation entry when cost_center is mandatory Solution : pass already calculated depreciation_cost_center value in credit_entry (in line with, already done as in debit_entry)	2021-08-25 21:33:08 +05:30
Ganga Manoj	842ceb1301	fix: cannot reconcile bank transactions against internal transfer payment entries (#26932) ... * fix: Only set Clearance Date for Payment Entries of type Internal Transfer if both Transactions have been reconciled * fix: Reset clearance_date for intra-company Payment Entries that have only been reconciled with one Bank Transaction * fix: indentation and args Co-authored-by: Saqib <nextchamp.saqib@gmail.com> Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-08-25 20:32:26 +05:30
Saqib Ansari	c6c7a8b5cf	fix: cost center & naming series	2021-08-25 20:17:04 +05:30
Saqib Ansari	7254368fc5	perf: reduce number of queries to get party link	2021-08-25 20:15:23 +05:30
Rohan	87308465d8	fix: create zero-dollar invoices fro trial subscriptions (#26441)	2021-08-25 20:11:05 +05:30
Saqib Ansari	a2f8d6c31a	fix: party link permissions	2021-08-25 20:10:19 +05:30
Saqib Ansari	c101b42d4a	feat: validate multiple links	2021-08-25 20:08:28 +05:30
Chillar Anand	81b28b8998	fix(healthcare): Removed ignore user permissions flag in appointment (#27129)	2021-08-25 20:08:11 +05:30
rohitwaghchaure	ad45ddcabe	fix: sequence of sub-operations in job card (#27138)	2021-08-25 20:07:18 +05:30
Saqib Ansari	881301ca9b	Merge branch 'develop' of https://github.com/frappe/erpnext into common-party-acc	2021-08-25 20:02:27 +05:30
Anupam Kumar	4d98be2126	feat: provision to create customer from opportunity (#27141) ... * feat: provision to create customer from opportunity * fead: linking of address and contact * revert: create_opportunity_address_contact * enabming print hide and no copy	2021-08-25 19:18:17 +05:30
18alantom	c7e11c89ff	fix: get filters to work ... - reorder and rename columns - add work order filter	2021-08-25 18:58:56 +05:30
Saqib	60675379c2	fix: partial rename while replacing abbreviation (#27065)	2021-08-25 18:26:00 +05:30
Frappe PR Bot	81b4590479	fix: TDS calculation on net total (#27058) (#27140) ... (cherry picked from commit 4eb7c2a011f3abbe547c2a32978e7af6e1fd6d33) Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>	2021-08-25 18:18:16 +05:30
Anupam	5ad8afcc8d	revert: creation of customer from opportunity	2021-08-25 17:36:53 +05:30
Marica	7cb1eec1f8	Merge pull request #27055 from 18alantom/update-stock-onboarding-fp ... refactor: update stock module onboarding (frontport #25745)	2021-08-25 16:59:28 +05:30
Ankush Menat	8d116fb9ff	fix: remove VARCHARs from Sales Invoice (#27136) ... Sales Invoice doctype is starting to hit row length limit as many integrations add custom fields on this doctype. This is just a small change to remove VARCHAR(140) fields and reduce row size wherever possible.	2021-08-25 16:45:41 +05:30
Anupam	c644fbb102	fix: sider issues	2021-08-25 16:35:34 +05:30
18alantom	dbea840ecf	fix: re-order tour to circumvent glitchy save highlight	2021-08-25 16:34:31 +05:30
Saqib	62114b226f	feat: unreconcile on cancellation of bank transaction (#27109)	2021-08-25 16:25:51 +05:30
Anupam	dfcac64b44	fix: review chnages	2021-08-25 16:24:46 +05:30
GangaManoj	e4c25bf4bb	fix: Return if there are no Items	2021-08-25 15:40:42 +05:30
GangaManoj	3135d6dc6a	fix: Get Bundle Items	2021-08-25 15:35:40 +05:30
GangaManoj	13ae10b3a2	fix: Remove comments	2021-08-25 15:20:27 +05:30
Chillar Anand	a65498dc61	fix(healthcare): Made payment fields mandatory for new appointments (#26608) ... * fix(healthcare): Made payment fields mandatory for new appointments * fix: sider issues * fix: Fix failing test * fix: Patient appointment invoicing Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com> Co-authored-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>	2021-08-25 14:40:22 +05:30
Marica	b7ef4ce7a2	Merge pull request #27052 from 18alantom/fix-scrap-items-updation ... fix: update scrap table item details; typo	2021-08-25 12:32:49 +05:30
Afshan	8366b6322e	fix: validate party and party type only if both available (#27002) ... * fix: validate party and party type only if both available * fix: indentation	2021-08-25 11:57:24 +05:30
Saqib	1dadea38a5	fix: remove unexpected comma (#27132)	2021-08-25 11:05:51 +05:30
GangaManoj	bea0f7a202	fix: Get data when grouped by invoice and otherwise	2021-08-25 02:52:18 +05:30
GangaManoj	96909b6c3b	fix: Display only the Invoice rows in bold	2021-08-25 02:49:14 +05:30
GangaManoj	b02effbc47	fix: Indentation	2021-08-25 01:00:40 +05:30
Ganga Manoj	3e5bbc9aa6	Merge branch 'develop' into gross-profit-product-bundle	2021-08-25 00:55:47 +05:30
GangaManoj	5f8c2b0946	fix: Remove base_rate and buying_rate for Invoice rows	2021-08-25 00:33:55 +05:30
GangaManoj	77352ae47e	fix: Only update Product Bundle prices if 'Calculate Product Bundle Price based on Child Items' Rates' is enabled	2021-08-25 00:12:43 +05:30
GangaManoj	2dbf8075eb	fix: Calculate total buying_amount for each invoice	2021-08-25 00:09:07 +05:30
GangaManoj	3edb1938a9	fix: Fetch bundle item details	2021-08-24 23:38:24 +05:30
GangaManoj	257215f479	fix: Fetch base_net_total for each Invoice	2021-08-24 23:32:19 +05:30
GangaManoj	1956f62ad8	fix: Remove qty from Sales Invoice rows	2021-08-24 23:30:50 +05:30
Subin Tom	fbc5977248	fix: Updated timestamp for pos invoice json (#27110) ... Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>	2021-08-24 22:34:02 +05:30
GangaManoj	1d82c3effe	fix: Make Rate editable if editable_bundle_item_rates is checked	2021-08-24 22:25:59 +05:30
Dany Robert	c7bad657b1	fix: broken URL in supplier portal (#26823) ... * fix: broken URL The quotations are supplier quotations, not sales quotation. * fix: remove erpnext from path	2021-08-24 22:10:14 +05:30
GangaManoj	a575d05a3e	fix: Make fieldname more concise	2021-08-24 22:09:36 +05:30
Anupam Kumar	1d6ef4b0d3	fix: replacing $.each -> forEach in SI (#26995) ... * fix: replacing $.each -> forEach in SI * fix: removed console log Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-08-24 22:06:19 +05:30
GangaManoj	2293ba302a	fix: Add checkbox to enable calculation of Product Bundle price based on child Items' rates	2021-08-24 22:04:03 +05:30
Frappe PR Bot	512ddc589f	fix: timesheet amount issue (#25993) (#26889) ... * fix: timesheet amount issue * fix: timesheet detail rate conversion * fix: condition to check timesheet currency * fix: removing console statement (cherry picked from commit a6aa6cd7d6) Co-authored-by: Anupam Kumar <anupamvns0099@gmail.com> Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-08-24 22:00:32 +05:30
Deepesh Garg	c30fb04e96	fix(minor): Update GSTR-1 json version (#27074)	2021-08-24 21:57:25 +05:30
GangaManoj	129df6e129	fix: Update Product Bundle rate based on its updated amount	2021-08-24 21:55:54 +05:30
GangaManoj	31482a08dc	fix: Update Product Bundle price based on the rates of its child Items	2021-08-24 21:42:44 +05:30
Pruthvi Patel	7c957d72b3	perf: reduce number of queries to validate selling price (#26225) ... * perf: reduce number of queries to validate selling price * fix: improved flow and formatting * fix: improve condition and use of `as_dict` Co-authored-by: Sagar Vora <sagar@resilient.tech>	2021-08-24 21:24:25 +05:30
Nabin Hait	b99a8cb96e	Merge pull request #27087 from deepeshgarg007/validate_due_date_fix ... fix: Ignore due date validations if payment terms are copied from orders/receipts	2021-08-24 21:10:44 +05:30
Nabin Hait	f5e52549e2	Merge branch 'develop' into fix-scrap-items-updation	2021-08-24 21:07:59 +05:30
Nabin Hait	14332ad8a2	Merge pull request #27114 from frappe-pr-bot/backport/develop/24664 ... refactor: social media post fixes	2021-08-24 21:04:36 +05:30
Frappe PR Bot	255b99ebdc	feat: Employee reminders (#25735) (#27115) ... * feat: Add reminders section to HR Settings * refactor: Extract generic function for getting Employees * feat: Employee Work Anniversary Reminder * feat: Daily Holiday Reminder * fix: Unnecessary params and replace [] with .get() * test: Daily Holiday Reminders * test: is_holiday basic tests * refactor: Move employee reminders code to separate module * feat: Add advance reminder to HR settings * feat: Advance Holiday Reminders * refactor: get_holidays_for_employee * feat: Email holiday reminders in advance + tests * fix: Remove unused import * refactor: HR Setting Reminder Section * refactor: Remove Daily Holiday Reminders feat * feat: Reminder miss warning * fix: Failing test and function name change * chore: Add patch for field rename * chore: Rename frequency label * fix: Failing patch test * fix: sider and removed description of fields * fix: email alignment Co-authored-by: pateljannat <pateljannat2308@gmail.com> Co-authored-by: Jannat Patel <31363128+pateljannat@users.noreply.github.com> (cherry picked from commit 24b2a315818d08ad4cb03347ccf5297df916a5ac) Co-authored-by: Mohammad Hussain Nagaria <34810212+NagariaHussain@users.noreply.github.com> Co-authored-by: Jannat Patel <31363128+pateljannat@users.noreply.github.com>	2021-08-24 20:19:22 +05:30
18alantom	95a2565d86	fix: correct value in test	2021-08-24 20:18:53 +05:30
18alantom	aff9aee29c	Merge branch 'develop' into feat-bom-process-loss-fp	2021-08-24 20:15:51 +05:30
18alantom	c3ce3f918d	fix: remove spurious function 'toggle_operations'	2021-08-24 20:15:19 +05:30
Anupam Kumar	1c279af0b3	fix: lead name issue (#26999) ... * fix: lead name issue * fix: change lead name wrt first name, middle and last name Co-authored-by: Jannat Patel <31363128+pateljannat@users.noreply.github.com>	2021-08-24 20:06:04 +05:30
Rucha Mahabal	d0cc1be230	Merge branch 'develop' into backport/develop/24664	2021-08-24 20:05:53 +05:30
Saqib	f1313302c9	fix: pos invoice test (#27113)	2021-08-24 19:45:21 +05:30
Marica	3167b58aee	Merge branch 'develop' into fix-scrap-items-updation	2021-08-24 19:33:09 +05:30
Anupam Kumar	164acc845a	refactor: social media post fixes (#24664) ... * fix: social media post fixes * feat: post metrics and some fixes * fix: sider issues * fix: sider issue * fix: reverting optional chaning statements * fix: sider issues * fix: review chnages * fix: text trigger check * fix: sider issue (cherry picked from commit f7e0edecc9ce45ba7baa4c17b2b35f487dffccf2)	2021-08-24 13:47:00 +00:00
18alantom	8f73d587f9	feat: process loss report, fix set pl query condition	2021-08-24 18:38:23 +05:30
GangaManoj	b4b6d10b5d	fix: Add editable Rate column	2021-08-24 17:59:11 +05:30
GangaManoj	8af5802e42	fix: Populate Bundle Items table	2021-08-24 17:58:23 +05:30
GangaManoj	91af0d6ffb	fix: Add Bundle Items table	2021-08-24 17:57:55 +05:30
Afshan	ad06fb2179	fix: calculation of gross profit percentage in Gross Profit Report (#27045)	2021-08-24 17:35:01 +05:30
Saqib	1db812ab9f	Merge branch 'develop' into common-party-acc	2021-08-24 17:27:43 +05:30
Saqib	f47cbae5e0	feat: allow draft pos invoices even if no stock available (#27078)	2021-08-24 17:27:27 +05:30
Saqib	9198caa5e7	fix: incorrect gl entry on period closing involving finance books (#26921)	2021-08-24 17:26:23 +05:30
Subin Tom	2e5525aba9	fix: Correct price list rate value in return si (#27097)	2021-08-24 17:24:41 +05:30
Saqib	ce129a1414	feat: re-arrange company doctype fields (#27091)	2021-08-24 17:23:14 +05:30
Anupam	0c6212189e	feat: link lead communication to prospect	2021-08-24 16:49:53 +05:30
Marica	774f305713	Merge branch 'develop' into update-stock-onboarding-fp	2021-08-24 16:23:42 +05:30
Subin Tom	d4d5a4221a	feat: coupon code discount in pos invoice (#27004)	2021-08-24 16:22:46 +05:30
18alantom	b58853e89d	feat: add procss_loss_qty field in work order	2021-08-24 16:11:29 +05:30
Anupam	3610882077	fix: reverting local chnages	2021-08-24 15:51:57 +05:30
Anupam	797b19a14a	feat: creation of prospect from lead	2021-08-24 15:50:15 +05:30
Saqib	9e82c24b27	fix: pos closing entry cancellation test (#27099) ... * fix: pos closing entry cancellation test * fix: invalid imports * fix: sider issue	2021-08-24 15:37:00 +05:30
Saqib	6cf9254ee5	fix: invalid imports (#27101)	2021-08-24 15:26:44 +05:30
18alantom	7fb08173b5	fix: reword error messages, fix test values	2021-08-24 15:01:38 +05:30
18alantom	ad735522cb	fix: rename form tours to doctype names, remove tours from js controllers	2021-08-24 14:54:38 +05:30
Marica	b9130bf4db	Merge branch 'develop' into fix-scrap-items-updation	2021-08-24 12:54:38 +05:30
Ankush Menat	c09d8a2809	fix(ux): keep stock entry title & purpose in sync (#27043) ... Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>	2021-08-24 12:20:34 +05:30
Ankush Menat	6de7b8ea93	fix: discard empty rows from update items (#27021)	2021-08-24 12:18:40 +05:30
Ankush Menat	0dff0beaba	fix: stock analytics report date range issues and add company filter (#27014) ... * test: tests for correct get_period_date_ranges * fix: stock analytics report date range issues - Upon selecting second half of month with Monthly filter, data from that period was missing. - Solution: "round down" the date as per expected frequency. * chore: drop py2 and fix misleading docstring * test: fix test to avoid FY clash * feat: add company filter in stock analytics report [skip ci] Co-authored-by: Marica <maricadsouza221197@gmail.com>	2021-08-24 12:16:46 +05:30
rohitwaghchaure	6106a635f8	Merge branch 'develop' into fix-scrap-items-updation	2021-08-24 12:10:04 +05:30
Pruthvi Patel	332ac105b5	refactor: use read_only_depends_on instead of code (#27008)	2021-08-24 12:07:38 +05:30
rohitwaghchaure	db385261f0	Merge pull request #27080 from rohitwaghchaure/fixed-stock-ledger-report-with-included-uom ... fix: stock ledger report not working if include UOM selected in filter	2021-08-24 10:16:35 +05:30
rohitwaghchaure	95866b736e	Merge pull request #27081 from rohitwaghchaure/fixed-donot-overrride-batch-no ... fix: batch no reset on changing of qty	2021-08-24 10:15:36 +05:30
Anupam	4a529f8039	feat: Prospect	2021-08-24 09:35:59 +05:30
rohitwaghchaure	da3220e38e	Merge branch 'develop' into fixed-stock-ledger-report-with-included-uom	2021-08-24 08:50:49 +05:30
Rushabh Mehta	49e0a4f287	Revert "fix: Salary component account filter (#26604)" ... This reverts commit ae9d1d9617.	2021-08-24 08:33:57 +05:30
GangaManoj	46650cce0d	fix: Calculate total buying_amount and gross profit for each invoice	2021-08-23 21:17:32 +05:30
Deepesh Garg	bd709f8ab0	fix: Ignore due date validations if payment terms are copied from orders/receipts	2021-08-23 19:05:52 +05:30
rohitwaghchaure	129a0fc8b2	Merge branch 'develop' into fixed-donot-overrride-batch-no	2021-08-23 18:07:22 +05:30
Deepesh Garg	69973a65aa	Merge pull request #26900 from deepeshgarg007/payment_entry_validations_and_trigger_develop ... fix: Multiple fixes in payment entry	2021-08-23 18:03:01 +05:30
Subin Tom	47b63a627d	fix: Eway bill test update to check ver 1.0.0421 (#27083)	2021-08-23 15:38:26 +05:30
Rohit Waghchaure	e1f070437a	fix: selected batch no changed on updation of qty	2021-08-23 14:27:55 +05:30
Rohit Waghchaure	098d349bf4	fix: stock ledger report not working if include uom selected in filter	2021-08-23 13:36:13 +05:30
Subin Tom	8b2fe9e793	fix: eway bill version changed to 1.0.0421 (#27044)	2021-08-23 11:17:31 +05:30
Subin Tom	7d627df4db	fix: pos return payment mode issue (#26872)	2021-08-23 11:05:07 +05:30
Deepesh Garg	df185045a1	Merge branch 'develop' into payment_entry_validations_and_trigger_develop	2021-08-23 10:34:28 +05:30
Deepesh Garg	496bff5136	feat: Column for total amount due in Accounts Receivable/Payable Summary (#27069)	2021-08-22 18:10:51 +05:30
Deepesh Garg	57e326e7d0	fix: Consolidated balance sheet showing incorrect values (#26975)	2021-08-21 17:59:11 +05:30
Saqib	5395f56c88	Merge branch 'develop' into common-party-acc	2021-08-20 20:42:50 +05:30
Saqib	ec258551bf	fix: flaky test for SLA (#27051)	2021-08-20 19:09:31 +05:30
GangaManoj	d1453c0cd0	fix: Remove Item Code and Item Name columns	2021-08-20 18:26:17 +05:30
GangaManoj	75d4fc99fc	fix: Display Items in the format Item Code: Item Name	2021-08-20 18:25:36 +05:30
Alan	62c590261c	refactor: rectify typo (#27057) ... [skip ci]	2021-08-20 18:21:09 +05:30
18alantom	810bce8da2	Merge branch 'develop' into update-stock-onboarding-fp	2021-08-20 16:31:27 +05:30
18alantom	f4487c3ae5	refactor: use Form Tour doc instead of controller form tour ... note - keeping controller form tours as a fallback, new form tours seem to work only for Stock Settings	2021-08-20 16:25:20 +05:30
18alantom	77ebbdd172	fix: minor changes ... - remove Is Group from warehouse - change stock entry type - link to stock entry type - add posting date to stock reco - change report to Stock Projected Qty - highlight quality inspection action - remove allow neg highlight	2021-08-20 16:21:33 +05:30
Deepesh Garg	2b2572b9b9	fix: Cascade deletion for Company (#26923) ... * fix: Cascade deletion for Company	2021-08-20 14:40:12 +05:30
18alantom	6ef16ee4fb	fix: update scrap table item details; typo	2021-08-20 12:24:13 +05:30
Saqib	c335962827	refactor!: drop e-invoicing integration from erpnext (#26940)	2021-08-20 11:10:46 +05:30
Saqib	153fe1cdb4	refactor: scan barcode field scanning (#26990)	2021-08-20 11:09:51 +05:30
Nabin Hait	b8c998119b	Merge pull request #27040 from marination/cart-pl-exchange-rate ... fix: Shopping cart Exchange rate validation	2021-08-20 10:56:10 +05:30
Nabin Hait	12d7f83998	Merge pull request #27033 from noahjacob/ux_promo_scheme_fix ... fix(ux): removed rate from grid view	2021-08-20 10:51:59 +05:30
Nabin Hait	657e61ae6d	Merge pull request #27028 from noahjacob/prompt_warehouse_fix ... fix: incorrect mandatory error message for warehouse	2021-08-20 10:48:34 +05:30
GangaManoj	b5fac83987	fix: Add items belonging to Product Bundles as children	2021-08-20 06:07:53 +05:30
GangaManoj	33f100d75d	fix: Set initial_depth to 3	2021-08-20 06:06:47 +05:30
GangaManoj	97a1d426a3	fix: Assign indent and parent_invoice	2021-08-20 03:54:19 +05:30
GangaManoj	779a1d68a5	fix: Make Invoice row bold	2021-08-20 02:38:34 +05:30
GangaManoj	5ffaff8e48	fix: Display items as descendants of invoices	2021-08-20 02:20:18 +05:30
GangaManoj	17a154017b	fix: Display data in tree form	2021-08-20 02:19:18 +05:30
GangaManoj	76921137ed	fix: Return data as dict if the report is grouped by Invoice	2021-08-20 02:16:49 +05:30
marination	8046d15ef0	chore: Comment out obsolete test ... - Modifying this test means considering extreme edge cases, which seems pointless now	2021-08-19 21:10:30 +05:30
Noah Jacob	f13315809e	refactor: renamed varint_item_code to variant_item_code (#27025)	2021-08-19 20:28:30 +05:30
marination	45617ae22f	fix: Shopping cart Exchange rate validation ... - Use `get_exchange_rate` to check for price list exchange rate in cart settings - Move cart exchange rate validation for Price List from hooks to doc event - Call cart exchange rate validation on PL update only if PL is in cart and currency is changed	2021-08-19 20:01:05 +05:30
Alan	9225f02599	fix: pass planned start date to created work order (#27031) ... * fix: pass planned start date to created workorder * test: production plan to work order start date Co-authored-by: Ankush Menat <ankush@iwebnotes.com>	2021-08-19 18:49:20 +05:30
Saqib Ansari	8e79c48db8	fix: remove unwanted filter query	2021-08-19 18:10:02 +05:30
Saqib Ansari	71e7254184	test: creation of advance entry on invoice submission	2021-08-19 18:09:35 +05:30
Saqib Ansari	977b09b6ba	feat: auto create advance entry on invoice submission	2021-08-19 18:09:35 +05:30
Saqib Ansari	cad08bc428	feat: toggle to enable common party accounting	2021-08-19 18:09:35 +05:30
Saqib Ansari	dddc29fdc1	feat: initialize party link for customer & suppliers	2021-08-19 18:09:35 +05:30
Afshan	c60d5523bc	fix: add child item groups into the filters (#26997) ... * fix: add child item groups into the filters * fix: appending values to proper variable * fix: refactor the loop	2021-08-19 16:23:18 +05:30
Noah Jacob	6541453c16	fix(ux): removed rate from grid view	2021-08-19 15:53:55 +05:30
Alan	09f34e558e	fix: set production plan to completed even on over production (#27027)	2021-08-19 15:51:36 +05:30
Ankush Menat	993b0532f8	Merge pull request #27026 from ankush/eq_assign ... fix: equality check instead of assignment [skip ci]	2021-08-19 15:43:34 +05:30
Noah Jacob	cf8d2d97dd	fix: Incorrect mandatory error message for warehouse	2021-08-19 15:43:20 +05:30
Ankush Menat	4551d7d602	chore: mass trailing whitespace and EOF fixes	2021-08-19 13:43:28 +05:30
Deepesh Garg	869e36c33a	Merge pull request #26737 from nemesis189/payment-reconc-party-validation-fix ... fix: Payment Reconciliation party validation issue	2021-08-19 12:40:54 +05:30
Afshan	ecd6584c50	fix: assigning values to rows in sales register reports (#26546) ... * fix: assigning values to rows in sales register reports * fix: check for is_internal_customer for unrealized_profit_loss_account	2021-08-19 12:18:27 +05:30
Frappe PR Bot	44434ff70f	fix: date_unchanged calculation in "Update Items" (#26992) (#27011) ... Branch corrected https://github.com/frappe/erpnext/pull/26058 ERPNext generates "Cannot set quantity less than delivered quantity" error even the delivered qty is zero when user clicks "Update Items". "date_unchanged" variable gets false value because of new_date is string. "getdate(new_date)" corrects the date comparison.  (cherry picked from commit d8a7abcd02f674bf6c4270a817ae9762a0b57140) Co-authored-by: Türker Tunalı <turkert@hotmail.com>	2021-08-18 18:33:06 +05:30
Subin Tom	ef792971f3	fix: Add ignore user perms to set_target_warehouse field in sales invoice (#26987) ... * reverting ot v12.7.1 * fix: Ignore user permissions for set_target_warehouse in SI Co-authored-by: Subin Tom <subin-home@Subins-MacBook-Air.local> Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>	2021-08-18 18:20:04 +05:30
Afshan	dc7280eef0	fix: filtering of items in Sales and Purchase Orders (#26936) ... * fix: filtering of items in Sales and Purchase Orders * fix: slider * fix: slider	2021-08-18 17:44:40 +05:30
Afshan	87372c8ce4	Merge branch 'develop' into payment-reconc-party-validation-fix	2021-08-18 16:20:36 +05:30
Subin Tom	333e44eb47	fix: Dimension filter query fix to avoid including disabled dimensions (#26988) ... * reverting ot v12.7.1 * fix: Dimension filter query fix to not display disabled dimensions Co-authored-by: Subin Tom <subin-home@Subins-MacBook-Air.local> Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>	2021-08-18 16:17:54 +05:30
Afshan	2416b3a1ee	Merge branch 'develop' into payment-reconc-party-validation-fix	2021-08-18 16:03:47 +05:30
Marica	112fc888f1	fix: Return Qty in PR/DN for legacy data (#27001)	2021-08-18 15:29:48 +05:30
Saqib	cab49254fc	fix: failing tests in issue doctype (#26998)	2021-08-18 14:53:32 +05:30
Saqib	fbc163cea6	feat: dynamic conditions for applying SLA (#26662)	2021-08-18 11:53:26 +05:30
Rucha Mahabal	15df0ad6a0	fix: undefined variable due to inconsistent porting of commits (#26994)	2021-08-18 11:23:44 +05:30
rohitwaghchaure	c068e8128c	Merge pull request #26993 from rohitwaghchaure/fixed-sales-invoice-not-loading ... fix: sales invoice not loading issue	2021-08-18 10:32:54 +05:30
Rohit Waghchaure	e0862de863	fix: sales invoice not loading issue	2021-08-18 10:27:58 +05:30
GangaManoj	4a77bd2304	fix: Syntax error	2021-08-18 00:33:43 +05:30
Afshan	5fec44446e	fix: set account for change amount even if pos profile not found (#26986)	2021-08-17 20:06:19 +05:30
Deepesh Garg	93fc469ace	Merge pull request #26973 from deepeshgarg007/payment_entry_unallocated_fix ... fix: Incorrect unallocated amount calculation in payment entry	2021-08-17 19:13:58 +05:30
Mohammed Redah	a2966db1e5	fix: change print_format_type from Server to Jinja (#26374)	2021-08-17 18:45:55 +05:30
18alantom	cc177f3415	fix: wo tests, sider, account for pl in se validation	2021-08-17 16:49:00 +05:30
18alantom	2670adc0c0	test: check manufacture completion qty in se and wo	2021-08-17 16:40:44 +05:30
18alantom	ad73d3fbfb	refactor: validation error message formatting	2021-08-17 16:40:16 +05:30
18alantom	23ef51a981	fix: sider	2021-08-17 16:40:05 +05:30
18alantom	47a4a3d888	refactor: polyfill ??	2021-08-17 16:39:05 +05:30
Deepesh Garg	fd739749ba	test: Add test case for payment entry	2021-08-17 16:38:25 +05:30
18alantom	55acb2e843	fix: sider	2021-08-17 16:37:34 +05:30
18alantom	cdf253aeb4	fix: add more validations, remove source wh req for pl item	2021-08-17 16:36:32 +05:30
18alantom	8ecb146231	test: add bom tests for process loss val, add se test for qty calc	2021-08-17 16:36:24 +05:30
18alantom	7433b97106	refactor: shift auto entry of is process loss check, update validations	2021-08-17 16:35:16 +05:30
18alantom	3df8d0cdf0	fix: add warehouse and unset is scrap for process loss items	2021-08-17 16:29:42 +05:30
18alantom	984c97ed4e	feat: add is process loss autoset and validation	2021-08-17 16:28:54 +05:30
18alantom	b6dc0efa27	feat: add provision for process loss in manufac	2021-08-17 16:23:19 +05:30
Frappe PR Bot	a14d218834	fix: typo (#26967) (#26984) ... (cherry picked from commit ace8cf965d2aab3faa18aa704e0e796f707cc666) Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>	2021-08-17 16:14:37 +05:30
Ankush Menat	8bbec42fa0	fix: undo changes to patch (#26983) ... * fix: undo changes to patch * ci: ignore empty body / head	2021-08-17 15:14:13 +05:30
Saqib	3c525e1136	fix(sla): 'doctype' is not defined (#26982)	2021-08-17 14:22:47 +05:30
Sagar Vora	d932cba38a	Merge pull request #26976 from resilient-tech/fix-incorrect-modified ... fix: Incorrect `modified` time in documents that inherit from `StatusUpdater`	2021-08-17 13:17:09 +05:30
Rohit Waghchaure	fbb328b84a	chore: added missing fieldname	2021-08-17 13:07:03 +05:30
Deepesh Garg	b1bcb3bf13	fix: Incorrect unallocated amount calculation in payment entry	2021-08-17 11:28:46 +05:30
Rohit Waghchaure	e92a8b87da	Merge branch 'develop' of https://github.com/frappe/erpnext into develop	2021-08-17 11:02:56 +05:30
Rohit Waghchaure	eb1e3181a4	fix: conflicts while merging brnach version-13 to develop	2021-08-17 10:53:19 +05:30
Chillar Anand	8c851b7019	Merge pull request #26906 from ChillarAnand/label ... fix: Changed label to "Inpatient Visit Charge" in appointment type	2021-08-17 10:39:18 +05:30
Rohit Waghchaure	03fdce5a19	bumped to version 13.9.0	2021-08-17 10:25:49 +05:50
rohitwaghchaure	6dd9e0194c	Merge pull request #26968 from rohitwaghchaure/release-notes-v13-9-0 ... chore: Release Notes v13.9.0	2021-08-16 22:17:47 +05:30
Rucha Mahabal	39efc62b94	feat: Organizational Chart (#26893) ... * feat: Organizational Chart * feat: org chart mobile interactions * feat(mobile): sibling node group expansion and rendering * fix: expanded node group interactions and visibility * feat: connectors for mobile node cards * fix: don't refresh connections for same node - remove all connectors while expanding a group node * chore: create separate files for Desktop and Mobile view and bundle assets * refactor: add options to chart - method to return the node data - wrapper for showing the hierarchy * feat: setup node edit action * fix: revert changes in employee descendants query * refactor: use arcs instead of bezier curves for cleaner connectors * feat: add arc to connectors in mobile view * fix: edit node button overflowing * fix: sider * fix: removing orphaned connectors * fix: unnecessary variables * feat: handle multiple root / orphan nodes * perf: Optimise Rendering - optimise get_children function - use promises instead of callbacks - optimise selectors - use const wherever possible - use pure js instead of jquery for connectors for faster rendering * fix: do not sort by number of connections * feat: use icon for connections on mobile view * fix: exclude active node while fetching sibling group * fix: sibling group expansion not working for root nodes * fix(mobile): collapsed nodes not expanding * fix: sider * test: UI tests for org chart desktop * test: UI tests for org chart mobile fix(mobile): detach node before emptying hierarchy fix(mobile): sibling group not rendering for first level * fix: sider * ci(cypress): use env variable for key documentation ref: https://docs.cypress.io/guides/guides/command-line\#cypress-run * fix(tests): clear filter before typing * fix(tests): apply filters correctly * fix: tests * fix: tests * fix: tests * fix(test): increase timeout for record creation * fix: sider * fix: sider * feat: Expand All nodes option in Desktop view * feat: add html2canvas for easily exporting html to images using canvas * feat: Export chart option in desktop view * fix(style): longer titles overflowing * fix: remove unnecessary imports * fix: test * fix: make bundled assets for hierarchy chart * fix(style): apply svg container margin only in desktop view * fix: Nest `.level` class style under `.hierarchy` class (#26905) fix: Nest `.level` class style under `.hierarchy` class * fix: add z-index to filter to avoid svg wrapper overlapping * fix: expand all nodes not working when there are only 2 levels - added dom freeze while expanding all nodes and exporting * fix: test Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>	2021-08-16 20:42:23 +05:30
Rohit Waghchaure	9722641847	chore: Release Notes v13.9.0	2021-08-16 20:38:38 +05:30
Deepesh Garg	a320a8f1df	Merge pull request #26966 from deepeshgarg007/distributed_budget_variance_report_v13_pre ... fix: Budget variance missing values	2021-08-16 18:28:19 +05:30
Deepesh Garg	58c1739eac	fix: Budget variance missing values	2021-08-16 18:04:57 +05:30
Deepesh Garg	9c893e320d	Merge pull request #26960 from deepeshgarg007/distributed_budget_variance_report ... fix: Budget variance missing values	2021-08-16 17:55:46 +05:30
Rucha Mahabal	bf75ea70fb	feat: Training Event Status Update and Validations (#26698) ... * fix: training event employee status not updated on feedback submission * feat: update attendees status on training event status update * test: Training Event and Feedback * chore: remove unused import	2021-08-16 17:22:51 +05:30
Deepesh Garg	8410e4854f	fix: Budget variance missing values	2021-08-16 17:14:40 +05:30
18alantom	f7b747e19c	refactor: reduce steps, reword cards	2021-08-16 15:14:36 +05:30
18alantom	599c1024a2	fix: semgrep, remove trailing and leading whitespaces	2021-08-16 15:14:22 +05:30
18alantom	95992a7ea5	refactor: fix typo, remove target warehouse cause SE Type dependency	2021-08-16 15:13:45 +05:30
18alantom	37466631f2	refactor: reorder steps according to stock settings refactor	2021-08-16 15:13:14 +05:30
18alantom	9581836885	refactor: add watch video step for stock opening balance	2021-08-16 15:13:05 +05:30
18alantom	1d67d20185	refactor: remove DN, PR; change wording, add/remove steps in tour	2021-08-16 15:12:57 +05:30
18alantom	51d2317bb5	refactor: sider/semgrep	2021-08-16 15:12:28 +05:30
18alantom	1851232e3c	refactor: move trailing whitespace out of translate func	2021-08-16 15:12:23 +05:30
18alantom	0b669b3d7e	refactor: add form tour for stock module onboarding	2021-08-16 15:12:16 +05:30
18alantom	23e1d2b536	refactor: update stock onboarding	2021-08-16 15:12:09 +05:30
Anupam Kumar	a9a24051c9	feat: enable track changes for leave type (#26917) ... Co-authored-by: Jannat Patel <31363128+pateljannat@users.noreply.github.com>	2021-08-16 14:48:53 +05:30
Deepesh Garg	4b9c127494	Merge branch 'version-13-pre-release' of https://github.com/frappe/erpnext into export_type_mandatory_v13_pre	2021-08-16 14:38:54 +05:30
Deepesh Garg	b58b1127f3	fix: Add mandatory depends on condition for export type field	2021-08-16 14:36:50 +05:30
Deepesh Garg	3f07bb7021	fix: Add mandatory depends on condition for export type field	2021-08-16 13:18:39 +05:30
Rucha Mahabal	67e3971c3b	fix: Org Chart fixes (#26952) ... * fix: add z-index to filter to avoid svg wrapper overlapping * fix: expand all nodes not working when there are only 2 levels - added dom freeze while expanding all nodes and exporting	2021-08-16 10:38:39 +05:30
Rucha Mahabal	0b4959966c	fix: expand all nodes not working when there are only 2 levels ... - added dom freeze while expanding all nodes and exporting	2021-08-16 10:19:48 +05:30
Rucha Mahabal	4c612b7cb2	fix: add z-index to filter to avoid svg wrapper overlapping	2021-08-15 21:32:39 +05:30
Rucha Mahabal	4981746b9a	Merge branch 'develop' into org-chart-develop	2021-08-15 20:50:56 +05:30
Suraj Shetty	1514916520	fix: Nest .level class style under .hierarchy class (#26905) ... fix: Nest `.level` class style under `.hierarchy` class	2021-08-15 20:43:16 +05:30
Deepesh Garg	7145e9d183	Merge pull request #26359 from GangaManoj/enable-discount-accounting ... feat: Enable discount accounting	2021-08-14 18:05:29 +05:30
Frappe PR Bot	b5926a33b3	fix: unknown attribute "string_type" (#26947) (#26950) ... (cherry picked from commit 6aed9e26acaf266f7260adab16656d554c6bb022) Co-authored-by: Ankush Menat <ankush@iwebnotes.com>	2021-08-14 10:48:33 +05:30
GangaManoj	f9356ee642	fix: Sider issues	2021-08-13 17:40:51 +05:30
GangaManoj	f977c65e80	fix: Make enable_discount_accounting a class property	2021-08-13 17:17:58 +05:30
GangaManoj	5999760a65	fix: Syntax error	2021-08-13 17:13:38 +05:30
Deepesh Garg	5122948450	Merge branch 'develop' of https://github.com/frappe/erpnext into enable-discount-accounting	2021-08-13 16:00:20 +05:30
Marica	2e6899fbe4	fix: Copy previous balance dict object instead of assigning (#26942) ... - Due to plain assignment, dict mutation gave wrong monthly values (cherry picked from commit fe2a34f171)	2021-08-13 10:08:41 +00:00
Marica	fe2a34f171	fix: Copy previous balance dict object instead of assigning (#26942) ... - Due to plain assignment, dict mutation gave wrong monthly values	2021-08-13 15:37:45 +05:30
Shariq Ansari	b32c2fa561	fix: updated erpnext wspace json files (#26380) ... * fix: updated erpnext wspace json files * fix: updated wspace json files * fix: updated wspace json files * fix: removed padding code from wspace json files * fix: Updated restrict_to_domain in wspace json Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>	2021-08-13 12:19:16 +05:30
Afshan	587d2db6a9	fix: show proper currency symbol in taxes and charges table (#26827) ... Co-authored-by: Saqib <nextchamp.saqib@gmail.com> Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>	2021-08-13 10:59:06 +05:30
Afshan	1de4c01942	fix: Deferred Revenue Section should be collapsible only if its not enabled (#26928)	2021-08-12 23:06:34 +05:30
Noah Jacob	b8658d003f	fix: from_warehouse getting set to None (#26920)	2021-08-12 20:03:28 +05:30
Frappe PR Bot	f4b2f4aaf7	fix: ZeroDivisionError on creating e-invoice for credit note (#26918)	2021-08-12 17:11:38 +05:30
Saqib	88f13fef81	fix: ZeroDivisionError on creating e-invoice for credit note (#26915)	2021-08-12 16:26:51 +05:30
Ganga Manoj	54c31ed33c	feat: depreciate asset after sale (#26543)	2021-08-12 13:42:56 +05:30
Marica	08e4026456	fix: Stock Analytics Report must consider warehouse during calculation (#26908) ... * fix: Stock Analytics Report must consider warehouse during calculation * fix: Brand filter in Stock Analytics (cherry picked from commit 703b081172981833bcf9a1fc5c86517817c3ff32)	2021-08-12 05:02:42 +00:00
Deepesh Garg	f037bae8ea	Merge pull request #26397 from GangaManoj/po-payment-terms ... feat: Fetch Payment Terms from linked Sales/Purchase Order	2021-08-11 22:28:34 +05:30
Deepesh Garg	a7054560da	Merge branch 'develop' into po-payment-terms	2021-08-11 19:31:30 +05:30
Marica	42899d69ea	Merge branch 'develop' into stock-analytics	2021-08-11 18:44:29 +05:30
Deepesh Garg	13fb71f642	Merge branch 'develop' into payment_entry_validations_and_trigger_develop	2021-08-11 18:20:42 +05:30
marination	455d300fca	Revert "test: fix POS Closing Entry Test" ... This reverts commit 8f1a3aef2e.	2021-08-11 17:00:46 +05:30
marination	867939fcae	test: fixed asset movement tests ... - set cwip account in company to avoid value missing - removed unused statement - removed trailing spaces	2021-08-11 16:40:07 +05:30
marination	8f1a3aef2e	test: fix POS Closing Entry Test ... - Separated into two tests, one checks if SI cancelling is blocked, the other checks PCE cancel impact - This is done because after cancel via assertRaises, damage done by cancel still exists or is partially comitted - Dont use this partially cancelled doc for any assertions further, end test at exception assertion - Use `get_value` to check SI docstatus, as its primary key changes after cancel	2021-08-11 15:17:06 +05:30
Suraj Shetty	99658ceb4e	fix: Nest .level class style under .hierarchy class ... - To avoid style overrides in list view	2021-08-11 14:19:07 +05:30
marination	bca30d6101	test: fix Shift Request test ... - Use `get_value` instead of `get_doc` - Remove unnecessary loop, only one shift assignment is made against a shift request - Get value after cancel again. Get doc is not reliable since primary key changed after cancel	2021-08-11 13:29:44 +05:30
marination	e5b0221693	test: fix attendance request tests ... - Use `frappe.db.get_value` instead of `get_doc` for asserting values - Get values after cancellation as reloading attendance doc breaks due to stale doc (primary key changed after cancel of attendance request) - rollback everything on tearDown	2021-08-11 13:02:49 +05:30
Deepesh Garg	a1f0cebda5	fix: Do not update settings for test	2021-08-11 11:50:39 +05:30
Deepesh Garg	02f44528f2	test: Add test case for payment entry unlink	2021-08-11 11:50:39 +05:30
Deepesh Garg	7141860c04	test: Update exchange rate in test cases	2021-08-11 11:50:39 +05:30
Deepesh Garg	b5162390e5	fix: Only do specific validations on reference unlink	2021-08-11 11:50:39 +05:30
Deepesh Garg	188bba8feb	fix: Validation for receivingfrom customer against negative outstanding	2021-08-11 11:50:39 +05:30
Deepesh Garg	c5276f3fd3	fix: Multiple fixes in payment entry	2021-08-11 11:50:16 +05:30
Deepesh Garg	a57d13e1e9	fix: Multiple fixes in payment entry	2021-08-11 11:50:16 +05:30
Afshan	976ae13c1e	Merge branch 'develop' into payment-reconc-party-validation-fix	2021-08-11 11:49:27 +05:30
Ankush	c1c9c4b68e	Merge branch 'develop' into fix_dn_test	2021-08-11 11:40:15 +05:30
Ankush	9152715f90	perf: various minor perf fixes for ledger postings (#26775) ... * perf: only validate if voucher is journal entry * perf: optimize merge GLE - Order fields such that comparison will fail faster - Break out of loops if not matched * perf: don't try to match SLE if count mismatch * refactor: simplify initialize_previous_data * perf: use cache for fetching valuation_method These are set only once fields * refactor: simplify get_future_stock_vouchers * refactor: simplify get_voucherwise_gl_entries * perf: fetch only required fields for GL comparison `select *` fetches all fields, output of this function is only used for comparing. * perf: reorder conditions in PL cost center check * perf: reduce query while validating new gle * perf: use cache for validating warehouse props These properties don't change often, no need to query everytime. * perf: use cached stock settings to validate SLE * docs: update misleading docstring Co-authored-by: Marica <maricadsouza221197@gmail.com>	2021-08-11 11:17:50 +05:30
Marica	e8be3a5243	Merge branch 'develop' into stock-analytics	2021-08-11 10:35:33 +05:30
Deepesh Garg	bff3b0962a	fix: Override template only if setting is enabled	2021-08-10 23:58:27 +05:30
Rucha Mahabal	9855bbb95e	fix(style): apply svg container margin only in desktop view (#26894)	2021-08-10 23:53:02 +05:30
Rucha Mahabal	15cb248d9e	fix(style): apply svg container margin only in desktop view	2021-08-10 23:44:08 +05:30
Rohit Waghchaure	7167fd00bc	Merge branch 'version-13-hotfix' into merged-v13-hotfix-into-pre-release	2021-08-10 23:30:16 +05:30
Frappe PR Bot	1167a9bf94	fix: unsetting of payment if no pos profile found (#26891) ... * fix: unseting of payment if no pos profile found (#26884) (cherry picked from commit b614834efe) # Conflicts: # erpnext/public/js/controllers/taxes_and_totals.js * fix: conflicts * fix: conflicts * fix: conflicts * fix: conflicts Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com> Co-authored-by: Afshan <afshan13k@gmail.com>	2021-08-10 23:18:23 +05:30
Frappe PR Bot	b7b111c3ed	fix: unseting of payment if no pos profile found (#26884) (#26890) ... (cherry picked from commit b614834efe) Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>	2021-08-10 22:52:37 +05:30
Afshan	b614834efe	fix: unseting of payment if no pos profile found (#26884)	2021-08-10 21:33:58 +05:30
marination	eb2050b407	fix: Brand filter in Stock Analytics	2021-08-10 20:37:09 +05:30
Anupam Kumar	a6aa6cd7d6	fix: timesheet amount issue (#25993) ... * fix: timesheet amount issue * fix: timesheet detail rate conversion * fix: condition to check timesheet currency * fix: removing console statement	2021-08-10 20:32:15 +05:30
Rucha Mahabal	52cd007292	fix: make bundled assets for hierarchy chart	2021-08-10 20:13:28 +05:30
Frappe PR Bot	1a39d1a311	fix: cost center & account validation in Sales/Purchase Taxes and Charges (#26881)	2021-08-10 19:38:39 +05:30
Anuja Pawar	66784a16cb	fix: Sales Return cancellation if linked with Payment Entry (#26883)	2021-08-10 19:38:16 +05:30
Marica	d657f39ab8	Merge pull request #25622 from noahjacob/promo_scheme_feat ... feat: added multi-select fields to create multiple pricing rules.	2021-08-10 19:09:42 +05:30
marination	55d8aaf0b6	fix: Stock Analytics Report must consider warehouse during calculation	2021-08-10 19:01:05 +05:30
Marica	af9863146d	fix: Grammar in Error message	2021-08-10 18:49:07 +05:30
Noah Jacob	49b7c7575e	refactor: code cleanup	2021-08-10 18:35:46 +05:30
Noah Jacob	4ee6e32d74	test(fix): fixed test case	2021-08-10 18:34:18 +05:30
Rucha Mahabal	f9afade7dc	fix: test	2021-08-10 18:02:41 +05:30
Rucha Mahabal	c1bb4eec9c	fix: remove unnecessary imports	2021-08-10 18:02:31 +05:30
Rucha Mahabal	5f0edca3f3	fix(style): longer titles overflowing	2021-08-10 18:02:21 +05:30
Rucha Mahabal	78f50a9809	feat: Export chart option in desktop view	2021-08-10 18:02:05 +05:30
Rucha Mahabal	6f799d17ce	feat: Expand All nodes option in Desktop view	2021-08-10 18:01:15 +05:30
Rucha Mahabal	982a097d7a	fix: tests	2021-08-10 18:00:27 +05:30
Rucha Mahabal	525d4d4776	fix: sider	2021-08-10 17:56:13 +05:30
Rucha Mahabal	a1d379d5d4	test: UI tests for org chart mobile ... fix(mobile): detach node before emptying hierarchy fix(mobile): sibling group not rendering for first level	2021-08-10 17:56:04 +05:30
Rucha Mahabal	3cc85e166f	test: UI tests for org chart desktop	2021-08-10 17:55:53 +05:30
Rucha Mahabal	e1cf7712d9	fix: sider	2021-08-10 17:55:17 +05:30
Rucha Mahabal	9e7302a21e	fix(mobile): collapsed nodes not expanding	2021-08-10 17:55:08 +05:30
Rucha Mahabal	9270de59f4	fix: sibling group expansion not working for root nodes	2021-08-10 17:51:37 +05:30
Rucha Mahabal	c79316a9c0	fix: exclude active node while fetching sibling group	2021-08-10 17:51:28 +05:30
Rucha Mahabal	1a3c335feb	feat: use icon for connections on mobile view	2021-08-10 17:50:13 +05:30
Rucha Mahabal	b6715189fb	fix: do not sort by number of connections	2021-08-10 17:50:02 +05:30
Rucha Mahabal	a48b23e6a5	perf: Optimise Rendering ... - optimise get_children function - use promises instead of callbacks - optimise selectors - use const wherever possible - use pure js instead of jquery for connectors for faster rendering	2021-08-10 17:49:53 +05:30
Rucha Mahabal	31a0f36ed9	feat: handle multiple root / orphan nodes	2021-08-10 17:49:44 +05:30
Rucha Mahabal	97d2bab434	fix: unnecessary variables	2021-08-10 17:49:36 +05:30
Rucha Mahabal	6a4cce2431	fix: removing orphaned connectors	2021-08-10 17:49:27 +05:30
Rucha Mahabal	781d1bf28d	fix: sider	2021-08-10 17:49:12 +05:30
Rucha Mahabal	d363f9db3d	fix: edit node button overflowing	2021-08-10 17:48:23 +05:30
Rucha Mahabal	6d06d8c207	feat: add arc to connectors in mobile view	2021-08-10 17:48:13 +05:30
Rucha Mahabal	4e7cda6e65	refactor: use arcs instead of bezier curves for cleaner connectors	2021-08-10 17:48:02 +05:30
Rucha Mahabal	e179cd9841	fix: revert changes in employee descendants query	2021-08-10 17:47:53 +05:30
Rucha Mahabal	aacb649050	feat: setup node edit action	2021-08-10 17:47:43 +05:30
Rucha Mahabal	249621af1b	refactor: add options to chart ... - method to return the node data - wrapper for showing the hierarchy	2021-08-10 17:47:06 +05:30
Rucha Mahabal	281241dc24	chore: create separate files for Desktop and Mobile view and bundle assets	2021-08-10 17:46:51 +05:30
Rucha Mahabal	e9c6ea077f	fix: don't refresh connections for same node ... - remove all connectors while expanding a group node	2021-08-10 17:46:40 +05:30
Rucha Mahabal	fb9b628b89	feat: connectors for mobile node cards	2021-08-10 17:46:20 +05:30
Rucha Mahabal	25c5cff3de	fix: expanded node group interactions and visibility	2021-08-10 17:46:10 +05:30
Rucha Mahabal	5046cb09d8	feat(mobile): sibling node group expansion and rendering	2021-08-10 17:45:51 +05:30
Rucha Mahabal	8a33a039f7	feat: org chart mobile interactions	2021-08-10 17:44:52 +05:30
Rucha Mahabal	506ecb4216	feat: Organizational Chart	2021-08-10 17:44:30 +05:30
Anuja Pawar	0e337be065	fix: cost center & account validation in Sales/Purchase Taxes and Charges (#25929)	2021-08-10 17:26:35 +05:30
Anuja Pawar	1cba77cfbd	fix: Sales Return cancellation if linked with Payment Entry (#26551)	2021-08-10 17:25:12 +05:30
Frappe PR Bot	a7e0805039	fix(e-invoicing): cannot cancel invoice if IRN cancelled on portal (#26879)	2021-08-10 17:16:15 +05:30
Nabin Hait	f8031d3d79	Merge pull request #26261 from ruchamahabal/org-chart ... feat: Organizational Chart	2021-08-10 17:12:59 +05:30
Saqib	84c4161c00	fix(e-invoicing): cannot cancel invoice if IRN cancelled on portal (#26638)	2021-08-10 16:46:44 +05:30
Saqib	2ae2580706	fix(asset): incorrect date difference calculation (#26793)	2021-08-10 16:37:48 +05:30
Saqib	363225d2ba	fix(asset): incorrect date difference calculation (#26805)	2021-08-10 16:37:23 +05:30
Subin Tom	793063bf4e	fix: pos return payment mode issue (#26875)	2021-08-10 15:57:30 +05:30
Frappe PR Bot	1ba04fdfe5	fix: pos profile not mandatory for Sales Invoice (#26876)	2021-08-10 15:47:36 +05:30
Marica	173c4c8564	Merge branch 'develop' into test-asset-lcv	2021-08-10 14:38:31 +05:30
marination	510e31952d	test: Serial no sanitation	2021-08-10 14:35:51 +05:30
marination	f22b858253	fix: Clean Serial No input on Server Side	2021-08-10 14:35:41 +05:30
rohitwaghchaure	f8b4d69ff1	Merge pull request #26596 from marination/serial-no-space ... fix: Clean Serial No input on Server Side	2021-08-10 14:32:23 +05:30
Afshan	af2f5277d5	fix: pos profile not mandatory for Sales Invoice (#26853)	2021-08-10 14:16:16 +05:30
Marica	d14f63afdc	Merge branch 'develop' into test-asset-lcv	2021-08-10 14:07:42 +05:30
Marica	fd12f65047	Merge pull request #26854 from marination/asset-lcv-gl-entry-hotfix ... fix: Faulty Gl Entry for Asset LCVs (#26803)	2021-08-10 14:07:12 +05:30
marination	948386d85d	test: Serial no sanitation	2021-08-10 14:00:55 +05:30
Saqib	5719198576	feat: dynamic conditions for applying SLA (#26806)	2021-08-10 13:56:48 +05:30
Saqib	b37c6992df	Merge branch 'develop' into po-payment-terms	2021-08-10 13:37:31 +05:30
Anurag Mishra	24da00cada	fix: updating lead status while customer creation (#26607) ... * fix: updating lead status while customer creation * fix: changes requested	2021-08-10 13:17:41 +05:30
Marica	f6ea00e029	Merge branch 'develop' into serial-no-space	2021-08-10 13:17:08 +05:30
Anurag Mishra	94beda65ca	fix: updating lead status while customer creation (#26606) ... * fix: updating lead status while customer creation * fix: changes requested	2021-08-10 13:16:46 +05:30
marination	06b6b7e3cc	fix: Set CWIP Account in company at the start to avoid flaky test	2021-08-10 13:14:32 +05:30
marination	9ca2febd88	fix: Set CWIP Account in company at the start to avoid flaky test	2021-08-10 13:10:46 +05:30
Deepesh Garg	25a2f2b90e	Merge pull request #26579 from deepeshgarg007/discount_accounting_v13 ... feat: Enable discount accounting	2021-08-10 11:48:14 +05:30
Subin Tom	2ab62a4484	fix: Missing method reset_issue_metrics added back to Issue doctype (#26574)	2021-08-10 11:43:59 +05:30
Subin Tom	8db0f07115	fix: Missing method reset_issue_metrics added back to Issue doctype (#26573)	2021-08-10 11:43:43 +05:30
Noah Jacob	10ce2f5d6e	refactor: added naming series for pricing rule	2021-08-10 11:42:59 +05:30
noahjacob	dd86642037	refactor: removed py2 code	2021-08-10 11:41:29 +05:30
noahjacob	b214e624bb	style: fixed formatting	2021-08-10 11:41:29 +05:30
noahjacob	74bcb987f3	style: fixed formatting	2021-08-10 11:41:29 +05:30
noahjacob	4fb1b6b80c	fix: Sider	2021-08-10 11:41:29 +05:30
noahjacob	a4cea1e56d	refactor: variable names	2021-08-10 11:41:29 +05:30
noahjacob	3a663ac77f	test: changed test item name	2021-08-10 11:41:29 +05:30
noahjacob	c95d96e7ae	refactor: changed variable names	2021-08-10 11:41:29 +05:30
noahjacob	a9ef56a107	test: added test case for creating and updating	2021-08-10 11:41:29 +05:30
noahjacob	415519af15	feat: added multi-select fields to create multiple pricing rules.	2021-08-10 11:41:29 +05:30
Saqib	7eefe927a5	Merge branch 'develop' into payment-reconc-party-validation-fix	2021-08-10 11:37:56 +05:30
rohitwaghchaure	c5e7673277	Merge pull request #26814 from noahjacob/mr_allowance_feat_v13 ... feat: over transfer allowance for material transfers (bp #26264)	2021-08-10 11:32:43 +05:30
Anupam Kumar	8e6d298fcf	Merge branch 'develop' into lead-cleanup	2021-08-10 11:32:43 +05:30
Deepesh Garg	797170e913	fix: Linting issues	2021-08-10 11:02:21 +05:30
Deepesh Garg	428ccebad9	test: Update test cases for discount accounting	2021-08-10 10:43:01 +05:30
Deepesh Garg	b73bb3e501	fix: Add discount account handling in Purchase Invoice	2021-08-10 10:42:47 +05:30
Deepesh Garg	9b561ea839	Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into discount_accounting_v13	2021-08-10 10:38:14 +05:30
Deepesh Garg	cd980f5e6b	Merge pull request #26723 from GangaManoj/backport-po-payment-terms ... feat: Fetch Payment Terms from linked Sales/Purchase Order	2021-08-10 10:34:39 +05:30
Afshan	f5b5be9644	Merge branch 'develop' into po-payment-terms	2021-08-10 09:32:08 +05:30
Afshan	a982a2a72e	Merge branch 'develop' into payment-reconc-party-validation-fix	2021-08-10 09:30:48 +05:30
Rohit Waghchaure	f571e42aa4	Merge branch 'version-13-hotfix' into merge-version-13-hotfix-into-v13-pre-9	2021-08-10 01:06:23 +05:30
Ankush	5e428f0447	perf(cache): fix active SLA doctype caching (#26861) ... If no SLA is configured then this query runs on EVERY `validate` call. Root cause: if not active SLA doctypes exist then `not []` evalutes to true and causes query to run again.	2021-08-09 22:15:49 +05:30
Francisco Roldan	0a90302170	fix: depends_on in price list field	2021-08-09 11:41:56 -03:00
Francisco Roldan	7e3dd9e8ee	fix: depends_on in price list field	2021-08-09 11:21:41 -03:00
Deepesh Garg	75a832715c	test: Update test cases for discount accounting	2021-08-09 19:03:14 +05:30
Deepesh Garg	cb539b7a6a	fix: Add discount account handling in Purchase Invoice	2021-08-09 19:01:41 +05:30
Deepesh Garg	8b9c04aae8	test: Fix test cases for payment terms fetch	2021-08-09 18:53:15 +05:30
Deepesh Garg	802c6b3738	test: Improve test case for not coping payment terms	2021-08-09 18:53:15 +05:30
Deepesh Garg	bcf56e64ba	fix: Ignore default payment term templates when coping payment terms from orders	2021-08-09 18:53:14 +05:30
GangaManoj	072f63b324	Revert "fix: Only fetch default Payment Terms Template if present" ... This reverts commit fb80ca9e06.	2021-08-09 18:53:14 +05:30
GangaManoj	e247e3a4b2	fix: Only fetch default Payment Terms Template if present	2021-08-09 18:53:14 +05:30
GangaManoj	5b33e75c65	fix: Fetch discount details from Payment Terms only if Discount Type = Percentage	2021-08-09 18:53:14 +05:30
GangaManoj	0588382c38	fix: Stop fetching amount while fetching Payment Terms	2021-08-09 18:53:14 +05:30
GangaManoj	55cb82c74d	fix: Compare Payment Schedules	2021-08-09 18:53:14 +05:30
GangaManoj	1200872c7e	fix: Disable automcatically_fetch_payment_terms after running its associated tests	2021-08-09 18:53:13 +05:30
GangaManoj	7244afe129	fix: Rename test to reflect changes in code	2021-08-09 18:53:13 +05:30
GangaManoj	54d1336d11	fix: Condition for fetching Payment Terms from Sales/Purchase Orders	2021-08-09 18:53:13 +05:30
Frappe PR Bot	18bd182f61	patch: delete all orphaned tables docs (#26863)	2021-08-09 18:34:51 +05:30
Deepesh Garg	90cca2cb55	Merge branch 'develop' into payment-reconc-party-validation-fix	2021-08-09 18:06:33 +05:30
Anuja Pawar	08ae49cd11	fix(regional): add permissions for VAT Audit report (#26851) ... fix(regional): add permissions for VAT Audit report	2021-08-09 17:58:52 +05:30
Frappe PR Bot	0ff9ef673c	fix: add parameter for db insert while adding item tax (#26855) (#26858) ... (cherry picked from commit b3bbebd27c) Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>	2021-08-09 17:58:18 +05:30
Anupam Kumar	d0d0be0a61	Merge branch 'develop' into lead-cleanup	2021-08-09 17:25:53 +05:30
Ganga Manoj	458f7f1194	patch: delete all orphaned tables docs (#26743)	2021-08-09 17:16:48 +05:30
Anupam Kumar	2f06c3e40d	Merge branch 'develop' into lead-cleanup	2021-08-09 16:07:04 +05:30
Ankush	9f5111809d	test: fix flaky purchase receipt test (#26859) (#26860) ... # Conflicts: # erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py	2021-08-09 15:35:26 +05:30
Anupam	db3ee31413	fix: test case	2021-08-09 15:34:50 +05:30
Ankush	7ba8c821a1	test: fix flaky purchase receipt test (#26859)	2021-08-09 15:14:26 +05:30
Anupam	42bb77bf80	fix: creating contact on creation of lead	2021-08-09 15:11:13 +05:30
Frappe PR Bot	ea83e2b45f	fix: validate python expressions (#26835) (#26856) ... (cherry picked from commit 07337d5c78) Co-authored-by: Ankush <ankush@iwebnotes.com>	2021-08-09 14:48:59 +05:30
Afshan	b3bbebd27c	fix: add parameter for db insert while adding item tax (#26855)	2021-08-09 14:39:32 +05:30
Anupam Kumar	9c04c297b8	refactor: Accounts Settings form cleanup (#26842)	2021-08-09 14:01:02 +05:30
harshpwctech	b0f3c0f3fd	fix: JWT decoding error (#26624)	2021-08-09 13:42:05 +05:30
Saqib	e7a77d9cb1	Merge pull request #26415 from GangaManoj/backport-asset-repair-refactor ... refactor: Asset Repair	2021-08-09 12:46:05 +05:30
Ankush	07337d5c78	fix: validate python expressions (#26835)	2021-08-09 12:38:40 +05:30
Anupam Kumar	ef8539fd60	refactor: Selling Settings form cleanup (#26841)	2021-08-09 12:38:14 +05:30
Marica	a8166c06c7	fix: Faulty Gl Entry for Asset LCVs (#26803) ... * fix: Faulty Gl Entry for Asset LCVs - Both Gl entries were crediting in their respective accounts - Asset Account must be debited into * fix: Use keyword arguments instead of positional for better readability * chore: Test for LCV for draft asset created via Purchase Receipt	2021-08-09 12:38:12 +05:30
Marica	ab8f0cab4d	fix: Faulty Gl Entry for Asset LCVs (#26803) ... * fix: Faulty Gl Entry for Asset LCVs - Both Gl entries were crediting in their respective accounts - Asset Account must be debited into * fix: Use keyword arguments instead of positional for better readability * chore: Test for LCV for draft asset created via Purchase Receipt	2021-08-09 12:24:04 +05:30
Frappe PR Bot	210441d9b5	fix: price list with 0 value are ignored (bp #26655) ... * fix: price list with 0 value are ignored Steps to reproduce: 1. Create 2 item price for two different supplier. One of them should be zero. 2. Create PO 3. Add supplier with non-zero price and add item. 4. change supplier. Price won't change. If price was non-zero it would've changed. Root cause: falsiness check instead of null value check is used for checking if price list value exists. 0 is evaluated as false. * refactor: make get_price_list_rate function pure (cherry picked from commit 16d4de5130) Co-authored-by: Ankush <ankush@iwebnotes.com>	2021-08-09 11:34:33 +05:30
Frappe PR Bot	3dfbf19e8f	fix: allow alternative items when using job card (bp #26724) ... (cherry picked from commit 7e0c57fa3f) Co-authored-by: Ankush <ankush@iwebnotes.com>	2021-08-09 11:33:55 +05:30
Frappe PR Bot	bba9aac9c0	feat: add french address template (bp #26316) ... * add french address template Co-authored-by: HENRY Florian <florian.henry@open-concept.pro> (cherry picked from commit 07e65ab589)	2021-08-09 10:58:39 +05:30
Marica	4c929b6994	Merge branch 'develop' into serial-no-space	2021-08-09 10:50:09 +05:30
Marica	e9c293d621	Merge pull request #25845 from noahjacob/item_so_variant_fix ... fix: production plan not fetching sales order of a variant	2021-08-09 10:47:54 +05:30
Ankush	7e0c57fa3f	fix: allow alternative items when using job card (#26724)	2021-08-09 10:46:29 +05:30
Ankush	16d4de5130	fix: price list with 0 value are ignored (#26655) ... * fix: price list with 0 value are ignored Steps to reproduce: 1. Create 2 item price for two different supplier. One of them should be zero. 2. Create PO 3. Add supplier with non-zero price and add item. 4. change supplier. Price won't change. If price was non-zero it would've changed. Root cause: falsiness check instead of null value check is used for checking if price list value exists. 0 is evaluated as false. * refactor: make get_price_list_rate function pure	2021-08-09 10:41:24 +05:30
HENRY Florian	07e65ab589	feat: add french address template (#26316) ... * add french address template Co-authored-by: Ankush <ankush@iwebnotes.com>	2021-08-09 10:32:31 +05:30
Deepesh Garg	5ace2767af	test: Fix test cases for payment terms fetch	2021-08-08 19:17:38 +05:30
Deepesh Garg	25d131a39f	test: Improve test case for not coping payment terms	2021-08-07 17:39:40 +05:30
Deepesh Garg	a27ef14db6	fix: Override template only if setting is enabled	2021-08-07 00:12:57 +05:30
Deepesh Garg	a59a761f99	Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into backport-po-payment-terms	2021-08-06 23:55:01 +05:30
Deepesh Garg	0bba425fe3	fix: Ignore default payment term templates when coping payment terms from orders	2021-08-06 23:53:16 +05:30
Frappe PR Bot	aec7846407	test: fix pricelist tests (#26839) (#26840) ... problem: exchange rate API is returning exchange rates for "_Test currency". These tests were relying on failure of that function. (cherry picked from commit 27a29eb6bc) Co-authored-by: Ankush <ankush@iwebnotes.com>	2021-08-06 21:55:01 +05:30
Ankush	27a29eb6bc	test: fix pricelist tests (#26839) ... problem: exchange rate API is returning exchange rates for "_Test currency". These tests were relying on failure of that function.	2021-08-06 21:34:44 +05:30
Frappe PR Bot	9ea24db20a	test: use item that allows fractional UOM in test (#26837) (#26838) ... (cherry picked from commit 614336fe1d) Co-authored-by: Ankush <ankush@iwebnotes.com>	2021-08-06 21:14:40 +05:30
Ankush	614336fe1d	test: use item that allows fractional UOM in test (#26837)	2021-08-06 19:36:21 +05:30
GangaManoj	fcbd79b7d3	Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into backport-asset-repair-refactor	2021-08-06 18:12:24 +05:30
Saqib	f1141e7756	fix: failing budget test due to project naming (#26834)	2021-08-06 17:37:17 +05:30
Anupam	b4e720f8ec	fix: test case	2021-08-06 14:39:13 +05:30
Anupam	59c971015a	fix: test case	2021-08-06 14:02:57 +05:30
Saqib	668f442139	Merge branch 'develop' into po-payment-terms	2021-08-06 13:42:10 +05:30
Frappe PR Bot	c8e6c07032	fix(e-invoicing): cannot generate IRNs for standalone credit notes (#26824) (#26833)	2021-08-06 12:33:18 +05:30
Anupam	01a0585ba0	fix: removing organization_lead traceback	2021-08-06 12:21:02 +05:30
Anupam	4723e18f9e	fix: sider issue	2021-08-06 11:16:55 +05:30
Noah Jacob	cb44aed78b	test: get sales order with variant	2021-08-06 11:16:25 +05:30
Deepesh Garg	ffd7642de2	Merge pull request #26832 from deepeshgarg007/budget_test_case ... test: Failing budget test due to project naming	2021-08-06 11:14:47 +05:30
Saqib	e7fa2e5826	fix(e-invoicing): cannot generate IRNs for standalone credit notes (#26824)	2021-08-06 11:03:57 +05:30
Frappe PR Bot	2e352834a2	fix: fetching of item tax from hsn code (#26736) (#26792) ... * fix: fetching of item tax from hsn code (cherry picked from commit 3a50490c04) Co-authored-by: Saqib <nextchamp.saqib@gmail.com>	2021-08-06 10:59:29 +05:30
Deepesh Garg	6871c07685	test: Failing budget test due to project naming	2021-08-06 10:53:38 +05:30
Frappe PR Bot	b13e46071a	fix: Let all System Managers be able to delete Company transactions (#26815) (#26819) ... (cherry picked from commit 884d8cf065) Co-authored-by: Ganga Manoj <ganga.manoj98@gmail.com>	2021-08-06 10:39:58 +05:30
Nabin Hait	418d478dad	Merge pull request #26764 from nabinhait/addl_salary_fix ... fix: Additional salary processing	2021-08-06 10:24:03 +05:30
Nabin Hait	894ed3a9a5	Merge pull request #26765 from frappe/revert-24206-additional_salary_tax_enhancements ... Revert "fix: Tax calculation for Recurring additional salary"	2021-08-06 10:22:31 +05:30
GangaManoj	232c728636	Revert "fix: Only fetch default Payment Terms Template if present" ... This reverts commit fb80ca9e06.	2021-08-05 23:04:58 +05:30
GangaManoj	fb80ca9e06	fix: Only fetch default Payment Terms Template if present	2021-08-05 22:04:11 +05:30
GangaManoj	5c21eea13d	fix: Fetch discount details from Payment Terms only if Discount Type = Percentage	2021-08-05 21:50:09 +05:30
GangaManoj	e4a07d8ff3	fix: Stop fetching amount while fetching Payment Terms	2021-08-05 21:42:09 +05:30
Frappe PR Bot	6e07ec2617	fix: Do not fetch fully return issued purchase receipts (#26809) (#26825) ... (cherry picked from commit 1d90f7684e) Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>	2021-08-05 20:13:28 +05:30
Deepesh Garg	1d90f7684e	fix: Do not fetch fully return issued purchase receipts (#26809)	2021-08-05 19:17:32 +05:30
Noah Jacob	041ac339b1	style: improved formatting of sql query	2021-08-05 16:37:22 +05:30
Noah Jacob	b10465eebe	refactor: created function to get bom_item for query	2021-08-05 16:37:22 +05:30
noahjacob	9b0b2daf4a	refactor: updated sql query for item variants	2021-08-05 16:37:22 +05:30
noahjacob	cf4078756d	fix: fixed fetching sales order of item variant in production plan	2021-08-05 16:37:21 +05:30
Anupam	c35a526dd8	fix: adding test cases	2021-08-05 14:42:15 +05:30
Frappe PR Bot	5b5a365aaf	fix: POS payment modes displayed wrong total (#26808)	2021-08-05 11:15:16 +05:30
Ganga Manoj	884d8cf065	fix: Let all System Managers be able to delete Company transactions (#26815)	2021-08-05 11:14:46 +05:30
GangaManoj	4a6ef9ab0f	fix: Compare Payment Schedules	2021-08-05 00:52:55 +05:30
GangaManoj	0b11420147	fix: Disable automcatically_fetch_payment_terms after running its associated tests	2021-08-05 00:35:45 +05:30
Anupam	2732490cbe	fix: review changes	2021-08-05 00:30:01 +05:30
GangaManoj	23c104555b	fix: Remove irrelevant code	2021-08-05 00:28:42 +05:30
Frappe PR Bot	bf8d0c256d	fix: typo in error message (#26816) (#26817) ... (cherry picked from commit 005291e6dd) Co-authored-by: François de Ryckel <f.deryckel@gmail.com>	2021-08-04 22:01:17 +05:30
François de Ryckel	005291e6dd	fix: typo in error message (#26816)	2021-08-04 21:59:18 +05:30
Noah Jacob	673bc58193	test: test case for over transfer of materials	2021-08-04 18:48:24 +05:30
Noah Jacob	8fced95f8c	feat: over transfer allowance for material transfers	2021-08-04 18:48:24 +05:30
GangaManoj	8328f45230	fix: Rename test to reflect changes in code	2021-08-04 17:33:35 +05:30
Frappe PR Bot	13192e1db1	fix: trigger lost reason dialog when status is changed to lost (#26811) (#26812) ... (cherry picked from commit e5d8ba65ca) Co-authored-by: Mohammed Yusuf Shaikh <49878143+mohammedyusufshaikh@users.noreply.github.com>	2021-08-04 17:07:22 +05:30
Mohammed Yusuf Shaikh	e5d8ba65ca	fix: trigger lost reason dialog when status is changed to lost (#26811)	2021-08-04 16:35:38 +05:30
Anupam Kumar	df477dcae6	fix: bank remittance report issue (#26398) (#26766)	2021-08-04 14:02:43 +05:30
Subin Tom	035ce304fe	fix: POS payment modes displayed wrong total (#26708)	2021-08-04 13:57:55 +05:30
Saqib	5c9d4db0e9	Merge branch 'develop' into payment-reconc-party-validation-fix	2021-08-04 13:57:00 +05:30
Dany Robert	9f94c19752	fix: ignore permission to update call log (#26797) ... Backport of #26112 #no-docs	2021-08-04 10:01:44 +05:30
Frappe PR Bot	1b9a5c851d	fix: incorrect amount in work order required items table. (#26585) (#26623) ... * fix: amount in work order not equal to rate * qty * fix: patch for amount in work order required items (cherry picked from commit cd12d95a24) Co-authored-by: Ankush <ankush@iwebnotes.com>	2021-08-03 20:06:36 +05:30
Frappe PR Bot	85815f989c	fix: Reset weight_per_unit on replacing Item (#26619) (#26791) ... * fix: Assign Item's default weight_per_unit as its weight_per_unit in get_item_details * fix: Set weight_uom in get_item_details as Item's default weight_uom (cherry picked from commit 471f48f64d) Co-authored-by: Ganga Manoj <ganga.manoj98@gmail.com>	2021-08-03 20:06:07 +05:30
Saqib	3a50490c04	fix: fetching of item tax from hsn code (#26736) ... * fix: fetching of item tax from hsn code	2021-08-03 15:57:11 +05:30
Deepesh Garg	4e1a205c11	fix: Optimize item updation	2021-08-03 14:58:45 +05:30
Deepesh Garg	346bde875c	Merge branch 'develop' of https://github.com/frappe/erpnext into sa-vat-report	2021-08-03 14:44:20 +05:30
Ganga Manoj	471f48f64d	fix: Reset weight_per_unit on replacing Item (#26619) ... * fix: Assign Item's default weight_per_unit as its weight_per_unit in get_item_details * fix: Set weight_uom in get_item_details as Item's default weight_uom	2021-08-03 14:39:38 +05:30
Frappe PR Bot	5a442f1bce	fix: change format string to percent string interpolation (#26774) (#26778) ... (cherry picked from commit 7fe588e236) Co-authored-by: Alan <2.alan.tom@gmail.com>	2021-08-03 13:29:10 +05:30
Frappe PR Bot	373ed1f65c	fix: remove limit from stock balance report (#26773) (#26779) ... (cherry picked from commit b3740e9afc) Co-authored-by: Ankush <ankush@iwebnotes.com>	2021-08-03 13:28:50 +05:30
GangaManoj	f99696b75d	fix: Condition for fetching Payment Terms from Sales/Purchase Orders	2021-08-02 23:15:44 +05:30
Anuja	f2ee1155c0	fix: sider fixes	2021-08-02 23:13:21 +05:30
Ankush	efb037b566	refactor!: drop shopify integration from ERPNext (#26700) ... BREAKING CHANGE: remove Shopify integration. The integration is moved to a separate app with additional enhancements. The app is still FOSS and licensed under the same license as ERPNext. Any data migration required is taken care of after installing the app and enabling it. New app: https://github.com/frappe/ecommerce_integrations	2021-08-02 21:57:52 +05:30
Deepesh Garg	db40d88fc2	Merge pull request #26780 from nemesis189/added-dispatch-address-to-sales-v13-new ... feat: Added dispatch address fields in Sales Ord, Sales Inv, Delivery Note for Eway Bill	2021-08-02 21:11:50 +05:30
Subin Tom	6ba11a382a	test: Updated test case for Eway bill	2021-08-02 20:36:46 +05:30
Subin Tom	8800aaaee7	feat: Added fields for dispatch address in Sales Order, Sales Invoice, Delivery Note for Eway Bill	2021-08-02 20:36:37 +05:30
Ankush	b3740e9afc	fix: remove limit from stock balance report (#26773)	2021-08-02 20:13:26 +05:30
Alan	7fe588e236	fix: change format string to percent string interpolation (#26774)	2021-08-02 20:07:55 +05:30
Ankush	e43bdf76a5	chore: warning for shopify integration deprecation (#26701) ... * chore: warning for shopify integration deprecation * fix: warn deprecation during patch for sysadmins	2021-08-02 18:57:48 +05:30
Anuja	3bcbc86291	fix: resolved conflicts in patches.txt	2021-08-02 12:58:46 +05:30
Anuja	f9fc3bbfa8	fix: added patch for custom field and minor fixes	2021-08-02 12:54:30 +05:30
Deepesh Garg	ad7bb316c1	fix: GL Entries for discount amount with item qty greater than 1	2021-08-02 12:41:06 +05:30
Deepesh Garg	c677d47a4a	fix: Test Cases	2021-08-02 12:40:44 +05:30
Deepesh Garg	c525b372c6	fix: Tests	2021-08-02 12:40:00 +05:30
Deepesh Garg	92f7a5a390	fix: GL For taxes if discount applied on Grand Total	2021-08-02 12:39:43 +05:30
Deepesh Garg	b7267f8f5f	fix: Syntax Error	2021-08-02 12:39:22 +05:30
Frappe PR Bot	a9474a9fbd	fix: POS Invoice consolidated Sales Invoice field set to no copy (#26768)	2021-08-02 12:25:27 +05:30
Subin Tom	e99cd2e9da	fix: POS Invoice consolidated Sales Invoice field set to no copy (#26706)	2021-08-02 11:39:20 +05:30
Subin Tom	4597f151f5	fix: POS Item Cart non-stop scroll issue (#26693)	2021-08-02 11:38:31 +05:30
Subin Tom	3b7615750a	fix: POS Item Cart non-stop scroll issue (#26692)	2021-08-02 11:37:38 +05:30
Subin Tom	58118d7830	fix: missing QR Code in auto email attachment (#26598)	2021-08-02 11:34:43 +05:30
Subin Tom	a75c7c48d8	fix: missing QR Code in auto email attachment (#26599)	2021-08-02 11:34:28 +05:30
rohitwaghchaure	31fe5f5b92	fix: added progress bar in repost item valuation (#26680)	2021-08-02 11:01:30 +05:30
Anuja Pawar	4ec02ad91d	Merge branch 'develop' into sa-vat-report	2021-08-02 10:42:04 +05:30
Nabin Hait	74bb55bfd2	Revert "fix: Tax calculation for Recurring additional salary (#24206)" ... This reverts commit adfdc71844.	2021-08-01 20:03:38 +05:30
Nabin Hait	493029195c	fix: Additional salary processing	2021-08-01 19:47:42 +05:30
Rohit Waghchaure	343143037c	fix: conflicts	2021-08-01 14:45:24 +05:30
Rohit Waghchaure	8cb560c753	bumped to version 13.8.0	2021-08-01 14:55:09 +05:50
Deepesh Garg	36f6e9b58e	Merge pull request #26654 from marination/pi-expense-account ... fix: Set Expense account from warehouse only if warehouse exists (Inter company invoice)	2021-07-31 17:32:24 +05:30
Rohit Waghchaure	6fffc90b46	chore: Added change log for v13.8.0	2021-07-31 16:22:12 +05:30
rohitwaghchaure	41da6f0d13	Merge pull request #26735 from rohitwaghchaure/fixed-cogs-in-purchase-receipt ... fix: COGS account in purchase receipt	2021-07-31 14:50:47 +05:30
Nabin Hait	99afe375ea	Merge pull request #26237 from rtdany10/patch-5 ... feat: Increase number of supported currency exchanges	2021-07-31 11:34:15 +05:30
Rohit Waghchaure	2a14f255cf	fix: COGS account in purchase receipt	2021-07-31 11:14:14 +05:30
Deepesh Garg	6eded547f5	fix: TDS calculation for first threshold breach for TDS category 194Q	2021-07-30 20:12:51 +05:30
Frappe PR Bot	b5c7fce689	fix: student category mapping from the program enrollment tool (#26716) (#26739) ... Co-authored-by: Jannat Patel <31363128+pateljannat@users.noreply.github.com> (cherry picked from commit 1a2332a81c) Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2021-07-30 18:54:35 +05:30
Rucha Mahabal	1a2332a81c	fix: student category mapping from the program enrollment tool (#26716) ... Co-authored-by: Jannat Patel <31363128+pateljannat@users.noreply.github.com>	2021-07-30 18:30:15 +05:30
Subin Tom	b8845b9ed9	Fix: Payment Entry party validation issue	2021-07-30 16:30:18 +05:30
Marica	7cbd755951	Merge branch 'develop' into serial-no-space	2021-07-30 14:09:19 +05:30
Saqib	d4ae1febe3	fix: gl entries for exchange gain loss (#26734)	2021-07-30 11:21:49 +05:30
Saqib	2d6f2fea5b	fix: gl entries for exchange gain loss (#26728)	2021-07-30 10:55:53 +05:30
Rucha Mahabal	821db5cce7	fix: employee status server-side validation (#26442) ... * fix: employee status server-side validation * fix: test * test: employee inactive status * fix: test	2021-07-30 10:21:42 +05:30
rohitwaghchaure	50b4b70589	Merge pull request #26727 from deepeshgarg007/pricing_rule_item_group_v13 ... fix: Parent condition in pricing rules	2021-07-29 20:06:47 +05:30
Deepesh Garg	9c7a9f3a13	fix: Parent condition in pricing rules	2021-07-29 20:02:49 +05:30
Marica	0eed394f5e	Merge branch 'develop' into stock-reco-fetch-non-empty-stock	2021-07-29 19:54:56 +05:30
rohitwaghchaure	bd33bdf210	Merge pull request #26717 from deepeshgarg007/pricing_rule_item_group ... fix: Parent condition in pricing rules	2021-07-29 19:51:53 +05:30
rohitwaghchaure	22eac9bd0c	Merge pull request #26720 from rohitwaghchaure/skip-cancelled-entries-in-report-develop ... fix: remove cancelled entries from Stock and Account Value comparison report	2021-07-29 19:50:00 +05:30
rohitwaghchaure	b7bbefee15	Merge pull request #26722 from rohitwaghchaure/skip-cancelled-entries-in-report ... fix: remove cancelled entries from Stock and Account Value comparison report	2021-07-29 19:49:42 +05:30
Ankush	57cd273f7c	fix: empty "against account" in Purchase Receipt GLE bp #26712 (#26719) ... * fix: correct field for GLE against account in PR * fix: remove incorrect field check from reposting	2021-07-29 19:49:36 +05:30
Ankush	c7df759324	fix: empty "against account" in Purchase Receipt GLE bp #26712 (#26718) ... * fix: correct field for GLE against account in PR * fix: remove incorrect field check from reposting	2021-07-29 19:49:12 +05:30
marination	533ee9a401	feat: (Stock Reco) Ignore Empty Stock while fetching items from warehouse ... - Added checkbox to `Fetch Items from Warehouse` dialog to ignore empty stock - fix: Items fetched twice due to Item Defaults - Improved code readability	2021-07-29 19:39:32 +05:30
GangaManoj	01ab63189a	fix: Check if Purchase Order has Payment Terms Template	2021-07-29 19:28:14 +05:30
GangaManoj	6343950d82	fix: Sider issues	2021-07-29 19:27:54 +05:30
GangaManoj	57df4a3aa1	fix: Rename tests	2021-07-29 19:27:54 +05:30
GangaManoj	0413a5aafd	fix: Add test to check if payment terms are fetched when creating a Purchase Invoice	2021-07-29 19:27:52 +05:30
GangaManoj	e94604f517	fix: Add test to check if payment terms are fetched when creating a Purchase Invoice	2021-07-29 19:26:39 +05:30
GangaManoj	293c5e10c3	fix: Add test to check if payment terms are fetched when creating a Sales Invoice	2021-07-29 19:26:39 +05:30
GangaManoj	59d1cc02c5	fix: Add test to check if payment terms are fetched when creating a Sales Invoice	2021-07-29 19:26:39 +05:30
GangaManoj	def7cc6cb3	fix: Modify set_payment_schedule() to include fetch_payment_terms_from_order()	2021-07-29 19:26:39 +05:30
GangaManoj	b389c9e375	fix: Fetch Payment Terms from Sales/Purchase Orders	2021-07-29 19:25:29 +05:30
GangaManoj	1011c1b01a	fix: Clear Payment Schedule if PI has default Payment Schedule, but linked PO doensn't	2021-07-29 19:24:29 +05:30
GangaManoj	c7c90244fe	fix: Check if Purchase Order has Payment Terms Template	2021-07-29 19:19:46 +05:30
rohitwaghchaure	020b8ae110	Merge pull request #26721 from rohitwaghchaure/skip-cancelled-entries-in-report-pre ... fix: remove cancelled entries from Stock and Account Value comparison report	2021-07-29 19:18:58 +05:30
Rohit Waghchaure	a6d276a06f	fix: remove cancelled entries from Stock and Account Value comparison report	2021-07-29 19:16:20 +05:30
Rohit Waghchaure	c1c5a4ae17	fix: remove cancelled entries from Stock and Account Value comparison report	2021-07-29 19:15:34 +05:30
Deepesh Garg	8b7e3775c2	Merge pull request #26712 from ankush/against_acc_pr ... fix: empty "against account" in Purchase Receipt GLE	2021-07-29 19:10:38 +05:30
Deepesh Garg	19a6d80927	fix: Parent condition in pricing rules	2021-07-29 18:47:16 +05:30
Jannat Patel	e99f68fd7e	fix: expense claim semgrep issue (#26709) ... * fix: expense claim semgrep issue * fix: sider	2021-07-29 18:31:38 +05:30
Rohit Waghchaure	379ce70126	fix: remove cancelled entries from Stock and Account Value comparison report	2021-07-29 18:06:17 +05:30
Saqib	bbb96899a5	Merge branch 'develop' into po-payment-terms	2021-07-29 17:23:09 +05:30
Dany Robert	2833a02e0e	Merge branch 'develop' into patch-5	2021-07-29 16:47:28 +05:30
Dany Robert	909995a441	fix: issue with cache.setex	2021-07-29 15:58:27 +05:30
Deepesh Garg	e014d7a00e	Merge pull request #26710 from deepeshgarg007/tds_194q_calculations ... fix: TDS calculation for first threshold breach for TDS category 194Q	2021-07-29 15:55:16 +05:30
Saqib	e39bbc85e1	fix: cannot cancel payment entry if linked with invoices (#26703)	2021-07-29 15:46:25 +05:30
Ankush Menat	5764b49767	fix: remove incorrect field check from reposting	2021-07-29 15:41:22 +05:30
Nabin Hait	237150d1f4	Merge pull request #26630 from rohitwaghchaure/show-progress-completion-status-in-repost-item-valuation ... fix: added progress bar in repost item valuation to check the status	2021-07-29 15:37:35 +05:30
Ankush Menat	c3e739caf8	fix: correct field for GLE against account in PR	2021-07-29 15:34:18 +05:30
Deepesh Garg	4c681592bf	fix: TDS calculation for first threshold breach for TDS category 194Q	2021-07-29 15:26:19 +05:30
Nabin Hait	ebbabf11e9	Merge pull request #25944 from ruchamahabal/fix-employee-onboarding-status ... fix: boarding status in Employee Onboarding and Separation	2021-07-29 15:24:54 +05:30
Jannat Patel	285463b031	Merge pull request #23129 from anupamvs/email-digest ... fix: multiselect recipients in Email Digest	2021-07-29 12:36:49 +05:30
rohitwaghchaure	04ff0bc40d	Merge pull request #26264 from noahjacob/mr_allowance_feat ... feat: over transfer allowance for material transfers	2021-07-29 11:18:37 +05:30
Ankush	f8343890b9	feat: don't recompute taxes (#26695)	2021-07-29 11:09:34 +05:30
Ankush	8859574aab	feat: don't recompute taxes (#26694)	2021-07-29 11:09:22 +05:30
Anupam	e5fea372af	fix: frappe linter	2021-07-29 11:05:38 +05:30
Anupam	a6ce1244a0	fix: sider issues	2021-07-29 10:43:21 +05:30
Anuja	5dcd5e48e7	fix: fixed zero tax rate issue by adding custom field	2021-07-29 00:54:48 +05:30
Anupam	b1350af1f6	fix: setup wizard	2021-07-28 23:54:46 +05:30
Deepesh Garg	c6fe601efa	Merge pull request #26677 from deepeshgarg007/tds_enhancements_v13 ... feat: Enhancements in TDS	2021-07-28 20:58:42 +05:30
Deepesh Garg	e79bfbb104	Merge pull request #26665 from ankush/dont_recompute_taxes ... feat: don't recompute taxes	2021-07-28 19:36:27 +05:30
Anupam Kumar	89f2138fbc	Merge branch 'version-13-hotfix' into email-digest	2021-07-28 18:24:29 +05:30
Anupam	47a651a80f	fix: removing depends_on for contact fields	2021-07-28 18:21:19 +05:30
Frappe PR Bot	1b6dd84c0a	fix(bom): remove manual permission checking (#26689) (#26690) ... get_list does the permission checking. (cherry picked from commit d95f16ac8f) Co-authored-by: Ankush <ankush@iwebnotes.com>	2021-07-28 18:11:11 +05:30
Anupam	49cfac0ef0	feat: added basic info. of lead in header part	2021-07-28 17:51:35 +05:30
Deepesh Garg	6ac68f3bc7	fix: Patch	2021-07-28 17:19:00 +05:30
Deepesh Garg	8c7d9efa9d	fix: Chnage fieldtype from data to check	2021-07-28 17:18:50 +05:30
Ankush	8ed7a21cd5	fix(bom): remove manual permission checking (#26689) ... get_list does the permission checking. (cherry picked from commit d95f16ac8f)	2021-07-28 11:12:27 +00:00
Ankush	d95f16ac8f	fix(bom): remove manual permission checking (#26689) ... get_list does the permission checking.	2021-07-28 16:38:59 +05:30
Anupam	f4f0dde838	feat: unlinking dynamic links on trash	2021-07-28 16:16:52 +05:30
Deepesh Garg	4c0dfdb398	Merge pull request #26687 from deepeshgarg007/fieldtype_fix ... fix: Change fieldtype from data to check	2021-07-28 15:59:08 +05:30
Deepesh Garg	fa8e6ac7cd	fix: Patch	2021-07-28 15:30:05 +05:30
Marica	d43e6ced91	Merge branch 'develop' into pi-expense-account	2021-07-28 14:38:48 +05:30
walstanb	655b5dc190	fix: date as reference_date from bank transactions	2021-07-28 14:30:11 +05:30
Afshan	42bc0a7db8	fix: documentation link for E Invoicing (#26684)	2021-07-28 13:42:53 +05:30
Afshan	90c5cb0a31	fix: documentation link for E Invoicing (#26685)	2021-07-28 13:42:33 +05:30
Afshan	868a6cb26d	fix: documentation link for E Invoicing (#26686)	2021-07-28 13:42:13 +05:30
Deepesh Garg	9350249941	fix: Chnage fieldtype from data to check	2021-07-28 12:57:59 +05:30
rohitwaghchaure	36bf5c7ed4	Merge branch 'develop' into mr_allowance_feat	2021-07-28 11:52:57 +05:30
Deepesh Garg	1c9e516092	fix: GL Entries for discount amount with item qty greater than 1	2021-07-28 11:38:44 +05:30
Deepesh Garg	441adf763f	fix(minor): Consider grand total for threshold check	2021-07-28 10:51:50 +05:30
Deepesh Garg	64af124f88	fix(minor): Consider grand total for threshold check	2021-07-28 10:43:02 +05:30
Frappe PR Bot	3a39c0f19a	fix: force reload of Opportunity in patch (#26668) (#26681) ... (cherry picked from commit ac2e139d5b) Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>	2021-07-28 00:19:32 +05:30
Raffael Meyer	ac2e139d5b	fix: force reload of Opportunity in patch (#26668)	2021-07-28 00:14:59 +05:30
rohitwaghchaure	c1eb5a06a3	Merge pull request #26679 from rohitwaghchaure/removed-remarks-field-from-ar-ap-report-develop ... fix: removed Remarks column from AR/AP report	2021-07-27 22:23:40 +05:30
Rohit Waghchaure	5d121c41f3	fix: removed Remarks column from AR/AP report	2021-07-27 22:22:56 +05:30
rohitwaghchaure	69983eb8ff	Merge pull request #26678 from rohitwaghchaure/fixed-dict-object-has-no-attr-develop ... fix: not able to add employee in the job card	2021-07-27 22:22:10 +05:30
Rohit Waghchaure	7903aeca7e	fix: not able to add employee in the job card	2021-07-27 22:19:41 +05:30
Rohit Waghchaure	56b81565fa	fix: added progress bar in repost item valuation	2021-07-27 22:11:30 +05:30
Deepesh Garg	5a7fad8a6a	feat: Enhancements in TDS	2021-07-27 18:55:14 +05:30
rohitwaghchaure	965b1fe4a0	Merge pull request #26675 from rohitwaghchaure/fixed-dict-object-has-no-attr ... fix: not able to add employee in the job card	2021-07-27 18:47:45 +05:30
rohitwaghchaure	82d0cfc68e	Merge pull request #26676 from rohitwaghchaure/fixed-dict-object-has-no-attr-pre ... fix: not able to add employee in the job card	2021-07-27 18:46:59 +05:30
Rohit Waghchaure	940356d28a	fix: not able to add employee in the job card	2021-07-27 18:45:17 +05:30
Rohit Waghchaure	af58ac9e10	fix: not able to add employee in the job card	2021-07-27 18:43:20 +05:30
Nabin Hait	11a1610781	Merge pull request #26661 from deepeshgarg007/tds_enhancements ... feat: Enhancements in Tax Withholding Category	2021-07-27 18:26:00 +05:30
Frappe PR Bot	b122a1eaa0	fix: reload manufacturing setting before patch (#26641) (#26670) ... (cherry picked from commit c8d7a8c781) Co-authored-by: Ankush <ankush@iwebnotes.com>	2021-07-27 16:59:06 +05:30
Ankush	7a97b6d6a8	fix: reload manufacturing setting before patch (#26641) ... (cherry picked from commit c8d7a8c781)	2021-07-27 11:19:33 +00:00
Anupam	ee1089ca4f	Merge branch 'develop' of https://github.com/frappe/erpnext into campaign-module	2021-07-27 16:49:24 +05:30
Anupam	f1c697ca75	fix: sider issue	2021-07-27 16:49:04 +05:30
Deepesh Garg	9d8efbe1db	Merge pull request #26651 from deepeshgarg007/exchange_rate_reval_fixes_v13_pre_release ... fix: Exchange rate revaluation posting date and precision fixes	2021-07-27 16:41:59 +05:30
Deepesh Garg	f28595cad0	Merge pull request #26650 from deepeshgarg007/exchange_rate_reval_fixes_v13 ... fix: Exchange rate revaluation posting date and precision fixes	2021-07-27 16:41:23 +05:30
Deepesh Garg	3ee61af676	Merge pull request #26628 from deepeshgarg007/exchange_rate_reval_fixes ... fix: Exchange rate revaluation posting date and precision fixes	2021-07-27 16:41:04 +05:30
Ankush	c8d7a8c781	fix: reload manufacturing setting before patch (#26641)	2021-07-27 16:39:38 +05:30
Ankush Menat	dfdd1c6e02	feat: don't recompute taxes	2021-07-27 14:49:44 +05:30
Rohit Waghchaure	6b482ebb0f	fix: serial no and batch validation	2021-07-27 13:42:37 +05:30
Deepesh Garg	6e6823c3aa	feat: Enhancements in TDS	2021-07-27 10:59:25 +05:30
Deepesh Garg	2dbfb932b4	Merge pull request #26618 from nemesis189/supplier-invoice-importer-fix ... fix: Supplier invoice importer fix	2021-07-27 10:27:07 +05:30
Anuja Pawar	9302e0b6c5	Merge branch 'develop' into sa-vat-report	2021-07-27 10:18:53 +05:30
Deepesh Garg	831ce88d1c	Merge pull request #26643 from nemesis189/ignore-mandatory-in-payment-reconcilitation-pre-release ... fix:Ignore mandatory fields while creating payment reconciliation Journal Entry	2021-07-27 10:16:04 +05:30
Deepesh Garg	3fae0db8d9	Merge pull request #26550 from nemesis189/ignore-mandatory-in-payment-reconcilitation-v13 ... fix: Ignore mandatory fields while creating payment reconciliation Journal Entry	2021-07-27 10:15:39 +05:30
Deepesh Garg	af84ce9216	Merge pull request #26647 from deepeshgarg007/gst_sales_register_fix_v13 ... fix(India): Default value for export type	2021-07-27 10:12:33 +05:30
Deepesh Garg	2922fb52cc	Merge pull request #26616 from deepeshgarg007/gst_sales_register_fix ... fix(India): Default value for export type	2021-07-27 10:12:02 +05:30
Anupam Kumar	34353df48c	fix: sales pipeline graph issue (#26626)	2021-07-27 09:47:44 +05:30
Jannat Patel	6c48a2ed79	fix: Removed set_status after cancel from Expense Claim and Employee Advance (#25901) ... * fix: removed set_status after cancel from hr doctypes * fix: semgrep on_submit issue * fix: sider * fix: spaces * fix: update flag for db_set	2021-07-27 09:41:55 +05:30
Jannat Patel	ae9d1d9617	fix: Salary component account filter (#26604) ... * fix: salary component account filter * fix: cleanup	2021-07-27 09:40:12 +05:30
Jannat Patel	aaea5edbdb	fix: Salary component account filter (#26605) ... * fix: salary component account filter * fix: cleanup	2021-07-27 09:39:33 +05:30
Ankush Menat	03a6c38f06	test: fix test due to rename change	2021-07-26 22:24:25 +05:30
marination	77f9f048b6	chore: test case for missing default warehouse on mapping	2021-07-26 21:33:17 +05:30
Marica	a4bafe2dbf	Merge branch 'develop' into pi-expense-account	2021-07-26 20:15:20 +05:30
marination	5c82af50f9	fix: Set Expense account from warehouse only if warehouse exists	2021-07-26 19:41:53 +05:30
Deepesh Garg	1b6c75bbb1	Merge pull request #26642 from deepeshgarg007/gstr_3b_missing_cess_develop ... fix: Add missing cess amount in GSTR-3B report	2021-07-26 19:21:29 +05:30
Deepesh Garg	61d014d249	Merge pull request #26644 from deepeshgarg007/gstr_3b_missing_cess_v13 ... fix: Add missing cess amount in GSTR-3B report	2021-07-26 19:20:50 +05:30
Deepesh Garg	23776600f3	Merge pull request #26544 from deepeshgarg007/gstr_3b_missing_cess ... fix: Add missing cess amount in GSTR-3B report	2021-07-26 19:20:42 +05:30
Deepesh Garg	8a6aa0d788	Merge pull request #26645 from deepeshgarg007/gst_reports_timeout_develop ... fix: GST Reports timeout issue	2021-07-26 19:20:12 +05:30
Deepesh Garg	6330318381	Merge pull request #26575 from deepeshgarg007/gst_reports_timeout ... fix: GST Reports timeout issue	2021-07-26 19:19:16 +05:30
Deepesh Garg	3fcc5e3134	fix: Convert null values to empty string on grouping	2021-07-26 19:09:09 +05:30
Deepesh Garg	19a0ca1980	fix: Ignore GL Entry on cancel	2021-07-26 19:08:56 +05:30
Deepesh Garg	356a55258e	fix: Exchange rate revaluation posting date and precision fixes	2021-07-26 19:08:45 +05:30
Deepesh Garg	dc2cd35b93	fix: Convert null values to empty string on grouping	2021-07-26 19:07:02 +05:30
Deepesh Garg	5749e52bf6	fix: Ignore GL Entry on cancel	2021-07-26 19:06:51 +05:30
Deepesh Garg	fb72df7dce	fix: Exchange rate revaluation posting date and precision fixes	2021-07-26 19:06:40 +05:30
Deepesh Garg	b23315a7e6	Merge branch 'develop' into exchange_rate_reval_fixes	2021-07-26 19:05:44 +05:30
Deepesh Garg	8d52a22709	fix: Additional discount calculations in Invoices (#26553) ... * fix: Additional discount calculations in Invoices * revert: Client side handling for Dynamic GST Rates * fix: Add update item tax template method back * fix: Revert refresh field * fix: add company change trigger	2021-07-26 19:00:57 +05:30
Deepesh Garg	cba847b051	fix: Test case for GSTR-3b report	2021-07-26 18:46:27 +05:30
Deepesh Garg	a661667e2a	fix(India): Default value for export type	2021-07-26 18:46:14 +05:30
Deepesh Garg	d066eab6cd	fix: Test case for GSTR-3b report	2021-07-26 18:38:50 +05:30
Noah Jacob	ba18a96b0c	test: test case for over transfer of materials	2021-07-26 18:12:40 +05:30
Noah Jacob	bc82344fc7	feat: over transfer allowance for material transfers	2021-07-26 18:12:37 +05:30
Anuja Pawar	abc63cffa8	fix: suggested changes	2021-07-26 18:11:38 +05:30
Deepesh Garg	0011585415	Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into gst_sales_register_fix	2021-07-26 17:21:13 +05:30
Deepesh Garg	5fe7d80a64	fix: GST Reports timeout issue	2021-07-26 17:13:28 +05:30
Deepesh Garg	19589b1e21	fix: GST Reports timeout issue	2021-07-26 17:05:48 +05:30
Deepesh Garg	c468e4a93d	fix: Add missing cess amount in GSTR-3B report	2021-07-26 16:58:07 +05:30
Deepesh Garg	00fd319531	fix: Add missing cess amount in GSTR-3B report	2021-07-26 16:52:54 +05:30
Subin Tom	50b76d04bf	fix:Ignore mandatory fields while creating payment reconciliation Journal Entry	2021-07-26 16:52:05 +05:30
Deepesh Garg	4e0664b548	Merge branch 'develop' into supplier-invoice-importer-fix	2021-07-26 16:48:11 +05:30
Subin Tom	ed68f11a46	fix: Supplier invoice importer fix pre release (#26636) ... * fix: Supplier Invoice Importer fix Co-authored-by: Subin Tom <subin-home@Subins-MacBook-Air.local>	2021-07-26 16:47:36 +05:30
Subin Tom	06fb0b93b5	fix: Supplier invoice importer fix v13 (#26633) ... * fix: Supplier Invoice Importer fix Co-authored-by: Subin Tom <subin-home@Subins-MacBook-Air.local>	2021-07-26 16:46:47 +05:30
Noah Jacob	64454a5dc8	fix: included company in Link Document Type filters for contact (#26576) ... (cherry picked from commit cbddedab7b)	2021-07-26 07:32:43 +00:00
Frappe PR Bot	4209b3bda9	fix: included company in Link Document Type filters for contact (#26576) (#26634) ... (cherry picked from commit cbddedab7b) Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>	2021-07-26 13:00:32 +05:30
Noah Jacob	cbddedab7b	fix: included company in Link Document Type filters for contact (#26576)	2021-07-26 12:54:35 +05:30
Rohit Waghchaure	60a0b7fe77	Merge branch 'version-13-hotfix' into 'version-13-pre-release-13-8'	2021-07-26 11:34:57 +05:30
Rucha Mahabal	c676eaae57	fix: test	2021-07-25 23:11:18 +05:30
Rucha Mahabal	6bca87ddb9	fix: remove unnecessary imports	2021-07-25 21:34:51 +05:30
Deepesh Garg	67273b9551	fix: Convert null values to empty string on grouping	2021-07-25 21:26:22 +05:30
Rucha Mahabal	475d856d66	fix(style): longer titles overflowing	2021-07-25 20:39:51 +05:30
Rucha Mahabal	37198159aa	feat: Export chart option in desktop view	2021-07-25 20:28:01 +05:30
Deepesh Garg	a8bf61c14e	Merge branch 'develop' of https://github.com/frappe/erpnext into exchange_rate_reval_fixes	2021-07-25 19:58:04 +05:30
Deepesh Garg	c485d5c3b7	fix: Ignore GL Entry on cancel	2021-07-25 19:46:50 +05:30
Deepesh Garg	f4701c174a	fix: Exchange rate revaluation posting date and precision fixes	2021-07-25 19:46:20 +05:30
Ankush	cd12d95a24	fix: incorrect amount in work order required items table. (#26585) ... * fix: amount in work order not equal to rate * qty * fix: patch for amount in work order required items	2021-07-25 13:10:50 +05:30
Ankush	96caae1f56	fix: wrong operation time in Work Order (#26613) (#26617) ... * fix: wrong operation time in Work Order Top level item time operation was not considering the BOM.quantity Co-authored-by: Ankush Menat <ankush@iwebnotes.com> Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>	2021-07-25 13:01:21 +05:30
Rucha Mahabal	017ed3f5c1	fix: employee status server-side validation (#26615)	2021-07-24 00:08:02 +05:30
rohitwaghchaure	9052a3b1a8	Merge pull request #26614 from rohitwaghchaure/fixed-serial-no-not-link-to-batch-error ... fix: serial no and batch validation	2021-07-23 23:38:02 +05:30
Subin Tom	fac88a3329	fix: Supplier Invoice Importer fix	2021-07-23 21:23:48 +05:30
Subin Tom	2fc39fcade	Merge branch 'develop' of https://github.com/frappe/erpnext into develop	2021-07-23 20:55:24 +05:30
rohitwaghchaure	9ef157b23b	fix: wrong operation time in Work Order (#26613) ... * fix: wrong operation time in Work Order Top level item time operation was not considering the BOM.quantity Co-authored-by: Ankush Menat <ankush@iwebnotes.com>	2021-07-23 20:44:34 +05:30
Deepesh Garg	328444b530	fix(India): Default value for export type	2021-07-23 20:28:02 +05:30
Anurag0911	4128aa7628	fix: syntax error (#26610) ... Removed "," at erpnext/public/js/controllers/taxes_and_totals.js:87	2021-07-23 16:52:42 +05:30