diff --git a/de_DE.csv b/de_DE.csv index 85cb042e5f..a34c2ce0d3 100644 --- a/de_DE.csv +++ b/de_DE.csv @@ -99,7 +99,7 @@ field,"stock.shipment.in.return,state",0,State,Status,0 field,"stock.shipment.in.return,to_location",0,To Location,Zu Lagerort,0 field,"stock.shipment.in,state",0,State,Status,0 field,"stock.shipment.in,supplier",0,Supplier,Lieferant,0 -field,"stock.shipment.internal.assign.ask_force,moves",0,Moves,Bewegungen,0 +field,"stock.shipment.internal.assign.assign_failed,moves",0,Moves,Bewegungen,0 field,"stock.shipment.internal,code",0,Code,Code,0 field,"stock.shipment.internal,effective_date",0,Effective Date,Effektives Datum,0 field,"stock.shipment.internal,from_location",0,From Location,Von Lagerort,0 @@ -110,7 +110,7 @@ field,"stock.shipment.internal,reference",0,Reference,Referenz,0 field,"stock.shipment.internal,state",0,State,Status,0 field,"stock.shipment.internal,to_location",0,To Location,Zu Lagerort,0 field,"stock.shipment.in,warehouse",0,Warehouse,Warenlager,0 -field,"stock.shipment.out.assign.ask_force,inventory_moves",0,Inventory Moves,Bestandsänderungen,0 +field,"stock.shipment.out.assign.assign_failed,inventory_moves",0,Inventory Moves,Bestandsänderungen,0 field,"stock.shipment.out,code",0,Code,Code,0 field,"stock.shipment.out,customer",0,Customer,Kunde,0 field,"stock.shipment.out,delivery_address",0,Delivery Address,Lieferadresse,0 @@ -241,11 +241,11 @@ model,"stock.location_stock_date.init,name",0,Compute stock quantities,Berechnun model,"stock.move,name",0,Stock Move,Lager Bewegung,0 model,"stock.product_stock_date.init,name",0,Compute stock quantities,Berechnung Lagerbestände,0 model,"stock.shipment.in,name",0,Supplier Shipment,Lieferant Lieferposten,0 -model,"stock.shipment.in.return.assign.ask_force,name",0,Assign Supplier Return Shipment Ask Force,Zuweisung Lieferposten Warenrückgabe Erzwungen,0 +model,"stock.shipment.in.return.assign.assign_failed,name",0,Assign Supplier Return Shipment Ask Force,Zuweisung Lieferposten Warenrückgabe Erzwungen,0 model,"stock.shipment.in.return,name",0,Supplier Return Shipment,Warenrückgabe Lieferant,0 -model,"stock.shipment.internal.assign.ask_force,name",0,Assign Shipment Internal Ask Force,Zuweisung Lieferposten Intern Erzwungen,0 +model,"stock.shipment.internal.assign.assign_failed,name",0,Assign Shipment Internal Ask Force,Zuweisung Lieferposten Intern Erzwungen,0 model,"stock.shipment.internal,name",0,Internal Shipment,Interner Lieferposten,0 -model,"stock.shipment.out.assign.ask_force,name",0,Assign Shipment Out Ask Force,Zuweisung Lieferposten Ausgehend Erzwungen,0 +model,"stock.shipment.out.assign.assign_failed,name",0,Assign Shipment Out Ask Force,Zuweisung Lieferposten Ausgehend Erzwungen,0 model,"stock.shipment.out,name",0,Customer Shipment,Lieferposten Kunde,0 model,"stock.shipment.out.return,name",0,Customer Return Shipment,Warenrücknahme Kunde,0 model,"workflow.activity,name",shipmentout_act_assigned,Assigned,Zugewiesen,0 @@ -422,9 +422,9 @@ view,stock.shipment.in.return,0,Reset to Draft,Auf Entwurf zurücksetzen,0 view,stock.shipment.in.return,0,Supplier Return Shipment,Warenrückgabe Lieferant,0 view,stock.shipment.in.return,0,Supplier Return Shipments,Warenrückgaben (an Lieferanten),0 view,stock.shipment.in.return,0,Waiting,Wartend,0 -view,stock.shipment.in.return.assign.ask_force,0,Moves,Bewegungen,0 -view,stock.shipment.in.return.assign.ask_force,0,Unable to Assign,Fehlmenge Zuweisung,0 -view,stock.shipment.in.return.assign.ask_force,0,Unable to assign those products:,Folgende Artikel können nicht zugewiesen werden:,0 +view,stock.shipment.in.return.assign.assign_failed,0,Moves,Bewegungen,0 +view,stock.shipment.in.return.assign.assign_failed,0,Unable to Assign,Fehlmenge Zuweisung,0 +view,stock.shipment.in.return.assign.assign_failed,0,Unable to assign those products:,Folgende Artikel können nicht zugewiesen werden:,0 view,stock.shipment.internal,0,Assign,Zuweisen,0 view,stock.shipment.internal,0,Cancel,Annullieren,0 view,stock.shipment.internal,0,Done,Erledigt,0 @@ -436,9 +436,9 @@ view,stock.shipment.internal,0,Reset to Draft,Auf Entwurf zurücksetzen,0 view,stock.shipment.internal,0,Set Done,Auf Erledigt setzen,0 view,stock.shipment.internal,0,Set Waiting,Auf Wartend setzen,0 view,stock.shipment.internal,0,Waiting,Wartend,0 -view,stock.shipment.internal.assign.ask_force,0,Moves,Bewegungen,0 -view,stock.shipment.internal.assign.ask_force,0,Unable to Assign,Fehlmenge Zuweisung,0 -view,stock.shipment.internal.assign.ask_force,0,Unable to assign those products:,Folgende Artikel können nicht zugewiesen werden:,0 +view,stock.shipment.internal.assign.assign_failed,0,Moves,Bewegungen,0 +view,stock.shipment.internal.assign.assign_failed,0,Unable to Assign,Fehlmenge Zuweisung,0 +view,stock.shipment.internal.assign.assign_failed,0,Unable to assign those products:,Folgende Artikel können nicht zugewiesen werden:,0 view,stock.shipment.out,0,Are you sure to force assignation?,Zuweisung wirklich erzwingen?,0 view,stock.shipment.out,0,Assign,Zuweisen,0 view,stock.shipment.out,0,Cancel,Annullieren,0 @@ -455,9 +455,9 @@ view,stock.shipment.out,0,Set Done,Auf Erledigt setzen,0 view,stock.shipment.out,0,Set Waiting,Auf Wartend setzen,0 view,stock.shipment.out,0,Unpack,Entpackt,0 view,stock.shipment.out,0,Waiting,Wartend,0 -view,stock.shipment.out.assign.ask_force,0,Inventory Moves,Bestandsänderungen,0 -view,stock.shipment.out.assign.ask_force,0,Unable to Assign,Fehlmenge Zuweisung,0 -view,stock.shipment.out.assign.ask_force,0,Unable to assign those products:,Folgende Artikel können nicht zugewiesen werden:,0 +view,stock.shipment.out.assign.assign_failed,0,Inventory Moves,Bestandsänderungen,0 +view,stock.shipment.out.assign.assign_failed,0,Unable to Assign,Fehlmenge Zuweisung,0 +view,stock.shipment.out.assign.assign_failed,0,Unable to assign those products:,Folgende Artikel können nicht zugewiesen werden:,0 view,stock.shipment.out.return,0,Cancel,Annullieren,0 view,stock.shipment.out.return,0,Customer Return Shipment,Warenrücknahme Kunde,0 view,stock.shipment.out.return,0,Customer Return Shipments,Warenrücknahmen (von Kunden),0 @@ -473,7 +473,10 @@ wizard_button,"stock.product.open,init,end",0,Cancel,Abbrechen,0 wizard_button,"stock.product.open,init,open",0,Open,Öffnen,0 wizard_button,"stock.shipment.in.return.assign,ask_force,end",0,Ok,OK,0 wizard_button,"stock.shipment.in.return.assign,ask_force,force",0,Force Assign,Zuweisung erzwingen,0 +wizard_button,"stock.shipment.in.return.assign,assign_failed,end",0,Ok,OK,0 wizard_button,"stock.shipment.internal.assign,ask_force,end",0,Ok,OK,0 wizard_button,"stock.shipment.internal.assign,ask_force,force",0,Force Assign,Zuweisung erzwingen,0 +wizard_button,"stock.shipment.internal.assign,assign_failed,end",0,Ok,OK,0 wizard_button,"stock.shipment.out.assign,ask_force,end",0,Ok,OK,0 wizard_button,"stock.shipment.out.assign,ask_force,force",0,Force Assign,Zuweisung erzwingen,0 +wizard_button,"stock.shipment.out.assign,assign_failed,end",0,Ok,OK,0 \ No newline at end of file diff --git a/es_CO.csv b/es_CO.csv index a4366eb447..80fa799c33 100644 --- a/es_CO.csv +++ b/es_CO.csv @@ -87,7 +87,7 @@ field,"stock.shipment.in,moves",0,Moves,Movimientos,0 field,"stock.shipment.in,planned_date",0,Planned Date,Fecha Planeada,0 field,"stock.shipment.in,rec_name",0,Name,Nombre,0 field,"stock.shipment.in,reference",0,Reference,Referencia,0 -field,"stock.shipment.in.return.assign.ask_force,moves",0,Moves,Movimientos,0 +field,"stock.shipment.in.return.assign.assign_failed,moves",0,Moves,Movimientos,0 field,"stock.shipment.in.return,code",0,Code,Código,0 field,"stock.shipment.in.return,effective_date",0,Effective Date,Fecha Efectiva,0 field,"stock.shipment.in.return,from_location",0,From Location,Lugar Inicial,0 @@ -99,7 +99,7 @@ field,"stock.shipment.in.return,state",0,State,Estado,0 field,"stock.shipment.in.return,to_location",0,To Location,Al Lugar:,0 field,"stock.shipment.in,state",0,State,Estado,0 field,"stock.shipment.in,supplier",0,Supplier,Proveedor,0 -field,"stock.shipment.internal.assign.ask_force,moves",0,Moves,Movimientos,0 +field,"stock.shipment.internal.assign.assign_failed,moves",0,Moves,Movimientos,0 field,"stock.shipment.internal,code",0,Code,Código,0 field,"stock.shipment.internal,effective_date",0,Effective Date,Fecha Efectiva,0 field,"stock.shipment.internal,from_location",0,From Location,Lugar Inicial,0 @@ -110,7 +110,7 @@ field,"stock.shipment.internal,reference",0,Reference,Referencia,0 field,"stock.shipment.internal,state",0,State,Estado,0 field,"stock.shipment.internal,to_location",0,To Location,Al Lugar:,0 field,"stock.shipment.in,warehouse",0,Warehouse,Depósito,0 -field,"stock.shipment.out.assign.ask_force,inventory_moves",0,Inventory Moves,Movimientos de Inventario,0 +field,"stock.shipment.out.assign.assign_failed,inventory_moves",0,Inventory Moves,Movimientos de Inventario,0 field,"stock.shipment.out,code",0,Code,Código,0 field,"stock.shipment.out,customer",0,Customer,Cliente,0 field,"stock.shipment.out,delivery_address",0,Delivery Address,Dirección de Envío,0 @@ -239,11 +239,11 @@ model,"stock.location_stock_date.init,name",0,Compute stock quantities,Calcule c model,"stock.move,name",0,Stock Move,Movimiento de Existencias,0 model,"stock.product_stock_date.init,name",0,Compute stock quantities,Calcule cantidad de existencia,0 model,"stock.shipment.in,name",0,Supplier Shipment,Envío del Proveedor,0 -model,"stock.shipment.in.return.assign.ask_force,name",0,Assign Supplier Return Shipment Ask Force,Fuerce Pregunta de Asigne Devolución a Proveedor,0 +model,"stock.shipment.in.return.assign.assign_failed,name",0,Assign Supplier Return Shipment Ask Force,Fuerce Pregunta de Asigne Devolución a Proveedor,0 model,"stock.shipment.in.return,name",0,Supplier Return Shipment,Devolución a Proveedor,0 -model,"stock.shipment.internal.assign.ask_force,name",0,Assign Shipment Internal Ask Force,Fuerce Pregunta de Asigne Envío Interno,0 +model,"stock.shipment.internal.assign.assign_failed,name",0,Assign Shipment Internal Ask Force,Fuerce Pregunta de Asigne Envío Interno,0 model,"stock.shipment.internal,name",0,Internal Shipment,Envío Interno,0 -model,"stock.shipment.out.assign.ask_force,name",0,Assign Shipment Out Ask Force,Fuerce Pregunta de Asigne Envío,0 +model,"stock.shipment.out.assign.assign_failed,name",0,Assign Shipment Out Ask Force,Fuerce Pregunta de Asigne Envío,0 model,"stock.shipment.out,name",0,Customer Shipment,Envío de Cliente,0 model,"stock.shipment.out.return,name",0,Customer Return Shipment,Devolución a Cliente,0 model,"workflow.activity,name",shipmentout_act_assigned,Assigned,Asignado,0 @@ -420,9 +420,9 @@ view,stock.shipment.in.return,0,Reset to Draft,Revertir a Borrador,0 view,stock.shipment.in.return,0,Supplier Return Shipment,Devolución de Proveedor,0 view,stock.shipment.in.return,0,Supplier Return Shipments,Devoluciones de Proveedor,0 view,stock.shipment.in.return,0,Waiting,En Espera,0 -view,stock.shipment.in.return.assign.ask_force,0,Moves,Movimientos,0 -view,stock.shipment.in.return.assign.ask_force,0,Unable to Assign,No es posible asignar,0 -view,stock.shipment.in.return.assign.ask_force,0,Unable to assign those products:,No es posible asignar esos productos:,0 +view,stock.shipment.in.return.assign.assign_failed,0,Moves,Movimientos,0 +view,stock.shipment.in.return.assign.assign_failed,0,Unable to Assign,No es posible asignar,0 +view,stock.shipment.in.return.assign.assign_failed,0,Unable to assign those products:,No es posible asignar esos productos:,0 view,stock.shipment.internal,0,Assign,Asignar,0 view,stock.shipment.internal,0,Cancel,Cancelar,0 view,stock.shipment.internal,0,Done,Hecho,0 @@ -434,9 +434,9 @@ view,stock.shipment.internal,0,Reset to Draft,Revertir a Borrador,0 view,stock.shipment.internal,0,Set Done,Marcar como Hecho,0 view,stock.shipment.internal,0,Set Waiting,Colocar en Espera,0 view,stock.shipment.internal,0,Waiting,En espera,0 -view,stock.shipment.internal.assign.ask_force,0,Moves,Movimientos,0 -view,stock.shipment.internal.assign.ask_force,0,Unable to Assign,No es posible asignar,0 -view,stock.shipment.internal.assign.ask_force,0,Unable to assign those products:,No es posible asignar esos productos:,0 +view,stock.shipment.internal.assign.assign_failed,0,Moves,Movimientos,0 +view,stock.shipment.internal.assign.assign_failed,0,Unable to Assign,No es posible asignar,0 +view,stock.shipment.internal.assign.assign_failed,0,Unable to assign those products:,No es posible asignar esos productos:,0 view,stock.shipment.out,0,Assign,Asignar,0 view,stock.shipment.out,0,Cancel,Cancelar,0 view,stock.shipment.out,0,Customer Shipment,Envío de Cliente,0 @@ -452,9 +452,9 @@ view,stock.shipment.out,0,Set Done,Marcar como Hecho,0 view,stock.shipment.out,0,Set Waiting,Colocar en Espera,0 view,stock.shipment.out,0,Unpack,Sin empaque,0 view,stock.shipment.out,0,Waiting,En espera,0 -view,stock.shipment.out.assign.ask_force,0,Inventory Moves,Movimientos de Inventario,0 -view,stock.shipment.out.assign.ask_force,0,Unable to Assign,No es posible asignar,0 -view,stock.shipment.out.assign.ask_force,0,Unable to assign those products:,No es posible asignar esos productos:,0 +view,stock.shipment.out.assign.assign_failed,0,Inventory Moves,Movimientos de Inventario,0 +view,stock.shipment.out.assign.assign_failed,0,Unable to Assign,No es posible asignar,0 +view,stock.shipment.out.assign.assign_failed,0,Unable to assign those products:,No es posible asignar esos productos:,0 view,stock.shipment.out.return,0,Cancel,Cancelar,0 view,stock.shipment.out.return,0,Customer Return Shipment,Devolución a Cliente,0 view,stock.shipment.out.return,0,Customer Return Shipments,Devolución a Cliente,0 @@ -470,7 +470,10 @@ wizard_button,"stock.product.open,init,end",0,Cancel,Cancelar,0 wizard_button,"stock.product.open,init,open",0,Open,Abrir,0 wizard_button,"stock.shipment.in.return.assign,ask_force,end",0,Ok,Aceptar,0 wizard_button,"stock.shipment.in.return.assign,ask_force,force",0,Force Assign,Forzar Asignación,0 +wizard_button,"stock.shipment.in.return.assign,assign_failed,end",0,Ok,Aceptar,0 wizard_button,"stock.shipment.internal.assign,ask_force,end",0,Ok,Aceptar,0 wizard_button,"stock.shipment.internal.assign,ask_force,force",0,Force Assign,Forzar Asignación,0 +wizard_button,"stock.shipment.internal.assign,assign_failed,end",0,Ok,Aceptar,0 wizard_button,"stock.shipment.out.assign,ask_force,end",0,Ok,Aceptar,0 wizard_button,"stock.shipment.out.assign,ask_force,force",0,Force Assign,Forzar Asignación,0 +wizard_button,"stock.shipment.out.assign,assign_failed,end",0,Ok,Aceptar,0 \ No newline at end of file diff --git a/es_ES.csv b/es_ES.csv index 69ff3d57ad..2e9ce14a47 100644 --- a/es_ES.csv +++ b/es_ES.csv @@ -87,7 +87,7 @@ field,"stock.shipment.in,moves",0,Moves,Movimientos,0 field,"stock.shipment.in,planned_date",0,Planned Date,Fecha estimada,0 field,"stock.shipment.in,rec_name",0,Name,Nombre,0 field,"stock.shipment.in,reference",0,Reference,Referencia,0 -field,"stock.shipment.in.return.assign.ask_force,moves",0,Moves,Movimientos,0 +field,"stock.shipment.in.return.assign.assign_failed,moves",0,Moves,Movimientos,0 field,"stock.shipment.in.return,code",0,Code,Código,0 field,"stock.shipment.in.return,effective_date",0,Effective Date,Fecha efectiva,0 field,"stock.shipment.in.return,from_location",0,From Location,Desde ubicación,0 @@ -99,7 +99,7 @@ field,"stock.shipment.in.return,state",0,State,Estado,0 field,"stock.shipment.in.return,to_location",0,To Location,A ubicación,0 field,"stock.shipment.in,state",0,State,Estado,0 field,"stock.shipment.in,supplier",0,Supplier,Proveedor,0 -field,"stock.shipment.internal.assign.ask_force,moves",0,Moves,Movimientos,0 +field,"stock.shipment.internal.assign.assign_failed,moves",0,Moves,Movimientos,0 field,"stock.shipment.internal,code",0,Code,Código,0 field,"stock.shipment.internal,effective_date",0,Effective Date,Fecha efectiva,0 field,"stock.shipment.internal,from_location",0,From Location,Desde ubicación,0 @@ -110,7 +110,7 @@ field,"stock.shipment.internal,reference",0,Reference,Referencia,0 field,"stock.shipment.internal,state",0,State,Estado,0 field,"stock.shipment.internal,to_location",0,To Location,A ubicación,0 field,"stock.shipment.in,warehouse",0,Warehouse,Almacén,0 -field,"stock.shipment.out.assign.ask_force,inventory_moves",0,Inventory Moves,Movimientos de inventario,0 +field,"stock.shipment.out.assign.assign_failed,inventory_moves",0,Inventory Moves,Movimientos de inventario,0 field,"stock.shipment.out,code",0,Code,Código,0 field,"stock.shipment.out,customer",0,Customer,Cliente,0 field,"stock.shipment.out,delivery_address",0,Delivery Address,Dirección de envío,0 @@ -239,11 +239,11 @@ model,"stock.location_stock_date.init,name",0,Compute stock quantities,Calcular model,"stock.move,name",0,Stock Move,Movimiento de existencias,0 model,"stock.product_stock_date.init,name",0,Compute stock quantities,Calcular cantidades de existencias,0 model,"stock.shipment.in,name",0,Supplier Shipment,Envío de proveedor,0 -model,"stock.shipment.in.return.assign.ask_force,name",0,Assign Supplier Return Shipment Ask Force,Asignar envio interno de proveedor - Solicitud forzosa,0 +model,"stock.shipment.in.return.assign.assign_failed,name",0,Assign Supplier Return Shipment Ask Force,Asignar envio interno de proveedor - Solicitud forzosa,0 model,"stock.shipment.in.return,name",0,Supplier Return Shipment,Envio de devolución a proveedor,0 -model,"stock.shipment.internal.assign.ask_force,name",0,Assign Shipment Internal Ask Force,Asignar envio interno - Solicitud forzosa,0 +model,"stock.shipment.internal.assign.assign_failed,name",0,Assign Shipment Internal Ask Force,Asignar envio interno - Solicitud forzosa,0 model,"stock.shipment.internal,name",0,Internal Shipment,Envío interno,0 -model,"stock.shipment.out.assign.ask_force,name",0,Assign Shipment Out Ask Force,Asignar envio de salida - Solicitud forzosa,0 +model,"stock.shipment.out.assign.assign_failed,name",0,Assign Shipment Out Ask Force,Asignar envio de salida - Solicitud forzosa,0 model,"stock.shipment.out,name",0,Customer Shipment,Envío a cliente,0 model,"stock.shipment.out.return,name",0,Customer Return Shipment,Envio de devolución de cliente,0 model,"workflow.activity,name",shipmentout_act_assigned,Assigned,Asignado,0 @@ -420,9 +420,9 @@ view,stock.shipment.in.return,0,Reset to Draft,Restablecer a borrador,0 view,stock.shipment.in.return,0,Supplier Return Shipment,Envio de devolución a proveedor,0 view,stock.shipment.in.return,0,Supplier Return Shipments,Envios de devolución a proveedor,0 view,stock.shipment.in.return,0,Waiting,En espera,0 -view,stock.shipment.in.return.assign.ask_force,0,Moves,Movimientos,0 -view,stock.shipment.in.return.assign.ask_force,0,Unable to Assign,No es posible asignar,0 -view,stock.shipment.in.return.assign.ask_force,0,Unable to assign those products:,No es posible asignar esos productos:,0 +view,stock.shipment.in.return.assign.assign_failed,0,Moves,Movimientos,0 +view,stock.shipment.in.return.assign.assign_failed,0,Unable to Assign,No es posible asignar,0 +view,stock.shipment.in.return.assign.assign_failed,0,Unable to assign those products:,No es posible asignar esos productos:,0 view,stock.shipment.internal,0,Assign,Asignar,0 view,stock.shipment.internal,0,Cancel,Cancelar,0 view,stock.shipment.internal,0,Done,Terminado,0 @@ -434,9 +434,9 @@ view,stock.shipment.internal,0,Reset to Draft,Restablecer a borrador,0 view,stock.shipment.internal,0,Set Done,Marcar como terminado,0 view,stock.shipment.internal,0,Set Waiting,Colocar en espera,0 view,stock.shipment.internal,0,Waiting,En espera,0 -view,stock.shipment.internal.assign.ask_force,0,Moves,Movimientos,0 -view,stock.shipment.internal.assign.ask_force,0,Unable to Assign,No es posible asignar,0 -view,stock.shipment.internal.assign.ask_force,0,Unable to assign those products:,No es posible asignar esos productos:,0 +view,stock.shipment.internal.assign.assign_failed,0,Moves,Movimientos,0 +view,stock.shipment.internal.assign.assign_failed,0,Unable to Assign,No es posible asignar,0 +view,stock.shipment.internal.assign.assign_failed,0,Unable to assign those products:,No es posible asignar esos productos:,0 view,stock.shipment.out,0,Assign,Asignar,0 view,stock.shipment.out,0,Cancel,Cancelar,0 view,stock.shipment.out,0,Customer Shipment,Envío a cliente,0 @@ -452,9 +452,9 @@ view,stock.shipment.out,0,Set Done,Marcar como terminado,0 view,stock.shipment.out,0,Set Waiting,Colocar en espera,0 view,stock.shipment.out,0,Unpack,Desempaquetar,0 view,stock.shipment.out,0,Waiting,En espera,0 -view,stock.shipment.out.assign.ask_force,0,Inventory Moves,Movimientos de inventario,0 -view,stock.shipment.out.assign.ask_force,0,Unable to Assign,No es posible asignar,0 -view,stock.shipment.out.assign.ask_force,0,Unable to assign those products:,No es posible asignar esos productos:,0 +view,stock.shipment.out.assign.assign_failed,0,Inventory Moves,Movimientos de inventario,0 +view,stock.shipment.out.assign.assign_failed,0,Unable to Assign,No es posible asignar,0 +view,stock.shipment.out.assign.assign_failed,0,Unable to assign those products:,No es posible asignar esos productos:,0 view,stock.shipment.out.return,0,Cancel,Cancelar,0 view,stock.shipment.out.return,0,Customer Return Shipment,Envio de devolución de cliente,0 view,stock.shipment.out.return,0,Customer Return Shipments,Envios de devolución de cliente,0 @@ -470,7 +470,10 @@ wizard_button,"stock.product.open,init,end",0,Cancel,Cancelar,0 wizard_button,"stock.product.open,init,open",0,Open,Abrir,0 wizard_button,"stock.shipment.in.return.assign,ask_force,end",0,Ok,Aceptar,0 wizard_button,"stock.shipment.in.return.assign,ask_force,force",0,Force Assign,Forzar asignación,0 +wizard_button,"stock.shipment.in.return.assign,assign_failed,end",0,Ok,Aceptar,0 wizard_button,"stock.shipment.internal.assign,ask_force,end",0,Ok,Aceptar,0 wizard_button,"stock.shipment.internal.assign,ask_force,force",0,Force Assign,Forzar asignación,0 +wizard_button,"stock.shipment.internal.assign,assign_failed,end",0,Ok,Aceptar,0 wizard_button,"stock.shipment.out.assign,ask_force,end",0,Ok,Aceptar,0 wizard_button,"stock.shipment.out.assign,ask_force,force",0,Force Assign,Forzar asignación,0 +wizard_button,"stock.shipment.out.assign,assign_failed,end",0,Ok,Aceptar,0 \ No newline at end of file diff --git a/fr_FR.csv b/fr_FR.csv index 89c2c9cb42..62df81144b 100644 --- a/fr_FR.csv +++ b/fr_FR.csv @@ -87,7 +87,7 @@ field,"stock.shipment.in,moves",0,Moves,Mouvements,0 field,"stock.shipment.in,planned_date",0,Planned Date,Date planifiée,0 field,"stock.shipment.in,rec_name",0,Name,Nom,0 field,"stock.shipment.in,reference",0,Reference,Référence,0 -field,"stock.shipment.in.return.assign.ask_force,moves",0,Moves,Mouvements,0 +field,"stock.shipment.in.return.assign.assign_failed,moves",0,Moves,Mouvements,0 field,"stock.shipment.in.return,code",0,Code,Code,0 field,"stock.shipment.in.return,effective_date",0,Effective Date,Date effective,0 field,"stock.shipment.in.return,from_location",0,From Location,Emplacement d'origine,0 @@ -99,7 +99,7 @@ field,"stock.shipment.in.return,state",0,State,État,0 field,"stock.shipment.in.return,to_location",0,To Location,Emplacement de destination,0 field,"stock.shipment.in,state",0,State,État,0 field,"stock.shipment.in,supplier",0,Supplier,Fournisseur,0 -field,"stock.shipment.internal.assign.ask_force,moves",0,Moves,Mouvements,0 +field,"stock.shipment.internal.assign.assign_failed,moves",0,Moves,Mouvements,0 field,"stock.shipment.internal,code",0,Code,Code,0 field,"stock.shipment.internal,effective_date",0,Effective Date,Date effective,0 field,"stock.shipment.internal,from_location",0,From Location,Emplacement d'origine,0 @@ -110,7 +110,7 @@ field,"stock.shipment.internal,reference",0,Reference,Référence,0 field,"stock.shipment.internal,state",0,State,État,0 field,"stock.shipment.internal,to_location",0,To Location,Emplacement de destination,0 field,"stock.shipment.in,warehouse",0,Warehouse,Entrepôt,0 -field,"stock.shipment.out.assign.ask_force,inventory_moves",0,Inventory Moves,Mouvements internes,0 +field,"stock.shipment.out.assign.assign_failed,inventory_moves",0,Inventory Moves,Mouvements internes,0 field,"stock.shipment.out,code",0,Code,Code,0 field,"stock.shipment.out,customer",0,Customer,Client,0 field,"stock.shipment.out,delivery_address",0,Delivery Address,Adresse de livraison,0 @@ -239,11 +239,11 @@ model,"stock.location_stock_date.init,name",0,Compute stock quantities,Quantité model,"stock.move,name",0,Stock Move,Mouvement de stock,0 model,"stock.product_stock_date.init,name",0,Compute stock quantities,Quantités de stock calculées,0 model,"stock.shipment.in,name",0,Supplier Shipment,Expédition fournisseur,0 -model,"stock.shipment.in.return.assign.ask_force,name",0,Assign Supplier Return Shipment Ask Force,Assigner le retour d'expédition fournisseur - Demande forcée,0 +model,"stock.shipment.in.return.assign.assign_failed,name",0,Assign Supplier Return Shipment Ask Force,Assigner le retour d'expédition fournisseur - Demande forcée,0 model,"stock.shipment.in.return,name",0,Supplier Return Shipment,Retour d'expédition fournisseur,0 -model,"stock.shipment.internal.assign.ask_force,name",0,Assign Shipment Internal Ask Force,Assigner l'expédition interne - Demande forcée,0 +model,"stock.shipment.internal.assign.assign_failed,name",0,Assign Shipment Internal Ask Force,Assigner l'expédition interne - Demande forcée,0 model,"stock.shipment.internal,name",0,Internal Shipment,Expédition interne,0 -model,"stock.shipment.out.assign.ask_force,name",0,Assign Shipment Out Ask Force,Assigner l'expédition de sortie - Demande forcée,0 +model,"stock.shipment.out.assign.assign_failed,name",0,Assign Shipment Out Ask Force,Assigner l'expédition de sortie - Demande forcée,0 model,"stock.shipment.out,name",0,Customer Shipment,Expédition Client,0 model,"stock.shipment.out.return,name",0,Customer Return Shipment,Retour d'expédition client,0 model,"workflow.activity,name",shipmentout_act_assigned,Assigned,Assigné,0 @@ -417,9 +417,9 @@ view,stock.shipment.in.return,0,Reset to Draft,Remettre en brouillon,0 view,stock.shipment.in.return,0,Supplier Return Shipment,Retour d'expédition fournisseur,0 view,stock.shipment.in.return,0,Supplier Return Shipments,Retours d'expédition fournisseur,0 view,stock.shipment.in.return,0,Waiting,En attente,0 -view,stock.shipment.in.return.assign.ask_force,0,Moves,Mouvements,0 -view,stock.shipment.in.return.assign.ask_force,0,Unable to Assign,Impossible d'assigner,0 -view,stock.shipment.in.return.assign.ask_force,0,Unable to assign those products:,Impossible d'assigner ces produits :,0 +view,stock.shipment.in.return.assign.assign_failed,0,Moves,Mouvements,0 +view,stock.shipment.in.return.assign.assign_failed,0,Unable to Assign,Impossible d'assigner,0 +view,stock.shipment.in.return.assign.assign_failed,0,Unable to assign those products:,Impossible d'assigner ces produits :,0 view,stock.shipment.internal,0,Assign,Assigner,0 view,stock.shipment.internal,0,Cancel,Annuler,0 view,stock.shipment.internal,0,Done,Fait,0 @@ -429,9 +429,9 @@ view,stock.shipment.internal,0,Internal Shipment,Expédition interne,0 view,stock.shipment.internal,0,Internal Shipments,Expéditions internes,0 view,stock.shipment.internal,0,Reset to Draft,Remettre en brouillon,0 view,stock.shipment.internal,0,Waiting,En attente,0 -view,stock.shipment.internal.assign.ask_force,0,Moves,Mouvements,0 -view,stock.shipment.internal.assign.ask_force,0,Unable to Assign,Impossible d'assigner,0 -view,stock.shipment.internal.assign.ask_force,0,Unable to assign those products:,Impossible d'assigner ces produits :,0 +view,stock.shipment.internal.assign.assign_failed,0,Moves,Mouvements,0 +view,stock.shipment.internal.assign.assign_failed,0,Unable to Assign,Impossible d'assigner,0 +view,stock.shipment.internal.assign.assign_failed,0,Unable to assign those products:,Impossible d'assigner ces produits :,0 view,stock.shipment.out,0,Are you sure to force assignation?,Êtes-vous sûr de forcer l'assignation ?,0 view,stock.shipment.out,0,Assign,Assigner,0 view,stock.shipment.out,0,Cancel,Annuler,0 @@ -446,9 +446,9 @@ view,stock.shipment.out,0,Outgoing Moves,Mouvements en sortie,0 view,stock.shipment.out,0,Reset to Draft,Remettre en brouillon,0 view,stock.shipment.out,0,Unpack,Déballer,0 view,stock.shipment.out,0,Waiting,En attente,0 -view,stock.shipment.out.assign.ask_force,0,Inventory Moves,Mouvements internes,0 -view,stock.shipment.out.assign.ask_force,0,Unable to Assign,Impossible d'assigner,0 -view,stock.shipment.out.assign.ask_force,0,Unable to assign those products:,Impossible d'assigner ces produits :,0 +view,stock.shipment.out.assign.assign_failed,0,Inventory Moves,Mouvements internes,0 +view,stock.shipment.out.assign.assign_failed,0,Unable to Assign,Impossible d'assigner,0 +view,stock.shipment.out.assign.assign_failed,0,Unable to assign those products:,Impossible d'assigner ces produits :,0 view,stock.shipment.out.return,0,Cancel,Annuler,0 view,stock.shipment.out.return,0,Customer Return Shipment,Retour d'expédition client,0 view,stock.shipment.out.return,0,Customer Return Shipments,Retours d'expédition client,0 @@ -464,7 +464,10 @@ wizard_button,"stock.product.open,init,end",0,Cancel,Annuler,0 wizard_button,"stock.product.open,init,open",0,Open,Ouvrir,0 wizard_button,"stock.shipment.in.return.assign,ask_force,end",0,Ok,Ok,0 wizard_button,"stock.shipment.in.return.assign,ask_force,force",0,Force Assign,Forcer l'assignation,0 +wizard_button,"stock.shipment.in.return.assign,assign_failed,end",0,Ok,Ok,0 wizard_button,"stock.shipment.internal.assign,ask_force,end",0,Ok,Ok,0 wizard_button,"stock.shipment.internal.assign,ask_force,force",0,Force Assign,Forcer l'assignation,0 +wizard_button,"stock.shipment.internal.assign,assign_failed,end",0,Ok,Ok,0 wizard_button,"stock.shipment.out.assign,ask_force,end",0,Ok,Ok,0 wizard_button,"stock.shipment.out.assign,ask_force,force",0,Force Assign,Forcer l'assignation,0 +wizard_button,"stock.shipment.out.assign,assign_failed,end",0,Ok,Ok,0 \ No newline at end of file diff --git a/shipment.py b/shipment.py index a97c8c1a6c..18d0f732d4 100644 --- a/shipment.py +++ b/shipment.py @@ -1289,15 +1289,15 @@ class ShipmentOutReturn(ModelWorkflow, ModelSQL, ModelView): ShipmentOutReturn() -class AssignShipmentOutAskForce(ModelView): - 'Assign Shipment Out Ask Force' - _name = 'stock.shipment.out.assign.ask_force' +class AssignShipmentOutAssignFailed(ModelView): + 'Assign Shipment Out Assign Failed' + _name = 'stock.shipment.out.assign.assign_failed' _description = __doc__ inventory_moves = fields.Many2Many('stock.move', None, None, 'Inventory Moves', readonly=True) -AssignShipmentOutAskForce() +AssignShipmentOutAssignFailed() class AssignShipmentOut(Wizard): @@ -1310,11 +1310,21 @@ class AssignShipmentOut(Wizard): 'next_state': '_choice', }, }, + 'assign_failed': { + 'actions': ['_moves'], + 'result': { + 'type': 'form', + 'object': 'stock.shipment.out.assign.assign_failed', + 'state': [ + ('end', 'Ok', 'tryton-ok', True), + ], + }, + }, 'ask_force': { 'actions': ['_moves'], 'result': { 'type': 'form', - 'object': 'stock.shipment.out.assign.ask_force', + 'object': 'stock.shipment.out.assign.assign_failed', 'state': [ ('force', 'Force Assign', 'tryton-go-next'), ('end', 'Ok', 'tryton-ok', True), @@ -1332,6 +1342,9 @@ class AssignShipmentOut(Wizard): def _choice(self, cursor, user, data, context=None): shipment_out_obj = self.pool.get('stock.shipment.out') + user_group_obj = self.pool.get('res.user-res.group') + model_data_obj = self.pool.get('ir.model.data') + transition_obj = self.pool.get('workflow.transition') shipment_out_obj.workflow_trigger_validate(cursor, user, data['id'], 'assign', context=context) @@ -1340,7 +1353,16 @@ class AssignShipmentOut(Wizard): if not [x.id for x in shipment.inventory_moves if x.state == 'draft']: return 'end' else: - return 'ask_force' + trans_id = model_data_obj.get_id(cursor, user, 'stock', + 'shipmentout_trans_waiting_assigned_force', context=context) + trans = transition_obj.read(cursor, user, trans_id, context=context) + user_in_group = user_group_obj.search(cursor, user, [ + ('uid', '=', user), + ('gid', '=', trans['group']), + ], limit=1, context=context) + if user_in_group: + return 'ask_force' + return 'assign_failed' def _moves(self, cursor, user, data, context=None): shipment_out_obj = self.pool.get('stock.shipment.out') @@ -1527,15 +1549,15 @@ class Address(ModelSQL, ModelView): Address() -class AssignShipmentInternalAskForce(ModelView): - 'Assign Shipment Internal Ask Force' - _name = 'stock.shipment.internal.assign.ask_force' +class AssignShipmentInternalAssignFailed(ModelView): + 'Assign Shipment Internal Assign Failed' + _name = 'stock.shipment.internal.assign.assign_failed' _description = __doc__ moves = fields.Many2Many('stock.move', None, None, 'Moves', readonly=True) -AssignShipmentInternalAskForce() +AssignShipmentInternalAssignFailed() class AssignShipmentInternal(Wizard): @@ -1548,11 +1570,21 @@ class AssignShipmentInternal(Wizard): 'next_state': '_choice', }, }, + 'assign_failed': { + 'actions': ['_moves'], + 'result': { + 'type': 'form', + 'object': 'stock.shipment.internal.assign.assign_failed', + 'state': [ + ('end', 'Ok', 'tryton-ok', True), + ], + }, + }, 'ask_force': { 'actions': ['_moves'], 'result': { 'type': 'form', - 'object': 'stock.shipment.internal.assign.ask_force', + 'object': 'stock.shipment.internal.assign.assign_failed', 'state': [ ('force', 'Force Assign', 'tryton-go-next'), ('end', 'Ok', 'tryton-ok', True), @@ -1570,6 +1602,9 @@ class AssignShipmentInternal(Wizard): def _choice(self, cursor, user, data, context=None): shipment_internal_obj = self.pool.get('stock.shipment.internal') + user_group_obj = self.pool.get('res.user-res.group') + model_data_obj = self.pool.get('ir.model.data') + transition_obj = self.pool.get('workflow.transition') shipment_internal_obj.workflow_trigger_validate(cursor, user, data['id'], 'assign', context=context) @@ -1578,7 +1613,18 @@ class AssignShipmentInternal(Wizard): if not [x.id for x in shipment.moves if x.state == 'draft']: return 'end' else: - return 'ask_force' + trans_id = model_data_obj.get_id(cursor, user, 'stock', + 'shipmentinternal_trans_waiting_assigned_force', + context=context) + trans = transition_obj.read(cursor, user, trans_id, + context=context) + user_in_group = user_group_obj.search(cursor, user, [ + ('uid', '=', user), + ('gid', '=', trans['group']), + ], limit=1, context=context) + if user_in_group: + return 'ask_force' + return 'assign_failed' def _moves(self, cursor, user, data, context=None): shipment_internal_obj = self.pool.get('stock.shipment.internal') @@ -1596,15 +1642,15 @@ class AssignShipmentInternal(Wizard): AssignShipmentInternal() -class AssignShipmentInReturnAskForce(ModelView): - 'Assign Supplier Return Shipment Ask Force' - _name = 'stock.shipment.in.return.assign.ask_force' +class AssignShipmentInReturnAssignFailed(ModelView): + 'Assign Supplier Return Shipment Assign Failed' + _name = 'stock.shipment.in.return.assign.assign_failed' _description = __doc__ moves = fields.Many2Many('stock.move', None, None, 'Moves', readonly=True) -AssignShipmentInReturnAskForce() +AssignShipmentInReturnAssignFailed() class AssignShipmentInReturn(Wizard): @@ -1617,11 +1663,21 @@ class AssignShipmentInReturn(Wizard): 'next_state': '_choice', }, }, + 'assign_failed': { + 'actions': ['_moves'], + 'result': { + 'type': 'form', + 'object': 'stock.shipment.in.return.assign.assign_failed', + 'state': [ + ('end', 'Ok', 'tryton-ok', True), + ], + }, + }, 'ask_force': { 'actions': ['_moves'], 'result': { 'type': 'form', - 'object': 'stock.shipment.in.return.assign.ask_force', + 'object': 'stock.shipment.in.return.assign.assign_failed', 'state': [ ('force', 'Force Assign', 'tryton-go-next'), ('end', 'Ok', 'tryton-ok', True), @@ -1639,6 +1695,9 @@ class AssignShipmentInReturn(Wizard): def _choice(self, cursor, user, data, context=None): shipment_internal_obj = self.pool.get('stock.shipment.in.return') + user_group_obj = self.pool.get('res.user-res.group') + model_data_obj = self.pool.get('ir.model.data') + transition_obj = self.pool.get('workflow.transition') shipment_internal_obj.workflow_trigger_validate(cursor, user, data['id'], 'assign', context=context) @@ -1647,7 +1706,17 @@ class AssignShipmentInReturn(Wizard): if not [x.id for x in shipment.moves if x.state == 'draft']: return 'end' else: - return 'ask_force' + trans_id = model_data_obj.get_id(cursor, user, 'stock', + 'shipment_in_return_trans_waiting_assigned_force', + context=context) + trans = transition_obj.read(cursor, user, trans_id, context=context) + user_in_group = user_group_obj.search(cursor, user, [ + ('uid', '=', user), + ('gid', '=', trans['group']), + ], limit=1, context=context) + if user_in_group: + return 'ask_force' + return 'assign_failed' def _moves(self, cursor, user, data, context=None): shipment_internal_obj = self.pool.get('stock.shipment.in.return') diff --git a/shipment.xml b/shipment.xml index b236b20ecd..1698b407fa 100644 --- a/shipment.xml +++ b/shipment.xml @@ -259,8 +259,8 @@ this repository contains the full copyright notices and license terms. --> action="act_shipment_in_return_new_form" id="menu_shipment_in_return_new_form"/> - - stock.shipment.in.return.assign.ask_force + + stock.shipment.in.return.assign.assign_failed form - - stock.shipment.out.assign.ask_force + + stock.shipment.out.assign.assign_failed form action="act_shipment_internal_assigned_form" id="menu_shipment_internal_assigned_form"/> - - stock.shipment.internal.assign.ask_force + + stock.shipment.internal.assign.assign_failed form