Merge lp:~inddiana/diana-addons/supply_control_update-gudanthony7 into lp:diana-addons

[Anthony]

Se realiza un mejora de la vista en la seccion de tipo de asignaciones en supply_control y se crea un modulo llamado supply_control_update el cual incluye nuevas funciones de validacion

Unmerged revisions

61. By Anthony on 2018-12-05

Actualizacion del modulo supply_control y la creacion de un modulo que hereda del mismo e implementa nuevas funcionalidades.

=== modified file 'supply_control/i18n/es_VE.po' (properties changed: +x to -x)
--- supply_control/i18n/es_VE.po	2017-07-20 15:21:08 +0000
+++ supply_control/i18n/es_VE.po	2018-12-06 12:31:45 +0000
@@ -1,324 +1,720 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* sisb_supply_control
+#	* supply_control
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.4\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2012-09-27 13:55+0000\n"
-"PO-Revision-Date: 2012-09-27 09:45-0400\n"
-"Last-Translator: Angel Guadarrama <[e-mail]>\n"
+"POT-Creation-Date: 2018-12-05 14:25+0000\n"
+"PO-Revision-Date: 2018-12-05 14:25+0000\n"
+"Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+"Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
-#. module: sisb_supply_control
-#: code:addons/sisb_supply_control/model/diana_supply.py:206
-#, python-format
-msgid "Connectivity problem. Check parameters!"
-msgstr "Problemas de conectividad. Chequee los parámetros!"
-
-#. module: sisb_supply_control
+#. module: supply_control
+#: report:sede.suministro:0
+msgid "FIRMA"
+msgstr "FIRMA"
+
+#. module: supply_control
+#: field:diana.supply.asign.type,days_old:0
+msgid "Dias de Antiguedad"
+msgstr "Dias de Antiguedad"
+
+#. module: supply_control
+#: model:ir.ui.menu,name:supply_control.menu_supply_printer
+msgid "Configuración de Impresoras"
+msgstr "Configuración de Impresoras"
+
+#. module: supply_control
+#: view:diana.supply.printers.wizard:0
+msgid "¿Ticket was printed correctly?"
+msgstr "¿El ticket se imprimió correctamente?"
+
+#. module: supply_control
+#: view:diana.supply.printer:0
+msgid "Puerto XMLRPC"
+msgstr "Puerto XMLRPC"
+
+#. module: supply_control
+#: field:diana.supply.asign,detail:0
+msgid "Incluye detalle"
+msgstr "Incluye detalle"
+
+#. module: supply_control
+#: report:sede.suministro:0
+msgid "/ Fecha de Impresion:"
+msgstr "/ Fecha de Impresion:"
+
+#. module: supply_control
+#: view:diana.supply.asign:0
+msgid "Crear Asignaciones"
+msgstr "Crear Asignaciones"
+
+#. module: supply_control
+#: field:diana.supply.asign.type,accumulate:0
+msgid "Es Acumulativo?"
+msgstr "Es Acumulativo?"
+
+#. module: supply_control
+#: report:report.sede.suministros:0
+msgid "Página:"
+msgstr "Página:"
+
+#. module: supply_control
+#: report:report.sede.suministros:0
+msgid "Fecha de Entrega"
+msgstr "Fecha de Entrega"
+
+#. module: supply_control
+#: report:report.sede.suministros:0
+msgid ","
+msgstr ","
+
+#. module: supply_control
+#: report:report.sede.suministros:0
+msgid "Impreso"
+msgstr "Impreso"
+
+#. module: supply_control
 #: view:diana.supply.lines:0
-#: field:diana.supply.lines,delivered:0
-#: selection:diana.supply.lines,state:0
-msgid "Delivered"
-msgstr "Entregado"
-
-#. module: sisb_supply_control
-#: code:addons/sisb_supply_control/model/diana_supply.py:79
-#: code:addons/sisb_supply_control/model/diana_supply.py:115
-#, python-format
-msgid "The period does not match with the current month!"
-msgstr "El período no concuerda con el mes corriente!"
-
-#. module: sisb_supply_control
-#: view:diana.supply.printers.wizard:0
-msgid "No"
-msgstr "No"
-
-#. module: sisb_supply_control
-#: field:diana.supply.printer,machine_pass:0
-msgid "User pass"
-msgstr "Contraseña de usuario"
-
-#. module: sisb_supply_control
-#: model:ir.model,name:sisb_supply_control.model_diana_supply_lines
-msgid "diana.supply.lines"
-msgstr "diana.supply.lines"
-
-#. module: sisb_supply_control
-#: code:addons/sisb_supply_control/model/diana_supply.py:188
-#, python-format
-msgid "The selected supply has expired. Select another."
-msgstr "El suministro seleccionado ha expirado. Seleccione otro."
-
-#. module: sisb_supply_control
+#: field:diana.supply.lines,sede_id:0
+#: field:wizard.supply,sede:0
+msgid "Sede"
+msgstr "Sede"
+
+#. module: supply_control
+#: model:ir.actions.act_window,name:supply_control.action_diana_supply_asign_tree
+#: model:ir.ui.menu,name:supply_control.menu_supply_asing
+msgid "Asignaciones"
+msgstr "Asignaciones"
+
+#. module: supply_control
+#: field:wizard.supply,mes:0
+msgid "Mes"
+msgstr "Mes"
+
+#. module: supply_control
+#: view:diana.supply.asign.type:0
+msgid "Configuration of users"
+msgstr "Configuración de usuarios"
+
+#. module: supply_control
+#: view:diana.supply.asign.type:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: supply_control
+#: field:diana.supply.lines,name:0
+msgid "Supply Reference"
+msgstr "Referencia de suministro"
+
+#. module: supply_control
+#: model:ir.ui.menu,name:supply_control.menu_diana_supply_control
+msgid "Control de Asignaciones"
+msgstr "Control de Asignaciones"
+
+#. module: supply_control
+#: report:report.sede.suministros:0
+msgid ", quedan"
+msgstr ", quedan"
+
+#. module: supply_control
+#: model:ir.actions.act_window,name:supply_control.action_diana_supply_printer
+msgid "Impresoras"
+msgstr "Impresoras"
+
+#. module: supply_control
+#: view:diana.supply.asign:0
+msgid "Lista de Empleados"
+msgstr "Lista de Empleados"
+
+#. module: supply_control
+#: report:report.sede.suministros:0
+msgid "Trabajador"
+msgstr "Trabajador"
+
+#. module: supply_control
+#: model:ir.actions.act_window,name:supply_control.action_diana_supply_asign_type_tree
+#: model:ir.actions.act_window,name:supply_control.action_diana_supply_type_tree
+msgid "Tipos de Asignación"
+msgstr "Tipos de Asignación"
+
+#. module: supply_control
+#: selection:diana.supply.asign.type,day_assig_defect:0
+msgid "Martes"
+msgstr "Martes"
+
+#. module: supply_control
+#: model:ir.model,name:supply_control.model_diana_supply_asign_detail
+msgid "Details of asignations"
+msgstr "Details of asignations"
+
+#. module: supply_control
+#: field:diana.supply.asign,aggregate:0
+msgid "Nota"
+msgstr "Nota"
+
+#. module: supply_control
+#: field:diana.supply.asign,print_default:0
+msgid "Seleccione Impresora"
+msgstr "Seleccione Impresora"
+
+#. module: supply_control
+#: selection:diana.supply.asign,state:0
+msgid "Cargado"
+msgstr "Cargado"
+
+#. module: supply_control
+#: model:ir.ui.menu,name:supply_control.menu_supply_lines
+msgid "Entregas"
+msgstr "Entregas"
+
+#. module: supply_control
+#: report:report.sede.suministros:0
+msgid "suministros en estado Borrador"
+msgstr "suministros en estado Borrador"
+
+#. module: supply_control
+#: field:diana.supply.asign,detail_ids:0
+msgid "Detalles"
+msgstr "Detalles"
+
+#. module: supply_control
 #: field:diana.supply.lines,state:0
 msgid "State"
 msgstr "Estado"
 
