nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 08:24:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Table Field Renaming: code replace, JV and budget distribution renamed

Browse Source
This commit is contained in:
Nabin Hait
2014-12-25 16:01:55 +05:30
parent d8f4984d71
commit e7d153624f
222 changed files with 1523 additions and 1483 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js
View File

@@ -100,7 +100,7 @@ cur_frm.fields_dict['contact_person'].get_query = function(doc, cdt, cdn) {
}
cur_frm.fields_dict['item_maintenance_detail'].grid.get_field('item_code').get_query = function(doc, cdt, cdn) {
cur_frm.fields_dict['items'].grid.get_field('item_code').get_query = function(doc, cdt, cdn) {
return {
filters:{ 'is_service_item': "Yes" }
}
@@ -110,7 +110,7 @@ cur_frm.cscript.item_code = function(doc, cdt, cdn) {
var fname = cur_frm.cscript.fname;
var d = locals[cdt][cdn];
if (d.item_code) {
return get_server_fields('get_item_details', d.item_code, 'item_maintenance_detail',
return get_server_fields('get_item_details', d.item_code, 'items',
doc, cdt, cdn, 1);
}
}
@@ -119,7 +119,7 @@ cur_frm.cscript.generate_schedule = function(doc, cdt, cdn) {
if (!doc.__islocal) {
return $c('runserverobj', args={'method':'generate_schedule', 'docs':doc},
function(r, rt) {
refresh_field('maintenance_schedule_detail');
refresh_field('schedules');
});
} else {
msgprint(__("Please save the document before generating maintenance schedule"));

2
erpnext/support/doctype/maintenance_schedule/maintenance_schedule.json
View File

@@ -94,7 +94,7 @@
"fieldname": "schedules",
"fieldtype": "Table",
"label": "Schedules",
"oldfieldname": "maintenance_schedule_detail",
"oldfieldname": "schedules",
"oldfieldtype": "Table",
"options": "Maintenance Schedule Detail",
"permlevel": 0,

28
erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py
View File

@@ -22,16 +22,16 @@ class MaintenanceSchedule(TransactionBase):
return ret
def generate_schedule(self):
self.set('maintenance_schedule_detail', [])
self.set('schedules', [])
frappe.db.sql("""delete from `tabMaintenance Schedule Detail`
where parent=%s""", (self.name))
count = 1
for d in self.get('item_maintenance_detail'):
for d in self.get('items'):
self.validate_maintenance_detail()
s_list = []
s_list = self.create_schedule_list(d.start_date, d.end_date, d.no_of_visits, d.sales_person)
for i in range(d.no_of_visits):
child = self.append('maintenance_schedule_detail')
child = self.append('schedules')
child.item_code = d.item_code
child.item_name = d.item_name
child.scheduled_date = s_list[i].strftime('%Y-%m-%d')
@@ -44,13 +44,13 @@ class MaintenanceSchedule(TransactionBase):
self.save()
def on_submit(self):
if not self.get('maintenance_schedule_detail'):
if not self.get('schedules'):
throw(_("Please click on 'Generate Schedule' to get schedule"))
self.check_serial_no_added()
self.validate_schedule()
email_map = {}
for d in self.get('item_maintenance_detail'):
for d in self.get('items'):
if d.serial_no:
serial_nos = get_valid_serial_nos(d.serial_no)
self.validate_serial_no(serial_nos, d.start_date)
@@ -133,7 +133,7 @@ class MaintenanceSchedule(TransactionBase):
return schedule_date
def validate_dates_with_periodicity(self):
for d in self.get("item_maintenance_detail"):
for d in self.get("items"):
if d.start_date and d.end_date and d.periodicity and d.periodicity!="Random":
date_diff = (getdate(d.end_date) - getdate(d.start_date)).days + 1
days_in_period = {
@@ -150,10 +150,10 @@ class MaintenanceSchedule(TransactionBase):
.format(d.idx, d.periodicity, days_in_period[d.periodicity]))
def validate_maintenance_detail(self):
if not self.get('item_maintenance_detail'):
if not self.get('items'):
throw(_("Please enter Maintaince Details first"))
for d in self.get('item_maintenance_detail'):
for d in self.get('items'):
if not d.item_code:
throw(_("Please select item code"))
elif not d.start_date or not d.end_date:
@@ -167,7 +167,7 @@ class MaintenanceSchedule(TransactionBase):
throw(_("Start date should be less than end date for Item {0}").format(d.item_code))
def validate_sales_order(self):
for d in self.get('item_maintenance_detail'):
for d in self.get('items'):
if d.prevdoc_docname:
chk = frappe.db.sql("""select ms.name from `tabMaintenance Schedule` ms,
`tabMaintenance Schedule Item` msi where msi.parent=ms.name and
@@ -210,11 +210,11 @@ class MaintenanceSchedule(TransactionBase):
def validate_schedule(self):
item_lst1 =[]
item_lst2 =[]
for d in self.get('item_maintenance_detail'):
for d in self.get('items'):
if d.item_code not in item_lst1:
item_lst1.append(d.item_code)
for m in self.get('maintenance_schedule_detail'):
for m in self.get('schedules'):
if m.item_code not in item_lst2:
item_lst2.append(m.item_code)
@@ -227,17 +227,17 @@ class MaintenanceSchedule(TransactionBase):
def check_serial_no_added(self):
serial_present =[]
for d in self.get('item_maintenance_detail'):
for d in self.get('items'):
if d.serial_no:
serial_present.append(d.item_code)
for m in self.get('maintenance_schedule_detail'):
for m in self.get('schedules'):
if serial_present:
if m.item_code in serial_present and not m.serial_no:
throw(_("Please click on 'Generate Schedule' to fetch Serial No added for Item {0}").format(m.item_code))
def on_cancel(self):
for d in self.get('item_maintenance_detail'):
for d in self.get('items'):
if d.serial_no:
serial_nos = get_valid_serial_nos(d.serial_no)
self.update_amc_date(serial_nos)

4
erpnext/support/doctype/maintenance_visit/maintenance_visit.js
View File

@@ -75,7 +75,7 @@ cur_frm.fields_dict['contact_person'].get_query = function(doc, cdt, cdn) {
}
}
cur_frm.fields_dict['maintenance_visit_details'].grid.get_field('item_code').get_query = function(doc, cdt, cdn) {
cur_frm.fields_dict['purposes'].grid.get_field('item_code').get_query = function(doc, cdt, cdn) {
return{
filters:{ 'is_service_item': "Yes"}
}
@@ -85,7 +85,7 @@ cur_frm.cscript.item_code = function(doc, cdt, cdn) {
var fname = cur_frm.cscript.fname;
var d = locals[cdt][cdn];
if (d.item_code) {
return get_server_fields('get_item_details',d.item_code, 'maintenance_visit_details',doc,cdt,cdn,1);
return get_server_fields('get_item_details',d.item_code, 'purposes',doc,cdt,cdn,1);
}
}

6
erpnext/support/doctype/maintenance_visit/maintenance_visit.py
View File

@@ -15,7 +15,7 @@ class MaintenanceVisit(TransactionBase):
return frappe.db.get_value("Item", item_code, ["item_name", "description"], as_dict=1)
def validate_serial_no(self):
for d in self.get('maintenance_visit_details'):
for d in self.get('purposes'):
if d.serial_no and not frappe.db.exists("Serial No", d.serial_no):
frappe.throw(_("Serial No {0} does not exist").format(d.serial_no))
@@ -23,7 +23,7 @@ class MaintenanceVisit(TransactionBase):
self.validate_serial_no()
def update_customer_issue(self, flag):
for d in self.get('maintenance_visit_details'):
for d in self.get('purposes'):
if d.prevdoc_docname and d.prevdoc_doctype == 'Customer Issue' :
if flag==1:
mntc_date = self.mntc_date
@@ -53,7 +53,7 @@ class MaintenanceVisit(TransactionBase):
def check_if_last_visit(self):
"""check if last maintenance visit against same sales order/ customer issue"""
check_for_docname = None
for d in self.get('maintenance_visit_details'):
for d in self.get('purposes'):
if d.prevdoc_docname:
check_for_docname = d.prevdoc_docname
#check_for_doctype = d.prevdoc_doctype