23597 Commits

Author	SHA1	Message	Date
Shivam Mishra	c8d9e7f77b	feat: add message field	2020-08-14 13:46:58 +05:30
Shivam Mishra	1678eb9b50	feat: drop payload column	2020-08-14 13:46:58 +05:30
Shivam Mishra	62e344188a	feat: update settings and link filters	2020-08-14 13:46:32 +05:30
Shivam Mishra	15340e0c7f	feat: send invoice via email	2020-08-14 13:46:32 +05:30
Shivam Mishra	811ac909f9	feat: add auto invoice creation fields and controllers	2020-08-14 13:46:32 +05:30
Shivam Mishra	96dc67c35e	feat: add copy button and docs link	2020-08-14 13:46:32 +05:30
Shivam Mishra	3a1868dae8	feat: add item field	2020-08-14 13:46:32 +05:30
Shivam Mishra	a16b24d50a	feat: add enable or disable invoicing and print format field	2020-08-14 13:46:32 +05:30
Anurag Mishra	759632c025	fix: requested Changes	2020-08-14 12:26:04 +05:30
Anurag Mishra	6f1579da1f	Merge branch 'develop' into shift_management	2020-08-14 12:11:41 +05:30
Deepesh Garg	8ca57eb5dd	Merge pull request #23022 from marination/loan-amount ... fix: Validate or Set Loan Amount first	2020-08-13 19:53:09 +05:30
Afshan	d7d92c520e	fix: removed code relating to standard working hours (#23009)	2020-08-13 19:40:09 +05:30
Deepesh Garg	1151f888ba	fix: Set pledge amount before setting loan amount	2020-08-13 18:52:23 +05:30
bhavesh95863	a647bef682	fix: warehouse mandatory even update stock uncheck (#23023)	2020-08-13 17:41:55 +05:30
Anupam K	b3bd780d46	fix: codasy dix	2020-08-13 17:07:15 +05:30
Anurag Mishra	f096ba4998	patch: Old Shift Assignment	2020-08-13 14:18:48 +05:30
Anurag Mishra	c2710e05ce	fix: showing on_going shift on calendar	2020-08-13 14:17:47 +05:30
Anurag Mishra	74f0a1ab7c	fix: changes Requested	2020-08-13 14:17:47 +05:30
Anurag Mishra	00a8081aba	Fix: button label	2020-08-13 14:17:47 +05:30
Anurag Mishra	dcf598dc2d	Fix: requested Changes	2020-08-13 14:17:47 +05:30
Anurag Mishra	d5c921e358	Fix: Requested Changes	2020-08-13 14:17:47 +05:30
Anurag Mishra	b48110caf1	Update erpnext/hr/doctype/shift_assignment/shift_assignment.py ... Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-08-13 14:17:47 +05:30
Anurag Mishra	3aa1101d5e	fix: requested changes	2020-08-13 14:17:47 +05:30
Anurag Mishra	17e6d0918b	feat: Employee level Shift Request Approver	2020-08-13 14:17:47 +05:30
Anurag Mishra	43ba7dd4c8	feat: don't allow to request for default shift	2020-08-13 14:17:47 +05:30
Anurag Mishra	feef4a6c1e	test: employee checkin	2020-08-13 14:17:47 +05:30
Anurag Mishra	b3e00de0ae	refactor: Shift Request	2020-08-13 14:17:47 +05:30
Anurag Mishra	a6ec7e31d2	test: shift assignment	2020-08-13 14:17:47 +05:30
Anurag Mishra	dd46d19765	feat: map event calendar to show ongoing shift assignment and fixed period assigment	2020-08-13 14:17:47 +05:30
Anurag Mishra	afa98bb39b	feat: Assign shift for period or create ongoing assignment	2020-08-13 14:17:47 +05:30
marination	8264fcd0a5	fix: Only validate repayment if term loan	2020-08-13 12:47:34 +05:30
marination	6988fbb82d	fix: Validate or Set Loan Amount first	2020-08-13 12:17:13 +05:30
prssanna	bfb219612e	feat: enable total row in Gross Profit Report	2020-08-13 11:34:05 +05:30
Anupam Kumar	e447c79f9d	fix: Quotation lost reason options fix (#22814) ... * adding patch and lost reason child tables * fix: conflict resolved	2020-08-13 09:20:36 +05:30
Saqib	c7614174d0	fix: cannot change customer fields if credit exhausted (#22838) ... * fix: cannot change customer fields if credit exhausted * fix: order based on company * fix: sort current limits w.r.t company before compare * fix: CustomerCreditLimit Object is not subscriptable	2020-08-13 09:18:59 +05:30
Nabin Hait	e2ee455acc	fix: Calculate taxes if tax is based on item quantity	2020-08-12 20:58:03 +05:30
Deepesh Garg	21a220e2a5	fix: Update state code and union territory for Daman and Diu (#22988) ... Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-08-12 19:19:03 +05:30
Rucha Mahabal	cd5821e00a	Merge pull request #23011 from ruchamahabal/fix-asset-maintenance-status ... fix: don't set asset maintenance log status as Overdue when Completed or Cancelled	2020-08-12 19:17:33 +05:30
Deepesh Garg	617027c6ca	Merge branch 'develop' of https://github.com/frappe/erpnext into navbar_links	2020-08-12 18:39:20 +05:30
Rucha Mahabal	517a6d0054	fix: set draft indicators for Asset Maintenance Log listview	2020-08-12 18:01:45 +05:30
Rucha Mahabal	691ec1bd27	fix: don't set maintenance log status as Overdue when Completed or Cancelled	2020-08-12 18:01:07 +05:30
Anupam Kumar	674d1b0803	feat: Material Request and Stock Entry Enhancement (#22671) ... * feat: send to warehouse * adding warehouse validation * fix: review changes * fix: review changes * stock entry enhancement * fix: review changes	2020-08-12 17:55:02 +05:30
Rucha Mahabal	e0cc421e50	fix: TypeError while setting transfer_qty in Stock Entry (#22929) ... Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-08-12 14:33:30 +05:30
Marica	846771cb29	Merge branch 'develop' into item-image-alt	2020-08-12 13:37:19 +05:30
Deepesh Garg	1d5ab618d2	Merge pull request #23001 from nabinhait/inclusive-tax-based-on-item-quantity ... fix: Calculate taxes if tax is based on item quantity and inclusive on item price	2020-08-11 22:05:02 +05:30
Deepesh Garg	7d0a625b9c	git commit -m "fix: Add missing semicolon"	2020-08-11 22:02:12 +05:30
Nabin Hait	19ea7218d9	fix: Calculate taxes if tax is based on item quantity and inclusive on item price	2020-08-11 20:34:57 +05:30
Shivam Mishra	1679c7af88	Merge branch 'develop' into support-search	2020-08-11 14:54:10 +00:00
Afshan	ba33900712	Merge remote-tracking branch 'upstream/develop' into fix-duplicate-dropdown-PO	2020-08-11 20:17:05 +05:30
Afshan	b5b2586968	fix: referencing frm	2020-08-11 20:15:57 +05:30
Shivam Mishra	2fe5d76fe4	Merge branch 'develop' into item-image-alt	2020-08-11 14:45:55 +00:00
Shivam Mishra	ccdaf3da66	Merge branch 'develop' into fix-margin-for-filter	2020-08-11 14:41:29 +00:00
Deepesh Garg	ca9038feb7	Merge pull request #22998 from abhishekbalam/rename_source_section_opportunity ... fix(CRM): Change 'Source' section name to 'More Information' in Opportunity	2020-08-11 18:26:09 +05:30
Anurag Mishra	ed6e9550ca	fix: removed payroll from HR. (#22991) ... Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-08-11 18:04:42 +05:30
Deepesh Garg	2633e292a5	fix: Is Secured Loan check mapping	2020-08-11 18:03:28 +05:30
Abhishek Balam	d0ae92d4bd	fix: moved company field, renamed to 'More Information'	2020-08-11 17:39:17 +05:30
prssanna	5a7618d8ec	fix: add company in list fields to fetch for Expense Claim	2020-08-11 16:50:31 +05:30
Abhishek Balam	ee5b9c7691	feat(Accounting): Process Statement Of Accounts (#22901) ... * feat: Process Statement Of Accounts initial commit * fix: add jinja supported inputs for subject and body in email settings * feat: utils support in template, tested autoemail, fixed issues	2020-08-11 16:23:47 +05:30
Abhishek Balam	9f6d114265	fix: Change Source section name to 'Company Information'	2020-08-11 16:16:05 +05:30
Anupam Kumar	79d731dcd8	feat: Naming series for Sales/Purchase Return (#22942) ... * feat: adding return naming series * Update purchase_invoice.json Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-08-11 16:11:20 +05:30
Deepesh Garg	145b80b11c	Merge pull request #22987 from frappe/fix-company-field ... fix: Consistent capitalization	2020-08-11 16:09:27 +05:30
Deepesh Garg	2621016884	fix: Allocated advance amount for multi-currency payment (#22923) ... * fix: Allocated advance amount for multicurrency payment * fix: Get grand total based on party currency * fix: Remove unwanted code	2020-08-11 16:06:13 +05:30
Abhishek Balam	ef3b82dae2	fix(CRM): Move Source section above Follow Up section In Opportunity (#22974) ... * fix: move source section above follow up * fix: only moving source field to 1st section	2020-08-11 16:05:02 +05:30
Shivam Mishra	3325be1d87	fix: spacing for slideshow (#22996)	2020-08-11 16:03:46 +05:30
Deepesh Garg	285e059394	Merge pull request #22997 from abhishekbalam/set_opportunity_status_to_converted ... fix(CRM): Change Opportunity to 'Converted' when Sales Order is created	2020-08-11 16:00:16 +05:30
Abhishek Balam	c992616d35	fix: change opportunity to 'Converted' when items not selected in opportunity itself for making quotation and sales order	2020-08-11 15:22:54 +05:30
Shivam Mishra	c798c6abbd	Merge branch 'develop' into fix-margin-for-filter	2020-08-11 09:11:30 +00:00
Afshan	acc3d42cf0	fix: escape apostrophe in company name if exist (#22956) ... Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-08-11 14:40:44 +05:30
Shivam Mishra	49dd8782fd	fix: margin overflow cutting the focus state	2020-08-11 14:39:04 +05:30
Rucha Mahabal	19b51762ef	fix: escape fields for Payroll Entry (#22994)	2020-08-11 13:12:00 +05:30
Rucha Mahabal	f7a7cc08d9	Merge branch 'develop' into escape-company-field	2020-08-11 10:22:32 +05:30
Saurabh	58d05ac0e0	fix: check setup complete flag insted setup page	2020-08-10 19:36:45 +05:30
Jai Chavan	dbbb864ba5	fix: Consistent capitalization	2020-08-10 16:55:03 +05:30
Deepesh Garg	069a54e5c3	fix: Cancellation of accounting transactions within closed accounting period	2020-08-10 16:01:01 +05:30
Deepesh Garg	372abaa420	Merge pull request #22976 from marination/sales-taxes-dashboard ... fix: Susbcription in Sales Taxes and Charges Dashboard	2020-08-10 15:17:59 +05:30
marination	0f27500197	fix: Susbcription in Sales Taxes and Charges Dashboard	2020-08-10 15:17:58 +05:30
Saurabh	2547b7479e	Merge pull request #22975 from nextchamp-saqib/pos-fixes-1 ... fix: [pos] minor bugs	2020-08-10 14:50:53 +05:30
Marica	0fcb05a3aa	fix: Misleading filters on Item tax Template Link field (#22918) ... Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com> Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-08-10 14:48:13 +05:30
Saqib Ansari	f1091534cd	fix: [pos] minor bugs	2020-08-10 14:45:58 +05:30
Marica	42fbdc09f8	Merge branch 'develop' into opportunity-from-email	2020-08-10 13:48:43 +05:30
Anoop	d3d3db654e	fix: Inpatient Record - Transfer check-in time validation (#22958) ... * fix: inpatient transfer should not allow future checkin time * Update erpnext/healthcare/doctype/inpatient_record/inpatient_record.js Error message corrected Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com> Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-08-10 13:21:12 +05:30
Deepesh Garg	d626e3bd2e	Merge branch 'develop' into billing_address_fetch	2020-08-10 12:57:12 +05:30
Shivam Mishra	ded9f41cce	refactor: update confusing label	2020-08-10 12:45:07 +05:30
marination	a07973cfa5	fix: Creating opportunity from email	2020-08-10 12:39:42 +05:30
Anurag Mishra	95984fd921	fix: Not able to cancel application,allocation nad encashments	2020-08-10 12:36:00 +05:30
Rucha Mahabal	97ecf52d6f	fix: failing Fees test	2020-08-10 12:13:35 +05:30
Prssanna Desai	5c0439f768	fix: set correct default value from from date in downtime analysis report (#22903) ... Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-08-10 11:12:52 +05:30
Deepesh Garg	bc8a281f83	fix: Subscripition link in Customer dashboard (#22960) ... Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-08-10 11:00:08 +05:30
Deepesh Garg	41a4999711	Merge pull request #22843 from nextchamp-saqib/asset-adj-dimension-fix ... fix: cannot submit value adjustment with custom dimension	2020-08-10 10:12:41 +05:30
Deepesh Garg	097d89f550	Merge pull request #22946 from deepeshgarg007/gst_export_wopay ... fix: GSTR 1 report for exports without payment of Tax	2020-08-10 09:56:12 +05:30
Anupam K	d01caac852	report lead detail	2020-08-10 09:39:58 +05:30
Mangesh-Khairnar	a53f15ca35	fix: remove mentions of display items in stock (#22963)	2020-08-09 13:12:47 +05:30
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
Deepesh Garg	d909669a18	fix: Test cases	2020-08-02 17:00:53 +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
Saurabh	a14618efe4	fix: validate theme_scss attribute	2020-07-30 17:22:29 +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	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
Anupam K	6bab21483c	report lost opportunity	2020-07-30 00:41:06 +05:30
Shivam Mishra	5b056988a6	Merge branch 'develop' of https://github.com/frappe/erpnext into support-search	2020-07-29 21:16:35 +05:30
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