Skip to content
Snippets Groups Projects
Commit b82092aa authored by Fabien Pinckaers's avatar Fabien Pinckaers
Browse files

[IMP] useability views 

bzr revid: fp@tinyerp.com-20100419061611-w20r969h0ldiqj4q
parent 7e3e4e54
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
addons/purchase/purchase_view.xml
+ 20
− 27
View file @ b82092aa
......@@ -81,7 +81,7 @@
<page string="Purchase Order">
<field name="partner_id" on_change="onchange_partner_id(partner_id)" select="1" domain="[('supplier','=', 1)]"/>
<field name="partner_address_id"/>
<field domain="[('type','=','purchase')]" name="pricelist_id"/>
<field domain="[('type','=','purchase')]" name="pricelist_id" groups="base.group_extended"/>
<field name="partner_ref"/>
<newline/>
<field colspan="4" name="order_line" nolabel="1" mode="tree,form">
......@@ -92,7 +92,7 @@
<field name="product_qty"/>
<field name="product_uom"/>
<field name="price_unit"/>
<field name="price_subtotal"/>
<field name="price_subtotal" groups="base.group_extended"/>
</tree>
<!-- default form view -->
</field>
......@@ -116,17 +116,17 @@
</group>
</page>
<page string="Delivery &amp; Invoices" groups="account.group_account_user">
<group colspan="2" col="2">
<group colspan="2" col="2" groups="base.group_extended">
<separator string="Delivery" colspan="2"/>
<field name="dest_address_id" on_change="onchange_dest_address_id(dest_address_id)"/>
<field name="minimum_planned_date"/>
<field name="location_id" widget="selection"/>
<field name="location_id"/>
</group>
<group colspan="2" col="2">
<separator string="Invoice Control" colspan="2"/>
<field name="invoice_method"/>
<field name="invoice_id" readonly="1"/>
<field name="fiscal_position" groups="base.group_extended" widget="selection"/>
<field name="invoice_id" readonly="1" groups="base.group_extended"/>
<field name="fiscal_position" widget="selection"/>
</group>
<newline/>
<separator string="Purchase Control" colspan="4"/>
......@@ -148,8 +148,10 @@
<field name="arch" type="xml">
<search string="Search Purchase Order">
<group col='10' colspan='4'>
<filter icon="terp-purchase" string="Quotations" domain="[('state','=','draft')]" separator="1"/>
<filter icon="terp-purchase" string="Unapproved" domain="[('state','in',('wait','confirmed'))]" separator="1"/>
<filter icon="terp-purchase" name="draft" string="Quotations" domain="[('state','=','draft')]" separator="1"/>
<filter icon="terp-purchase" name="confirmed" string="To Approve" domain="[('state','in',('wait','confirmed'))]" separator="1"/>
<filter icon="terp-purchase" name="approved" string="Approved" domain="[('state','in',('approved','done'))]" separator="1"/>
<filter icon="terp-purchase" name="exception" string="Exception" domain="[('state','in',('except_invoice','except_picking'))]" separator="1"/>
<separator orientation="vertical"/>
<filter icon="terp-purchase" string="To Invoice" domain="[('invoiced','=',1)]" separator="1"/>
<separator orientation="vertical"/>
......@@ -171,16 +173,16 @@
</record>
<record id="purchase_rfq" model="ir.actions.act_window">
<field name="name">Quotation Request</field>
<field name="name">Requests for Quotation</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">purchase.order</field>
<field name="view_type">form</field>
<field name="domain">[('state','=','draft')]</field>
<field name="view_mode">tree,form</field>
<field name="search_view_id" ref="view_purchase_order_filter"/>
<field name="context">{'search_default_draft': 1}</field>
<field name="view_mode">tree,form</field>
<field name="search_view_id" ref="view_purchase_order_filter"/>
</record>
<menuitem action="purchase_rfq" id="menu_purchase_rfq" parent="menu_procurement_management"
name="Request for Quotations" sequence="6"/>
sequence="6"/>
<record id="purchase_form_action" model="ir.actions.act_window">
<field name="name">Purchase Orders</field>
......@@ -188,19 +190,10 @@
<field name="res_model">purchase.order</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="search_view_id" ref="view_purchase_order_filter"/>
<field name="context">{'search_default_approved': 1}</field>
</record>
<menuitem action="purchase_form_action" id="menu_purchase_form_action" parent="menu_procurement_management"/>
<record id="purchase_form_action4" model="ir.actions.act_window">
<field name="name">Purchase Orders in Progress</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">purchase.order</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="domain">[('state','=','approved')]</field>
<field name="search_view_id" ref="view_purchase_order_filter"/>
</record>
<record id="purchase_order_tree" model="ir.ui.view">
<field name="name">purchase.order.tree</field>
<field name="model">purchase.order</field>
......@@ -208,15 +201,15 @@
<field name="arch" type="xml">
<tree string="Purchase Order">
<field name="name" string="Reference"/>
<field name="origin"/>
<field name="date_order" string="Order Date"/>
<field name="partner_id"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
<field name="location_id"/>
<field name="minimum_planned_date"/>
<field name="origin"/>
<field name="invoiced_rate" widget="progressbar"/>
<field name="shipped_rate" widget="progressbar"/>
<field name="amount_untaxed" sum="Total Untaxed amount"/>
<field name="amount_untaxed" sum="Total Untaxed amount"/>
<field name="amount_total" sum="Total amount"/>
<field name="state"/>
</tree>
......@@ -243,11 +236,11 @@
<page string="Notes">
<field colspan="4" name="notes" nolabel="1"/>
</page>
<page string="History" groups="base.group_extended,stock.group_stock_user">
<page string="History" groups="base.group_extended">
<separator colspan="4" string="Stock Moves"/>
<field colspan="4" name="move_ids" nolabel="1" widget="many2many"/>
</page>
<page string="Invoicing" groups="account.group_account_user">
<page string="Invoicing" groups="base.group_extended">
<field name="account_analytic_id" colspan="4"/>
<separator colspan="4" string="Taxes"/>
<field colspan="4" nolabel="1" name="taxes_id" domain="[('parent_id','=',False),('type_tax_use','!=','sale')]"/>
......
addons/purchase/report/purchase_report.py
+ 1
− 1
View file @ b82092aa
......@@ -46,7 +46,7 @@ class report_purchase_order(osv.osv):
'product_id':fields.many2one('product.product', 'Product', readonly=True),
'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse', readonly=True),
'category_id': fields.many2one('product.category', 'Categories', readonly=True),
'partner_id':fields.many2one('res.partner', 'Partner', readonly=True),
'partner_id':fields.many2one('res.partner', 'Supplier', readonly=True),
'company_id':fields.many2one('res.company', 'Company', readonly=True),
'user_id':fields.many2one('res.users', 'Responsible', readonly=True),
'quantity': fields.float('# of Products', readonly=True),
......
addons/purchase/report/purchase_report_view.xml
+ 3
− 3
View file @ b82092aa
......@@ -76,9 +76,9 @@
<filter string="Warehouse" icon="terp-purchase" context="{'group_by':'warehouse_id'}"/>
<filter string="Responsible" name="by_user" icon="terp-purchase" context="{'group_by':'user_id'}"/>
<separator orientation="vertical"/>
<filter string="Product" icon="terp-purchase" context="{'group_by':'product_id'}"/>
<filter string="Product" name="by_product" icon="terp-purchase" context="{'group_by':'product_id'}"/>
<filter string="Product Category" icon="terp-purchase" context="{'group_by':'category_id'}"/>
<filter string="Partner" icon="terp-purchase" context="{'group_by':'partner_id'}"/>
<filter string="Supplier" name="by_partner" icon="terp-purchase" context="{'group_by':'partner_id'}"/>
<filter string="State" icon="terp-purchase" context="{'group_by':'state'}"/>
<separator orientation="vertical"/>
<filter string="Month" icon="terp-purchase" context="{'group_by':'date'}"/>
......@@ -93,7 +93,7 @@
<field name="res_model">report.purchase.order</field>
<field name="view_type">form</field>
<field name="view_mode">tree,graph</field>
<field name="context">{"search_default_this_year":1,"search_default_this_month":1,"search_default_purchase":1,"search_default_by_user":1}</field>
<field name="context">{"search_default_this_year":1,"search_default_this_month":1,"search_default_purchase":1,"search_default_by_product":1}</field>
<field name="search_view_id" ref="view_purchase_order_search"/>
</record>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment