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

[IMP] purchase, purchase_analytic_plans, purchase_requisition: remove group_extended 

bzr revid: rco@openerp.com-20120425132202-yqxsma0z80hgd6s4
This commit is contained in:
Raphael Collet 2012-04-25 15:22:02 +02:00
parent b1ef98d463
commit 2076ad19fb
6 changed files with 24 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
addons/purchase/purchase_view.xml
View File

@ -26,8 +26,7 @@
<!--<menuitem
action="product.product_pricelist_type_action" id="menu_purchase_product_pricelist_type"
parent="menu_purchase_config_pricelist" sequence="2"
groups="base.group_extended"/>-->
parent="menu_purchase_config_pricelist" sequence="2"/>-->
<menuitem
id="menu_product_in_config_purchase" name="Products"
@ -64,13 +63,11 @@
<!--Inventory control-->
<menuitem id="menu_procurement_management_inventory" name="Receive Products"
parent="base.menu_purchase_root" sequence="4"
groups="base.group_extended"/>
parent="base.menu_purchase_root" sequence="4"/>
<menuitem action="stock.action_picking_tree4" id="menu_action_picking_tree4" parent="menu_procurement_management_inventory"
name="Incoming Shipments" sequence="9"/>
<menuitem action="stock.action_reception_picking_move" id="menu_action_picking_tree_in_move"
parent="menu_procurement_management_inventory" sequence="11"
groups="base.group_extended"/>
parent="menu_procurement_management_inventory" sequence="11"/>
<!--Invoice control-->
<menuitem id="menu_procurement_management_invoice" name="Invoice Control"
@ -148,7 +145,7 @@
<page string="Purchase Order">
<field name="partner_id" on_change="onchange_partner_id(partner_id)" context="{'search_default_supplier':1,'default_supplier':1,'default_customer':0}" options='{"quick_create": false}'/>
<field domain="[('type','=','purchase')]" name="pricelist_id" groups="product.group_purchase_pricelist"/>
<field name="origin" groups="base.group_extended"/>
<field name="origin"/>
<newline/>
<field colspan="4" name="order_line" nolabel="1" mode="tree,form">
<tree string="Purchase Order Lines">
@ -180,7 +177,7 @@
<button name="%(report_purchase_order)d" string="Print" states="approved" type="action" icon="gtk-print"/>
</group>
</page>
<page string="Delivery &amp; Invoicing" groups="base.group_extended">
<page string="Delivery &amp; Invoicing">
<group colspan="2" col="2">
<separator string="Delivery" colspan="2"/>
<field name="dest_address_id" on_change="onchange_dest_address_id(dest_address_id)"/>
@ -200,7 +197,7 @@
</group>
<separator string="Invoices" colspan="4"/>
<newline/>
<field name="invoice_ids" groups="base.group_extended" nolabel="1" colspan="4" context="{'type':'in_invoice', 'journal_type':'purchase'}"/>
<field name="invoice_ids" nolabel="1" colspan="4" context="{'type':'in_invoice', 'journal_type':'purchase'}"/>
</page>
<page string="Notes">
<field colspan="4" name="notes" nolabel="1"/>
@ -223,7 +220,7 @@
<separator orientation="vertical"/>
<filter icon="terp-emblem-important" name="exception" string="Exception" domain="[('state','in',('except_invoice','except_picking'))]" help="Purchase order which are in the exception state"/>
<separator orientation="vertical"/>
<filter icon="terp-gtk-go-back-rtl" name="not_invoiced" string="Not invoiced" domain="[('invoice_ids','=', False)]" help="Purchase orders that include lines not invoiced." groups="base.group_extended"/>
<filter icon="terp-gtk-go-back-rtl" name="not_invoiced" string="Not invoiced" domain="[('invoice_ids','=', False)]" help="Purchase orders that include lines not invoiced."/>
<separator orientation="vertical"/>
<field name="name" string="Reference"/>
<field name="partner_id"/>
@ -231,7 +228,7 @@
<field name="create_uid"/>
</group>
<newline/>
<group expand="0" string="Group By..." groups="base.group_extended">
<group expand="0" string="Group By...">
<filter string="Supplier" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
<separator orientation="vertical"/>
<filter string="Origin" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
@ -259,7 +256,7 @@
<separator orientation="vertical"/>
<filter icon="terp-emblem-important" name="exception" string="Exception" domain="[('state','in',('except_invoice','except_picking'))]" help="Purchase orders which are in exception state"/>
<separator orientation="vertical"/>
<filter icon="terp-gtk-go-back-rtl" name="not_invoiced" string="Not invoiced" domain="[('invoice_ids','=', False)]" help="Purchase orders that include lines not invoiced." groups="base.group_extended"/>
<filter icon="terp-gtk-go-back-rtl" name="not_invoiced" string="Not invoiced" domain="[('invoice_ids','=', False)]" help="Purchase orders that include lines not invoiced."/>
<separator orientation="vertical"/>
<field name="name" string="Reference"/>
<field name="partner_id"/>
@ -267,7 +264,7 @@
<field name="create_uid"/>
</group>
<newline/>
<group expand="0" string="Group By..." groups="base.group_extended">
<group expand="0" string="Group By...">
<filter string="Supplier" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
<separator orientation="vertical"/>
<filter string="Origin" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
@ -350,7 +347,7 @@
domain="[('parent_id','=',False),('type_tax_use','!=','sale')]"/>
</group>
</page>
<page string="Invoicing" groups="base.group_extended">
<page string="Invoicing">
<separator colspan="4" string="Manual Invoices"/>
<field name="invoiced"/>
<newline/>
@ -359,7 +356,7 @@
<page string="Notes">
<field colspan="4" name="notes" nolabel="1"/>
</page>
<page string="History" groups="base.group_extended">
<page string="History">
<separator colspan="4" string="Stock Moves"/>
<field colspan="4" name="move_ids" nolabel="1" widget="many2many"/>
</page>
@ -407,13 +404,13 @@
<field name="price_unit"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
<field name="account_analytic_id" colspan="4" groups="purchase.group_analytic_accounting" domain="[('parent_id','!=',False)]"/>
<group colspan="4" col="4" groups="base.group_extended">
<group colspan="4" col="4">
<separator colspan="4" string="Taxes"/>
<field colspan="4" nolabel="1" name="taxes_id"
domain="[('parent_id','=',False),('type_tax_use','!=','sale')]"/>
</group>
</page>
<page string="Invoicing" groups="base.group_extended">
<page string="Invoicing">
<separator colspan="4" string="Manual Invoices"/>
<field name="invoiced"/>
<newline/>
@ -422,7 +419,7 @@
<page string="Notes">
<field colspan="4" name="notes" nolabel="1"/>
</page>
<page string="History" groups="base.group_extended">
<page string="History">
<separator colspan="4" string="Stock Moves"/>
<field colspan="4" name="move_ids" nolabel="1" widget="many2many"/>
</page>
@ -496,7 +493,6 @@
<menuitem
action="purchase_line_form_action2"
id="menu_purchase_line_order_draft"
groups="base.group_extended"
parent="menu_procurement_management_invoice"
sequence="72"/>

