nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-17 02:26:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

rename dt first cut

Browse Source
This commit is contained in:
Anand Doshi
2012-03-30 12:29:06 +05:30
parent 37fb9c8f27
commit fedfd89e4a
509 changed files with 2108 additions and 2088 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/support/DocType Mapper/Customer Issue-Maintenance Visit/Customer Issue-Maintenance Visit.txt
View File

@@ -96,7 +96,7 @@
'match_id': 1,
'reference_doctype_key': 'prevdoc_doctype',
'to_field': 'maintenance_visit_details',
'to_table': 'Maintenance Visit Detail'
'to_table': 'Maintenance Visit Purpose'
},
# Table Mapper Detail

4
erpnext/support/DocType Mapper/Sales Order-Maintenance Schedule/Sales Order-Maintenance Schedule.txt
View File

@@ -83,10 +83,10 @@
{
'doctype': 'Table Mapper Detail',
'from_field': 'sales_order_details',
'from_table': 'Sales Order Detail',
'from_table': 'Sales Order Item',
'match_id': 1,
'to_field': 'item_maintenance_detail',
'to_table': 'Item Maintenance Detail',
'to_table': 'Maintenance Schedule Item',
'validation_logic': 'docstatus =1'
},

4
erpnext/support/DocType Mapper/Sales Order-Maintenance Visit/Sales Order-Maintenance Visit.txt
View File

@@ -83,10 +83,10 @@
{
'doctype': 'Table Mapper Detail',
'from_field': 'sales_order_details',
'from_table': 'Sales Order Detail',
'from_table': 'Sales Order Item',
'match_id': 1,
'to_field': 'maintenance_visit_details',
'to_table': 'Maintenance Visit Detail'
'to_table': 'Maintenance Visit Purpose'
},
# Table Mapper Detail

2
erpnext/support/doctype/customer_issue/customer_issue.js
View File

