brotherton-erpnext

Author	SHA1	Message	Date
Deepesh Garg	7882c70244	Merge pull request #22959 from deepeshgarg007/gst_rcm_fixes_v13 fix: Taxable value for RCM	2020-08-08 22:34:36 +05:30
Deepesh Garg	d4ecf426b7	fix: Place of supply fix	2020-08-08 22:33:18 +05:30
Deepesh Garg	5ac2fd94f0	fix: Taxable value for RCM	2020-08-08 22:28:13 +05:30
Deepesh Garg	af1f46f2d9	fix: Add default billing address for purchase documents	2020-08-07 19:44:20 +05:30
Deepesh Garg	72fc188706	Merge pull request #21756 from deepeshgarg007/loan_patch_and_fixes fix: Description for fields and patch for old loans	2020-08-07 17:08:31 +05:30
Deepesh Garg	bad269c354	fix: Parent income account check	2020-08-07 16:21:41 +05:30
Afshan	1f3cc7553c	fix: grand_total assigment before reference	2020-08-07 15:57:31 +05:30
Rucha Mahabal	8118dd9e62	fix: escape company field	2020-08-07 14:52:50 +05:30
Deepesh Garg	ab611d5fd8	fix: GSTR 1 report for exports without payment of Tax	2020-08-07 14:47:40 +05:30
Shivam Mishra	b7a24ad95b	Merge branch 'develop' into item-image-alt	2020-08-07 09:15:00 +00:00
Shivam Mishra	b1f8859121	feat: add alt value in product page	2020-08-07 14:38:40 +05:30
Shivam Mishra	a0954e66a8	feat: add image alt argument for product_image macros	2020-08-07 14:34:54 +05:30
Shivam Mishra	ba4c4f107e	feat: add image alt field in items	2020-08-07 14:34:28 +05:30
Deepesh Garg	b98088bb01	Merge branch 'develop' into loan_patch_and_fixes	2020-08-07 13:27:40 +05:30
Deepesh Garg	a306af8c08	fix: Add help link in navbar settings	2020-08-06 20:52:02 +05:30
Shivam Mishra	124eabaac8	Merge branch 'develop' into barredterra-patch-1	2020-08-06 14:16:48 +00:00
Rucha Mahabal	a78336e77d	fix: remove patch for retaining permissions for Video DocType (#22932 ) Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-08-06 19:01:42 +05:30
Raffael Meyer	d854d39c00	fix: show only company's bank accounts	2020-08-06 15:09:22 +02:00
marination	63513f1b14	fix: Show Add to Cart Button anyway - add to cart wasnt visible if show price is disabled in shopping cart settings (product_info = null), creating confusion	2020-08-06 18:22:28 +05:30
marination	ccf44a1bfd	fix: product action instead of info	2020-08-06 17:34:38 +05:30
Shivam Mishra	01f664a88f	fix: handle product_info null	2020-08-06 17:24:02 +05:30
Shivam Mishra	33a5fdfb78	fix: unbound error in product configurator	2020-08-06 17:23:51 +05:30
Afshan	085061fa21	fix: show or hide section or attributes depending on other attributes… (#22861 ) * fix: show or hide section or attributes depending on other attributes for better UI * Update erpnext/stock/doctype/item/item.js Co-authored-by: Marica <maricadsouza221197@gmail.com> * fix: made has_variants checkbox to read_only if stock_exists Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-08-06 14:36:34 +05:30
Marica	1afe177a4f	Merge branch 'develop' into education-dashboard	2020-08-06 14:12:00 +05:30
Deepesh Garg	44d62ad0d7	Merge pull request #22921 from ruchamahabal/fix-payment-entry-ref fix: condition for checking reference details for Payment Entry	2020-08-05 23:16:14 +05:30
Suraj Shetty	1923ef052c	refactor: Format and sanitise user inputs to search queries. (#22913 ) * refactor: Sanitize whitelisted method inputs Co-authored-by: Prssanna Desai <prssud@gmail.com> Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com> * refactor: Format and sanitize tax_account_query inputs Co-authored-by: Nabin Hait <nabinhait@gmail.com> Co-authored-by: Prssanna Desai <prssud@gmail.com> Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com> * refactor: Validate and sanitize search inputs via decorator Co-authored-by: Nabin Hait <nabinhait@gmail.com> Co-authored-by: Prssanna Desai <prssud@gmail.com> Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com> * style: Minor formatting fix * refactor: Validate and sanitize search inputs using decorator * fix: Typo * fix: Remove unwanted import statement * refactor: Repalce validate_and_sanitize_search_inputs() with validate_and_sanitize_search_inputs Co-authored-by: Prssanna Desai <prssud@gmail.com> Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com> Co-authored-by: Prssanna Desai <prssud@gmail.com> Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com> Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-08-05 19:42:25 +05:30
Rucha Mahabal	5da067b689	fix: condition for checking reference detail for Payment Entry	2020-08-05 18:18:57 +05:30
Marica	0c818927a5	fix: get_regional_address_details missing positional arg 'company' (#22915 )	2020-08-05 16:47:41 +05:30
Rucha Mahabal	f9143e9bb0	Merge branch 'develop' into education-dashboard	2020-08-05 16:28:14 +05:30
Rucha Mahabal	8edace1a58	fix: covert Program wise Fee Collection to a Script Report	2020-08-05 16:24:21 +05:30
Rucha Mahabal	d67c2ea0d4	fix: make program field mandatory in Fees	2020-08-05 14:13:14 +05:30
Nabin Hait	a042d4721e	fix: Bank Clearance of POS purchase invoice (#22882 )	2020-08-03 20:42:15 +05:30
Rucha Mahabal	b7311c8fc1	fix: SQL query in accounts receivable, payable reports (#22888 )	2020-08-03 20:41:25 +05:30
Marica	e211bb7a53	fix: Reposition description in Warehouse (#22895 )	2020-08-03 20:40:09 +05:30
Nabin Hait	48163e31c5	Dunning cleanup (#22898 ) * fix: Dunning cleanup * fix: Added dashboard for Dunning	2020-08-03 20:38:28 +05:30
Rucha Mahabal	101fe2b769	fix: Assessment Result child table not visible when accessed via dashboard (#22880 ) Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-08-03 19:42:24 +05:30
Anupam Kumar	1895e9b89a	fix: Shopping cart issue v13 (#22868 ) * refactoring shopping cart settings * adding column_break in shopping cart settings * fix: mandatory depend on fix company * fix: resetting company, price_list, default_customer_group, quotation_series when card is diabled.	2020-08-03 18:50:11 +05:30
Rucha Mahabal	b50b20458e	fix: TypeError while concatenating account number and name in COA (#22885 ) Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>	2020-08-03 15:51:57 +05:30
Marica	dd97524db5	fix: Misleading description in Warehouse (#22877 ) Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-08-03 14:55:40 +05:30
Prssanna Desai	1dfd9fd756	fix: check if row['delay'] exists (#22889 )	2020-08-03 14:48:45 +05:30
Deepesh Garg	2f2de2264d	Merge pull request #22887 from deepeshgarg007/subscription_test fix: Test case for subscription	2020-08-03 14:31:21 +05:30
Deepesh Garg	5572f8eb1e	fix: Test case for subscription	2020-08-03 13:40:11 +05:30
Wolfram Schmidt	5e438cc853	Update lead_source.json (#22872 ) Allow Lead Source to be renamed. This is usefull for cleaning up data at a later point and allow correcting spelling errors. Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-08-03 12:46:50 +05:30
Nabin Hait	9cc2d340ba	Reset home page based on product settings (#22875 )	2020-08-03 10:43:47 +05:30
Nabin Hait	4cc99286c0	fix: Update modified timestamp in accounts settings (#22873 )	2020-08-03 09:33:31 +05:30
Anurag Mishra	ba52dd8ba6	fix: minor payroll_dashboard fixes (#22832 ) * fix: minor payroll_dashboard fixes * Update erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.js Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com> Co-authored-by: Nabin Hait <nabinhait@gmail.com> Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-08-03 08:57:49 +05:30
Deepesh Garg	4104887abb	fix: fieldname in filter	2020-08-02 18:23:54 +05:30
marination	e3495116dd	chore: Error Logging and exception hnadling on connection failure	2020-08-02 17:13:34 +05:30
Deepesh Garg	d909669a18	fix: Test cases	2020-08-02 17:00:53 +05:30
marination	c16ace6732	fix: Codacy	2020-08-02 16:43:15 +05:30
marination	ccf4ab9f85	chore: Added Interactions Report and behaviour fixes - Youtube Interactions Report with Chart and Summary - Statistics change in doc on refresh and get updated in db as well	2020-08-02 16:26:36 +05:30
marination	ddc2be36ab	Merge branch 'develop' of https://github.com/frappe/erpnext into youtube-analytics	2020-08-02 05:37:30 +05:30
marination	d4817c8685	feat: Track Youtube interactions via Video DocType	2020-08-02 05:35:45 +05:30
Deepesh Garg	b9dc21129c	fix: Loan Seurity shortfall calculation fixes	2020-08-01 22:51:40 +05:30
Deepesh Garg	946e106714	Merge pull request #22863 from deepeshgarg007/taxjar_fix fix: Import pycountry and taxjar only if taxjar is enabled	2020-08-01 13:52:40 +05:30
Deepesh Garg	dcb462f305	fix: Import pycountry and taxjar only if taxjar is enabled	2020-08-01 13:47:09 +05:30
Anurag Mishra	2a4c90302b	fix: minor recritment analytics fixes (#22830 ) Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-07-31 17:59:30 +05:30
Marica	cf00ee49ec	fix: PO/SO view title (#22858 )	2020-07-31 15:14:50 +05:30
Deepesh Garg	01e0d50eba	Merge pull request #22854 from nabinhait/gl-balance-fix fix: Ignore cancelled gl entries to get account balance	2020-07-30 22:15:23 +05:30
Nabin Hait	9837285bf1	fix: Ignore cancelled gl entries to get account balance	2020-07-30 20:52:20 +05:30
Rucha Mahabal	b6675f8dd4	feat: Lab Test Report Summary and Chart	2020-07-30 19:33:08 +05:30
Rucha Mahabal	c5ccf38cdf	refactor: Lab Test Report	2020-07-30 18:56:16 +05:30
Saurabh	a14618efe4	fix: validate theme_scss attribute	2020-07-30 17:22:29 +05:30
Rucha Mahabal	ca1b389c99	fix: validate negative quantity for sample collection	2020-07-30 16:58:19 +05:30
Rucha Mahabal	fa2c20ea9e	chore: Sample Collection Form clean-up	2020-07-30 16:56:11 +05:30
Rucha Mahabal	9087689d90	fix: subtitle for onboarding Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-07-30 16:10:05 +05:30
Rucha Mahabal	afa001a1d1	fix: code clean-up	2020-07-30 15:25:04 +05:30
Rucha Mahabal	73edb12ab3	fix: msgprint for sample collection doc created on Lab Test creation	2020-07-30 14:50:30 +05:30
Rucha Mahabal	c33703d54c	fix: move result value validations to server side	2020-07-30 14:25:40 +05:30
Rucha Mahabal	b00f870c77	fix: Lab Test Completed status not visible in list view	2020-07-30 13:49:13 +05:30
Rucha Mahabal	621529adfb	fix: unlink item from healthcare service unit type (#22828 ) Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-07-30 13:18:41 +05:30
Marica	c0ea2bc804	Merge branch 'develop' into validate-patient-transfer-time	2020-07-30 13:10:19 +05:30
Saqib	031768f49d	chore: asset form reorder (#22833 ) Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-07-30 12:40:53 +05:30
Rucha Mahabal	ff0b9bffcf	feat: added dashboard for Lab Test Template	2020-07-30 12:16:56 +05:30
Rucha Mahabal	440c752529	chore: Lab Test Template form clean-up	2020-07-30 12:16:18 +05:30
Anupam K	6bab21483c	report lost opportunity	2020-07-30 00:41:06 +05:30
barredterra	517df5fb0e	fix: codacy (again)	2020-07-29 18:16:49 +02:00
barredterra	b719378ee5	fix: codacy	2020-07-29 18:11:04 +02:00
Shivam Mishra	5b056988a6	Merge branch 'develop' of https://github.com/frappe/erpnext into support-search	2020-07-29 21:16:35 +05:30
barredterra	dec2c90866	refactor: move datev-specific stuff to utils	2020-07-29 17:14:23 +02:00
Prssanna Desai	9e81bb9a11	fix: add range filters to oldest items chart (#22842 )	2020-07-29 17:28:30 +05:30
Anupam K	61bfb8c817	Merge branch 'develop' of https://github.com/frappe/erpnext into crm-reports	2020-07-29 15:45:55 +05:30
Saqib Ansari	8cfa00920e	fix: cannot submit value adjustment with custom dimension	2020-07-29 15:24:03 +05:30
anoop	5903002039	fix: exclude Cancelled appointments while Get Items in Sales Invoice	2020-07-28 21:15:54 +05:30
Rucha Mahabal	a695971596	fix: show the standard validation message Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-07-28 20:15:29 +05:30
Rucha Mahabal	7cbc7946af	fix: validate check out and check in time for inpatient occupancy	2020-07-28 14:11:12 +05:30
Marica	c1e46d8131	Merge branch 'develop' into fix-payment-entry-wrong-bank-account-fetch-develop	2020-07-28 12:29:47 +05:30
Rucha Mahabal	81ae6c3240	fix: reload HR Settings to fix failing setup (#22802 ) Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-07-28 12:27:41 +05:30
Nabin Hait	701474cbaa	fix: POS patch fix (#22818 )	2020-07-28 09:11:37 +05:30
Shivam Mishra	48be7d37b8	fix: add order_by explicitly for lead (#22820 )	2020-07-28 09:00:09 +05:30
Deepesh Garg	9119b4c538	fix: Unable to submit backdated stock transactions for different items (#22648 ) * fix: Unable to submit backdated stock transactions for different items * fix: Test cases * fix: Test Cases * fix: Test Cases * fix: Test for stock account JV * fix: Journal Entry Test	2020-07-28 08:49:44 +05:30
Rucha Mahabal	fdcaecb58c	Merge branch 'develop' into education-dashboard	2020-07-27 22:23:08 +05:30
Rucha Mahabal	9a2cc74414	feat: onboarding for Education module	2020-07-27 21:33:00 +05:30
Anupam K	9ceeefbd2b	refactor: CRM Reports	2020-07-27 19:56:07 +05:30
Rucha Mahabal	6c11f26a11	feat: Education dashboard charts and number cards	2020-07-27 18:50:04 +05:30
Rucha Mahabal	49140ccbfd	feat: Program wise Fee Collection Query Report	2020-07-27 18:48:15 +05:30
Shivam Mishra	97a316c09a	feat: add create customer button to member	2020-07-27 15:27:09 +05:30
Shivam Mishra	9e3776e001	feat: improve webhook logging	2020-07-27 14:26:37 +05:30
Shivam Mishra	e43d362d53	feat: verbose logging for verification	2020-07-27 14:19:36 +05:30
Shivam Mishra	4e40b9bdbe	feat: log everything	2020-07-27 14:19:36 +05:30
bhavesh95863	bcb49e59e7	fix: Add missing translation function (#22813 ) * fix: Add missing translation function Add missing translation function * fix: Add missing function for translation * fix: Add missing translation function * fix: Add missing translation function	2020-07-26 14:02:16 +05:30
Anupam K	8718daa11e	Adding formatter in budget variance report	2020-07-25 23:56:11 +05:30
Deepesh Garg	b2fccc1d05	Merge pull request #22800 from ruchamahabal/fix-assessment-report fix(Education): course wise assessment report labels	2020-07-24 19:12:24 +05:30
Deepesh Garg	c591b77613	Merge branch 'develop' into fix-payment-entry-wrong-bank-account-fetch-develop	2020-07-24 19:04:05 +05:30
Mangesh-Khairnar	8721530b4b	fix(payment-request): do not set guest as administrator (#22801 )	2020-07-24 17:19:56 +05:30
Rucha Mahabal	860a824a7c	fix: change label for final grade	2020-07-24 14:32:36 +05:30
Rucha Mahabal	27835b7789	fix: add labels to chart datasets in course wise assessment	2020-07-24 14:07:00 +05:30
Rucha Mahabal	1010feefe0	feat: Patient Progress Page (#22474 ) * feat: add patient progress page * feat: patient progress sidebar * feat: Patient Progress Charts * feat: set up sidebar links * feat: added heatmap chart for patient interactions * fix: styles * fix: add markers for max score in assessment charts * fix(style): mobile view css * fix: heatmap and percentage chart filters * feat: add time span filters to line charts * fix: make date fields mandatory in healthcare doctypes for better analytics * fix: title and filter styles * fix: handle null state for charts * feat: add Patient Progress Page to desk * feat: add date range filter to all charts * fix: code clean-up * fix: assign roles for Patient Progress Page Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-07-24 10:49:04 +05:30
Afshan	ecb1460440	fix: update the project after task deletion so that the % completed s… (#22591 ) * fix: update the project after task deletion so that the % completed shows correct value * fix: patch to correct % complete of previous projects * fix: for version-13 * fix: removed patch from v13 Co-authored-by: Marica <maricadsouza221197@gmail.com> Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com> Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-07-24 10:48:16 +05:30
Afshan	91fe10666e	fix: buying price for non stock item in gross profit report (#22616 ) * fix: buying price for non stock item in gross profit report * fix: refactor query	2020-07-24 09:49:17 +05:30
Nabin Hait	39969647ca	fix: Added missing project field in Purchase invoice (#22799 )	2020-07-24 09:48:54 +05:30
Nabin Hait	6bbd4d0c14	fix: Other charges on income tax (#22797 )	2020-07-24 09:20:48 +05:30
Anupam K	5d5f026a0d	fix: Target variance report signs	2020-07-24 02:32:45 +05:30
Deepesh Garg	7cb1613173	Merge pull request #22622 from AfshanKhan/add-age-range-in-stock-ageing feat: added range for age in stock ageing	2020-07-23 21:56:45 +05:30
Afshan	73b86d241c	fix: conversion to float	2020-07-23 21:09:27 +05:30
Rucha Mahabal	89f9346185	fix(Education): descriptions not copied while creating fees from fee structure (#22792 ) Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>	2020-07-23 20:59:56 +05:30
Deepesh Garg	9843e9f917	fix: Expnese claim outstanding while making payment entry (#22735 )	2020-07-23 20:58:57 +05:30
Afshan	13d2a34548	Merge remote-tracking branch 'upstream' into add-age-range-in-stock-ageing Merge remote-tracking branch 'upstream' into add-age-range-in-stock-ageing	2020-07-23 20:35:21 +05:30
Afshan	7965f655a2	Merge branch 'add-age-range-in-stock-ageing' of https://github.com/AfshanKhan/erpnext into add-age-range-in-stock-ageing Merge branch 'add-age-range-in-stock-ageing' of https://github.com/AfshanKhan/erpnext into add-age-range-in-stock-ageing	2020-07-23 20:33:43 +05:30
Afshan	775fbe74c5	fix: fixed the logic	2020-07-23 20:33:07 +05:30
Sun Howwrongbum	9bd5f1e4b0	fix: incorrect available_qty being set (#22539 ) * fix: incorrect available_qty being set * style: descriptive variables	2020-07-23 20:06:26 +05:30
Afshan	aa94abf601	fix: asset dashboard report changes (#22759 ) * fix: asset dashboard report changes * fix: moved static filters to dynamic filters Co-authored-by: Nabin Hait <nabinhait@gmail.com> Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-07-23 19:12:38 +05:30
Abhishek Balam	cb45836cda	feat(CRM): Email Group Option In Email Campaign (#22731 ) * new parent updating logic, made requested changes * feat: adding Email Group option in Email Campaign * fix: inv commas	2020-07-23 19:07:11 +05:30
Deepesh Garg	76028cde6a	Merge branch 'develop' into fix-payment-entry-wrong-bank-account-fetch-develop	2020-07-23 19:05:17 +05:30
Abhishek Balam	d05a98517d	Fix: Increase Length Of "In Words" and "In Words (Company Currency)" fields (#22732 ) * new parent updating logic, made requested changes * fix: Increase Length of In Words fields Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-07-23 19:01:31 +05:30
Deepesh Garg	718870f4a2	Merge pull request #22736 from Thunderbottom/set-homepage fix: reset homepage to home after unchecking products page	2020-07-23 18:53:37 +05:30
Nabin Hait	9389b3625a	Merge branch 'develop' into add-age-range-in-stock-ageing	2020-07-23 18:53:00 +05:30
Saqib	a6f98d48bc	refactor: POS workflow (#20789 ) * refactor: add pos invoice doctype replacing sales invoice in POS * refactor: move pos.py to pos invoice * feat: add pos invoice merge log doctype * feat: ability to merge pos invoices into a sales invoice * feat: [wip] new ui for point of sale * fix: pos.py moved to pos_invoice * feat: loyalty points for POS Invoice * fix: loyalty points on merging * feat: return against pos invoices * Merge 'fork/serial-no-selector' into refactor-pos-invoice * chore: status fix and set warehouse from pos profile * fix: naming series * feat: merge pos returns into credit notes * feat: add pos list action for merging into sales invoices * feat[UX]: add shortcuts & focus on search after customer selection * feat: stock validation from previous pos transactions * Merge 'fork/serial-no-selector' into refactor-pos-invoice * chore: fix df not found for base_amount precision * feat: serial no validation from previous pos transactions * chore: move pos.py into pos page * feat: pos opening voucher * feat: link pos closing voucher with opening voucher * chore: use map_doc instead of get_mapped_doc for better perf * feat: enforce opening voucher on pos page * feat: [ui] [wip] point of sale beta ui refactor * fix: auto fetching serial nos with batch no * feat: [ui] item details section for new pos ui * feat: remove item from cart * refactor: [ui] [wip] split point_of_sale into components * new payment component * new numberpad * fix pos opening status * move from flex to grids * fix: search from item selector * feat: loyalty points as payment method * feat: pos invoice status * fix a bug with invalid JSON * fix: loyalty program ui fixes * feat: past order list and past order summary * feat: (minor) setting discount from item details * fix: adding item before customer selection * feat: post order submission summary * save and open draft orders * fix: item group filter * fix: item_det not defined while submitting sle * fix: minor bugs * fix: minor ux fixes * feat: show opening time in pos ui * feat: item and customer images * feat: emailing and printing an invoice * fix: item details field edit shows empty alert * fix: (minor) ux fixes * chore: rename pos opening voucher to pos opening entry * chore: (minor) rename pos closing voucher and sub doctypes * chore: add patch for renaming pos closing doctypes * fix: negative stock not allowed in pos invoices* default is_pos in pos invoices* fix: transalation * fix: invoices not getting fetched on pos closing * fix: indentation * feat: view / edit customer info * fix: minor bugs * fix: minor bug * fix: patch * fix: minor ux issues * fix: remove uppercase status * refactor: pos closing payment reconciliation * fix: move pos invoice print formats to pos invoice doctype * fix: ui issues * feat: new child doctype to store pos payment mode details * fix: add to patches.txt * feat: search by serial no * chore: [wip] code cleanup * fix: item not selectable from cart * chore: [wip] code cleanup * fix: minor issues * loyalty points transactions * default payment mode * fix: minor fixes * set correct mop amount with loaylty points * editing draft invoices from UI * chore: pos invoice merge log tests * fix: batch / serial validation in pos ui and on submission * feat: use onscan js for barcode scan events * fix: cart header with amount column * fix: validate batch no and qty in pos transactions * chore: do not fetch closing balances as opening balance * feat: show available qty in item selector * feat: shortcuts * fix: onscan.js not found * fix: onscan.js not found * fix: cannot return partial items * fix: neagtive stock indicator * feat: invoice discount * fix: change available stock on warehouse change * chore: cleanup code * fix: pos profile payment method table * feat: adding same item with different uom * fix: loyalty points deleted after consolidation * fix: enter loyalty amount instead of loyalty points * chore: return print format * feat: custom fields in pos view * chore: pos invoice test * chore: remove offline pos * fix: cyclic dependency * fix: cyclic dependency * patch: remove pos page and order fixes * chore: little fixes * fix: patch perf and plural naming * chore: tidy up pos invoice validation * chore: move pos closing to accounts * fix: move pos doctypes to accounts * fix: move pos doctypes to accounts * fix: item description in cart * fix: item description in cart * chore: loyalty tests * minor fixes * chore: rename point of sale beta to point of sale * chore: reset past order summary on filter change * chore: add point of sale to accounting desk * fix: payment reconciliation table in pos closing * fix: travis * Update accounting.json * fix: test cases * fix: tests * patch loyalty point entries * fix: remove test * default mode of payment is mandatory for pos transaction * chore: remove unused checks from pos profile * fix: loyalty point entry patch * fix: numpad reset and patches * fix: minor bugs * fix: travis * fix: travis * fix: travis * fix: travis Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-07-23 18:51:26 +05:30
Nabin Hait	8712ac6d39	fix: Job offer is mandatory for employee onboarding (#22791 )	2020-07-23 18:09:35 +05:30
Marica	3c8c346227	fix: Pick List empty table and Serial-Batch items handling (#22426 ) * chore: Pick List empty table and serial-batch items handling * fix: Remove console statement * chore: Added tests for batched and batched-serialised item	2020-07-23 17:52:06 +05:30
Afshan	55125fbe4e	fix: moved custom_make_buttons to PurchaseOrderController to avoid duplication of dropdown options (#22744 )	2020-07-23 17:44:38 +05:30
Rucha Mahabal	833682b03d	feat(Education): Student Attendance and Leave Enhancements (#22623 ) * feat: make Student Attendance doctype submittable * feat: add attendance related fields in Student Leave Application * feat: update Attendance records on Leave Application submission * refactor: better error messages and ORM queries * fix: show present only for leave applications with mark_as_present enabled in attendance reports * test: Student Leave Application * fix: filter for attendance records * fix: codacy issues	2020-07-23 16:40:07 +05:30
Anupam Kumar	04a76285e2	fix: Unable to change link from new lead to existing customer (#22787 ) * Unable to change link from new lead to existing customer * Unable to change link from new lead to existing customer Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>	2020-07-23 16:30:56 +05:30
Anupam Kumar	7137b0b670	refactor: shopping cart (#22617 ) * refactoring shopping cart settings * adding column_break in shopping cart settings	2020-07-23 15:58:47 +05:30
Rucha Mahabal	5142fc9365	feat(Education): added form dashboards and refactored custom buttons for better linking (#22727 ) * feat: add form dashboards to all forms in Education Module * feat: Add Course to Programs button in Course DocType * refactor: custom buttons in Education module forms * feat: buttons to add topic, article, quiz to their respective parent doctypes * feat: add charts to form dashboards * fix: code cleanup	2020-07-23 15:57:27 +05:30
KanchanChauhan	2826fd3c20	feat: Dunning (#22559 ) * feat: Dunning * fix: Replaces spaces with tab Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-07-23 15:45:03 +05:30
Afshan	767ee1cdb8	fix: logic to get other items also other than just 1st one	2020-07-23 15:39:27 +05:30
Anoop	23481cc484	feat: Laboratory Module Enhancements (#22416 ) * feat: option to add organism count in descriptive tests print format to accommodate descriptive test changes fix: refactoring, clean up wip * lab test - result based on secondary uom, result format options lab test print - consider result format options, result legend and worksheet instructions * feat: option to allow results blank in lab test if configured via lab test template * fix: rename child doctypes, rename related links * fix: field display depends on, cleanup - rename fields and variables * fix: get from encounter popup layout, code cleanup and minor fixes * fix: sms send dialog bug * fix: lab test get from encounter html class name typo corrected * fix: lab test organisms depends on condition * fix: reorder fields - depends on fields brought together * fix: PR review feedback, removed : separator, result formatting applied to result UOM * fix: child table js removed * fix: internal field require_result_value hidden, secondary uom result field type set to data * fix: Use ORM methods instead of db.sql, code cleanup, style * fix: create item price for lab test template if billable, code cleanup * fix: patch rename doctypes before fields, deleted renamed child doctypes * fix: secondary uom result calc - warn user if calculation fails * fix: patch to insert entries into renamed child tables * fix: codacy issues * fix: patch duplicate error as items are already migrated in v12 migrate organisms child table field name updated * fix: patch a bit lenghty, added comments * fix: patch * fix: require_result_value flag marked hidden * fix: code cleanup-up * fix: patch - lab_test rename field, lab_test_group_template select option corrected Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-07-23 15:00:54 +05:30
Anurag Mishra	453325fbc9	fix: job applicant fixes (#22448 ) * fix(validation): not two job offer should be allowed for single job_applicant * fix: don't allow to create employee_onboarding without job offer * fix: server side validation * fix: requested changes	2020-07-23 12:22:42 +05:30
Deepesh Garg	7ac4ad8410	fix: Error due to comma in Pricing rule name (#22741 ) * fix: Error due to commma in Pricing rule name * fix: Remove print statement * fix: Tests Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-07-23 12:12:55 +05:30
Anurag Mishra	9aa0602065	Fix: HR and Payroll Dashboard (#22771 ) * Fix: HR and Payroll Dashboard * fix: requested changes	2020-07-23 12:10:48 +05:30
Chinmay D. Pai	3e503e4404	chore: do not reset homepage through hooks Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>	2020-07-23 12:06:19 +05:30
Anurag Mishra	ce5b490f66	feat : Recruitment analytics (#21732 ) * feat: recruitment_anlytics * fix: filters * feat: added missing column designation Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-07-23 12:04:58 +05:30
Deepesh Garg	9c49f2d886	feat: Enhancement in subscription (#22263 ) * feat: Add supplier in subscription doctype * fix: Code cleanup * fix: Add dynamic link in subscription invoices * fix: Multiple enhanccement in subscription * feat: Follow calendar months in subscription * fix: Test Cases and patch * fix: Patch * fix: Update patch and add fixes * fix: Update permission for subscription settings * fix: Patch and Test * fix: Add cost center dimension in Subscripiton	2020-07-23 11:11:23 +05:30
Anupam Kumar	a18f2ec23e	fix: setting filter for project in kanban board (#22717 ) Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-07-23 11:09:17 +05:30
Marica	43b4b1cb55	chore: Export Buying Dashboard (#22767 ) * chore: Export Buying Dashboard * fix: Use Timespan instead of Between for static filters	2020-07-23 11:08:49 +05:30
Anupam Kumar	4a5fc23d5c	Export Project dashboard (#22782 )	2020-07-23 11:07:56 +05:30
Marica	f207f48a67	Merge branch 'develop' into change-video-doctype-module	2020-07-22 21:22:39 +05:30
Prssanna Desai	fb89906354	fix: pass date range instead of from date (#22114 ) * fix: pass date range instead of from date * fix: escape inputs Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>	2020-07-22 20:17:50 +05:30
Marica	3994aa8b06	fix: Same Contact name for different parties at Portal Login (#22715 )	2020-07-22 19:49:54 +05:30
Rucha Mahabal	f4a7adbf2e	refactor: Education Desk Page	2020-07-22 18:59:04 +05:30
Marica	2ee64ceaff	Merge branch 'develop' into club-mr-column	2020-07-22 18:52:10 +05:30
Deepesh Garg	c88a3b4bf9	Merge pull request #22765 from anupamvs/rfq feat: Provision to make RFQ against Opportunity	2020-07-22 18:28:48 +05:30
rohitwaghchaure	d45ff31ff0	fix: incorrect stock after merging the items (#22526 ) * fix: incorrect stock after merging items * fix: Readability fix Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-07-22 18:24:01 +05:30
Deepesh Garg	7c50f421e1	fix: Move branch code back to bank account (#22725 ) * fix: Move branch code back to bank account * fix: Patch	2020-07-22 18:21:04 +05:30
Anupam Kumar	3e4b5e5496	fix: item-wise sales history report (#22783 )	2020-07-22 18:17:58 +05:30
Anupam Kumar	e519334dfc	feat: Export CRM dashboard (#22778 ) * feat: Exported CRM dashboard * feat: Export CRM Dashboard * fix: adding company in all dashboard and number card	2020-07-22 18:16:57 +05:30
Anupam K	5bd0b93acf	fix: cur_frm -> frm	2020-07-22 18:10:57 +05:30
Anupam Kumar	93afbe143b	feat: Export Selling Dashboard (#22776 ) * feat:Export Stock Dashboard * Export Selling Dashboard * Export Selling Dashboard	2020-07-22 18:07:39 +05:30
Deepesh Garg	c7eadfceb0	fix: Multi currency payment reconciliation (#22738 ) * fix: Multi currency payment reconciliation * fix: Hide currency link fields	2020-07-22 17:59:37 +05:30
Prssanna Desai	f098221550	feat: Exported manufacturing dashboard (#22626 ) * feat: exported Manufacturing Dashboard * fix: update use_report_chart fieldname * fix: add dynamic filter for company in Produced Quantity chart	2020-07-22 16:58:17 +05:30
sahil28297	3d3c922d7f	fix(patch): handle duplicate entry error while inserting account (#22745 )	2020-07-22 16:42:31 +05:30
Marica	514366654e	fix: Serial No Rename does not affect Stock Ledger Entry (#22746 ) * Revert "fix: Remove rename related code from Serial No (#22627)" This reverts commit `1ec2d962db`. * fix: Rename fails on Stock Ledger Entry * fix: Allow Rename in Serial No	2020-07-22 16:40:24 +05:30
Marica	53646cb360	chore: Export Stock Dashboard (#22768 )	2020-07-22 16:17:40 +05:30
Shivam Mishra	f50312b6d2	fix: button sizing (#22777 )	2020-07-22 16:17:11 +05:30
Rucha Mahabal	1fddc6d126	chore: Exported Accounts Module Dashboard (#22769 ) * chore: Exported Accounts Module Dashboards * chore: deleted dashboard fixtures for Accounts module	2020-07-22 16:11:06 +05:30
Afshan	6b9acf4476	updated patch to delete auto email reports and moved patch to v13 from v12	2020-07-22 16:00:18 +05:30
Rucha Mahabal	8d28eacb09	chore: Exported Healthcare Module Dashboard (#22775 )	2020-07-22 15:57:33 +05:30
Deepesh Garg	d6615248a8	Merge pull request #22762 from DeeMysterio/financial-stat fix(report): fix alignment in script report that extends financial_statements.js	2020-07-22 14:45:22 +05:30
Anupam K	de417d2774	feat: Provision to make RFQ against Opportunity	2020-07-22 01:05:32 +05:30
Afshan	871889220b	style: moved parent warehouse to top section also added a section bre… (#22708 ) * style: moved parent warehouse to top section also added a section break for better look * style: changes display depends on for HTML field Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-07-21 20:39:00 +05:30
Afshan	66d4b42df0	fix: update set query for warehouse after changing the company (#22632 ) * fix: update set query for warehouse after changing the company * fix: changed set_query to get_query * fix: variable filter doesn't get updated once set on load hence removed Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-07-21 19:59:30 +05:30
Rucha Mahabal	ffbd7b4087	fix: move Video DocType from Core to Utilities module	2020-07-21 19:40:18 +05:30
Diksha Jadhav	09b8caf866	fix(report): fix alignment in script report that extends financial_statements.js	2020-07-21 17:35:10 +05:30
Deepesh Garg	9e5aa282ec	Merge pull request #22753 from nabinhait/trial-balance-opening-cancelled-entry-fix fix: Ignore cancelled entries in trial balance opening	2020-07-21 16:42:02 +05:30
Abhishek Balam	a5b83e85c3	feat: dashboard for timesheet (#22750 )	2020-07-21 12:54:59 +05:30
Nabin Hait	493b581862	fix: Ignore cancelled entries in trial balance opening	2020-07-21 12:47:16 +05:30
Marica	8ec4198af2	Merge branch 'develop' into club-mr-column	2020-07-20 16:07:10 +05:30
Afshan	2b21b7bafa	fix: moved custom_make_buttons to PurchaseOrderController to avoid duplication of dropdown options	2020-07-20 16:05:52 +05:30
michellealva	8c7d8ba917	fix: remove tab in code	2020-07-20 13:12:17 +05:30
michellealva	37cd1b8021	fix: Heatmap in Vehicle	2020-07-20 13:04:46 +05:30
Deepesh Garg	04e8af7dca	Merge branch 'develop' of https://github.com/frappe/erpnext into loan_patch_and_fixes	2020-07-20 09:53:26 +05:30
Chinmay D. Pai	33bf0574a3	chore: fix get single value call Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>	2020-07-19 15:54:11 +05:30
Chinmay D. Pai	5bda28eae6	fix: reset homepage to home after unchecking products page resets homepage back to home when "home page is products" is unchecked Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>	2020-07-19 00:15:40 +05:30
Deepesh Garg	d81372a39c	Merge pull request #22734 from deepeshgarg007/custom_cash_flow fix: Period list api changes for custom cash flow report	2020-07-18 20:35:28 +05:30
Deepesh Garg	07f8e749be	fix: Period list api changes for custom cash flow report	2020-07-18 19:47:33 +05:30
Deepesh Garg	f6c70bca0a	Merge pull request #22615 from aerele/fix_mandatory_error fix: log type mandatory error while exposing api call to employee checkin.	2020-07-17 17:38:21 +05:30
Deepesh Garg	2fd4aa3051	Merge pull request #22661 from frappe/lead-owner-efficiency fix: making owner fieldtype to link	2020-07-17 17:36:59 +05:30
rohitwaghchaure	f4db8c1c11	Merge pull request #22724 from rohitwaghchaure/fixed-incorrect-currency-symbol-in-stock-balance-report-develop fix: currency symbol not showing as per company currency in stock balance report	2020-07-17 16:56:22 +05:30
rohitwaghchaure	b4ef13c686	Merge pull request #22726 from rohitwaghchaure/fixed-actual-qty-showing-as-zero-develop fix: Stock Reconciliation Invalid Quantity for Batched Item	2020-07-17 16:55:59 +05:30
Rucha Mahabal	3e6fe38d02	Merge branch 'develop' into fix-maintenance-visit	2020-07-17 16:34:59 +05:30
Rohit Waghchaure	2347e69cb9	fix: for past dated stock reco, batched item showing the current available qty instead of quantity as per posting date	2020-07-17 14:50:49 +05:30
Rohit Waghchaure	848568d023	fix: currency symbol not showing as per company currency in stock balance	2020-07-17 14:49:12 +05:30
rohitwaghchaure	7e56e80057	Merge pull request #22721 from deepeshgarg007/gstr_test fix: Multiple fixes in GST	2020-07-17 14:34:43 +05:30
Mangesh-Khairnar	9be6787b80	fix(maintenance-visit): change fieldtype of status to select	2020-07-17 12:51:49 +05:30
Rucha Mahabal	7e64a1f170	Merge branch 'develop' into issue-list-action	2020-07-17 11:48:23 +05:30
Deepesh Garg	188273564c	fix: Multiple fixes in GST	2020-07-17 11:31:15 +05:30
michellealva	d02465a68f	fix: Update modified timestamp for Delivery Note Item	2020-07-17 10:35:16 +05:30
marination	6319073d81	fix: Move Issue List actions under 'Actions' dropdown	2020-07-16 15:38:51 +05:30
Karthikeyan S	ff6ba25386	fix: remove FE validation for log_type field	2020-07-16 13:33:38 +05:30
Anurag Mishra	ac23ac6a02	fix: validation for additional salary (#22645 ) * fix: validation for additional salary * fix:changes requested Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com> Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-07-16 13:10:43 +05:30
Rucha Mahabal	6b3110ed13	Merge branch 'develop' into expense-claim-payment-fix	2020-07-16 12:23:26 +05:30
Anurag Mishra	50902cf30c	Fix: Changes Requested	2020-07-16 12:21:46 +05:30
Suraj Shetty	11b0554ae9	Merge branch 'develop' into fix-financial-statement-print-format	2020-07-16 09:45:26 +05:30
Deepesh Garg	52c319cfa7	fix: Update RCM only for indian countries	2020-07-16 00:23:58 +05:30
Deepesh Garg	2af43b3df6	fix: linting	2020-07-15 21:54:28 +05:30
Deepesh Garg	49821df0ae	Merge pull request #22697 from rohitwaghchaure/fixed-not-able-to-submit-si fix: not able to submit sales invoice	2020-07-15 21:51:16 +05:30
Deepesh Garg	177bbd8e20	Merge pull request #22701 from deepeshgarg007/gstr3b_cess fix: Cess amount in GSTR 3B report	2020-07-15 18:20:42 +05:30
Deepesh Garg	0fa4143bac	fix: Cess amount in GSTR 3B report	2020-07-15 18:17:38 +05:30
rohitwaghchaure	8ff821970a	Merge pull request #22700 from rohitwaghchaure/fixed-incorrect-balance-qty-in-stock-ledger-develop fix: incorrect balance qty in stock ledger report	2020-07-15 17:25:11 +05:30
Rohit Waghchaure	132376750c	fix: incorrect balance qty in stock ledger report	2020-07-15 17:23:17 +05:30
Rohit Waghchaure	e0de0ac617	fix: not able to submit sales invoice	2020-07-15 17:13:43 +05:30
Rohit Waghchaure	07cc918d70	fix: patch update_actual_start_and_end_date_in_wo	2020-07-15 16:41:32 +05:30
Suraj Shetty	34617744e1	fix: Show total row in print format of financial statement	2020-07-15 16:37:21 +05:30
rohitwaghchaure	f16bd00463	Merge pull request #22608 from ruchamahabal/fix-sla-ui fix: allow creating SLA documents even if SLA tracking is not enabled	2020-07-15 15:47:37 +05:30
rohitwaghchaure	30030230bf	Merge pull request #22675 from marination/material-request-warehouse fix: Dont overwrite default warehouse in Material Request	2020-07-15 15:35:38 +05:30
rohitwaghchaure	7c08ff7572	Merge pull request #22596 from marination/exploded-item-rate fix: Exploded Item Rate in BOM	2020-07-15 14:30:27 +05:30
Rohit Waghchaure	e1b3f16abd	fix: project field added two time in purchase receipt	2020-07-15 12:28:19 +05:30
Deepesh Garg	5beac7a0cc	fix: Period list fixes in financial statements (#22677 )	2020-07-15 12:17:43 +05:30
Anurag Mishra	c1636f8fab	fix: conversion rate as 1 if no conversion rate	2020-07-14 18:58:02 +05:30
marination	392f323d2d	fix: Dont overwrite default warehouse in Material Request	2020-07-14 17:03:17 +05:30
rohitwaghchaure	eb2a42d9e1	Merge pull request #22589 from deepeshgarg007/rcm_fix fix: Do not add GST tax amount in grand total for reverse charge invoices	2020-07-14 13:42:48 +05:30
Rucha Mahabal	c4a1b34811	Merge branch 'develop' into fix-sla-error	2020-07-14 13:24:57 +05:30
Marica	82a606d04b	fix: Added Project Field in Purchase Receipt for Stock Ledger Tagging (#22666 )	2020-07-14 13:16:28 +05:30
Anupam Kumar	c5f14da99c	Merge branch 'develop' into lead-owner-efficiency	2020-07-14 12:59:42 +05:30
Rucha Mahabal	88931f0677	fix(Support): TypeError while saving Service Level Agreement	2020-07-14 11:46:11 +05:30
John Veness	72320afb07	Correct help link for Address (#22673 )	2020-07-14 10:44:15 +05:30
bhavesh95863	eb69859d3e	fix: Quotation list view blank if quotation_to field not set as a standard filter	2020-07-13 23:15:31 +05:30
rohitwaghchaure	165d57aa0b	Merge pull request #22663 from rohitwaghchaure/fixed-error-report-related-to-task-develop fix: '>' not supported between instances of 'str' and 'int'	2020-07-13 18:11:50 +05:30
rohitwaghchaure	165eb5a1c3	Merge pull request #22665 from marination/maintenance-schedule fix: Block Invalid Serial No updates in Maintenance Schedule	2020-07-13 18:11:06 +05:30
rohitwaghchaure	62fe2cac19	Merge pull request #22051 from deepeshgarg007/project-link-for-all-accounts fix: Project link not set in accounts other than profit and loss accounts	2020-07-13 18:09:41 +05:30
Marica	3f8840cd7a	Merge branch 'develop' into maintenance-schedule	2020-07-13 15:24:37 +05:30
Rucha Mahabal	68cc3e4220	Merge branch 'develop' into fix-sla-ui	2020-07-13 14:40:01 +05:30
Anurag Mishra	b9d8ff91a5	Merge branch 'develop' into lead-owner-efficiency	2020-07-13 14:22:34 +05:30
Anurag Mishra	d38c22d85d	Merge branch 'develop' into fixed-error-report-related-to-task-develop	2020-07-13 14:21:58 +05:30
rohitwaghchaure	a8fea8df98	Merge pull request #22614 from deepeshgarg007/payment_reco_cost_center_fix fix: Add default cost center in payment reconciliation JV	2020-07-13 13:44:49 +05:30
marination	1791bc187b	fix: Block Invalid Serial No updates in Maintenance Schedule	2020-07-13 12:32:09 +05:30
Rohit Waghchaure	2e8d8b9aeb	fix: '>' not supported between instances of 'str' and 'int'	2020-07-13 12:09:10 +05:30
rohitwaghchaure	ac984eb37c	Merge branch 'develop' into project-link-for-all-accounts	2020-07-13 11:50:11 +05:30
Afshan	ccf6b5f640	Merge remote-tracking branch 'upstream/develop' into add-age-range-in-stock-ageing Merge remote-tracking branch 'upstream/develop' into add-age-range-in-stock-ageing	2020-07-13 11:45:33 +05:30
Afshan	e40605d711	Merge remote-tracking branch 'upstream/develop' into club-mr-column Merge remote-tracking branch 'upstream/develop' into club-mr-column	2020-07-13 11:43:19 +05:30
Deepesh Garg	f5a457c397	Merge branch 'develop' into lead-owner-efficiency	2020-07-13 11:32:09 +05:30
Anupam K	cd445786fe	making owner fieldtype to link	2020-07-12 20:03:15 +05:30
Afshan	d058840094	fix: removed fiscal year field from "Request for Quotation" doctype (#22446 ) * fix: removed fiscal year field from "Request for Quotation" doctype	2020-07-12 19:19:59 +05:30
Raffael Meyer	193e12f02a	fix: download button (#22652 )	2020-07-12 17:26:27 +05:30
Afshan	83cd1dcc44	fix: Add project filter in parent task field (#22655 ) * fix: Add project filter in parent task field	2020-07-11 21:54:54 +05:30
Deepesh Garg	1ab228b52e	Merge pull request #22657 from deepeshgarg007/eway_bill_json_gen fix: ewaybill json had json dump of json dump, and other related fixes	2020-07-11 21:42:01 +05:30
Sagar Vora	c9b4ba6de8	fix: ewaybill json had json dump of json dump, and other related fixes	2020-07-11 21:29:17 +05:30
Deepesh Garg	62d047bf9b	Merge branch 'develop' into payment_reco_cost_center_fix	2020-07-11 21:05:32 +05:30
Deepesh Garg	8cdf33f618	Merge pull request #22635 from deepeshgarg007/item_tax_test fix(travis): Item Tax template test	2020-07-11 21:04:31 +05:30
Deepesh Garg	a9820cdcf6	fix: Remove every bit of randomness from this test	2020-07-11 19:38:51 +05:30
Deepesh Garg	46bcb46422	fix: Do not use random customers	2020-07-11 18:36:32 +05:30
Deepesh Garg	f15ff5fbfa	fix: Test	2020-07-11 13:58:53 +05:30
Deepesh Garg	87eb2827ef	fix: Update tests	2020-07-10 22:45:45 +05:30
marination	a6c10b1bc0	fix: Pricing Rule breaks if no item_code	2020-07-10 20:09:58 +05:30
Karthikeyan S	183ebb237e	Merge branch 'develop' into fix_mandatory_error	2020-07-10 18:05:18 +05:30
gavin	ecf2bae041	Merge branch 'develop' into erpnext-install-check	2020-07-10 17:42:39 +05:30
Afshan	e9affe3705	merge branch develop	2020-07-10 16:31:40 +05:30
Faris Ansari	70aa3c0b1f	fix: Remove explicit exception Co-authored-by: gavin <gavin18d@gmail.com>	2020-07-10 16:13:21 +05:30
Afshan	0863beec92	created new report named "requested_items_to_order_and_receive" removed report "requested_items_to_order" also wrote a patch for deleting old report from table "tabReport"	2020-07-10 15:14:01 +05:30
Afshan	dca8a1d69d	renamed "pending qty" to "qty to recieved"	2020-07-10 14:26:21 +05:30
rohitwaghchaure	bca8483dc8	Merge pull request #22634 from Anurag810/retention-bonus-fixes fix: default overwrite property and 'company' is not defined	2020-07-10 13:41:40 +05:30
Deepesh Garg	e99091fd4f	Merge pull request #22644 from deepeshgarg007/dcc_query fix: Distributed cost center query	2020-07-10 13:35:34 +05:30
Deepesh Garg	7cb195b304	fix: Distributed cost center query	2020-07-10 13:33:50 +05:30
Marica	eee12fbcb4	fix: Remove redundant variable declaration (#22641 )	2020-07-10 12:34:59 +05:30
Afshan	fd28f1071e	style: arrangements of filters for reports (#22636 )	2020-07-10 11:25:39 +05:30
rohitwaghchaure	3a3787f9e7	fix: Due to decimal issue make purchase receipt button not showing from PO (#22629 )	2020-07-09 20:07:40 +05:30
rohitwaghchaure	d14666e419	fix: incorrect delivered qty in Supplier-Wise Sales Analytics (#22631 )	2020-07-09 20:07:10 +05:30
Marica	1ec2d962db	fix: Remove rename related code from Serial No (#22627 )	2020-07-09 20:02:18 +05:30
Deepesh Garg	b74077faf5	fix(travis): Item Tax tempate template test	2020-07-09 19:50:41 +05:30
Anurag Mishra	d7563f0327	fix: default overwroite property n 'company' is not defined	2020-07-09 19:40:18 +05:30
Rohan	cdf55cef80	fix: fetch project-related info in Timesheet (#22423 ) Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-07-09 11:36:01 +05:30
Rucha Mahabal	6c6c36e780	fix: attribute error while cancelling patient encounter	2020-07-09 11:23:41 +05:30
Afshan	a629c9e1bc	style: remove import comment	2020-07-08 19:28:28 +05:30
Afshan	d16d0efde5	feat: added range for age in stock ageing	2020-07-08 19:23:13 +05:30
Rucha Mahabal	45b01d2c02	feat: add medical coding fields to Healthcare DocTypes (#22501 ) * feat: add medical coding fields to templates * feat: fetch medical codes from templates in forms * fix: codacy issues Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-07-08 15:39:45 +05:30
Afshan	e0ff0cfcb9	fix: fetch "Employee Leave Policy" from "Employee Grade" if available (#22570 ) * fix:fetch "Employee Leave Policy" from "Employee Grade" if available * fix: checked "Fetch IF Empty" checkbox Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-07-08 14:40:22 +05:30
Marica	b78dc75456	Merge pull request #22573 from deepeshgarg007/employee_tree feat: Added all companies option in employee tree to view employee ac…	2020-07-08 14:34:33 +05:30
rohitwaghchaure	0cd39e3a38	Merge pull request #22611 from frappe/hrms-dashboard-fix fix: HR dashboard number card filter	2020-07-08 14:33:45 +05:30
Marica	9e73fdd866	Merge branch 'develop' into employee_tree	2020-07-08 14:33:10 +05:30
Michelle Alva	5d514fe4df	fix: grammatical fixes in module onboarding (#22580 ) * fix: grammatical fixes in module onboarding * fix: more grammatical changes for consistency * fix: Reorder Stock Onboarding * fix: update success message * fix: change order of stock onboarding steps Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-07-08 14:25:51 +05:30
Marica	3f05a2692e	Merge branch 'develop' into employee_tree	2020-07-08 14:04:49 +05:30
rohitwaghchaure	41c9708f99	Merge branch 'develop' into project-link-for-all-accounts	2020-07-08 13:11:37 +05:30
Marica	0afdafdbce	Merge branch 'develop' into error-message	2020-07-08 13:07:01 +05:30
rohitwaghchaure	37d828eda6	Merge pull request #22511 from deepeshgarg007/gl_entry_ignore_validation fix: Do not ignore validate methods on GL entry submit	2020-07-08 13:06:47 +05:30
rohitwaghchaure	be9f8dc5db	Merge pull request #22522 from Anurag810/leave_application_fixes fix: set half day date None if half day is unchecked	2020-07-08 12:40:30 +05:30
rohitwaghchaure	1fce8b7475	Update leave_application.js	2020-07-08 12:40:01 +05:30
rohitwaghchaure	c7b63bfcaf	Merge pull request #22415 from Anurag810/payroll_entry_ux_fix_2.0 fix: Create salary slip button disappears	2020-07-08 12:35:24 +05:30
rohitwaghchaure	e862b3f9ce	Update payroll_entry.js	2020-07-08 12:34:15 +05:30
rohitwaghchaure	3431d42d12	Merge pull request #22610 from frappe/lead-creation-from-email fix: Creating Lead from email	2020-07-08 12:27:18 +05:30
rohitwaghchaure	50f48f5176	Merge pull request #22592 from frappe/number-card-filter-fix fix: crm dashboard Number card filter fix	2020-07-08 12:25:12 +05:30
rohitwaghchaure	fae570e0a2	Merge pull request #22612 from netchampfaris/fix-item-price-labels fix: Remove trailing spaces from labels	2020-07-08 12:14:21 +05:30
Faris Ansari	0a06580e2c	fix: Update message Co-authored-by: gavin <gavin18d@gmail.com>	2020-07-08 12:06:28 +05:30
Deepesh Garg	9071a7de82	fix: Add default cost center in payment reconciliation JV	2020-07-08 11:27:25 +05:30
Kaviya Periyasamy	923ed8a741	fix: log type mandatory error while exposing api call to employee checkin	2020-07-08 11:15:04 +05:30
Faris Ansari	f3a6e30e6a	fix: Check if homepage is not setup-wizard The new desk changes sets the default homepage to 'workspace'. To avoid problem in the future, check if the value is not setup-wizard. Also throw an exception if the check passes, so it exits with error.	2020-07-08 10:45:55 +05:30
Deepesh Garg	addd1e842b	Merge pull request #22568 from ahmadpak/develop fix: Item Tax Template permissions as per company	2020-07-08 10:08:53 +05:30
Faris Ansari	8c5c74ca06	fix: Remove trailing spaces from labels	2020-07-08 09:20:13 +05:30
Anupam K	6669f7457a	hr dashboard number card filter fix	2020-07-08 01:24:53 +05:30
Anupam K	8bc92b90f5	updating lead.py	2020-07-08 00:56:21 +05:30
Rucha Mahabal	3d14011d23	fix: allow creating SLA documents even if SLA tracking is not enabled	2020-07-07 18:30:54 +05:30
Afshan	e3269039d3	feat: added columns to get complete analysis for material request	2020-07-07 18:01:37 +05:30
Marica	4d5d706a4b	Merge branch 'develop' into error-message	2020-07-07 16:41:39 +05:30
Mitali Deshpande	f642be9727	fix: Changed error message in the Product Bundle	2020-07-07 16:14:01 +05:30
Marica	f4d0a3e7b0	Merge branch 'develop' into whitelist-query	2020-07-07 15:42:42 +05:30
rohitwaghchaure	546cfdaac2	Merge pull request #22601 from deepeshgarg007/payment_reco_company fix: Payment reco error in multi-company setup	2020-07-07 15:32:36 +05:30
Deepesh Garg	ca351e3549	fix: Pass company	2020-07-07 14:37:17 +05:30
Marica	8dbdf0902f	Merge branch 'develop' into whitelist-query	2020-07-07 14:29:24 +05:30
marination	32f3d24dac	fix: Employee benefit application & quality inspection whitelist	2020-07-07 14:31:49 +05:30
Deepesh Garg	e2fdff5777	fix: Payment reco error in multicompany setup	2020-07-07 14:14:07 +05:30
Marica	7860d9e699	Merge branch 'develop' into whitelist-query	2020-07-07 11:53:19 +05:30
Afshan	70b3edd502	fix: format according to cordacy	2020-07-07 00:03:45 +05:30
Afshan	3819c0bf28	fix: cost center should only show option of selectedcompany	2020-07-06 23:52:11 +05:30
Marica	d187a6ac48	Merge branch 'develop' into exploded-item-rate	2020-07-06 23:35:37 +05:30
marination	4355d3cf0f	fix: Exploded Item Rate	2020-07-06 23:15:08 +05:30
Marica	5f299a08bd	fix: General Message in previous doc validation for buying and selling (#22546 )	2020-07-06 18:26:56 +05:30
Marica	e3e5fd7e74	fix: Skip Progress and Completed by fields on Task Duplication (#22565 )	2020-07-06 18:26:19 +05:30
rohitwaghchaure	39933a4db1	Merge pull request #22441 from nextchamp-saqib/asset-delete-fix fix: cannot cancel asset and asset movement	2020-07-06 16:13:55 +05:30
Anupam K	8b26ea720b	Merge branch 'develop' of https://github.com/frappe/erpnext into number-card-filter-fix	2020-07-06 15:21:53 +05:30
rohitwaghchaure	71e1d2cc79	Merge pull request #22563 from AndyOverLord/patch-6 fix: fetch item price in sales invoice	2020-07-06 14:18:03 +05:30
Deepesh Garg	05738bd29a	fix: Remove print statements	2020-07-06 13:40:48 +05:30
rohitwaghchaure	661bc46b81	Merge pull request #22571 from marination/quality-feedback fix: Quality Feedback and Template (minor)	2020-07-06 13:17:10 +05:30
rohitwaghchaure	1cc1fd4f86	Merge pull request #22576 from marination/party-details fix: Check for Company before trying to fetch party details	2020-07-06 12:42:16 +05:30
Deepesh Garg	92a03aa5db	Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts	2020-07-06 12:37:28 +05:30
rohitwaghchaure	e5d9ebe32e	Merge pull request #22577 from deepeshgarg007/coa_fiscal_year_fix fix: Consider company fiscal year for getting balance	2020-07-06 12:34:56 +05:30
Anupam K	e88f2bb053	number card filter	2020-07-06 12:34:05 +05:30
Marica	7e198527b9	Merge branch 'develop' into party-details	2020-07-06 11:09:20 +05:30
Saqib	819879dd12	Merge branch 'develop' into asset-delete-fix	2020-07-05 18:38:51 +05:30
Deepesh Garg	be05c4e14a	fix: Codacy and minor fixes	2020-07-05 18:16:16 +05:30
Deepesh Garg	4993ab5191	Merge branch 'develop' into develop	2020-07-04 18:28:06 +05:30
rohitwaghchaure	3292e63dee	Merge pull request #22569 from rohitwaghchaure/fixed-travis-failing-due-to-loan-issue fix: travis	2020-07-04 14:14:52 +05:30
Rohit Waghchaure	f0f4f70a76	fix: test case for salary slip	2020-07-04 13:30:22 +05:30
Deepesh Garg	96d40ec9da	fix: Consider company fiscal for getting balalnce	2020-07-03 22:59:00 +05:30
marination	e27b996e38	fix: Check for Company before trying to fetch party details	2020-07-03 22:12:00 +05:30
Deepesh Garg	62181707ee	Merge pull request #22574 from deepeshgarg007/uae_item_tax_fix fix: Update item tax only if item code available	2020-07-03 21:25:28 +05:30
Deepesh Garg	04661a4e15	fix: Update item tax only if item code available	2020-07-03 21:23:23 +05:30
Rohit Waghchaure	2cbf598b4b	fix: travis	2020-07-03 20:15:18 +05:30
Deepesh Garg	d7adacd3e2	feat: Added all companies option in employee tree to view employee accress all companies	2020-07-03 18:39:51 +05:30
marination	8e62035991	fix: Quality Feedback and Template (minor)	2020-07-03 16:19:55 +05:30
mohammadahmad1990	405b20884b	fix: patch	2020-07-03 15:15:27 +05:00
mohammadahmad1990	b2725577b2	Patch file updated	2020-07-03 15:06:36 +05:00
mohammadahmad1990	f933cf80df	Patch for Updating item Tax Template Company	2020-07-03 15:04:37 +05:00
mohammadahmad1990	261ecba3d6	Company field removed from Item Taxes Table	2020-07-03 15:04:28 +05:00
mohammadahmad1990	ad3d44d622	fix: Item Tax Template check on company field	2020-07-03 15:02:39 +05:00
mohammadahmad1990	015910b4c4	Company Field Added in Item Tax Template	2020-07-03 15:02:32 +05:00
mohammadahmad1990	728bf0e6dd	fix: Item Tax Template	2020-07-03 15:02:16 +05:00
mohammadahmad1990	e39649bc9e	fix: Item Tax Template with no validity	2020-07-03 15:02:03 +05:00
mohammadahmad1990	41c0c9f46b	fix: Item Tax Template	2020-07-03 15:01:49 +05:00
Deepesh Garg	9ed0384bea	fix: Code cleanup	2020-07-03 14:54:41 +05:30
sahil28297	32d7ff7b34	Merge branch 'develop' into fix_develop_version	2020-07-03 11:48:22 +05:30
Deepesh Garg	271ccff77d	Merge pull request #22564 from deepeshgarg007/loan_doc_cleanup fix: Remove loan security field from loan	2020-07-03 09:34:56 +05:30
Andy Zhu	b60abb0158	fix: fetch item price in sales invoice When create standalone sales invoice, the item price will not be created fetch. By adding "posting_date" to dict: item_price_args, it will be fetch on building the condition of SQL.	2020-07-03 14:13:15 +12:00
Deepesh Garg	30d9101cbf	fix: Remove loan security field from loan	2020-07-02 23:39:12 +05:30
Deepesh Garg	3c004ad798	fix(GST): Do not add tax amount in grand total for reverse charge invoices	2020-07-02 21:18:29 +05:30
Afshan	bfffd9b01b	made "Subscription Section", "Auto Repeat" and Hub Publishing" collapsible by default (#22521 ) Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-07-02 15:11:45 +05:30
Khushal Trivedi	49d04f449e	fix: no else condition required since we can decalre it by default (#22537 ) * fix: removing unnecessary else condition on customer form * fix: removing unnecessary else condition on customer form * fix: no else condition required since we can decalre it by default Co-authored-by: Khushal Trivedi <khushalt5@gmail.com>	2020-07-02 14:51:20 +05:30
Chinmay D. Pai	ed0bb20e6f	chore: add query functions to whitelist Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>	2020-07-02 12:35:41 +05:30
Chinmay D. Pai	aa1210921b	fix: whitelist all query functions for search widget Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>	2020-07-01 21:14:32 +05:30
Marica	484a681e0c	Merge branch 'develop' into FR_ISS_204863	2020-07-01 11:29:03 +05:30
Michelle Alva	ec84afa86d	fix: Refactor dashboard links in leave policy (#22519 ) * fix: refactor dashboard links in leave policy * fx: code fix * fix: add labels to links * fix: code change	2020-06-30 18:04:20 +05:30
Sahil Khan	ad4eb649a2	chore: set develop version as 13.x.x	2020-06-30 17:54:41 +05:30
Anurag Mishra	8f2cb0beb6	fix: set half day date None if half day is unchecked	2020-06-30 12:11:03 +05:30
Nabin Hait	fdbd10f193	fix: Dashboard label in Projects and Assets module (#22517 )	2020-06-30 09:25:17 +05:30
rohitwaghchaure	7056cd3782	fix: manufacturing dashboard grammar (#22510 ) * fix: manufacturing dashboard grammar * Update manufacturing.json	2020-06-30 08:20:03 +05:30
Afshan	06f11aba0b	feat: Autofill Supplier pop-up when only 1 Supplier in RFQ	2020-06-29 21:39:35 +05:30
Deepesh Garg	8230e41a42	fix: Insert instead of DB insert	2020-06-29 21:20:05 +05:30
Deepesh Garg	d1bf6e0277	fix: Do not ignore validate methods on GLL entry submit	2020-06-29 21:14:03 +05:30
Anurag Mishra	c2523e8453	fixes: Payroll module pre relese test fixes (#22500 ) * fix: salary payment based on payments * fix: bank remittance report * fix: Payroll period onboarding * fix: provident-fund-deductions report * fix: Considered unmarked days * fix: onboarding paYroll * feat: quick entry in payroll entry	2020-06-29 19:54:23 +05:30
Marica	510436931b	fix: Added Missing Trends Reports to Buying/Selling Desk (#22502 ) * fix: Added Missing Trends Reports to Buying/Selling Desk * fix: Move Reports to Other Reports	2020-06-29 19:52:23 +05:30
Anurag Mishra	343651fc39	fix: job offer validation fix (#22504 )	2020-06-29 18:23:22 +05:30
Marica	3e93a2f67f	fix: Set Root as Parent if no parent in new tree view node (#22497 ) Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-06-29 17:39:26 +05:30
Marica	8732b8caf6	fix: Stock Onboarding typo and reorder (#22499 )	2020-06-29 17:38:42 +05:30
Anurag Mishra	ba5f571b0d	fix: take parent cost center for child if no cost center at child (#22496 )	2020-06-29 17:35:27 +05:30
Saqib	41034f760d	Merge branch 'develop' into asset-delete-fix	2020-06-29 10:54:01 +05:30
Saqib Ansari	cc42aa1750	fix: cancel asset movement on asset cancellation	2020-06-29 10:33:24 +05:30
Mangesh-Khairnar	73edba0e10	fix: handle nonetype issue for packed items (#22493 )	2020-06-29 08:54:53 +05:30
Deepesh Garg	a74cffe7a4	Merge pull request #21047 from vishdha/feat_taxjar feat(ERPNext Integrations): Taxjar Integration Added	2020-06-28 23:01:37 +05:30
Deepesh Garg	50e6e47e66	fix: Patch	2020-06-28 21:32:08 +05:30
rohitwaghchaure	6acde987c5	Merge pull request #22488 from rohitwaghchaure/fixed-letter-head-not-found fix: letter head not found in opening invoice creation tool	2020-06-28 20:02:29 +05:30
Deepesh Garg	eca2c1cd93	fix: patch	2020-06-28 18:53:55 +05:30
Rohit Waghchaure	04cf2e029f	fix: letter head not found in opening invoice creation tool	2020-06-28 17:08:12 +05:30
Deepesh Garg	4c230ed4b0	Merge pull request #21690 from alyf-de/refactor_datev fix(regional): DATEV report	2020-06-28 16:55:18 +05:30
Deepesh Garg	c8b11143a1	Merge pull request #22445 from Alchez/dev-job-offer-list-view fix: setup status indicators for Job Offer and Job Applicant (develop)	2020-06-28 16:49:28 +05:30
rohitwaghchaure	e4d296bb1c	Merge pull request #22413 from Anurag810/salary-structure-help-fix fix: 'Condition & Formula Help' appears twice	2020-06-28 16:29:20 +05:30
rohitwaghchaure	7e3f10e5bc	Merge pull request #22397 from Anurag810/salary_deductions_report_fixes fix: Salary deductions report fixes	2020-06-28 16:27:37 +05:30
rohitwaghchaure	81af2235f4	Merge branch 'develop' into dev-job-offer-list-view	2020-06-28 15:25:32 +05:30
rohitwaghchaure	41cd4fc788	Merge pull request #22478 from michellealva/cost_center_filter fix: apply filters in all transactions	2020-06-28 15:10:13 +05:30
rohitwaghchaure	4cc2e70348	Merge pull request #22454 from wojosc/patch-10 refactor: update customs_tariff_number.json	2020-06-28 15:07:19 +05:30
rohitwaghchaure	cc2d7f3e7f	Merge pull request #22450 from marination/serial-no-rename fix: Disable Renaming in Serial No	2020-06-28 11:15:35 +05:30
rohitwaghchaure	d5736711ce	fix: indentation	2020-06-28 11:12:20 +05:30
rohitwaghchaure	2f4971b5a6	Merge pull request #22461 from britlog/develop fix: product_info	2020-06-28 11:05:26 +05:30
Deepesh Garg	1d8b13c943	Merge pull request #22483 from deepeshgarg007/loan_security_shorttfall_fixes fix: Loan security shortfall fixes	2020-06-27 18:57:14 +05:30
Deepesh Garg	a4b9fc74aa	Merge branch 'develop' into feat_taxjar	2020-06-27 18:51:48 +05:30
Deepesh Garg	589364856c	fix: Syntax Error	2020-06-27 18:44:36 +05:30
Michelle Alva	2f37c447dd	fix: change button label in issue Changed the label of the button from "Make" to "Create" so that it is consistent with other DocTypes. Before:	2020-06-27 09:27:45 +05:30
Marica	92bea1326a	Merge branch 'develop' into serial-no-rename	2020-06-26 20:34:09 +05:30
michellealva	08f842d12e	fix: apply filters in all transactions	2020-06-26 19:56:00 +05:30
michellealva	e9cec2ff76	fix: remove redundant label in salary slip	2020-06-26 19:39:54 +05:30
britlog	0086a3727f	fix: product_info	2020-06-26 15:30:27 +02:00
rohitwaghchaure	275ebefdd2	Merge pull request #22468 from frappe/shopping-cart-settings fix: enable show_configure_button when shopping cart is enabled	2020-06-26 17:20:35 +05:30
rohitwaghchaure	b2ae6d9961	Merge pull request #22467 from nabinhait/credit_limit_email fix: Send email to credit controllers to increase credit limit	2020-06-26 15:49:25 +05:30
rohitwaghchaure	13e8c32172	Update shopping_cart_settings.js	2020-06-26 15:07:32 +05:30
marination	0f056ec51d	fix: Sales Order to MR test failing	2020-06-26 14:12:11 +05:30
Wolfram Schmidt	a97715e464	Update customs_tariff_number.json	2020-06-26 10:24:48 +02:00
Anupam K	0ce70bd68f	Merge branch 'develop' of https://github.com/frappe/erpnext into shopping-cart-settings	2020-06-26 12:47:37 +05:30
Nabin Hait	0ff5af222a	fix: Send email to credit controllers to increase credit limit	2020-06-26 12:46:42 +05:30
Anupam K	27d27c924d	enable show_configure_button when shopping cart is enabled	2020-06-26 12:46:40 +05:30
rohitwaghchaure	cc7e1b0ec5	Merge pull request #22400 from AfshanKhan/FR_ISS_204290 fix: removed condition that considered "Standard working hours" while…	2020-06-25 23:23:33 +05:30
rohitwaghchaure	2eb452f3bb	Merge pull request #22458 from scmmishra/fix-email-digest-so-company fix: add company filter in email digest	2020-06-25 23:18:38 +05:30
rohitwaghchaure	6cf568d094	Merge pull request #22462 from marination/production-plan-ux fix: Handling Empty tables in Production Plan	2020-06-25 23:15:28 +05:30
Michelle Alva	978722621f	fix: grammatical fix on error message Before: Fiscal Year: 2020 does not exists After: Fiscal Year 2020 Does Not Exist	2020-06-25 22:35:33 +05:30
marination	c8f590bc8f	fix: Handling Empty tables in Production Plan	2020-06-25 21:30:45 +05:30
Shivam Mishra	5374e7ae1f	fix: add company filter in email digest	2020-06-25 19:41:42 +05:30
Wolfram Schmidt	7f2a3e8c7d	Update customs_tariff_number.json Main information of tariff numbers are the number. A description is more or less double information as this is mostly the number. Thus a description should not be mandetory.	2020-06-25 13:56:32 +02:00
marination	f311f52f6e	fix: Disable Renaming in Serial No	2020-06-25 16:02:18 +05:30
Saqib	40847aeac3	fix: cannot cancel assets with repair pending (#22440 ) * fix: cannot cancel assets with repair pending * fix: message * Update asset.py Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-06-25 15:43:31 +05:30
Deepesh Garg	8a55ec1580	fix: Add view ledger button for cancelled docs (#22432 ) * fix: Add view ledger button for cancelled docs * fix: Add moddified to date in Stock Ledger	2020-06-25 15:34:01 +05:30
Shivam Mishra	42fd2312b8	style: add styles in style block	2020-06-25 15:28:58 +05:30
Shivam Mishra	3bbbd1b606	feat: added search to support page	2020-06-25 15:28:58 +05:30
Sun Howwrongbum	ecff8f9582	fix: UnboundLocalError when setting product_info (#22436 ) Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-06-25 14:25:53 +05:30
Afshan	a462e29172	Merge branch 'develop' into FR_ISS_204290	2020-06-25 14:16:35 +05:30
Rohan Bansal	e7c91917aa	fix: setup status indicators for Job Offer and Job Applicant	2020-06-25 13:40:18 +05:30
Rucha Mahabal	7b3700b3ec	fix: handle custom statuses for the pause SLA configuration (#22349 ) * fix: handle hold time for custom statuses * fix: set total hold time only if hold configurations are enabled Co-authored-by: Himanshu <himanshuwarekar@yahoo.com>	2020-06-25 13:29:14 +05:30
Saqib Ansari	acdaf2b001	fiix: cannot cancel asset and asset movement	2020-06-25 12:43:25 +05:30
Shivam Mishra	53346217d2	Revert "feat: added search to support page (#22376 )" (#22431 ) This reverts commit `3ab8d865dd`.	2020-06-25 11:12:09 +05:30
Michelle Alva	da0385cd39	fix: change error messages in RFQ Before: 1. Row {0}: For supplier {0} Email Address is required to send email 2. Email sent to supplier 3. Request for Quotation is disabled to access from portal, for more check portal settings. 4. Supplier Quotation created. After: 1. Row {0}: For Supplier {0} Email Address is Required to Send Email 2. Email sent to Supplier 3. The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings. 4. Supplier Quotation Created.	2020-06-25 08:24:01 +05:30
John Clarke	6fd1068af3	Update stock_ageing.py	2020-06-24 07:31:21 -06:00
Deepesh Garg	06a37660ae	Merge pull request #22421 from deepeshgarg007/update_jv_account_timestamp fix: Update journal entry accounts times stamp	2020-06-24 17:56:51 +05:30
Deepesh Garg	2abd66da9d	fix: Update journal entry account timesstamp	2020-06-24 17:49:50 +05:30
Anurag Mishra	2f867ca357	Merge branch 'develop' into salary-structure-help-fix	2020-06-24 17:41:32 +05:30
Anupam Kumar	10c7faf090	updating education report modified time (#22418 ) Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>	2020-06-24 17:34:52 +05:30
vishdha	d3ec1c1d89	feat: Taxjar Integration Added	2020-06-24 16:37:21 +05:30
Shivam Mishra	3ab8d865dd	feat: added search to support page (#22376 ) * feat: added search to support page * style: add styles in style block	2020-06-24 15:50:06 +05:30
Anurag Mishra	020c6e9175	fix: Create salary slip button disappears	2020-06-24 15:22:45 +05:30
Afshan	a07a548622	fix: removed "standard working hours" also fixed test cases	2020-06-24 13:07:59 +05:30
Anurag Mishra	a81c54f23a	fix: 'Condition & Formula Help' appears twice	2020-06-24 11:51:06 +05:30
rohitwaghchaure	a50c95c959	Merge pull request #22223 from deepeshgarg007/grn_posting feat: Accounting entries for service item in Purchase receipt	2020-06-24 11:00:19 +05:30
rohitwaghchaure	c4382abc03	Merge pull request #22410 from kennethsequeira/item_report_date fix: add error prompt for wrong date range	2020-06-24 10:49:21 +05:30
rohitwaghchaure	d63c59ced4	Merge branch 'develop' into grn_posting	2020-06-24 10:23:23 +05:30
Marica	7af7bb8311	fix: Insert Supplier Group via List View (#22403 )	2020-06-23 17:51:02 +05:30
Rohan	9c25101d9b	feat: add ability for a contract to be authorised internally (#22095 ) * Added ability for a contract to be signed by a company user before being sent out * feat: contract signed by stays even after reload (#402) * format: use new JSON format Co-authored-by: Neil Lasrado <neil@digithinkit.com> Co-authored-by: nehasacher143 <45919049+nehasacher143@users.noreply.github.com> Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-06-23 17:39:37 +05:30
Kenneth Sequeira	f5b7bd9dcb	fix: add error prompt for wrong date range	2020-06-23 16:55:35 +05:30
Anurag Mishra	ecbfda7d6a	fix: typo in template(#22401 )	2020-06-23 14:33:49 +05:30
Anurag Mishra	ece9508eb5	fix: test_tax_for_payroll_period	2020-06-23 14:25:43 +05:30
Afshan	4e37d25374	fix: removed condition that considered "Standard working hours" while creating "timesheet" as it was setting wrong time #20848	2020-06-23 14:10:40 +05:30
Anurag Mishra	f9ca29cebd	Fix: if there is no component	2020-06-23 11:57:02 +05:30
Anurag Mishra	d0d9b53361	feat: added year filters	2020-06-23 11:49:57 +05:30
Anoop	5e16ca0326	fix: Login page doesn't load for new sites (#22388 ) * fix: Login page doesn't load for new sites Login page broken as active domains are not set for new sites * Update footer_powered.html Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-06-23 11:11:13 +05:30
Anurag Mishra	101d15f2f8	fix: not working without from_amount and percentage_deduction (#22380 )	2020-06-23 10:45:54 +05:30
Anurag Mishra	36560c8406	fix: staffing Plan validation (#22379 )	2020-06-23 10:44:33 +05:30
mergify[bot]	ca8894b0fc	fix: alternative item not working for subcontract (#22386 ) (cherry picked from commit 171699537c3e7d7632f45123c6d30012c8de7281) Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>	2020-06-23 10:42:32 +05:30
Marica	3dee5273d6	fix: Update Packed Items via Update Items in SO (#22392 )	2020-06-23 10:33:47 +05:30
Marica	bd5c8573de	fix: Unable to create batched Item (#22393 )	2020-06-23 10:32:51 +05:30
Deepesh Garg	7cc1cf36ca	feat: More controlled deferred revenue booking (#21671 ) * feat: More controller deferred revenue booking * fix: Query for last gl entry * fix: Accounting Dimension for Deferred entries * fix: Deferred revenue booking against paid invoices * fix: Don not update outstanding on Deferred Entry submission * fix: Naming fixes * feat: Deferred revenue/expense booking based on months * fix: Test case for fix monthly deferred revenue booking * fix: Typo * fix: Patch to update settings * fix: Test case to book deferred expense via journal entry * fix: Update field for better UX * fix: Codacy * fix: Change select field to checkbox	2020-06-23 09:57:56 +05:30
Marica	b073544e06	Merge branch 'develop' into fix-payment-entry-wrong-bank-account-fetch-develop	2020-06-23 02:24:35 +05:30
Raffael Meyer	c3e91be48e	Merge branch 'develop' into refactor_datev	2020-06-22 19:53:47 +02:00
Suraj Shetty	c753502412	Merge branch 'develop' into patch-1	2020-06-22 21:41:31 +05:30
rohitwaghchaure	b658a010f1	Merge pull request #22383 from frappe/mergify/bp/develop/pr-22330 fix(pricing_rule): apply_on logic dont get cleanup (bp #22330)	2020-06-22 21:08:55 +05:30
Deepesh Garg	49f51f4132	Merge pull request #22346 from AfshanKhan/ISS_20_21_02455 fix: set row_id by default as previous row for On Previous Row Amount and On Previous Row Total	2020-06-22 20:53:23 +05:30
Rohit Waghchaure	aaed3b988f	added validation and clear fields for Apply Rule On Other (cherry picked from commit ebbbc85fc0f9aa418163f8344d3a234ecbe08488)	2020-06-22 14:52:30 +00:00
Poranut Chollavorn	e3973a4730	fix(pricing_rule): apply_on logic dont get cleanup (cherry picked from commit acf399c4e0c74458c17866be7d72788aeecbe829)	2020-06-22 14:52:29 +00:00
Deepesh Garg	5dc175f068	fix(Immutable Ledger): Item wise backdated stock entry posting (#22366 ) * fix(Immutable Ledger): Item wise backdated stock entry posting * fix: Remove fiscal year query * fix: Update message string	2020-06-22 19:05:39 +05:30
Deepesh Garg	c914d1b8e8	Merge branch 'develop' into ISS_20_21_02455	2020-06-22 18:46:58 +05:30
Anupam Kumar	71da90034d	fix: resetting lost reason in opportunity and quotation (#22378 )	2020-06-22 18:27:14 +05:30
Deepesh Garg	be4fc1a78e	fix(UX): Notify user of expense account change in Purchase Invoice (#22193 )	2020-06-22 18:03:11 +05:30
Anurag Mishra	7672166ce3	fix: Wrong filter (#22375 )	2020-06-22 17:22:05 +05:30
Anurag Mishra	0093b3b27c	fix: label (#22377 )	2020-06-22 17:21:01 +05:30
Deepesh Garg	0252cb6789	Merge pull request #22374 from deepeshgarg007/employee_advance_cancel fix: Unable to cancel employee advance	2020-06-22 14:55:21 +05:30
Deepesh Garg	62897d3878	fix: Unable to cancel employee advance	2020-06-22 14:54:01 +05:30
Anurag Mishra	8ffb9f852f	fix: patch check_is_income_tax_component (#22371 )	2020-06-22 12:17:29 +05:30
rohitwaghchaure	39a7516252	Merge pull request #22241 from deepeshgarg007/cost_center_fix fix: Minor fixes in cost center	2020-06-22 11:21:14 +05:30
Alvaro	43be163b32	feat: Enabled translation on html files in LMS [Proposal] (#21582 ) * :fix: translation fix for html files in LMS * fix: typo in translation * Update content.html * Update content.html * Update profile.html Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com> Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-06-22 11:06:12 +05:30
Deepesh Garg	d79e8e82cb	fix: Test cases	2020-06-22 10:00:12 +05:30
Deepesh Garg	edd4aa6faa	Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts	2020-06-22 09:59:39 +05:30
Deepesh Garg	ded3ab1cd7	fix: Test Cases	2020-06-22 09:40:15 +05:30
Deepesh Garg	7f94765d02	Merge pull request #22350 from AfshanKhan/ISS_20_21_02392 fix: Skipping total row for tree-view reports	2020-06-21 19:25:59 +05:30
Afshan	84c6973742	fix: adding json for checked add total row	2020-06-21 17:48:44 +05:30
Deepesh Garg	95a497cffb	Merge branch 'develop' of https://github.com/frappe/erpnext into cost_center_fix	2020-06-20 12:33:41 +05:30
Deepesh Garg	bef80b7981	fix: Test	2020-06-20 12:32:30 +05:30
Deepesh Garg	dee1c92df1	Merge pull request #22351 from kennethsequeira/purchase_inv_due fix: status error in purchase invoice	2020-06-20 11:58:19 +05:30
Deepesh Garg	c70eb30e7e	Merge branch 'develop' of https://github.com/frappe/erpnext into grn_posting	2020-06-20 11:56:25 +05:30
Deepesh Garg	53d5d16abb	fix: Move check from Stock Settings to Company Master	2020-06-20 11:55:56 +05:30
Afshan	3fbe6e9e4b	fix: test case	2020-06-19 22:51:52 +05:30
Kenneth Sequeira	b7c8037e9a	fix codacy	2020-06-19 22:33:51 +05:30
Anurag Mishra	289c82243f	feat: New Payroll module (#21990 ) * feat: Moved Document to Payroll Module * feat: Moved Reports to Payroll Module * feat: Moved Print fromat With Patch * feat: Moved Notifiction to Payroll Module and patches * feat: added dashboard and desk page to Payroll * feat: Payroll Dashboard * feat: Module onboarding * feat: Income tax Deductions Report * feat: Ecs Checklist Report * feat: Provident Fund Report * feat: Professional Fund report and commonified Code * feat: Total Payments Based On Payment Mode Report * fix: refactor and added chart Total Payments Based On Payment Mode * feat: Payroll Settings * fix: Bank remittance Report * feat(Payroll based on): Considered unmarked days * feat: Added Help for condition an formula in Salary structure * fix: requested changes * fix: rename report Ecs checklist to salary_payments_via_ecs * fix: renamed report report/total_payments_based_on_payment_mode * fix: added role via setup.py for regional report * feat: added All reports to desk page * fix: frappe.reload doc in all patches * fix: codacy * fix: frappe.reload_doctype for patches * patch: is_income_tax_component and component_type for salary component * fix: uncommented code * test: fixture * fix: test * test: test_payment_days_based_on_attendance	2020-06-19 19:17:57 +05:30
Marica	47a4567301	Merge branch 'develop' into purchase_inv_due	2020-06-19 18:44:53 +05:30
Kenneth Sequeira	02f3e045ab	fix: due date filter in purchase invoice	2020-06-19 18:22:04 +05:30
Afshan	65f00cea15	fix: Skipping*	2020-06-19 18:19:06 +05:30
Afshan	fbd66574ad	Skiping total row for tree-view reports	2020-06-19 18:17:01 +05:30
Deepesh Garg	aea450c36a	Revert "fix: update remark on submitting payment entry"	2020-06-19 17:29:49 +05:30
Afshan	aca2ca5982	style: formate according to Codacy/PR Quality Review	2020-06-19 16:22:41 +05:30
Marica	383807f72e	feat: Selling Desk, Dashboard and Onboarding (#22055 ) * feat: Selling Desk, Dashboard and Onboarding * chore: Selling Onboarding and fixes in Other onboardings * chore: Dashboard and Number card Fixtures * fix: Escape filters and Reposition Accounts Dashboard shortcut. Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-06-19 15:33:21 +05:30
Afshan	0fe14ce94e	style: formate according to Codacy/PR Quality Review	2020-06-19 15:10:15 +05:30
Afshan	6f7652f425	fix: set row_id by default as previous row for On Previous Row Amount and On Previous Row Total	2020-06-19 14:36:56 +05:30
Afshan	7a45c8bc28	fix: replaced "row_id" to "idx" as "row_id" was not available in variable "tax", also replaced "-1" by "-2" as "idx" starts with 0 rather than 1	2020-06-19 12:37:50 +05:30
Deepesh Garg	1b30ca6a36	fix: Codacy	2020-06-19 12:12:08 +05:30
Deepesh Garg	163a569715	chore: Delete Bank Reco doctype	2020-06-19 12:03:36 +05:30
Deepesh Garg	3c63f5b76b	Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts	2020-06-19 11:41:21 +05:30
Deepesh Garg	23cb5e1869	Merge pull request #22312 from frappe/email-digest-html fix: Email digest html view fix	2020-06-19 11:36:02 +05:30
Rucha Mahabal	428235c478	fix: revert issue metrics patch (#22331 )	2020-06-19 11:15:59 +05:30
Afshan	a9cdc7b696	style: moved project from reference section to accounting dimensions section (#22309 )	2020-06-19 11:11:33 +05:30
rohitwaghchaure	a504bdb448	Merge pull request #22329 from scmmishra/fix-grammar-footer refactor: show service instead of services	2020-06-19 10:59:52 +05:30
rohitwaghchaure	ec2dec03cc	Merge pull request #22334 from kennethsequeira/item-sale-hist fix: Customer Group label in Item-wise Sales History report	2020-06-19 10:53:09 +05:30
Kenneth Sequeira	766f978858	fix: Customer Group label in Itemwise Sales report	2020-06-18 23:23:54 +05:30
rohitwaghchaure	9d25826bbe	Merge pull request #22249 from marination/rfq-multi-uom feat: Multi UOM support in Request for Quotation	2020-06-18 20:48:13 +05:30
Shivam Mishra	e892448733	Merge branch 'develop' into fix-grammar-footer	2020-06-18 14:21:03 +00:00
Shivam Mishra	25702a1c55	refactor: show service instead of services	2020-06-18 19:49:46 +05:30
Anurag Mishra	d9b2d635d8	feat: added Expense approver for employee and validation (#22244 ) * feat: added Expense approver for employee nad validation * fix: requested changes	2020-06-18 19:13:01 +05:30
Prssanna Desai	82ddef58c0	feat: date filter for fiscal year (#21880 ) * feat: date filter for fiscal year * fix: rename fieldtypes to valid_for_fieldtypes * Update utils.py Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-06-18 18:18:41 +05:30
Anupam Kumar	77673e27e0	enable Lead create by email (#22314 ) Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>	2020-06-18 17:46:20 +05:30
Deepesh Garg	bdb40553c3	Merge pull request #22323 from deepeshgarg007/item_tax_map fix: Do not copy Item Tax template from SO to PO	2020-06-18 17:01:53 +05:30
Deepesh Garg	1ba7708b60	fix: Do not copy Item Tax template from SO to PO	2020-06-18 16:45:16 +05:30
rohitwaghchaure	b5af614824	Merge pull request #22219 from Anurag810/quality_procedure_fix fix: Child is shown in Parent process if added from tree view	2020-06-18 15:51:00 +05:30
rohitwaghchaure	853fce8c7e	Merge branch 'develop' into rfq-multi-uom	2020-06-18 15:49:53 +05:30
rohitwaghchaure	b7a2f8731f	Merge pull request #22048 from nextchamp-saqib/update-items-permission-fix fix: submitted sales order can be updated with no permission	2020-06-18 15:47:12 +05:30
rohitwaghchaure	f1cbe89496	Merge pull request #22086 from deepeshgarg007/rcm_develop fix(India): Reverse charge mechanism for GST	2020-06-18 15:46:42 +05:30
Rucha Mahabal	a529d71ca0	fix(patch): add patch for setting issue metrics (#22296 ) * patch: set issue metrics in Issue documents * fix: commit after every 100 records	2020-06-18 15:38:43 +05:30
Shivam Mishra	34d2bfbb3e	refactor: handle exceptions when updating addresses (#22307 ) * refactor: handle exceptions when updating addresses * refactor: fold common statements in a loop	2020-06-18 15:28:55 +05:30
Marica	d6906dccfe	Merge branch 'develop' into rfq-multi-uom	2020-06-18 14:44:46 +05:30
marination	95e9a4ef2c	fix: Patch simplification - Also, apply patch to all docs	2020-06-18 14:46:42 +05:30
Anupam K	bd449c8d07	email digest html fix	2020-06-18 14:20:22 +05:30
Rohit Waghchaure	8d5380a2f0	fix: incorrect variable used	2020-06-18 14:06:31 +05:30
Chinmay Pai	96100e9507	chore: add standard queries hooks to whitelist (#21939 ) standard queries are used within the search widget, and now require to be whitelisted before they can be executed through the search widget. Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com> Co-authored-by: sahil28297 <37302950+sahil28297@users.noreply.github.com>	2020-06-18 11:58:54 +05:30
Deepesh Garg	8db89bfab6	Merge pull request #22210 from abhishekbalam/customer_acq_revenue_fix fix: Revenue and Customer Count only in date range in Customer Acq. Report	2020-06-18 11:55:09 +05:30
marination	24ee482d8f	fix: Codacy	2020-06-18 11:49:15 +05:30
Afshan	ea78b24035	style: subtitle to be displayed if provided else empty (#22298 ) * added: /support * refactor code and implemented fail checks * removed unused imports * changed filter from from title to name * refactor code to move context inside main * removed unused variable * added: /support * refactor code and implemented fail checks * removed unused imports * changed filter from from title to name * refactor code to move context inside main * removed unused variable * refactor: renamed set to get * style: subtitle to be displyed if provided else empty Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com> Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>	2020-06-18 09:49:35 +05:30
P-Froggy	c3b74affe3	fix: Set Value of wrong Bank Account Field in Payment Entry Company bank account was wrongly inserted into the field "Party Bank Account" in payment entry, instead of "Bank Account". Also changes the label of "Default Bank Account" to "Default Company Bank Account", like suggested in PR #20632	2020-06-18 01:48:37 +02:00
Mangesh-Khairnar	53b601523b	fix: update shopify api version (#22284 ) Co-authored-by: Saurabh <saurabh@erpnext.com>	2020-06-17 19:31:57 +05:30
Marica	7bc9352546	Merge branch 'develop' into variant-error-msg	2020-06-17 19:22:49 +05:30
marination	91dfd000ed	fix: Typo	2020-06-17 19:05:40 +05:30
Shivam Mishra	64d772480b	fix: limit max length for cards (#22289 )	2020-06-17 18:48:15 +05:30
Shivam Mishra	6e231ae0cb	refactor: remove translation	2020-06-17 18:43:59 +05:30
Shivam Mishra	2462f07c87	refactor: update titles	2020-06-17 18:39:49 +05:30
Shivam Mishra	2b18bdfe72	fix: title for support	2020-06-17 18:36:51 +05:30
marination	b9c38a13d1	chore: Remove unnecessary get_doc	2020-06-17 18:36:12 +05:30
Shivam Mishra	7057a807ca	refactor: minor layout fixes to portal	2020-06-17 18:35:38 +05:30
marination	8b19d01d57	fix: Quality Procedure Fixes - Dont prompt error message if parent is the same in child - filter child procedure field - Disable New button in tree view - Editable grid for Quality Procedure Proces table.	2020-06-17 18:35:27 +05:30
Marica	5f3cdce353	Merge branch 'develop' into quality_procedure_fix	2020-06-17 18:27:04 +05:30
Kaviya Periyasamy	fec894f530	fix: modified time updated with the latest date (#22286 )	2020-06-17 17:39:12 +05:30
Abhishek Balam	a4cd9e2389	use getdate() for comparing dates	2020-06-17 17:13:13 +05:30
Afshan	8546b71358	feat: /support (#22194 ) * added: /support * refactor code and implemented fail checks * removed unused imports * changed filter from from title to name * refactor code to move context inside main * removed unused variable * added: /support * refactor code and implemented fail checks * removed unused imports * changed filter from from title to name * refactor code to move context inside main * removed unused variable * refactor: renamed set to get Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com> Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>	2020-06-17 16:16:59 +05:30
Deepesh Garg	179365683f	Merge pull request #22265 from frappe/edu-academic-term-validation fix: Adding filter in academic term	2020-06-17 15:34:47 +05:30
Deepesh Garg	0511e8cc03	Merge branch 'develop' into rcm_develop	2020-06-17 15:33:29 +05:30
marination	17422a3e45	fix: Message Formatting	2020-06-17 14:00:45 +05:30
Marica	6e751440cf	Merge branch 'develop' into quality_procedure_fix	2020-06-17 13:49:46 +05:30
Anupam Kumar	c6592c880a	fix: Student Admission (#22255 ) * Student Admission fix * adding check for application * adding check for application * updating error message * added date_diff for date comparision	2020-06-17 12:38:31 +05:30
rohitwaghchaure	67022b2d15	Merge pull request #22275 from frappe/mergify/bp/develop/pr-22267 refactor: hide company currency fields in the routing (bp #22267)	2020-06-17 12:27:40 +05:30
Anupam K	8d4ba6c7ec	Adding filter in academic term	2020-06-17 11:48:15 +05:30
Anupam Kumar	0a3c34de01	address label chages (#22137 ) Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-06-17 10:53:13 +05:30
rohitwaghchaure	8d856659af	refactor: hide company currency fields in the routing (#22267 ) (cherry picked from commit fd3ff6be18b0bd5accc88aea22e3adfe48e62aff)	2020-06-17 05:22:45 +00:00
Kenneth Sequeira	c159556c24	fix: typo for language in Terms description (#22270 )	2020-06-17 09:34:58 +05:30
Anurag Mishra	58831ecc7d	fix(HR): wrong shortcut in desk page (#22269 )	2020-06-16 19:23:52 +05:30
Marica	74f34c2ee3	Merge branch 'develop' into update-items-permission-fix	2020-06-16 17:18:33 +05:30
rohitwaghchaure	64c0e8f325	Merge pull request #22257 from rohitwaghchaure/fixed-travis-for-develop-branch fix: travis for develop	2020-06-16 12:38:10 +05:30
Rohit Waghchaure	fa6e4f62e2	fix: travis for develop	2020-06-16 12:02:58 +05:30
Marica	2112834743	fix: Handle unavailable Variants in Website (#22195 ) * fix: Handle unavailable Variants in Website * fix: Fetch cart setting from argument	2020-06-16 00:20:57 +05:30
marination	87dafb4d70	Merge branch 'develop' of https://github.com/frappe/erpnext into rfq-multi-uom	2020-06-15 17:44:04 +05:30
marination	ae862c993b	feat: Multi UOM support in Request for Quotation	2020-06-15 17:38:47 +05:30
rohitwaghchaure	d8683d381b	Merge pull request #22205 from deepeshgarg007/fiscal_year_travis fix: Travis(develop)	2020-06-15 16:12:10 +05:30
Deepesh Garg	a66ce050ff	fix: Minor fixes in loan	2020-06-15 16:03:12 +05:30
rohitwaghchaure	75366ebaec	Merge pull request #22243 from Anurag810/expense-claim-standard-filter-fix fix: added some standard filters in expense claim	2020-06-15 15:36:37 +05:30
rohitwaghchaure	21a95e1327	Merge pull request #22242 from Anurag810/employee_fix fix(hr): allow to enter Relieving date if status = Left	2020-06-15 15:35:22 +05:30
Deepesh Garg	c2496a3600	fix: Asset maintenance test	2020-06-15 15:18:49 +05:30
Rucha Mahabal	b8b11bb8ea	Merge branch 'develop' into sla-enhancements	2020-06-15 15:11:40 +05:30
marination	8a0058787e	fix: Wrong key sent to gte_valuation_rate	2020-06-15 14:40:39 +05:30
Rucha Mahabal	096792791b	fix(patch): reload child tables	2020-06-15 14:07:06 +05:30
Rucha Mahabal	30487bd854	fix: codacy issues	2020-06-15 13:49:58 +05:30
P-Froggy	2957a631db	fix: Validation of Purchase Order against Material Request missing (#22192 ) Validation of Purchase Order and Purchase Order Item against the linked Material Request Item was missing, so it was possible to exchange items in the purcahse order against others and still fullfill the material request. Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-06-15 13:41:16 +05:30
Rucha Mahabal	bf26b10df4	Merge branch 'develop' into sla-enhancements	2020-06-15 13:15:03 +05:30
Anurag Mishra	45b6fed029	fix: added some standard filters in expense cliam	2020-06-15 12:44:55 +05:30
Anurag Mishra	a2cf79da0f	fix: allow to enter Releaving date if status = Left	2020-06-15 12:28:31 +05:30
Deepesh Garg	0d880079b1	fix: Validation for group cost center	2020-06-15 12:23:24 +05:30
marination	8d68ba37bb	Merge branch 'update-items-permission-fix' of https://github.com/nextchamp-saqib/erpnext into update-items-permission-fix	2020-06-15 12:18:16 +05:30
marination	b7e94cc742	fix: Travis	2020-06-15 12:16:30 +05:30
Deepesh Garg	817cbc4b48	fix: Minor fixes in cost center	2020-06-15 12:07:04 +05:30
Marica	7dd92f15fa	Merge branch 'develop' into update-items-permission-fix	2020-06-15 11:44:59 +05:30
marination	359e934cd2	fix: Travis	2020-06-15 11:44:29 +05:30
Abhishek Balam	6c4a24a6c3	cleanup	2020-06-15 11:36:56 +05:30
Abhishek Balam	1a28227daa	fix merge conflict	2020-06-15 10:58:51 +05:30
Deepesh Garg	11253a91f1	Merge pull request #22199 from marination/qi-on-return fix: Don't prompt for Quality Inspection on Return Documents.	2020-06-14 17:09:51 +05:30
rohitwaghchaure	25f49d59c5	Merge pull request #22233 from deepeshgarg007/pi_billing_address fix: Billing address in for Purchase documents	2020-06-14 15:10:43 +05:30
rohitwaghchaure	c5a2803a1c	Merge pull request #22239 from rohitwaghchaure/item-none-not-found-opening-creation-tool-develop fix: item none not found while making sales invoice using opening inv…	2020-06-14 15:09:38 +05:30
Rohit Waghchaure	d6f9a51cbb	fix: item none not found while making sales invoice using opening invoice creation tool	2020-06-14 14:46:49 +05:30
Deepesh Garg	5bf6bec656	fix: Consider Overseas category in RCM	2020-06-14 13:18:08 +05:30
Anupam K	234b5f9a8c	sm-post-permission-fix	2020-06-14 10:34:58 +05:30
Anupam K	c2d1ed7a34	Merge branch 'develop' of https://github.com/frappe/erpnext into opportunity-dashboard	2020-06-14 00:09:45 +05:30
Anupam K	65e7a2e7a6	opportunity-dashboard-fix	2020-06-14 00:05:38 +05:30
Deepesh Garg	3a16b033b6	Merge branch 'develop' of https://github.com/frappe/erpnext into rcm_develop	2020-06-13 22:50:14 +05:30
Deepesh Garg	6760077674	fix: Billing address in for Purchase documents	2020-06-13 22:40:23 +05:30
Deepesh Garg	dcdd1f3d9b	Merge pull request #22227 from frappe/opportunity-dashboard fix: Links in opportunity dashboard	2020-06-13 22:16:10 +05:30
Deepesh Garg	5f4330621c	Merge pull request #22231 from deepeshgarg007/financila_satement_immutable fix: Handle cancelled entries in financial statements	2020-06-13 21:19:20 +05:30
Deepesh Garg	cc4943d54d	fix: Distributed cost center query updation	2020-06-13 21:13:52 +05:30
Deepesh Garg	d80d442aa1	fix: Do not select cancelled entries in financial statements	2020-06-13 21:12:19 +05:30
Deepesh Garg	f3261794d9	Merge pull request #22230 from deepeshgarg007/financial_statement_to_date_v13 fix: Data not appearing properly for some fiscal_year in financial statements	2020-06-13 19:27:38 +05:30
Deepesh Garg	15231aa60d	fix: Data not appearing properly for some fiscal_year in financial statemets	2020-06-13 19:26:39 +05:30
Anupam K	8bc414620b	opportunity-dashboard-fix	2020-06-13 13:11:43 +05:30
Anurag Mishra	5b8a47d072	fix: patch for expense claim (#22226 )	2020-06-13 01:04:32 +05:30
Deepesh Garg	28fecb1b29	Merge pull request #22198 from scmmishra/membership-fixes fix: verification for razorpay hooks	2020-06-12 21:28:07 +05:30
John Clarke	15e4ea0472	Merge branch 'develop' into clarkejj-patch-1	2020-06-12 07:55:49 -06:00
John Clarke	85f237257a	Thanks so much for your pointer Marica - that violation is clear and obvious to me in retrospect, but a good relearning experience in any case	2020-06-12 07:22:14 -06:00
Deepesh Garg	c258ac82c5	feat: Accounting entries for service item in Purchase receipt	2020-06-12 18:33:42 +05:30
Anurag Mishra	7558e64d6d	fix: set_query in leave application (#22197 )	2020-06-12 17:37:59 +05:30
John Clarke	677978dd00	Update stock_ageing.py As reviewer Deepesh Garg advised thanks! batch[0] can be int of float - see line 49 - so change proposed cint to flt	2020-06-12 05:53:24 -06:00
Anurag Mishra	ec54653852	fix: Child is shown in Parent process if added from tree view	2020-06-12 17:02:31 +05:30
rohitwaghchaure	ee6f80e25b	Merge pull request #22213 from vishdha/fix-credit-limit-notification_v13 feat: notify credit controller role users with credit limit extension request	2020-06-12 16:37:41 +05:30
marination	f9c4b20985	fix: Added PO test and conversion factor fix - Don't change conversion factor if stock uom and uom is the same - Added PO test - Added Accounts User basic role in PO - Minor fixes, wrong variables	2020-06-12 15:49:53 +05:30
Deepesh Garg	7e974c9e2c	fix: Test Cases	2020-06-12 15:29:40 +05:30
Sahil Khan	182c1f860b	fix(patch): escape special characters in company field	2020-06-12 15:16:20 +05:30
Abhishek Balam	86ea75e49e	fix(HR): Change Due Advance Amount to Pending Amount (#22123 ) * rename 'Due Advance Amount' field to 'Pending Amount' * changed fieldname and references for easier debugging * added patch for moving data * added newline added Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>	2020-06-12 13:13:14 +05:30
Shivam Mishra	3bf18509ba	Merge branch 'develop' into membership-fixes	2020-06-12 07:27:20 +00:00
Rohan Bansal	ccd03bc120	feat: notify credit controller role users with credit limit extension requests	2020-06-12 12:48:54 +05:30
Vignesh S	90957b7f74	feat(Attendance): Add In and Out time to attendance (#21547 ) * feat(Attendance): Add In and Out time to attendance Co-authored-by: Karthikeyan S <skarthikeyan1410@gmail.com> * fix:add depends in attendance IN time and OUT time Co-authored-by: Karthikeyan S <skarthikeyan1410@gmail.com>	2020-06-12 12:32:55 +05:30
Marica	c62a6df016	Merge branch 'develop' into qi-on-return	2020-06-12 12:31:20 +05:30
Marica	fd3d976e06	Update erpnext/controllers/stock_controller.py Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>	2020-06-12 12:30:59 +05:30
Abhishek Balam	996b306cda	fix territory count	2020-06-12 11:38:07 +05:30
Abhishek Balam	72450d2af3	add revenue if within date range	2020-06-12 11:07:57 +05:30
Abhishek Balam	f596b5950e	indent to tabs	2020-06-12 11:07:28 +05:30
Deepesh Garg	d09aa53571	Merge pull request #22208 from aliriocastro/fix-itemwise-rec-reord-level-report fix: key name to get float precision was misspelled	2020-06-12 10:04:58 +05:30
Deepesh Garg	ca97e19b7e	Merge pull request #22203 from marination/account-tree fix: Check for Company before rendering tree in Account Tree	2020-06-12 10:02:41 +05:30
Alirio Castro	faf33072c8	fix: key was mispelled	2020-06-11 23:32:53 -04:00
Shivam Mishra	241088c73e	Merge branch 'develop' into membership-fixes	2020-06-11 16:53:15 +00:00
John Clarke	6b55f66f02	Stock Ageing TypeError: ‘<’ not supported between instances of ‘int’ and ‘str’ Proposed fix re this error report https://discuss.erpnext.com/t/stock-ageing-report-typeerror-not-supported-between-instances-of-int-and-str/62605	2020-06-11 10:24:48 -06:00
Deepesh Garg	9df4532d14	fix: Travis(develop)	2020-06-11 21:33:43 +05:30
marination	c9a6e4f151	fix: Check for Company before rendering tree in Account Tree	2020-06-11 19:54:44 +05:30
Abhishek Balam	44b8cf4fef	enable 'user cannot create' for payment request (#22044 ) Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-06-11 19:31:41 +05:30
Rucha Mahabal	d7481f59ba	fix: patch	2020-06-11 17:41:05 +05:30
Rucha Mahabal	4dbb7c552c	Merge branch 'develop' into sla-enhancements	2020-06-11 17:04:20 +05:30
Rucha Mahabal	9c27d683ba	fix: priority column width Co-authored-by: Himanshu <himanshuwarekar@yahoo.com>	2020-06-11 17:03:53 +05:30
marination	596560c3c2	fix: Don't prompt for Quality Inspection on Return Documents.	2020-06-11 16:39:03 +05:30
Shivam Mishra	3f60801566	Merge branch 'develop' into membership-fixes	2020-06-11 10:16:39 +00:00
Shivam Mishra	8c24810f30	refactor: ignore mandatory for customer	2020-06-11 15:42:29 +05:30
Shivam Mishra	49d51b8ce7	feat: check duplicate contact explicitly	2020-06-11 14:24:07 +05:30
Shivam Mishra	84fcc55a36	refactor: do nothing if member is not found	2020-06-11 13:34:40 +05:30
Shivam Mishra	8d61a0abef	fix: use string to verify webhook	2020-06-11 13:34:25 +05:30
Deepesh Garg	7d3c3b9a8b	Merge pull request #22188 from deepeshgarg007/payment_terms_outstanding fix: Update payment schedule based on payment terms	2020-06-10 22:17:37 +05:30
Deepesh Garg	a0fd97f2ac	fix: Update payment schedule based on payment terms	2020-06-10 22:15:27 +05:30
Deepesh Garg	f108574772	Merge pull request #22186 from deepeshgarg007/inter_warehouse_party_validation fix: Party validation for inter-warehouse transaction	2020-06-10 20:02:43 +05:30
Deepesh Garg	7963e2b708	fix: Party validation for inter-warehouse transaction	2020-06-10 19:57:49 +05:30
Rohan	d60d2e1826	fix: only auto-set serial nos and batches if allowed in Stock Settings (develop) (#21781 ) * fix: only auto-set serial nos and batches if allowed in Stock Settings * fix: bug with setting disabled batch no in Pick List * fix: remove auto-set batch variable Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-06-10 19:10:56 +05:30
Marica	170d4b7db9	Merge branch 'develop' into website-price-list	2020-06-10 18:57:44 +05:30
Deepesh Garg	6e0d6bd74c	Merge pull request #22184 from deepeshgarg007/item-wise-report-export fix: Item-wise sales and purchase register export	2020-06-10 18:48:35 +05:30
Deepesh Garg	08fee12266	fix: Item-wise sales and purchase register export	2020-06-10 18:33:24 +05:30
marination	fdddb679ed	fix: Prioritize Default Customer Price List in Portal	2020-06-10 18:22:59 +05:30
rohitwaghchaure	496b6a28f2	Merge pull request #22179 from rohitwaghchaure/code-cleanup-for-handling-batch-case-in-SI-develop fix: Cannot read property 'has_batch_no' of undefined	2020-06-10 17:57:07 +05:30
Rohit Waghchaure	afe8e88cb8	fix: Cannot read property 'has_batch_no' of undefined	2020-06-10 17:55:24 +05:30
Marica	aeeadee8f8	Merge branch 'develop' into update-items-permission-fix	2020-06-10 15:19:33 +05:30
rohitwaghchaure	0233f94570	Merge pull request #22081 from deepeshgarg007/jv_list_view fix: Add total debit in Journal Entry list view	2020-06-10 14:17:13 +05:30
rohitwaghchaure	95331a31a7	Merge pull request #22155 from frappe/barredterra-billing_hours feat(projects): bill all hours by default	2020-06-10 14:16:18 +05:30
rohitwaghchaure	9ea9a99889	Merge pull request #22063 from marination/procurement-tracker-develop fix: Procurement Tracker Data Consistency	2020-06-10 14:13:36 +05:30
rohitwaghchaure	3a9c1b23db	Merge pull request #22096 from marination/valuation-rate fix: '>=' not supported between instances of 'str' and 'int'	2020-06-10 14:12:13 +05:30
rohitwaghchaure	63e8f2c430	Merge pull request #22175 from Anurag810/expense_claim_cost_center_fix fix: set cost center in child table	2020-06-10 13:40:51 +05:30
Rucha Mahabal	1e49c6b68b	fix: update duration options	2020-06-10 12:58:16 +05:30
Anurag Mishra	452b7760df	fix: dependency for leave Period in Desk page	2020-06-10 12:48:21 +05:30
Rucha Mahabal	5b6d2c2e7b	Merge branch 'develop' into sla-enhancements	2020-06-10 12:33:19 +05:30
rohitwaghchaure	904e0f4eda	Merge pull request #22106 from Anurag810/employee_onboarding_fix fix: problem during assigning	2020-06-10 12:30:15 +05:30
Anurag Mishra	402c347f83	fix: set cost center in child table	2020-06-10 12:27:59 +05:30
Anupam Kumar	934e30ecac	update program course (#22166 )	2020-06-10 11:07:43 +05:30
Rucha Mahabal	bb3b616a04	fix: set valuesin db for handle hold time	2020-06-09 23:17:51 +05:30
Raffael Meyer	088ab75083	fix: move feature into update_billing_hours	2020-06-09 16:09:40 +02:00
Deepesh Garg	0dd925cfc8	Merge pull request #22164 from frappe/revert-21123-patch-1 Revert "fix: docfield of sales_order is not fetching route options for new doc"	2020-06-09 17:42:42 +05:30
rohitwaghchaure	b42ac845da	Merge pull request #22147 from marination/finished-good-valuation fix: Finished Product Valuation at Repack	2020-06-09 17:42:06 +05:30
Deepesh Garg	e5fe00cf58	Revert "fix: docfield of sales_order is not fetching route options for new doc (#21123 )" This reverts commit `5c54adec28`.	2020-06-09 17:41:27 +05:30
Raffael Meyer	d27d88c3e4	feat: bill all hours by default	2020-06-08 22:52:44 +02:00
marination	f5b9deea5b	fix: Finished Product Valuation at Repack	2020-06-08 13:02:00 +05:30
Karthikeyan S	e9ff6d3d52	feat(Cost Center): Distributed Cost Center (#21531 ) * feat: Distributed Cost Center Squashed commit of the following: commit 274236eb92dfddfd015583ee1e6b5e1937366d28 Author: Vignesh <kaviya.3111999@gmail.com> Date: Mon Mar 23 18:32:26 2020 +0530 Fix: Indentation commit beae0b9849f333dd1d9f29c27192ea7de2e4e809 Author: Vignesh <kaviya.3111999@gmail.com> Date: Mon Mar 23 18:26:50 2020 +0530 The validations are added to distributed cost center. commit 3f66943adacb5797338ef3510251bf6633be3dba Author: Vignesh <kaviya.3111999@gmail.com> Date: Thu Mar 19 22:17:25 2020 +0530 The distributed cost centers are shown with the percentage allocation in the reports commit 1ac11df522096fa187d2f5863b4c970e18b37fac Author: Vignesh <kaviya.3111999@gmail.com> Date: Thu Mar 19 13:36:04 2020 +0530 The child table distributed cost center are added to cost center doctype and then validate percentage allocation. * fix(Distributed Cost Center): validation and filters * fix(Distributed Cost Center): financial statement query * fix(Distributed Cost Center): add test cases Co-authored-by: Vignesh S <svignesh0308@gmail.com> * fix(Distributed Cost Center): budget variance, general ledger, profitability analysis reports. * Merge branch 'develop' into develop-distributed-cost-center * fix(Distributed Cost Center): Added DCC reflection in actual amount column of Budget Variance Report. * Update creation field in general ledger report Co-authored-by: Nabin Hait <nabinhait@gmail.com> * creation field updated in gl_entries query Co-authored-by: Nabin Hait <nabinhait@gmail.com> Co-authored-by: KaviyaPeriyasamy <kaviya.3111999@gmail.com> Co-authored-by: Vignesh S <svignesh0308@gmail.com> Co-authored-by: KaviyaPeriyasamy <kaviyaperiyasamy22@gmail.com> Co-authored-by: Kaviya Periyasamy <36359901+KaviyaPeriyasamy@users.noreply.github.com> Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-06-08 12:20:21 +05:30
rohitwaghchaure	c6d4c2afb6	Merge pull request #22113 from Anurag810/leave_application-fixes fix: Wrong filters	2020-06-08 10:43:22 +05:30
rohitwaghchaure	b3b5c96749	Merge pull request #22092 from marination/shippinng-address fix: Apply shipping rule without address too	2020-06-08 10:36:19 +05:30
rohitwaghchaure	6debdc89c2	Merge pull request #22121 from rohitwaghchaure/error-report-exponential-smoothing-report fix: 'ForecastingReport' object has no attribute 'total_demand'	2020-06-08 10:30:19 +05:30
Deepesh Garg	63e8391381	Merge pull request #22142 from deepeshgarg007/loan_amount_precision fix: Precision in loan amount calculation	2020-06-07 21:28:23 +05:30
Deepesh Garg	0bc163c230	fix: Ignore GL Entry on cancel	2020-06-07 21:23:55 +05:30
Deepesh Garg	e5ac8cc430	fix: Precision in loan amount calculation	2020-06-07 21:18:47 +05:30
Mangesh-Khairnar	3031128167	fix: fetch tax lines within the shipping lines (#22138 )	2020-06-07 18:02:23 +05:30
Deepesh Garg	c01b4aa2e5	Merge pull request #22131 from deepeshgarg007/tds_monthly_cancelled fix: Cancelled entries in tds payable monthly report	2020-06-07 00:08:17 +05:30
Deepesh Garg	57f9d43c43	fix: Cancelled entries in tds payable monthly report	2020-06-07 00:01:20 +05:30
Rucha Mahabal	73326d308b	refactor: move pause SLA configuration to SLA DocType	2020-06-05 18:23:39 +05:30
Rucha Mahabal	d7d3ca4214	fix: tests	2020-06-05 16:57:37 +05:30
Abhishek Balam	328a55749d	fix(HR): Fix half day error when only 1 day is selected (#22122 ) * fix half day error when only 1 day is selected * adding validation fix for half day on serverside	2020-06-05 16:46:57 +05:30
Rucha Mahabal	25ef6a9638	fix: add default hold statuses in fixtures and patch	2020-06-05 16:37:20 +05:30
Rucha Mahabal	8d39928418	refactor: dashboard indicator when SLA is on hold	2020-06-05 16:36:31 +05:30
Rucha Mahabal	2c9f7cf371	feat: pause SLA on statuses configuration	2020-06-05 16:35:57 +05:30
Rohit Waghchaure	5a82276389	fix: 'ForecastingReport' object has no attribute 'total_demand'	2020-06-05 13:56:20 +05:30
Rucha Mahabal	b29cb87868	refactor: setting avg_response_time moved to communication	2020-06-05 13:35:38 +05:30
Deepesh Garg	407c7bc113	Merge pull request #22067 from marination/item-attribute fix: Misleading Error message for Item Attribute.	2020-06-05 11:21:08 +05:30
P-Froggy	6f87f97efe	fix: Wrong Ordered-Status Indicator for Material Request Items (#22118 ) The indicator displaying if a material request item has been ordered or not (green/orange) used the wrong quantity field for determining the status. The qty field used in the code is not in stock uom while the ordered_qty field is. Now, the stock_qty field is used for correct comparison with ordered_qty.	2020-06-05 10:57:07 +05:30
Anurag Mishra	94582a89c7	fix: Wrong filters	2020-06-04 17:50:47 +05:30
Rucha Mahabal	3f08350181	fix: retain Hold status	2020-06-04 15:56:59 +05:30
Marica	d03ebbd51d	Merge branch 'develop' into valuation-rate	2020-06-04 15:31:11 +05:30
rohitwaghchaure	2213ea3d82	Merge pull request #22109 from rohitwaghchaure/routing-operations-not-in-a-sequence fix: routing operations not added sequentially in the BOM	2020-06-04 14:56:10 +05:30
Rohit Waghchaure	404ed88c0c	fix: routing operations not added sequentially in the BOM	2020-06-04 14:46:50 +05:30
rohitwaghchaure	dd97a5f4a8	Merge pull request #22107 from rohitwaghchaure/fixed-import-supplier-invoice-not-worked fix: import supplier invoice not working	2020-06-04 14:40:30 +05:30
Rohit Waghchaure	60c1855014	fix: import supplier invoice not working	2020-06-04 14:31:35 +05:30
Anurag Mishra	225802e3a0	fix: problem during assigning	2020-06-04 14:15:55 +05:30
Rucha Mahabal	94d03c6100	fix: remove Service Level DocType from Support Desk Page	2020-06-04 12:35:36 +05:30
Rucha Mahabal	b3338a149b	fix: code clean-up	2020-06-04 12:35:00 +05:30
Deepesh Garg	c83ad8185a	Merge pull request #22098 from deepeshgarg007/accounts_payable_error fix: Error when no data is present in AR/AP report	2020-06-03 21:59:28 +05:30
Deepesh Garg	7135a75e5e	fix: Error when no data is present in AR/AP reeport	2020-06-03 21:51:21 +05:30
marination	6f7e9d2904	fix: '>=' not supported between instances of 'str' and 'int'	2020-06-03 17:13:58 +05:30
marination	0c72249403	fix: Apply shipping rule without address too	2020-06-03 14:32:07 +05:30
Deepesh Garg	881999d3bf	Merge pull request #22089 from scmmishra/selling-dash-fix fix: dashboard chart does not exist on selling page	2020-06-03 13:38:36 +05:30
Shivam Mishra	b84dd9b5f5	fix: dashboard chart does not exist on selling page	2020-06-03 13:24:18 +05:30
Myuddin khatri	9276d16420	fix(stock): able to create purchase invoice from purchase receipt dashboard able to create purchase invoice from purchase receipt dashboard	2020-06-03 11:22:49 +05:30
Deepesh Garg	24f9a80e7d	fix(India): Reverse charge mechanism for GST	2020-06-03 10:59:37 +05:30
Shivam Mishra	f460c17961	fix: syntax error (#22082 )	2020-06-02 21:48:23 +05:30
Shivam Mishra	789df32683	feat: verify signature on webhook (#21872 )	2020-06-02 19:18:22 +05:30
Deepesh Garg	60f3a2b8e7	fix: Add total debit in Journal Entry list view	2020-06-02 18:26:43 +05:30
gavin	7a05662e9f	Merge pull request #21491 from gavindsouza/tally-migration-feat feat(Tally migration): Errored documents handling	2020-06-02 13:03:13 +05:30
Deepesh Garg	fecac677ec	Merge pull request #22075 from abhishekbalam/fix-customer-count fix(Accounts): Customer Count in Customer Acq. Report wrong	2020-06-02 00:09:01 +05:30
Abhishek Balam	192d4c8810	indent to tabs instead of spaces	2020-06-01 23:58:05 +05:30
Abhishek Balam	732f5c1867	fixed customer count logic	2020-06-01 23:51:39 +05:30
marination	0df7f0fe9d	fix: Misleading Error message for Item Attribute.	2020-06-01 11:56:33 +05:30
Deepesh Garg	de03d2cba4	fix: Method in hooks for proccesing deferred revenue	2020-06-01 11:30:34 +05:30
marination	c0c455c471	fix: Procurement Tracker Data Consistency	2020-05-31 20:20:59 +05:30
karthikeyan5	ca46bedfcb	fix(ewb): remove checksum validation for TRANSIN	2020-05-30 15:00:56 +05:30
Saqib	c16e278979	Merge branch 'develop' into update-items-permission-fix	2020-05-30 13:16:55 +05:30
Deepesh Garg	3609ddedbb	fix: Purchase receipt item json	2020-05-30 12:03:37 +05:30
Deepesh Garg	159d0734ef	fix: Proccurement tracker report test	2020-05-30 11:47:22 +05:30
Deepesh Garg	1aec30d849	fix: Procurement Tracker test case	2020-05-30 11:47:04 +05:30
Deepesh Garg	c96bf870e4	fix: Test Cases	2020-05-30 11:46:39 +05:30
Deepesh Garg	8a4dc521cd	Revert 'fix: tests depending on global default company'	2020-05-30 11:40:16 +05:30
Deepesh Garg	36f7710356	Revert "fix: tests depending on global default company" This reverts commit `1f20c99ecf`.	2020-05-30 11:38:04 +05:30
Deepesh Garg	f8550790fa	This reverts commit `aa196c0a66`	2020-05-30 11:37:36 +05:30
Abhishek Balam	40694c98aa	fix(HR) : Filter Leave Type based on allocation for a particular employee (#22050 ) * table was showing empty with just headers when no leaves allocated, fixed template code * added filters on Leave Type based on leave allocation for a particular employee and to/from dates	2020-05-30 01:02:06 +05:30
Saqib Ansari	a655db6a79	fix: unexpected removal of print hide field	2020-05-29 22:44:59 +05:30
Saqib Ansari	d531a8ab8d	Merge branch 'develop' of https://github.com/frappe/erpnext into update-items-permission-fix	2020-05-29 22:37:13 +05:30
Saqib Ansari	c579b0879e	fix: cannot update delivery date	2020-05-29 22:34:22 +05:30
Saqib Ansari	5da8b98a04	fix: label	2020-05-29 21:59:01 +05:30
Saqib Ansari	2c3c8aaa2d	fix: submitted sales order can be updated with no permission	2020-05-29 21:55:38 +05:30
rohitwaghchaure	7544160374	fix: routing operations table is blank on pull of operations in BOM (#22039 )	2020-05-29 21:27:24 +05:30
Nabin Hait	2186c223b9	fix: Migrate standard_tax_exemption_amount if field exists (#22036 )	2020-05-29 21:26:49 +05:30
Deepesh Garg	dfa32a77c1	fix: Patch to remove Property Setter	2020-05-29 17:20:33 +05:30
Deepesh Garg	52baf8f863	fix: Test Cases	2020-05-29 17:20:03 +05:30
Chinmay D. Pai	d6587fa1d5	fix: check if swift_number exists in bank account Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>	2020-05-29 12:44:09 +05:30
Rucha Mahabal	43d4397003	Merge branch 'develop' into sla-enhancements	2020-05-29 11:43:49 +05:30
Rucha Mahabal	bc38289a59	fix: added patch for sla enhancements	2020-05-29 11:43:05 +05:30
Deepesh Garg	c897e800ed	Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts	2020-05-29 11:04:20 +05:30
Saqib	cd8b5d1e4c	fix: cannot assign same task to other asset maintenance (#22024 )	2020-05-29 10:21:20 +05:30
Mangesh-Khairnar	c302d066a3	fix: only save end date when transactions are returned (#22023 )	2020-05-29 10:19:58 +05:30
Anurag Mishra	cf0168668f	fix: Correct filters (#22022 )	2020-05-29 10:19:33 +05:30
Saqib	3c460364b5	fix: disposed asset creates inconsistencies in asset depr report (#22021 )	2020-05-29 10:18:06 +05:30
Anupam Kumar	8385fed042	crm onboarding typos (#22008 )	2020-05-28 22:14:59 +05:30
Rucha Mahabal	a3dd75e77f	fix: empty filters in Healthcare Charts	2020-05-28 19:03:37 +05:30
sahil28297	9209b9a7de	fix(set_purchase_receipt_delivery_note_detail): commit after every 100 sql updates (#22016 )	2020-05-28 18:49:47 +05:30
Deepesh Garg	1f3fe59e36	fix: Default period start date and period end date for financial statements (#22011 )	2020-05-28 18:36:21 +05:30
sahil28297	517ab955ac	fix(rename_bank_reconcilliation): do not delete doc after renaming (#22013 )	2020-05-28 18:32:16 +05:30
Marica	1a25aa83de	fix: Delete Auto Email Reports (#22009 )	2020-05-28 18:16:24 +05:30
mergify[bot]	fd351f8268	fix: set fiscal year for Profit and Loss chart (#22006 ) (cherry picked from commit `4afda76015`) Co-authored-by: Shivam Mishra <scm.mymail@gmail.com>	2020-05-28 15:18:47 +05:30
Shivam Mishra	6621e22c02	refactor: clean up desk pages (#22004 ) * refactor: clean up desk pages * refactor: update label for CRM	2020-05-28 14:48:50 +05:30
rohitwaghchaure	af91e13435	Merge pull request #22001 from nextchamp-saqib/price-rule-date-field-fix fix: transaction date not found in sales invoice	2020-05-28 14:38:13 +05:30
Rucha Mahabal	3a51a97b2d	Merge branch 'develop' into sla-enhancements	2020-05-28 14:33:51 +05:30
Rucha Mahabal	376a46f1e5	test: hold time for Replied status	2020-05-28 14:33:30 +05:30

... 13 14 15 16 17 ...

23973 Commits