4
addons/purchase/report/purchase_report_view.xml
View File

@ -81,7 +81,7 @@
<field name="product_id"/>
</group>
<newline/>
<group expand="0" string="Extended Filters..." groups="base.group_extended">
<group expand="0" string="Extended Filters...">
<field name="user_id"/>
<field name="validator"/>
<separator orientation="vertical"/>
@ -103,7 +103,7 @@
<filter string="Product" name="group_product_id" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
<filter string="Category" name="group_category_id" icon="terp-stock_symbol-selection" context="{'group_by':'category_id'}"/>
<filter string="Reference UOM" name="group_product_uom" icon="terp-mrp" context="{'group_by':'product_uom'}"/>
<filter string="Warehouse" icon="terp-go-home" context="{'group_by':'warehouse_id'}" groups="base.group_extended"/>
<filter string="Warehouse" icon="terp-go-home" context="{'group_by':'warehouse_id'}"/>
<filter string="Destination" icon="terp-gtk-jump-to-ltr" context="{'group_by':'location_id'}"/>
<separator orientation="vertical"/>
<filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>

7
addons/purchase/stock_view.xml
View File

@ -29,7 +29,6 @@
id="act_purchase_order_2_stock_picking"
name="Receptions"
res_model="stock.picking"
groups="base.group_extended"
src_model="purchase.order"
context="{'default_purchase_id': active_id, 'contact_display': 'partner'}" />
@ -72,14 +71,14 @@
domain="[('state','=','done')]" help="Incoming Shipments already processed"/>
<separator orientation="vertical"/>
<filter icon="terp-accessories-archiver-minus" string="Back Orders"
domain="[('backorder_id', '!=', False)]" help="Is a Back Order" groups="base.group_extended"/>
domain="[('backorder_id', '!=', False)]" help="Is a Back Order"/>
<separator orientation="vertical"/>
<filter string="To Invoice" name="to_invoice" icon="terp-dolar"
domain="[('invoice_state', '=', '2binvoiced')]"/>
<separator orientation="vertical"/>
<field name="name"/>
<field name="origin"/>
<field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
<field name="stock_journal_id" widget="selection"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
</group>
<newline/>
@ -94,7 +93,7 @@
domain="[]" context="{'group_by':'min_date'}"/>
<separator orientation="vertical"/>
<filter string="Journal" icon="terp-folder-orange"
domain="[]" context="{'group_by':'stock_journal_id'}" groups="base.group_extended"/>
domain="[]" context="{'group_by':'stock_journal_id'}"/>
</group>
</search>
</field>

1
addons/purchase/wizard/purchase_order_group_view.xml
View File

@ -34,7 +34,6 @@ Lines will only be merged if: &#10;
target="new"
multi="True"
key2="client_action_multi"
groups="base.group_extended"
id="action_view_purchase_order_group"/>
</data>

2
addons/purchase_analytic_plans/purchase_analytic_plans_view.xml
View File

@ -9,7 +9,7 @@
<field name="inherit_id" ref="purchase.purchase_order_line_form"/>
<field name="arch" type="xml">
<field name="account_analytic_id" position="replace">
<field name="analytics_id" domain="[('plan_id','&lt;&gt;',False)]" groups="base.group_extended"/>
<field name="analytics_id" domain="[('plan_id','&lt;&gt;',False)]"/>
</field>
</field>
</record>

6
addons/purchase_requisition/purchase_requisition_view.xml
View File

@ -10,7 +10,7 @@
<field name="inherit_id" ref="purchase.purchase_order_form"/>
<field name="arch" type="xml">
<field name="shipped" position="after">
<field name="requisition_id" groups="base.group_extended"/>
<field name="requisition_id"/>
</field>
</field>
</record>
@ -54,7 +54,7 @@
<field name="date_start"/>
<field name="date_end"/>
<field name="origin"/>
<field name="warehouse_id" groups="base.group_extended" widget="selection"/>
<field name="warehouse_id" widget="selection"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
</group>
<notebook colspan="4">
@ -146,7 +146,7 @@
<field name="exclusive" />
</group>
<newline/>
<group expand="0" string="Group By..." groups="base.group_extended">
<group expand="0" string="Group By...">
<filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
<separator orientation="vertical"/>
<filter string="Origin" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>