Foram Katharotiya (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-addons20-mail-fka into
lp:openobject-addons.
Requested reviews:
Amit Patel (OpenERP) (apa-tiny)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons20-mail-fka/+merge/132878
Hello Sir,
- Improve subtype names of canceled & closed
- Rename the placeholder of the composer to "Write a note..." instead of
"Write a reply..."
Thanks,
FKA
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons20-mail-fka/+merge/132878
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-addons20-mail-fka.
=== modified file 'hr_timesheet_invoice/hr_timesheet_invoice_data.xml'
--- hr_timesheet_invoice/hr_timesheet_invoice_data.xml 2012-11-02 08:36:12 +0000
+++ hr_timesheet_invoice/hr_timesheet_invoice_data.xml 2012-11-05 12:14:21 +0000
@@ -28,7 +28,7 @@
<field name="res_model">account.analytic.account</field>
</record>
<record id="mt_account_canceled" model="mail.message.subtype">
- <field name="name">canceled</field>
+ <field name="name">cancelled</field>
<field name="res_model">account.analytic.account</field>
</record>
=== modified file 'mail/static/src/xml/mail.xml'
--- mail/static/src/xml/mail.xml 2012-10-29 14:45:03 +0000
+++ mail/static/src/xml/mail.xml 2012-11-05 12:14:21 +0000
@@ -38,7 +38,7 @@
</div>
</div>
<div t-if="widget.show_compact_message and !widget.show_composer" t-attf-class="oe_msg oe_msg_composer_compact #{widget.thread_level and widget.options.display_indented_thread > -1 ? 'oe_msg_indented' : ''}">
- <textarea class="field_text oe_compact" placeholder="Write a reply..."/>
+ <textarea class="field_text oe_compact" placeholder="Write a note..."/>
</div>
<span t-if="!(widget.show_compact_message and !widget.show_composer) and !widget.show_composer" class="oe_placeholder_compose"></span>
</t>
=== modified file 'project/project_data.xml'
--- project/project_data.xml 2012-11-02 15:41:54 +0000
+++ project/project_data.xml 2012-11-05 12:14:21 +0000
@@ -91,11 +91,11 @@
<field name="default" eval="False"/>
</record>
<record id="mt_project_closed" model="mail.message.subtype">
- <field name="name">Closed</field>
+ <field name="name">Done</field>
<field name="res_model">project.project</field>
</record>
<record id="mt_project_canceled" model="mail.message.subtype">
- <field name="name">Canceled</field>
+ <field name="name">Cancelled</field>
<field name="res_model">project.project</field>
</record>
<record id="mt_project_stage" model="mail.message.subtype">
@@ -108,11 +108,11 @@
<field name="res_model">project.task</field>
</record>
<record id="mt_task_closed" model="mail.message.subtype">
- <field name="name">Closed</field>
+ <field name="name">Done</field>
<field name="res_model">project.task</field>
</record>
<record id="mt_task_canceled" model="mail.message.subtype">
- <field name="name">Canceled</field>
+ <field name="name">Cancelled</field>
<field name="res_model">project.task</field>
</record>
<record id="mt_task_change" model="mail.message.subtype">
=== modified file 'project_issue/project_issue_data.xml'
--- project_issue/project_issue_data.xml 2012-11-02 15:41:54 +0000
+++ project_issue/project_issue_data.xml 2012-11-05 12:14:21 +0000
@@ -48,11 +48,11 @@
<field name="res_model">project.issue</field>
</record>
<record id="mail.mt_issue_closed" model="mail.message.subtype">
- <field name="name">Closed</field>
+ <field name="name">Done</field>
<field name="res_model">project.issue</field>
</record>
<record id="mail.mt_issue_canceled" model="mail.message.subtype">
- <field name="name">Canceled</field>
+ <field name="name">Cancelled</field>
<field name="res_model">project.issue</field>
</record>
<record id="mail.mt_issue_change" model="mail.message.subtype">
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
