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

Proposed by Anthony
Status: Needs review
Proposed branch: lp:~inddiana/diana-addons/supply_control_update-gudanthony7
Merge into: lp:diana-addons
Diff against target: 1612 lines (+1176/-274)
16 files modified
supply_control/i18n/es_VE.po (+660/-264)
supply_control/model/diana_supply_lines.py (+4/-2)
supply_control/model/remote_print.py (+2/-2)
supply_control/view/diana_supply_view.xml (+14/-6)
supply_control_update/__init__.py (+2/-0)
supply_control_update/__openerp__.py (+26/-0)
supply_control_update/i18n/es_VE.po (+154/-0)
supply_control_update/models/__init__.py (+4/-0)
supply_control_update/models/hr_employee.py (+54/-0)
supply_control_update/models/lock_assig.py (+103/-0)
supply_control_update/models/supply_control.py (+55/-0)
supply_control_update/security/ir.model.access.csv (+10/-0)
supply_control_update/security/supply_security.xml (+12/-0)
supply_control_update/views/diana_supply_views.xml (+24/-0)
supply_control_update/views/hr_employee_views.xml (+50/-0)
supply_control_update/views/lock_assig_views.xml (+2/-0)
To merge this branch: bzr merge lp:~inddiana/diana-addons/supply_control_update-gudanthony7
Reviewer Review Type Date Requested Status
Anthony Pending
Review via email: mp+360185@code.launchpad.net

Commit message

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

To post a comment you must log in.

Unmerged revisions

