schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'hotfix' into ewb

Browse Source
This commit is contained in:
Deepesh Garg
2019-04-30 10:28:57 +05:30
committed by GitHub
parent 0555223797 c1bbaf07a4
commit 09ac547a80
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__init__.py
View File

@@ -5,7 +5,7 @@ import frappe
from erpnext.hooks import regional_overrides from erpnext.hooks import regional_overrides
from frappe.utils import getdate from frappe.utils import getdate
__version__ = '11.1.22' __version__ = '11.1.23'
def get_default_company(user=None): def get_default_company(user=None):
'''Get default company for user''' '''Get default company for user'''

8
erpnext/projects/doctype/project/project.py
View File

@@ -74,7 +74,7 @@ class Project(Document):
self.load_tasks() self.load_tasks()
self.validate_dates() self.validate_dates()
self.send_welcome_email() self.send_welcome_email()
self.update_percent_complete() self.update_percent_complete(from_validate=True)
def validate_project_name(self): def validate_project_name(self):
if self.get("__islocal") and frappe.db.exists("Project", self.project_name): if self.get("__islocal") and frappe.db.exists("Project", self.project_name):
@@ -198,7 +198,7 @@ class Project(Document):
if self.sales_order: if self.sales_order:
frappe.db.set_value("Sales Order", self.sales_order, "project", self.name) frappe.db.set_value("Sales Order", self.sales_order, "project", self.name)
def update_percent_complete(self): def update_percent_complete(self, from_validate=False):
if not self.tasks: return if not self.tasks: return
total = frappe.db.sql("""select count(name) from tabTask where project=%s""", self.name)[0][0] total = frappe.db.sql("""select count(name) from tabTask where project=%s""", self.name)[0][0]
if not total and self.percent_complete: if not total and self.percent_complete:
@@ -227,7 +227,9 @@ class Project(Document):
self.status = "Completed" self.status = "Completed"
elif not self.status == "Cancelled": elif not self.status == "Cancelled":
self.status = "Open" self.status = "Open"
self.db_update()
if not from_validate:
self.db_update()
def update_costing(self): def update_costing(self):
from_time_sheet = frappe.db.sql("""select from_time_sheet = frappe.db.sql("""select

2
erpnext/selling/doctype/sales_order/sales_order.py
View File

@@ -544,7 +544,7 @@ def make_project(source_name, target_doc=None):
"Sales Order Item": { "Sales Order Item": {
"doctype": "Project Task", "doctype": "Project Task",
"field_map": { "field_map": {
"description": "title", "item_code": "title",
}, },
} }
}, target_doc, postprocess) }, target_doc, postprocess)