Turkesh Patel (openERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-social-sheet-tpa into
lp:~openerp-dev/openobject-addons/trunk-openchatter.
Requested reviews:
Bhumika (OpenERP) (sbh-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-social-sheet-tpa/+merge/105934
--> set Chatter widget out of the sheet in following modules.
- account
- crm
- product
-project_issue
-hr_holidays
--> [IMP] project: improved code.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-social-sheet-tpa/+merge/105934
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-openchatter.
=== modified file 'account/account_invoice_view.xml'
--- account/account_invoice_view.xml 2012-05-15 05:56:10 +0000
+++ account/account_invoice_view.xml 2012-05-16 06:56:19 +0000
@@ -144,7 +144,8 @@
<field name="type">form</field>
<field name="priority">2</field>
<field name="arch" type="xml">
- <form string="Supplier Invoice">
+ <form layout="manual">
+ <sheet string="Supplier Invoice" layout="auto">
<group col="8" colspan="4">
<field name="journal_id" on_change="onchange_journal_id(journal_id)" widget="selection"/>
<field name="number" readonly="1"/>
@@ -243,7 +244,10 @@
</field>
</page>
</notebook>
+ </sheet>
+ <div class="oe_form_sheet_width">
<field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
+ </div>
</form>
</field>
</record>
@@ -253,7 +257,8 @@
<field name="model">account.invoice</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Invoice">
+ <form layout="manual">
+ <sheet string="Invoice" layout="auto">
<group colspan="4" col="8">
<field name="journal_id" groups="base.group_user" on_change="onchange_journal_id(journal_id, context)" widget="selection"/>
<field name="number"/>
@@ -338,7 +343,10 @@
</field>
</page>
</notebook>
+ </sheet>
+ <div class="oe_form_sheet_width">
<field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
+ </div>
</form>
</field>
</record>
=== modified file 'crm/crm_meeting_view.xml'
--- crm/crm_meeting_view.xml 2012-05-14 11:27:10 +0000
+++ crm/crm_meeting_view.xml 2012-05-16 06:56:19 +0000
@@ -25,7 +25,8 @@
<field name="model">crm.meeting</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Meetings">
+ <form layout="manual">
+ <sheet string="Meetings" layout="auto">
<group col="6" colspan="4">
<field name="name" select="1" string="Summary"
required="1" />
@@ -211,7 +212,10 @@
</page>
</notebook>
+ </sheet>
+ <div class="oe_form_sheet_width">
<field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
+ </div>
</form>
</field>
</record>
=== modified file 'crm/crm_phonecall_view.xml'
--- crm/crm_phonecall_view.xml 2012-05-14 11:27:10 +0000
+++ crm/crm_phonecall_view.xml 2012-05-16 06:56:19 +0000
@@ -58,7 +58,8 @@
<field name="model">crm.phonecall</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Phone Call">
+ <form layout="manual">
+ <sheet string="Phone Call" layout="auto">
<group colspan="6" col="7">
<field name="name" required="1"/>
<field name="partner_phone"/>
@@ -121,7 +122,10 @@
states="cancel" type="object"
icon="gtk-convert" />
</group>
+ </sheet>
+ <div class="oe_form_sheet_width">
<field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
+ </div>
</form>
</field>
</record>
=== modified file 'hr_holidays/hr_holidays_view.xml'
--- hr_holidays/hr_holidays_view.xml 2012-05-14 11:27:10 +0000
+++ hr_holidays/hr_holidays_view.xml 2012-05-16 06:56:19 +0000
@@ -63,7 +63,8 @@
<field name="type">form</field>
<field name="priority">1</field>
<field name="arch" type="xml">
- <form string="Leave Request">
+ <form layout="manual">
+ <sheet string="Leave Request" layout="auto">
<group col="8" colspan="4">
<field name="name" attrs="{'readonly':[('state','!=','draft'),('state','!=','confirm')]}"/>
<field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" width="130" string="Mode" groups="base.group_hr_user"/>
@@ -95,9 +96,12 @@
<button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
<button string="Set to Draft" name="set_to_draft" states="refuse,validate" type="object" icon="gtk-convert" groups="base.group_hr_user"/>
</group>
- <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
</page>
</notebook>
+ </sheet>
+ <div class="oe_form_sheet_width">
+ <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
+ </div>
</form>
</field>
</record>
@@ -108,7 +112,8 @@
<field name="model">hr.holidays</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Allocation Request">
+ <form layout="manual">
+ <sheet string="Allocation Request" layout="auto">
<group col="8" colspan="4">
<field name="name"/>
<field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" string="Allocation Mode" groups="base.group_hr_manager"/>
@@ -138,9 +143,12 @@
<button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
<button string="Set to Draft" name="set_to_draft" states="cancel,validate,refuse" type="object" icon="gtk-convert" groups="base.group_hr_user"/>
</group>
- <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
</page>
</notebook>
+ </sheet>
+ <div class="oe_form_sheet_width">
+ <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
+ </div>
</form>
</field>
</record>
=== modified file 'mail/res_partner_view.xml'
--- mail/res_partner_view.xml 2012-05-15 10:05:30 +0000
+++ mail/res_partner_view.xml 2012-05-16 06:56:19 +0000
@@ -12,10 +12,6 @@
<xpath expr="/form/notebook/page[@string='History']" position="attributes">
<attribute name="invisible">False</attribute>
</xpath>
- <xpath expr="/form/notebook" position="after">
- <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"
- options='{"thread_level": 1}'/>
- </xpath>
</field>
</record>
<record id="view_emails_partner_info_form" model="ir.ui.view">
@@ -27,6 +23,10 @@
<page string="History" position="inside">
<field name="emails" colspan="4" nolabel="1"/>
</page>
+ <xpath expr="/form/notebook" position="after">
+ <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"
+ options='{"thread_level": 1}'/>
+ </xpath>
</field>
</record>
=== modified file 'product/product_view.xml'
--- product/product_view.xml 2012-05-16 04:30:48 +0000
+++ product/product_view.xml 2012-05-16 06:56:19 +0000
@@ -68,7 +68,8 @@
<field name="type">form</field>
<field eval="7" name="priority"/>
<field name="arch" type="xml">
- <form string="Product">
+ <form layout="manual">
+ <sheet string="Product" layout="auto">
<group colspan="4" col="8">
<group colspan="4" col="2">
<separator string="Name" colspan="2"/>
@@ -190,7 +191,10 @@
</field>
</page>
</notebook>
+ </sheet>
+ <div class="oe_form_sheet_width">
<field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
+ </div>
</form>
</field>
</record>
=== modified file 'project/project.py'
--- project/project.py 2012-05-16 04:30:48 +0000
+++ project/project.py 2012-05-16 06:56:19 +0000
@@ -1060,7 +1060,6 @@
elif typeid and typeid in sorted_types and sorted_types.index(typeid) != len(sorted_types)-1:
index = sorted_types.index(typeid)
self.write(cr, uid, task.id, {'type_id': sorted_types[index+1]})
- self.state_change_send_note(cr, uid, [task.id], context)
return True
def next_type(self, cr, uid, ids, context=None):
@@ -1103,9 +1102,9 @@
result = True
else:
result = super(task,self).write(cr, uid, ids, vals, context=context)
- if ('type_id' in vals) or ('remaining_hours' in vals) or ('user_id' in vals) or ('kanban_state' in vals):
+ if ('type_id' in vals) or ('remaining_hours' in vals) or ('user_id' in vals) or ('state' in vals) or ('kanban_state' in vals):
self._store_history(cr, uid, ids, context=context)
- self.state_change_send_note(cr, uid, ids, context)
+ self.stage_change_send_note(cr, uid, ids, context)
return result
def unlink(self, cr, uid, ids, context=None):
@@ -1192,7 +1191,7 @@
self.message_append_note(cr, uid, [task.id], body=msg, context=context)
return True
- def state_change_send_note(self, cr, uid, ids, context=None):
+ def stage_change_send_note(self, cr, uid, ids, context=None):
for task in self.browse(cr, uid, ids, context=context):
msg = _('Stage changed to <b>%s</b>') % (task.type_id.name)
self.message_append_note(cr, uid, [task.id], body=msg, context=context)
=== modified file 'project_issue/project_issue_view.xml'
--- project_issue/project_issue_view.xml 2012-05-14 11:27:10 +0000
+++ project_issue/project_issue_view.xml 2012-05-16 06:56:19 +0000
@@ -50,7 +50,8 @@
<field name="model">project.issue</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Issue Tracker Form">
+ <form layout="manual">
+ <sheet string="Issue Tracker Form" layout="auto">
<group colspan="4" col="6">
<field name="name"/>
<field name="project_id" required="True" on_change="on_change_project(project_id)"/>
@@ -113,7 +114,10 @@
</group>
</page>
</notebook>
- <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
+ </sheet>
+ <div class="oe_form_sheet_width">
+ <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
+ </div>
</form>
</field>
</record>
_______________________________________________
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
