23305 Commits

Author	SHA1	Message	Date
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