Merge pull request #21978 from scmmishra/work-order-fix-v13-beta
fix: compare start and end time to prevent negative diff
diff --git a/erpnext/buying/dashboard_fixtures.py b/erpnext/buying/dashboard_fixtures.py
index 0e2f78f..186bfb2 100644
--- a/erpnext/buying/dashboard_fixtures.py
+++ b/erpnext/buying/dashboard_fixtures.py
@@ -41,7 +41,7 @@
{ "chart": "Top Suppliers", "width": "Full"}
],
"cards": [
- { "card": "This Year Purchases"},
+ { "card": "Annual Purchase"},
{ "card": "Purchase Orders to Receive"},
{ "card": "Purchase Orders to Bill"},
{ "card": "Active Suppliers"}
@@ -142,7 +142,7 @@
def get_number_cards():
return [
{
- "name": "This Year Purchases",
+ "name": "Annual Purchase",
"aggregate_function_based_on": "base_net_total",
"doctype": "Number Card",
"document_type": "Purchase Order",
@@ -155,7 +155,7 @@
]),
"function": "Sum",
"is_public": 1,
- "label": _("This Year Purchases"),
+ "label": _("Annual Purchase"),
"owner": "Administrator",
"show_percentage_stats": 1,
"stats_time_interval": "Monthly"
diff --git a/erpnext/buying/desk_page/buying/buying.json b/erpnext/buying/desk_page/buying/buying.json
index ee18545..88f0a2b 100644
--- a/erpnext/buying/desk_page/buying/buying.json
+++ b/erpnext/buying/desk_page/buying/buying.json
@@ -55,7 +55,7 @@
"idx": 0,
"is_standard": 1,
"label": "Buying",
- "modified": "2020-05-19 19:44:36.260982",
+ "modified": "2020-05-27 19:15:05.067756",
"modified_by": "Administrator",
"module": "Buying",
"name": "Buying",
@@ -66,7 +66,7 @@
"shortcuts": [
{
"color": "#cef6d1",
- "format": "{} available",
+ "format": "{} Available",
"label": "Item",
"link_to": "Item",
"stats_filter": "{\n \"disabled\": 0\n}",
@@ -82,7 +82,7 @@
},
{
"color": "#ffe8cd",
- "format": "{} to Receive",
+ "format": "{} To Receive",
"label": "Purchase Order",
"link_to": "Purchase Order",
"stats_filter": "{\n \"company\": [\"like\", '%' + frappe.defaults.get_global_default(\"company\") + '%'],\n \"status\":[\"in\", [\"To Receive\", \"To Receive and Bill\"]]\n}",
@@ -99,7 +99,7 @@
"type": "Report"
},
{
- "label": "Buying Dashboard",
+ "label": "Dashboard",
"link_to": "Buying",
"type": "Dashboard"
}
diff --git a/erpnext/buying/doctype/buying_settings/buying_settings.js b/erpnext/buying/doctype/buying_settings/buying_settings.js
index a27950a..01b40cd 100644
--- a/erpnext/buying/doctype/buying_settings/buying_settings.js
+++ b/erpnext/buying/doctype/buying_settings/buying_settings.js
@@ -11,7 +11,7 @@
{
fieldname: "supp_master_name",
title: "Supplier Naming By",
- description: __("By default, the Item Name is set as per the Item Code entered. If you want Items to be named by a set ") + "<a href='https://docs.erpnext.com/docs/user/manual/en/setting-up/settings/naming-series'>Naming Series</a>" + __(" choose the 'Naming Series' option."),
+ description: __("By default, the Item Name is set as per the Item Code entered. If you want Items to be named by a set ") + "<a href='https://docs.erpnext.com/docs/user/manual/en/setting-up/settings/naming-series' target='_blank'>Naming Series</a>" + __(" choose the 'Naming Series' option."),
},
{
fieldname: "buying_price_list",
diff --git a/erpnext/change_log/v13/v13_0_0_beta_1.md b/erpnext/change_log/v13/v13_0_0-beta_1.md
similarity index 89%
rename from erpnext/change_log/v13/v13_0_0_beta_1.md
rename to erpnext/change_log/v13/v13_0_0-beta_1.md
index f84dc24..5bd13dd 100644
--- a/erpnext/change_log/v13/v13_0_0_beta_1.md
+++ b/erpnext/change_log/v13/v13_0_0-beta_1.md
@@ -30,6 +30,14 @@
- [Item-wise Sales Register](https://docs.erpnext.com/docs/user/manual/en/accounts/accounting-reports)
- [Territory-wise Sales](https://github.com/frappe/erpnext/pull/20428)
+## Regional
+
+- Germany
+
+ - [Update report DATEV Export to version 7.0](https://github.com/frappe/erpnext/pull/20582) and [allow to filter by voucher type](https://github.com/frappe/erpnext/pull/21060).
+
+- [Use any available Address Template](https://github.com/frappe/erpnext/pull/19862), not just your country's.
+
## Other Changes
- [Report Summary in Financial Statement](https://github.com/frappe/erpnext/pull/20876)
- [Accounts Payable Report based on Payment Terms](https://docs.erpnext.com/docs/user/manual/en/accounts/accounting-reports)
diff --git a/erpnext/change_log/v13/v13_0_0_beta_2.md b/erpnext/change_log/v13/v13_0_0-beta_2.md
similarity index 100%
rename from erpnext/change_log/v13/v13_0_0_beta_2.md
rename to erpnext/change_log/v13/v13_0_0-beta_2.md
diff --git a/erpnext/crm/module_onboarding/crm/crm.json b/erpnext/crm/module_onboarding/crm/crm.json
index 694763f..9b3d91e 100644
--- a/erpnext/crm/module_onboarding/crm/crm.json
+++ b/erpnext/crm/module_onboarding/crm/crm.json
@@ -16,7 +16,7 @@
"documentation_url": "https://docs.erpnext.com/docs/user/manual/en/CRM",
"idx": 0,
"is_complete": 0,
- "modified": "2020-05-20 12:53:47.029412",
+ "modified": "2020-05-27 11:33:09.941263",
"modified_by": "Administrator",
"module": "CRM",
"name": "CRM",
diff --git a/erpnext/crm/onboarding_step/create_and_send_quotation/create_and_send_quotation.json b/erpnext/crm/onboarding_step/create_and_send_quotation/create_and_send_quotation.json
index a6edfd7..9201d77 100644
--- a/erpnext/crm/onboarding_step/create_and_send_quotation/create_and_send_quotation.json
+++ b/erpnext/crm/onboarding_step/create_and_send_quotation/create_and_send_quotation.json
@@ -8,12 +8,12 @@
"is_mandatory": 0,
"is_single": 0,
"is_skipped": 0,
- "modified": "2020-05-14 17:30:07.887411",
+ "modified": "2020-05-27 11:30:28.237263",
"modified_by": "Administrator",
"name": "Create and Send Quotation",
"owner": "Administrator",
"reference_document": "Quotation",
- "show_full_form": 0,
+ "show_full_form": 1,
"title": "Create and Send Quotation",
- "validate_action": 0
+ "validate_action": 1
}
\ No newline at end of file
diff --git a/erpnext/crm/onboarding_step/create_lead/create_lead.json b/erpnext/crm/onboarding_step/create_lead/create_lead.json
index 47a45d7..6ff0bd6 100644
--- a/erpnext/crm/onboarding_step/create_lead/create_lead.json
+++ b/erpnext/crm/onboarding_step/create_lead/create_lead.json
@@ -8,12 +8,12 @@
"is_mandatory": 0,
"is_single": 0,
"is_skipped": 0,
- "modified": "2020-05-14 17:28:36.441387",
+ "modified": "2020-05-27 11:30:59.493720",
"modified_by": "Administrator",
"name": "Create Lead",
"owner": "Administrator",
"reference_document": "Lead",
- "show_full_form": 0,
+ "show_full_form": 1,
"title": "Create Lead",
- "validate_action": 0
+ "validate_action": 1
}
\ No newline at end of file
diff --git a/erpnext/crm/onboarding_step/create_opportunity/create_opportunity.json b/erpnext/crm/onboarding_step/create_opportunity/create_opportunity.json
index 231cf17..9f996d9 100644
--- a/erpnext/crm/onboarding_step/create_opportunity/create_opportunity.json
+++ b/erpnext/crm/onboarding_step/create_opportunity/create_opportunity.json
@@ -15,5 +15,5 @@
"reference_document": "Opportunity",
"show_full_form": 0,
"title": "Create Opportunity",
- "validate_action": 0
+ "validate_action": 1
}
\ No newline at end of file
diff --git a/erpnext/crm/onboarding_step/introduction_to_crm/introduction_to_crm.json b/erpnext/crm/onboarding_step/introduction_to_crm/introduction_to_crm.json
index 552ade0..545a756 100644
--- a/erpnext/crm/onboarding_step/introduction_to_crm/introduction_to_crm.json
+++ b/erpnext/crm/onboarding_step/introduction_to_crm/introduction_to_crm.json
@@ -8,12 +8,12 @@
"is_mandatory": 0,
"is_single": 0,
"is_skipped": 0,
- "modified": "2020-05-14 17:28:16.448676",
+ "modified": "2020-05-27 11:28:07.452857",
"modified_by": "Administrator",
"name": "Introduction to CRM",
"owner": "Administrator",
"show_full_form": 0,
"title": "Introduction to CRM",
- "validate_action": 0,
+ "validate_action": 1,
"video_url": "https://www.youtube.com/watch?v=o9XCSZHJfpA"
}
\ No newline at end of file
diff --git a/erpnext/healthcare/doctype/healthcare_settings/healthcare_settings.js b/erpnext/healthcare/doctype/healthcare_settings/healthcare_settings.js
index c266ba8..cf2276f 100644
--- a/erpnext/healthcare/doctype/healthcare_settings/healthcare_settings.js
+++ b/erpnext/healthcare/doctype/healthcare_settings/healthcare_settings.js
@@ -57,19 +57,19 @@
description: __('Checking this will automatically create a Sales Invoice whenever an appointment is booked for a Patient.')
},
{
- fieldname: 'healthcare_service_items',
+ fieldname: 'inpatient_visit_charge_item',
title: __('Healthcare Service Items'),
- description: __('Set up the Healthcare Service Items for billing. Click ') + "<a href='https://docs.erpnext.com/docs/user/manual/en/healthcare/healthcare_settings#2-default-healthcare-service-items' target='_blank'>here</a>" + __(' to know more')
+ description: __('You can create a service item for Inpatient Visit Charge and set it here. Similarly, you can set up other Healthcare Service Items for billing in this section. Click ') + "<a href='https://docs.erpnext.com/docs/user/manual/en/healthcare/healthcare_settings#2-default-healthcare-service-items' target='_blank'>here</a>" + __(' to know more')
},
{
- fieldname: 'sb_in_ac',
+ fieldname: 'income_account',
title: __('Set up default Accounts for the Healthcare Facility'),
description: __('If you wish to override default accounts settings and configure the Income and Receivable accounts for Healthcare, you can do so here.')
},
{
- fieldname: 'out_patient_sms_alerts',
+ fieldname: 'send_registration_msg',
title: __('Out Patient SMS alerts'),
- description: __('You can set up Out Patient SMS alerts here. Click ') + "<a href='https://docs.erpnext.com/docs/user/manual/en/healthcare/healthcare_settings#4-out-patient-sms-alerts' target='_blank'>here</a>" + __(' to know more')
+ description: __('If you want to send SMS alert on Patient Registration, you can enable this option. Similary, you can set up Out Patient SMS alerts for other functionalities in this section. Click ') + "<a href='https://docs.erpnext.com/docs/user/manual/en/healthcare/healthcare_settings#4-out-patient-sms-alerts' target='_blank'>here</a>" + __(' to know more')
}
];
diff --git a/erpnext/healthcare/doctype/patient_assessment/patient_assessment.json b/erpnext/healthcare/doctype/patient_assessment/patient_assessment.json
index 3952a81..15c9434 100644
--- a/erpnext/healthcare/doctype/patient_assessment/patient_assessment.json
+++ b/erpnext/healthcare/doctype/patient_assessment/patient_assessment.json
@@ -11,6 +11,7 @@
"patient",
"assessment_template",
"column_break_4",
+ "company",
"healthcare_practitioner",
"assessment_datetime",
"assessment_description",
@@ -127,11 +128,18 @@
"fieldname": "assessment_description",
"fieldtype": "Small Text",
"label": "Assessment Description"
+ },
+ {
+ "fieldname": "company",
+ "fieldtype": "Link",
+ "in_standard_filter": 1,
+ "label": "Company",
+ "options": "Company"
}
],
"is_submittable": 1,
"links": [],
- "modified": "2020-04-21 13:23:09.815007",
+ "modified": "2020-05-25 14:38:38.302399",
"modified_by": "Administrator",
"module": "Healthcare",
"name": "Patient Assessment",
diff --git a/erpnext/healthcare/doctype/sample_collection/sample_collection.json b/erpnext/healthcare/doctype/sample_collection/sample_collection.json
index c352287..016cfbc 100644
--- a/erpnext/healthcare/doctype/sample_collection/sample_collection.json
+++ b/erpnext/healthcare/doctype/sample_collection/sample_collection.json
@@ -85,11 +85,9 @@
{
"fieldname": "company",
"fieldtype": "Link",
- "hidden": 1,
+ "in_standard_filter": 1,
"label": "Company",
- "options": "Company",
- "print_hide": 1,
- "report_hide": 1
+ "options": "Company"
},
{
"fieldname": "section_break_6",
@@ -167,7 +165,7 @@
],
"is_submittable": 1,
"links": [],
- "modified": "2020-04-04 19:17:02.707203",
+ "modified": "2020-05-25 14:36:46.990469",
"modified_by": "Administrator",
"module": "Healthcare",
"name": "Sample Collection",
diff --git a/erpnext/healthcare/doctype/therapy_plan/therapy_plan.json b/erpnext/healthcare/doctype/therapy_plan/therapy_plan.json
index ca78b66..9edfeb2 100644
--- a/erpnext/healthcare/doctype/therapy_plan/therapy_plan.json
+++ b/erpnext/healthcare/doctype/therapy_plan/therapy_plan.json
@@ -10,6 +10,7 @@
"patient",
"patient_name",
"column_break_4",
+ "company",
"status",
"start_date",
"section_break_3",
@@ -98,10 +99,17 @@
"label": "Status",
"options": "Not Started\nIn Progress\nCompleted\nCancelled",
"read_only": 1
+ },
+ {
+ "fieldname": "company",
+ "fieldtype": "Link",
+ "in_standard_filter": 1,
+ "label": "Company",
+ "options": "Company"
}
],
"links": [],
- "modified": "2020-04-21 13:13:43.956014",
+ "modified": "2020-05-25 14:38:53.649315",
"modified_by": "Administrator",
"module": "Healthcare",
"name": "Therapy Plan",
diff --git a/erpnext/healthcare/module_onboarding/healthcare/healthcare.json b/erpnext/healthcare/module_onboarding/healthcare/healthcare.json
index db35149..3e50726 100644
--- a/erpnext/healthcare/module_onboarding/healthcare/healthcare.json
+++ b/erpnext/healthcare/module_onboarding/healthcare/healthcare.json
@@ -10,7 +10,7 @@
"documentation_url": "https://docs.erpnext.com/docs/user/manual/en/healthcare",
"idx": 0,
"is_complete": 0,
- "modified": "2020-05-19 12:52:09.757729",
+ "modified": "2020-05-26 23:16:37.603361",
"modified_by": "Administrator",
"module": "Healthcare",
"name": "Healthcare",
@@ -20,13 +20,13 @@
"step": "Create Patient"
},
{
- "step": "Create Practitioner"
- },
- {
"step": "Create Practitioner Schedule"
},
{
- "step": "Setup Schedule and Employee for Healthcare Practitioner"
+ "step": "Introduction to Healthcare Practitioner"
+ },
+ {
+ "step": "Create Healthcare Practitioner"
},
{
"step": "Explore Healthcare Settings"
diff --git a/erpnext/healthcare/onboarding_step/create_practitioner/create_practitioner.json b/erpnext/healthcare/onboarding_step/create_healthcare_practitioner/create_healthcare_practitioner.json
similarity index 64%
rename from erpnext/healthcare/onboarding_step/create_practitioner/create_practitioner.json
rename to erpnext/healthcare/onboarding_step/create_healthcare_practitioner/create_healthcare_practitioner.json
index 614b201..c45a347 100644
--- a/erpnext/healthcare/onboarding_step/create_practitioner/create_practitioner.json
+++ b/erpnext/healthcare/onboarding_step/create_healthcare_practitioner/create_healthcare_practitioner.json
@@ -1,6 +1,6 @@
{
"action": "Create Entry",
- "creation": "2020-05-19 10:39:55.728057",
+ "creation": "2020-05-19 10:39:55.728058",
"docstatus": 0,
"doctype": "Onboarding Step",
"idx": 0,
@@ -8,12 +8,12 @@
"is_mandatory": 1,
"is_single": 0,
"is_skipped": 0,
- "modified": "2020-05-19 12:27:39.851375",
+ "modified": "2020-05-26 23:16:31.965521",
"modified_by": "Administrator",
- "name": "Create Practitioner",
+ "name": "Create Healthcare Practitioner",
"owner": "Administrator",
"reference_document": "Healthcare Practitioner",
"show_full_form": 1,
- "title": "Create Practitioner",
+ "title": "Create Healthcare Practitioner",
"validate_action": 1
}
\ No newline at end of file
diff --git a/erpnext/healthcare/onboarding_step/explore_clinical_procedure_templates/explore_clinical_procedure_templates.json b/erpnext/healthcare/onboarding_step/explore_clinical_procedure_templates/explore_clinical_procedure_templates.json
index f0c0f61..697b761 100644
--- a/erpnext/healthcare/onboarding_step/explore_clinical_procedure_templates/explore_clinical_procedure_templates.json
+++ b/erpnext/healthcare/onboarding_step/explore_clinical_procedure_templates/explore_clinical_procedure_templates.json
@@ -8,7 +8,7 @@
"is_mandatory": 0,
"is_single": 0,
"is_skipped": 0,
- "modified": "2020-05-19 11:46:35.085270",
+ "modified": "2020-05-26 23:10:24.504030",
"modified_by": "Administrator",
"name": "Explore Clinical Procedure Templates",
"owner": "Administrator",
diff --git a/erpnext/healthcare/onboarding_step/explore_healthcare_settings/explore_healthcare_settings.json b/erpnext/healthcare/onboarding_step/explore_healthcare_settings/explore_healthcare_settings.json
index 2bdab69..b2d5aef 100644
--- a/erpnext/healthcare/onboarding_step/explore_healthcare_settings/explore_healthcare_settings.json
+++ b/erpnext/healthcare/onboarding_step/explore_healthcare_settings/explore_healthcare_settings.json
@@ -8,7 +8,7 @@
"is_mandatory": 1,
"is_single": 1,
"is_skipped": 0,
- "modified": "2020-05-19 12:26:48.682673",
+ "modified": "2020-05-26 23:10:24.507648",
"modified_by": "Administrator",
"name": "Explore Healthcare Settings",
"owner": "Administrator",
diff --git a/erpnext/healthcare/onboarding_step/setup_schedule_and_employee_for_healthcare_practitioner/setup_schedule_and_employee_for_healthcare_practitioner.json b/erpnext/healthcare/onboarding_step/introduction_to_healthcare_practitioner/introduction_to_healthcare_practitioner.json
similarity index 67%
rename from erpnext/healthcare/onboarding_step/setup_schedule_and_employee_for_healthcare_practitioner/setup_schedule_and_employee_for_healthcare_practitioner.json
rename to erpnext/healthcare/onboarding_step/introduction_to_healthcare_practitioner/introduction_to_healthcare_practitioner.json
index c5af177..fa4c903 100644
--- a/erpnext/healthcare/onboarding_step/setup_schedule_and_employee_for_healthcare_practitioner/setup_schedule_and_employee_for_healthcare_practitioner.json
+++ b/erpnext/healthcare/onboarding_step/introduction_to_healthcare_practitioner/introduction_to_healthcare_practitioner.json
@@ -9,12 +9,12 @@
"is_mandatory": 1,
"is_single": 0,
"is_skipped": 0,
- "modified": "2020-05-19 12:26:42.492734",
+ "modified": "2020-05-26 22:07:07.482530",
"modified_by": "Administrator",
- "name": "Setup Schedule and Employee for Healthcare Practitioner",
+ "name": "Introduction to Healthcare Practitioner",
"owner": "Administrator",
"reference_document": "Healthcare Practitioner",
"show_full_form": 0,
- "title": "Setup Schedule and Employee for Healthcare Practitioner",
+ "title": "Introduction to Healthcare Practitioner",
"validate_action": 0
}
\ No newline at end of file
diff --git a/erpnext/healthcare/setup.py b/erpnext/healthcare/setup.py
index 2087f49..0684080 100644
--- a/erpnext/healthcare/setup.py
+++ b/erpnext/healthcare/setup.py
@@ -195,10 +195,21 @@
def add_healthcare_service_unit_tree_root():
record = [
- {
- "doctype": "Healthcare Service Unit",
- "healthcare_service_unit_name": "All Healthcare Service Units",
- "is_group": 1
- }
+ {
+ "doctype": "Healthcare Service Unit",
+ "healthcare_service_unit_name": "All Healthcare Service Units",
+ "is_group": 1,
+ "company": get_company()
+ }
]
insert_record(record)
+
+def get_company():
+ company = frappe.defaults.get_defaults().company
+ if company:
+ return company
+ else:
+ company = frappe.get_list("Company", limit=1)
+ if company:
+ return company[0].name
+ return None
diff --git a/erpnext/healthcare/utils.py b/erpnext/healthcare/utils.py
index f092578..9abaa07 100644
--- a/erpnext/healthcare/utils.py
+++ b/erpnext/healthcare/utils.py
@@ -512,10 +512,10 @@
def get_patient_vitals(patient, from_date=None, to_date=None):
if not patient: return
- vitals = frappe.db.get_all('Vital Signs', {
+ vitals = frappe.db.get_all('Vital Signs', filters={
'docstatus': 1,
'patient': patient
- }, order_by='signs_date, signs_time')
+ }, order_by='signs_date, signs_time', fields=['*'])
if len(vitals):
return vitals
diff --git a/erpnext/hr/doctype/additional_salary/additional_salary.py b/erpnext/hr/doctype/additional_salary/additional_salary.py
index bab6fb5..e369ba7 100644
--- a/erpnext/hr/doctype/additional_salary/additional_salary.py
+++ b/erpnext/hr/doctype/additional_salary/additional_salary.py
@@ -37,7 +37,7 @@
frappe.throw(_("Payroll date can not be less than employee's joining date."))
elif getdate(self.from_date) < getdate(date_of_joining):
frappe.throw(_("From date can not be less than employee's joining date."))
- elif getdate(self.to_date) > getdate(relieving_date):
+ elif relieving_date and getdate(self.to_date) > getdate(relieving_date):
frappe.throw(_("To date can not be greater than employee's relieving date."))
def get_amount(self, sal_start_date, sal_end_date):
diff --git a/erpnext/hr/onboarding_step/create_holiday_list/create_holiday_list.json b/erpnext/hr/onboarding_step/create_holiday_list/create_holiday_list.json
index 25cb9fe..208e394 100644
--- a/erpnext/hr/onboarding_step/create_holiday_list/create_holiday_list.json
+++ b/erpnext/hr/onboarding_step/create_holiday_list/create_holiday_list.json
@@ -1,6 +1,6 @@
{
"action": "Create Entry",
- "creation": "2020-05-14 11:47:34.700174",
+ "creation": "2020-05-27 11:47:34.700174",
"docstatus": 0,
"doctype": "Onboarding Step",
"idx": 0,
@@ -13,7 +13,7 @@
"name": "Create Holiday list",
"owner": "Administrator",
"reference_document": "Holiday List",
- "show_full_form": 0,
+ "show_full_form": 1,
"title": "Create Holiday list",
"validate_action": 0
}
\ No newline at end of file
diff --git a/erpnext/hr/onboarding_step/create_leave_type/create_leave_type.json b/erpnext/hr/onboarding_step/create_leave_type/create_leave_type.json
index e8b97c2..8cbfc5c 100644
--- a/erpnext/hr/onboarding_step/create_leave_type/create_leave_type.json
+++ b/erpnext/hr/onboarding_step/create_leave_type/create_leave_type.json
@@ -1,6 +1,6 @@
{
"action": "Create Entry",
- "creation": "2020-05-20 11:17:31.119312",
+ "creation": "2020-05-27 11:17:31.119312",
"docstatus": 0,
"doctype": "Onboarding Step",
"idx": 0,
@@ -13,7 +13,7 @@
"name": "Create Leave Type",
"owner": "Administrator",
"reference_document": "Leave Type",
- "show_full_form": 0,
+ "show_full_form": 1,
"title": "Create Leave Type",
"validate_action": 0
}
\ No newline at end of file
diff --git a/erpnext/manufacturing/dashboard_fixtures.py b/erpnext/manufacturing/dashboard_fixtures.py
index ef61f23..4a17fd0 100644
--- a/erpnext/manufacturing/dashboard_fixtures.py
+++ b/erpnext/manufacturing/dashboard_fixtures.py
@@ -3,7 +3,7 @@
import frappe, erpnext, json
from frappe import _
-from frappe.utils import nowdate, get_date_str
+from frappe.utils import nowdate, get_first_day, get_last_day, add_months
from erpnext.accounts.utils import get_fiscal_year
def get_data():
@@ -28,10 +28,10 @@
{ "chart": "Job Card Analysis", "width": "Full" }
],
"cards": [
- { "card": "Total Work Order" },
- { "card": "Completed Work Order" },
+ { "card": "Monthly Total Work Order" },
+ { "card": "Monthly Completed Work Order" },
{ "card": "Ongoing Job Card" },
- { "card": "Total Quality Inspection"}
+ { "card": "Monthly Quality Inspection"}
]
}]
@@ -180,38 +180,37 @@
}]
def get_number_cards():
- fiscal_year = get_fiscal_year(date=nowdate())
- year_start_date = get_date_str(fiscal_year[1])
- year_end_date = get_date_str(fiscal_year[2])
+ start_date = add_months(nowdate(), -1)
+ end_date = nowdate()
return [{
"doctype": "Number Card",
"document_type": "Work Order",
- "name": "Total Work Order",
+ "name": "Monthly Total Work Order",
"filters_json": json.dumps([
['Work Order', 'docstatus', '=', 1],
- ['Work Order', 'creation', 'between', [year_start_date, year_end_date]]
+ ['Work Order', 'creation', 'between', [start_date, end_date]]
]),
"function": "Count",
"is_public": 1,
- "label": _("Total Work Order"),
+ "label": _("Monthly Total Work Order"),
"show_percentage_stats": 1,
- "stats_time_interval": "Monthly"
+ "stats_time_interval": "Weekly"
},
{
"doctype": "Number Card",
"document_type": "Work Order",
- "name": "Completed Work Order",
+ "name": "Monthly Completed Work Order",
"filters_json": json.dumps([
['Work Order', 'status', '=', 'Completed'],
['Work Order', 'docstatus', '=', 1],
- ['Work Order', 'creation', 'between', [year_start_date, year_end_date]]
+ ['Work Order', 'creation', 'between', [start_date, end_date]]
]),
"function": "Count",
"is_public": 1,
- "label": _("Completed Work Order"),
+ "label": _("Monthly Completed Work Order"),
"show_percentage_stats": 1,
- "stats_time_interval": "Monthly"
+ "stats_time_interval": "Weekly"
},
{
"doctype": "Number Card",
@@ -225,16 +224,19 @@
"is_public": 1,
"label": _("Ongoing Job Card"),
"show_percentage_stats": 1,
- "stats_time_interval": "Monthly"
+ "stats_time_interval": "Weekly"
},
{
"doctype": "Number Card",
"document_type": "Quality Inspection",
- "name": "Total Quality Inspection",
- "filters_json": json.dumps([['Quality Inspection', 'docstatus', '=', 1]]),
+ "name": "Monthly Quality Inspection",
+ "filters_json": json.dumps([
+ ['Quality Inspection', 'docstatus', '=', 1],
+ ['Quality Inspection', 'creation', 'between', [start_date, end_date]]
+ ]),
"function": "Count",
"is_public": 1,
- "label": _("Total Quality Inspection"),
+ "label": _("Monthly Quality Inspection"),
"show_percentage_stats": 1,
- "stats_time_interval": "Monthly"
+ "stats_time_interval": "Weekly"
}]
\ No newline at end of file
diff --git a/erpnext/manufacturing/doctype/downtime_entry/downtime_entry.json b/erpnext/manufacturing/doctype/downtime_entry/downtime_entry.json
index 9acb4f0..b301a9e 100644
--- a/erpnext/manufacturing/doctype/downtime_entry/downtime_entry.json
+++ b/erpnext/manufacturing/doctype/downtime_entry/downtime_entry.json
@@ -1,11 +1,13 @@
{
"actions": [],
"allow_import": 1,
+ "autoname": "naming_series:",
"creation": "2020-04-18 04:50:46.187638",
"doctype": "DocType",
"editable_grid": 1,
"engine": "InnoDB",
"field_order": [
+ "naming_series",
"workstation",
"operator",
"column_break_4",
@@ -78,10 +80,17 @@
"fieldname": "remarks",
"fieldtype": "Text",
"label": "Remarks"
+ },
+ {
+ "fieldname": "naming_series",
+ "fieldtype": "Select",
+ "label": "Naming Series",
+ "options": "DT-",
+ "reqd": 1
}
],
"links": [],
- "modified": "2020-05-19 12:59:37.358483",
+ "modified": "2020-05-26 22:14:54.479831",
"modified_by": "Administrator",
"module": "Manufacturing",
"name": "Downtime Entry",
diff --git a/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.js b/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.js
index ac144e2..668e981 100644
--- a/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.js
+++ b/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.js
@@ -3,3 +3,31 @@
frappe.ui.form.on('Manufacturing Settings', {
});
+
+frappe.tour["Manufacturing Settings"] = [
+ {
+ fieldname: "material_consumption",
+ title: __("Allow Multiple Material Consumption"),
+ description: __("If ticked, multiple materials can be used for a single Work Order. This is useful if one or more time consuming products are being manufactured.")
+ },
+ {
+ fieldname: "backflush_raw_materials_based_on",
+ title: __("Backflush Raw Materials"),
+ description: __("The Stock Entry of type 'Manufacture' is known as backflush. Raw materials being consumed to manufacture finished goods is known as backflushing. <br><br> When creating Manufacture Entry, raw-material items are backflushed based on BOM of production item. If you want raw-material items to be backflushed based on Material Transfer entry made against that Work Order instead, then you can set it under this field.")
+ },
+ {
+ fieldname: "default_wip_warehouse",
+ title: __("Work In Progress Warehouse"),
+ description: __("This Warehouse will be auto-updated in the Work In Progress Warehouse field of Work Orders.")
+ },
+ {
+ fieldname: "default_fg_warehouse",
+ title: __("Finished Goods Warehouse"),
+ description: __("This Warehouse will be auto-updated in the Target Warehouse field of Work Order.")
+ },
+ {
+ fieldname: "update_bom_costs_automatically",
+ title: __("Update BOM Cost Automatically"),
+ description: __("If ticked, the BOM cost will be automatically updated based on Valuation Rate / Price List Rate / last purchase rate of raw materials.")
+ }
+];
\ No newline at end of file
diff --git a/erpnext/manufacturing/doctype/production_plan/production_plan.js b/erpnext/manufacturing/doctype/production_plan/production_plan.js
index 64c952b..1a64bc5 100644
--- a/erpnext/manufacturing/doctype/production_plan/production_plan.js
+++ b/erpnext/manufacturing/doctype/production_plan/production_plan.js
@@ -201,9 +201,9 @@
title: title,
fields: [
{
- "fieldtype": "Table MultiSelect", "label": __("Source Warehouses"),
+ "fieldtype": "Table MultiSelect", "label": __("Source Warehouses (Optional)"),
"fieldname": "warehouses", "options": "Production Plan Material Request Warehouse",
- "description": "System will pickup the materials from the selected warehouses",
+ "description": __("System will pickup the materials from the selected warehouses. If not specified, system will create material request for purchase."),
get_query: function () {
return {
filters: {
diff --git a/erpnext/manufacturing/onboarding_step/explore_manufacturing_settings/explore_manufacturing_settings.json b/erpnext/manufacturing/onboarding_step/explore_manufacturing_settings/explore_manufacturing_settings.json
index 582aba4..7ef202e 100644
--- a/erpnext/manufacturing/onboarding_step/explore_manufacturing_settings/explore_manufacturing_settings.json
+++ b/erpnext/manufacturing/onboarding_step/explore_manufacturing_settings/explore_manufacturing_settings.json
@@ -1,5 +1,5 @@
{
- "action": "Update Settings",
+ "action": "Show Form Tour",
"creation": "2020-05-19 11:55:11.378374",
"docstatus": 0,
"doctype": "Onboarding Step",
@@ -8,7 +8,7 @@
"is_mandatory": 0,
"is_single": 1,
"is_skipped": 0,
- "modified": "2020-05-19 12:12:28.145366",
+ "modified": "2020-05-26 20:28:03.558199",
"modified_by": "Administrator",
"name": "Explore Manufacturing Settings",
"owner": "Administrator",
diff --git a/erpnext/manufacturing/report/bom_operations_time/bom_operations_time.py b/erpnext/manufacturing/report/bom_operations_time/bom_operations_time.py
index 1279011..e7d9265 100644
--- a/erpnext/manufacturing/report/bom_operations_time/bom_operations_time.py
+++ b/erpnext/manufacturing/report/bom_operations_time/bom_operations_time.py
@@ -103,7 +103,7 @@
"fieldtype": "Int",
"width": 140
}, {
- "label": _("Subassembly BOM Count"),
+ "label": _("Sub-assembly BOM Count"),
"fieldname": "used_as_subassembly_items",
"fieldtype": "Int",
"width": 180
diff --git a/erpnext/manufacturing/report/downtime_analysis/downtime_analysis.py b/erpnext/manufacturing/report/downtime_analysis/downtime_analysis.py
index 2b2be4f..093309a 100644
--- a/erpnext/manufacturing/report/downtime_analysis/downtime_analysis.py
+++ b/erpnext/manufacturing/report/downtime_analysis/downtime_analysis.py
@@ -24,7 +24,12 @@
if filters.get("workstation"):
query_filters["workstation"] = filters.get("workstation")
- return frappe.get_all("Downtime Entry", fields= fields, filters=query_filters)
+ data = frappe.get_all("Downtime Entry", fields= fields, filters=query_filters) or []
+ for d in data:
+ if d.downtime:
+ d.downtime = d.downtime / 60
+
+ return data
def get_chart_data(data, columns):
labels = sorted(list(set([d.workstation for d in data])))
@@ -44,7 +49,7 @@
"data": {
"labels": labels,
"datasets": [
- {"name": "Dataset 1", "values": datasets}
+ {"name": "Machine Downtime", "values": datasets}
]
},
"type": "bar"
@@ -88,7 +93,7 @@
"width": 160
},
{
- "label": _("Downtime (In Mins)"),
+ "label": _("Downtime (In Hours)"),
"fieldname": "downtime",
"fieldtype": "Float",
"width": 150
diff --git a/erpnext/manufacturing/report/job_card_summary/job_card_summary.js b/erpnext/manufacturing/report/job_card_summary/job_card_summary.js
index b7e3071..33953b1 100644
--- a/erpnext/manufacturing/report/job_card_summary/job_card_summary.js
+++ b/erpnext/manufacturing/report/job_card_summary/job_card_summary.js
@@ -13,17 +13,38 @@
reqd: 1
},
{
- label: __("From Date"),
+ fieldname: "fiscal_year",
+ label: __("Fiscal Year"),
+ fieldtype: "Link",
+ options: "Fiscal Year",
+ default: frappe.defaults.get_user_default("fiscal_year"),
+ reqd: 1,
+ on_change: function(query_report) {
+ var fiscal_year = query_report.get_values().fiscal_year;
+ if (!fiscal_year) {
+ return;
+ }
+ frappe.model.with_doc("Fiscal Year", fiscal_year, function(r) {
+ var fy = frappe.model.get_doc("Fiscal Year", fiscal_year);
+ frappe.query_report.set_filter_value({
+ from_date: fy.year_start_date,
+ to_date: fy.year_end_date
+ });
+ });
+ }
+ },
+ {
+ label: __("From Posting Date"),
fieldname:"from_date",
fieldtype: "Date",
- default: frappe.datetime.add_months(frappe.datetime.get_today(), -12),
+ default: frappe.defaults.get_user_default("year_start_date"),
reqd: 1
},
{
- label: __("To Date"),
+ label: __("To Posting Datetime"),
fieldname:"to_date",
fieldtype: "Date",
- default: frappe.datetime.get_today(),
+ default: frappe.defaults.get_user_default("year_end_date"),
reqd: 1,
},
{
diff --git a/erpnext/manufacturing/report/job_card_summary/job_card_summary.py b/erpnext/manufacturing/report/job_card_summary/job_card_summary.py
index ae1e4f3..953d820 100644
--- a/erpnext/manufacturing/report/job_card_summary/job_card_summary.py
+++ b/erpnext/manufacturing/report/job_card_summary/job_card_summary.py
@@ -15,9 +15,12 @@
return columns, data, None, chart_data
def get_data(filters):
- query_filters = {"docstatus": ("<", 2)}
+ query_filters = {
+ "docstatus": ("=", 1),
+ "posting_date": ("between", [filters.from_date, filters.to_date])
+ }
- fields = ["name", "status", "work_order", "production_item", "item_name",
+ fields = ["name", "status", "work_order", "production_item", "item_name", "posting_date",
"total_completed_qty", "workstation", "operation", "employee_name", "total_time_in_mins"]
for field in ["work_order", "workstation", "operation", "company"]:
@@ -30,12 +33,19 @@
if not data: return []
job_cards = [d.name for d in data]
+
+ job_card_time_filter = {
+ "docstatus": 1,
+ "parent": ("in", job_cards),
+ }
+
job_card_time_details = {}
for job_card_data in frappe.get_all("Job Card Time Log",
fields=["min(from_time) as from_time", "max(to_time) as to_time", "parent"],
- filters={"docstatus": ("<", 2), "parent": ("in", job_cards)}, group_by="parent"):
+ filters=job_card_time_filter, group_by="parent", debug=1):
job_card_time_details[job_card_data.parent] = job_card_data
+ res = []
for d in data:
if d.status == "Material Transferred":
d.status = "Open"
@@ -43,8 +53,9 @@
if job_card_time_details.get(d.name):
d.from_time = job_card_time_details.get(d.name).from_time
d.to_time = job_card_time_details.get(d.name).to_time
+ res.append(d)
- return data
+ return res
def get_chart_data(job_card_details, filters):
labels, periodic_data = prepare_chart_data(job_card_details, filters)
@@ -86,10 +97,10 @@
labels.append(period)
for d in job_card_details:
- if getdate(d.from_time) >= from_date and getdate(d.to_time) <= end_date:
+ if getdate(d.posting_date) > from_date and getdate(d.posting_date) <= end_date:
status = "Completed" if d.status == "Completed" else "Pending"
- if periodic_data.get(status) and periodic_data.get(status).get(period):
+ if periodic_data.get(status).get(period):
periodic_data[status][period] += 1
else:
periodic_data[status][period] = 1
@@ -105,6 +116,12 @@
"options": "Job Card",
"width": 100
},
+ {
+ "label": _("Posting Date"),
+ "fieldname": "posting_date",
+ "fieldtype": "Date",
+ "width": 100
+ },
]
if not filters.get("status"):
diff --git a/erpnext/manufacturing/report/work_order_summary/work_order_summary.js b/erpnext/manufacturing/report/work_order_summary/work_order_summary.js
index ec9fe35..2292865 100644
--- a/erpnext/manufacturing/report/work_order_summary/work_order_summary.js
+++ b/erpnext/manufacturing/report/work_order_summary/work_order_summary.js
@@ -13,17 +13,38 @@
reqd: 1
},
{
- label: __("From Date"),
+ fieldname: "fiscal_year",
+ label: __("Fiscal Year"),
+ fieldtype: "Link",
+ options: "Fiscal Year",
+ default: frappe.defaults.get_user_default("fiscal_year"),
+ reqd: 1,
+ on_change: function(query_report) {
+ var fiscal_year = query_report.get_values().fiscal_year;
+ if (!fiscal_year) {
+ return;
+ }
+ frappe.model.with_doc("Fiscal Year", fiscal_year, function(r) {
+ var fy = frappe.model.get_doc("Fiscal Year", fiscal_year);
+ frappe.query_report.set_filter_value({
+ from_date: fy.year_start_date,
+ to_date: fy.year_end_date
+ });
+ });
+ }
+ },
+ {
+ label: __("From Posting Date"),
fieldname:"from_date",
fieldtype: "Date",
- default: frappe.datetime.add_months(frappe.datetime.get_today(), -12),
+ default: frappe.defaults.get_user_default("year_start_date"),
reqd: 1
},
{
- label: __("To Date"),
+ label: __("To Posting Datetime"),
fieldname:"to_date",
fieldtype: "Date",
- default: frappe.datetime.get_today(),
+ default: frappe.defaults.get_user_default("year_end_date"),
reqd: 1,
},
{
diff --git a/erpnext/manufacturing/report/work_order_summary/work_order_summary.py b/erpnext/manufacturing/report/work_order_summary/work_order_summary.py
index bc09ed4..fb047b2 100644
--- a/erpnext/manufacturing/report/work_order_summary/work_order_summary.py
+++ b/erpnext/manufacturing/report/work_order_summary/work_order_summary.py
@@ -56,7 +56,7 @@
return get_chart_based_on_qty(data, filters)
def get_chart_based_on_status(data):
- labels = ["Not Started", "In Process", "Stopped", "Completed"]
+ labels = ["Completed", "In Process", "Stopped", "Not Started"]
status_wise_data = {
"Not Started": 0,
@@ -66,13 +66,10 @@
}
for d in data:
- if d.status == "In Process" and d.produced_qty:
- status_wise_data["Completed"] += d.produced_qty
+ status_wise_data[d.status] += 1
- status_wise_data[d.status] += d.qty
-
- values = [status_wise_data["Not Started"], status_wise_data["In Process"],
- status_wise_data["Stopped"], status_wise_data["Completed"]]
+ values = [status_wise_data["Completed"], status_wise_data["In Process"],
+ status_wise_data["Stopped"], status_wise_data["Not Started"]]
chart = {
"data": {
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index cb82901..481cd35 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -688,7 +688,7 @@
erpnext.patches.v12_0.update_price_list_currency_in_bom
execute:frappe.delete_doc_if_exists('Dashboard', 'Accounts')
erpnext.patches.v13_0.update_actual_start_and_end_date_in_wo
-erpnext.patches.v13_0.set_company_field_in_healthcare_doctypes
+erpnext.patches.v13_0.set_company_field_in_healthcare_doctypes #2020-05-25
erpnext.patches.v12_0.update_bom_in_so_mr
execute:frappe.delete_doc("Report", "Department Analytics")
execute:frappe.rename_doc("Desk Page", "Loan Management", "Loan", force=True)
diff --git a/erpnext/patches/v13_0/set_company_field_in_healthcare_doctypes.py b/erpnext/patches/v13_0/set_company_field_in_healthcare_doctypes.py
index 9d0dae4..a7d4c66 100644
--- a/erpnext/patches/v13_0/set_company_field_in_healthcare_doctypes.py
+++ b/erpnext/patches/v13_0/set_company_field_in_healthcare_doctypes.py
@@ -3,8 +3,8 @@
def execute():
company = frappe.db.get_single_value('Global Defaults', 'default_company')
- doctypes = ['Clinical Procedure', 'Inpatient Record', 'Lab Test', 'Patient Appointment', 'Patient Encounter', 'Vital Signs']
+ doctypes = ['Clinical Procedure', 'Inpatient Record', 'Lab Test', 'Sample Collection' 'Patient Appointment', 'Patient Encounter', 'Vital Signs', 'Therapy Session', 'Therapy Plan', 'Patient Assessment']
for entry in doctypes:
if frappe.db.exists('DocType', entry):
- frappe.reload_doc("Healthcare", "doctype", entry)
+ frappe.reload_doc('Healthcare', 'doctype', entry)
frappe.db.sql("update `tab{dt}` set company = '{company}' where ifnull(company, '') = ''".format(dt=entry, company=company))
diff --git a/erpnext/projects/report/project_summary/project_summary.js b/erpnext/projects/report/project_summary/project_summary.js
index 15367ac..414b7b2 100644
--- a/erpnext/projects/report/project_summary/project_summary.js
+++ b/erpnext/projects/report/project_summary/project_summary.js
@@ -13,11 +13,30 @@
"reqd": 1
},
{
+ "fieldname": "is_active",
+ "label": __("Is Active"),
+ "fieldtype": "Select",
+ "options": "\nYes\nNo",
+ "default": "Yes",
+ },
+ {
"fieldname": "status",
"label": __("Status"),
"fieldtype": "Select",
- "options": "Open\nComplete\nCancelled",
+ "options": "\nOpen\nCompleted\nCancelled",
"default": "Open"
+ },
+ {
+ "fieldname": "project_type",
+ "label": __("Project Type"),
+ "fieldtype": "Link",
+ "options": "Project Type"
+ },
+ {
+ "fieldname": "priority",
+ "label": __("Priority"),
+ "fieldtype": "Select",
+ "options": "\nLow\nMedium\nHigh"
}
]
};
diff --git a/erpnext/projects/report/project_summary/project_summary.py b/erpnext/projects/report/project_summary/project_summary.py
index a20d7f2..ea7f1ab 100644
--- a/erpnext/projects/report/project_summary/project_summary.py
+++ b/erpnext/projects/report/project_summary/project_summary.py
@@ -9,7 +9,7 @@
columns = get_columns()
data = []
- data = frappe.db.get_all("Project", filters=filters, fields=["name", 'status', "percent_complete", "expected_start_date", "expected_end_date"], order_by="expected_end_date")
+ data = frappe.db.get_all("Project", filters=filters, fields=["name", 'status', "percent_complete", "expected_start_date", "expected_end_date", "project_type"], order_by="expected_end_date")
for project in data:
project["total_tasks"] = frappe.db.count("Task", filters={"project": project.name})
@@ -31,6 +31,13 @@
"width": 200
},
{
+ "fieldname": "project_type",
+ "label": _("Type"),
+ "fieldtype": "Link",
+ "options": "Project Type",
+ "width": 120
+ },
+ {
"fieldname": "status",
"label": _("Status"),
"fieldtype": "Data",
@@ -88,19 +95,19 @@
return {
"data": {
- 'labels': labels,
+ 'labels': labels[:30],
'datasets': [
{
"name": "Overdue",
- "values": overdue
+ "values": overdue[:30]
},
{
"name": "Completed",
- "values": completed
+ "values": completed[:30]
},
{
"name": "Total Tasks",
- "values": total
+ "values": total[:30]
},
]
},
diff --git a/erpnext/stock/desk_page/stock/stock.json b/erpnext/stock/desk_page/stock/stock.json
index 4506664..23401fd 100644
--- a/erpnext/stock/desk_page/stock/stock.json
+++ b/erpnext/stock/desk_page/stock/stock.json
@@ -58,7 +58,7 @@
"idx": 0,
"is_standard": 1,
"label": "Stock",
- "modified": "2020-05-19 17:36:08.185652",
+ "modified": "2020-05-27 19:14:51.210671",
"modified_by": "Administrator",
"module": "Stock",
"name": "Stock",
@@ -69,7 +69,7 @@
"shortcuts": [
{
"color": "#cef6d1",
- "format": "{} available",
+ "format": "{} Available",
"label": "Item",
"link_to": "Item",
"stats_filter": "{\n \"disabled\" : 0\n}",
@@ -90,7 +90,7 @@
},
{
"color": "#ffe8cd",
- "format": "{} to Bill",
+ "format": "{} To Bill",
"label": "Purchase Receipt",
"link_to": "Purchase Receipt",
"stats_filter": "{\n \"company\": [\"like\", '%' + frappe.defaults.get_global_default(\"company\") + '%'],\n \"status\": \"To Bill\"\n}",
@@ -98,7 +98,7 @@
},
{
"color": "#ffe8cd",
- "format": "{} to Bill",
+ "format": "{} To Bill",
"label": "Delivery Note",
"link_to": "Delivery Note",
"stats_filter": "{\n \"company\": [\"like\", '%' + frappe.defaults.get_global_default(\"company\") + '%'],\n \"status\": \"To Bill\"\n}",
@@ -115,7 +115,7 @@
"type": "Report"
},
{
- "label": "Stock Dashboard",
+ "label": "Dashboard",
"link_to": "Stock",
"type": "Dashboard"
}
diff --git a/erpnext/stock/doctype/stock_settings/stock_settings.js b/erpnext/stock/doctype/stock_settings/stock_settings.js
index 6f97572..877d0c3 100644
--- a/erpnext/stock/doctype/stock_settings/stock_settings.js
+++ b/erpnext/stock/doctype/stock_settings/stock_settings.js
@@ -36,7 +36,7 @@
{
fieldname: "valuation_method",
title: __("Valuation Method"),
- description: __("Choose between FIFO and Moving Average Valuation Methods. Click ") + "<a href='https://docs.erpnext.com/docs/user/manual/en/stock/articles/item-valuation-fifo-and-moving-average'>here</a>" + __(" to know more about them.")
+ description: __("Choose between FIFO and Moving Average Valuation Methods. Click ") + "<a href='https://docs.erpnext.com/docs/user/manual/en/stock/articles/item-valuation-fifo-and-moving-average' target='_blank'>here</a>" + __(" to know more about them.")
},
{
fieldname: "show_barcode_field",
diff --git a/erpnext/stock/onboarding_step/introduction_to_stock_entry/introduction_to_stock_entry.json b/erpnext/stock/onboarding_step/introduction_to_stock_entry/introduction_to_stock_entry.json
index 447611f..009a44f 100644
--- a/erpnext/stock/onboarding_step/introduction_to_stock_entry/introduction_to_stock_entry.json
+++ b/erpnext/stock/onboarding_step/introduction_to_stock_entry/introduction_to_stock_entry.json
@@ -8,12 +8,12 @@
"is_mandatory": 0,
"is_single": 0,
"is_skipped": 0,
- "modified": "2020-05-19 18:55:41.457289",
+ "modified": "2020-05-26 15:55:41.457289",
"modified_by": "Administrator",
"name": "Introduction to Stock Entry",
"owner": "Administrator",
"show_full_form": 0,
- "title": "Introduction to the multi-purpose stock transaction",
+ "title": "Introduction to Stock Entry",
"validate_action": 1,
"video_url": "https://www.youtube.com/watch?v=Njt107hlY3I"
}
\ No newline at end of file