[MERGE] improve views related to purchase
bzr revid: rco@openerp.com-20111129153900-rcvdtpk2c22hamf4
This commit is contained in:
commit
b8629279f3
|
@ -57,7 +57,7 @@
|
|||
<field name="sequence"/>
|
||||
<field colspan="4" name="name" select="1"/>
|
||||
<field name="product_id"/>
|
||||
<field name="product_tmpl_id" select="1"/>
|
||||
<field name="product_tmpl_id" select="1" groups="product.group_product_variant"/>
|
||||
<field name="categ_id" select="1"/>
|
||||
<field name="min_quantity"/>
|
||||
<field name="base"/>
|
||||
|
@ -74,7 +74,7 @@
|
|||
<separator colspan="4" string="Rules Test Match"/>
|
||||
<field colspan="4" name="name" select="1"/>
|
||||
<field name="product_id" on_change="product_id_change(product_id)" select="1"/>
|
||||
<field name="product_tmpl_id" select="1"/>
|
||||
<field name="product_tmpl_id" select="1" groups="product.group_product_variant"/>
|
||||
<field name="categ_id" select="1"/>
|
||||
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
|
||||
<newline/>
|
||||
|
|
|
@ -136,7 +136,6 @@
|
|||
<action name="%(purchase.action_po_per_month_tree)d" string="Purchase order per month"/>
|
||||
-->
|
||||
<action name="%(purchase_draft)d" string="Request for Quotations"/>
|
||||
<action name="%(purchase_waiting)d" string="Purchase Order Waiting Approval"/>
|
||||
</column>
|
||||
<column>
|
||||
<action name="%(action_purchase_order_monthly_categ_graph)d" string="Monthly Purchase by Category"/>
|
||||
|
|
|
@ -172,7 +172,7 @@
|
|||
</group>
|
||||
<notebook colspan="4">
|
||||
<page string="Purchase Order">
|
||||
<field name="partner_id" on_change="onchange_partner_id(partner_id)" context="{'search_default_supplier':1}" />
|
||||
<field name="partner_id" on_change="onchange_partner_id(partner_id)" context="{'search_default_supplier':1,'default_supplier':1,'default_customer':0}" />
|
||||
<field name="partner_address_id"/>
|
||||
<field domain="[('type','=','purchase')]" name="pricelist_id" groups="base.group_extended"/>
|
||||
<field name="origin" groups="base.group_extended"/>
|
||||
|
|
|
@ -37,9 +37,10 @@ that exceeds minimum amount set by configuration wizard.
|
|||
'website': 'http://www.openerp.com',
|
||||
'init_xml': [],
|
||||
'update_xml': [
|
||||
'purchase_double_validation_workflow.xml',
|
||||
'purchase_double_validation_installer.xml'
|
||||
],
|
||||
'purchase_double_validation_workflow.xml',
|
||||
'purchase_double_validation_installer.xml',
|
||||
'board_purchase_view.xml'
|
||||
],
|
||||
'test': ['test/purchase_double_validation_test.yml'],
|
||||
'demo_xml': [],
|
||||
'installable': True,
|
||||
|
|
|
@ -0,0 +1,27 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<openerp>
|
||||
<data>
|
||||
|
||||
<record id="purchase_waiting" model="ir.actions.act_window">
|
||||
<field name="name">Purchase Order Waiting Approval</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</field>
|
||||
<field name="domain">[('date_order','>',time.strftime('%Y-01-01 00:00:00')),('date_order','<',time.strftime('%Y-12-31 23:59:59')), ('state','in',('wait','confirmed'))]</field>
|
||||
</record>
|
||||
|
||||
<record id="board_purchase_form2" model="ir.ui.view">
|
||||
<field name="name">board.purchase.form</field>
|
||||
<field name="model">board.board</field>
|
||||
<field name="type">form</field>
|
||||
<field name="inherit_id" ref="purchase.board_purchase_form"/>
|
||||
<field name="arch" type="xml">
|
||||
<xpath expr="/form/board/column/action[@string='Request for Quotations']" position="after">
|
||||
<action name="%(purchase_waiting)d" string="Purchase Order Waiting Approval"/>
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
</data>
|
||||
</openerp>
|
Loading…
Reference in New Issue