tfr (Openerp) has proposed merging
lp:~openerp-dev/openerp-int/mck_undefined_popup into
lp:~openerp-dev/openerp-int/mck_addons.
Requested reviews:
OpenERP R&D Team (openerp-dev)
For more details, see:
https://code.launchpad.net/~openerp-dev/openerp-int/mck_undefined_popup/+merge/127702
--
https://code.launchpad.net/~openerp-dev/openerp-int/mck_undefined_popup/+merge/127702
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-dev/openerp-int/mck_undefined_popup into
lp:~openerp-dev/openerp-int/mck_addons.
=== modified file 'mck_common/view/email_template.xml'
--- mck_common/view/email_template.xml 2012-08-31 12:06:07 +0000
+++ mck_common/view/email_template.xml 2012-10-03 10:10:47 +0000
@@ -98,7 +98,14 @@
<page string="Attachments">
<button name="create_attachment" string="Create New Attachment" type="object" icon="gtk-go-forward" />
- <field name="attachment_ids" colspan="4" nolabel="1"/>
+ <field name="attachment_ids" colspan="4" nolabel="1">
+ <tree string="Attachment(s)">
+ <field name="datas_fname"/>
+ <field name="practice_id"/>
+ <field name="create_uid"/>
+ <field name="create_date"/>
+ </tree>
+ </field>
</page>
<page string="Advanced options and edit history ">
<separator string="Advanced options" colspan="4"/>
=== modified file 'mck_common/view/email_view.xml'
--- mck_common/view/email_view.xml 2012-10-01 13:20:34 +0000
+++ mck_common/view/email_view.xml 2012-10-03 10:10:47 +0000
@@ -54,7 +54,7 @@
<page string="Attachment(s)">
<field name="attachment_ids" nolabel="1" colspan="4"
readonly="1">
- <tree>
+ <tree string="Attachment(s)">
<field name="datas_fname" />
<field name="create_uid" />
<field name="create_date" string="Date Created" />
@@ -81,7 +81,7 @@
<field name="type">tree</field>
<field name="priority">20</field>
<field name="arch" type="xml">
- <tree>
+ <tree string="Mail">
<field name="subject" />
<field name='practice_id' />
<field name='user_id' />
=== modified file 'mck_contact/view/company.xml'
--- mck_contact/view/company.xml 2012-10-02 07:38:46 +0000
+++ mck_contact/view/company.xml 2012-10-03 10:10:47 +0000
@@ -90,7 +90,7 @@
<separator string="Company addresses" colspan="4" />
<field name="addresses_ids" colspan="4" nolabel="1"
on_change="onchange_location(addresses_ids)">
- <tree editable="top">
+ <tree string="Company addresses" editable="top">
<field name="hq" />
<field name="street" />
<field name="street2" />
@@ -105,7 +105,7 @@
<label string="" colspan="4" />
<separator string="Executives" colspan="4" />
<field name="address" colspan="4" nolabel="1" readonly="1">
- <tree string="">
+ <tree string="Executives">
<field name="contact_name" />
<field name="title" />
<field name="type_id" />
=== modified file 'mck_event/view/event.xml'
--- mck_event/view/event.xml 2012-09-21 09:59:51 +0000
+++ mck_event/view/event.xml 2012-10-03 10:10:47 +0000
@@ -215,7 +215,7 @@
<page string="Email Templates and Edit History">
<separator string="Template History" colspan="4" />
<field name="email_templates_ids" nolabel="1" colspan="4">
- <tree>
+ <tree string="Template">
<field name="name" />
</tree>
</field>
=== modified file 'mck_event/view/invitee.xml'
--- mck_event/view/invitee.xml 2012-09-25 10:20:16 +0000
+++ mck_event/view/invitee.xml 2012-10-03 10:10:47 +0000
@@ -149,7 +149,7 @@
<label string="" colspan="24" />
<separator string="CC'ed Mck Contacts" colspan="24" />
<field name="cc_mck_contact" nolabel="1" colspan="24">
- <tree>
+ <tree string="Contact">
<field name="full_name" string="Name"/>
<field name="email" />
</tree>
=== modified file 'mck_event/wizard/view/email_ok.xml'
--- mck_event/wizard/view/email_ok.xml 2012-06-28 09:47:28 +0000
+++ mck_event/wizard/view/email_ok.xml 2012-10-03 10:10:47 +0000
@@ -17,7 +17,7 @@
<label string="" colspan="4"/>
<label string="However, no email address has been found for the following invites, this means they will not receive the email you have just send." colspan="4"/>
<field name="exec_ids" nolabel="1" colspan="4">
- <tree>
+ <tree string="Email">
<field name="name"/>
<field name="email"/>
</tree>
@@ -29,4 +29,4 @@
</field>
</record>
</data>
-</openerp>
\ No newline at end of file
+</openerp>
=== modified file 'mck_event/wizard/view/update.xml'
--- mck_event/wizard/view/update.xml 2012-06-27 11:31:14 +0000
+++ mck_event/wizard/view/update.xml 2012-10-03 10:10:47 +0000
@@ -10,7 +10,19 @@
<group>
<field name="event_id" />
</group>
- <field name="invitee_ids" colspan="4" nolabel="1"/>
+ <field name="invitee_ids" colspan="4" nolabel="1">
+ <tree string="Invites">
+ <field name="event_id"/>
+ <field name="switch_to"/>
+ <field name="executive_id"/>
+ <field name="role_title"/>
+ <field name="role_type"/>
+ <field name="role_company_id"/>
+ <field name="main_partner"/>
+ <field name="role_company_id"/>
+ <field name="start_date"/>
+ </tree>
+ </field>
<group>
<field name="status_id" context="{'event':event_id}" colspan="2"/>
</group>
=== modified file 'mck_internal/view/users.xml'
--- mck_internal/view/users.xml 2012-10-01 13:20:34 +0000
+++ mck_internal/view/users.xml 2012-10-03 10:10:47 +0000
@@ -52,7 +52,7 @@
<field name="type">tree</field>
<field name="priority">1</field>
<field name="arch" type="xml">
- <tree>
+ <tree string="User">
<field name="name"/>
<field name="login"/>
<field name="context_tz" required="1" string="Time Zone"/>
=== modified file 'mck_publication/view/event.xml'
--- mck_publication/view/event.xml 2012-09-21 09:59:51 +0000
+++ mck_publication/view/event.xml 2012-10-03 10:10:47 +0000
@@ -146,7 +146,7 @@
<page string="Email Templates and Edit History">
<separator string="Template History" colspan="4" />
<field name="email_templates_ids" nolabel="1" colspan="4">
- <tree>
+ <tree string="Template">
<field name="name" />
</tree>
</field>
=== modified file 'mck_publication/view/invitee.xml'
--- mck_publication/view/invitee.xml 2012-09-25 10:20:16 +0000
+++ mck_publication/view/invitee.xml 2012-10-03 10:10:47 +0000
@@ -155,7 +155,7 @@
<separator string="CC'ed Mck Contacts" colspan="8" />
<field name="cc_mck_contact" nolabel="1" colspan="8">
- <tree>
+ <tree string="Contact">
<field name="name" string="Name"/>
<field name="email" />
</tree>
=== modified file 'mck_publication/wizard/view/email_ok.xml'
--- mck_publication/wizard/view/email_ok.xml 2012-06-28 09:47:28 +0000
+++ mck_publication/wizard/view/email_ok.xml 2012-10-03 10:10:47 +0000
@@ -18,7 +18,7 @@
<label string="However, no email address has been found for the following recipients, this means they will not receive the email you have just send." colspan="4"/>
<field name="exec_ids" nolabel="1" colspan="4">
- <tree>
+ <tree string="Email">
<field name="name"/>
<field name="email"/>
</tree>
@@ -30,4 +30,4 @@
</field>
</record>
</data>
-</openerp>
\ No newline at end of file
+</openerp>
=== modified file 'mck_publication/wizard/view/export_recipient.xml'
--- mck_publication/wizard/view/export_recipient.xml 2012-06-01 15:11:00 +0000
+++ mck_publication/wizard/view/export_recipient.xml 2012-10-03 10:10:47 +0000
@@ -10,7 +10,7 @@
<group colspan="4" attrs="{'invisible' : [('state', '=', 'done')]}">
<separator string="Recipients whom addresses have to be exported : " colspan="4" />
<field name="recipient_ids" nolabel="1" colspan="4">
- <tree>
+ <tree string="Recipients">
<field name="name"/>
<field name="role_id"/>
<field name="role_type"/>
=== modified file 'mck_publication/wizard/view/update.xml'
--- mck_publication/wizard/view/update.xml 2012-06-27 11:31:14 +0000
+++ mck_publication/wizard/view/update.xml 2012-10-03 10:10:47 +0000
@@ -11,7 +11,20 @@
<field name="event_id" string="Name of the publication"/>
</group>
- <field name="invitee_ids" colspan="4" nolabel="1"/>
+ <field name="invitee_ids" colspan="4" nolabel="1">
+ <tree string="Recipients">
+ <field name="event_id"/>
+ <field name="switch_to"/>
+ <field name="executive_id"/>
+ <field name="role_title"/>
+ <field name="role_type"/>
+ <field name="role_company_id"/>
+ <field name="main_partner"/>
+ <field name="role_company_id"/>
+ <field name="date"/>
+ </tree>
+
+ </field>
<group>
<field name="status_id" context="{'event':event_id}" string="update the status of these recipients to "/>
</group>
_______________________________________________
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
