Merge lp:~inddiana/diana-addons/supply_control_update-gudanthony7 into lp:diana-addons
- supply_control_update-gudanthony7
- Merge into trunk
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 |
Related bugs: |
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_
Description of the change
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'supply_control/i18n/es_VE.po' (properties changed: +x to -x) | |||
2 | --- supply_control/i18n/es_VE.po 2017-07-20 15:21:08 +0000 | |||
3 | +++ supply_control/i18n/es_VE.po 2018-12-06 12:31:45 +0000 | |||
4 | @@ -1,324 +1,720 @@ | |||
5 | 1 | # Translation of OpenERP Server. | 1 | # Translation of OpenERP Server. |
6 | 2 | # This file contains the translation of the following modules: | 2 | # This file contains the translation of the following modules: |
8 | 3 | # * sisb_supply_control | 3 | # * supply_control |
9 | 4 | # | 4 | # |
10 | 5 | msgid "" | 5 | msgid "" |
11 | 6 | msgstr "" | 6 | msgstr "" |
12 | 7 | "Project-Id-Version: OpenERP Server 6.0.4\n" | 7 | "Project-Id-Version: OpenERP Server 6.0.4\n" |
13 | 8 | "Report-Msgid-Bugs-To: support@openerp.com\n" | 8 | "Report-Msgid-Bugs-To: support@openerp.com\n" |
17 | 9 | "POT-Creation-Date: 2012-09-27 13:55+0000\n" | 9 | "POT-Creation-Date: 2018-12-05 14:25+0000\n" |
18 | 10 | "PO-Revision-Date: 2012-09-27 09:45-0400\n" | 10 | "PO-Revision-Date: 2018-12-05 14:25+0000\n" |
19 | 11 | "Last-Translator: Angel Guadarrama <guadarramaangel@gmail.com>\n" | 11 | "Last-Translator: <>\n" |
20 | 12 | "Language-Team: \n" | 12 | "Language-Team: \n" |
21 | 13 | "MIME-Version: 1.0\n" | 13 | "MIME-Version: 1.0\n" |
22 | 14 | "Content-Type: text/plain; charset=UTF-8\n" | 14 | "Content-Type: text/plain; charset=UTF-8\n" |
24 | 15 | "Content-Transfer-Encoding: 8bit\n" | 15 | "Content-Transfer-Encoding: \n" |
25 | 16 | "Plural-Forms: \n" | 16 | "Plural-Forms: \n" |
26 | 17 | 17 | ||
34 | 18 | #. module: sisb_supply_control | 18 | #. module: supply_control |
35 | 19 | #: code:addons/sisb_supply_control/model/diana_supply.py:206 | 19 | #: report:sede.suministro:0 |
36 | 20 | #, python-format | 20 | msgid "FIRMA" |
37 | 21 | msgid "Connectivity problem. Check parameters!" | 21 | msgstr "FIRMA" |
38 | 22 | msgstr "Problemas de conectividad. Chequee los parámetros!" | 22 | |
39 | 23 | 23 | #. module: supply_control | |
40 | 24 | #. module: sisb_supply_control | 24 | #: field:diana.supply.asign.type,days_old:0 |
41 | 25 | msgid "Dias de Antiguedad" | ||
42 | 26 | msgstr "Dias de Antiguedad" | ||
43 | 27 | |||
44 | 28 | #. module: supply_control | ||
45 | 29 | #: model:ir.ui.menu,name:supply_control.menu_supply_printer | ||
46 | 30 | msgid "Configuración de Impresoras" | ||
47 | 31 | msgstr "Configuración de Impresoras" | ||
48 | 32 | |||
49 | 33 | #. module: supply_control | ||
50 | 34 | #: view:diana.supply.printers.wizard:0 | ||
51 | 35 | msgid "¿Ticket was printed correctly?" | ||
52 | 36 | msgstr "¿El ticket se imprimió correctamente?" | ||
53 | 37 | |||
54 | 38 | #. module: supply_control | ||
55 | 39 | #: view:diana.supply.printer:0 | ||
56 | 40 | msgid "Puerto XMLRPC" | ||
57 | 41 | msgstr "Puerto XMLRPC" | ||
58 | 42 | |||
59 | 43 | #. module: supply_control | ||
60 | 44 | #: field:diana.supply.asign,detail:0 | ||
61 | 45 | msgid "Incluye detalle" | ||
62 | 46 | msgstr "Incluye detalle" | ||
63 | 47 | |||
64 | 48 | #. module: supply_control | ||
65 | 49 | #: report:sede.suministro:0 | ||
66 | 50 | msgid "/ Fecha de Impresion:" | ||
67 | 51 | msgstr "/ Fecha de Impresion:" | ||
68 | 52 | |||
69 | 53 | #. module: supply_control | ||
70 | 54 | #: view:diana.supply.asign:0 | ||
71 | 55 | msgid "Crear Asignaciones" | ||
72 | 56 | msgstr "Crear Asignaciones" | ||
73 | 57 | |||
74 | 58 | #. module: supply_control | ||
75 | 59 | #: field:diana.supply.asign.type,accumulate:0 | ||
76 | 60 | msgid "Es Acumulativo?" | ||
77 | 61 | msgstr "Es Acumulativo?" | ||
78 | 62 | |||
79 | 63 | #. module: supply_control | ||
80 | 64 | #: report:report.sede.suministros:0 | ||
81 | 65 | msgid "Página:" | ||
82 | 66 | msgstr "Página:" | ||
83 | 67 | |||
84 | 68 | #. module: supply_control | ||
85 | 69 | #: report:report.sede.suministros:0 | ||
86 | 70 | msgid "Fecha de Entrega" | ||
87 | 71 | msgstr "Fecha de Entrega" | ||
88 | 72 | |||
89 | 73 | #. module: supply_control | ||
90 | 74 | #: report:report.sede.suministros:0 | ||
91 | 75 | msgid "," | ||
92 | 76 | msgstr "," | ||
93 | 77 | |||
94 | 78 | #. module: supply_control | ||
95 | 79 | #: report:report.sede.suministros:0 | ||
96 | 80 | msgid "Impreso" | ||
97 | 81 | msgstr "Impreso" | ||
98 | 82 | |||
99 | 83 | #. module: supply_control | ||
100 | 25 | #: view:diana.supply.lines:0 | 84 | #: view:diana.supply.lines:0 |
135 | 26 | #: field:diana.supply.lines,delivered:0 | 85 | #: field:diana.supply.lines,sede_id:0 |
136 | 27 | #: selection:diana.supply.lines,state:0 | 86 | #: field:wizard.supply,sede:0 |
137 | 28 | msgid "Delivered" | 87 | msgid "Sede" |
138 | 29 | msgstr "Entregado" | 88 | msgstr "Sede" |
139 | 30 | 89 | ||
140 | 31 | #. module: sisb_supply_control | 90 | #. module: supply_control |
141 | 32 | #: code:addons/sisb_supply_control/model/diana_supply.py:79 | 91 | #: model:ir.actions.act_window,name:supply_control.action_diana_supply_asign_tree |
142 | 33 | #: code:addons/sisb_supply_control/model/diana_supply.py:115 | 92 | #: model:ir.ui.menu,name:supply_control.menu_supply_asing |
143 | 34 | #, python-format | 93 | msgid "Asignaciones" |
144 | 35 | msgid "The period does not match with the current month!" | 94 | msgstr "Asignaciones" |
145 | 36 | msgstr "El período no concuerda con el mes corriente!" | 95 | |
146 | 37 | 96 | #. module: supply_control | |
147 | 38 | #. module: sisb_supply_control | 97 | #: field:wizard.supply,mes:0 |
148 | 39 | #: view:diana.supply.printers.wizard:0 | 98 | msgid "Mes" |
149 | 40 | msgid "No" | 99 | msgstr "Mes" |
150 | 41 | msgstr "No" | 100 | |
151 | 42 | 101 | #. module: supply_control | |
152 | 43 | #. module: sisb_supply_control | 102 | #: view:diana.supply.asign.type:0 |
153 | 44 | #: field:diana.supply.printer,machine_pass:0 | 103 | msgid "Configuration of users" |
154 | 45 | msgid "User pass" | 104 | msgstr "Configuración de usuarios" |
155 | 46 | msgstr "Contraseña de usuario" | 105 | |
156 | 47 | 106 | #. module: supply_control | |
157 | 48 | #. module: sisb_supply_control | 107 | #: view:diana.supply.asign.type:0 |
158 | 49 | #: model:ir.model,name:sisb_supply_control.model_diana_supply_lines | 108 | msgid "Notes" |
159 | 50 | msgid "diana.supply.lines" | 109 | msgstr "Notas" |
160 | 51 | msgstr "diana.supply.lines" | 110 | |
161 | 52 | 111 | #. module: supply_control | |
162 | 53 | #. module: sisb_supply_control | 112 | #: field:diana.supply.lines,name:0 |
163 | 54 | #: code:addons/sisb_supply_control/model/diana_supply.py:188 | 113 | msgid "Supply Reference" |
164 | 55 | #, python-format | 114 | msgstr "Referencia de suministro" |
165 | 56 | msgid "The selected supply has expired. Select another." | 115 | |
166 | 57 | msgstr "El suministro seleccionado ha expirado. Seleccione otro." | 116 | #. module: supply_control |
167 | 58 | 117 | #: model:ir.ui.menu,name:supply_control.menu_diana_supply_control | |
168 | 59 | #. module: sisb_supply_control | 118 | msgid "Control de Asignaciones" |
169 | 119 | msgstr "Control de Asignaciones" | ||
170 | 120 | |||
171 | 121 | #. module: supply_control | ||
172 | 122 | #: report:report.sede.suministros:0 | ||
173 | 123 | msgid ", quedan" | ||
174 | 124 | msgstr ", quedan" | ||
175 | 125 | |||
176 | 126 | #. module: supply_control | ||
177 | 127 | #: model:ir.actions.act_window,name:supply_control.action_diana_supply_printer | ||
178 | 128 | msgid "Impresoras" | ||
179 | 129 | msgstr "Impresoras" | ||
180 | 130 | |||
181 | 131 | #. module: supply_control | ||
182 | 132 | #: view:diana.supply.asign:0 | ||
183 | 133 | msgid "Lista de Empleados" | ||
184 | 134 | msgstr "Lista de Empleados" | ||
185 | 135 | |||
186 | 136 | #. module: supply_control | ||
187 | 137 | #: report:report.sede.suministros:0 | ||
188 | 138 | msgid "Trabajador" | ||
189 | 139 | msgstr "Trabajador" | ||
190 | 140 | |||
191 | 141 | #. module: supply_control | ||
192 | 142 | #: model:ir.actions.act_window,name:supply_control.action_diana_supply_asign_type_tree | ||
193 | 143 | #: model:ir.actions.act_window,name:supply_control.action_diana_supply_type_tree | ||
194 | 144 | msgid "Tipos de Asignación" | ||
195 | 145 | msgstr "Tipos de Asignación" | ||
196 | 146 | |||
197 | 147 | #. module: supply_control | ||
198 | 148 | #: selection:diana.supply.asign.type,day_assig_defect:0 | ||
199 | 149 | msgid "Martes" | ||
200 | 150 | msgstr "Martes" | ||
201 | 151 | |||
202 | 152 | #. module: supply_control | ||
203 | 153 | #: model:ir.model,name:supply_control.model_diana_supply_asign_detail | ||
204 | 154 | msgid "Details of asignations" | ||
205 | 155 | msgstr "Details of asignations" | ||
206 | 156 | |||
207 | 157 | #. module: supply_control | ||
208 | 158 | #: field:diana.supply.asign,aggregate:0 | ||
209 | 159 | msgid "Nota" | ||
210 | 160 | msgstr "Nota" | ||
211 | 161 | |||
212 | 162 | #. module: supply_control | ||
213 | 163 | #: field:diana.supply.asign,print_default:0 | ||
214 | 164 | msgid "Seleccione Impresora" | ||
215 | 165 | msgstr "Seleccione Impresora" | ||
216 | 166 | |||
217 | 167 | #. module: supply_control | ||
218 | 168 | #: selection:diana.supply.asign,state:0 | ||
219 | 169 | msgid "Cargado" | ||
220 | 170 | msgstr "Cargado" | ||
221 | 171 | |||
222 | 172 | #. module: supply_control | ||
223 | 173 | #: model:ir.ui.menu,name:supply_control.menu_supply_lines | ||
224 | 174 | msgid "Entregas" | ||
225 | 175 | msgstr "Entregas" | ||
226 | 176 | |||
227 | 177 | #. module: supply_control | ||
228 | 178 | #: report:report.sede.suministros:0 | ||
229 | 179 | msgid "suministros en estado Borrador" | ||
230 | 180 | msgstr "suministros en estado Borrador" | ||
231 | 181 | |||
232 | 182 | #. module: supply_control | ||
233 | 183 | #: field:diana.supply.asign,detail_ids:0 | ||
234 | 184 | msgid "Detalles" | ||
235 | 185 | msgstr "Detalles" | ||
236 | 186 | |||
237 | 187 | #. module: supply_control | ||
238 | 60 | #: field:diana.supply.lines,state:0 | 188 | #: field:diana.supply.lines,state:0 |
239 | 61 | msgid "State" | 189 | msgid "State" |
240 | 62 | msgstr "Estado" | 190 | msgstr "Estado" |
241 | 63 | 191 | ||
254 | 64 | #. module: sisb_supply_control | 192 | #. module: supply_control |
255 | 65 | #: view:diana.supply.lines:0 | 193 | #: report:report.sede.suministros:0 |
256 | 66 | #: selection:diana.supply.lines,state:0 | 194 | msgid "Fecha de Asignacion" |
257 | 67 | msgid "Draft" | 195 | msgstr "Fecha de Asignacion" |
258 | 68 | msgstr "Borrador" | 196 | |
259 | 69 | 197 | #. module: supply_control | |
260 | 70 | #. module: sisb_supply_control | 198 | #: field:diana.supply.asign.type,day_assig_defect:0 |
261 | 71 | #: view:diana.supply.printers.wizard:0 | 199 | msgid "Dia de asignación por defecto" |
262 | 72 | msgid "¿Ticket was printed correctly?" | 200 | msgstr "Dia de asignación por defecto" |
263 | 73 | msgstr "¿El ticket se imprimió correctamente?" | 201 | |
264 | 74 | 202 | #. module: supply_control | |
253 | 75 | #. module: sisb_supply_control | ||
265 | 76 | #: field:diana.supply.lines,employee_id:0 | 203 | #: field:diana.supply.lines,employee_id:0 |
266 | 77 | #: model:ir.model,name:sisb_supply_control.model_hr_employee | ||
267 | 78 | msgid "Employee" | 204 | msgid "Employee" |
268 | 79 | msgstr "Empleado" | 205 | msgstr "Empleado" |
269 | 80 | 206 | ||
332 | 81 | #. module: sisb_supply_control | 207 | #. module: supply_control |
333 | 82 | #: model:ir.actions.act_window,name:sisb_supply_control.action_diana_supply_line_tree | 208 | #: selection:diana.supply.asign.type,day_assig_defect:0 |
334 | 83 | msgid "Diana Supply Lines" | 209 | msgid "Lunes" |
335 | 84 | msgstr "Lineas de suministros Diana" | 210 | msgstr "Lunes" |
336 | 85 | 211 | ||
337 | 86 | #. module: sisb_supply_control | 212 | #. module: supply_control |
338 | 87 | #: code:addons/sisb_supply_control/model/diana_supply.py:79 | 213 | #: field:diana.supply.printer,ssh_port:0 |
339 | 88 | #: code:addons/sisb_supply_control/model/diana_supply.py:82 | 214 | msgid "SSH Port" |
340 | 89 | #: code:addons/sisb_supply_control/model/diana_supply.py:115 | 215 | msgstr "Puerto SSh" |
341 | 90 | #: code:addons/sisb_supply_control/model/diana_supply.py:117 | 216 | |
342 | 91 | #: code:addons/sisb_supply_control/model/diana_supply.py:206 | 217 | #. module: supply_control |
343 | 92 | #, python-format | 218 | #: report:report.sede.suministros:0 |
344 | 93 | msgid "Alert !" | 219 | msgid "A la fecha" |
345 | 94 | msgstr "Alerta!" | 220 | msgstr "A la fecha" |
346 | 95 | 221 | ||
347 | 96 | #. module: sisb_supply_control | 222 | #. module: supply_control |
348 | 97 | #: field:diana.supply.asign,name:0 | 223 | #: model:ir.model,name:supply_control.model_wizard_print_report_sede |
349 | 98 | msgid "Asignation Reference" | 224 | msgid "Wizar para imprimir reportes de las lineas de suministros" |
350 | 99 | msgstr "Referencia de asignación" | 225 | msgstr "Wizar para imprimir reportes de las lineas de suministros" |
351 | 100 | 226 | ||
352 | 101 | #. module: sisb_supply_control | 227 | #. module: supply_control |
353 | 102 | #: model:ir.actions.act_window,name:sisb_supply_control.action_diana_supply_printer | 228 | #: field:wizard.supply,type_assig:0 |
354 | 103 | #: model:ir.ui.menu,name:sisb_supply_control.menu_supply_printer | 229 | msgid "Tipo de Asignacion" |
355 | 104 | msgid "Printer" | 230 | msgstr "Tipo de Asignacion" |
356 | 105 | msgstr "Impresora" | 231 | |
357 | 106 | 232 | #. module: supply_control | |
358 | 107 | #. module: sisb_supply_control | 233 | #: selection:diana.supply.asign.type,day_assig_defect:0 |
359 | 108 | #: field:diana.supply.printer,printer_status:0 | 234 | msgid "Jueves" |
360 | 109 | msgid "Printer Status" | 235 | msgstr "Jueves" |
361 | 110 | msgstr "Estatus de la impresora" | 236 | |
362 | 111 | 237 | #. module: supply_control | |
363 | 112 | #. module: sisb_supply_control | 238 | #: model:ir.ui.menu,name:supply_control.supply_configuration |
364 | 113 | #: field:diana.supply.printer,ip_address:0 | 239 | msgid "Configuración" |
365 | 114 | msgid "IP Address" | 240 | msgstr "Configuración" |
366 | 115 | msgstr "Dirección IP" | 241 | |
367 | 116 | 242 | #. module: supply_control | |
306 | 117 | #. module: sisb_supply_control | ||
307 | 118 | #: view:diana.supply.lines:0 | ||
308 | 119 | msgid "Deliver" | ||
309 | 120 | msgstr "Entregar" | ||
310 | 121 | |||
311 | 122 | #. module: sisb_supply_control | ||
312 | 123 | #: model:ir.actions.act_window,name:sisb_supply_control.action_printers_wizard_confirm | ||
313 | 124 | msgid "Printing Confirmation" | ||
314 | 125 | msgstr "Confirmación de impresión" | ||
315 | 126 | |||
316 | 127 | #. module: sisb_supply_control | ||
317 | 128 | #: view:diana.supply.lines:0 | ||
318 | 129 | msgid "Search Supply State" | ||
319 | 130 | msgstr "Búsqueda por estado de suministros" | ||
320 | 131 | |||
321 | 132 | #. module: sisb_supply_control | ||
322 | 133 | #: model:ir.actions.report.xml,name:sisb_supply_control.supply_lines_report | ||
323 | 134 | msgid "Report Latex Supply Lines Sisb" | ||
324 | 135 | msgstr "Reporte latex de lineas de suministros SISB" | ||
325 | 136 | |||
326 | 137 | #. module: sisb_supply_control | ||
327 | 138 | #: view:diana.supply.asign:0 | ||
328 | 139 | msgid "Supply Asignation" | ||
329 | 140 | msgstr "Asignación de suministro" | ||
330 | 141 | |||
331 | 142 | #. module: sisb_supply_control | ||
368 | 143 | #: field:diana.supply.printer,name:0 | 243 | #: field:diana.supply.printer,name:0 |
369 | 144 | msgid "Printer Name" | 244 | msgid "Printer Name" |
370 | 145 | msgstr "Nombre de impresora" | 245 | msgstr "Nombre de impresora" |
371 | 146 | 246 | ||
384 | 147 | #. module: sisb_supply_control | 247 | #. module: supply_control |
373 | 148 | #: view:diana.supply.lines:0 | ||
374 | 149 | #: selection:diana.supply.lines,state:0 | ||
375 | 150 | msgid "Expired" | ||
376 | 151 | msgstr "Expirado" | ||
377 | 152 | |||
378 | 153 | #. module: sisb_supply_control | ||
379 | 154 | #: constraint:hr.employee:0 | ||
380 | 155 | msgid "Error ! You cannot create recursive Hierarchy of Employees." | ||
381 | 156 | msgstr "Error ! You cannot create recursive Hierarchy of Employees." | ||
382 | 157 | |||
383 | 158 | #. module: sisb_supply_control | ||
385 | 159 | #: field:diana.supply.lines,expiration_date:0 | 248 | #: field:diana.supply.lines,expiration_date:0 |
386 | 160 | msgid "Expiration Date" | 249 | msgid "Expiration Date" |
387 | 161 | msgstr "Fecha de expirado" | 250 | msgstr "Fecha de expirado" |
388 | 162 | 251 | ||
417 | 163 | #. module: sisb_supply_control | 252 | #. module: supply_control |
390 | 164 | #: code:addons/sisb_supply_control/model/diana_supply.py:231 | ||
391 | 165 | #, python-format | ||
392 | 166 | msgid "The supply has been changed to draft correctly." | ||
393 | 167 | msgstr "El suministro ha cambiado a borrador correctamente." | ||
394 | 168 | |||
395 | 169 | #. module: sisb_supply_control | ||
396 | 170 | #: model:ir.actions.act_window,name:sisb_supply_control.action_diana_supply_asign_tree | ||
397 | 171 | #: model:ir.ui.menu,name:sisb_supply_control.menu_supply_asing | ||
398 | 172 | msgid "Assignation" | ||
399 | 173 | msgstr "Asignación" | ||
400 | 174 | |||
401 | 175 | #. module: sisb_supply_control | ||
402 | 176 | #: view:diana.supply.asign:0 | ||
403 | 177 | msgid "Employees for supply asignation" | ||
404 | 178 | msgstr "Empleados para asignación de suministro" | ||
405 | 179 | |||
406 | 180 | #. module: sisb_supply_control | ||
407 | 181 | #: model:ir.model,name:sisb_supply_control.model_diana_supply_asign | ||
408 | 182 | msgid "diana.supply.asign" | ||
409 | 183 | msgstr "diana.supply.asign" | ||
410 | 184 | |||
411 | 185 | #. module: sisb_supply_control | ||
412 | 186 | #: field:diana.supply.asign,employee_ids:0 | ||
413 | 187 | msgid "Employees" | ||
414 | 188 | msgstr "Empleados" | ||
415 | 189 | |||
416 | 190 | #. module: sisb_supply_control | ||
418 | 191 | #: view:diana.supply.lines:0 | 253 | #: view:diana.supply.lines:0 |
419 | 192 | msgid "Return to Draft" | 254 | msgid "Return to Draft" |
420 | 193 | msgstr "Retornar a borrador" | 255 | msgstr "Retornar a borrador" |
421 | 194 | 256 | ||
438 | 195 | #. module: sisb_supply_control | 257 | #. module: supply_control |
439 | 196 | #: constraint:hr.employee:0 | 258 | #: report:report.sede.suministros:0 |
440 | 197 | msgid "Error ! You cannot select a department for which the employee is the manager." | 259 | msgid "/ Fecha de Impresión:" |
441 | 198 | msgstr "Error ! You cannot select a department for which the employee is the manager." | 260 | msgstr "/ Fecha de Impresión:" |
442 | 199 | 261 | ||
443 | 200 | #. module: sisb_supply_control | 262 | #. module: supply_control |
444 | 201 | #: code:addons/sisb_supply_control/model/diana_supply.py:82 | 263 | #: view:diana.supply.lines:0 |
445 | 202 | #: code:addons/sisb_supply_control/model/diana_supply.py:117 | 264 | msgid "Empleado" |
446 | 203 | #, python-format | 265 | msgstr "Empleado" |
447 | 204 | msgid "Already assigned this period!" | 266 | |
448 | 205 | msgstr "Ya ha sido asignado este período" | 267 | #. module: supply_control |
449 | 206 | 268 | #: view:diana.supply.asign:0 | |
450 | 207 | #. module: sisb_supply_control | 269 | msgid "Cargar Todos" |
451 | 208 | #: view:diana.supply.asign:0 | 270 | msgstr "Cargar Todos" |
452 | 209 | #: field:diana.supply.lines,asign_id:0 | 271 | |
453 | 210 | msgid "Asignation" | 272 | #. module: supply_control |
454 | 273 | #: view:diana.supply.asign:0 | ||
455 | 274 | #: field:diana.supply.asign.detail,asign_id:0 | ||
456 | 275 | #: view:diana.supply.lines:0 | ||
457 | 276 | msgid "Asignación" | ||
458 | 211 | msgstr "Asignación" | 277 | msgstr "Asignación" |
459 | 212 | 278 | ||
503 | 213 | #. module: sisb_supply_control | 279 | #. module: supply_control |
504 | 214 | #: field:diana.supply.lines,name:0 | 280 | #: report:sede.suministro:0 |
505 | 215 | msgid "Supply Reference" | 281 | msgid "Valencia," |
506 | 216 | msgstr "Referencia de suministro" | 282 | msgstr "Valencia," |
507 | 217 | 283 | ||
508 | 218 | #. module: sisb_supply_control | 284 | #. module: supply_control |
509 | 219 | #: field:diana.supply.printer,ssh_port:0 | 285 | #: field:diana.supply.printer,machine_user:0 |
510 | 220 | msgid "SSH Port" | 286 | msgid "User Machine" |
511 | 221 | msgstr "Puerto SSh" | 287 | msgstr "Usuario de la maquina" |
512 | 222 | 288 | ||
513 | 223 | #. module: sisb_supply_control | 289 | #. module: supply_control |
514 | 224 | #: model:ir.model,name:sisb_supply_control.model_diana_supply_printer | 290 | #: report:report.sede.suministros:0 |
515 | 225 | msgid "diana.supply.printer" | 291 | msgid "RESUMEN GENERAL" |
516 | 226 | msgstr "diana.supply.printer" | 292 | msgstr "RESUMEN GENERAL" |
517 | 227 | 293 | ||
518 | 228 | #. module: sisb_supply_control | 294 | #. module: supply_control |
519 | 229 | #: code:addons/sisb_supply_control/model/diana_supply.py:141 | 295 | #: field:diana.supply.lines,despachador_id:0 |
520 | 230 | #, python-format | 296 | msgid "Entregado por:" |
521 | 231 | msgid "Supplies period %s, assigned correctly." | 297 | msgstr "Entregado por:" |
522 | 232 | msgstr "Los suministros del período %s, asignados correctamente." | 298 | |
523 | 233 | 299 | #. module: supply_control | |
481 | 234 | #. module: sisb_supply_control | ||
482 | 235 | #: field:diana.supply.printer,upload_dir:0 | ||
483 | 236 | msgid "Remote Directory" | ||
484 | 237 | msgstr "Directorio remoto" | ||
485 | 238 | |||
486 | 239 | #. module: sisb_supply_control | ||
487 | 240 | #: view:diana.supply.printer:0 | ||
488 | 241 | msgid "Printer Configuration" | ||
489 | 242 | msgstr "Configuración de impresoras" | ||
490 | 243 | |||
491 | 244 | #. module: sisb_supply_control | ||
492 | 245 | #: field:diana.supply.asign,asigned_date:0 | ||
493 | 246 | #: field:diana.supply.lines,asigned_date:0 | ||
494 | 247 | msgid "Asignation Date" | ||
495 | 248 | msgstr "Fecha de asignación" | ||
496 | 249 | |||
497 | 250 | #. module: sisb_supply_control | ||
498 | 251 | #: field:diana.supply.lines,print_verify:0 | ||
499 | 252 | msgid "Print verification" | ||
500 | 253 | msgstr "Verificación de impresión" | ||
501 | 254 | |||
502 | 255 | #. module: sisb_supply_control | ||
524 | 256 | #: field:diana.supply.lines,delivery_date:0 | 300 | #: field:diana.supply.lines,delivery_date:0 |
525 | 257 | msgid "Delivery Date" | 301 | msgid "Delivery Date" |
526 | 258 | msgstr "Fecha de entrega" | 302 | msgstr "Fecha de entrega" |
527 | 259 | 303 | ||
532 | 260 | #. module: sisb_supply_control | 304 | #. module: supply_control |
533 | 261 | #: field:diana.supply.printer,file_name:0 | 305 | #: model:ir.model,name:supply_control.model_wizard_supply |
534 | 262 | msgid "File Name" | 306 | msgid "Wizar para imprimir reportes de suministros" |
535 | 263 | msgstr "Nombre del archivo" | 307 | msgstr "Wizar para imprimir reportes de suministros" |
536 | 264 | 308 | ||
538 | 265 | #. module: sisb_supply_control | 309 | #. module: supply_control |
539 | 266 | #: field:diana.supply.asign,lines_ids:0 | 310 | #: field:diana.supply.asign,lines_ids:0 |
540 | 267 | #: view:diana.supply.lines:0 | ||
541 | 268 | #: field:hr.employee,diana_supply_asign_id:0 | ||
542 | 269 | #: field:hr.employee,diana_supply_lines_id:0 | ||
543 | 270 | #: model:ir.ui.menu,name:sisb_supply_control.menu_supply_lines | ||
544 | 271 | msgid "Supply Lines" | 311 | msgid "Supply Lines" |
545 | 272 | msgstr "Lineas de suministro" | 312 | msgstr "Lineas de suministro" |
546 | 273 | 313 | ||
575 | 274 | #. module: sisb_supply_control | 314 | #. module: supply_control |
576 | 275 | #: field:diana.supply.asign,period_id:0 | 315 | #: view:diana.supply.lines:0 |
577 | 276 | #: field:diana.supply.lines,period_id:0 | 316 | msgid "Despachado Por" |
578 | 277 | msgid "Period" | 317 | msgstr "Despachado Por" |
579 | 278 | msgstr "Período" | 318 | |
580 | 279 | 319 | #. module: supply_control | |
581 | 280 | #. module: sisb_supply_control | 320 | #: model:ir.model,name:supply_control.model_diana_supply_printers_wizard |
554 | 281 | #: model:ir.ui.menu,name:sisb_supply_control.menu_diana_supply_control | ||
555 | 282 | msgid "Diana Supply Control" | ||
556 | 283 | msgstr "Control de suministros Diana" | ||
557 | 284 | |||
558 | 285 | #. module: sisb_supply_control | ||
559 | 286 | #: view:diana.supply.printers.wizard:0 | ||
560 | 287 | msgid "Yes" | ||
561 | 288 | msgstr "Si" | ||
562 | 289 | |||
563 | 290 | #. module: sisb_supply_control | ||
564 | 291 | #: view:diana.supply.asign:0 | ||
565 | 292 | msgid "_Cancel" | ||
566 | 293 | msgstr "_Cancelar" | ||
567 | 294 | |||
568 | 295 | #. module: sisb_supply_control | ||
569 | 296 | #: view:diana.supply.asign:0 | ||
570 | 297 | msgid "Asign Supply" | ||
571 | 298 | msgstr "Asignar suministro" | ||
572 | 299 | |||
573 | 300 | #. module: sisb_supply_control | ||
574 | 301 | #: model:ir.model,name:sisb_supply_control.model_diana_supply_printers_wizard | ||
582 | 302 | msgid "diana.supply.printers.wizard" | 321 | msgid "diana.supply.printers.wizard" |
583 | 303 | msgstr "diana.supply.printers.wizard" | 322 | msgstr "diana.supply.printers.wizard" |
584 | 304 | 323 | ||
586 | 305 | #. module: sisb_supply_control | 324 | #. module: supply_control |
587 | 306 | #: field:diana.supply.printer,printer_port:0 | 325 | #: field:diana.supply.printer,printer_port:0 |
588 | 307 | msgid "Printer Port" | 326 | msgid "Printer Port" |
589 | 308 | msgstr "Puerto de impresora" | 327 | msgstr "Puerto de impresora" |
590 | 309 | 328 | ||
592 | 310 | #. module: sisb_supply_control | 329 | #. module: supply_control |
593 | 311 | #: field:diana.supply.lines,employee_code:0 | 330 | #: field:diana.supply.lines,employee_code:0 |
594 | 312 | msgid "Employee Code" | 331 | msgid "Employee Code" |
595 | 313 | msgstr "Código de empleado" | 332 | msgstr "Código de empleado" |
596 | 314 | 333 | ||
598 | 315 | #. module: sisb_supply_control | 334 | #. module: supply_control |
599 | 316 | #: field:diana.supply.printer,local_dir:0 | 335 | #: field:diana.supply.printer,local_dir:0 |
600 | 317 | msgid "Local Directory" | 336 | msgid "Local Directory" |
601 | 318 | msgstr "Directorio local" | 337 | msgstr "Directorio local" |
602 | 319 | 338 | ||
607 | 320 | #. module: sisb_supply_control | 339 | #. module: supply_control |
608 | 321 | #: field:diana.supply.printer,machine_user:0 | 340 | #: report:sede.suministro:0 |
609 | 322 | msgid "User Machine" | 341 | msgid "ENTREGA DE SUMINISTRO" |
610 | 323 | msgstr "Usuario de la maquina" | 342 | msgstr "ENTREGA DE SUMINISTRO" |
611 | 343 | |||
612 | 344 | #. module: supply_control | ||
613 | 345 | #: view:diana.supply.asign:0 | ||
614 | 346 | msgid "Detalles de la Asignación" | ||
615 | 347 | msgstr "Detalles de la Asignación" | ||
616 | 348 | |||
617 | 349 | #. module: supply_control | ||
618 | 350 | #: view:diana.supply.printers.wizard:0 | ||
619 | 351 | msgid "No" | ||
620 | 352 | msgstr "No" | ||
621 | 353 | |||
622 | 354 | #. module: supply_control | ||
623 | 355 | #: view:diana.supply.asign:0 | ||
624 | 356 | msgid "¿Confirma que desea devolver el proceso?" | ||
625 | 357 | msgstr "¿Confirma que desea devolver el proceso?" | ||
626 | 358 | |||
627 | 359 | #. module: supply_control | ||
628 | 360 | #: model:ir.model,name:supply_control.model_diana_supply_printer | ||
629 | 361 | msgid "diana.supply.printer" | ||
630 | 362 | msgstr "diana.supply.printer" | ||
631 | 363 | |||
632 | 364 | #. module: supply_control | ||
633 | 365 | #: report:report.sede.suministros:0 | ||
634 | 366 | msgid "Despachado por" | ||
635 | 367 | msgstr "Despachado por" | ||
636 | 368 | |||
637 | 369 | #. module: supply_control | ||
638 | 370 | #: report:report.sede.suministros:0 | ||
639 | 371 | msgid "INFORME DE ASIGNACION DE" | ||
640 | 372 | msgstr "INFORME DE ASIGNACION DE" | ||
641 | 373 | |||
642 | 374 | #. module: supply_control | ||
643 | 375 | #: view:diana.supply.lines:0 | ||
644 | 376 | #: selection:diana.supply.lines,state:0 | ||
645 | 377 | msgid "Draft" | ||
646 | 378 | msgstr "Borrador" | ||
647 | 379 | |||
648 | 380 | #. module: supply_control | ||
649 | 381 | #: report:report.sede.suministros:0 | ||
650 | 382 | msgid ", Estado:" | ||
651 | 383 | msgstr ", Estado:" | ||
652 | 384 | |||
653 | 385 | #. module: supply_control | ||
654 | 386 | #: field:diana.supply.printer,printer_status:0 | ||
655 | 387 | msgid "Status" | ||
656 | 388 | msgstr "Status" | ||
657 | 389 | |||
658 | 390 | #. module: supply_control | ||
659 | 391 | #: model:ir.actions.act_window,name:supply_control.action_w | ||
660 | 392 | msgid "Informe de Asignaciones" | ||
661 | 393 | msgstr "Informe de Asignaciones" | ||
662 | 394 | |||
663 | 395 | #. module: supply_control | ||
664 | 396 | #: field:diana.supply.asign,note:0 | ||
665 | 397 | msgid "Agregar Nota" | ||
666 | 398 | msgstr "Agregar Nota" | ||
667 | 399 | |||
668 | 400 | #. module: supply_control | ||
669 | 401 | #: field:diana.supply.lines,asigned_type:0 | ||
670 | 402 | msgid "Tipo de asignación" | ||
671 | 403 | msgstr "Tipo de asignación" | ||
672 | 404 | |||
673 | 405 | #. module: supply_control | ||
674 | 406 | #: report:report.sede.suministros:0 | ||
675 | 407 | #: report:sede.suministro:0 | ||
676 | 408 | msgid "SISB /" | ||
677 | 409 | msgstr "SISB /" | ||
678 | 410 | |||
679 | 411 | #. module: supply_control | ||
680 | 412 | #: selection:diana.supply.asign.type,day_assig_defect:0 | ||
681 | 413 | msgid "Miercoles" | ||
682 | 414 | msgstr "Miercoles" | ||
683 | 415 | |||
684 | 416 | #. module: supply_control | ||
685 | 417 | #: view:diana.supply.lines:0 | ||
686 | 418 | msgid "Search Supply State" | ||
687 | 419 | msgstr "Búsqueda por estado de suministros" | ||
688 | 420 | |||
689 | 421 | #. module: supply_control | ||
690 | 422 | #: field:diana.supply.asign.type,active:0 | ||
691 | 423 | msgid "Activo" | ||
692 | 424 | msgstr "Activo" | ||
693 | 425 | |||
694 | 426 | #. module: supply_control | ||
695 | 427 | #: model:ir.actions.act_window,name:supply_control.action_diana_supply_line_tree | ||
696 | 428 | msgid "Lineas de Asignación" | ||
697 | 429 | msgstr "Lineas de Asignación" | ||
698 | 430 | |||
699 | 431 | #. module: supply_control | ||
700 | 432 | #: field:diana.supply.asign.type,user_ids:0 | ||
701 | 433 | #: field:diana.supply.printer,employee_ids:0 | ||
702 | 434 | msgid "Usuarios" | ||
703 | 435 | msgstr "Usuarios" | ||
704 | 436 | |||
705 | 437 | #. module: supply_control | ||
706 | 438 | #: view:diana.supply.lines:0 | ||
707 | 439 | #: report:report.sede.suministros:0 | ||
708 | 440 | #: field:wizard.supply,estado:0 | ||
709 | 441 | msgid "Estado" | ||
710 | 442 | msgstr "Estado" | ||
711 | 443 | |||
712 | 444 | #. module: supply_control | ||
713 | 445 | #: report:report.sede.suministros:0 | ||
714 | 446 | msgid "TOTAL EXPIRADOS" | ||
715 | 447 | msgstr "TOTAL EXPIRADOS" | ||
716 | 448 | |||
717 | 449 | #. module: supply_control | ||
718 | 450 | #: model:ir.model,name:supply_control.model_diana_supply_lines | ||
719 | 451 | msgid "diana.supply.lines" | ||
720 | 452 | msgstr "diana.supply.lines" | ||
721 | 453 | |||
722 | 454 | #. module: supply_control | ||
723 | 455 | #: field:diana.supply.asign.type,quantity:0 | ||
724 | 456 | msgid "Cantidad acumular" | ||
725 | 457 | msgstr "Cantidad acumular" | ||
726 | 458 | |||
727 | 459 | #. module: supply_control | ||
728 | 460 | #: view:wizard.supply:0 | ||
729 | 461 | msgid "Generar Reporte" | ||
730 | 462 | msgstr "Generar Reporte" | ||
731 | 463 | |||
732 | 464 | #. module: supply_control | ||
733 | 465 | #: model:ir.model,name:supply_control.model_diana_supply_asign | ||
734 | 466 | msgid "diana.supply.asign" | ||
735 | 467 | msgstr "diana.supply.asign" | ||
736 | 468 | |||
737 | 469 | #. module: supply_control | ||
738 | 470 | #: report:report.sede.suministros:0 | ||
739 | 471 | msgid "TOTAL BORRADOR" | ||
740 | 472 | msgstr "TOTAL BORRADOR" | ||
741 | 473 | |||
742 | 474 | #. module: supply_control | ||
743 | 475 | #: model:ir.model,name:supply_control.model_diana_supply_asign_type | ||
744 | 476 | msgid "diana.supply.asign.type" | ||
745 | 477 | msgstr "diana.supply.asign.type" | ||
746 | 478 | |||
747 | 479 | #. module: supply_control | ||
748 | 480 | #: report:report.sede.suministros:0 | ||
749 | 481 | msgid "Mes:" | ||
750 | 482 | msgstr "Mes:" | ||
751 | 483 | |||
752 | 484 | #. module: supply_control | ||
753 | 485 | #: field:diana.supply.asign,asigned_date:0 | ||
754 | 486 | #: field:diana.supply.lines,asigned_date:0 | ||
755 | 487 | msgid "Asignation Date" | ||
756 | 488 | msgstr "Fecha de asignación" | ||
757 | 489 | |||
758 | 490 | #. module: supply_control | ||
759 | 491 | #: view:diana.supply.lines:0 | ||
760 | 492 | #: report:report.sede.suministros:0 | ||
761 | 493 | msgid "Periodo" | ||
762 | 494 | msgstr "Periodo" | ||
763 | 495 | |||
764 | 496 | #. module: supply_control | ||
765 | 497 | #: view:diana.supply.printer:0 | ||
766 | 498 | msgid "Configuración de impresoras" | ||
767 | 499 | msgstr "Configuración de impresoras" | ||
768 | 500 | |||
769 | 501 | #. module: supply_control | ||
770 | 502 | #: field:diana.supply.asign,period_id:0 | ||
771 | 503 | #: field:diana.supply.lines,period_id:0 | ||
772 | 504 | msgid "Period" | ||
773 | 505 | msgstr "Período" | ||
774 | 506 | |||
775 | 507 | #. module: supply_control | ||
776 | 508 | #: field:diana.supply.printer,ip_address:0 | ||
777 | 509 | msgid "IP Address" | ||
778 | 510 | msgstr "Dirección IP" | ||
779 | 511 | |||
780 | 512 | #. module: supply_control | ||
781 | 513 | #: report:sede.suministro:0 | ||
782 | 514 | msgid "NOMBRE y APELLIDO" | ||
783 | 515 | msgstr "NOMBRE y APELLIDO" | ||
784 | 516 | |||
785 | 517 | #. module: supply_control | ||
786 | 518 | #: report:sede.suministro:0 | ||
787 | 519 | msgid "/ Pagina:" | ||
788 | 520 | msgstr "/ Pagina:" | ||
789 | 521 | |||
790 | 522 | #. module: supply_control | ||
791 | 523 | #: view:diana.supply.lines:0 | ||
792 | 524 | #: field:diana.supply.lines,delivered:0 | ||
793 | 525 | #: selection:diana.supply.lines,state:0 | ||
794 | 526 | msgid "Delivered" | ||
795 | 527 | msgstr "Entregado" | ||
796 | 528 | |||
797 | 529 | #. module: supply_control | ||
798 | 530 | #: selection:wizard.supply,estado:0 | ||
799 | 531 | msgid "Expirado" | ||
800 | 532 | msgstr "Expirado" | ||
801 | 533 | |||
802 | 534 | #. module: supply_control | ||
803 | 535 | #: view:diana.supply.lines:0 | ||
804 | 536 | msgid "Agrupar por..." | ||
805 | 537 | msgstr "Agrupar por..." | ||
806 | 538 | |||
807 | 539 | #. module: supply_control | ||
808 | 540 | #: selection:diana.supply.asign,state:0 | ||
809 | 541 | #: selection:wizard.supply,estado:0 | ||
810 | 542 | msgid "Borrador" | ||
811 | 543 | msgstr "Borrador" | ||
812 | 544 | |||
813 | 545 | #. module: supply_control | ||
814 | 546 | #: report:sede.suministro:0 | ||
815 | 547 | msgid "FECHA" | ||
816 | 548 | msgstr "FECHA" | ||
817 | 549 | |||
818 | 550 | #. module: supply_control | ||
819 | 551 | #: field:diana.supply.printer,machine_pass:0 | ||
820 | 552 | msgid "User pass" | ||
821 | 553 | msgstr "Contraseña de usuario" | ||
822 | 554 | |||
823 | 555 | #. module: supply_control | ||
824 | 556 | #: field:diana.supply.asign,asigned_type:0 | ||
825 | 557 | #: field:diana.supply.asign,name:0 | ||
826 | 558 | #: field:diana.supply.asign.type,name:0 | ||
827 | 559 | msgid "Tipo de Asignación" | ||
828 | 560 | msgstr "Tipo de Asignación" | ||
829 | 561 | |||
830 | 562 | #. module: supply_control | ||
831 | 563 | #: model:ir.actions.report.xml,name:supply_control.supply_report | ||
832 | 564 | msgid "Reporte de Suministro" | ||
833 | 565 | msgstr "Reporte de Suministro" | ||
834 | 566 | |||
835 | 567 | #. module: supply_control | ||
836 | 568 | #: report:sede.suministro:0 | ||
837 | 569 | msgid "Pag." | ||
838 | 570 | msgstr "Pag." | ||
839 | 571 | |||
840 | 572 | #. module: supply_control | ||
841 | 573 | #: field:diana.supply.printer,upload_dir:0 | ||
842 | 574 | msgid "Remote Directory" | ||
843 | 575 | msgstr "Directorio remoto" | ||
844 | 576 | |||
845 | 577 | #. module: supply_control | ||
846 | 578 | #: selection:diana.supply.asign.type,day_assig_defect:0 | ||
847 | 579 | msgid "Viernes" | ||
848 | 580 | msgstr "Viernes" | ||
849 | 581 | |||
850 | 582 | #. module: supply_control | ||
851 | 583 | #: field:diana.supply.asign,state:0 | ||
852 | 584 | #: view:diana.supply.printer:0 | ||
853 | 585 | msgid "Estatus" | ||
854 | 586 | msgstr "Estatus" | ||
855 | 587 | |||
856 | 588 | #. module: supply_control | ||
857 | 589 | #: view:diana.supply.asign:0 | ||
858 | 590 | msgid "Return to draft" | ||
859 | 591 | msgstr "Return to draft" | ||
860 | 592 | |||
861 | 593 | #. module: supply_control | ||
862 | 594 | #: view:diana.supply.lines:0 | ||
863 | 595 | msgid "Deliver" | ||
864 | 596 | msgstr "Entregar" | ||
865 | 597 | |||
866 | 598 | #. module: supply_control | ||
867 | 599 | #: model:ir.actions.report.xml,name:supply_control.supply_lines_sede_report | ||
868 | 600 | msgid "Reporte de Suministro por sede" | ||
869 | 601 | msgstr "Reporte de Suministro por sede" | ||
870 | 602 | |||
871 | 603 | #. module: supply_control | ||
872 | 604 | #: selection:wizard.supply,estado:0 | ||
873 | 605 | msgid "Entregado" | ||
874 | 606 | msgstr "Entregado" | ||
875 | 607 | |||
876 | 608 | #. module: supply_control | ||
877 | 609 | #: model:ir.actions.act_window,name:supply_control.action_printers_wizard_confirm | ||
878 | 610 | msgid "Printing Confirmation" | ||
879 | 611 | msgstr "Confirmación de impresión" | ||
880 | 612 | |||
881 | 613 | #. module: supply_control | ||
882 | 614 | #: model:ir.actions.report.xml,name:supply_control.supply_lines_report | ||
883 | 615 | msgid "Report Latex Supply Lines Sisb" | ||
884 | 616 | msgstr "Reporte latex de lineas de suministros SISB" | ||
885 | 617 | |||
886 | 618 | #. module: supply_control | ||
887 | 619 | #: view:diana.supply.asign:0 | ||
888 | 620 | msgid "¿Confirmar proceso de la creación de asignaciones?" | ||
889 | 621 | msgstr "¿Confirmar proceso de la creación de asignaciones?" | ||
890 | 622 | |||
891 | 623 | #. module: supply_control | ||
892 | 624 | #: report:report.sede.suministros:0 | ||
893 | 625 | msgid "TOTAL ENTREGADOS:" | ||
894 | 626 | msgstr "TOTAL ENTREGADOS:" | ||
895 | 627 | |||
896 | 628 | #. module: supply_control | ||
897 | 629 | #: report:sede.suministro:0 | ||
898 | 630 | msgid "CODIGO" | ||
899 | 631 | msgstr "CODIGO" | ||
900 | 632 | |||
901 | 633 | #. module: supply_control | ||
902 | 634 | #: view:diana.supply.lines:0 | ||
903 | 635 | #: selection:diana.supply.lines,state:0 | ||
904 | 636 | msgid "Expired" | ||
905 | 637 | msgstr "Expirado" | ||
906 | 638 | |||
907 | 639 | #. module: supply_control | ||
908 | 640 | #: field:diana.supply.asign.type,create_month:0 | ||
909 | 641 | msgid "Crear en el mes corriente?" | ||
910 | 642 | msgstr "Crear en el mes corriente?" | ||
911 | 643 | |||
912 | 644 | #. module: supply_control | ||
913 | 645 | #: field:diana.supply.asign,employee_ids:0 | ||
914 | 646 | msgid "Employees" | ||
915 | 647 | msgstr "Empleados" | ||
916 | 648 | |||
917 | 649 | #. module: supply_control | ||
918 | 650 | #: field:diana.supply.lines,asign_id:0 | ||
919 | 651 | msgid "Asignation" | ||
920 | 652 | msgstr "Asignación" | ||
921 | 653 | |||
922 | 654 | #. module: supply_control | ||
923 | 655 | #: report:report.sede.suministros:0 | ||
924 | 656 | msgid "Codigo" | ||
925 | 657 | msgstr "Codigo" | ||
926 | 658 | |||
927 | 659 | #. module: supply_control | ||
928 | 660 | #: field:diana.supply.asign.detail,name:0 | ||
929 | 661 | msgid "Descripción" | ||
930 | 662 | msgstr "Descripción" | ||
931 | 663 | |||
932 | 664 | #. module: supply_control | ||
933 | 665 | #: view:diana.supply.printers.wizard:0 | ||
934 | 666 | msgid "Yes" | ||
935 | 667 | msgstr "Si" | ||
936 | 668 | |||
937 | 669 | #. module: supply_control | ||
938 | 670 | #: report:report.sede.suministros:0 | ||
939 | 671 | msgid "Sede:" | ||
940 | 672 | msgstr "Sede:" | ||
941 | 673 | |||
942 | 674 | #. module: supply_control | ||
943 | 675 | #: field:diana.supply.asign.detail,qty:0 | ||
944 | 676 | #: report:report.sede.suministros:0 | ||
945 | 677 | msgid "Cantidad" | ||
946 | 678 | msgstr "Cantidad" | ||
947 | 679 | |||
948 | 680 | #. module: supply_control | ||
949 | 681 | #: field:diana.supply.printer,file_name:0 | ||
950 | 682 | msgid "File Name" | ||
951 | 683 | msgstr "Nombre del archivo" | ||
952 | 684 | |||
953 | 685 | #. module: supply_control | ||
954 | 686 | #: view:diana.supply.asign.type:0 | ||
955 | 687 | #: model:ir.ui.menu,name:supply_control.supply_configuration_type | ||
956 | 688 | msgid "Tipos de Asignaciones" | ||
957 | 689 | msgstr "Tipos de Asignaciones" | ||
958 | 690 | |||
959 | 691 | #. module: supply_control | ||
960 | 692 | #: selection:diana.supply.asign,state:0 | ||
961 | 693 | msgid "Asignado" | ||
962 | 694 | msgstr "Asignado" | ||
963 | 695 | |||
964 | 696 | #. module: supply_control | ||
965 | 697 | #: field:diana.supply.asign.type,monthly:0 | ||
966 | 698 | msgid "Crear una vez al mes?" | ||
967 | 699 | msgstr "Crear una vez al mes?" | ||
968 | 700 | |||
969 | 701 | #. module: supply_control | ||
970 | 702 | #: view:diana.supply.lines:0 | ||
971 | 703 | msgid "Asignaciónes" | ||
972 | 704 | msgstr "Asignaciónes" | ||
973 | 705 | |||
974 | 706 | #. module: supply_control | ||
975 | 707 | #: report:report.sede.suministros:0 | ||
976 | 708 | msgid "Total" | ||
977 | 709 | msgstr "Total" | ||
978 | 710 | |||
979 | 711 | #. module: supply_control | ||
980 | 712 | #: view:wizard.supply:0 | ||
981 | 713 | msgid "Imprimir Reporte" | ||
982 | 714 | msgstr "Imprimir Reporte" | ||
983 | 715 | |||
984 | 716 | #. module: supply_control | ||
985 | 717 | #: field:diana.supply.lines,print_verify:0 | ||
986 | 718 | msgid "Print verification" | ||
987 | 719 | msgstr "Verificación de impresión" | ||
988 | 324 | 720 | ||
989 | 325 | 721 | ||
990 | === modified file 'supply_control/model/diana_supply_lines.py' | |||
991 | --- supply_control/model/diana_supply_lines.py 2018-10-05 16:29:45 +0000 | |||
992 | +++ supply_control/model/diana_supply_lines.py 2018-12-06 12:31:45 +0000 | |||
993 | @@ -165,9 +165,11 @@ | |||
994 | 165 | 165 | ||
995 | 166 | error_imprimir = frc.transferAndprint() | 166 | error_imprimir = frc.transferAndprint() |
996 | 167 | 167 | ||
998 | 168 | if not error_imprimir: | 168 | if not error_imprimir[0]: |
999 | 169 | raise osv.except_osv( | 169 | raise osv.except_osv( |
1001 | 170 | ('Alert !'), ('Por favor verifique la conexion.')) | 170 | ('Alert !'), |
1002 | 171 | ('Por favor verifique la conexion.\n {}'.format( | ||
1003 | 172 | error_imprimir[1]))) | ||
1004 | 171 | 173 | ||
1005 | 172 | dicc_values = {'delivery_date': today, 'state': 'Delivered', | 174 | dicc_values = {'delivery_date': today, 'state': 'Delivered', |
1006 | 173 | 'delivered': True, 'expiration_date': None, | 175 | 'delivered': True, 'expiration_date': None, |
1007 | 174 | 176 | ||
1008 | === modified file 'supply_control/model/remote_print.py' | |||
1009 | --- supply_control/model/remote_print.py 2018-10-05 13:37:08 +0000 | |||
1010 | +++ supply_control/model/remote_print.py 2018-12-06 12:31:45 +0000 | |||
1011 | @@ -19,5 +19,5 @@ | |||
1012 | 19 | try: | 19 | try: |
1013 | 20 | res = cliente.imprimir(archivo) | 20 | res = cliente.imprimir(archivo) |
1014 | 21 | except Exception, e: | 21 | except Exception, e: |
1017 | 22 | return e | 22 | return False, e |
1018 | 23 | return res | 23 | return True, res |
1019 | 24 | 24 | ||
1020 | === modified file 'supply_control/view/diana_supply_view.xml' | |||
1021 | --- supply_control/view/diana_supply_view.xml 2018-10-05 16:29:45 +0000 | |||
1022 | +++ supply_control/view/diana_supply_view.xml 2018-12-06 12:31:45 +0000 | |||
1023 | @@ -37,12 +37,20 @@ | |||
1024 | 37 | <field name="day_assig_defect"/> | 37 | <field name="day_assig_defect"/> |
1025 | 38 | <field name="monthly"/> | 38 | <field name="monthly"/> |
1026 | 39 | <field name="create_month"/> | 39 | <field name="create_month"/> |
1033 | 40 | <field name="user_ids" nolabel="True" colspan="4" > | 40 | <notebook colspan="6"> |
1034 | 41 | <tree> | 41 | <page string="Configuration of users" name="configuration_user"> |
1035 | 42 | <field name="login"/> | 42 | <field name="user_ids" nolabel="1"> |
1036 | 43 | <field name="name"/> | 43 | <tree> |
1037 | 44 | </tree> | 44 | <field name="login"/> |
1038 | 45 | </field> | 45 | <field name="name"/> |
1039 | 46 | </tree> | ||
1040 | 47 | </field> | ||
1041 | 48 | </page> | ||
1042 | 49 | <page string="Notes" name="notes"> | ||
1043 | 50 | |||
1044 | 51 | </page> | ||
1045 | 52 | </notebook> | ||
1046 | 53 | |||
1047 | 46 | </form> | 54 | </form> |
1048 | 47 | </field> | 55 | </field> |
1049 | 48 | </record> | 56 | </record> |
1050 | 49 | 57 | ||
1051 | === added directory 'supply_control_update' | |||
1052 | === added file 'supply_control_update/README.md' | |||
1053 | === added file 'supply_control_update/__init__.py' | |||
1054 | --- supply_control_update/__init__.py 1970-01-01 00:00:00 +0000 | |||
1055 | +++ supply_control_update/__init__.py 2018-12-06 12:31:45 +0000 | |||
1056 | @@ -0,0 +1,2 @@ | |||
1057 | 1 | |||
1058 | 2 | from . import models | ||
1059 | 0 | 3 | ||
1060 | === added file 'supply_control_update/__openerp__.py' | |||
1061 | --- supply_control_update/__openerp__.py 1970-01-01 00:00:00 +0000 | |||
1062 | +++ supply_control_update/__openerp__.py 2018-12-06 12:31:45 +0000 | |||
1063 | @@ -0,0 +1,26 @@ | |||
1064 | 1 | |||
1065 | 2 | { | ||
1066 | 3 | 'name': 'Control de entrega de asignaciones - Update', | ||
1067 | 4 | 'version': '1.0.0', | ||
1068 | 5 | 'category': 'Human Resources', | ||
1069 | 6 | 'sequence': 40, | ||
1070 | 7 | 'complexity': 'normal', | ||
1071 | 8 | 'description': ''' | ||
1072 | 9 | Este modulo permite el control para la entrega de asignaciones en Industrias | ||
1073 | 10 | Diana C.A. y realizar la impresion de los tickets correspondientes. | ||
1074 | 11 | ''', | ||
1075 | 12 | 'author': 'Industrias Diana C.A.', | ||
1076 | 13 | 'website': 'http://www.industriasdiana.gob.ve', | ||
1077 | 14 | 'depends': [ | ||
1078 | 15 | 'supply_control' | ||
1079 | 16 | ], | ||
1080 | 17 | 'update_xml': [ | ||
1081 | 18 | 'security/supply_security.xml', | ||
1082 | 19 | 'security/ir.model.access.csv', | ||
1083 | 20 | 'views/hr_employee_views.xml', | ||
1084 | 21 | 'views/diana_supply_views.xml', | ||
1085 | 22 | ], | ||
1086 | 23 | 'data': [], | ||
1087 | 24 | 'installable': True, | ||
1088 | 25 | 'active': False | ||
1089 | 26 | } | ||
1090 | 0 | 27 | ||
1091 | === added directory 'supply_control_update/i18n' | |||
1092 | === added file 'supply_control_update/i18n/es_VE.po' | |||
1093 | --- supply_control_update/i18n/es_VE.po 1970-01-01 00:00:00 +0000 | |||
1094 | +++ supply_control_update/i18n/es_VE.po 2018-12-06 12:31:45 +0000 | |||
1095 | @@ -0,0 +1,154 @@ | |||
1096 | 1 | # Translation of OpenERP Server. | ||
1097 | 2 | # This file contains the translation of the following modules: | ||
1098 | 3 | # * supply_control_update | ||
1099 | 4 | # | ||
1100 | 5 | msgid "" | ||
1101 | 6 | msgstr "" | ||
1102 | 7 | "Project-Id-Version: OpenERP Server 6.0.4\n" | ||
1103 | 8 | "Report-Msgid-Bugs-To: support@openerp.com\n" | ||
1104 | 9 | "POT-Creation-Date: 2018-12-05 15:17+0000\n" | ||
1105 | 10 | "PO-Revision-Date: 2018-12-05 15:17+0000\n" | ||
1106 | 11 | "Last-Translator: <>\n" | ||
1107 | 12 | "Language-Team: \n" | ||
1108 | 13 | "MIME-Version: 1.0\n" | ||
1109 | 14 | "Content-Type: text/plain; charset=UTF-8\n" | ||
1110 | 15 | "Content-Transfer-Encoding: \n" | ||
1111 | 16 | "Plural-Forms: \n" | ||
1112 | 17 | |||
1113 | 18 | #. module: supply_control_update | ||
1114 | 19 | #: code:addons/supply_control_update/models/lock_assig.py:45 | ||
1115 | 20 | #, python-format | ||
1116 | 21 | msgid "The user {} add the list of blocked assignments {}" | ||
1117 | 22 | msgstr "El usuario {} agrego {}" | ||
1118 | 23 | |||
1119 | 24 | #. module: supply_control_update | ||
1120 | 25 | #: view:diana.supply.asign.type:0 | ||
1121 | 26 | msgid "Empleados no permitidos" | ||
1122 | 27 | msgstr "Empleados no permitidos" | ||
1123 | 28 | |||
1124 | 29 | #. module: supply_control_update | ||
1125 | 30 | #: field:hr.employee,lock_history_ids:0 | ||
1126 | 31 | #: model:ir.model,name:supply_control_update.model_diana_supply_lock_history | ||
1127 | 32 | msgid "Lock history" | ||
1128 | 33 | msgstr "Lock history" | ||
1129 | 34 | |||
1130 | 35 | #. module: supply_control_update | ||
1131 | 36 | #: sql_constraint:hr.employee:0 | ||
1132 | 37 | msgid "El numero de cedula del trabajador debe ser unico" | ||
1133 | 38 | msgstr "El numero de cedula del trabajador debe ser unico" | ||
1134 | 39 | |||
1135 | 40 | #. module: supply_control_update | ||
1136 | 41 | #: code:addons/supply_control_update/models/lock_assig.py:25 | ||
1137 | 42 | #: sql_constraint:diana.supply.lock.assignment:0 | ||
1138 | 43 | #, python-format | ||
1139 | 44 | msgid "You can not duplicate assignments in this section." | ||
1140 | 45 | msgstr "No puedes duplicar tipos de asignación en esta sección." | ||
1141 | 46 | |||
1142 | 47 | #. module: supply_control_update | ||
1143 | 48 | #: field:diana.supply.lock.assignment,date:0 | ||
1144 | 49 | msgid "Date lock" | ||
1145 | 50 | msgstr "Fecha" | ||
1146 | 51 | |||
1147 | 52 | #. module: supply_control_update | ||
1148 | 53 | #: field:diana.supply.lock.assignment,employee_id:0 | ||
1149 | 54 | #: field:diana.supply.lock.history,employee_id:0 | ||
1150 | 55 | #: model:ir.model,name:supply_control_update.model_hr_employee | ||
1151 | 56 | msgid "Employee" | ||
1152 | 57 | msgstr "Employee" | ||
1153 | 58 | |||
1154 | 59 | #. module: supply_control_update | ||
1155 | 60 | #: view:hr.employee:0 | ||
1156 | 61 | msgid "Todas las asignaciones bloqueadas..." | ||
1157 | 62 | msgstr "Todas las asignaciones bloqueadas..." | ||
1158 | 63 | |||
1159 | 64 | #. module: supply_control_update | ||
1160 | 65 | #: field:diana.supply.lock.assignment,asig_type:0 | ||
1161 | 66 | #: field:diana.supply.lock.history,asig_type:0 | ||
1162 | 67 | msgid "Type of assignment" | ||
1163 | 68 | msgstr "Tipo de asignación" | ||
1164 | 69 | |||
1165 | 70 | #. module: supply_control_update | ||
1166 | 71 | #: field:diana.supply.lock.history,name:0 | ||
1167 | 72 | msgid "Description" | ||
1168 | 73 | msgstr "Descripción" | ||
1169 | 74 | |||
1170 | 75 | #. module: supply_control_update | ||
1171 | 76 | #: field:diana.supply.asign.type,lock_assig_ids:0 | ||
1172 | 77 | #: view:hr.employee:0 | ||
1173 | 78 | #: field:hr.employee,lock_assig_ids:0 | ||
1174 | 79 | #: model:ir.model,name:supply_control_update.model_diana_supply_lock_assignment | ||
1175 | 80 | msgid "Lock assignments" | ||
1176 | 81 | msgstr "Asignaciones no permitidas" | ||
1177 | 82 | |||
1178 | 83 | #. module: supply_control_update | ||
1179 | 84 | #: field:diana.supply.lock.history,user_id:0 | ||
1180 | 85 | msgid "User" | ||
1181 | 86 | msgstr "Usuario" | ||
1182 | 87 | |||
1183 | 88 | #. module: supply_control_update | ||
1184 | 89 | #: field:diana.supply.lock.history,date:0 | ||
1185 | 90 | msgid "Date" | ||
1186 | 91 | msgstr "Fecha" | ||
1187 | 92 | |||
1188 | 93 | #. module: supply_control_update | ||
1189 | 94 | #: constraint:hr.employee:0 | ||
1190 | 95 | msgid "Error ! You cannot create recursive Hierarchy of Employees." | ||
1191 | 96 | msgstr "Error ! You cannot create recursive Hierarchy of Employees." | ||
1192 | 97 | |||
1193 | 98 | #. module: supply_control_update | ||
1194 | 99 | #: model:ir.model,name:supply_control_update.model_diana_supply_lines | ||
1195 | 100 | msgid "diana.supply.lines" | ||
1196 | 101 | msgstr "diana.supply.lines" | ||
1197 | 102 | |||
1198 | 103 | #. module: supply_control_update | ||
1199 | 104 | #: constraint:hr.employee:0 | ||
1200 | 105 | msgid "Error ! You cannot select a department for which the employee is the manager." | ||
1201 | 106 | msgstr "Error ! You cannot select a department for which the employee is the manager." | ||
1202 | 107 | |||
1203 | 108 | #. module: supply_control_update | ||
1204 | 109 | #: code:addons/supply_control_update/models/supply_control.py:44 | ||
1205 | 110 | #, python-format | ||
1206 | 111 | msgid "Error!" | ||
1207 | 112 | msgstr "Error!" | ||
1208 | 113 | |||
1209 | 114 | #. module: supply_control_update | ||
1210 | 115 | #: field:diana.supply.lock.assignment,name:0 | ||
1211 | 116 | msgid "Supply Reference" | ||
1212 | 117 | msgstr "Supply Reference" | ||
1213 | 118 | |||
1214 | 119 | #. module: supply_control_update | ||
1215 | 120 | #: sql_constraint:hr.employee:0 | ||
1216 | 121 | msgid "El codigo del trabajador debe ser unico" | ||
1217 | 122 | msgstr "El codigo del trabajador debe ser unico" | ||
1218 | 123 | |||
1219 | 124 | #. module: supply_control_update | ||
1220 | 125 | #: model:ir.model,name:supply_control_update.model_diana_supply_asign_type | ||
1221 | 126 | msgid "diana.supply.asign.type" | ||
1222 | 127 | msgstr "diana.supply.asign.type" | ||
1223 | 128 | |||
1224 | 129 | #. module: supply_control_update | ||
1225 | 130 | #: view:hr.employee:0 | ||
1226 | 131 | msgid "History" | ||
1227 | 132 | msgstr "Historial" | ||
1228 | 133 | |||
1229 | 134 | #. module: supply_control_update | ||
1230 | 135 | #: code:addons/supply_control_update/models/lock_assig.py:68 | ||
1231 | 136 | #, python-format | ||
1232 | 137 | msgid "The user {} remove the list of blocked assignments {}" | ||
1233 | 138 | msgstr "El usuario {} elimino {}" | ||
1234 | 139 | |||
1235 | 140 | #. module: supply_control_update | ||
1236 | 141 | #: sql_constraint:hr.employee:0 | ||
1237 | 142 | msgid "La cuenta bancaria seleccionada ya esta asignada a otro Trabajador" | ||
1238 | 143 | msgstr "La cuenta bancaria seleccionada ya esta asignada a otro Trabajador" | ||
1239 | 144 | |||
1240 | 145 | #. module: supply_control_update | ||
1241 | 146 | #: field:hr.employee,lock_all:0 | ||
1242 | 147 | msgid "Lock all" | ||
1243 | 148 | msgstr "Bloquear todas las asignaciones" | ||
1244 | 149 | |||
1245 | 150 | #. module: supply_control_update | ||
1246 | 151 | #: view:hr.employee:0 | ||
1247 | 152 | msgid "Message" | ||
1248 | 153 | msgstr "Mensaje" | ||
1249 | 154 | |||
1250 | 0 | 155 | ||
1251 | === added directory 'supply_control_update/models' | |||
1252 | === added file 'supply_control_update/models/__init__.py' | |||
1253 | --- supply_control_update/models/__init__.py 1970-01-01 00:00:00 +0000 | |||
1254 | +++ supply_control_update/models/__init__.py 2018-12-06 12:31:45 +0000 | |||
1255 | @@ -0,0 +1,4 @@ | |||
1256 | 1 | |||
1257 | 2 | from . import lock_assig | ||
1258 | 3 | from . import hr_employee | ||
1259 | 4 | from . import supply_control | ||
1260 | 0 | 5 | ||
1261 | === added file 'supply_control_update/models/hr_employee.py' | |||
1262 | --- supply_control_update/models/hr_employee.py 1970-01-01 00:00:00 +0000 | |||
1263 | +++ supply_control_update/models/hr_employee.py 2018-12-06 12:31:45 +0000 | |||
1264 | @@ -0,0 +1,54 @@ | |||
1265 | 1 | |||
1266 | 2 | from datetime import datetime | ||
1267 | 3 | |||
1268 | 4 | from osv import fields, osv | ||
1269 | 5 | from tools.translate import _ | ||
1270 | 6 | |||
1271 | 7 | |||
1272 | 8 | class Employee(osv.osv): | ||
1273 | 9 | """.""" | ||
1274 | 10 | |||
1275 | 11 | _inherit = 'hr.employee' | ||
1276 | 12 | _columns = { | ||
1277 | 13 | 'lock_assig_ids': fields.one2many( | ||
1278 | 14 | 'diana.supply.lock.assignment', 'employee_id', | ||
1279 | 15 | 'Lock assignments'), | ||
1280 | 16 | 'lock_history_ids': fields.one2many( | ||
1281 | 17 | 'diana.supply.lock.history', 'employee_id', | ||
1282 | 18 | 'Lock history'), | ||
1283 | 19 | 'lock_all': fields.boolean('Lock all') | ||
1284 | 20 | } | ||
1285 | 21 | |||
1286 | 22 | def write(self, cr, uid, ids, vals, context=None): | ||
1287 | 23 | """.""" | ||
1288 | 24 | if context is None: | ||
1289 | 25 | context = {} | ||
1290 | 26 | |||
1291 | 27 | res = super(Employee, self).write( | ||
1292 | 28 | cr, uid, ids, vals, context) | ||
1293 | 29 | |||
1294 | 30 | if res and 'lock_all' in vals: | ||
1295 | 31 | history = self.pool.get('diana.supply.lock.history') | ||
1296 | 32 | users = self.pool.get('res.users') | ||
1297 | 33 | user = users.browse(cr, uid, uid) | ||
1298 | 34 | lock_all = vals['lock_all'] | ||
1299 | 35 | if lock_all: | ||
1300 | 36 | msg = _( | ||
1301 | 37 | 'El usuario {} bloquea todas las asignaciones.'.format( | ||
1302 | 38 | user.login)) | ||
1303 | 39 | else: | ||
1304 | 40 | msg = _( | ||
1305 | 41 | 'El usuario {} desbloquea todas las asignaciones.'.format( | ||
1306 | 42 | user.login)) | ||
1307 | 43 | val = { | ||
1308 | 44 | 'name': msg, | ||
1309 | 45 | 'employee_id': ids[0], | ||
1310 | 46 | 'asig_type': False, | ||
1311 | 47 | 'user_id': uid, | ||
1312 | 48 | 'date': datetime.now() | ||
1313 | 49 | } | ||
1314 | 50 | history.create(cr, uid, val) | ||
1315 | 51 | return res | ||
1316 | 52 | |||
1317 | 53 | |||
1318 | 54 | Employee() | ||
1319 | 0 | 55 | ||
1320 | === added file 'supply_control_update/models/lock_assig.py' | |||
1321 | --- supply_control_update/models/lock_assig.py 1970-01-01 00:00:00 +0000 | |||
1322 | +++ supply_control_update/models/lock_assig.py 2018-12-06 12:31:45 +0000 | |||
1323 | @@ -0,0 +1,103 @@ | |||
1324 | 1 | |||
1325 | 2 | import unicodedata | ||
1326 | 3 | |||
1327 | 4 | from datetime import datetime | ||
1328 | 5 | |||
1329 | 6 | from osv import fields, osv | ||
1330 | 7 | from tools.translate import _ | ||
1331 | 8 | |||
1332 | 9 | |||
1333 | 10 | class LockAssignments(osv.osv): | ||
1334 | 11 | """.""" | ||
1335 | 12 | |||
1336 | 13 | _name = 'diana.supply.lock.assignment' | ||
1337 | 14 | _description = 'Lock assignments' | ||
1338 | 15 | _columns = { | ||
1339 | 16 | 'name': fields.char('Supply Reference', size=128), | ||
1340 | 17 | 'employee_id': fields.many2one('hr.employee', 'Employee'), | ||
1341 | 18 | 'asig_type': fields.many2one( | ||
1342 | 19 | 'diana.supply.asign.type', 'Type of assignment', required=True), | ||
1343 | 20 | 'date': fields.date('Date lock'), | ||
1344 | 21 | } | ||
1345 | 22 | _defaults = {} | ||
1346 | 23 | _sql_constraints = [ | ||
1347 | 24 | ('unique_type_assig', 'unique(asig_type, employee_id)', | ||
1348 | 25 | _('You can not duplicate assignments in this section.')) | ||
1349 | 26 | ] | ||
1350 | 27 | |||
1351 | 28 | def elimina_tildes(self, s): | ||
1352 | 29 | """.""" | ||
1353 | 30 | return ''.join( | ||
1354 | 31 | (c for c in unicodedata.normalize('NFD', s) | ||
1355 | 32 | if unicodedata.category(c) != 'Mn') | ||
1356 | 33 | ).replace("'", "") | ||
1357 | 34 | |||
1358 | 35 | def create(self, cr, uid, vals, context=None): | ||
1359 | 36 | """.""" | ||
1360 | 37 | if context is None: | ||
1361 | 38 | context = {} | ||
1362 | 39 | history = self.pool.get('diana.supply.lock.history') | ||
1363 | 40 | users = self.pool.get('res.users') | ||
1364 | 41 | type_assig = self.pool.get('diana.supply.asign.type') | ||
1365 | 42 | user = users.browse(cr, uid, uid, context=context) | ||
1366 | 43 | lock_asig = type_assig.browse(cr, uid, vals['asig_type']) | ||
1367 | 44 | msg = _( | ||
1368 | 45 | 'The user {} add the list of blocked assignments {}').format( | ||
1369 | 46 | user.login, self.elimina_tildes(lock_asig.name)) | ||
1370 | 47 | val = { | ||
1371 | 48 | 'name': msg, | ||
1372 | 49 | 'employee_id': vals['employee_id'], | ||
1373 | 50 | 'asig_type': vals['asig_type'], | ||
1374 | 51 | 'user_id': user.id, | ||
1375 | 52 | 'date': datetime.now() | ||
1376 | 53 | } | ||
1377 | 54 | |||
1378 | 55 | res = super(LockAssignments, self).create(cr, uid, vals, context) | ||
1379 | 56 | if res: | ||
1380 | 57 | history.create(cr, uid, val, context=context) | ||
1381 | 58 | return res | ||
1382 | 59 | |||
1383 | 60 | def unlink(self, cr, uid, ids, context=None): | ||
1384 | 61 | """.""" | ||
1385 | 62 | if context is None: | ||
1386 | 63 | context = {} | ||
1387 | 64 | history = self.pool.get('diana.supply.lock.history') | ||
1388 | 65 | users = self.pool.get('res.users') | ||
1389 | 66 | user = users.browse(cr, uid, uid, context=context) | ||
1390 | 67 | lock_asig = self.browse(cr, uid, ids) | ||
1391 | 68 | msg = _( | ||
1392 | 69 | 'The user {} remove the list of blocked assignments {}').format( | ||
1393 | 70 | user.login, self.elimina_tildes(lock_asig[0].asig_type.name)) | ||
1394 | 71 | vals = { | ||
1395 | 72 | 'name': msg, | ||
1396 | 73 | 'employee_id': lock_asig[0].employee_id.id, | ||
1397 | 74 | 'asig_type': lock_asig[0].asig_type.id, | ||
1398 | 75 | 'user_id': user.id, | ||
1399 | 76 | 'date': datetime.now() | ||
1400 | 77 | } | ||
1401 | 78 | res = super(LockAssignments, self).unlink(cr, uid, ids, context) | ||
1402 | 79 | if res: | ||
1403 | 80 | history.create(cr, uid, vals, context=context) | ||
1404 | 81 | return res | ||
1405 | 82 | |||
1406 | 83 | |||
1407 | 84 | LockAssignments() | ||
1408 | 85 | |||
1409 | 86 | |||
1410 | 87 | class LockHistory(osv.osv): | ||
1411 | 88 | """.""" | ||
1412 | 89 | |||
1413 | 90 | _name = 'diana.supply.lock.history' | ||
1414 | 91 | _description = 'Lock history' | ||
1415 | 92 | _order = 'id desc' | ||
1416 | 93 | _columns = { | ||
1417 | 94 | 'name': fields.char('Description', size=256), | ||
1418 | 95 | 'employee_id': fields.many2one('hr.employee', 'Employee'), | ||
1419 | 96 | 'asig_type': fields.many2one( | ||
1420 | 97 | 'diana.supply.asign.type', 'Type of assignment'), | ||
1421 | 98 | 'user_id': fields.many2one('res.users', 'User'), | ||
1422 | 99 | 'date': fields.datetime('Date') | ||
1423 | 100 | } | ||
1424 | 101 | |||
1425 | 102 | |||
1426 | 103 | LockHistory() | ||
1427 | 0 | 104 | ||
1428 | === added file 'supply_control_update/models/supply_control.py' | |||
1429 | --- supply_control_update/models/supply_control.py 1970-01-01 00:00:00 +0000 | |||
1430 | +++ supply_control_update/models/supply_control.py 2018-12-06 12:31:45 +0000 | |||
1431 | @@ -0,0 +1,55 @@ | |||
1432 | 1 | |||
1433 | 2 | import unicodedata | ||
1434 | 3 | |||
1435 | 4 | from osv import fields, osv | ||
1436 | 5 | from tools.translate import _ | ||
1437 | 6 | |||
1438 | 7 | |||
1439 | 8 | class diana_supply_asign_type(osv.osv): | ||
1440 | 9 | """.""" | ||
1441 | 10 | |||
1442 | 11 | _inherit = 'diana.supply.asign.type' | ||
1443 | 12 | _columns = { | ||
1444 | 13 | 'lock_assig_ids': fields.one2many( | ||
1445 | 14 | 'diana.supply.lock.assignment', 'asig_type', | ||
1446 | 15 | 'Lock assignments'), | ||
1447 | 16 | } | ||
1448 | 17 | |||
1449 | 18 | |||
1450 | 19 | diana_supply_asign_type() | ||
1451 | 20 | |||
1452 | 21 | |||
1453 | 22 | class diana_supply_lines(osv.osv): | ||
1454 | 23 | """.""" | ||
1455 | 24 | |||
1456 | 25 | _inherit = 'diana.supply.lines' | ||
1457 | 26 | |||
1458 | 27 | def elimina_tildes(self, s): | ||
1459 | 28 | """.""" | ||
1460 | 29 | return ''.join( | ||
1461 | 30 | (c for c in unicodedata.normalize('NFD', s) | ||
1462 | 31 | if unicodedata.category(c) != 'Mn') | ||
1463 | 32 | ).replace("'", "") | ||
1464 | 33 | |||
1465 | 34 | def action_deliver(self, cr, uid, ids, context=None): | ||
1466 | 35 | """.""" | ||
1467 | 36 | obj_brw = self.browse(cr, uid, ids) | ||
1468 | 37 | for line in obj_brw: | ||
1469 | 38 | employee = line.employee_id | ||
1470 | 39 | asigned_type = line.asigned_type | ||
1471 | 40 | if employee.lock_all or employee.no_remunerado or\ | ||
1472 | 41 | asigned_type.id in [i.asig_type.id | ||
1473 | 42 | for i in employee.lock_assig_ids]: | ||
1474 | 43 | raise osv.except_osv( | ||
1475 | 44 | _('Error!'), _( | ||
1476 | 45 | 'El trabajador {} con el cod. {} no tiene las ' | ||
1477 | 46 | 'condiciones para recibir {}'.format( | ||
1478 | 47 | self.elimina_tildes(employee.name), | ||
1479 | 48 | employee.cod_number, | ||
1480 | 49 | self.elimina_tildes(line.asigned_type.name).upper() | ||
1481 | 50 | ))) | ||
1482 | 51 | return super( | ||
1483 | 52 | diana_supply_lines, self).action_deliver(cr, uid, ids, context) | ||
1484 | 53 | |||
1485 | 54 | |||
1486 | 55 | diana_supply_lines() | ||
1487 | 0 | 56 | ||
1488 | === added directory 'supply_control_update/security' | |||
1489 | === added file 'supply_control_update/security/ir.model.access.csv' | |||
1490 | --- supply_control_update/security/ir.model.access.csv 1970-01-01 00:00:00 +0000 | |||
1491 | +++ supply_control_update/security/ir.model.access.csv 2018-12-06 12:31:45 +0000 | |||
1492 | @@ -0,0 +1,10 @@ | |||
1493 | 1 | id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink | ||
1494 | 2 | |||
1495 | 3 | access_control_update_manager,diana.supply.lock.assignment,model_diana_supply_lock_assignment,group_lock_assignment_supply_manager,1,1,1,1 | ||
1496 | 4 | |||
1497 | 5 | access_control_update_history_manager,diana.supply.lock.history,model_diana_supply_lock_history,group_lock_assignment_supply_manager,1,1,1,0 | ||
1498 | 6 | |||
1499 | 7 | |||
1500 | 8 | access_control_update_user,diana.supply.lock.assignment,model_diana_supply_lock_assignment,group_lock_assignment_supply_user,1,0,0,0 | ||
1501 | 9 | |||
1502 | 10 | access_control_update_history_user,diana.supply.lock.history,model_diana_supply_lock_history,group_lock_assignment_supply_user,1,0,0,0 | ||
1503 | 0 | \ No newline at end of file | 11 | \ No newline at end of file |
1504 | 1 | 12 | ||
1505 | === added file 'supply_control_update/security/supply_security.xml' | |||
1506 | --- supply_control_update/security/supply_security.xml 1970-01-01 00:00:00 +0000 | |||
1507 | +++ supply_control_update/security/supply_security.xml 2018-12-06 12:31:45 +0000 | |||
1508 | @@ -0,0 +1,12 @@ | |||
1509 | 1 | <?xml version="1.0" encoding="utf-8"?> | ||
1510 | 2 | <openerp> | ||
1511 | 3 | <data noupdate="1"> | ||
1512 | 4 | <record id="group_lock_assignment_supply_manager" model="res.groups"> | ||
1513 | 5 | <field name="name">Asignaciones no permitidas / Manager</field> | ||
1514 | 6 | </record> | ||
1515 | 7 | |||
1516 | 8 | <record id="group_lock_assignment_supply_user" model="res.groups"> | ||
1517 | 9 | <field name="name">Asignaciones no permitidas / user</field> | ||
1518 | 10 | </record> | ||
1519 | 11 | </data> | ||
1520 | 12 | </openerp> | ||
1521 | 0 | 13 | ||
1522 | === added directory 'supply_control_update/views' | |||
1523 | === added file 'supply_control_update/views/diana_supply_views.xml' | |||
1524 | --- supply_control_update/views/diana_supply_views.xml 1970-01-01 00:00:00 +0000 | |||
1525 | +++ supply_control_update/views/diana_supply_views.xml 2018-12-06 12:31:45 +0000 | |||
1526 | @@ -0,0 +1,24 @@ | |||
1527 | 1 | <?xml version="1.0" encoding="utf-8"?> | ||
1528 | 2 | <openerp> | ||
1529 | 3 | <data> | ||
1530 | 4 | |||
1531 | 5 | <record model="ir.ui.view" id="diana_supply_asign_type_update"> | ||
1532 | 6 | <field name="name">diana.supply.asign.type.update</field> | ||
1533 | 7 | <field name="model">diana.supply.asign.type</field> | ||
1534 | 8 | <field name="type">form</field> | ||
1535 | 9 | <field name="inherit_id" ref="supply_control.view_diana_supply_asign_type_form" /> | ||
1536 | 10 | <field name="arch" type="xml"> | ||
1537 | 11 | <xpath expr='/form/notebook/page[@name="configuration_user"]' position='after'> | ||
1538 | 12 | <page string="Empleados no permitidos"> | ||
1539 | 13 | <field name='lock_assig_ids' nolabel="1" readonly="1"> | ||
1540 | 14 | <tree editable="bottom"> | ||
1541 | 15 | <field name='employee_id'/> | ||
1542 | 16 | </tree> | ||
1543 | 17 | </field> | ||
1544 | 18 | </page> | ||
1545 | 19 | </xpath> | ||
1546 | 20 | </field> | ||
1547 | 21 | </record> | ||
1548 | 22 | |||
1549 | 23 | </data> | ||
1550 | 24 | </openerp> | ||
1551 | 0 | 25 | ||
1552 | === added file 'supply_control_update/views/hr_employee_views.xml' | |||
1553 | --- supply_control_update/views/hr_employee_views.xml 1970-01-01 00:00:00 +0000 | |||
1554 | +++ supply_control_update/views/hr_employee_views.xml 2018-12-06 12:31:45 +0000 | |||
1555 | @@ -0,0 +1,50 @@ | |||
1556 | 1 | <?xml version="1.0" encoding="utf-8"?> | ||
1557 | 2 | <openerp> | ||
1558 | 3 | <data> | ||
1559 | 4 | |||
1560 | 5 | <record model="ir.ui.view" id="view_employee_form_lock_assig"> | ||
1561 | 6 | <field name="name">view.employee.form.lock.assig</field> | ||
1562 | 7 | <field name="model">hr.employee</field> | ||
1563 | 8 | <field name="type">form</field> | ||
1564 | 9 | <field name="inherit_id" ref="sisb_nomina.view_employee_form_inherit_2"/> | ||
1565 | 10 | <field name="arch" type="xml"> | ||
1566 | 11 | <xpath expr='/form/notebook/page[@string="Notes"]' position='before'> | ||
1567 | 12 | |||
1568 | 13 | <page string="Lock assignments" groups="supply_control_update.group_lock_assignment_supply_manager"> | ||
1569 | 14 | <group colspan="4" col="4"> | ||
1570 | 15 | <field name='lock_all'/> | ||
1571 | 16 | </group> | ||
1572 | 17 | <label string="Todas las asignaciones bloqueadas..." attrs="{'invisible':[('lock_all','=', False)]}"/> | ||
1573 | 18 | <newline/> | ||
1574 | 19 | |||
1575 | 20 | <notebook> | ||
1576 | 21 | <page string="Lock assignments" attrs="{'invisible':[('lock_all', '=', True)]}"> | ||
1577 | 22 | <field name="lock_assig_ids" nolabel="1" attrs="{'readonly':[('lock_all','=', True)]}"> | ||
1578 | 23 | |||
1579 | 24 | <tree editable="bottom"> | ||
1580 | 25 | <field name='asig_type'/> | ||
1581 | 26 | </tree> | ||
1582 | 27 | |||
1583 | 28 | </field> | ||
1584 | 29 | </page> | ||
1585 | 30 | <page string="History"> | ||
1586 | 31 | <field name="lock_history_ids" nolabel="1" readonly='1'> | ||
1587 | 32 | |||
1588 | 33 | <tree editable="bottom"> | ||
1589 | 34 | <field name='date'/> | ||
1590 | 35 | <field name='user_id'/> | ||
1591 | 36 | <field name='name' string="Message"/> | ||
1592 | 37 | <field name='asig_type'/> | ||
1593 | 38 | </tree> | ||
1594 | 39 | |||
1595 | 40 | </field> | ||
1596 | 41 | </page> | ||
1597 | 42 | </notebook> | ||
1598 | 43 | |||
1599 | 44 | </page> | ||
1600 | 45 | </xpath> | ||
1601 | 46 | </field> | ||
1602 | 47 | </record> | ||
1603 | 48 | |||
1604 | 49 | </data> | ||
1605 | 50 | </openerp> | ||
1606 | 0 | 51 | ||
1607 | === added file 'supply_control_update/views/lock_assig_views.xml' | |||
1608 | --- supply_control_update/views/lock_assig_views.xml 1970-01-01 00:00:00 +0000 | |||
1609 | +++ supply_control_update/views/lock_assig_views.xml 2018-12-06 12:31:45 +0000 | |||
1610 | @@ -0,0 +1,2 @@ | |||
1611 | 1 | |||
1612 | 2 |