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

[IMP] purchase : onboarding improvements

Browse Source
This commit is contained in:
Yannick Tivisse
2015-04-13 11:40:22 +02:00
committed by Richard Mathot
parent b4dd0b6f8c
commit 9c0763c426
4 changed files with 19 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/mail/__openerp__.py
-1
View File
@@ -56,7 +56,6 @@ Main Features
'mail_thread_view.xml',
'mail_group_view.xml',
'res_config_view.xml',
'res_partner_view.xml',
'data/mail_data.xml',
'data/mail_group_data.xml',
'security/mail_security.xml',
addons/mail/res_partner_view.xml
-27
View File
@@ -1,27 +0,0 @@
<?xml version="1.0"?>
<openerp>
<data>
<record id="view_emails_partner_info_form" model="ir.ui.view">
<field name="name">res.partner.emails.info.inherit</field>
<field name="model">res.partner</field>
<field name="inherit_id" ref="base.view_partner_form"/>
<field name="arch" type="xml">
<xpath expr="//group[@name='container_row_2']" position="after">
<group name="container_row_communication">
<group string="Mailing" name="mailing">
<field name='notify_email' widget="radio"/>
</group>
</group>
</xpath>
<xpath expr="//sheet" position="after">
<div class="oe_chatter">
<field name="message_follower_ids" widget="mail_followers"/>
<field name="message_ids" widget="mail_thread" options='{"thread_level": 1}'/>
</div>
</xpath>
</field>
</record>
</data>
</openerp>
addons/mail/views/res_partner_view.xml
+16 -4
View File
@@ -1,13 +1,25 @@
<?xml version="1.0" ?>
<openerp>
<data>
<record model="ir.ui.view" id="res_partner_opt_out_form">
<field name="name">res.partner.opt_out.form</field>
<record id="view_emails_partner_info_form" model="ir.ui.view">
<field name="name">res.partner.emails.info.inherit</field>
<field name="model">res.partner</field>
<field name="inherit_id" ref="base.view_partner_form"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='active']" position="after">
<field name="opt_out"/>
<xpath expr="//group[@name='container_row_2']" position="after">
<group name="container_row_communication">
<group string="Mailing" name="mailing">
<field name='notify_email' widget="radio"/>
<field name="opt_out"/>
</group>
</group>
</xpath>
<xpath expr="//sheet" position="after">
<div class="oe_chatter">
<field name="message_follower_ids" widget="mail_followers"/>
<field name="message_ids" widget="mail_thread" options='{"thread_level": 1}'/>
</div>
</xpath>
</field>
</record>
addons/purchase/purchase_view.xml
+3 -3
View File
@@ -147,7 +147,7 @@
parent="base.menu_purchase_root" sequence="8"/>
<menuitem name="Products by Category" id="menu_product_by_category_purchase_form" action="product.product_category_action"
parent="menu_procurement_management_product" sequence="2"/>
parent="menu_procurement_management_product" sequence="2" groups="base.group_no_one"/>
<menuitem name="Products" id="menu_procurement_partner_contact_form" action="product_normal_action_puchased"
parent="menu_procurement_management_product" sequence="1"/>
@@ -228,7 +228,6 @@
<field name="date_order"/>
<field name="origin" attrs="{'invisible': [('origin','=',False)]}"/>
<field name="company_id" groups="base.group_multi_company" options="{'no_create': True}"/>
<field name="picking_type_id" on_change="onchange_picking_type_id(picking_type_id, context)" domain="[('code','=','incoming')]" options="{'no_create': True}" context="{'special_shortened_wh_name': True}" groups="stock.group_locations"/>
<field name="related_usage" invisible="1"/>
<field name="dest_address_id" string="Customer Address" on_change="onchange_dest_address_id(dest_address_id, context)"
attrs="{'invisible':[('related_usage','!=','customer')],
@@ -283,7 +282,8 @@
<group>
<group>
<field name="minimum_planned_date"/>
<field name="location_id" groups="stock.group_locations"/>
<field name="picking_type_id" on_change="onchange_picking_type_id(picking_type_id, context)" domain="[('code','=','incoming')]" options="{'no_create': True}" context="{'special_shortened_wh_name': True}" groups="stock.group_locations"/>
<field name="location_id" groups="stock.group_locations" string="Location"/>
<field name="shipped" groups="base.group_no_one"/>
<field name="incoterm_id"/>
</group>