-#. module: sisb_supply_control
-#: view:diana.supply.lines:0
-#: selection:diana.supply.lines,state:0
-msgid "Draft"
-msgstr "Borrador"
-
-#. module: sisb_supply_control
-#: view:diana.supply.printers.wizard:0
-msgid "¿Ticket was printed correctly?"
-msgstr "¿El ticket se imprimió correctamente?"
-
-#. module: sisb_supply_control
+#. module: supply_control
+#: report:report.sede.suministros:0
+msgid "Fecha de Asignacion"
+msgstr "Fecha de Asignacion"
+
+#. module: supply_control
+#: field:diana.supply.asign.type,day_assig_defect:0
+msgid "Dia de asignación por defecto"
+msgstr "Dia de asignación por defecto"
+
+#. module: supply_control
 #: field:diana.supply.lines,employee_id:0
-#: model:ir.model,name:sisb_supply_control.model_hr_employee
 msgid "Employee"
 msgstr "Empleado"
 
-#. module: sisb_supply_control
-#: model:ir.actions.act_window,name:sisb_supply_control.action_diana_supply_line_tree
-msgid "Diana Supply Lines"
-msgstr "Lineas de suministros Diana"
-
-#. module: sisb_supply_control
-#: code:addons/sisb_supply_control/model/diana_supply.py:79
-#: code:addons/sisb_supply_control/model/diana_supply.py:82
-#: code:addons/sisb_supply_control/model/diana_supply.py:115
-#: code:addons/sisb_supply_control/model/diana_supply.py:117
-#: code:addons/sisb_supply_control/model/diana_supply.py:206
-#, python-format
-msgid "Alert !"
-msgstr "Alerta!"
-
-#. module: sisb_supply_control
-#: field:diana.supply.asign,name:0
-msgid "Asignation Reference"
-msgstr "Referencia de asignación"
-
-#. module: sisb_supply_control
-#: model:ir.actions.act_window,name:sisb_supply_control.action_diana_supply_printer
-#: model:ir.ui.menu,name:sisb_supply_control.menu_supply_printer
-msgid "Printer"
-msgstr "Impresora"
-
-#. module: sisb_supply_control
-#: field:diana.supply.printer,printer_status:0
-msgid "Printer Status"
-msgstr "Estatus de la impresora"
-
-#. module: sisb_supply_control
-#: field:diana.supply.printer,ip_address:0
-msgid "IP Address"
-msgstr "Dirección IP"
-
-#. module: sisb_supply_control
-#: view:diana.supply.lines:0
-msgid "Deliver"
-msgstr "Entregar"
-
-#. module: sisb_supply_control
-#: model:ir.actions.act_window,name:sisb_supply_control.action_printers_wizard_confirm
-msgid "Printing Confirmation"
-msgstr "Confirmación de impresión"
-
-#. module: sisb_supply_control
-#: view:diana.supply.lines:0
-msgid "Search Supply State"
-msgstr "Búsqueda por estado de suministros"
-
-#. module: sisb_supply_control
-#: model:ir.actions.report.xml,name:sisb_supply_control.supply_lines_report
-msgid "Report Latex Supply Lines Sisb"
-msgstr "Reporte latex de lineas de suministros SISB"
-
-#. module: sisb_supply_control
-#: view:diana.supply.asign:0
-msgid "Supply Asignation"
-msgstr "Asignación de suministro"
-
-#. module: sisb_supply_control
+#. module: supply_control
+#: selection:diana.supply.asign.type,day_assig_defect:0
+msgid "Lunes"
+msgstr "Lunes"
+
+#. module: supply_control
+#: field:diana.supply.printer,ssh_port:0
+msgid "SSH Port"
+msgstr "Puerto SSh"
+
+#. module: supply_control
+#: report:report.sede.suministros:0
+msgid "A la fecha"
+msgstr "A la fecha"
+
+#. module: supply_control
+#: model:ir.model,name:supply_control.model_wizard_print_report_sede
+msgid "Wizar para imprimir reportes de las lineas de suministros"
+msgstr "Wizar para imprimir reportes de las lineas de suministros"
+
+#. module: supply_control
+#: field:wizard.supply,type_assig:0
+msgid "Tipo de Asignacion"
+msgstr "Tipo de Asignacion"
+
+#. module: supply_control
+#: selection:diana.supply.asign.type,day_assig_defect:0
+msgid "Jueves"
+msgstr "Jueves"
+
+#. module: supply_control
+#: model:ir.ui.menu,name:supply_control.supply_configuration
+msgid "Configuración"
+msgstr "Configuración"
+
+#. module: supply_control
 #: field:diana.supply.printer,name:0
 msgid "Printer Name"
 msgstr "Nombre de impresora"
 
-#. module: sisb_supply_control
-#: view:diana.supply.lines:0
-#: selection:diana.supply.lines,state:0
-msgid "Expired"
-msgstr "Expirado"
-
-#. module: sisb_supply_control
-#: constraint:hr.employee:0
-msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr "Error ! You cannot create recursive Hierarchy of Employees."
-
-#. module: sisb_supply_control
+#. module: supply_control
 #: field:diana.supply.lines,expiration_date:0
 msgid "Expiration Date"
 msgstr "Fecha de expirado"
 