61. By Anthony

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1# Translation of OpenERP Server.1# Translation of OpenERP Server.
2# This file contains the translation of the following modules:2# This file contains the translation of the following modules:
3# * sisb_supply_control3# * supply_control
4#4#
5msgid ""5msgid ""
6msgstr ""6msgstr ""
7"Project-Id-Version: OpenERP Server 6.0.4\n"7"Project-Id-Version: OpenERP Server 6.0.4\n"
8"Report-Msgid-Bugs-To: support@openerp.com\n"8"Report-Msgid-Bugs-To: support@openerp.com\n"
9"POT-Creation-Date: 2012-09-27 13:55+0000\n"9"POT-Creation-Date: 2018-12-05 14:25+0000\n"
10"PO-Revision-Date: 2012-09-27 09:45-0400\n"10"PO-Revision-Date: 2018-12-05 14:25+0000\n"
11"Last-Translator: Angel Guadarrama <guadarramaangel@gmail.com>\n"11"Last-Translator: <>\n"
12"Language-Team: \n"12"Language-Team: \n"
13"MIME-Version: 1.0\n"13"MIME-Version: 1.0\n"
14"Content-Type: text/plain; charset=UTF-8\n"14"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Transfer-Encoding: 8bit\n"15"Content-Transfer-Encoding: \n"
16"Plural-Forms: \n"16"Plural-Forms: \n"
1717
18#. module: sisb_supply_control18#. module: supply_control
19#: code:addons/sisb_supply_control/model/diana_supply.py:20619#: report:sede.suministro:0
20#, python-format20msgid "FIRMA"
21msgid "Connectivity problem. Check parameters!"21msgstr "FIRMA"
22msgstr "Problemas de conectividad. Chequee los parámetros!"22
2323#. module: supply_control
24#. module: sisb_supply_control24#: field:diana.supply.asign.type,days_old:0
25msgid "Dias de Antiguedad"
26msgstr "Dias de Antiguedad"
27
28#. module: supply_control
29#: model:ir.ui.menu,name:supply_control.menu_supply_printer
30msgid "Configuración de Impresoras"
31msgstr "Configuración de Impresoras"
32
33#. module: supply_control
34#: view:diana.supply.printers.wizard:0
35msgid "¿Ticket was printed correctly?"
36msgstr "¿El ticket se imprimió correctamente?"
37
38#. module: supply_control
39#: view:diana.supply.printer:0
40msgid "Puerto XMLRPC"
41msgstr "Puerto XMLRPC"
42
43#. module: supply_control
44#: field:diana.supply.asign,detail:0
45msgid "Incluye detalle"
46msgstr "Incluye detalle"
47
48#. module: supply_control
49#: report:sede.suministro:0
50msgid "/ Fecha de Impresion:"
51msgstr "/ Fecha de Impresion:"
52
53#. module: supply_control
54#: view:diana.supply.asign:0
55msgid "Crear Asignaciones"
56msgstr "Crear Asignaciones"
57
58#. module: supply_control
59#: field:diana.supply.asign.type,accumulate:0
60msgid "Es Acumulativo?"
61msgstr "Es Acumulativo?"
62
63#. module: supply_control
64#: report:report.sede.suministros:0
65msgid "Página:"
66msgstr "Página:"
67
68#. module: supply_control
69#: report:report.sede.suministros:0
70msgid "Fecha de Entrega"
71msgstr "Fecha de Entrega"
72
73#. module: supply_control
74#: report:report.sede.suministros:0
75msgid ","
76msgstr ","
77
78#. module: supply_control
79#: report:report.sede.suministros:0
80msgid "Impreso"
81msgstr "Impreso"
82
83#. module: supply_control
25#: view:diana.supply.lines:084#: view:diana.supply.lines:0
26#: field:diana.supply.lines,delivered:085#: field:diana.supply.lines,sede_id:0
27#: selection:diana.supply.lines,state:086#: field:wizard.supply,sede:0
28msgid "Delivered"87msgid "Sede"
29msgstr "Entregado"88msgstr "Sede"
3089
31#. module: sisb_supply_control90#. module: supply_control
32#: code:addons/sisb_supply_control/model/diana_supply.py:7991#: model:ir.actions.act_window,name:supply_control.action_diana_supply_asign_tree
33#: code:addons/sisb_supply_control/model/diana_supply.py:11592#: model:ir.ui.menu,name:supply_control.menu_supply_asing
34#, python-format93msgid "Asignaciones"
35msgid "The period does not match with the current month!"94msgstr "Asignaciones"
36msgstr "El período no concuerda con el mes corriente!"95
3796#. module: supply_control
38#. module: sisb_supply_control97#: field:wizard.supply,mes:0
39#: view:diana.supply.printers.wizard:098msgid "Mes"
40msgid "No"99msgstr "Mes"
41msgstr "No"100
42101#. module: supply_control
43#. module: sisb_supply_control102#: view:diana.supply.asign.type:0
44#: field:diana.supply.printer,machine_pass:0103msgid "Configuration of users"
45msgid "User pass"104msgstr "Configuración de usuarios"
46msgstr "Contraseña de usuario"105
47106#. module: supply_control
48#. module: sisb_supply_control107#: view:diana.supply.asign.type:0
49#: model:ir.model,name:sisb_supply_control.model_diana_supply_lines108msgid "Notes"
50msgid "diana.supply.lines"109msgstr "Notas"
51msgstr "diana.supply.lines"110
52111#. module: supply_control
53#. module: sisb_supply_control112#: field:diana.supply.lines,name:0
54#: code:addons/sisb_supply_control/model/diana_supply.py:188113msgid "Supply Reference"
55#, python-format114msgstr "Referencia de suministro"
56msgid "The selected supply has expired. Select another."115
57msgstr "El suministro seleccionado ha expirado. Seleccione otro."116#. module: supply_control
58117#: model:ir.ui.menu,name:supply_control.menu_diana_supply_control
59#. module: sisb_supply_control118msgid "Control de Asignaciones"
119msgstr "Control de Asignaciones"
120
121#. module: supply_control
122#: report:report.sede.suministros:0
123msgid ", quedan"
124msgstr ", quedan"
125
126#. module: supply_control
127#: model:ir.actions.act_window,name:supply_control.action_diana_supply_printer
128msgid "Impresoras"
129msgstr "Impresoras"
130
131#. module: supply_control
132#: view:diana.supply.asign:0
133msgid "Lista de Empleados"
134msgstr "Lista de Empleados"
135
136#. module: supply_control
137#: report:report.sede.suministros:0
138msgid "Trabajador"
139msgstr "Trabajador"
140
141#. module: supply_control
142#: model:ir.actions.act_window,name:supply_control.action_diana_supply_asign_type_tree
143#: model:ir.actions.act_window,name:supply_control.action_diana_supply_type_tree
144msgid "Tipos de Asignación"
145msgstr "Tipos de Asignación"
146
147#. module: supply_control
148#: selection:diana.supply.asign.type,day_assig_defect:0
149msgid "Martes"
150msgstr "Martes"
151
152#. module: supply_control
153#: model:ir.model,name:supply_control.model_diana_supply_asign_detail
154msgid "Details of asignations"
155msgstr "Details of asignations"
156
157#. module: supply_control
158#: field:diana.supply.asign,aggregate:0
159msgid "Nota"
160msgstr "Nota"
161
162#. module: supply_control
163#: field:diana.supply.asign,print_default:0
164msgid "Seleccione Impresora"
165msgstr "Seleccione Impresora"
166
167#. module: supply_control
168#: selection:diana.supply.asign,state:0
169msgid "Cargado"
170msgstr "Cargado"
171
172#. module: supply_control
173#: model:ir.ui.menu,name:supply_control.menu_supply_lines
174msgid "Entregas"
175msgstr "Entregas"
176
177#. module: supply_control
178#: report:report.sede.suministros:0
179msgid "suministros en estado Borrador"
180msgstr "suministros en estado Borrador"
181
182#. module: supply_control
183#: field:diana.supply.asign,detail_ids:0
184msgid "Detalles"
185msgstr "Detalles"
186
187#. module: supply_control
60#: field:diana.supply.lines,state:0188#: field:diana.supply.lines,state:0
61msgid "State"189msgid "State"
62msgstr "Estado"190msgstr "Estado"
63191
64#. module: sisb_supply_control192#. module: supply_control
65#: view:diana.supply.lines:0193#: report:report.sede.suministros:0
66#: selection:diana.supply.lines,state:0194msgid "Fecha de Asignacion"
67msgid "Draft"195msgstr "Fecha de Asignacion"
68msgstr "Borrador"196
69197#. module: supply_control
70#. module: sisb_supply_control198#: field:diana.supply.asign.type,day_assig_defect:0
71#: view:diana.supply.printers.wizard:0199msgid "Dia de asignación por defecto"
72msgid "¿Ticket was printed correctly?"200msgstr "Dia de asignación por defecto"
73msgstr "¿El ticket se imprimió correctamente?"201
74202#. module: supply_control
75#. module: sisb_supply_control
76#: field:diana.supply.lines,employee_id:0203#: field:diana.supply.lines,employee_id:0
77#: model:ir.model,name:sisb_supply_control.model_hr_employee
78msgid "Employee"204msgid "Employee"
79msgstr "Empleado"205msgstr "Empleado"
80206
81#. module: sisb_supply_control207#. module: supply_control
82#: model:ir.actions.act_window,name:sisb_supply_control.action_diana_supply_line_tree208#: selection:diana.supply.asign.type,day_assig_defect:0
83msgid "Diana Supply Lines"209msgid "Lunes"
84msgstr "Lineas de suministros Diana"210msgstr "Lunes"
85211
86#. module: sisb_supply_control212#. module: supply_control
87#: code:addons/sisb_supply_control/model/diana_supply.py:79213#: field:diana.supply.printer,ssh_port:0
88#: code:addons/sisb_supply_control/model/diana_supply.py:82214msgid "SSH Port"
89#: code:addons/sisb_supply_control/model/diana_supply.py:115215msgstr "Puerto SSh"
90#: code:addons/sisb_supply_control/model/diana_supply.py:117216
91#: code:addons/sisb_supply_control/model/diana_supply.py:206217#. module: supply_control
92#, python-format218#: report:report.sede.suministros:0
93msgid "Alert !"219msgid "A la fecha"
94msgstr "Alerta!"220msgstr "A la fecha"
95221
96#. module: sisb_supply_control222#. module: supply_control
97#: field:diana.supply.asign,name:0223#: model:ir.model,name:supply_control.model_wizard_print_report_sede
98msgid "Asignation Reference"224msgid "Wizar para imprimir reportes de las lineas de suministros"
99msgstr "Referencia de asignación"225msgstr "Wizar para imprimir reportes de las lineas de suministros"
100226
101#. module: sisb_supply_control227#. module: supply_control
102#: model:ir.actions.act_window,name:sisb_supply_control.action_diana_supply_printer228#: field:wizard.supply,type_assig:0
103#: model:ir.ui.menu,name:sisb_supply_control.menu_supply_printer229msgid "Tipo de Asignacion"
104msgid "Printer"230msgstr "Tipo de Asignacion"
105msgstr "Impresora"231
106232#. module: supply_control
107#. module: sisb_supply_control233#: selection:diana.supply.asign.type,day_assig_defect:0
108#: field:diana.supply.printer,printer_status:0234msgid "Jueves"
109msgid "Printer Status"235msgstr "Jueves"
110msgstr "Estatus de la impresora"236
111237#. module: supply_control
112#. module: sisb_supply_control238#: model:ir.ui.menu,name:supply_control.supply_configuration
113#: field:diana.supply.printer,ip_address:0239msgid "Configuración"
114msgid "IP Address"240msgstr "Configuración"
115msgstr "Dirección IP"241
116242#. module: supply_control
117#. module: sisb_supply_control
118#: view:diana.supply.lines:0
119msgid "Deliver"
120msgstr "Entregar"
121
122#. module: sisb_supply_control
123#: model:ir.actions.act_window,name:sisb_supply_control.action_printers_wizard_confirm
124msgid "Printing Confirmation"
125msgstr "Confirmación de impresión"
126
127#. module: sisb_supply_control
128#: view:diana.supply.lines:0
129msgid "Search Supply State"
130msgstr "Búsqueda por estado de suministros"
131
132#. module: sisb_supply_control
133#: model:ir.actions.report.xml,name:sisb_supply_control.supply_lines_report
134msgid "Report Latex Supply Lines Sisb"
135msgstr "Reporte latex de lineas de suministros SISB"
136
137#. module: sisb_supply_control
138#: view:diana.supply.asign:0
139msgid "Supply Asignation"
140msgstr "Asignación de suministro"
141
142#. module: sisb_supply_control
143#: field:diana.supply.printer,name:0243#: field:diana.supply.printer,name:0
144msgid "Printer Name"244msgid "Printer Name"
145msgstr "Nombre de impresora"245msgstr "Nombre de impresora"
146246
147#. module: sisb_supply_control247#. module: supply_control
148#: view:diana.supply.lines:0
149#: selection:diana.supply.lines,state:0
150msgid "Expired"
151msgstr "Expirado"
152
153#. module: sisb_supply_control
154#: constraint:hr.employee:0
155msgid "Error ! You cannot create recursive Hierarchy of Employees."
156msgstr "Error ! You cannot create recursive Hierarchy of Employees."
157
158#. module: sisb_supply_control
159#: field:diana.supply.lines,expiration_date:0248#: field:diana.supply.lines,expiration_date:0
160msgid "Expiration Date"249msgid "Expiration Date"
161msgstr "Fecha de expirado"250msgstr "Fecha de expirado"
162251
163#. module: sisb_supply_control252#. module: supply_control
164#: code:addons/sisb_supply_control/model/diana_supply.py:231
165#, python-format
166msgid "The supply has been changed to draft correctly."
167msgstr "El suministro ha cambiado a borrador correctamente."
168
169#. module: sisb_supply_control
170#: model:ir.actions.act_window,name:sisb_supply_control.action_diana_supply_asign_tree
171#: model:ir.ui.menu,name:sisb_supply_control.menu_supply_asing
172msgid "Assignation"
173msgstr "Asignación"
174
175#. module: sisb_supply_control
176#: view:diana.supply.asign:0
177msgid "Employees for supply asignation"
178msgstr "Empleados para asignación de suministro"
179
180#. module: sisb_supply_control
181#: model:ir.model,name:sisb_supply_control.model_diana_supply_asign
182msgid "diana.supply.asign"
183msgstr "diana.supply.asign"
184
185#. module: sisb_supply_control
186#: field:diana.supply.asign,employee_ids:0
187msgid "Employees"
188msgstr "Empleados"
189
190#. module: sisb_supply_control
191#: view:diana.supply.lines:0253#: view:diana.supply.lines:0
192msgid "Return to Draft"254msgid "Return to Draft"
193msgstr "Retornar a borrador"255msgstr "Retornar a borrador"
194256
195#. module: sisb_supply_control257#. module: supply_control
196#: constraint:hr.employee:0258#: report:report.sede.suministros:0
197msgid "Error ! You cannot select a department for which the employee is the manager."259msgid "/ Fecha de Impresión:"
198msgstr "Error ! You cannot select a department for which the employee is the manager."260msgstr "/ Fecha de Impresión:"
199261
200#. module: sisb_supply_control262#. module: supply_control
201#: code:addons/sisb_supply_control/model/diana_supply.py:82263#: view:diana.supply.lines:0
202#: code:addons/sisb_supply_control/model/diana_supply.py:117264msgid "Empleado"
203#, python-format265msgstr "Empleado"
204msgid "Already assigned this period!"266
205msgstr "Ya ha sido asignado este período"267#. module: supply_control
206268#: view:diana.supply.asign:0
207#. module: sisb_supply_control269msgid "Cargar Todos"
208#: view:diana.supply.asign:0270msgstr "Cargar Todos"
209#: field:diana.supply.lines,asign_id:0271
210msgid "Asignation"272#. module: supply_control
273#: view:diana.supply.asign:0
274#: field:diana.supply.asign.detail,asign_id:0
275#: view:diana.supply.lines:0
276msgid "Asignación"
211msgstr "Asignación"277msgstr "Asignación"
212278
213#. module: sisb_supply_control279#. module: supply_control
214#: field:diana.supply.lines,name:0280#: report:sede.suministro:0
215msgid "Supply Reference"281msgid "Valencia,"
216msgstr "Referencia de suministro"282msgstr "Valencia,"
217283
218#. module: sisb_supply_control284#. module: supply_control
219#: field:diana.supply.printer,ssh_port:0285#: field:diana.supply.printer,machine_user:0
220msgid "SSH Port"286msgid "User Machine"
221msgstr "Puerto SSh"287msgstr "Usuario de la maquina"
222288
223#. module: sisb_supply_control289#. module: supply_control
224#: model:ir.model,name:sisb_supply_control.model_diana_supply_printer290#: report:report.sede.suministros:0
225msgid "diana.supply.printer"291msgid "RESUMEN GENERAL"
226msgstr "diana.supply.printer"292msgstr "RESUMEN GENERAL"
227293
228#. module: sisb_supply_control294#. module: supply_control
229#: code:addons/sisb_supply_control/model/diana_supply.py:141295#: field:diana.supply.lines,despachador_id:0
230#, python-format296msgid "Entregado por:"
231msgid "Supplies period %s, assigned correctly."297msgstr "Entregado por:"
232msgstr "Los suministros del período %s, asignados correctamente."298
233299#. module: supply_control
234#. module: sisb_supply_control
235#: field:diana.supply.printer,upload_dir:0
236msgid "Remote Directory"
237msgstr "Directorio remoto"
238
239#. module: sisb_supply_control
240#: view:diana.supply.printer:0
241msgid "Printer Configuration"
242msgstr "Configuración de impresoras"
243
244#. module: sisb_supply_control
245#: field:diana.supply.asign,asigned_date:0
246#: field:diana.supply.lines,asigned_date:0
247msgid "Asignation Date"
248msgstr "Fecha de asignación"
249
250#. module: sisb_supply_control
251#: field:diana.supply.lines,print_verify:0
252msgid "Print verification"
253msgstr "Verificación de impresión"
254
255#. module: sisb_supply_control
256#: field:diana.supply.lines,delivery_date:0300#: field:diana.supply.lines,delivery_date:0
257msgid "Delivery Date"301msgid "Delivery Date"
258msgstr "Fecha de entrega"302msgstr "Fecha de entrega"
259303
260#. module: sisb_supply_control304#. module: supply_control
261#: field:diana.supply.printer,file_name:0305#: model:ir.model,name:supply_control.model_wizard_supply
262msgid "File Name"306msgid "Wizar para imprimir reportes de suministros"
263msgstr "Nombre del archivo"307msgstr "Wizar para imprimir reportes de suministros"
264308
265#. module: sisb_supply_control309#. module: supply_control
266#: field:diana.supply.asign,lines_ids:0310#: field:diana.supply.asign,lines_ids:0
267#: view:diana.supply.lines:0
268#: field:hr.employee,diana_supply_asign_id:0
269#: field:hr.employee,diana_supply_lines_id:0
270#: model:ir.ui.menu,name:sisb_supply_control.menu_supply_lines
271msgid "Supply Lines"311msgid "Supply Lines"
272msgstr "Lineas de suministro"312msgstr "Lineas de suministro"
273313
274#. module: sisb_supply_control314#. module: supply_control
275#: field:diana.supply.asign,period_id:0315#: view:diana.supply.lines:0
276#: field:diana.supply.lines,period_id:0316msgid "Despachado Por"
277msgid "Period"317msgstr "Despachado Por"
278msgstr "Período"318
279319#. module: supply_control
280#. module: sisb_supply_control320#: model:ir.model,name:supply_control.model_diana_supply_printers_wizard
281#: model:ir.ui.menu,name:sisb_supply_control.menu_diana_supply_control
282msgid "Diana Supply Control"
283msgstr "Control de suministros Diana"
284
285#. module: sisb_supply_control
286#: view:diana.supply.printers.wizard:0
287msgid "Yes"
288msgstr "Si"
289
290#. module: sisb_supply_control
291#: view:diana.supply.asign:0
292msgid "_Cancel"
293msgstr "_Cancelar"
294
295#. module: sisb_supply_control
296#: view:diana.supply.asign:0
297msgid "Asign Supply"
298msgstr "Asignar suministro"
299
300#. module: sisb_supply_control
301#: model:ir.model,name:sisb_supply_control.model_diana_supply_printers_wizard
302msgid "diana.supply.printers.wizard"321msgid "diana.supply.printers.wizard"
303msgstr "diana.supply.printers.wizard"322msgstr "diana.supply.printers.wizard"
304323
305#. module: sisb_supply_control324#. module: supply_control
306#: field:diana.supply.printer,printer_port:0325#: field:diana.supply.printer,printer_port:0
307msgid "Printer Port"326msgid "Printer Port"
308msgstr "Puerto de impresora"327msgstr "Puerto de impresora"
309328
310#. module: sisb_supply_control329#. module: supply_control
311#: field:diana.supply.lines,employee_code:0330#: field:diana.supply.lines,employee_code:0
312msgid "Employee Code"331msgid "Employee Code"
313msgstr "Código de empleado"332msgstr "Código de empleado"
314333
315#. module: sisb_supply_control334#. module: supply_control
316#: field:diana.supply.printer,local_dir:0335#: field:diana.supply.printer,local_dir:0
317msgid "Local Directory"336msgid "Local Directory"
318msgstr "Directorio local"337msgstr "Directorio local"
319338
320#. module: sisb_supply_control339#. module: supply_control
321#: field:diana.supply.printer,machine_user:0340#: report:sede.suministro:0
322msgid "User Machine"341msgid "ENTREGA DE SUMINISTRO"
323msgstr "Usuario de la maquina"342msgstr "ENTREGA DE SUMINISTRO"
343
344#. module: supply_control
345#: view:diana.supply.asign:0
346msgid "Detalles de la Asignación"
347msgstr "Detalles de la Asignación"
348
349#. module: supply_control
350#: view:diana.supply.printers.wizard:0
351msgid "No"
352msgstr "No"
353
354#. module: supply_control
355#: view:diana.supply.asign:0
356msgid "¿Confirma que desea devolver el proceso?"
357msgstr "¿Confirma que desea devolver el proceso?"
358
359#. module: supply_control
360#: model:ir.model,name:supply_control.model_diana_supply_printer
361msgid "diana.supply.printer"
362msgstr "diana.supply.printer"
363
364#. module: supply_control
365#: report:report.sede.suministros:0
366msgid "Despachado por"
367msgstr "Despachado por"
368
369#. module: supply_control
370#: report:report.sede.suministros:0
371msgid "INFORME DE ASIGNACION DE"
372msgstr "INFORME DE ASIGNACION DE"
373
374#. module: supply_control
375#: view:diana.supply.lines:0
376#: selection:diana.supply.lines,state:0
377msgid "Draft"
378msgstr "Borrador"
379
380#. module: supply_control
381#: report:report.sede.suministros:0
382msgid ", Estado:"
383msgstr ", Estado:"
384
385#. module: supply_control
386#: field:diana.supply.printer,printer_status:0
387msgid "Status"
388msgstr "Status"
389
390#. module: supply_control
391#: model:ir.actions.act_window,name:supply_control.action_w
392msgid "Informe de Asignaciones"
393msgstr "Informe de Asignaciones"
394
395#. module: supply_control
396#: field:diana.supply.asign,note:0
397msgid "Agregar Nota"
398msgstr "Agregar Nota"
399
400#. module: supply_control
401#: field:diana.supply.lines,asigned_type:0
402msgid "Tipo de asignación"
403msgstr "Tipo de asignación"
404
405#. module: supply_control
406#: report:report.sede.suministros:0
407#: report:sede.suministro:0
408msgid "SISB /"
409msgstr "SISB /"
410
411#. module: supply_control
412#: selection:diana.supply.asign.type,day_assig_defect:0
413msgid "Miercoles"
414msgstr "Miercoles"
415
416#. module: supply_control
417#: view:diana.supply.lines:0
418msgid "Search Supply State"
419msgstr "Búsqueda por estado de suministros"
420
421#. module: supply_control
422#: field:diana.supply.asign.type,active:0
423msgid "Activo"
424msgstr "Activo"
425
426#. module: supply_control
427#: model:ir.actions.act_window,name:supply_control.action_diana_supply_line_tree
428msgid "Lineas de Asignación"
429msgstr "Lineas de Asignación"
430
431#. module: supply_control
432#: field:diana.supply.asign.type,user_ids:0
433#: field:diana.supply.printer,employee_ids:0
434msgid "Usuarios"
435msgstr "Usuarios"
436
437#. module: supply_control
438#: view:diana.supply.lines:0
439#: report:report.sede.suministros:0
440#: field:wizard.supply,estado:0
441msgid "Estado"
442msgstr "Estado"
443
444#. module: supply_control
445#: report:report.sede.suministros:0
446msgid "TOTAL EXPIRADOS"
447msgstr "TOTAL EXPIRADOS"
448
449#. module: supply_control
450#: model:ir.model,name:supply_control.model_diana_supply_lines
451msgid "diana.supply.lines"
452msgstr "diana.supply.lines"
453
454#. module: supply_control
455#: field:diana.supply.asign.type,quantity:0
456msgid "Cantidad acumular"
457msgstr "Cantidad acumular"
458
459#. module: supply_control
460#: view:wizard.supply:0
461msgid "Generar Reporte"
462msgstr "Generar Reporte"
463
464#. module: supply_control
465#: model:ir.model,name:supply_control.model_diana_supply_asign
466msgid "diana.supply.asign"
467msgstr "diana.supply.asign"
468
469#. module: supply_control
470#: report:report.sede.suministros:0
471msgid "TOTAL BORRADOR"
472msgstr "TOTAL BORRADOR"
473
474#. module: supply_control
475#: model:ir.model,name:supply_control.model_diana_supply_asign_type
476msgid "diana.supply.asign.type"
477msgstr "diana.supply.asign.type"
478
479#. module: supply_control
480#: report:report.sede.suministros:0
481msgid "Mes:"
482msgstr "Mes:"
483
484#. module: supply_control
485#: field:diana.supply.asign,asigned_date:0
486#: field:diana.supply.lines,asigned_date:0
487msgid "Asignation Date"
488msgstr "Fecha de asignación"
489
490#. module: supply_control
491#: view:diana.supply.lines:0
492#: report:report.sede.suministros:0
493msgid "Periodo"
494msgstr "Periodo"
495
496#. module: supply_control
497#: view:diana.supply.printer:0
498msgid "Configuración de impresoras"
499msgstr "Configuración de impresoras"
500
501#. module: supply_control
502#: field:diana.supply.asign,period_id:0
503#: field:diana.supply.lines,period_id:0
504msgid "Period"
505msgstr "Período"
506
507#. module: supply_control
508#: field:diana.supply.printer,ip_address:0
509msgid "IP Address"
510msgstr "Dirección IP"
511
512#. module: supply_control
513#: report:sede.suministro:0
514msgid "NOMBRE y APELLIDO"
515msgstr "NOMBRE y APELLIDO"
516
517#. module: supply_control
518#: report:sede.suministro:0
519msgid "/ Pagina:"
520msgstr "/ Pagina:"
521
522#. module: supply_control
523#: view:diana.supply.lines:0
524#: field:diana.supply.lines,delivered:0
525#: selection:diana.supply.lines,state:0
526msgid "Delivered"
527msgstr "Entregado"
528
529#. module: supply_control
530#: selection:wizard.supply,estado:0
531msgid "Expirado"
532msgstr "Expirado"
533
534#. module: supply_control
535#: view:diana.supply.lines:0
536msgid "Agrupar por..."
537msgstr "Agrupar por..."
538
539#. module: supply_control
540#: selection:diana.supply.asign,state:0
541#: selection:wizard.supply,estado:0
542msgid "Borrador"
543msgstr "Borrador"
544
545#. module: supply_control
546#: report:sede.suministro:0
547msgid "FECHA"
548msgstr "FECHA"
549
550#. module: supply_control
551#: field:diana.supply.printer,machine_pass:0
552msgid "User pass"
553msgstr "Contraseña de usuario"
554
555#. module: supply_control
556#: field:diana.supply.asign,asigned_type:0
557#: field:diana.supply.asign,name:0
558#: field:diana.supply.asign.type,name:0
559msgid "Tipo de Asignación"
560msgstr "Tipo de Asignación"
561
562#. module: supply_control
563#: model:ir.actions.report.xml,name:supply_control.supply_report
564msgid "Reporte de Suministro"
565msgstr "Reporte de Suministro"
566
567#. module: supply_control
568#: report:sede.suministro:0
569msgid "Pag."
570msgstr "Pag."
571
572#. module: supply_control
573#: field:diana.supply.printer,upload_dir:0
574msgid "Remote Directory"
575msgstr "Directorio remoto"
576
577#. module: supply_control
578#: selection:diana.supply.asign.type,day_assig_defect:0
579msgid "Viernes"
580msgstr "Viernes"
581
582#. module: supply_control
583#: field:diana.supply.asign,state:0
584#: view:diana.supply.printer:0
585msgid "Estatus"
586msgstr "Estatus"
587
588#. module: supply_control
589#: view:diana.supply.asign:0
590msgid "Return to draft"
591msgstr "Return to draft"
592
593#. module: supply_control
594#: view:diana.supply.lines:0
595msgid "Deliver"
596msgstr "Entregar"
597
598#. module: supply_control
599#: model:ir.actions.report.xml,name:supply_control.supply_lines_sede_report
600msgid "Reporte de Suministro por sede"
601msgstr "Reporte de Suministro por sede"
602
603#. module: supply_control
604#: selection:wizard.supply,estado:0
605msgid "Entregado"
606msgstr "Entregado"
607
608#. module: supply_control
609#: model:ir.actions.act_window,name:supply_control.action_printers_wizard_confirm
610msgid "Printing Confirmation"
611msgstr "Confirmación de impresión"
612
613#. module: supply_control
614#: model:ir.actions.report.xml,name:supply_control.supply_lines_report
615msgid "Report Latex Supply Lines Sisb"
616msgstr "Reporte latex de lineas de suministros SISB"
617
618#. module: supply_control
619#: view:diana.supply.asign:0
620msgid "¿Confirmar proceso de la creación de asignaciones?"
621msgstr "¿Confirmar proceso de la creación de asignaciones?"
622
623#. module: supply_control
624#: report:report.sede.suministros:0
625msgid "TOTAL ENTREGADOS:"
626msgstr "TOTAL ENTREGADOS:"
627
628#. module: supply_control
629#: report:sede.suministro:0
630msgid "CODIGO"
631msgstr "CODIGO"
632
633#. module: supply_control
634#: view:diana.supply.lines:0
635#: selection:diana.supply.lines,state:0
636msgid "Expired"
637msgstr "Expirado"
638
639#. module: supply_control
640#: field:diana.supply.asign.type,create_month:0
641msgid "Crear en el mes corriente?"
642msgstr "Crear en el mes corriente?"
643
644#. module: supply_control
645#: field:diana.supply.asign,employee_ids:0
646msgid "Employees"
647msgstr "Empleados"
648
649#. module: supply_control
650#: field:diana.supply.lines,asign_id:0
651msgid "Asignation"
652msgstr "Asignación"
653
654#. module: supply_control
655#: report:report.sede.suministros:0
656msgid "Codigo"
657msgstr "Codigo"
658
659#. module: supply_control
660#: field:diana.supply.asign.detail,name:0
661msgid "Descripción"
662msgstr "Descripción"
663
664#. module: supply_control
665#: view:diana.supply.printers.wizard:0
666msgid "Yes"
667msgstr "Si"
668
669#. module: supply_control
670#: report:report.sede.suministros:0
671msgid "Sede:"
672msgstr "Sede:"
673
674#. module: supply_control
675#: field:diana.supply.asign.detail,qty:0
676#: report:report.sede.suministros:0
677msgid "Cantidad"
678msgstr "Cantidad"
679
680#. module: supply_control
681#: field:diana.supply.printer,file_name:0
682msgid "File Name"
683msgstr "Nombre del archivo"
684
685#. module: supply_control
686#: view:diana.supply.asign.type:0
687#: model:ir.ui.menu,name:supply_control.supply_configuration_type
688msgid "Tipos de Asignaciones"
689msgstr "Tipos de Asignaciones"
690
691#. module: supply_control
692#: selection:diana.supply.asign,state:0
693msgid "Asignado"
694msgstr "Asignado"
695
696#. module: supply_control
697#: field:diana.supply.asign.type,monthly:0
698msgid "Crear una vez al mes?"
699msgstr "Crear una vez al mes?"
700
701#. module: supply_control
702#: view:diana.supply.lines:0
703msgid "Asignaciónes"
704msgstr "Asignaciónes"
705
706#. module: supply_control
707#: report:report.sede.suministros:0
708msgid "Total"
709msgstr "Total"
710
711#. module: supply_control
712#: view:wizard.supply:0
713msgid "Imprimir Reporte"
714msgstr "Imprimir Reporte"
715
716#. module: supply_control
717#: field:diana.supply.lines,print_verify:0
718msgid "Print verification"
719msgstr "Verificación de impresión"
324720
325721
=== 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 @@
165165
166 error_imprimir = frc.transferAndprint()166 error_imprimir = frc.transferAndprint()
167167
168 if not error_imprimir:168 if not error_imprimir[0]:
169 raise osv.except_osv(169 raise osv.except_osv(
170 ('Alert !'), ('Por favor verifique la conexion.'))170 ('Alert !'),
171 ('Por favor verifique la conexion.\n {}'.format(
172 error_imprimir[1])))
171173
172 dicc_values = {'delivery_date': today, 'state': 'Delivered',174 dicc_values = {'delivery_date': today, 'state': 'Delivered',
173 'delivered': True, 'expiration_date': None,175 'delivered': True, 'expiration_date': None,
174176
=== 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 @@
19 try:19 try:
20 res = cliente.imprimir(archivo)20 res = cliente.imprimir(archivo)
21 except Exception, e:21 except Exception, e:
22 return e22 return False, e
23 return res23 return True, res
2424
=== 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 @@
37 <field name="day_assig_defect"/>37 <field name="day_assig_defect"/>
38 <field name="monthly"/>38 <field name="monthly"/>
39 <field name="create_month"/>39 <field name="create_month"/>
40 <field name="user_ids" nolabel="True" colspan="4" >40 <notebook colspan="6">
41 <tree>41 <page string="Configuration of users" name="configuration_user">
42 <field name="login"/>42 <field name="user_ids" nolabel="1">
43 <field name="name"/>43 <tree>
44 </tree>44 <field name="login"/>
45 </field>45 <field name="name"/>
46 </tree>
47 </field>
48 </page>
49 <page string="Notes" name="notes">
50
51 </page>
52 </notebook>
53
46 </form>54 </form>
47 </field>55 </field>
48 </record>56 </record>
4957
=== 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 @@
1
2from . import models
03
=== 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 @@
1
2{
3 'name': 'Control de entrega de asignaciones - Update',
4 'version': '1.0.0',
5 'category': 'Human Resources',
6 'sequence': 40,
7 'complexity': 'normal',
8 'description': '''
9Este modulo permite el control para la entrega de asignaciones en Industrias
10Diana C.A. y realizar la impresion de los tickets correspondientes.
11''',
12 'author': 'Industrias Diana C.A.',
13 'website': 'http://www.industriasdiana.gob.ve',
14 'depends': [
15 'supply_control'
16 ],
17 'update_xml': [
18 'security/supply_security.xml',
19 'security/ir.model.access.csv',
20 'views/hr_employee_views.xml',
21 'views/diana_supply_views.xml',
22 ],
23 'data': [],
24 'installable': True,
25 'active': False
26}
027
=== 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 @@
1# Translation of OpenERP Server.
2# This file contains the translation of the following modules:
3# * supply_control_update
4#
5msgid ""
6msgstr ""
7"Project-Id-Version: OpenERP Server 6.0.4\n"
8"Report-Msgid-Bugs-To: support@openerp.com\n"
9"POT-Creation-Date: 2018-12-05 15:17+0000\n"
10"PO-Revision-Date: 2018-12-05 15:17+0000\n"
11"Last-Translator: <>\n"
12"Language-Team: \n"
13"MIME-Version: 1.0\n"
14"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Transfer-Encoding: \n"
16"Plural-Forms: \n"
17
18#. module: supply_control_update
19#: code:addons/supply_control_update/models/lock_assig.py:45
20#, python-format
21msgid "The user {} add the list of blocked assignments {}"
22msgstr "El usuario {} agrego {}"
23
24#. module: supply_control_update
25#: view:diana.supply.asign.type:0
26msgid "Empleados no permitidos"
27msgstr "Empleados no permitidos"
28
29#. module: supply_control_update
30#: field:hr.employee,lock_history_ids:0
31#: model:ir.model,name:supply_control_update.model_diana_supply_lock_history
32msgid "Lock history"
33msgstr "Lock history"
34
35#. module: supply_control_update
36#: sql_constraint:hr.employee:0
37msgid "El numero de cedula del trabajador debe ser unico"
38msgstr "El numero de cedula del trabajador debe ser unico"
39
40#. module: supply_control_update
41#: code:addons/supply_control_update/models/lock_assig.py:25
42#: sql_constraint:diana.supply.lock.assignment:0
43#, python-format
44msgid "You can not duplicate assignments in this section."
45msgstr "No puedes duplicar tipos de asignación en esta sección."
46
47#. module: supply_control_update
48#: field:diana.supply.lock.assignment,date:0
49msgid "Date lock"
50msgstr "Fecha"
51
52#. module: supply_control_update
53#: field:diana.supply.lock.assignment,employee_id:0
54#: field:diana.supply.lock.history,employee_id:0
55#: model:ir.model,name:supply_control_update.model_hr_employee
56msgid "Employee"
57msgstr "Employee"
58
59#. module: supply_control_update
60#: view:hr.employee:0
61msgid "Todas las asignaciones bloqueadas..."
62msgstr "Todas las asignaciones bloqueadas..."
63
64#. module: supply_control_update
65#: field:diana.supply.lock.assignment,asig_type:0
66#: field:diana.supply.lock.history,asig_type:0
67msgid "Type of assignment"
68msgstr "Tipo de asignación"
69
70#. module: supply_control_update
71#: field:diana.supply.lock.history,name:0
72msgid "Description"
73msgstr "Descripción"
74
75#. module: supply_control_update
76#: field:diana.supply.asign.type,lock_assig_ids:0
77#: view:hr.employee:0
78#: field:hr.employee,lock_assig_ids:0
79#: model:ir.model,name:supply_control_update.model_diana_supply_lock_assignment
80msgid "Lock assignments"
81msgstr "Asignaciones no permitidas"
82
83#. module: supply_control_update
84#: field:diana.supply.lock.history,user_id:0
85msgid "User"
86msgstr "Usuario"
87
88#. module: supply_control_update
89#: field:diana.supply.lock.history,date:0
90msgid "Date"
91msgstr "Fecha"
92
93#. module: supply_control_update
94#: constraint:hr.employee:0
95msgid "Error ! You cannot create recursive Hierarchy of Employees."
96msgstr "Error ! You cannot create recursive Hierarchy of Employees."
97
98#. module: supply_control_update
99#: model:ir.model,name:supply_control_update.model_diana_supply_lines
100msgid "diana.supply.lines"
101msgstr "diana.supply.lines"
102
103#. module: supply_control_update
104#: constraint:hr.employee:0
105msgid "Error ! You cannot select a department for which the employee is the manager."
106msgstr "Error ! You cannot select a department for which the employee is the manager."
107
108#. module: supply_control_update
109#: code:addons/supply_control_update/models/supply_control.py:44
110#, python-format
111msgid "Error!"
112msgstr "Error!"
113
114#. module: supply_control_update
115#: field:diana.supply.lock.assignment,name:0
116msgid "Supply Reference"
117msgstr "Supply Reference"
118
119#. module: supply_control_update
120#: sql_constraint:hr.employee:0
121msgid "El codigo del trabajador debe ser unico"
122msgstr "El codigo del trabajador debe ser unico"
123
124#. module: supply_control_update
125#: model:ir.model,name:supply_control_update.model_diana_supply_asign_type
126msgid "diana.supply.asign.type"
127msgstr "diana.supply.asign.type"
128
129#. module: supply_control_update
130#: view:hr.employee:0
131msgid "History"
132msgstr "Historial"
133
134#. module: supply_control_update
135#: code:addons/supply_control_update/models/lock_assig.py:68
136#, python-format
137msgid "The user {} remove the list of blocked assignments {}"
138msgstr "El usuario {} elimino {}"
139
140#. module: supply_control_update
141#: sql_constraint:hr.employee:0
142msgid "La cuenta bancaria seleccionada ya esta asignada a otro Trabajador"
143msgstr "La cuenta bancaria seleccionada ya esta asignada a otro Trabajador"
144
145#. module: supply_control_update
146#: field:hr.employee,lock_all:0
147msgid "Lock all"
148msgstr "Bloquear todas las asignaciones"
149
150#. module: supply_control_update
151#: view:hr.employee:0
152msgid "Message"
153msgstr "Mensaje"
154
0155
=== 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 @@
1
2from . import lock_assig
3from . import hr_employee
4from . import supply_control
05
=== 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 @@
1
2from datetime import datetime
3
4from osv import fields, osv
5from tools.translate import _
6
7
8class Employee(osv.osv):
9 """."""
10
11 _inherit = 'hr.employee'
12 _columns = {
13 'lock_assig_ids': fields.one2many(
14 'diana.supply.lock.assignment', 'employee_id',
15 'Lock assignments'),
16 'lock_history_ids': fields.one2many(
17 'diana.supply.lock.history', 'employee_id',
18 'Lock history'),
19 'lock_all': fields.boolean('Lock all')
20 }
21
22 def write(self, cr, uid, ids, vals, context=None):
23 """."""
24 if context is None:
25 context = {}
26
27 res = super(Employee, self).write(
28 cr, uid, ids, vals, context)
29
30 if res and 'lock_all' in vals:
31 history = self.pool.get('diana.supply.lock.history')
32 users = self.pool.get('res.users')
33 user = users.browse(cr, uid, uid)
34 lock_all = vals['lock_all']
35 if lock_all:
36 msg = _(
37 'El usuario {} bloquea todas las asignaciones.'.format(
38 user.login))
39 else:
40 msg = _(
41 'El usuario {} desbloquea todas las asignaciones.'.format(
42 user.login))
43 val = {
44 'name': msg,
45 'employee_id': ids[0],
46 'asig_type': False,
47 'user_id': uid,
48 'date': datetime.now()
49 }
50 history.create(cr, uid, val)
51 return res
52
53
54Employee()
055
=== 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 @@
1
2import unicodedata
3
4from datetime import datetime
5
6from osv import fields, osv
7from tools.translate import _
8
9
10class LockAssignments(osv.osv):
11 """."""
12
13 _name = 'diana.supply.lock.assignment'
14 _description = 'Lock assignments'
15 _columns = {
16 'name': fields.char('Supply Reference', size=128),
17 'employee_id': fields.many2one('hr.employee', 'Employee'),
18 'asig_type': fields.many2one(
19 'diana.supply.asign.type', 'Type of assignment', required=True),
20 'date': fields.date('Date lock'),
21 }
22 _defaults = {}
23 _sql_constraints = [
24 ('unique_type_assig', 'unique(asig_type, employee_id)',
25 _('You can not duplicate assignments in this section.'))
26 ]
27
28 def elimina_tildes(self, s):
29 """."""
30 return ''.join(
31 (c for c in unicodedata.normalize('NFD', s)
32 if unicodedata.category(c) != 'Mn')
33 ).replace("'", "")
34
35 def create(self, cr, uid, vals, context=None):
36 """."""
37 if context is None:
38 context = {}
39 history = self.pool.get('diana.supply.lock.history')
40 users = self.pool.get('res.users')
41 type_assig = self.pool.get('diana.supply.asign.type')
42 user = users.browse(cr, uid, uid, context=context)
43 lock_asig = type_assig.browse(cr, uid, vals['asig_type'])
44 msg = _(
45 'The user {} add the list of blocked assignments {}').format(
46 user.login, self.elimina_tildes(lock_asig.name))
47 val = {
48 'name': msg,
49 'employee_id': vals['employee_id'],
50 'asig_type': vals['asig_type'],
51 'user_id': user.id,
52 'date': datetime.now()
53 }
54
55 res = super(LockAssignments, self).create(cr, uid, vals, context)
56 if res:
57 history.create(cr, uid, val, context=context)
58 return res
59
60 def unlink(self, cr, uid, ids, context=None):
61 """."""
62 if context is None:
63 context = {}
64 history = self.pool.get('diana.supply.lock.history')
65 users = self.pool.get('res.users')
66 user = users.browse(cr, uid, uid, context=context)
67 lock_asig = self.browse(cr, uid, ids)
68 msg = _(
69 'The user {} remove the list of blocked assignments {}').format(
70 user.login, self.elimina_tildes(lock_asig[0].asig_type.name))
71 vals = {
72 'name': msg,
73 'employee_id': lock_asig[0].employee_id.id,
74 'asig_type': lock_asig[0].asig_type.id,
75 'user_id': user.id,
76 'date': datetime.now()
77 }
78 res = super(LockAssignments, self).unlink(cr, uid, ids, context)
79 if res:
80 history.create(cr, uid, vals, context=context)
81 return res
82
83
84LockAssignments()
85
86
87class LockHistory(osv.osv):
88 """."""
89
90 _name = 'diana.supply.lock.history'
91 _description = 'Lock history'
92 _order = 'id desc'
93 _columns = {
94 'name': fields.char('Description', size=256),
95 'employee_id': fields.many2one('hr.employee', 'Employee'),
96 'asig_type': fields.many2one(
97 'diana.supply.asign.type', 'Type of assignment'),
98 'user_id': fields.many2one('res.users', 'User'),
99 'date': fields.datetime('Date')
100 }
101
102
103LockHistory()
0104
=== 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 @@
1
2import unicodedata
3
4from osv import fields, osv
5from tools.translate import _
6
7
8class diana_supply_asign_type(osv.osv):
9 """."""
10
11 _inherit = 'diana.supply.asign.type'
12 _columns = {
13 'lock_assig_ids': fields.one2many(
14 'diana.supply.lock.assignment', 'asig_type',
15 'Lock assignments'),
16 }
17
18
19diana_supply_asign_type()
20
21
22class diana_supply_lines(osv.osv):
23 """."""
24
25 _inherit = 'diana.supply.lines'
26
27 def elimina_tildes(self, s):
28 """."""
29 return ''.join(
30 (c for c in unicodedata.normalize('NFD', s)
31 if unicodedata.category(c) != 'Mn')
32 ).replace("'", "")
33
34 def action_deliver(self, cr, uid, ids, context=None):
35 """."""
36 obj_brw = self.browse(cr, uid, ids)
37 for line in obj_brw:
38 employee = line.employee_id
39 asigned_type = line.asigned_type
40 if employee.lock_all or employee.no_remunerado or\
41 asigned_type.id in [i.asig_type.id
42 for i in employee.lock_assig_ids]:
43 raise osv.except_osv(
44 _('Error!'), _(
45 'El trabajador {} con el cod. {} no tiene las '
46 'condiciones para recibir {}'.format(
47 self.elimina_tildes(employee.name),
48 employee.cod_number,
49 self.elimina_tildes(line.asigned_type.name).upper()
50 )))
51 return super(
52 diana_supply_lines, self).action_deliver(cr, uid, ids, context)
53
54
55diana_supply_lines()
056
=== 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 @@
1id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
2
3access_control_update_manager,diana.supply.lock.assignment,model_diana_supply_lock_assignment,group_lock_assignment_supply_manager,1,1,1,1
4
5access_control_update_history_manager,diana.supply.lock.history,model_diana_supply_lock_history,group_lock_assignment_supply_manager,1,1,1,0
6
7
8access_control_update_user,diana.supply.lock.assignment,model_diana_supply_lock_assignment,group_lock_assignment_supply_user,1,0,0,0
9
10access_control_update_history_user,diana.supply.lock.history,model_diana_supply_lock_history,group_lock_assignment_supply_user,1,0,0,0
0\ No newline at end of file11\ No newline at end of file
112
=== 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 @@
1<?xml version="1.0" encoding="utf-8"?>
2<openerp>
3 <data noupdate="1">
4 <record id="group_lock_assignment_supply_manager" model="res.groups">
5 <field name="name">Asignaciones no permitidas / Manager</field>
6 </record>
7
8 <record id="group_lock_assignment_supply_user" model="res.groups">
9 <field name="name">Asignaciones no permitidas / user</field>
10 </record>
11 </data>
12</openerp>
013
=== 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 @@
1<?xml version="1.0" encoding="utf-8"?>
2<openerp>
3<data>
4
5 <record model="ir.ui.view" id="diana_supply_asign_type_update">
6 <field name="name">diana.supply.asign.type.update</field>
7 <field name="model">diana.supply.asign.type</field>
8 <field name="type">form</field>
9 <field name="inherit_id" ref="supply_control.view_diana_supply_asign_type_form" />
10 <field name="arch" type="xml">
11 <xpath expr='/form/notebook/page[@name="configuration_user"]' position='after'>
12 <page string="Empleados no permitidos">
13 <field name='lock_assig_ids' nolabel="1" readonly="1">
14 <tree editable="bottom">
15 <field name='employee_id'/>
16 </tree>
17 </field>
18 </page>
19 </xpath>
20 </field>
21 </record>
22
23</data>
24</openerp>
025
=== 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 @@
1<?xml version="1.0" encoding="utf-8"?>
2<openerp>
3 <data>
4
5 <record model="ir.ui.view" id="view_employee_form_lock_assig">
6 <field name="name">view.employee.form.lock.assig</field>
7 <field name="model">hr.employee</field>
8 <field name="type">form</field>
9 <field name="inherit_id" ref="sisb_nomina.view_employee_form_inherit_2"/>
10 <field name="arch" type="xml">
11 <xpath expr='/form/notebook/page[@string="Notes"]' position='before'>
12
13 <page string="Lock assignments" groups="supply_control_update.group_lock_assignment_supply_manager">
14 <group colspan="4" col="4">
15 <field name='lock_all'/>
16 </group>
17 <label string="Todas las asignaciones bloqueadas..." attrs="{'invisible':[('lock_all','=', False)]}"/>
18 <newline/>
19
20 <notebook>
21 <page string="Lock assignments" attrs="{'invisible':[('lock_all', '=', True)]}">
22 <field name="lock_assig_ids" nolabel="1" attrs="{'readonly':[('lock_all','=', True)]}">
23
24 <tree editable="bottom">
25 <field name='asig_type'/>
26 </tree>
27
28 </field>
29 </page>
30 <page string="History">
31 <field name="lock_history_ids" nolabel="1" readonly='1'>
32
33 <tree editable="bottom">
34 <field name='date'/>
35 <field name='user_id'/>
36 <field name='name' string="Message"/>
37 <field name='asig_type'/>
38 </tree>
39
40 </field>
41 </page>
42 </notebook>
43
44 </page>
45 </xpath>
46 </field>
47 </record>
48
49</data>
50</openerp>
051
=== 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 @@
1
2

Subscribers

People subscribed via source and target branches