Modifs
bzr revid: fp@tinyerp.com-1970125c74e5934e759bbb62eb5d77e20d404d48
This commit is contained in:
parent
e9604f36a1
commit
37246631d6
|
@ -43,7 +43,7 @@ email_send_form = '''<?xml version="1.0"?>
|
||||||
email_send_fields = {
|
email_send_fields = {
|
||||||
'from': {'string':"Sender's email", 'type':'char', 'size':64, 'required':True},
|
'from': {'string':"Sender's email", 'type':'char', 'size':64, 'required':True},
|
||||||
'subject': {'string':'Subject', 'type':'char', 'size':64, 'required':True},
|
'subject': {'string':'Subject', 'type':'char', 'size':64, 'required':True},
|
||||||
'text': {'string':'Message', 'type':'text', 'required':True}
|
'text': {'string':'Message', 'type':'text_tag', 'required':True}
|
||||||
}
|
}
|
||||||
|
|
||||||
# this sends an email to ALL the addresses of the selected partners.
|
# this sends an email to ALL the addresses of the selected partners.
|
||||||
|
|
|
@ -108,7 +108,7 @@ class ServiceUnavailable(Exception):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
def service_exist(name):
|
def service_exist(name):
|
||||||
return (name in _service)
|
return (name in _service) and bool(_service[name])
|
||||||
|
|
||||||
LOG_DEBUG='debug'
|
LOG_DEBUG='debug'
|
||||||
LOG_INFO='info'
|
LOG_INFO='info'
|
||||||
|
|
|
@ -197,8 +197,8 @@ def register_all(db):
|
||||||
for r in result:
|
for r in result:
|
||||||
if netsvc.service_exist('report.'+r['report_name']):
|
if netsvc.service_exist('report.'+r['report_name']):
|
||||||
continue
|
continue
|
||||||
if r['report_rml']:
|
if r['report_rml'] or r['report_rml_content']:
|
||||||
report_sxw('report.'+r['report_name'], r['model'], opj('addons',r['report_rml']), header=r['header'])
|
report_sxw('report.'+r['report_name'], r['model'], opj('addons',r['report_rml'] or '/'), header=r['header'])
|
||||||
if r['report_xsl']:
|
if r['report_xsl']:
|
||||||
report_rml('report.'+r['report_name'], r['model'], opj('addons',r['report_xml']), r['report_xsl'] and opj('addons',r['report_xsl']))
|
report_rml('report.'+r['report_name'], r['model'], opj('addons',r['report_xml']), r['report_xsl'] and opj('addons',r['report_xsl']))
|
||||||
|
|
||||||
|
|
|
@ -339,6 +339,7 @@ class report_sxw(report_rml):
|
||||||
def create(self, cr, uid, ids, data, context=None):
|
def create(self, cr, uid, ids, data, context=None):
|
||||||
if not context:
|
if not context:
|
||||||
context={}
|
context={}
|
||||||
|
print self.name[7:]
|
||||||
cr.execute('select report_rml_content from ir_act_report_xml where report_name=%s', (self.name[7:],))
|
cr.execute('select report_rml_content from ir_act_report_xml where report_name=%s', (self.name[7:],))
|
||||||
result = cr.fetchone()
|
result = cr.fetchone()
|
||||||
if result and result[0]:
|
if result and result[0]:
|
||||||
|
|
Loading…
Reference in New Issue