-#. module: sisb_supply_control
-#: code:addons/sisb_supply_control/model/diana_supply.py:231
-#, python-format
-msgid "The supply has been changed to draft correctly."
-msgstr "El suministro ha cambiado a borrador correctamente."
-
-#. module: sisb_supply_control
-#: model:ir.actions.act_window,name:sisb_supply_control.action_diana_supply_asign_tree
-#: model:ir.ui.menu,name:sisb_supply_control.menu_supply_asing
-msgid "Assignation"
-msgstr "Asignación"
-
-#. module: sisb_supply_control
-#: view:diana.supply.asign:0
-msgid "Employees for supply asignation"
-msgstr "Empleados para asignación de suministro"
-
-#. module: sisb_supply_control
-#: model:ir.model,name:sisb_supply_control.model_diana_supply_asign
-msgid "diana.supply.asign"
-msgstr "diana.supply.asign"
-
-#. module: sisb_supply_control
-#: field:diana.supply.asign,employee_ids:0
-msgid "Employees"
-msgstr "Empleados"
-
-#. module: sisb_supply_control
+#. module: supply_control
 #: view:diana.supply.lines:0
 msgid "Return to Draft"
 msgstr "Retornar a borrador"
 
-#. module: sisb_supply_control
-#: constraint:hr.employee:0
-msgid "Error ! You cannot select a department for which the employee is the manager."
-msgstr "Error ! You cannot select a department for which the employee is the manager."
-
-#. module: sisb_supply_control
-#: code:addons/sisb_supply_control/model/diana_supply.py:82
-#: code:addons/sisb_supply_control/model/diana_supply.py:117
-#, python-format
-msgid "Already assigned this period!"
-msgstr "Ya ha sido asignado este período"
-
-#. module: sisb_supply_control
-#: view:diana.supply.asign:0
-#: field:diana.supply.lines,asign_id:0
-msgid "Asignation"
+#. module: supply_control
+#: report:report.sede.suministros:0
+msgid "/ Fecha de Impresión:"
+msgstr "/ Fecha de Impresión:"
+
+#. module: supply_control
+#: view:diana.supply.lines:0
+msgid "Empleado"
+msgstr "Empleado"
+
+#. module: supply_control
+#: view:diana.supply.asign:0
+msgid "Cargar Todos"
+msgstr "Cargar Todos"
+
+#. module: supply_control
+#: view:diana.supply.asign:0
+#: field:diana.supply.asign.detail,asign_id:0
+#: view:diana.supply.lines:0
+msgid "Asignación"
 msgstr "Asignación"
 
-#. module: sisb_supply_control
-#: field:diana.supply.lines,name:0
-msgid "Supply Reference"
-msgstr "Referencia de suministro"
-
-#. module: sisb_supply_control
-#: field:diana.supply.printer,ssh_port:0
-msgid "SSH Port"
-msgstr "Puerto SSh"
-
-#. module: sisb_supply_control
-#: model:ir.model,name:sisb_supply_control.model_diana_supply_printer
-msgid "diana.supply.printer"
-msgstr "diana.supply.printer"
-
-#. module: sisb_supply_control
-#: code:addons/sisb_supply_control/model/diana_supply.py:141
-#, python-format
-msgid "Supplies period %s, assigned correctly."
-msgstr "Los suministros del período %s, asignados correctamente."
-
-#. module: sisb_supply_control
-#: field:diana.supply.printer,upload_dir:0
-msgid "Remote Directory"
-msgstr "Directorio remoto"
-
-#. module: sisb_supply_control
-#: view:diana.supply.printer:0
-msgid "Printer Configuration"
-msgstr "Configuración de impresoras"
-
-#. module: sisb_supply_control
-#: field:diana.supply.asign,asigned_date:0
-#: field:diana.supply.lines,asigned_date:0
-msgid "Asignation Date"
-msgstr "Fecha de asignación"
-
-#. module: sisb_supply_control
-#: field:diana.supply.lines,print_verify:0
-msgid "Print verification"
-msgstr "Verificación de impresión"
-
-#. module: sisb_supply_control
+#. module: supply_control
+#: report:sede.suministro:0
+msgid "Valencia,"
+msgstr "Valencia,"
+
+#. module: supply_control
+#: field:diana.supply.printer,machine_user:0
+msgid "User Machine"
+msgstr "Usuario de la maquina"
+
+#. module: supply_control
+#: report:report.sede.suministros:0
+msgid "RESUMEN GENERAL"
+msgstr "RESUMEN GENERAL"
+
+#. module: supply_control
+#: field:diana.supply.lines,despachador_id:0
+msgid "Entregado por:"
+msgstr "Entregado por:"
+
+#. module: supply_control
 #: field:diana.supply.lines,delivery_date:0
 msgid "Delivery Date"
 msgstr "Fecha de entrega"
 
-#. module: sisb_supply_control
-#: field:diana.supply.printer,file_name:0
-msgid "File Name"
-msgstr "Nombre del archivo"
+#. module: supply_control
+#: model:ir.model,name:supply_control.model_wizard_supply
+msgid "Wizar para imprimir reportes de suministros"
+msgstr "Wizar para imprimir reportes de suministros"
 
-#. module: sisb_supply_control
+#. module: supply_control
 #: field:diana.supply.asign,lines_ids:0
-#: view:diana.supply.lines:0
-#: field:hr.employee,diana_supply_asign_id:0
-#: field:hr.employee,diana_supply_lines_id:0
-#: model:ir.ui.menu,name:sisb_supply_control.menu_supply_lines
 msgid "Supply Lines"
 msgstr "Lineas de suministro"
 
-#. module: sisb_supply_control
-#: field:diana.supply.asign,period_id:0
-#: field:diana.supply.lines,period_id:0
-msgid "Period"
-msgstr "Período"
-
-#. module: sisb_supply_control
-#: model:ir.ui.menu,name:sisb_supply_control.menu_diana_supply_control
-msgid "Diana Supply Control"
-msgstr "Control de suministros Diana"
-
-#. module: sisb_supply_control
-#: view:diana.supply.printers.wizard:0
-msgid "Yes"
-msgstr "Si"
-
-#. module: sisb_supply_control
-#: view:diana.supply.asign:0
-msgid "_Cancel"
-msgstr "_Cancelar"
-
-#. module: sisb_supply_control
-#: view:diana.supply.asign:0
-msgid "Asign Supply"
-msgstr "Asignar suministro"
-
-#. module: sisb_supply_control
-#: model:ir.model,name:sisb_supply_control.model_diana_supply_printers_wizard
+#. module: supply_control
+#: view:diana.supply.lines:0
+msgid "Despachado Por"
+msgstr "Despachado Por"
+
+#. module: supply_control
+#: model:ir.model,name:supply_control.model_diana_supply_printers_wizard
 msgid "diana.supply.printers.wizard"
 msgstr "diana.supply.printers.wizard"
 
