[FIX] improvements in views

bzr revid: fp@tinyerp.com-20100621194842-c0ccgv8r36kh4grz
This commit is contained in:
Fabien Pinckaers
2010-06-21 21:48:42 +02:00
parent 805fb21c22
commit d39ab835a4
3 changed files with 27 additions and 19 deletions
+2 -2
View File
@@ -11,14 +11,14 @@
</record>
<record id="product_comp_rule" model="ir.rule">
<field name="name" >Product multi-company</field>
<field name="name" >Product multi-company</field>
<field name="model_id" ref="model_product_template"/>
<field name="global" eval="True"/>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
</record>
<record id="group_product_variant" model="res.groups" context="{'noadmin':True}">
<field name="name">Product / Variant</field>
<field name="name">Useability / Product Variant</field>
</record>
</data>
+25 -16
View File
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<!--<menuitem icon="terp-purchase" id="base.menu_purchase_root" name="Purchase Management"
groups="group_purchase_user"/>-->
<menuitem icon="terp-purchase" id="base.menu_purchase_root" name="Purchases"
groups="group_purchase_user" sequence="3"/>
<menuitem id="menu_procurement_management" name="Purchase Management"
@@ -35,27 +33,34 @@
parent="base.menu_purchase_root" sequence="3"/>
<menuitem id="base.menu_procurement_management_supplier_name" name="Suppliers"
parent="base.menu_procurement_management_supplier" action="base.action_partner_supplier_form" sequence="1"/>
<menuitem action="action_supplier_address_form" id="menu_purchases_partner_address_form"
<menuitem
action="action_supplier_address_form"
id="menu_purchases_partner_address_form"
groups="base.group_extended"
parent="base.menu_procurement_management_supplier" sequence="3"/>
<!--Inventory control-->
<menuitem id="menu_procurement_management_inventory" name="Inventory Control"
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"/>
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"/>
<!--Invoice control-->
<menuitem id="menu_procurement_management_invoice" name="Invoice Control"
parent="base.menu_purchase_root" sequence="6"/>
<menuitem name="Pending Invoices" id="menu_procurement_management_pending_invoice" action="account.action_invoice_tree_pending_invoice"
parent="menu_procurement_management_invoice" sequence="13"/>
<menuitem id="menu_procurement_management_invoice" name="Invoice Control"
parent="base.menu_purchase_root" sequence="6"/>
<menuitem name="Supplier Invoices to Receive"
id="menu_procurement_management_pending_invoice"
action="account.action_invoice_tree_pending_invoice"
parent="menu_procurement_management_invoice"
sequence="13"/>
<!--product menu-->
<menuitem id="menu_procurement_management_product" name="Product"
parent="base.menu_purchase_root" sequence="8"/>
<menuitem id="menu_procurement_management_product" name="Products"
parent="base.menu_purchase_root" sequence="8"/>
<menuitem name="Products" id="menu_procurement_partner_contact_form" action="product.product_normal_action_puchased"
parent="menu_procurement_management_product"/>
parent="menu_procurement_management_product"/>
<record model="ir.ui.view" id="purchase_order_calendar">
<field name="name">purchase.order.calendar</field>
@@ -136,8 +141,8 @@
<button name="invoice_ok" states="except_invoice" string="Manually Corrected" icon="gtk-convert"/>
</group>
</page>
<page string="Delivery &amp; Invoices" groups="account.group_account_user">
<group colspan="2" col="2" groups="base.group_extended">
<page string="Delivery &amp; Invoices" groups="base.group_extended">
<group colspan="2" col="2">
<separator string="Delivery" colspan="2"/>
<field name="dest_address_id" on_change="onchange_dest_address_id(dest_address_id)"/>
<field name="minimum_planned_date"/>
@@ -367,8 +372,12 @@
<field name="view_id" ref="purchase_order_line_form"/>
<field name="act_window_id" ref="purchase_line_form_action2"/>
</record>
<menuitem action="purchase_line_form_action2" id="menu_purchase_line_order_draft"
parent="menu_procurement_management_invoice" sequence="12"/>
<menuitem
action="purchase_line_form_action2"
id="menu_purchase_line_order_draft"
groups="base.group_extended"
parent="menu_procurement_management_invoice"
sequence="12"/>
<!--
Procurements
-1
View File
@@ -1637,7 +1637,6 @@
<button name="%(track_line)d" string="Split in production lots"
groups="base.group_extended"
type="action" icon="terp-stock_effects-object-colorize"/>
</group>
<separator colspan="4" string="Move State"/>
<field name="state"/>
<group col="5" colspan="2">