odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] forward port of branch 7.0 up to revid 9636 mat@openerp.com-20131122165504-tmbg0ixhqed4kdkz 

bzr revid: chs@openerp.com-20131122193122-wpdfsfn24ezj1qrp
This commit is contained in:
Christophe Simonis 2013-11-22 20:31:22 +01:00
parent 162dd9ad17 3a7c74ca31
commit 0244543c71
13 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/account/edi/invoice_action_data.xml
View File

@ -22,7 +22,7 @@
<!--Email template --> <!--Email template -->
<record id="email_template_edi_invoice" model="email.template"> <record id="email_template_edi_invoice" model="email.template">
<field name="name">Invoice - Send by Email</field> <field name="name">Invoice - Send by Email</field>
<field name="email_from">${object.user_id.email or object.company_id.email or 'noreply@localhost'|safe}</field> <field name="email_from">${(object.user_id.email or object.company_id.email or 'noreply@localhost')|safe}</field>
<field name="subject">${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})</field> <field name="subject">${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})</field>
<field name="partner_to">${object.partner_id.id}</field> <field name="partner_to">${object.partner_id.id}</field>
<field name="model_id" ref="account.model_account_invoice"/> <field name="model_id" ref="account.model_account_invoice"/>

2
addons/account_analytic_analysis/account_analytic_analysis_cron.xml
View File

@ -4,7 +4,7 @@
<record id="account_analytic_cron_email_template" model="email.template"> <record id="account_analytic_cron_email_template" model="email.template">
<field name="name">Contract expiration reminder</field> <field name="name">Contract expiration reminder</field>
<field name="email_from">${object.email or ''|safe}</field> <field name="email_from">${(object.email or '')|safe}</field>
<field name="subject">Contract expiration reminder ${user.company_id.name}</field> <field name="subject">Contract expiration reminder ${user.company_id.name}</field>
<field name="email_to">${object.email|safe}</field> <field name="email_to">${object.email|safe}</field>
<field name="lang">${object.lang}</field> <field name="lang">${object.lang}</field>

8
addons/account_followup/account_followup_data.xml
View File

@ -6,7 +6,7 @@
<!--Mail template level 0--> <!--Mail template level 0-->
<record id="email_template_account_followup_level0" model="email.template"> <record id="email_template_account_followup_level0" model="email.template">
<field name="name">First polite payment follow-up reminder email</field> <field name="name">First polite payment follow-up reminder email</field>
<field name="email_from">${user.email or ''|safe}</field> <field name="email_from">${(user.email or '')|safe}</field>
<field name="subject">${user.company_id.name} Payment Reminder</field> <field name="subject">${user.company_id.name} Payment Reminder</field>
<field name="email_to">${object.email|safe}</field> <field name="email_to">${object.email|safe}</field>
<field name="lang">${object.lang}</field> <field name="lang">${object.lang}</field>
@ -45,7 +45,7 @@ ${object.get_followup_table_html() | safe}
<!--Mail template level 1 --> <!--Mail template level 1 -->
<record id="email_template_account_followup_level1" model="email.template"> <record id="email_template_account_followup_level1" model="email.template">
<field name="name">A bit urging second payment follow-up reminder email</field> <field name="name">A bit urging second payment follow-up reminder email</field>
<field name="email_from">${user.email or ''|safe}</field> <field name="email_from">${(user.email or '')|safe}</field>
<field name="subject">${user.company_id.name} Payment Reminder</field> <field name="subject">${user.company_id.name} Payment Reminder</field>
<field name="email_to">${object.email|safe}</field> <field name="email_to">${object.email|safe}</field>
<field name="lang">${object.lang}</field> <field name="lang">${object.lang}</field>
@ -85,7 +85,7 @@ ${object.get_followup_table_html() | safe}
<!--Mail template level 2 --> <!--Mail template level 2 -->
<record id="email_template_account_followup_level2" model="email.template"> <record id="email_template_account_followup_level2" model="email.template">
<field name="name">Urging payment follow-up reminder email</field> <field name="name">Urging payment follow-up reminder email</field>
<field name="email_from">${user.email or ''|safe}</field> <field name="email_from">${(user.email or '')|safe}</field>
<field name="subject">${user.company_id.name} Payment Reminder</field> <field name="subject">${user.company_id.name} Payment Reminder</field>
<field name="email_to">${object.email|safe}</field> <field name="email_to">${object.email|safe}</field>
<field name="lang">${object.lang}</field> <field name="lang">${object.lang}</field>
@ -122,7 +122,7 @@ ${object.get_followup_table_html() | safe}
<!-- Default follow up message --> <!-- Default follow up message -->
<record id="email_template_account_followup_default" model="email.template"> <record id="email_template_account_followup_default" model="email.template">
<field name="name">Default payment follow-up reminder e-mail</field> <field name="name">Default payment follow-up reminder e-mail</field>
<field name="email_from">${user.email or ''|safe}</field> <field name="email_from">${(user.email or '')|safe}</field>
<field name="subject">${user.company_id.name} Payment Reminder</field> <field name="subject">${user.company_id.name} Payment Reminder</field>
<field name="email_to">${object.email|safe}</field> <field name="email_to">${object.email|safe}</field>
<field name="lang">${object.lang}</field> <field name="lang">${object.lang}</field>

