Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/frappe/erpnext into email_digest

Browse Source
This commit is contained in:
deepeshgarg007 2019-01-15 17:02:12 +05:30
commit 7278834d25
5 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/config/desktop.py
View File

@ -575,9 +575,9 @@ def get_data():
}, },
{ {
"module_name": "Quality Management", "module_name": "Quality Management",
"color": "blue", "color": "#1abc9c",
"icon": "octicon octicon-package", "icon": "fa fa-check-square-o",
"type": "module", "type": "module",
"label": _("Quality Management") "label": _("Quality")
} }
] ]

1
erpnext/patches.txt
View File

@ -580,6 +580,7 @@ erpnext.patches.v11_0.update_delivery_trip_status
erpnext.patches.v10_0.repost_gle_for_purchase_receipts_with_rejected_items erpnext.patches.v10_0.repost_gle_for_purchase_receipts_with_rejected_items
erpnext.patches.v11_0.set_missing_gst_hsn_code erpnext.patches.v11_0.set_missing_gst_hsn_code
erpnext.patches.v11_0.rename_bom_wo_fields erpnext.patches.v11_0.rename_bom_wo_fields
erpnext.patches.v12_0.change_qms_icon
erpnext.patches.v12_0.rename_learn_to_help erpnext.patches.v12_0.rename_learn_to_help
erpnext.patches.v12_0.rename_accounts_desktop_icon_to_accounting erpnext.patches.v12_0.rename_accounts_desktop_icon_to_accounting
erpnext.patches.v12_0.replace_project_list_desktop_icon_with_projects_module_desktop_icon erpnext.patches.v12_0.replace_project_list_desktop_icon_with_projects_module_desktop_icon

10
erpnext/patches/v12_0/change_qms_icon.py Normal file
View File

@ -0,0 +1,10 @@
import frappe
def execute():
qms_icons = frappe.get_all("Desktop Icon", filters={
"module_name": "Quality Management"
})
for icon in qms_icons:
frappe.db.set_value('Desktop Icon', icon.name, 'color', '#1abc9c')
frappe.db.set_value('Desktop Icon', icon.name, 'icon', 'fa fa-check-square-o')

10
erpnext/patches/v12_0/rename_quality_management_to_quality.py Normal file
View File

@ -0,0 +1,10 @@
import frappe
from frappe import _
def execute():
quality_management_module_icons = frappe.get_all('Desktop Icon', filters={
'module_name': 'Quality Management'
}, fields=['name'])
for icon in quality_management_module_icons:
frappe.db.set_value('Desktop Icon', icon.name, 'label', _('Quality'))

17
erpnext/quality_management/doctype/customer_feedback/test_customer_feedback.py
View File

@ -28,19 +28,4 @@ def create_feedback():
def get_feedback(): def get_feedback():
feedback = frappe.get_list("Customer Feedback", limit=1) feedback = frappe.get_list("Customer Feedback", limit=1)
return feedback[0] return feedback[0]
#def create_feedback_template():
# template = frappe.get_doc({
# "doctype": "Customer Feedback Template",
# "template": "_Test Customer Feedback Template",
# "scope": "Company",
# "feedback_parameter": [
# {
# "parameter": "_Test Customer Feedback Template Parameter",
# }
# ]
# })
# template_exist = frappe.get_list("Customer Feedback Template", filters={"template": ""+ template.template +""}, fields=["name"])
# if len(template_exist) == 0:
# template.insert()