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

Merge branch 'develop' into adding-frappe-school-to-readme

Browse Source
This commit is contained in:
Jannat Patel 2021-10-05 12:59:31 +05:30 committed by GitHub
commit 0223f633dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
erpnext/stock/doctype/item/item.py
View File

@ -181,6 +181,8 @@ class Item(WebsiteGenerator):
"doctype": "Item Price", "doctype": "Item Price",
"price_list": price_list, "price_list": price_list,
"item_code": self.name, "item_code": self.name,
"uom": self.stock_uom,
"brand": self.brand,
"currency": erpnext.get_default_currency(), "currency": erpnext.get_default_currency(),
"price_list_rate": self.standard_rate "price_list_rate": self.standard_rate
}) })
@ -634,9 +636,21 @@ class Item(WebsiteGenerator):
_("An Item Group exists with same name, please change the item name or rename the item group")) _("An Item Group exists with same name, please change the item name or rename the item group"))
def update_item_price(self): def update_item_price(self):
frappe.db.sql("""update `tabItem Price` set item_name=%s, frappe.db.sql("""
item_description=%s, brand=%s where item_code=%s""", UPDATE `tabItem Price`
(self.item_name, self.description, self.brand, self.name)) SET
item_name=%(item_name)s,
item_description=%(item_description)s,
brand=%(brand)s
WHERE item_code=%(item_code)s
""",
dict(
item_name=self.item_name,
item_description=self.description,
brand=self.brand,
item_code=self.name
)
)
def on_trash(self): def on_trash(self):
super(Item, self).on_trash() super(Item, self).on_trash()

2
erpnext/support/doctype/issue/issue.py
View File

@ -228,7 +228,7 @@ def get_time_in_timedelta(time):
def set_first_response_time(communication, method): def set_first_response_time(communication, method):
if communication.get('reference_doctype') == "Issue": if communication.get('reference_doctype') == "Issue":
issue = get_parent_doc(communication) issue = get_parent_doc(communication)
if is_first_response(issue): if is_first_response(issue) and issue.service_level_agreement:
first_response_time = calculate_first_response_time(issue, get_datetime(issue.first_responded_on)) first_response_time = calculate_first_response_time(issue, get_datetime(issue.first_responded_on))
issue.db_set("first_response_time", first_response_time) issue.db_set("first_response_time", first_response_time)