This commit is contained in:
Anand Doshi
2014-03-28 15:23:26 +05:30
parent f78d1aee28
commit 81ba0b29da
36 changed files with 208 additions and 242 deletions

View File

@@ -33,14 +33,14 @@ class CustomerIssue(TransactionBase):
msgprint("Maintenance Visit No. "+lst1+" already created against this customer issue. So can not be Cancelled")
raise Exception
else:
frappe.db.set(self.doc, 'status', 'Cancelled')
frappe.db.set(self, 'status', 'Cancelled')
def on_update(self):
pass
@frappe.whitelist()
def make_maintenance_visit(source_name, target_doclist=None):
from frappe.model.mapper import get_mapped_doclist
def make_maintenance_visit(source_name, target_doc=None):
from frappe.model.mapper import get_mapped_doc
visit = frappe.db.sql("""select t1.name
from `tabMaintenance Visit` t1, `tabMaintenance Visit Purpose` t2
@@ -48,7 +48,7 @@ def make_maintenance_visit(source_name, target_doclist=None):
and t1.docstatus=1 and t1.completion_status='Fully Completed'""", source_name)
if not visit:
doclist = get_mapped_doclist("Customer Issue", source_name, {
doclist = get_mapped_doc("Customer Issue", source_name, {
"Customer Issue": {
"doctype": "Maintenance Visit",
"field_map": {
@@ -57,6 +57,6 @@ def make_maintenance_visit(source_name, target_doclist=None):
"name": "prevdoc_docname"
}
}
}, target_doclist)
}, target_doc)
return [d.fields for d in doclist]

View File

@@ -80,7 +80,7 @@ class MaintenanceSchedule(TransactionBase):
"ref_name": self.name
}).insert(ignore_permissions=1)
frappe.db.set(self.doc, 'status', 'Submitted')
frappe.db.set(self, 'status', 'Submitted')
def create_schedule_list(self, start_date, end_date, no_of_visit, sales_person):
schedule_list = []
@@ -199,7 +199,7 @@ class MaintenanceSchedule(TransactionBase):
self.validate_sales_order()
def on_update(self):
frappe.db.set(self.doc, 'status', 'Draft')
frappe.db.set(self, 'status', 'Draft')
def update_amc_date(self, serial_nos, amc_expiry_date=None):
for serial_no in serial_nos:
@@ -261,20 +261,20 @@ class MaintenanceSchedule(TransactionBase):
if d.serial_no:
serial_nos = get_valid_serial_nos(d.serial_no)
self.update_amc_date(serial_nos)
frappe.db.set(self.doc, 'status', 'Cancelled')
frappe.db.set(self, 'status', 'Cancelled')
delete_events(self.doctype, self.name)
def on_trash(self):
delete_events(self.doctype, self.name)
@frappe.whitelist()
def make_maintenance_visit(source_name, target_doclist=None):
from frappe.model.mapper import get_mapped_doclist
def make_maintenance_visit(source_name, target_doc=None):
from frappe.model.mapper import get_mapped_doc
def update_status(source, target, parent):
target.maintenance_type = "Scheduled"
doclist = get_mapped_doclist("Maintenance Schedule", source_name, {
doclist = get_mapped_doc("Maintenance Schedule", source_name, {
"Maintenance Schedule": {
"doctype": "Maintenance Visit",
"field_map": {
@@ -293,6 +293,6 @@ def make_maintenance_visit(source_name, target_doclist=None):
"sales_person": "service_person"
}
}
}, target_doclist)
}, target_doc)
return [d.fields for d in doclist]

View File

@@ -79,11 +79,11 @@ class MaintenanceVisit(TransactionBase):
def on_submit(self):
self.update_customer_issue(1)
frappe.db.set(self.doc, 'status', 'Submitted')
frappe.db.set(self, 'status', 'Submitted')
def on_cancel(self):
self.check_if_last_visit()
frappe.db.set(self.doc, 'status', 'Cancelled')
frappe.db.set(self, 'status', 'Cancelled')
def on_update(self):
pass

View File

@@ -40,7 +40,7 @@ class Newsletter(Document):
"doctype": self.send_to_doctype
}))
frappe.db.set(self.doc, "email_sent", 1)
frappe.db.set(self, "email_sent", 1)
def get_recipients(self):
self.email_field = None