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

[IMP]Make changes into the purchases wizard 

bzr revid: rma@tinyerp.com-20120718132129-yfylbf3mut8dgpns
This commit is contained in:
Randhir Mayatra (OpenERP) 2012-07-18 18:51:29 +05:30
parent 537126dbad
commit a29a608533
2 changed files with 52 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
addons/purchase/res_config_view.xml
View File

@ -1,6 +1,5 @@
<openerp>
<data>
<record id="view_purchase_configuration" model="ir.ui.view">
<field name="name">purchase settings</field>
<field name="model">purchase.config.settings</field>
@ -13,20 +12,53 @@
<button string="Cancel" type="object" name="cancel" class="oe_link"/>
</header>
<group>
<group>
<separator string="Purchase Order" colspan="2"/>
<field name="group_purchase_pricelist"/>
<field name="group_uom"/>
<field name="group_purchase_delivery_address"/>
<field name="module_purchase_double_validation"/>
<field name="module_purchase_requisition"/>
<field name="module_warning"/>
<field name="module_purchase_analytic_plans"/>
</group>
<group>
<separator string="Invoicing" colspan="2"/>
<field name="default_invoice_method" class="oe_inline"/>
<field name="decimal_precision" class="oe_inline"/>
<separator string="Purchase Order" colspan="2"/>
<group colspan="2">
<label for="id" string="Purchase Order Setting"/>
<div>
<div>
<field name="group_purchase_pricelist" class="oe_inline"/>
Pricelist Per<label for="group_purchase_pricelist" string="Supplier"/>
</div>
<div>
<field name="group_uom" class="oe_inline"/>
Manage Different <label for="group_uom" string="Units of Measure"/>For Products
</div>
<div>
<field name="group_purchase_delivery_address" class="oe_inline"/>
Allow Different Addresses for <label for="group_purchase_delivery_address" string="Delivery and Invoice"/>
</div>
<div>
<field name="module_purchase_double_validation" class="oe_inline"/>
Two Levels of<label for="module_purchase_double_validation" string="Approval"/>
</div>
<div>
<field name="module_purchase_requisition" class="oe_inline"/>
Manage<label for="module_purchase_requisition" string="Purchase Requisitions"/>
</div>
<div>
<field name="module_warning" class="oe_inline"/>
Alert By<label for="module_warning" string="Products or Supplier"/>
</div>
<div>
<field name="module_purchase_analytic_plans" class="oe_inline"/>
Use<label for="module_purchase_analytic_plans" string="Multiple Analytic Accounts"/>On Purchases
</div>
</div>
</group>
<separator string="Invoicing" colspan="2"/>
<group colspan="2">
<label for="id" string="Invoicing Setting"/>
<div>
<div>
Default <label for="default_invoice_method" string="Invoicing Control"/>Method
<field name="default_invoice_method" class="oe_inline"/>
</div>
<div>
<label for="decimal_precision " string="Decimal"/>Precision
<field name="decimal_precision" class="oe_inline"/>
</div>
</div>
</group>
</group>
</form>

7
addons/purchase_double_validation/purchase_double_validation_installer.xml
View File

@ -7,8 +7,11 @@
<field name="type">form</field>
<field name="inherit_id" ref="purchase.view_purchase_configuration"/>
<field name="arch" type="xml">
<field name="module_purchase_double_validation" position="after">
<field name="limit_amount" attrs="{'required': [('module_purchase_double_validation','=',True)]}"/>
<field name="module_purchase_double_validation" position="before">
<div>
Limit to Require a <label for="limit_amount" string="Second Approval "/>
<field name="limit_amount" attrs="{'required': [('module_purchase_double_validation','=',True)]}" class="oe_inline"/>
</div>
</field>
</field>
</record>