From: mtr <mtr@mtr>
Date: Thu, 13 May 2010 09:16:42 +0000 (+0530)
Subject: [MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons1
X-Git-Tag: 6.0.0-rc1-addons~144^2~124^2~23
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=f5776b4ae073f94737e094ac265e540686041668;p=odoo%2Fodoo.git

[MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons1

bzr revid: mtr@mtr-20100513091642-cci0qw2f3ksfqcu1
---

f5776b4ae073f94737e094ac265e540686041668
diff --cc addons/purchase_requisition/purchase_requisition_view.xml
index e5ed52f,1df006e..96488f4
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@@ -70,16 -78,7 +78,6 @@@
                      	<field name="purchase_ids" nolabel="1" colspan="4"/>
                     </page>
                  </notebook>
- 				<separator colspan="4"/>
- 	                <group col="8" colspan="4">
- 	                    <field name="state" readonly ="1"/>
- 						<button name="tender_in_progress" states="draft" string="Confirm" type="object" icon="gtk-apply" />
- 	                    <button name="tender_reset" states="done,cancel" string="Reset to Draft" type="object" icon="gtk-convert" />
- 						<button name="tender_done" states="in_progress" string="Done" type="object" icon="gtk-jump-to" />
- 						<button name="tender_cancel" states="draft,in_progress" string="Cancel" type="object" icon="gtk-cancel" />
- 	                </group>
--
- 
              </form>
          </field>
      </record>
@@@ -106,15 -106,16 +105,16 @@@
              <field name="arch" type="xml">
                  <search string="Search Purchase Requisition">
                   <group col='10' colspan='4'>
-                     <filter icon="terp-purchase" string=" Current" domain="[('state','=','draft,in_progress')]" separator="1" help="Current Purchaes Requisition"/>
+                     <filter icon="terp-purchase" string="Current" domain="[('state','=','draft,in_progress')]" separator="1" help="Current Purchaes Requisition"/>
+ 					<filter icon="terp-purchase" string="Done" domain="[('state','=','done')]" separator="1" help="Current Purchaes Requisition"/>                    
                      <separator orientation="vertical"/>
 -                    <field name="name" select="1" string="Requisition Reference"/>
 -                    <field name="purchase_ids" select="1"/>
 -                    <field name="user_id" select="1" widget="selection">
 +                    <field name="name" string="Requisition Reference"/>
 +                    <field name="purchase_ids"/>
 +                    <field name="user_id" widget="selection">
                          <filter icon="terp-partner" domain="[('create_uid','=',uid)]" help="My Requisition "/>
                      </field>
 -                    <field name="exclusive" select="1" />
 -                    <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
 +                    <field name="exclusive"/>
 +                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                  </group>
                  <newline/>
                    <group expand="1" string="Group By..." colspan="4" col="10">