diff options
| author | Thibault Delavallée <tde@openerp.com> | 2012-06-04 10:01:34 +0200 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2012-06-04 10:01:34 +0200 |
| commit | 6a16fd4a786fc7b2e033e306d22bcbc235a4772d (patch) | |
| tree | d5df66ce9449d046464e1151d064d97f64c2e71e /addons/purchase_double_validation | |
| parent | fe0115f13abc8bb6d6fc8b1b8d01220e580e4997 (diff) | |
| parent | 37e59e65b393034b4cc3fe79521be9525b650960 (diff) | |
[MERGE] Merged with main addons.
bzr revid: tde@openerp.com-20120604080134-t1zg2sv0jpmhbyge
Diffstat (limited to 'addons/purchase_double_validation')
3 files changed, 19 insertions, 3 deletions
diff --git a/addons/purchase_double_validation/__openerp__.py b/addons/purchase_double_validation/__openerp__.py index ca79aa551fa..47124e689ef 100644 --- a/addons/purchase_double_validation/__openerp__.py +++ b/addons/purchase_double_validation/__openerp__.py @@ -23,7 +23,6 @@ "name" : "Double Validation on Purchases", "version" : "1.1", 'category': 'Purchase Management', - 'complexity': "easy", "images" : ["images/purchase_validation.jpeg"], "depends" : ["base","purchase"], "author" : 'OpenERP SA', @@ -39,6 +38,7 @@ that exceeds minimum amount set by configuration wizard. 'update_xml': [ 'purchase_double_validation_workflow.xml', 'purchase_double_validation_installer.xml', + 'purchase_double_validation_view.xml', 'board_purchase_view.xml' ], 'test': [ diff --git a/addons/purchase_double_validation/purchase_double_validation_installer.xml b/addons/purchase_double_validation/purchase_double_validation_installer.xml index 582312bfd6f..426dcae859a 100644 --- a/addons/purchase_double_validation/purchase_double_validation_installer.xml +++ b/addons/purchase_double_validation/purchase_double_validation_installer.xml @@ -7,8 +7,8 @@ <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="replace"> - <field name="limit_amount"/> + <field name="module_purchase_double_validation" position="after"> + <field name="limit_amount" attrs="{'required': [('module_purchase_double_validation','=',True)]}"/> </field> </field> </record> diff --git a/addons/purchase_double_validation/purchase_double_validation_view.xml b/addons/purchase_double_validation/purchase_double_validation_view.xml new file mode 100644 index 00000000000..e6b255e3245 --- /dev/null +++ b/addons/purchase_double_validation/purchase_double_validation_view.xml @@ -0,0 +1,16 @@ +<?xml version="1.0"?> +<openerp> + <data> + <record model="ir.ui.view" id="purchase_order_search_inherit"> + <field name="name">purchase.order.list.select.inherit</field> + <field name="type">form</field> + <field name="model">purchase.order</field> + <field name="inherit_id" ref="purchase.view_purchase_order_filter"/> + <field name="arch" type="xml"> + <xpath expr="//filter[@name='draft']" position="after"> + <filter icon="terp-gtk-jump-to-ltr" name="to_approve" string="To Approve" domain="[('state','in',('wait','confirmed'))]" help="Purchase orders which are not approved yet."/> + </xpath> + </field> + </record> + </data> +</openerp> |