Merge lp:~inddiana/diana-addons/yenni_filtro_sede_suministros into lp:diana-addons

[[SISB] Yennifer Santiago Z]

[ADD] Agregado campo sede a diana_supply_lines
[ADD] Agregado filtro sede a diana_supply_lines

=== modified file 'supply_control/model/diana_supply.py'
--- supply_control/model/diana_supply.py	2013-08-23 14:02:35 +0000
+++ supply_control/model/diana_supply.py	2013-10-18 13:04:19 +0000
@@ -166,6 +166,9 @@
         'delivered': fields.boolean('Delivered'),
         'state': fields.selection([("Draft","Draft"),("Delivered","Delivered"),("Expired","Expired")], 'State'),
         'print_verify': fields.boolean('Print verification'),
+        'sede_id':fields.related('employee_id', 'hr_sede_id', type='many2one', 
+          relation='hr.sede', string='Sede', readonly=True, store=True, 
+          select=True),
     }
 
     _defaults = {
@@ -271,8 +274,3 @@
 
 
 diana_supply_printer()
-
-  
-    
-    
-    

=== modified file 'supply_control/view/diana_supply_view.xml'
--- supply_control/view/diana_supply_view.xml	2013-08-23 14:02:35 +0000
+++ supply_control/view/diana_supply_view.xml	2013-10-18 13:04:19 +0000
@@ -76,30 +76,12 @@
                         <filter icon="terp-document-new" string="Draft" domain="[('state','=','Draft')]" />
                         <filter  icon="terp-camera_test" string="Delivered" domain="[('state','=','Delivered')]" />
                         <filter icon="terp-dialog-close" string="Expired" domain="[('state','=','Expired')]" />
-<!--
-                        <filter  icon="terp-dialog-close" string="Sede" domain="[( 'employee_id.hr_sede_id', '=', '1' )]" />
--->
-                        <newline />
-                        <filter icon="terp-document-new" string="PLANTA VALENCIA" domain="[( 'employee_id.hr_sede_id.id' , '=', '1' )]" />
-                        <filter icon="terp-document-new" string="TUREN" domain="[( 'employee_id.hr_sede_id.id' , '=', '2' )]" />
-                        <filter  icon="terp-document-new" string="COMISION DE ENLACE" domain="[( 'employee_id.hr_sede_id.id' , '=', '4' )]" />
-<!--
-                        <newline />
--->
-                        <filter  icon="terp-document-new" string="ABASTOS VENEZUELA" domain="[( 'employee_id.hr_sede_id.id' , '=', '5' )]" />
-                        <filter  icon="terp-document-new" string="CENT. DE DIST. MARACAIBO" domain="[( 'employee_id.hr_sede_id.id' , '=', '6' )]" />
-                        <filter  icon="terp-document-new" string="CENT. DE DIST. BARQUISIMETO" domain="[( 'employee_id.hr_sede_id.id' , '=', '8' )]" />
-<!--
-                        <newline />
--->
-                        <filter  icon="terp-document-new" string="CENT. DIST. SAN CRISTOBAL" domain="[( 'employee_id.hr_sede_id.id' , '=', '11' )]" />
-                        <filter  icon="terp-document-new" string="CENT. DE DIST. CARACAS" domain="[( 'employee_id.hr_sede_id.id', '=', '12' )]" />
-                        <filter  icon="terp-document-new" string="CENT. DE DIST. VALENCIA" domain="[( 'employee_id.hr_sede_id.id', '=', '13' )]" />
                         <newline />
                         <field name="name"/>
                         <field name="employee_code"/>
                         <field name="employee_id"/>
                         <field name="period_id"/>
+                        <field name="sede_id"/>
                     </group>
                 </search>
             </field>
@@ -216,5 +198,3 @@
         
     </data>
 </openerp>
-
-