4
addons/auth_signup/auth_signup_data.xml
View File

@ -22,7 +22,7 @@
<record id="reset_password_email" model="email.template"> <record id="reset_password_email" model="email.template">
<field name="name">Reset Password</field> <field name="name">Reset Password</field>
<field name="model_id" ref="base.model_res_users"/> <field name="model_id" ref="base.model_res_users"/>
<field name="email_from"><![CDATA[${object.company_id.name} <${object.company_id.email or user.email|safe}>]]></field> <field name="email_from"><![CDATA[${object.company_id.name} <${(object.company_id.email or user.email)|safe}>]]></field>
<field name="email_to">${object.email|safe}</field> <field name="email_to">${object.email|safe}</field>
<field name="subject">Password reset</field> <field name="subject">Password reset</field>
<field name="body_html"><![CDATA[ <field name="body_html"><![CDATA[
@ -37,7 +37,7 @@
<record id="set_password_email" model="email.template"> <record id="set_password_email" model="email.template">
<field name="name">OpenERP Enterprise Connection</field> <field name="name">OpenERP Enterprise Connection</field>
<field name="model_id" ref="base.model_res_users"/> <field name="model_id" ref="base.model_res_users"/>
<field name="email_from"><![CDATA[${object.company_id.name} <${object.company_id.email or user.email|safe}>]]></field> <field name="email_from"><![CDATA[${object.company_id.name} <${(object.company_id.email or user.email)|safe}>]]></field>
<field name="email_to">${object.email|safe}</field> <field name="email_to">${object.email|safe}</field>
<field name="subject"><![CDATA[${object.company_id.name} invitation to connect on OpenERP]]></field> <field name="subject"><![CDATA[${object.company_id.name} invitation to connect on OpenERP]]></field>
<field name="body_html"> <field name="body_html">

4
addons/event/email_template.xml
View File

@ -4,7 +4,7 @@
<record id="confirmation_event" model="email.template"> <record id="confirmation_event" model="email.template">
<field name="name">Confirmation of the Event</field> <field name="name">Confirmation of the Event</field>
<field name="model_id" ref="event.model_event_registration"/> <field name="model_id" ref="event.model_event_registration"/>
<field name="email_from" >${object.user_id.email or object.company_id.email or 'noreply@' + object.company_id.name + '.com'|safe}</field> <field name="email_from" >${(object.user_id.email or object.company_id.email or 'noreply@' + object.company_id.name + '.com')|safe}</field>
<field name="email_to" >${object.email|safe}</field> <field name="email_to" >${object.email|safe}</field>
<field name="subject">Your registration at ${object.event_id.name}</field> <field name="subject">Your registration at ${object.event_id.name}</field>
<field name="body_html"><![CDATA[ <field name="body_html"><![CDATA[
@ -21,7 +21,7 @@
<record id="confirmation_registration" model="email.template"> <record id="confirmation_registration" model="email.template">
<field name="name">Confirmation of the Registration</field> <field name="name">Confirmation of the Registration</field>
<field name="model_id" ref="event.model_event_registration"/> <field name="model_id" ref="event.model_event_registration"/>
<field name="email_from" >${object.user_id.email or object.company_id.email or 'noreply@' + object.company_id.name + '.com'|safe}</field> <field name="email_from" >${(object.user_id.email or object.company_id.email or 'noreply@' + object.company_id.name + '.com')|safe}</field>
<field name="email_to" >${object.email|safe}</field> <field name="email_to" >${object.email|safe}</field>
<field name="subject">Your registration at ${object.event_id.name}</field> <field name="subject">Your registration at ${object.event_id.name}</field>
<field name="body_html"><![CDATA[ <field name="body_html"><![CDATA[

6
addons/marketing_campaign/marketing_campaign_demo.xml
View File

@ -5,7 +5,7 @@
<field name="name">welcome new partner</field> <field name="name">welcome new partner</field>
<field name="email_from">info@openerp.com</field> <field name="email_from">info@openerp.com</field>
<field name="subject">Welcome to the OpenERP Partner Channel!</field> <field name="subject">Welcome to the OpenERP Partner Channel!</field>
<field name="email_to">${object.email or ''|safe}</field> <field name="email_to">${(object.email or '')|safe}</field>
<field name="model_id" ref="base.model_res_partner"/> <field name="model_id" ref="base.model_res_partner"/>
<field name="body_html">Hello, you will receive your welcome pack via email shortly.</field> <field name="body_html">Hello, you will receive your welcome pack via email shortly.</field>
</record> </record>
@ -13,7 +13,7 @@
<field name="name">congrats silver partner</field> <field name="name">congrats silver partner</field>
<field name="email_from">info@openerp.com</field> <field name="email_from">info@openerp.com</field>
<field name="subject">Congratulations! You are now a Silver Partner!</field> <field name="subject">Congratulations! You are now a Silver Partner!</field>
<field name="email_to">${object.email or ''|safe}</field> <field name="email_to">${(object.email or '')|safe}</field>
<field name="model_id" ref="base.model_res_partner"/> <field name="model_id" ref="base.model_res_partner"/>
<field name="body_html">Hi, we are delighted to welcome you among our Silver Partners as of today!</field> <field name="body_html">Hi, we are delighted to welcome you among our Silver Partners as of today!</field>
</record> </record>
@ -22,7 +22,7 @@
<field name="name">congrats gold partner</field> <field name="name">congrats gold partner</field>
<field name="email_from">info@openerp.com</field> <field name="email_from">info@openerp.com</field>
<field name="subject">Congratulations! You are now one of our Gold Partners!</field> <field name="subject">Congratulations! You are now one of our Gold Partners!</field>
<field name="email_to">${object.email or ''|safe}</field> <field name="email_to">${(object.email or '')|safe}</field>
<field name="model_id" ref="base.model_res_partner"/> <field name="model_id" ref="base.model_res_partner"/>
<field name="body_html">Hi, we are delighted to let you know that you have entered the select circle of our Gold Partners</field> <field name="body_html">Hi, we are delighted to let you know that you have entered the select circle of our Gold Partners</field>
</record> </record>

4
addons/portal_sale/portal_sale_data.xml
View File

@ -6,7 +6,7 @@
<!--Email template --> <!--Email template -->
<record id="email_template_edi_sale" model="email.template"> <record id="email_template_edi_sale" model="email.template">
<field name="name">Sales Order - Send by Email (Portal)</field> <field name="name">Sales Order - Send by Email (Portal)</field>
<field name="email_from">${object.user_id.email or ''|safe}</field> <field name="email_from">${(object.user_id.email or '')|safe}</field>
<field name="subject">${object.company_id.name} ${object.state in ('draft', 'sent') and 'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })</field> <field name="subject">${object.company_id.name} ${object.state in ('draft', 'sent') and 'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })</field>
<field name="partner_to">${object.partner_invoice_id.id}</field> <field name="partner_to">${object.partner_invoice_id.id}</field>
<field name="model_id" ref="sale.model_sale_order"/> <field name="model_id" ref="sale.model_sale_order"/>
@ -95,7 +95,7 @@
<record id="email_template_edi_invoice" model="email.template"> <record id="email_template_edi_invoice" model="email.template">
<field name="name">Invoice - Send by Email (Portal)</field> <field name="name">Invoice - Send by Email (Portal)</field>
<field name="email_from">${object.user_id.email or object.company_id.email or 'noreply@localhost'|safe}</field> <field name="email_from">${(object.user_id.email or object.company_id.email or 'noreply@localhost')|safe}</field>
<field name="subject">${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })</field> <field name="subject">${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })</field>
<field name="partner_to">${object.partner_id.id}</field> <field name="partner_to">${object.partner_id.id}</field>
<field name="model_id" ref="account.model_account_invoice"/> <field name="model_id" ref="account.model_account_invoice"/>

2
addons/project/project.py
View File

@ -1246,6 +1246,8 @@ class account_analytic_account(osv.osv):
return analytic_account_id return analytic_account_id
def write(self, cr, uid, ids, vals, context=None): def write(self, cr, uid, ids, vals, context=None):
if isinstance(ids, (int, long)):
ids = [ids]
vals_for_project = vals.copy() vals_for_project = vals.copy()
for account in self.browse(cr, uid, ids, context=context): for account in self.browse(cr, uid, ids, context=context):
if not vals.get('name'): if not vals.get('name'):

2
addons/purchase/edi/purchase_order_action_data.xml
View File

@ -19,7 +19,7 @@
<!--Email template --> <!--Email template -->
<record id="email_template_edi_purchase" model="email.template"> <record id="email_template_edi_purchase" model="email.template">
<field name="name">Purchase Order - Send by mail</field> <field name="name">Purchase Order - Send by mail</field>
<field name="email_from">${object.validator.email or ''|safe}</field> <field name="email_from">${(object.validator.email or '')|safe}</field>
<field name="subject">${object.company_id.name} Order (Ref ${object.name or 'n/a' })</field> <field name="subject">${object.company_id.name} Order (Ref ${object.name or 'n/a' })</field>
<field name="partner_to">${object.partner_id.id}</field> <field name="partner_to">${object.partner_id.id}</field>
<field name="model_id" ref="purchase.model_purchase_order"/> <field name="model_id" ref="purchase.model_purchase_order"/>

2
addons/sale/edi/sale_order_action_data.xml
View File

@ -20,7 +20,7 @@
<!--Email template --> <!--Email template -->
<record id="email_template_edi_sale" model="email.template"> <record id="email_template_edi_sale" model="email.template">
<field name="name">Sales Order - Send by Email</field> <field name="name">Sales Order - Send by Email</field>
<field name="email_from">${object.user_id.email or ''|safe}</field> <field name="email_from">${(object.user_id.email or '')|safe}</field>
<field name="subject">${object.company_id.name} ${object.state in ('draft', 'sent') and 'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })</field> <field name="subject">${object.company_id.name} ${object.state in ('draft', 'sent') and 'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })</field>
<field name="partner_to">${object.partner_invoice_id.id}</field> <field name="partner_to">${object.partner_invoice_id.id}</field>
<field name="model_id" ref="sale.model_sale_order"/> <field name="model_id" ref="sale.model_sale_order"/>

6
addons/stock/report/picking.rml
View File

@ -285,9 +285,9 @@
<para style="terp_default_Centre_9">[[ (move_lines.prodlot_id and move_lines.prodlot_id.name) or '' ]]</para> <para style="terp_default_Centre_9">[[ (move_lines.prodlot_id and move_lines.prodlot_id.name) or '' ]]</para>
</td> </td>
<td> <td>
<para style="terp_default_9">[[ (picking.type == 'in' or removeParentNode('para')) ]][[ move_lines.state == 'done' and 'Received' or move_lines.state]]</para> <para style="terp_default_9">[[ (picking.type == 'in' or removeParentNode('para')) and '' ]][[ move_lines.state == 'done' and 'Received' or move_lines.state]]</para>
<para style="terp_default_9">[[ (picking.type == 'out' or removeParentNode('para')) ]][[ move_lines.state == 'done' and 'Delivered' or move_lines.state]]</para> <para style="terp_default_9">[[ (picking.type == 'out' or removeParentNode('para')) and '']][[ move_lines.state == 'done' and 'Delivered' or move_lines.state]]</para>
<para style="terp_default_9">[[ (picking.type == 'internal' or removeParentNode('para')) ]][[ move_lines.state == 'done' and 'Transferred' or move_lines.state]]</para> <para style="terp_default_9">[[ (picking.type == 'internal' or removeParentNode('para')) and '' ]][[ move_lines.state == 'done' and 'Transferred' or move_lines.state]]</para>
</td> </td>
<td> <td>
<para style="terp_default_Right_9">[[ (move_lines.location_id and move_lines.location_id.name) or '' ]] </para> <para style="terp_default_Right_9">[[ (move_lines.location_id and move_lines.location_id.name) or '' ]] </para>

2
addons/survey/survey_view.xml
View File

@ -1127,7 +1127,7 @@
<field name="survey_id"/> <field name="survey_id"/>
<field name="user_id" on_change="on_change_user(user_id)" context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'base.group_survey_user']}"/> <field name="user_id" on_change="on_change_user(user_id)" context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'base.group_survey_user']}"/>
<field name="email"/> <field name="email"/>
<field name="response" readonly="1"/> <field name="response" readonly="1" attrs="{'invisible':[('response','=',False)]}"/>
</group> </group>
</sheet> </sheet>
</form> </form>

2
addons/warning/warning.py
View File

@ -281,7 +281,7 @@ class purchase_order_line(osv.osv):
name=False, price_unit=False, notes=False, context=None): name=False, price_unit=False, notes=False, context=None):
warning = {} warning = {}
if not product: if not product:
return {'value': {'price_unit': 0.0, 'name':'','notes':'', 'product_uom' : False}, 'domain':{'product_uom':[]}} return {'value': {'price_unit': price_unit or 0.0, 'name': name or '', 'notes': notes or '', 'product_uom' : uom or False}, 'domain':{'product_uom':[]}}
product_obj = self.pool.get('product.product') product_obj = self.pool.get('product.product')
product_info = product_obj.browse(cr, uid, product) product_info = product_obj.browse(cr, uid, product)
title = False title = False