-#. module: sisb_supply_control
+#. module: supply_control
 #: field:diana.supply.printer,printer_port:0
 msgid "Printer Port"
 msgstr "Puerto de impresora"
 
-#. module: sisb_supply_control
+#. module: supply_control
 #: field:diana.supply.lines,employee_code:0
 msgid "Employee Code"
 msgstr "Código de empleado"
 
-#. module: sisb_supply_control
+#. module: supply_control
 #: field:diana.supply.printer,local_dir:0
 msgid "Local Directory"
 msgstr "Directorio local"
 
-#. module: sisb_supply_control
-#: field:diana.supply.printer,machine_user:0
-msgid "User Machine"
-msgstr "Usuario de la maquina"
+#. module: supply_control
+#: report:sede.suministro:0
+msgid "ENTREGA DE SUMINISTRO"
+msgstr "ENTREGA DE SUMINISTRO"
+
+#. module: supply_control
+#: view:diana.supply.asign:0
+msgid "Detalles de la Asignación"
+msgstr "Detalles de la Asignación"
+
+#. module: supply_control
+#: view:diana.supply.printers.wizard:0
+msgid "No"
+msgstr "No"
+
+#. module: supply_control
+#: view:diana.supply.asign:0
+msgid "¿Confirma que desea devolver el proceso?"
+msgstr "¿Confirma que desea devolver el proceso?"
+
+#. module: supply_control
+#: model:ir.model,name:supply_control.model_diana_supply_printer
+msgid "diana.supply.printer"
+msgstr "diana.supply.printer"
+
+#. module: supply_control
+#: report:report.sede.suministros:0
+msgid "Despachado por"
+msgstr "Despachado por"
+
+#. module: supply_control
+#: report:report.sede.suministros:0
+msgid "INFORME DE ASIGNACION DE"
+msgstr "INFORME DE ASIGNACION DE"
+
+#. module: supply_control
+#: view:diana.supply.lines:0
+#: selection:diana.supply.lines,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: supply_control
+#: report:report.sede.suministros:0
+msgid ", Estado:"
+msgstr ", Estado:"
+
+#. module: supply_control
+#: field:diana.supply.printer,printer_status:0
+msgid "Status"
+msgstr "Status"
+
+#. module: supply_control
+#: model:ir.actions.act_window,name:supply_control.action_w
+msgid "Informe de Asignaciones"
+msgstr "Informe de Asignaciones"
+
+#. module: supply_control
+#: field:diana.supply.asign,note:0
+msgid "Agregar Nota"
+msgstr "Agregar Nota"
+
+#. module: supply_control
+#: field:diana.supply.lines,asigned_type:0
+msgid "Tipo de asignación"
+msgstr "Tipo de asignación"
+
+#. module: supply_control
+#: report:report.sede.suministros:0
+#: report:sede.suministro:0
+msgid "SISB /"
+msgstr "SISB /"
+
+#. module: supply_control
+#: selection:diana.supply.asign.type,day_assig_defect:0
+msgid "Miercoles"
+msgstr "Miercoles"
+
+#. module: supply_control
+#: view:diana.supply.lines:0
+msgid "Search Supply State"
+msgstr "Búsqueda por estado de suministros"
+
+#. module: supply_control
+#: field:diana.supply.asign.type,active:0
+msgid "Activo"
+msgstr "Activo"
+
+#. module: supply_control
+#: model:ir.actions.act_window,name:supply_control.action_diana_supply_line_tree
+msgid "Lineas de Asignación"
+msgstr "Lineas de Asignación"
+
+#. module: supply_control
+#: field:diana.supply.asign.type,user_ids:0
+#: field:diana.supply.printer,employee_ids:0
+msgid "Usuarios"
+msgstr "Usuarios"
+
+#. module: supply_control
+#: view:diana.supply.lines:0
+#: report:report.sede.suministros:0
+#: field:wizard.supply,estado:0
+msgid "Estado"
+msgstr "Estado"
+
+#. module: supply_control
+#: report:report.sede.suministros:0
+msgid "TOTAL EXPIRADOS"
+msgstr "TOTAL EXPIRADOS"
+
+#. module: supply_control
+#: model:ir.model,name:supply_control.model_diana_supply_lines
+msgid "diana.supply.lines"
+msgstr "diana.supply.lines"
+
+#. module: supply_control
+#: field:diana.supply.asign.type,quantity:0
+msgid "Cantidad acumular"
+msgstr "Cantidad acumular"
+
+#. module: supply_control
+#: view:wizard.supply:0
+msgid "Generar Reporte"
+msgstr "Generar Reporte"
+
+#. module: supply_control
+#: model:ir.model,name:supply_control.model_diana_supply_asign
+msgid "diana.supply.asign"
+msgstr "diana.supply.asign"
+
+#. module: supply_control
+#: report:report.sede.suministros:0
+msgid "TOTAL BORRADOR"
+msgstr "TOTAL BORRADOR"
+
+#. module: supply_control
+#: model:ir.model,name:supply_control.model_diana_supply_asign_type
+msgid "diana.supply.asign.type"
+msgstr "diana.supply.asign.type"
+
+#. module: supply_control
+#: report:report.sede.suministros:0
+msgid "Mes:"
+msgstr "Mes:"
+
+#. module: supply_control
+#: field:diana.supply.asign,asigned_date:0
+#: field:diana.supply.lines,asigned_date:0
+msgid "Asignation Date"
+msgstr "Fecha de asignación"
+
+#. module: supply_control
+#: view:diana.supply.lines:0
+#: report:report.sede.suministros:0
+msgid "Periodo"
+msgstr "Periodo"
+
+#. module: supply_control
+#: view:diana.supply.printer:0
+msgid "Configuración de impresoras"
+msgstr "Configuración de impresoras"
+
+#. module: supply_control
+#: field:diana.supply.asign,period_id:0
+#: field:diana.supply.lines,period_id:0
+msgid "Period"
+msgstr "Período"
+
+#. module: supply_control
+#: field:diana.supply.printer,ip_address:0
+msgid "IP Address"
+msgstr "Dirección IP"
+
+#. module: supply_control
+#: report:sede.suministro:0
+msgid "NOMBRE y APELLIDO"
+msgstr "NOMBRE y APELLIDO"
+
+#. module: supply_control
+#: report:sede.suministro:0
+msgid "/ Pagina:"
+msgstr "/ Pagina:"
+
+#. module: supply_control
+#: view:diana.supply.lines:0
+#: field:diana.supply.lines,delivered:0
+#: selection:diana.supply.lines,state:0
+msgid "Delivered"
+msgstr "Entregado"
+
+#. module: supply_control
+#: selection:wizard.supply,estado:0
+msgid "Expirado"
+msgstr "Expirado"
+
+#. module: supply_control
+#: view:diana.supply.lines:0
+msgid "Agrupar por..."
+msgstr "Agrupar por..."
+
+#. module: supply_control
+#: selection:diana.supply.asign,state:0
+#: selection:wizard.supply,estado:0
+msgid "Borrador"
+msgstr "Borrador"
+
+#. module: supply_control
+#: report:sede.suministro:0
+msgid "FECHA"
+msgstr "FECHA"
+
+#. module: supply_control
+#: field:diana.supply.printer,machine_pass:0
+msgid "User pass"
+msgstr "Contraseña de usuario"
+
+#. module: supply_control
+#: field:diana.supply.asign,asigned_type:0
+#: field:diana.supply.asign,name:0
+#: field:diana.supply.asign.type,name:0
+msgid "Tipo de Asignación"
+msgstr "Tipo de Asignación"
+
+#. module: supply_control
+#: model:ir.actions.report.xml,name:supply_control.supply_report
+msgid "Reporte de Suministro"
+msgstr "Reporte de Suministro"
+
+#. module: supply_control
+#: report:sede.suministro:0
+msgid "Pag."
+msgstr "Pag."
+
+#. module: supply_control
+#: field:diana.supply.printer,upload_dir:0
+msgid "Remote Directory"
+msgstr "Directorio remoto"
+
+#. module: supply_control
+#: selection:diana.supply.asign.type,day_assig_defect:0
+msgid "Viernes"
+msgstr "Viernes"
+
+#. module: supply_control
+#: field:diana.supply.asign,state:0
+#: view:diana.supply.printer:0
+msgid "Estatus"
+msgstr "Estatus"
+
+#. module: supply_control
+#: view:diana.supply.asign:0
+msgid "Return to draft"
+msgstr "Return to draft"
+
+#. module: supply_control
+#: view:diana.supply.lines:0
+msgid "Deliver"
+msgstr "Entregar"
+
+#. module: supply_control
+#: model:ir.actions.report.xml,name:supply_control.supply_lines_sede_report
+msgid "Reporte de Suministro por sede"
+msgstr "Reporte de Suministro por sede"
+
+#. module: supply_control
+#: selection:wizard.supply,estado:0
+msgid "Entregado"
+msgstr "Entregado"
+
+#. module: supply_control
+#: model:ir.actions.act_window,name:supply_control.action_printers_wizard_confirm
+msgid "Printing Confirmation"
+msgstr "Confirmación de impresión"
+
+#. module: supply_control
+#: model:ir.actions.report.xml,name:supply_control.supply_lines_report
+msgid "Report Latex Supply Lines Sisb"
+msgstr "Reporte latex de lineas de suministros SISB"
+
+#. module: supply_control
+#: view:diana.supply.asign:0
+msgid "¿Confirmar proceso de la creación de asignaciones?"
+msgstr "¿Confirmar proceso de la creación de asignaciones?"
+
+#. module: supply_control
+#: report:report.sede.suministros:0
+msgid "TOTAL ENTREGADOS:"
+msgstr "TOTAL ENTREGADOS:"
+
+#. module: supply_control
+#: report:sede.suministro:0
+msgid "CODIGO"
+msgstr "CODIGO"
+
+#. module: supply_control
+#: view:diana.supply.lines:0
+#: selection:diana.supply.lines,state:0
+msgid "Expired"
+msgstr "Expirado"
+
+#. module: supply_control
+#: field:diana.supply.asign.type,create_month:0
+msgid "Crear en el mes corriente?"
+msgstr "Crear en el mes corriente?"
+
+#. module: supply_control
+#: field:diana.supply.asign,employee_ids:0
+msgid "Employees"
+msgstr "Empleados"
+
+#. module: supply_control
+#: field:diana.supply.lines,asign_id:0
+msgid "Asignation"
+msgstr "Asignación"
+
+#. module: supply_control
+#: report:report.sede.suministros:0
+msgid "Codigo"
+msgstr "Codigo"
+
+#. module: supply_control
+#: field:diana.supply.asign.detail,name:0
+msgid "Descripción"
+msgstr "Descripción"
+
+#. module: supply_control
+#: view:diana.supply.printers.wizard:0
+msgid "Yes"
+msgstr "Si"
+
+#. module: supply_control
+#: report:report.sede.suministros:0
+msgid "Sede:"
+msgstr "Sede:"
+
+#. module: supply_control
+#: field:diana.supply.asign.detail,qty:0
+#: report:report.sede.suministros:0
+msgid "Cantidad"
+msgstr "Cantidad"
+
+#. module: supply_control
+#: field:diana.supply.printer,file_name:0
+msgid "File Name"
+msgstr "Nombre del archivo"
+
+#. module: supply_control
+#: view:diana.supply.asign.type:0
+#: model:ir.ui.menu,name:supply_control.supply_configuration_type
+msgid "Tipos de Asignaciones"
+msgstr "Tipos de Asignaciones"
+
+#. module: supply_control
+#: selection:diana.supply.asign,state:0
+msgid "Asignado"
+msgstr "Asignado"
+
+#. module: supply_control
+#: field:diana.supply.asign.type,monthly:0
+msgid "Crear una vez al mes?"
+msgstr "Crear una vez al mes?"
+
+#. module: supply_control
+#: view:diana.supply.lines:0
+msgid "Asignaciónes"
+msgstr "Asignaciónes"
+
+#. module: supply_control
+#: report:report.sede.suministros:0
+msgid "Total"
+msgstr "Total"
+
+#. module: supply_control
+#: view:wizard.supply:0
+msgid "Imprimir Reporte"
+msgstr "Imprimir Reporte"
+
+#. module: supply_control
+#: field:diana.supply.lines,print_verify:0
+msgid "Print verification"
+msgstr "Verificación de impresión"
 

