Merge lp:~inddiana/diana-addons/modificacion_diana_supply_control into lp:diana-addons/6.0

[Mauricio Jose Sanchez Puerta]

creado grupo para añadir permiso de lectura en las sedes y acceso al wizard

[lp:~inddiana/diana-addons/modificacion_diana_supply_control]

22. By Mauricio Sanchez <email address hidden> on 2013-08-23

modificado nobre del rml

=== modified file 'supply_control/__openerp__.py'
--- supply_control/__openerp__.py	2012-11-08 18:00:55 +0000
+++ supply_control/__openerp__.py	2013-08-23 18:56:30 +0000
@@ -10,9 +10,14 @@
     control para la entrega de suministros en Industrias Diana C.A. y realizar la
     impresion de los tickets""",
     "update_xml" : [
+                'security/group_user_access_suplly.xml',
+                'security/ir.model.access.csv',
                 'view/diana_supply_view.xml',
                 'wizard/printers_selection_wizard.xml',
+                'wizard/wizard_print_report_sede.xml',
                 'report/sisb_supply_lines_report.xml',
+                'report/report_sede_suministro.xml',
+             
                     ],
     "active": False,
     "installable": True,

=== modified file 'supply_control/model/diana_supply.py'
--- supply_control/model/diana_supply.py	2013-06-07 16:17:48 +0000
+++ supply_control/model/diana_supply.py	2013-08-23 18:56:30 +0000
@@ -271,3 +271,8 @@
 
 
 diana_supply_printer()
+
+  
+    
+    
+    

=== added file 'supply_control/report/__init__.py'
--- supply_control/report/__init__.py	1970-01-01 00:00:00 +0000
+++ supply_control/report/__init__.py	2013-08-23 18:56:30 +0000
@@ -0,0 +1,1 @@
+import report_sede_suministro

=== added file 'supply_control/report/report_sede_suministro.py'
--- supply_control/report/report_sede_suministro.py	1970-01-01 00:00:00 +0000
+++ supply_control/report/report_sede_suministro.py	2013-08-23 18:56:30 +0000
@@ -0,0 +1,38 @@
+from report import report_sxw
+import datetime
+from datetime import datetime
+
+class report_diana_supply_lines(report_sxw.rml_parse):
+    _name =  'report.diana.supply.lines'
+    
+    def __init__(self, cr, uid, name, context):
+        super(report_diana_supply_lines, self).__init__(cr, uid, name, context)
+        self.localcontext.update({
+            'get_empresa':self.get_empresa,
+            'get_final_date':self.get_final_date,
+        })
+        
+    def get_empresa(self, partner_id):
+        obj_addr = self.pool.get('res.partner.address')
+        addr_id =obj_addr.search(self.cr, self.uid, [('type','=','invoice'),('partner_id','=',partner_id)])
+        res = {}
+        for row in obj_addr.browse(self.cr, self.uid, addr_id):
+            res = {
+            'street': row.street,
+            'phone': row.phone,
+            'fax': row.fax,
+            'email': row.email,
+            'city': row.city,
+            'name': row.name,
+            'country': row.country_id.name,
+            } 
+        return res
+    
+    def get_final_date(self):
+        return datetime.now().strftime('%d/%m/%Y %H:%M')        
+        
+report_sxw.report_sxw(
+    'report.sede.suministro',
+    'diana.supply.lines',
+    'supply_control/report/report_sede_suministro.rml',
+    parser=report_diana_supply_lines, header=False)

=== added file 'supply_control/report/report_sede_suministro.rml'
--- supply_control/report/report_sede_suministro.rml	1970-01-01 00:00:00 +0000
+++ supply_control/report/report_sede_suministro.rml	2013-08-23 18:56:30 +0000
@@ -0,0 +1,195 @@
+<?xml version="1.0"?>
+<!DOCTYPE document SYSTEM "rml.dtd" >
+<document filename="General Ledger_01.pdf">
+  <header x="10cm" y="10cm">
+    <template pageSize="(27cm,30cm)" title="ENTREGA DE SUMINISTRO" author="Industrias Diana, C.A. " allowSplitting="20">
+      <pageTemplate id="cabecera">
+        <!--
+             <frame id="reporte" x1="05.0mm" y1="10.0mm" width="253.0mm" height="180mm" />
+        -->
+        <!--
+             <frame id="reporte"  x1="6cm" y1="6.1cm" width="20cm" height="22.6cm" />
+        -->
+        <frame id="reporte" x1="0.5cm" y1="6.1cm" width="253.0mm" height="210mm" />
+        <pageGraphics>
+          <!--
+               <image  x="100" y="750" width="21.06mm" height="21.06mm">[[ company.logo or removeParentNode('image') ]]</image>
+          -->
+          <setFont name="Helvetica-Bold" size="10" />
+          <stroke color="black" />
+          <drawString x="100" y="780">[[ company.partner_id.name ]]</drawString>
+          <drawString x="100" y="765">[[ company.partner_id.vat[2:] or '']]</drawString>
+          <drawString x="630" y="780">Valencia, [[ get_final_date() ]]</drawString>
+          <drawCentredString x="700" y="800">
+            Pag.
+            <pageNumber style="estilo2" />
+          </drawCentredString>
+          <drawString x="10mm" y="5mm">
+            SISB / [[ user.login ]] / Fecha de Impresion:  [[formatLang(time.strftime('%Y-%m-%d'),date=True)]] [[time.strftime('%H:%m')]] / Pagina:
+            <pageNumber />
+          </drawString>
+        </pageGraphics>
+      </pageTemplate >
+    </template>
+  </header>
+  <stylesheet>
+    <paraStyle name="estilo1_a" fontName="Helvetica" alignment="JUSTIFY" fontSize="8.0" />
+    <paraStyle name="estilo1" fontName="Helvetica" alignment="JUSTIFY" />
+    <paraStyle name="estilo2" fontName="Helvetica-bold" alignment="CENTER" fontSize="10.0" />
+    <paraStyle name="estilo3" fontName="Helvetica" alignment="CENTER" fontSize="8.0" />
+    <paraStyle name="estilo3_a" fontName="Helvetica-bold" alignment="CENTER" fontSize="8.0" />
+    <paraStyle name="estilo4" fontName="Helvetica" alignment="CENTER" fontSize="6.0" leading="8.0" />
+    <paraStyle name="estilo5" fontName="Helvetica" alignment="CENTER" fontSize="6.0" leading="8.0" />
+    <paraStyle name="estilo6" fontName="Helvetica-bold" alignment="LEFT" fontSize="8.0" leading="8.0" />
+    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0" />
+    <paraStyle name="terp_default_Centre_7" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0" />
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT" />
+      <blockValign value="TOP" />
+    </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT" />
+      <blockValign value="TOP" />
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="0,0" stop="0,-1" />
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0" />
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1" />
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="1,0" stop="1,-1" />
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0" />
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1" />
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="2,0" stop="2,-1" />
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0" />
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1" />
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="3,0" stop="3,-1" />
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0" />
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1" />
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="4,0" stop="4,-1" />
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0" />
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1" />
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="5,0" stop="5,-1" />
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0" />
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1" />
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="6,0" stop="6,-1" />
+      <lineStyle kind="LINEAFTER" colorName="#000000" start="6,0" stop="6,-1" />
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="6,0" stop="6,0" />
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1" />
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="7,0" stop="7,0" />
+      <lineStyle kind="LINEAFTER" colorName="#000000" start="6,0" stop="7,-1" />
+    </blockTableStyle>
+    <blockTableStyle id="Table2">
+      <blockAlignment value="LEFT" />
+      <blockValign value="TOP" />
+      <lineStyle kind="GRID" colorName="#000000" />
+    </blockTableStyle>
+    <blockTableStyle id="Tabla11_b">
+      <blockAlignment value="LEFT" />
+      <blockValign value="TOP" />
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="11,0" />
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,1" stop="11,1" />
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="3,0" stop="3,-1" />
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="0,0" stop="0,-1" />
+    </blockTableStyle>
+    <blockTableStyle id="Tabla12">
+      <blockAlignment value="LEFT" />
+      <blockValign value="TOP" />
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0" />
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1" />
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="0,0" stop="0,-1" />
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="1,0" stop="1,-1" />
+      <lineStyle kind="LINEAFTER" colorName="#000000" start="1,0" stop="1,-1" />
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0" />
+      <lineStyle kind="LINEAFTER" colorName="#000000" start="2,0" stop="2,-1" />
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1" />
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0" />
+      <lineStyle kind="LINEAFTER" colorName="#000000" start="3,0" stop="3,-1" />
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0" />
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1" />
+      <lineStyle kind="LINEAFTER" colorName="#000000" start="4,0" stop="4,-1" />
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0" />
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1" />
+      <lineStyle kind="LINEAFTER" colorName="#000000" start="5,0" stop="5,-1" />
+      <setNextTemplate name="first" />
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0" />
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="5,-1" />
+    </blockTableStyle>
+    <!--
+         <condPageBreak/>    
+    -->
+  </stylesheet>
+  <story>
+    <pto>
+      <pto_header>
+<!--
+        <para>[[repeatIn(data['form']['salida'],'o')]]</para>
+-->
+        <blockTable colWidths="750">
+          <tr>
+            <td>
+              <para style="terp_header_Centre">ENTREGA DE SUMINISTRO</para>
+            </td>
+          </tr>
+        </blockTable>
+        <spacer length="0.5cm" />
+        <blockTable colWidths="90, 115, 130, 140" style="Table2">
+          <tr>
+            <td>
+              <para style="estilo3_a">FECHA</para>
+            </td>
+            <td>
+              <para style="estilo3_a">CODIGO</para>
+            </td>
+            <td>
+              <para style="estilo3_a">NOMBRE y APELLIDO</para>
+            </td>
+            <td>
+              <para style="estilo3_a">FIRMA</para>
+            </td>
+          </tr>
+        </blockTable>
+      </pto_header>
+
+      <blockTable colWidths="750">
+        <tr>
+          <td>
+            <para style="terp_header_Centre">ENTREGA DE SUMINISTRO</para>
+          </td>
+        </tr>
+      </blockTable>
+      <spacer length="0.5cm" />
+      <blockTable colWidths="90, 115, 130, 140" style="Table2">
+        <tr>
+          <td>
+            <para style="estilo3_a">FECHA</para>
+          </td>
+          <td>
+            <para style="estilo3_a">CODIGO</para>
+          </td>
+          <td>
+            <para style="estilo3_a">NOMBRE y APELLIDO</para>
+          </td>
+          <td>
+            <para style="estilo3_a">FIRMA</para>
+          </td>
+        </tr>
+
+      </blockTable>
+      <blockTable colWidths="90, 115, 130, 140" style="Table2">
+
+        <tr>
+      <para>[[repeatIn(data['form']['salida'],'o')]]</para>
+          <td>
+            <para style="estilo3_a">[[formatLang(o['fecha'],  date=True)]]</para>
+          </td>
+          <td>
+            <para style="estilo3_a">[[ o['cod'] ]]</para>
+          </td>
+          <td>
+            <para style="estilo3_a">[[ o['name'] ]]</para>
+          </td>
+          <td>
+            <para style="estilo3_a" />
+          </td>
+        </tr>
+      </blockTable>
+    </pto>
+  </story>
+</document>

=== added file 'supply_control/report/report_sede_suministro.xml'
--- supply_control/report/report_sede_suministro.xml	1970-01-01 00:00:00 +0000
+++ supply_control/report/report_sede_suministro.xml	2013-08-23 18:56:30 +0000
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <report auto="True" 
+            id="supply_lines_sede_report" 
+            model="wizard.print.report.sede" 
+            name="sede.suministro"  
+            string="Reporte de Suministro por sede" 
+            menu="True"
+            file="supply_control/report/report_sede_suministro.rml" 
+        />  
+
+    </data>
+</openerp>
+

=== added directory 'supply_control/security'
=== added file 'supply_control/security/group_user_access_suplly.xml'
--- supply_control/security/group_user_access_suplly.xml	1970-01-01 00:00:00 +0000
+++ supply_control/security/group_user_access_suplly.xml	2013-08-23 18:56:30 +0000
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+
+<!--
+        Grupos de suplly control
+-->
+
+        
+        <record id="group_supply_manager" model="res.groups">
+            <field name="name">supply / Manager</field>
+        </record>
+        
+        
+        <record id="group_hr_sede_view" model="res.groups">
+            <field name="name">hr_sede / asigd</field>
+        </record>
+        
+<!--
+        Menu de Anticipos
+-->
+       
+       
+
+    </data>
+</openerp>

=== added file 'supply_control/security/ir.model.access.csv'
--- supply_control/security/ir.model.access.csv	1970-01-01 00:00:00 +0000
+++ supply_control/security/ir.model.access.csv	2013-08-23 18:56:30 +0000
@@ -0,0 +1,2 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"acces_wizard_print_repor_sede_print","wizard.print.report.sede.form","sisb_nomina.model_hr_sede","group_hr_sede_view",1,0,0,0

=== modified file 'supply_control/view/diana_supply_view.xml'
--- supply_control/view/diana_supply_view.xml	2012-11-08 18:00:55 +0000
+++ supply_control/view/diana_supply_view.xml	2013-08-23 18:56:30 +0000
@@ -73,9 +73,28 @@
             <field name="arch" type="xml">
                 <search string="Search Supply State">
                     <group col='10' colspan='4'>
-                        <filter name='draft' icon="terp-document-new" string="Draft" domain="[('state','=','Draft')]" />
-                        <filter name='delivered' icon="terp-camera_test" string="Delivered" domain="[('state','=','Delivered')]" />
-                        <filter name='expired' icon="terp-dialog-close" string="Expired" domain="[('state','=','Expired')]" />
+                        <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"/>

=== modified file 'supply_control/wizard/__init__.py'
--- supply_control/wizard/__init__.py	2012-11-08 18:00:55 +0000
+++ supply_control/wizard/__init__.py	2013-08-23 18:56:30 +0000
@@ -19,3 +19,4 @@
 
 
 import printers_selection_wizard
+import wizard_print_report_sede

=== added file 'supply_control/wizard/wizard_print_report_sede.py'
--- supply_control/wizard/wizard_print_report_sede.py	1970-01-01 00:00:00 +0000
+++ supply_control/wizard/wizard_print_report_sede.py	2013-08-23 18:56:30 +0000
@@ -0,0 +1,44 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*--
+
+from time import strftime
+from datetime import datetime
+from datetime import date
+from datetime import timedelta
+import calendar
+from dateutil.relativedelta import *
+from osv import fields, osv
+import unicodedata
+
+class wizard_print_repor_sede(osv.osv_memory):
+    _name = 'wizard.print.report.sede'
+    _description = 'Wizar para imprimir reportes de las lineas de suministros'
+    
+    
+    def imprimir(self, cr, uid, ids, context=None):
+        act_id = context['active_ids']
+        diana_supply_lines_obj = self.pool.get('diana.supply.lines')
+        diana_supply_lines_brw = diana_supply_lines_obj.browse(cr, uid, act_id)
+        data = {'form':{'salida':[]}}
+        diana_supply_lines_id = [i.id for i in diana_supply_lines_brw if i.state == 'Draft']
+        now = date.today()
+        now_str = str(now) 
+        
+        if not diana_supply_lines_id:
+           raise osv.except_osv('ERROR', 'No hay suministros en estado borrador')
+        
+        diana_supply_lines_write = diana_supply_lines_obj.write(cr, uid, diana_supply_lines_id, {'delivery_date': now_str, 'state': 'Delivered', 'delivered': True, 'expiration_date': None, 'print_verify': True})
+        diana_supply_lines_brw = diana_supply_lines_obj.browse(cr, uid, diana_supply_lines_id)
+        
+        for i in diana_supply_lines_brw:
+            data['form']['salida'].append({'fecha':i.delivery_date, 'cod':i.employee_id.cod_number, 'name':i.employee_id.name})
+        
+        #~ print data    
+        
+        return {
+            'type': 'ir.actions.report.xml',
+            'report_name': 'sede.suministro',
+            'datas': data,
+            }     
+    
+wizard_print_repor_sede()    

=== added file 'supply_control/wizard/wizard_print_report_sede.xml'
--- supply_control/wizard/wizard_print_report_sede.xml	1970-01-01 00:00:00 +0000
+++ supply_control/wizard/wizard_print_report_sede.xml	2013-08-23 18:56:30 +0000
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+<!--
+Printer Selection
+-->
+
+
+        <record id="wizard_print_repor_sede_print" model="ir.ui.view">
+            <field name="name">wizard.print.report.sede.form</field>
+            <field name="model">wizard.print.report.sede</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Imprimir Reporte">
+                    <group colspan = "2" col = "5">
+                        <hpaned/> 
+                        <button icon = "gtk-cancel" special = "cancel" string = "Cancel"/>
+                        <hpaned/>  
+                        <button icon = "gtk-print" name = "imprimir" string = "Print" type = "object"/>
+                        <hpaned/> 
+                    </group>
+                </form>
+            </field>
+        </record>
+        
+        
+          <act_window name="Entregar por listado" 
+          res_model="wizard.print.report.sede" 
+          src_model="diana.supply.lines" 
+          key2="client_action_multi" 
+          multi="True" 
+          view_mode="form" 
+          view_type="form" 
+          target="new" 
+          id="action_wizard_print_repor_sede_print"
+          groups="supply_control.group_supply_manager"/>
+        
+
+    </data>
+</openerp>
+