pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge

Browse Source 
bzr revid: fp@tinyerp.com-20090408151949-ggvhgw5nr9jjunsr
This commit is contained in:
Fabien Pinckaers
2009-04-08 17:19:49 +02:00
parent 4193c0c802 b2ae2812e5
commit 016ba4f9cf
5 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/account_invoice_view.xml
+1 -1
View File
@@ -121,7 +121,7 @@
<field name="amount_untaxed" sum="Untaxed amount"/>
<field name="amount_total" sum="Total amount"/>
<field name="currency_id"/>
<field name="date_invoice"/>
<field name="date_invoice" select="1"/>
<field name="date_due" select="1"/>
<field name="residual"/>
<field name="state"/>
addons/account/project/project_view.xml
+1 -1
View File
@@ -164,7 +164,7 @@
<field name="res_model">account.analytic.line</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('account_id','child_of', active_id)]</field>
<field name="domain">[('account_id','child_of',[active_id])]</field>
<field name="context">{'account_id':active_id}</field>
</record>
<record id="ir_open_account_analytic_account" model="ir.values">
addons/analytic_journal_billing_rate/analytic_journal_billing_rate_view.xml
+1 -1
View File
@@ -32,7 +32,7 @@
<field name="name">account.analytic.account.form</field>
<field name="model">account.analytic.account</field>
<field name="type">form</field>
<field name="inherit_id" ref="account.view_account_analytic_account_form"/>
<field name="inherit_id" ref="hr_timesheet_invoice.account_analytic_account_form_form"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='to_invoice']" position="after">
<!--<field name="to_invoice" string="Default Invoicing Percentage"/>-->
addons/auction/auction_demo.xml
-1
View File
@@ -373,7 +373,6 @@
</record>
<record model="auction.lots" id="auction_deposit_4_lot_1">
<field name="name"></field>
<field name="auction_id" ref="auction_date_1" />
<field name="name">bresslet</field>
<field name="lot_num">7</field>
addons/crm/crm.py
+6 -3
View File
@@ -510,7 +510,7 @@ class crm_case(osv.osv):
return True
def format_body(self, body):
return tools.ustr((body or '').encode('ascii', 'replace'))
return (body or u'').encode('utf8', 'replace')
def format_mail(self, case, body):
data = {
@@ -526,7 +526,7 @@ class crm_case(osv.osv):
'partner': (case.partner_id and case.partner_id.name) or '/',
'partner_email': (case.partner_address_id and case.partner_address_id.email) or '/',
}
return self.format_body(body) % data
return self.format_body(body % data)
def email_send(self, cr, uid, case, emails, body, context={}):
body = self.format_mail(case, body)
@@ -534,7 +534,10 @@ class crm_case(osv.osv):
emailfrom = case.user_id.address_id.email
else:
emailfrom = case.section_id.reply_to
tools.email_send(emailfrom, emails, '['+str(case.id)+'] '+case.name, body, reply_to=case.section_id.reply_to, tinycrm=str(case.id))
name = '[%d] %s' % (case.id, case.name.encode('utf8'))
reply_to = case.section_id.reply_to or False
if reply_to: reply_to = reply_to.encode('utf8')
tools.email_send(emailfrom, emails, name, body, reply_to=reply_to, tinycrm=str(case.id))
return True
def __log(self, cr, uid, cases, keyword, context={}):
if not self.pool.get('res.partner.event.type').check(cr, uid, 'crm_case_'+keyword):