=== modified file 'supply_control/model/diana_supply_lines.py'
--- supply_control/model/diana_supply_lines.py	2018-10-05 16:29:45 +0000
+++ supply_control/model/diana_supply_lines.py	2018-12-06 12:31:45 +0000
@@ -165,9 +165,11 @@
 
             error_imprimir = frc.transferAndprint()
 
-            if not error_imprimir:
+            if not error_imprimir[0]:
                 raise osv.except_osv(
-                    ('Alert !'), ('Por favor verifique la conexion.'))
+                    ('Alert !'),
+                    ('Por favor verifique la conexion.\n {}'.format(
+                        error_imprimir[1])))
 
             dicc_values = {'delivery_date': today, 'state': 'Delivered',
                            'delivered': True, 'expiration_date': None,

=== modified file 'supply_control/model/remote_print.py'
--- supply_control/model/remote_print.py	2018-10-05 13:37:08 +0000
+++ supply_control/model/remote_print.py	2018-12-06 12:31:45 +0000
@@ -19,5 +19,5 @@
         try:
             res = cliente.imprimir(archivo)
         except Exception, e:
-            return e
-        return res
+            return False, e
+        return True, res

=== modified file 'supply_control/view/diana_supply_view.xml'
--- supply_control/view/diana_supply_view.xml	2018-10-05 16:29:45 +0000
+++ supply_control/view/diana_supply_view.xml	2018-12-06 12:31:45 +0000
@@ -37,12 +37,20 @@
                     <field name="day_assig_defect"/>
                     <field name="monthly"/>
                     <field name="create_month"/>
-                    <field name="user_ids" nolabel="True" colspan="4" >
-                        <tree>
-                            <field name="login"/>
-                            <field name="name"/>
-                        </tree>
-                    </field>
+                    <notebook colspan="6">
+                        <page string="Configuration of users" name="configuration_user">
+                            <field name="user_ids" nolabel="1">
+                                <tree>
+                                    <field name="login"/>
+                                    <field name="name"/>
+                                </tree>
+                            </field>
+                        </page>
+                        <page string="Notes" name="notes">
+                        
+                        </page>
+                    </notebook>
+
                 </form>
             </field>
         </record>

=== added directory 'supply_control_update'
=== added file 'supply_control_update/README.md'
=== added file 'supply_control_update/__init__.py'
--- supply_control_update/__init__.py	1970-01-01 00:00:00 +0000
+++ supply_control_update/__init__.py	2018-12-06 12:31:45 +0000
@@ -0,0 +1,2 @@
+
+from . import models

=== added file 'supply_control_update/__openerp__.py'
--- supply_control_update/__openerp__.py	1970-01-01 00:00:00 +0000
+++ supply_control_update/__openerp__.py	2018-12-06 12:31:45 +0000
@@ -0,0 +1,26 @@
+
+{
+    'name': 'Control de entrega de asignaciones - Update',
+    'version': '1.0.0',
+    'category': 'Human Resources',
+    'sequence': 40,
+    'complexity': 'normal',
+    'description': '''
+Este modulo permite el control para la entrega de asignaciones en Industrias
+Diana C.A. y realizar la impresion de los tickets correspondientes.
+''',
+    'author': 'Industrias Diana C.A.',
+    'website': 'http://www.industriasdiana.gob.ve',
+    'depends': [
+        'supply_control'
+    ],
+    'update_xml': [
+        'security/supply_security.xml',
+        'security/ir.model.access.csv',
+        'views/hr_employee_views.xml',
+        'views/diana_supply_views.xml',
+    ],
+    'data': [],
+    'installable': True,
+    'active': False
+}

=== added directory 'supply_control_update/i18n'
=== added file 'supply_control_update/i18n/es_VE.po'
--- supply_control_update/i18n/es_VE.po	1970-01-01 00:00:00 +0000
+++ supply_control_update/i18n/es_VE.po	2018-12-06 12:31:45 +0000
@@ -0,0 +1,154 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* supply_control_update
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0.4\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2018-12-05 15:17+0000\n"
+"PO-Revision-Date: 2018-12-05 15:17+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: supply_control_update
+#: code:addons/supply_control_update/models/lock_assig.py:45
+#, python-format
+msgid "The user {} add the list of blocked assignments {}"
+msgstr "El usuario {} agrego {}"
+
+#. module: supply_control_update
+#: view:diana.supply.asign.type:0
+msgid "Empleados no permitidos"
+msgstr "Empleados no permitidos"
+
+#. module: supply_control_update
+#: field:hr.employee,lock_history_ids:0
+#: model:ir.model,name:supply_control_update.model_diana_supply_lock_history
+msgid "Lock history"
+msgstr "Lock history"
+
+#. module: supply_control_update
+#: sql_constraint:hr.employee:0
+msgid "El numero de cedula del trabajador debe ser unico"
+msgstr "El numero de cedula del trabajador debe ser unico"
+
+#. module: supply_control_update
+#: code:addons/supply_control_update/models/lock_assig.py:25
+#: sql_constraint:diana.supply.lock.assignment:0
+#, python-format
+msgid "You can not duplicate assignments in this section."
+msgstr "No puedes duplicar tipos de asignación en esta sección."
+
+#. module: supply_control_update
+#: field:diana.supply.lock.assignment,date:0
+msgid "Date lock"
+msgstr "Fecha"
+
+#. module: supply_control_update
+#: field:diana.supply.lock.assignment,employee_id:0
+#: field:diana.supply.lock.history,employee_id:0
+#: model:ir.model,name:supply_control_update.model_hr_employee
+msgid "Employee"
+msgstr "Employee"
+
+#. module: supply_control_update
+#: view:hr.employee:0
+msgid "Todas las asignaciones bloqueadas..."
+msgstr "Todas las asignaciones bloqueadas..."
+
+#. module: supply_control_update
+#: field:diana.supply.lock.assignment,asig_type:0
+#: field:diana.supply.lock.history,asig_type:0
+msgid "Type of assignment"
+msgstr "Tipo de asignación"
+
+#. module: supply_control_update
+#: field:diana.supply.lock.history,name:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: supply_control_update
+#: field:diana.supply.asign.type,lock_assig_ids:0
+#: view:hr.employee:0
+#: field:hr.employee,lock_assig_ids:0
+#: model:ir.model,name:supply_control_update.model_diana_supply_lock_assignment
+msgid "Lock assignments"
+msgstr "Asignaciones no permitidas"
+
+#. module: supply_control_update
+#: field:diana.supply.lock.history,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: supply_control_update
+#: field:diana.supply.lock.history,date:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: supply_control_update
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr "Error ! You cannot create recursive Hierarchy of Employees."
+
+#. module: supply_control_update
+#: model:ir.model,name:supply_control_update.model_diana_supply_lines
+msgid "diana.supply.lines"
+msgstr "diana.supply.lines"
+
+#. module: supply_control_update
+#: constraint:hr.employee:0
+msgid "Error ! You cannot select a department for which the employee is the manager."
+msgstr "Error ! You cannot select a department for which the employee is the manager."
+
+#. module: supply_control_update
+#: code:addons/supply_control_update/models/supply_control.py:44
+#, python-format
+msgid "Error!"
+msgstr "Error!"
+
+#. module: supply_control_update
+#: field:diana.supply.lock.assignment,name:0
+msgid "Supply Reference"
+msgstr "Supply Reference"
+
+#. module: supply_control_update
+#: sql_constraint:hr.employee:0
+msgid "El       codigo del trabajador debe ser unico"
+msgstr "El       codigo del trabajador debe ser unico"
+
+#. module: supply_control_update
+#: model:ir.model,name:supply_control_update.model_diana_supply_asign_type
+msgid "diana.supply.asign.type"
+msgstr "diana.supply.asign.type"
+
+#. module: supply_control_update
+#: view:hr.employee:0
+msgid "History"
+msgstr "Historial"
+
+#. module: supply_control_update
+#: code:addons/supply_control_update/models/lock_assig.py:68
+#, python-format
+msgid "The user {} remove the list of blocked assignments {}"
+msgstr "El usuario {} elimino {}"
+
+#. module: supply_control_update
+#: sql_constraint:hr.employee:0
+msgid "La cuenta bancaria seleccionada ya esta asignada a otro Trabajador"
+msgstr "La cuenta bancaria seleccionada ya esta asignada a otro Trabajador"
+
+#. module: supply_control_update
+#: field:hr.employee,lock_all:0
+msgid "Lock all"
+msgstr "Bloquear todas las asignaciones"
+
+#. module: supply_control_update
+#: view:hr.employee:0
+msgid "Message"
+msgstr "Mensaje"
+

=== added directory 'supply_control_update/models'
=== added file 'supply_control_update/models/__init__.py'
--- supply_control_update/models/__init__.py	1970-01-01 00:00:00 +0000
+++ supply_control_update/models/__init__.py	2018-12-06 12:31:45 +0000
@@ -0,0 +1,4 @@
+
+from . import lock_assig
+from . import hr_employee
+from . import supply_control

=== added file 'supply_control_update/models/hr_employee.py'
--- supply_control_update/models/hr_employee.py	1970-01-01 00:00:00 +0000
+++ supply_control_update/models/hr_employee.py	2018-12-06 12:31:45 +0000
@@ -0,0 +1,54 @@
+
+from datetime import datetime
+
+from osv import fields, osv
+from tools.translate import _
+
+
+class Employee(osv.osv):
+    """."""
+
+    _inherit = 'hr.employee'
+    _columns = {
+        'lock_assig_ids': fields.one2many(
+            'diana.supply.lock.assignment', 'employee_id',
+            'Lock assignments'),
+        'lock_history_ids': fields.one2many(
+            'diana.supply.lock.history', 'employee_id',
+            'Lock history'),
+        'lock_all': fields.boolean('Lock all')
+    }
+
+    def write(self, cr, uid, ids, vals, context=None):
+        """."""
+        if context is None:
+            context = {}
+
+        res = super(Employee, self).write(
+            cr, uid, ids, vals, context)
+
+        if res and 'lock_all' in vals:
+            history = self.pool.get('diana.supply.lock.history')
+            users = self.pool.get('res.users')
+            user = users.browse(cr, uid, uid)
+            lock_all = vals['lock_all']
+            if lock_all:
+                msg = _(
+                    'El usuario {} bloquea todas las asignaciones.'.format(
+                        user.login))
+            else:
+                msg = _(
+                    'El usuario {} desbloquea todas las asignaciones.'.format(
+                        user.login))
+            val = {
+                'name': msg,
+                'employee_id': ids[0],
+                'asig_type': False,
+                'user_id': uid,
+                'date': datetime.now()
+            }
+            history.create(cr, uid, val)
+        return res
+
+
+Employee()

=== added file 'supply_control_update/models/lock_assig.py'
--- supply_control_update/models/lock_assig.py	1970-01-01 00:00:00 +0000
+++ supply_control_update/models/lock_assig.py	2018-12-06 12:31:45 +0000
@@ -0,0 +1,103 @@
+
+import unicodedata
+
+from datetime import datetime
+
+from osv import fields, osv
+from tools.translate import _
+
+
+class LockAssignments(osv.osv):
+    """."""
+
+    _name = 'diana.supply.lock.assignment'
+    _description = 'Lock assignments'
+    _columns = {
+        'name': fields.char('Supply Reference', size=128),
+        'employee_id': fields.many2one('hr.employee', 'Employee'),
+        'asig_type': fields.many2one(
+            'diana.supply.asign.type', 'Type of assignment', required=True),
+        'date': fields.date('Date lock'),
+    }
+    _defaults = {}
+    _sql_constraints = [
+        ('unique_type_assig', 'unique(asig_type, employee_id)',
+            _('You can not duplicate assignments in this section.'))
+    ]
+
+    def elimina_tildes(self, s):
+        """."""
+        return ''.join(
+            (c for c in unicodedata.normalize('NFD', s)
+             if unicodedata.category(c) != 'Mn')
+        ).replace("'", "")
+
+    def create(self, cr, uid, vals, context=None):
+        """."""
+        if context is None:
+            context = {}
+        history = self.pool.get('diana.supply.lock.history')
+        users = self.pool.get('res.users')
+        type_assig = self.pool.get('diana.supply.asign.type')
+        user = users.browse(cr, uid, uid, context=context)
+        lock_asig = type_assig.browse(cr, uid, vals['asig_type'])
+        msg = _(
+            'The user {} add the list of blocked assignments {}').format(
+            user.login, self.elimina_tildes(lock_asig.name))
+        val = {
+            'name': msg,
+            'employee_id': vals['employee_id'],
+            'asig_type': vals['asig_type'],
+            'user_id': user.id,
+            'date': datetime.now()
+        }
+
+        res = super(LockAssignments, self).create(cr, uid, vals, context)
+        if res:
+            history.create(cr, uid, val, context=context)
+        return res
+
+    def unlink(self, cr, uid, ids, context=None):
+        """."""
+        if context is None:
+            context = {}
+        history = self.pool.get('diana.supply.lock.history')
+        users = self.pool.get('res.users')
+        user = users.browse(cr, uid, uid, context=context)
+        lock_asig = self.browse(cr, uid, ids)
+        msg = _(
+            'The user {} remove the list of blocked assignments {}').format(
+            user.login, self.elimina_tildes(lock_asig[0].asig_type.name))
+        vals = {
+            'name': msg,
+            'employee_id': lock_asig[0].employee_id.id,
+            'asig_type': lock_asig[0].asig_type.id,
+            'user_id': user.id,
+            'date': datetime.now()
+        }
+        res = super(LockAssignments, self).unlink(cr, uid, ids, context)
+        if res:
+            history.create(cr, uid, vals, context=context)
+        return res
+
+
+LockAssignments()
+
+
+class LockHistory(osv.osv):
+    """."""
+
+    _name = 'diana.supply.lock.history'
+    _description = 'Lock history'
+    _order = 'id desc'
+    _columns = {
+        'name': fields.char('Description', size=256),
+        'employee_id': fields.many2one('hr.employee', 'Employee'),
+        'asig_type': fields.many2one(
+            'diana.supply.asign.type', 'Type of assignment'),
+        'user_id': fields.many2one('res.users', 'User'),
+        'date': fields.datetime('Date')
+    }
+
+
+LockHistory()

=== added file 'supply_control_update/models/supply_control.py'
--- supply_control_update/models/supply_control.py	1970-01-01 00:00:00 +0000
+++ supply_control_update/models/supply_control.py	2018-12-06 12:31:45 +0000
@@ -0,0 +1,55 @@
+
+import unicodedata
+
+from osv import fields, osv
+from tools.translate import _
+
+
+class diana_supply_asign_type(osv.osv):
+    """."""
+
+    _inherit = 'diana.supply.asign.type'
+    _columns = {
+        'lock_assig_ids': fields.one2many(
+            'diana.supply.lock.assignment', 'asig_type',
+            'Lock assignments'),
+    }
+
+
+diana_supply_asign_type()
+
+
+class diana_supply_lines(osv.osv):
+    """."""
+
+    _inherit = 'diana.supply.lines'
+
+    def elimina_tildes(self, s):
+        """."""
+        return ''.join(
+            (c for c in unicodedata.normalize('NFD', s)
+             if unicodedata.category(c) != 'Mn')
+        ).replace("'", "")
+
+    def action_deliver(self, cr, uid, ids, context=None):
+        """."""
+        obj_brw = self.browse(cr, uid, ids)
+        for line in obj_brw:
+            employee = line.employee_id
+            asigned_type = line.asigned_type
+            if employee.lock_all or employee.no_remunerado or\
+                    asigned_type.id in [i.asig_type.id
+                                        for i in employee.lock_assig_ids]:
+                raise osv.except_osv(
+                    _('Error!'), _(
+                        'El trabajador {} con el cod. {} no tiene las '
+                        'condiciones para recibir {}'.format(
+                            self.elimina_tildes(employee.name),
+                            employee.cod_number,
+                            self.elimina_tildes(line.asigned_type.name).upper()
+                        )))
+        return super(
+            diana_supply_lines, self).action_deliver(cr, uid, ids, context)
+
+
+diana_supply_lines()

=== added directory 'supply_control_update/security'
=== added file 'supply_control_update/security/ir.model.access.csv'
--- supply_control_update/security/ir.model.access.csv	1970-01-01 00:00:00 +0000
+++ supply_control_update/security/ir.model.access.csv	2018-12-06 12:31:45 +0000
@@ -0,0 +1,10 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+
+access_control_update_manager,diana.supply.lock.assignment,model_diana_supply_lock_assignment,group_lock_assignment_supply_manager,1,1,1,1
+
+access_control_update_history_manager,diana.supply.lock.history,model_diana_supply_lock_history,group_lock_assignment_supply_manager,1,1,1,0
+
+
+access_control_update_user,diana.supply.lock.assignment,model_diana_supply_lock_assignment,group_lock_assignment_supply_user,1,0,0,0
+
+access_control_update_history_user,diana.supply.lock.history,model_diana_supply_lock_history,group_lock_assignment_supply_user,1,0,0,0
\ No newline at end of file

=== added file 'supply_control_update/security/supply_security.xml'
--- supply_control_update/security/supply_security.xml	1970-01-01 00:00:00 +0000
+++ supply_control_update/security/supply_security.xml	2018-12-06 12:31:45 +0000
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+	<data noupdate="1">
+    	<record id="group_lock_assignment_supply_manager" model="res.groups">
+        	<field name="name">Asignaciones no permitidas / Manager</field>
+    	</record>
+
+    	<record id="group_lock_assignment_supply_user" model="res.groups">
+        	<field name="name">Asignaciones no permitidas / user</field>
+    	</record>
+	</data>
+</openerp>

=== added directory 'supply_control_update/views'
=== added file 'supply_control_update/views/diana_supply_views.xml'
--- supply_control_update/views/diana_supply_views.xml	1970-01-01 00:00:00 +0000
+++ supply_control_update/views/diana_supply_views.xml	2018-12-06 12:31:45 +0000
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data>
+
+	<record model="ir.ui.view" id="diana_supply_asign_type_update">
+        <field name="name">diana.supply.asign.type.update</field>
+        <field name="model">diana.supply.asign.type</field>
+        <field name="type">form</field>
+        <field name="inherit_id" ref="supply_control.view_diana_supply_asign_type_form" />
+        <field name="arch" type="xml">
+            <xpath expr='/form/notebook/page[@name="configuration_user"]' position='after'>
+                <page string="Empleados no permitidos">
+                    <field name='lock_assig_ids' nolabel="1" readonly="1">
+                        <tree editable="bottom">
+                            <field name='employee_id'/>   
+                        </tree>
+                    </field>
+                </page>
+            </xpath>
+        </field>
+    </record>
+
+</data>
+</openerp>

=== added file 'supply_control_update/views/hr_employee_views.xml'
--- supply_control_update/views/hr_employee_views.xml	1970-01-01 00:00:00 +0000
+++ supply_control_update/views/hr_employee_views.xml	2018-12-06 12:31:45 +0000
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+	<record model="ir.ui.view" id="view_employee_form_lock_assig">
+        <field name="name">view.employee.form.lock.assig</field>
+        <field name="model">hr.employee</field>
+        <field name="type">form</field>
+        <field name="inherit_id" ref="sisb_nomina.view_employee_form_inherit_2"/>
+        <field name="arch" type="xml">
+            <xpath expr='/form/notebook/page[@string="Notes"]' position='before'>
+                
+                <page string="Lock assignments" groups="supply_control_update.group_lock_assignment_supply_manager">
+                    <group colspan="4" col="4">
+                        <field name='lock_all'/>
+                    </group>
+                    <label string="Todas las asignaciones bloqueadas..." attrs="{'invisible':[('lock_all','=', False)]}"/>
+                    <newline/>
+
+                    <notebook>
+                        <page string="Lock assignments" attrs="{'invisible':[('lock_all', '=', True)]}">
+                            <field name="lock_assig_ids" nolabel="1" attrs="{'readonly':[('lock_all','=', True)]}">
+                                
+                                <tree editable="bottom">
+                                    <field name='asig_type'/>   
+                                </tree>
+
+                            </field>
+                        </page>
+                        <page string="History">
+                            <field name="lock_history_ids" nolabel="1" readonly='1'>
+                                
+                                <tree editable="bottom">
+                                    <field name='date'/>
+                                    <field name='user_id'/>   
+                                    <field name='name' string="Message"/>   
+                                    <field name='asig_type'/>     
+                                </tree>
+                            
+                            </field>
+                        </page>
+                    </notebook>
+
+                </page>
+            </xpath>
+        </field>
+    </record>
+
+</data>
+</openerp>

=== added file 'supply_control_update/views/lock_assig_views.xml'
--- supply_control_update/views/lock_assig_views.xml	1970-01-01 00:00:00 +0000
+++ supply_control_update/views/lock_assig_views.xml	2018-12-06 12:31:45 +0000
@@ -0,0 +1,2 @@
+
+