@@ -74,7 +74,7 @@ cur_frm.cscript['Make Maintenance Visit'] = function(doc, cdt, cdn) {
'from_doctype':'Customer Issue',
'to_doctype':'Maintenance Visit',
'from_docname':doc.name,
'from_to_list':"[['Customer Issue', 'Maintenance Visit'], ['Customer Issue', 'Maintenance Visit Detail']]"
'from_to_list':"[['Customer Issue', 'Maintenance Visit'], ['Customer Issue', 'Maintenance Visit Purpose']]"
}
, function(r,rt) {
loaddoc("Maintenance Visit", n);

4
erpnext/support/doctype/customer_issue/customer_issue.py
View File

@@ -48,7 +48,7 @@ class DocType(TransactionBase):
#check if maintenance schedule already generated
#============================================
def check_maintenance_visit(self):
nm = sql("select t1.name from `tabMaintenance Visit` t1, `tabMaintenance Visit Detail` t2 where t2.parent=t1.name and t2.prevdoc_docname=%s and t1.docstatus=1 and t1.completion_status='Fully Completed'", self.doc.name)
nm = sql("select t1.name from `tabMaintenance Visit` t1, `tabMaintenance Visit Purpose` t2 where t2.parent=t1.name and t2.prevdoc_docname=%s and t1.docstatus=1 and t1.completion_status='Fully Completed'", self.doc.name)
nm = nm and nm[0][0] or ''
if not nm:
@@ -72,7 +72,7 @@ class DocType(TransactionBase):
# raise Exception
def on_cancel(self):
lst = sql("select t1.name from `tabMaintenance Visit` t1, `tabMaintenance Visit Detail` t2 where t2.parent = t1.name and t2.prevdoc_docname = '%s' and t1.docstatus!=2"%(self.doc.name))
lst = sql("select t1.name from `tabMaintenance Visit` t1, `tabMaintenance Visit Purpose` t2 where t2.parent = t1.name and t2.prevdoc_docname = '%s' and t1.docstatus!=2"%(self.doc.name))
if lst:
lst1 = ','.join([x[0] for x in lst])
msgprint("Maintenance Visit No. "+lst1+" already created against this customer issue. So can not be Cancelled")

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

@@ -97,7 +97,7 @@ cur_frm.fields_dict['sales_order_no'].get_query = function(doc) {
if(doc.customer) {
cond = '`tabSales Order`.customer = "'+doc.customer+'" AND';
}
return repl('SELECT DISTINCT `tabSales Order`.name FROM `tabSales Order`, `tabSales Order Detail`, `tabItem` WHERE `tabSales Order`.company = "%(company)s" AND `tabSales Order`.docstatus = 1 AND `tabSales Order Detail`.parent = `tabSales Order`.name AND `tabSales Order Detail`.item_code = `tabItem`.name AND `tabItem`.is_service_item = "Yes" AND %(cond)s `tabSales Order`.name LIKE "%s" ORDER BY `tabSales Order`.name DESC LIMIT 50', {company:doc.company, cond:cond});
return repl('SELECT DISTINCT `tabSales Order`.name FROM `tabSales Order`, `tabSales Order Item`, `tabItem` WHERE `tabSales Order`.company = "%(company)s" AND `tabSales Order`.docstatus = 1 AND `tabSales Order Item`.parent = `tabSales Order`.name AND `tabSales Order Item`.item_code = `tabItem`.name AND `tabItem`.is_service_item = "Yes" AND %(cond)s `tabSales Order`.name LIKE "%s" ORDER BY `tabSales Order`.name DESC LIMIT 50', {company:doc.company, cond:cond});
}
cur_frm.cscript.periodicity = function(doc, cdt, cdn){

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

@@ -44,7 +44,7 @@ class DocType(TransactionBase):
def pull_sales_order_detail(self):
self.doc.clear_table(self.doclist, 'item_maintenance_detail')
self.doc.clear_table(self.doclist, 'maintenance_schedule_detail')
self.doclist = get_obj('DocType Mapper', 'Sales Order-Maintenance Schedule').dt_map('Sales Order', 'Maintenance Schedule', self.doc.sales_order_no, self.doc, self.doclist, "[['Sales Order', 'Maintenance Schedule'],['Sales Order Detail', 'Item Maintenance Detail']]")
self.doclist = get_obj('DocType Mapper', 'Sales Order-Maintenance Schedule').dt_map('Sales Order', 'Maintenance Schedule', self.doc.sales_order_no, self.doc, self.doclist, "[['Sales Order', 'Maintenance Schedule'],['Sales Order Item', 'Maintenance Schedule Item']]")
#pull item details
#-------------------
@@ -213,7 +213,7 @@ class DocType(TransactionBase):
def validate_sales_order(self):
for d in getlist(self.doclist, 'item_maintenance_detail'):
if d.prevdoc_docname:
chk = sql("select t1.name from `tabMaintenance Schedule` t1, `tabItem Maintenance Detail` t2 where t2.parent=t1.name and t2.prevdoc_docname=%s and t1.docstatus=1", d.prevdoc_docname)
chk = sql("select t1.name from `tabMaintenance Schedule` t1, `tabMaintenance Schedule Item` t2 where t2.parent=t1.name and t2.prevdoc_docname=%s and t1.docstatus=1", d.prevdoc_docname)
if chk:
msgprint("Maintenance Schedule against "+d.prevdoc_docname+" already exist")
raise Exception

4
erpnext/support/doctype/maintenance_schedule/maintenance_schedule.txt
View File

@@ -355,10 +355,10 @@
'doctype': u'DocField',
'fieldname': u'item_maintenance_detail',
'fieldtype': u'Table',
'label': u'Item Maintenance Detail',
'label': u'Maintenance Schedule Item',
'oldfieldname': u'item_maintenance_detail',
'oldfieldtype': u'Table',
'options': u'Item Maintenance Detail',
'options': u'Maintenance Schedule Item',
'permlevel': 0
},

0
erpnext/support/doctype/item_maintenance_detail/__init__.py → erpnext/support/doctype/maintenance_schedule_item/__init__.py
View File

8
erpnext/support/doctype/item_maintenance_detail/item_maintenance_detail.txt → erpnext/support/doctype/maintenance_schedule_item/maintenance_schedule_item.txt
View File

@@ -1,4 +1,4 @@
# DocType, Item Maintenance Detail
# DocType, Maintenance Schedule Item
[
# These values are common in all dictionaries
@@ -29,15 +29,15 @@
{
'doctype': u'DocField',
'name': '__common__',
'parent': u'Item Maintenance Detail',
'parent': u'Maintenance Schedule Item',
'parentfield': u'fields',
'parenttype': u'DocType'
},
# DocType, Item Maintenance Detail
# DocType, Maintenance Schedule Item
{
'doctype': 'DocType',
'name': u'Item Maintenance Detail'
'name': u'Maintenance Schedule Item'
},
# DocField

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

@@ -110,8 +110,8 @@ cur_frm.fields_dict['sales_order_no'].get_query = function(doc) {
if(doc.customer) {
cond = '`tabSales Order`.customer = "'+doc.customer+'" AND';
}
//return repl('SELECT DISTINCT `tabSales Order`.name FROM `tabSales Order`, `tabSales Order Detail` WHERE `tabSales Order`.company = "%(company)s" AND `tabSales Order`.docstatus = 1 AND %(cond)s `tabSales Order`.name LIKE "%s" ORDER BY `tabSales Order`.name DESC LIMIT 50', {company:doc.company, cond:cond});
return repl('SELECT DISTINCT `tabSales Order`.name FROM `tabSales Order`, `tabSales Order Detail`, `tabItem` WHERE `tabSales Order`.company = "%(company)s" AND `tabSales Order`.docstatus = 1 AND `tabSales Order Detail`.parent = `tabSales Order`.name AND `tabSales Order Detail`.item_code = `tabItem`.name AND `tabItem`.is_service_item = "Yes" AND %(cond)s `tabSales Order`.name LIKE "%s" ORDER BY `tabSales Order`.name DESC LIMIT 50', {company:doc.company, cond:cond});
//return repl('SELECT DISTINCT `tabSales Order`.name FROM `tabSales Order`, `tabSales Order Item` WHERE `tabSales Order`.company = "%(company)s" AND `tabSales Order`.docstatus = 1 AND %(cond)s `tabSales Order`.name LIKE "%s" ORDER BY `tabSales Order`.name DESC LIMIT 50', {company:doc.company, cond:cond});
return repl('SELECT DISTINCT `tabSales Order`.name FROM `tabSales Order`, `tabSales Order Item`, `tabItem` WHERE `tabSales Order`.company = "%(company)s" AND `tabSales Order`.docstatus = 1 AND `tabSales Order Item`.parent = `tabSales Order`.name AND `tabSales Order Item`.item_code = `tabItem`.name AND `tabItem`.is_service_item = "Yes" AND %(cond)s `tabSales Order`.name LIKE "%s" ORDER BY `tabSales Order`.name DESC LIMIT 50', {company:doc.company, cond:cond});
}
cur_frm.fields_dict['customer_issue_no'].get_query = function(doc) {

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

@@ -59,10 +59,10 @@ class DocType(TransactionBase):
self.doc.clear_table(self.doclist, 'maintenance_visit_details')
if self.doc.sales_order_no:
self.doclist = get_obj('DocType Mapper', 'Sales Order-Maintenance Visit').dt_map('Sales Order', 'Maintenance Visit', self.doc.sales_order_no, self.doc, self.doclist, "[['Sales Order', 'Maintenance Visit'],['Sales Order Detail', 'Maintenance Visit Detail']]")
self.doclist = get_obj('DocType Mapper', 'Sales Order-Maintenance Visit').dt_map('Sales Order', 'Maintenance Visit', self.doc.sales_order_no, self.doc, self.doclist, "[['Sales Order', 'Maintenance Visit'],['Sales Order Item', 'Maintenance Visit Purpose']]")
elif self.doc.customer_issue_no:
self.doclist = get_obj('DocType Mapper', 'Customer Issue-Maintenance Visit').dt_map('Customer Issue', 'Maintenance Visit', self.doc.customer_issue_no, self.doc, self.doclist, "[['Customer Issue', 'Maintenance Visit'],['Customer Issue', 'Maintenance Visit Detail']]")
self.doclist = get_obj('DocType Mapper', 'Customer Issue-Maintenance Visit').dt_map('Customer Issue', 'Maintenance Visit', self.doc.customer_issue_no, self.doc, self.doclist, "[['Customer Issue', 'Maintenance Visit'],['Customer Issue', 'Maintenance Visit Purpose']]")
#validate reference value using doctype mapper
#-----------------------------------------------------
@@ -117,7 +117,7 @@ class DocType(TransactionBase):
elif self.doc.completion_status == 'Partially Completed':
status = 'Work In Progress'
else:
nm = sql("select t1.name, t1.mntc_date, t2.service_person, t2.work_done from `tabMaintenance Visit` t1, `tabMaintenance Visit Detail` t2 where t2.parent = t1.name and t1.completion_status = 'Partially Completed' and t2.prevdoc_docname = %s and t1.name!=%s and t1.docstatus = 1 order by t1.name desc limit 1", (d.prevdoc_docname, self.doc.name))
nm = sql("select t1.name, t1.mntc_date, t2.service_person, t2.work_done from `tabMaintenance Visit` t1, `tabMaintenance Visit Purpose` t2 where t2.parent = t1.name and t1.completion_status = 'Partially Completed' and t2.prevdoc_docname = %s and t1.name!=%s and t1.docstatus = 1 order by t1.name desc limit 1", (d.prevdoc_docname, self.doc.name))
if nm:
status = 'Work In Progress'
@@ -141,7 +141,7 @@ class DocType(TransactionBase):
check_for_doctype = d.prevdoc_doctype
if check_for_docname:
check = sql("select t1.name from `tabMaintenance Visit` t1, `tabMaintenance Visit Detail` t2 where t2.parent = t1.name and t1.name!=%s and t2.prevdoc_docname=%s and t1.docstatus = 1 and (t1.mntc_date > %s or (t1.mntc_date = %s and t1.mntc_time > %s))", (self.doc.name, check_for_docname, self.doc.mntc_date, self.doc.mntc_date, self.doc.mntc_time))
check = sql("select t1.name from `tabMaintenance Visit` t1, `tabMaintenance Visit Purpose` t2 where t2.parent = t1.name and t1.name!=%s and t2.prevdoc_docname=%s and t1.docstatus = 1 and (t1.mntc_date > %s or (t1.mntc_date = %s and t1.mntc_time > %s))", (self.doc.name, check_for_docname, self.doc.mntc_date, self.doc.mntc_date, self.doc.mntc_time))
if check:
check_lst = [x[0] for x in check]

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

@@ -460,10 +460,10 @@
'doctype': u'DocField',
'fieldname': u'maintenance_visit_details',
'fieldtype': u'Table',
'label': u'Maintenance Visit Detail',
'label': u'Maintenance Visit Purpose',
'oldfieldname': u'maintenance_visit_details',
'oldfieldtype': u'Table',
'options': u'Maintenance Visit Detail',
'options': u'Maintenance Visit Purpose',
'permlevel': 0
},

0
erpnext/support/doctype/maintenance_visit_detail/__init__.py → erpnext/support/doctype/maintenance_visit_purpose/__init__.py
View File

8
erpnext/support/doctype/maintenance_visit_detail/maintenance_visit_detail.txt → erpnext/support/doctype/maintenance_visit_purpose/maintenance_visit_purpose.txt
View File

@@ -1,4 +1,4 @@
# DocType, Maintenance Visit Detail
# DocType, Maintenance Visit Purpose
[
# These values are common in all dictionaries
@@ -27,15 +27,15 @@
{
'doctype': u'DocField',
'name': '__common__',
'parent': u'Maintenance Visit Detail',
'parent': u'Maintenance Visit Purpose',
'parentfield': u'fields',
'parenttype': u'DocType'
},
# DocType, Maintenance Visit Detail
# DocType, Maintenance Visit Purpose
{
'doctype': 'DocType',
'name': u'Maintenance Visit Detail'
'name': u'Maintenance Visit Purpose'
},
# DocField

4
erpnext/support/search_criteria/maintenance_orderwise_pending_amount_to_bill/maintenance_orderwise_pending_amount_to_bill.txt
View File

@@ -12,11 +12,11 @@
# These values are common for all Search Criteria
{
'add_col': "SUM((`tabSales Order Detail`.`qty` - `tabSales Order Detail`.`billed_qty`) * `tabSales Order Detail`.`basic_rate`) AS 'Pending Amount'",
'add_col': "SUM((`tabSales Order Item`.`qty` - `tabSales Order Item`.`billed_qty`) * `tabSales Order Item`.`basic_rate`) AS 'Pending Amount'",
'add_cond': "`tabSales Order`.status != 'Stopped'\n`tabSales Order`.order_type='Maintenance'",
'columns': 'Sales Order\x01ID,Sales Order\x01Customer,Sales Order\x01Customer Name,Sales Order\x01Customer Address,Sales Order\x01Status,Sales Order\x01% Billed,Sales Order\x01Sales Order Date',
'criteria_name': 'Maintenance Orderwise Pending Amount To Bill',
'doc_type': 'Sales Order Detail',
'doc_type': 'Sales Order Item',
'doctype': 'Search Criteria',
'filters': "{'Sales Order\x01Saved':1,'Sales Order\x01Submitted':1,'Sales Order\x01Status':'','Sales Order\x01Fiscal Year':''}",
'module': 'Support',