Modified: ofbiz/branches/jackrabbit20100709/applications/manufacturing/config/ManufacturingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/manufacturing/config/ManufacturingUiLabels.xml?rev=1094250&r1=1094249&r2=1094250&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/manufacturing/config/ManufacturingUiLabels.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/manufacturing/config/ManufacturingUiLabels.xml Mon Apr 18 06:21:43 2011 @@ -24,7 +24,7 @@ <value xml:lang="en">Allocated Cost</value> <value xml:lang="es">Coste asignado</value> <value xml:lang="fr">Coût alloué</value> - <value xml:lang="it">Costo Allocato</value> + <value xml:lang="it">Costo allocato</value> <value xml:lang="pt_BR">Custo alocado</value> <value xml:lang="th">สà¹à¸§à¸à¹à¸à¹à¸à¸£à¸²à¸à¸²</value> <value xml:lang="zh">å·²åæææ¬</value> @@ -45,7 +45,7 @@ <value xml:lang="en">Calendar Week Id</value> <value xml:lang="es">Código de semana</value> <value xml:lang="fr">Réf. du calendrier par semaine</value> - <value xml:lang="it">Calendario Settmanale</value> + <value xml:lang="it">Calendario settmanale</value> <value xml:lang="pt_BR">Id da semana no calendário</value> <value xml:lang="th">รหัสà¸à¸à¸´à¸à¸´à¸à¸à¸£à¸°à¸à¸³à¸ªà¸±à¸à¸à¸²à¸«à¹</value> <value xml:lang="zh">èªç¶å¨æ è¯</value> @@ -67,7 +67,7 @@ <value xml:lang="en">Cost Custom Method Id</value> <value xml:lang="es">Código del método de cálculo </value> <value xml:lang="fr">Réf. de méthode de coût personnalisée</value> - <value xml:lang="it">Metodo Costo Personalizzato</value> + <value xml:lang="it">Metodo costo personalizzato</value> <value xml:lang="pt_BR">Id do método de cálculo</value> <value xml:lang="ro">Metoda Cost Personalizat</value> <value xml:lang="th">รหัสวิà¸à¸µà¸à¸²à¸£à¸à¸³à¸à¸§à¸à¹à¸à¸´à¸à¸¥à¸¹à¸à¸à¹à¸²</value> @@ -79,7 +79,7 @@ <value xml:lang="en">Cost Gl Account Type Id</value> <value xml:lang="es">Código de asiento</value> <value xml:lang="fr">Réf. de type de compte de coût (GL)</value> - <value xml:lang="it">Tipo Conto Contabilità Generale</value> + <value xml:lang="it">Tipo conto contabilità generale</value> <value xml:lang="pt_BR">Id de tipo de balanço</value> <value xml:lang="ro">Tip Cont Contabil General</value> <value xml:lang="th">รหัสà¸à¸£à¸°à¹à¸ à¸à¸à¸±à¸à¸à¸µà¸à¹à¸²à¹à¸à¹à¸à¹à¸²à¸¢ GI</value> @@ -98,7 +98,7 @@ <value xml:lang="en">Default Years Offset</value> <value xml:lang="es">Desfase anual por defecto</value> <value xml:lang="fr">Décalage d'années par défaut</value> - <value xml:lang="it">Scostamento Anni Di Default</value> + <value xml:lang="it">Scostamento anni di default</value> <value xml:lang="pt_BR">Deslocamento padrão em anos</value> <value xml:lang="th">à¸à¹à¸²à¸à¸à¹à¸à¸¢à¸à¸µà¸à¸µà¹à¸à¸´à¸à¸ªà¸±à¸à¸à¸²</value> <value xml:lang="zh">缺ç财年æç</value> @@ -120,7 +120,7 @@ <value xml:lang="en">Fail If Items Are Not Available</value> <value xml:lang="es">Fallar si no todos los items están disponibles</value> <value xml:lang="fr">Echec si les articles ne sont pas disponibles</value> - <value xml:lang="it">Fallisce se i Prodotti Non Sono Disponibili</value> + <value xml:lang="it">Fallisce se i prodotti non sono disponibili</value> <value xml:lang="pt_BR">Falha se os itens não estão disponÃveis</value> <value xml:lang="th">à¹à¸à¸´à¸à¸à¸§à¸²à¸¡à¸à¸´à¸à¸à¸¥à¸²à¸à¸à¹à¸²à¹à¸¡à¹à¸¡à¸µà¸ªà¸´à¸à¸à¹à¸²à¸à¸¢à¸¹à¹</value> <value xml:lang="zh">å¦ææç»æ ææ¶å¤±è´¥</value> @@ -131,7 +131,7 @@ <value xml:lang="en">Fixed Cost</value> <value xml:lang="es">Coste fijo</value> <value xml:lang="fr">Coût fixe</value> - <value xml:lang="it">Costo Fisso</value> + <value xml:lang="it">Costo fisso</value> <value xml:lang="pt_BR">Custo fixo</value> <value xml:lang="ro">Cost Fix</value> <value xml:lang="th">à¹à¸à¸¥à¸µà¹à¸¢à¸à¹à¸à¸¥à¸à¸£à¸²à¸à¸²</value> @@ -165,7 +165,7 @@ <value xml:lang="en">Issued Quantity</value> <value xml:lang="es">Cantidad emitida</value> <value xml:lang="fr">Quantité prélevée</value> - <value xml:lang="it">Quantità Prelevata</value> + <value xml:lang="it">Quantità prelevata</value> <value xml:lang="pt_BR">Quantidade emitida</value> <value xml:lang="ro">Cantitate Preluat</value> <value xml:lang="th">à¸à¸³à¸à¸§à¸</value> @@ -262,7 +262,7 @@ <value xml:lang="en">Per Milli Second</value> <value xml:lang="es">por milisegundo</value> <value xml:lang="fr">Par millisecondes</value> - <value xml:lang="it">Per Milli Secondi</value> + <value xml:lang="it">Per millisecondi</value> <value xml:lang="pt_BR">Por milissegundo</value> <value xml:lang="ro">Pe Milisecunde</value> <value xml:lang="th">à¸à¹à¸à¸à¸±à¸à¸§à¸´à¸à¸²à¸à¸µ</value> @@ -274,7 +274,7 @@ <value xml:lang="en">Product Feature</value> <value xml:lang="es">CharacterÃstica de producto</value> <value xml:lang="fr">Caractéristique de l'article</value> - <value xml:lang="it">Caratteristica Prodotto</value> + <value xml:lang="it">Caratteristica prodotto</value> <value xml:lang="pt_BR">CaracterÃstica do produto</value> <value xml:lang="ro">Caratteristica Produs</value> <value xml:lang="th">ลัà¸à¸©à¸à¸°à¸ªà¸´à¸à¸à¹à¸²</value> @@ -286,7 +286,7 @@ <value xml:lang="en">Product Id For</value> <value xml:lang="es">Código de producto</value> <value xml:lang="fr">Réf. de l'article pour</value> - <value xml:lang="it">Codice Prodotto Da</value> + <value xml:lang="it">Codice prodotto da</value> <value xml:lang="pt_BR">Id do produto para</value> <value xml:lang="ro">Cod Produs De la</value> <value xml:lang="th">รหัสสิà¸à¸à¹à¸²à¸ªà¸³à¸«à¸£à¸±à¸</value> @@ -298,7 +298,7 @@ <value xml:lang="en">Product Id In</value> <value xml:lang="es">Código de producto en</value> <value xml:lang="fr">Réf. de l'article dans</value> - <value xml:lang="it">Codice Prodotto In</value> + <value xml:lang="it">Codice prodotto in</value> <value xml:lang="pt_BR">Id de produto em</value> <value xml:lang="ro">Cod Produs In</value> <value xml:lang="th">รหัสสิà¸à¸à¹à¸²à¹à¸</value> @@ -309,7 +309,7 @@ <value xml:lang="en">Product Id In Subst</value> <value xml:lang="es">Código de producto en sustitución</value> <value xml:lang="fr">Réf. de l'article dans subst.</value> - <value xml:lang="it">Codice Prodotto In Sostituzione</value> + <value xml:lang="it">Codice prodotto in sostituzione</value> <value xml:lang="pt_BR">Id de produto em substituição</value> <value xml:lang="ro">Cod Produs In Substitutie</value> <value xml:lang="th">รหัสสิà¸à¸à¹à¸²à¹à¸à¸à¸µà¹à¸¡à¸µà¸à¸¢à¸¹à¹à¸à¸£à¸´à¸</value> @@ -321,7 +321,7 @@ <value xml:lang="en">production Runs</value> <value xml:lang="es">Código de producto en sustitución</value> <value xml:lang="fr">Cadences de production</value> - <value xml:lang="it">Ordini di Produzione</value> + <value xml:lang="it">Ordini di produzione</value> <value xml:lang="pt_BR">Ritmos de produção</value> <value xml:lang="ro">Comenzi de Productie</value> <value xml:lang="th">à¸à¸²à¸£à¸à¸¥à¸´à¸à¸ªà¸´à¸à¸à¹à¸²</value> @@ -333,7 +333,7 @@ <value xml:lang="en">routingId</value> <value xml:lang="es">Fecha de comienzo del requisito</value> <value xml:lang="fr">Gamme</value> - <value xml:lang="it">Id Ciclo</value> + <value xml:lang="it">Id ciclo</value> <value xml:lang="pt_BR">Id de perÃodo</value> <value xml:lang="ro">Id Ciclu</value> <value xml:lang="th">รหัส routing</value> @@ -345,7 +345,7 @@ <value xml:lang="en">Rule Id</value> <value xml:lang="es">Código de regla</value> <value xml:lang="fr">Réf. de règle</value> - <value xml:lang="it">Codice Regola</value> + <value xml:lang="it">Codice regola</value> <value xml:lang="pt_BR">Id de regra</value> <value xml:lang="ro">Cod Regula</value> <value xml:lang="th">รหัสà¸à¹à¸à¸à¸±à¸à¸à¸±à¸</value> @@ -357,7 +357,7 @@ <value xml:lang="en">Rule Operator</value> <value xml:lang="es">Operador de regla</value> <value xml:lang="fr">Opérateur de règle</value> - <value xml:lang="it">Regola Operatore</value> + <value xml:lang="it">Operatore della regola</value> <value xml:lang="pt_BR">Operador de regra</value> <value xml:lang="ro">Regula Operator</value> <value xml:lang="th">à¸à¸¹à¹à¸à¸à¸à¸à¸à¸£à¸°à¹à¸à¸µà¸¢à¸</value> @@ -369,7 +369,7 @@ <value xml:lang="en">Rule Seq Id</value> <value xml:lang="es">Número de secuencia de regla</value> <value xml:lang="fr">Réf. séq. de règle </value> - <value xml:lang="it">Codice Regola Sequenza</value> + <value xml:lang="it">Numero seq. regola</value> <value xml:lang="pt_BR">Id de sequência de regra</value> <value xml:lang="ro">Cod Regula Secventa</value> <value xml:lang="th">รหัสลำà¸à¸±à¸à¸à¹à¸à¸à¸±à¸à¸à¸±à¸</value> @@ -381,7 +381,7 @@ <value xml:lang="en">Run Time</value> <value xml:lang="es">Tiempo de ejeución</value> <value xml:lang="fr">Moment d'exécution</value> - <value xml:lang="it">Orario di Esecuzione</value> + <value xml:lang="it">Orario di esecuzione</value> <value xml:lang="pt_BR">Tempo de execução</value> <value xml:lang="th">ระยะà¹à¸§à¸¥à¸²à¸à¸³à¹à¸à¸´à¸à¸à¸²à¸</value> <value xml:lang="zh">è¿è¡æ¶é´</value> @@ -414,7 +414,7 @@ <value xml:lang="en">Secondary Location Seq Id</value> <value xml:lang="es">Número de secuencia de la ubicación secundaria</value> <value xml:lang="fr">Ref. séq. d'emplacement secondaire</value> - <value xml:lang="it">Locazione Secondaria</value> + <value xml:lang="it">Locazione secondaria</value> <value xml:lang="pt_BR">Id de sequência do local secundário</value> <value xml:lang="th">รหัสสà¸à¸²à¸à¸à¸µà¹à¸à¸±à¹à¸à¸à¸µà¹à¸ªà¸à¸</value> <value xml:lang="zh">è¾ å©å°ç¹åºåå·</value> @@ -425,7 +425,7 @@ <value xml:lang="en">Start Date Time</value> <value xml:lang="es">Fecha y hora de comienzo</value> <value xml:lang="fr">Heure de date de début</value> - <value xml:lang="it">Data/Ora di Inizio</value> + <value xml:lang="it">Data/Ora di inizio</value> <value xml:lang="pt_BR">Data e hora de inÃcio</value> <value xml:lang="th">วัà¸à¹à¸§à¸¥à¸²à¹à¸£à¸´à¹à¸¡à¸à¹à¸</value> <value xml:lang="zh">å¼å§æ¥ææ¶é´</value> @@ -480,7 +480,7 @@ <value xml:lang="en">Tot Issued Quantity</value> <value xml:lang="es">Cantidad total emitida</value> <value xml:lang="fr">Quantité totale prélevée</value> - <value xml:lang="it">Totale Quantità Prelevata</value> + <value xml:lang="it">Totale quantità prelevata</value> <value xml:lang="pt_BR">Quantidade total emitida</value> <value xml:lang="ro">Total Cantitate Preluata</value> <value xml:lang="th">รวมà¸à¸³à¸à¸§à¸à¸à¸£à¸°à¹à¸à¹à¸</value> @@ -492,7 +492,7 @@ <value xml:lang="en">Tot Ordered Quantity</value> <value xml:lang="es">Cantidad total pedida</value> <value xml:lang="fr">Quantité totale commandée</value> - <value xml:lang="it">Totale Quantità Ordinata</value> + <value xml:lang="it">Totale quantità ordinata</value> <value xml:lang="pt_BR">Quantidade total encomendada</value> <value xml:lang="ro">Total Cantitate Comandata</value> <value xml:lang="th">รวมà¸à¸³à¸à¸§à¸à¸à¸µà¹à¸ªà¸±à¹à¸à¸à¸·à¹à¸</value> @@ -504,7 +504,7 @@ <value xml:lang="en">Tot Planned Quantity</value> <value xml:lang="es">Cantidad total planificada</value> <value xml:lang="fr">Quantité totale planifiée</value> - <value xml:lang="it">Totale Quantità Pianificata</value> + <value xml:lang="it">Totale quantità pianificata</value> <value xml:lang="pt_BR">Quantidade planejada total</value> <value xml:lang="ro">Total Cantitate Planificata</value> <value xml:lang="th">à¸à¸¥à¸£à¸§à¸¡à¸à¸³à¸à¸§à¸à¸à¸µà¹à¸à¸²à¸à¹à¸§à¹</value> @@ -550,7 +550,7 @@ <value xml:lang="en">Variable Cost</value> <value xml:lang="es">Coste variable</value> <value xml:lang="fr">Coût variable</value> - <value xml:lang="it">Costo Variabile</value> + <value xml:lang="it">Costo variabile</value> <value xml:lang="pt_BR">Custo variável</value> <value xml:lang="ro">Cost Variabil</value> <value xml:lang="th">ราà¸à¸²à¹à¸à¸¥à¸µà¹à¸¢à¸à¹à¸à¸¥à¸à¹à¸à¹</value> @@ -608,7 +608,7 @@ <value xml:lang="en">Actual Costs</value> <value xml:lang="es">Costos Reales</value> <value xml:lang="fr">Coûts actuels</value> - <value xml:lang="it">Costi Attuali</value> + <value xml:lang="it">Costi attuali</value> <value xml:lang="pt_BR">Custos reais</value> <value xml:lang="ro">Costuri Actuali</value> <value xml:lang="th">ราà¸à¸²à¸à¸£à¸´à¸</value> @@ -620,7 +620,7 @@ <value xml:lang="en">Actual End Date/Time</value> <value xml:lang="es">Fecha/Hora de Fin Real</value> <value xml:lang="fr">Date/heure de fin actuelle</value> - <value xml:lang="it">Data/Ora Fine Attuale</value> + <value xml:lang="it">Data/Ora fine attuale</value> <value xml:lang="pt_BR">Data/hora de encerramento real</value> <value xml:lang="ro">Data/Ora Sfarsit</value> <value xml:lang="th">วัà¸/à¹à¸§à¸¥à¸² à¸à¸µà¹à¹à¸ªà¸£à¹à¸à¸à¸£à¸´à¸</value> @@ -632,7 +632,7 @@ <value xml:lang="en">Actual Materials</value> <value xml:lang="es">Materiales reales</value> <value xml:lang="fr">Matériels rééls</value> - <value xml:lang="it">Materiali Attuali</value> + <value xml:lang="it">Materiali attuali</value> <value xml:lang="pt_BR">Materiais reais</value> <value xml:lang="th">à¸à¹à¸à¹à¸à¹à¸à¸à¸£à¸´à¸</value> <value xml:lang="zh">å®é ææ</value> @@ -643,7 +643,7 @@ <value xml:lang="en">Actual Start Date/Time</value> <value xml:lang="es">Fecha/Hora de Inicio Real</value> <value xml:lang="fr">Date/heure de début réelle</value> - <value xml:lang="it">Data/Ora Inizio Attuale</value> + <value xml:lang="it">Data/Ora inizio attuale</value> <value xml:lang="pt_BR">Data e hora real para inÃcio</value> <value xml:lang="ro">Data/Ora Initiere</value> <value xml:lang="th">วัà¸/à¹à¸§à¸¥à¸² à¹à¸£à¸´à¹à¸¡à¸à¹à¸à¸à¸£à¸´à¸</value> @@ -655,7 +655,7 @@ <value xml:lang="en">Add a existing RoutingTask</value> <value xml:lang="es">Añadir una tarea existente</value> <value xml:lang="fr">Ajouter une opération existante</value> - <value xml:lang="it">Aggiungi una Operazione esistente</value> + <value xml:lang="it">Aggiungi una operazione esistente</value> <value xml:lang="pt_BR">Adicionar tarefa de roteamento já existente</value> <value xml:lang="ro">Adauga o Operatie existenta</value> <value xml:lang="th">à¹à¸à¸´à¹à¸¡à¸à¸²à¸£à¸à¸³à¸à¸²à¸à¸à¸µà¹à¸¡à¸µà¸à¸¢à¸¹à¹</value> @@ -667,7 +667,7 @@ <value xml:lang="en">Assign Fixed Asset</value> <value xml:lang="es">Asignar activo fijo</value> <value xml:lang="fr">Affecter la machine</value> - <value xml:lang="it">Assegna Cespite</value> + <value xml:lang="it">Assegna cespite</value> <value xml:lang="pt_BR">Designar ativo fixo</value> <value xml:lang="ro">Inregistreaza Mijloc Fix</value> <value xml:lang="th">à¸à¸³à¸«à¸à¸à¸ªà¸´à¸à¸à¸£à¸±à¸à¸¢à¹à¹à¸¡à¹à¸«à¸¡à¸¸à¸à¹à¸§à¸µà¸¢à¸</value> @@ -679,7 +679,7 @@ <value xml:lang="en">Add ProductComponent to ProductionRun</value> <value xml:lang="es">Añadir componente</value> <value xml:lang="fr">Ajouter un composant à l'O.F.</value> - <value xml:lang="it">Aggiungi Componente Prodotto ad un´Ordine di Produzione</value> + <value xml:lang="it">Aggiungi componente ad un ordine di produzione</value> <value xml:lang="pt_BR">Adicionar componente de produto a execução de produção</value> <value xml:lang="ro">Adauga Componente Produs la o comanda de Productie</value> <value xml:lang="th">à¹à¸à¸´à¹à¸¡à¸ªà¹à¸§à¸à¸à¸£à¸°à¸à¸à¸à¸ªà¸´à¸à¸à¹à¸²à¹à¸à¸à¸²à¸£à¸à¸¥à¸´à¸à¸ªà¸´à¸à¸à¹à¸²</value> @@ -688,7 +688,7 @@ </property> <property key="ManufacturingAddProductionRunRoutingTaskNotCreated"> <value xml:lang="en">Add Production Run Routing Task Not Created</value> - <value xml:lang="it">Aggiunta componente prodotto ad un´compito non creato</value> + <value xml:lang="it">Aggiunta componente ad un compito non creato</value> <value xml:lang="pt_BR">Adicionar tarefa de execução de produção de roteamento não foi criada</value> <value xml:lang="zh">æ·»å 没æå建ç产åè¿è¡è§ç¨ä»»å¡</value> <value xml:lang="zh_TW">æ·»å æ²æåµå»ºçç¢åéè¡è¦ç¨ä»»å</value> @@ -698,7 +698,7 @@ <value xml:lang="en">Add Qty Produced</value> <value xml:lang="es">Añadir Cant. Producida</value> <value xml:lang="fr">Ajouter la quantité produite</value> - <value xml:lang="it">Aggiungi Quantità Prodotta</value> + <value xml:lang="it">Aggiungi quantità prodotta</value> <value xml:lang="pt_BR">Adicionar quantidade produzida</value> <value xml:lang="ro">Adauga Cantitate Produsa</value> <value xml:lang="th">à¹à¸à¸´à¹à¸¡à¸à¸³à¸à¸§à¸à¸ªà¸´à¸à¸à¹à¸²</value> @@ -710,7 +710,7 @@ <value xml:lang="en">Add Qty Rejected</value> <value xml:lang="es">Añadir Cantidad rechazada</value> <value xml:lang="fr">Ajouter la quantité rejetée</value> - <value xml:lang="it">Aggiungi Quantità Scartata</value> + <value xml:lang="it">Aggiungi quantità scartata</value> <value xml:lang="pt_BR">Adicionar quantidade rejeitada</value> <value xml:lang="ro">Adauga Cantitate Rebutata</value> <value xml:lang="th">à¹à¸à¸´à¹à¸¡à¸à¸³à¸à¸§à¸à¸à¸²à¸£à¸à¸à¸´à¹à¸ªà¸</value> @@ -722,7 +722,7 @@ <value xml:lang="en">Add a RoutingTask</value> <value xml:lang="es">Añadir una ruta</value> <value xml:lang="fr">Ajouter une opération</value> - <value xml:lang="it">Aggiungi una Operazione</value> + <value xml:lang="it">Aggiungi una operazione</value> <value xml:lang="pt_BR">Adicionar tarefa de roteamento</value> <value xml:lang="ro">Adauga o Operatie</value> <value xml:lang="th">à¹à¸à¸´à¹à¸¡à¸à¸²à¸£à¸à¸³à¸à¸²à¸</value> @@ -734,7 +734,7 @@ <value xml:lang="en">Add Actual Setup Time</value> <value xml:lang="es">Añadir Tiempo de configuración</value> <value xml:lang="fr">Ajouter le temps d'installation réel</value> - <value xml:lang="it">Aggiungi Tempo Installazione Attuale</value> + <value xml:lang="it">Aggiungi tempo installazione attuale</value> <value xml:lang="pt_BR">Adicionar tempo de preparação real</value> <value xml:lang="ro">Adauga Timp Actual de Instalare</value> <value xml:lang="th">à¹à¸à¸´à¹à¸¡à¸à¸²à¸£à¸à¸´à¸à¸à¸±à¹à¸à¹à¸§à¸¥à¸²à¸à¸£à¸´à¸</value> @@ -746,7 +746,7 @@ <value xml:lang="en">Add Actual Task Time</value> <value xml:lang="es">Añadir Tiempo de Tarea</value> <value xml:lang="fr">Ajouter le temps d'opération réel</value> - <value xml:lang="it">Aggiungi Tempo Attuale Operazione</value> + <value xml:lang="it">Aggiungi tempo attuale operazione</value> <value xml:lang="pt_BR">Adicionar tempo de tarefa real</value> <value xml:lang="ro">Adauga Timp Actual Sarcina</value> <value xml:lang="th">à¹à¸à¸´à¹à¸¡à¹à¸§à¸¥à¸²à¸à¸²à¸£à¸à¸³à¸à¸²à¸à¸à¸£à¸´à¸</value> @@ -758,7 +758,7 @@ <value xml:lang="en">Any Fixed Asset Group</value> <value xml:lang="es">Cualquier grupo de máquinas</value> <value xml:lang="fr">Tous les groupes de machine</value> - <value xml:lang="it">Qualsiasi Gruppo Macchina</value> + <value xml:lang="it">Qualsiasi gruppo macchina</value> <value xml:lang="pt_BR">Qualquer grupo de ativos fixos</value> <value xml:lang="ro">Orice Grup de Mijloace Fixe</value> <value xml:lang="th">à¸à¸¥à¸¸à¹à¸¡à¸ªà¸´à¸à¸à¸£à¸±à¸à¸¢à¹à¹à¸¡à¹à¸«à¸¡à¸¸à¸à¹à¸§à¸µà¸¢à¸</value> @@ -781,7 +781,7 @@ <value xml:lang="en">Associated Production Runs</value> <value xml:lang="es">Tiradas asociadas</value> <value xml:lang="fr">Exécution de production associées</value> - <value xml:lang="it">Ordini di Produzione Associati</value> + <value xml:lang="it">Ordini di produzione associati</value> <value xml:lang="pt_BR">Execuções da produção associadas</value> <value xml:lang="th">สิà¸à¸à¹à¸²à¸à¸µà¹à¹à¸à¸µà¹à¸¢à¸§à¸à¹à¸à¸à¸à¸±à¸</value> <value xml:lang="zh">ç¸å ³çç产è¿è¡</value> @@ -792,7 +792,7 @@ <value xml:lang="en">Bill Of Materials</value> <value xml:lang="es">Lista de materiales</value> <value xml:lang="fr">Nomenclature</value> - <value xml:lang="it">Distinta Base</value> + <value xml:lang="it">Distinta base</value> <value xml:lang="pt_BR">Estrutura de produtos (BOM)</value> <value xml:lang="ro">Lista Repere Produs</value> <value xml:lang="th">รายà¸à¸²à¸£à¸à¸à¸à¸ªà¸´à¸à¸à¹à¸²</value> @@ -836,7 +836,7 @@ <value xml:lang="en">Bom Simulation</value> <value xml:lang="es">Simulación de materiales</value> <value xml:lang="fr">Simulation de nomenclature</value> - <value xml:lang="it">Simulazione Distinta Base</value> + <value xml:lang="it">Simulazione distinta base</value> <value xml:lang="pt_BR">Simulação da estrutura de produtos (BOM)</value> <value xml:lang="ro">Simulare Lista repere</value> <value xml:lang="th">รายà¸à¸²à¸£à¸à¸à¸à¸ªà¸´à¸à¸à¹à¸²à¸à¸µà¹à¹à¸¥à¸µà¸¢à¸à¹à¸à¸</value> @@ -848,7 +848,7 @@ <value xml:lang="en">Bom Type</value> <value xml:lang="es">Tipo de lista de materiales</value> <value xml:lang="fr">Type de nomenclature</value> - <value xml:lang="it">Tipo Distinta Base</value> + <value xml:lang="it">Tipo distinta base</value> <value xml:lang="pt_BR">Tipo de estrutura de produtos (BOM)</value> <value xml:lang="ro">Tip Lista repere</value> <value xml:lang="th">à¸à¸£à¸°à¹à¸ à¸à¸£à¸²à¸¢à¸à¸²à¸£à¸à¸à¸à¸ªà¸´à¸à¸à¹à¸²</value> @@ -872,7 +872,7 @@ <value xml:lang="en">Manufacturing Calendar Capacity</value> <value xml:lang="es">Capacidad del calendario</value> <value xml:lang="fr">Capacité du calendrier de fabrication</value> - <value xml:lang="it">Capacità Calendario Produzione</value> + <value xml:lang="it">Capacità calendario produzione</value> <value xml:lang="pt_BR">Capacidade do calendário de produção</value> <value xml:lang="ro">Capacitate Productie Calendar</value> <value xml:lang="th">à¸à¸²à¸£à¸ªà¸£à¹à¸²à¸à¸à¸à¸´à¸à¸´à¸à¸à¸²à¸£à¸à¸³à¸à¸²à¸</value> @@ -884,7 +884,7 @@ <value xml:lang="en">Exception Day</value> <value xml:lang="es">Fecha de excepción</value> <value xml:lang="fr">Jour exclu</value> - <value xml:lang="it">Giorno Speciale</value> + <value xml:lang="it">Giorno speciale</value> <value xml:lang="pt_BR">Data de exceção</value> <value xml:lang="ro">Zi Speciala</value> <value xml:lang="th">วัà¸à¸à¸µà¹à¸¢à¸à¹à¸§à¹à¸</value> @@ -896,7 +896,7 @@ <value xml:lang="en">Manufacturing Calendar Exception Day Id Already Exist</value> <value xml:lang="es">El código de excepción ya existe</value> <value xml:lang="fr">Cette réf. de jour exclu existe déjà </value> - <value xml:lang="it">Codice Capacità Calendario Produzione già esistente</value> + <value xml:lang="it">Codice capacità calendario produzione già esistente</value> <value xml:lang="pt_BR">Id do dia de exceção do calendário de produção já existente</value> <value xml:lang="ro">Cod Capacitate Calendar Productie existenta</value> <value xml:lang="th">รหัสวัà¸à¸à¸µà¹à¸¢à¸à¹à¸§à¹à¸à¹à¸à¸à¸à¸´à¸à¸´à¸à¸à¸²à¸£à¸à¸³à¸à¸²à¸à¸à¸µà¹à¸¡à¸µà¸à¸¢à¸¹à¹</value> @@ -920,7 +920,7 @@ <value xml:lang="en">Exception Week</value> <value xml:lang="es">Semana de excepción</value> <value xml:lang="fr">Semaine exclue</value> - <value xml:lang="it">Settimana Speciale</value> + <value xml:lang="it">Settimana speciale</value> <value xml:lang="pt_BR">Semana de exceção</value> <value xml:lang="ro">Saptamana Speciala</value> <value xml:lang="th">สัà¸à¸à¸²à¸«à¹à¸à¸µà¹à¸¢à¸à¹à¸§à¹à¸</value> @@ -932,7 +932,7 @@ <value xml:lang="en">Manufacturing Calendar Exception Week Id Already Exist</value> <value xml:lang="es">El código de excepción de semana ya existe</value> <value xml:lang="fr">Cette réf. de semaine exclue existe déjà </value> - <value xml:lang="it">Codice Calendario Settimanale Produzione Speciale è gia esistente</value> + <value xml:lang="it">Codice calendario settimanale produzione speciale già esistente</value> <value xml:lang="pt_BR">Id de semana de exceção no calendário de produção já existente</value> <value xml:lang="ro">Cod Calendar Saptamana Productie Speciala deja existent</value> <value xml:lang="th">รหัสสัà¸à¸à¸²à¸«à¹à¸à¸µà¹à¸¢à¸à¹à¸§à¹à¸à¹à¸à¸à¸à¸´à¸à¸´à¸à¸à¸²à¸£à¸à¸³à¸à¸²à¸à¸à¸µà¹à¸¡à¸µà¸à¸¢à¸¹à¹</value> @@ -968,7 +968,7 @@ <value xml:lang="en">Calendar Id already exist</value> <value xml:lang="es">El código de calendario ya existe</value> <value xml:lang="fr">Cette réf. de calendrier existe déja</value> - <value xml:lang="it">Codice Calendario già esistente</value> + <value xml:lang="it">Codice calendario già esistente</value> <value xml:lang="pt_BR">Ide de calendário já existente</value> <value xml:lang="ro">Cod Calendar deja existent</value> <value xml:lang="th">รหัสà¸à¸à¸´à¸à¸´à¸à¸à¸µà¹à¸¡à¸µà¸à¸¢à¸¹à¹à¸¥à¹à¸§</value> @@ -980,7 +980,7 @@ <value xml:lang="en">You do not have permission to view this page. ("MANUFACTURING_VIEW" or "MANUFACTURING_ADMIN" needed)</value> <value xml:lang="es">Usted no tiene permiso para ver esta página. Necesita los permisos "MANUFACTURING_VIEW" o "MANUFACTURING_ADMIN"</value> <value xml:lang="fr">Erreur sécurité : pour effectuer une opération sur un calendrier, il faut avoir l'autorisation MANUFACTURING_CREATE ou MANUFACTURING_ADMIN.</value> - <value xml:lang="it">Tu non sei autorizzato a vedere questa pagina. (permesso "MANUFACTURING_VIEW" o "MANUFACTURING_ADMIN" necessario)</value> + <value xml:lang="it">Non sei autorizzato a vedere questa pagina. (permesso "MANUFACTURING_VIEW" o "MANUFACTURING_ADMIN" necessario)</value> <value xml:lang="pt_BR">Você não possui permissão para visualizar essa página (Permissão MANUFACTURING_VIEW ou MANUFACTURING_ADMIN necessária).</value> <value xml:lang="ro">Tu nu esti autorizat sa vezi aceasta pagina. (Ai nevoie de permis "MANUFACTURING_VIEW" sau "MANUFACTURING_ADMIN")</value> <value xml:lang="th">à¸à¸¸à¸à¹à¸¡à¹à¹à¸à¹à¸£à¸±à¸à¸à¸à¸¸à¸à¸²à¸à¹à¸«à¹à¸à¸¹à¸«à¸à¹à¸²à¸à¸µà¹ ("MANUFACTURING_VIEW" หรืภ"MANUFACTURING_ADMIN" à¸à¸µà¹à¸à¹à¸à¸à¸à¸²à¸£)</value> @@ -1004,7 +1004,7 @@ <value xml:lang="en">Week</value> <value xml:lang="es">Semana</value> <value xml:lang="fr">Semaine</value> - <value xml:lang="it">Calendario Settimanale</value> + <value xml:lang="it">Calendario settimanale</value> <value xml:lang="pt_BR">Semana</value> <value xml:lang="ro">Saptamana</value> <value xml:lang="th">สัà¸à¸à¸²à¸«à¹</value> @@ -1016,7 +1016,7 @@ <value xml:lang="en">There is still an exception week which use this week</value> <value xml:lang="es">Hay una semana de excepción que usa esta semana</value> <value xml:lang="fr">Il existe encore une semaine exclue qui utilise cette semaine</value> - <value xml:lang="it">C'è ancora una settimanale speciale che usa questa settimana</value> + <value xml:lang="it">C'è ancora una settimana speciale che usa questa settimana</value> <value xml:lang="pt_BR">Ainda há uma semana de exceção que usa esta semana</value> <value xml:lang="ro">Exista deja o saptamana speciala care foloseste acest calendar</value> <value xml:lang="th">ยัà¸à¸à¸à¸¡à¸µà¸à¹à¸à¸¢à¸à¹à¸§à¹à¸à¸à¸à¸à¸ªà¸±à¸à¸à¸²à¸«à¹à¸à¸µà¹à¹à¸à¹à¹à¸à¸ªà¸±à¸à¸à¸²à¸«à¹à¸à¸µà¹</value> @@ -1028,7 +1028,7 @@ <value xml:lang="en">Calendar Week ID</value> <value xml:lang="es">Semana asociada</value> <value xml:lang="fr">Semaine</value> - <value xml:lang="it">Codice Calendario Settimanale</value> + <value xml:lang="it">Settimana</value> <value xml:lang="pt_BR">Id de semana do calendário</value> <value xml:lang="ro">Cod Calendar Saptamana</value> <value xml:lang="th">รหัสà¸à¸à¸´à¸à¸´à¸à¸à¸£à¸°à¸à¸³à¸ªà¸±à¸à¸à¸²à¸«à¹</value> @@ -1040,7 +1040,7 @@ <value xml:lang="en">CalendarWeekId already exist</value> <value xml:lang="es">El código ya existe</value> <value xml:lang="fr">Cette réf. de semaine existe déja</value> - <value xml:lang="it">Codice Calendario Settimanale già esistente</value> + <value xml:lang="it">Codice calendario settimanale già esistente</value> <value xml:lang="pt_BR">Id de semana de calendário já existente</value> <value xml:lang="ro">Cod Calendar Saptamana existent </value> <value xml:lang="th">รหัสà¸à¸à¸´à¸à¸´à¸à¸à¸£à¸°à¸à¸³à¸ªà¸±à¸à¸à¸²à¸«à¹à¸à¸µà¹à¸¢à¸±à¸à¸à¸à¹à¸à¹à¸à¸¢à¸¹à¹</value> @@ -1052,7 +1052,7 @@ <value xml:lang="en">Calendar Week ID does'nt exist</value> <value xml:lang="es">El código de calendario no existe</value> <value xml:lang="fr">Réf. de semaine de calendrier n'existe pas</value> - <value xml:lang="it">Codice Calendario Settimanale non esiste</value> + <value xml:lang="it">Codice calendario settimanale non esistente</value> <value xml:lang="pt_BR">Id de semana de calendário não existe</value> <value xml:lang="ro">Cod Calendar Sptamana nu exista</value> <value xml:lang="th">รหัสà¸à¸à¸´à¸à¸´à¸à¸à¸£à¸°à¸à¸³à¸ªà¸±à¸à¸à¸²à¸«à¹à¸à¸µà¹à¹à¸¡à¹à¹à¸à¹</value> @@ -1064,7 +1064,7 @@ <value xml:lang="en">Weeks</value> <value xml:lang="es">Semanas</value> <value xml:lang="fr">Semaines</value> - <value xml:lang="it">Calendari Settimanali</value> + <value xml:lang="it">Calendari settimanali</value> <value xml:lang="pt_BR">Semanas</value> <value xml:lang="th">สัà¸à¸à¸²à¸«à¹</value> <value xml:lang="zh">å¨</value> @@ -1110,7 +1110,7 @@ <value xml:lang="en">OFBiz: Manufacturing Manager</value> <value xml:lang="es">OFBiz: Gestor de producción</value> <value xml:lang="fr">OFBiz: Gestion de production</value> - <value xml:lang="it">OFBiz: Gestione della Produzione</value> + <value xml:lang="it">OFBiz: Gestione della produzione</value> <value xml:lang="pt_BR">OFBiz: Gestão de produção</value> <value xml:lang="ro">OFBiz: Gestiune Productie</value> <value xml:lang="th">OFBiz: à¸à¸²à¸£à¸à¸±à¸à¸à¸²à¸£à¸à¸²à¸£à¸à¸¥à¸´à¸</value> @@ -1178,7 +1178,7 @@ <value xml:lang="en">Copy a routingTask and Add it</value> <value xml:lang="es">Copiar una tarea y añadirla</value> <value xml:lang="fr">Copier une opération puis l'ajouter</value> - <value xml:lang="it">Copia e aggiungi una Operazione</value> + <value xml:lang="it">Copia e aggiungi una operazione</value> <value xml:lang="pt_BR">Copiar a tarefa de roteamento e adicioná-la</value> <value xml:lang="ro">Copiaza si Adauga o Operatie </value> <value xml:lang="th">à¸à¸±à¸à¸¥à¸à¸à¸à¸²à¸£à¸à¸³à¸à¸²à¸à¹à¸¥à¸°à¹à¸à¸´à¹à¸¡à¸¡à¸±à¸</value> @@ -1190,7 +1190,7 @@ <value xml:lang="en">Copy BOM</value> <value xml:lang="es">Copiar Lista de materiales</value> <value xml:lang="fr">Copie de la nomenclature</value> - <value xml:lang="it">Copia Distinte Base</value> + <value xml:lang="it">Copia distinte base</value> <value xml:lang="pt_BR">Copiar estrutura de produtos (BOM)</value> <value xml:lang="ro">Copiaza Lista repere </value> <value xml:lang="th">à¸à¸±à¸à¸¥à¸à¸à¸£à¸²à¸¢à¸à¸²à¸£à¸à¸à¸à¸ªà¸´à¸à¸à¹à¸²</value> @@ -1202,7 +1202,7 @@ <value xml:lang="en">To Product Id</value> <value xml:lang="es">Código del producto destino</value> <value xml:lang="fr">Réf. à l'article</value> - <value xml:lang="it">Al Codice Prodotto</value> + <value xml:lang="it">Al codice prodotto</value> <value xml:lang="pt_BR">Para o Id de produto</value> <value xml:lang="ro">La Cod Produs</value> <value xml:lang="th">à¸à¸¶à¸à¸£à¸«à¸±à¸ªà¸ªà¸´à¸à¸à¹à¸²</value> @@ -1247,13 +1247,17 @@ <value xml:lang="en">Create Calendar Week</value> <value xml:lang="es">Crear semana</value> <value xml:lang="fr">Créer un calendier de semaine</value> - <value xml:lang="it">Creare Calendario Settimanale</value> + <value xml:lang="it">Creare calendario settimanale</value> <value xml:lang="pt_BR">Criar calendário semanal</value> <value xml:lang="ro">Creare Calendar Saptamana</value> <value xml:lang="th">สรà¹à¸²à¸à¸à¸à¸´à¸à¸´à¸à¸à¸£à¸°à¸à¸³à¸ªà¸±à¸à¸à¸²à¸«à¹</value> <value xml:lang="zh">æ°å»ºæ¥åå¨</value> <value xml:lang="zh_TW">æ°å»ºæ¥æé±</value> </property> + <property key="ManufacturingCreateDependentProductionRuns"> + <value xml:lang="en">Create Dependent Production Runs</value> + <value xml:lang="it">Crea ordini di produzione dipendenti</value> + </property> <property key="ManufacturingCreateMachineGroup"> <value xml:lang="de">Anlagengruppe erstellen</value> <value xml:lang="en">Create a Fixed Asset group</value> @@ -1292,7 +1296,7 @@ <value xml:lang="en">Create a Production Run</value> <value xml:lang="es">Crear orden de producción</value> <value xml:lang="fr">Création O.F.</value> - <value xml:lang="it">Creare un Ordine di Produzione</value> + <value xml:lang="it">Nuovo ordine di produzione</value> <value xml:lang="pt_BR">Criar execução de produção</value> <value xml:lang="ro">Creare Comanda de Productie</value> <value xml:lang="th">สรà¹à¸²à¸à¸à¸²à¸£à¸à¸¥à¸´à¸à¸ªà¸´à¸à¸à¹à¸²</value> @@ -1364,7 +1368,7 @@ <value xml:lang="en">Dependent Production Runs</value> <value xml:lang="es">Esfuerzos de trabajo dependientes</value> <value xml:lang="fr">Exécution de production dépendantes</value> - <value xml:lang="it">Dipendenza Ordine di Produzione</value> + <value xml:lang="it">Ordini di produzione dipendenti</value> <value xml:lang="pt_BR">Execuções de produção dependentes</value> <value xml:lang="ro">Comenzi lansate in Productie?</value> <value xml:lang="th">à¸à¸¶à¹à¸à¸à¸¢à¸¹à¹à¸à¸±à¸à¸à¸²à¸£à¸à¸¥à¸´à¸à¸ªà¸´à¸à¸à¹à¸²</value> @@ -1472,7 +1476,7 @@ <value xml:lang="en">Edit Production Run</value> <value xml:lang="es">Editar orden de producción</value> <value xml:lang="fr">Modifier l'ordre de fabrication</value> - <value xml:lang="it">Aggiorna Ordine di Produzione</value> + <value xml:lang="it">Aggiorna ordine di produzione</value> <value xml:lang="pt_BR">Editar execução de produção</value> <value xml:lang="ro">Actualizare Comenzi de Productie</value> <value xml:lang="th">à¹à¸à¹à¹à¸à¸à¸²à¸£à¸à¸¥à¸´à¸</value> @@ -1484,7 +1488,7 @@ <value xml:lang="en">Edit Routing</value> <value xml:lang="es">Editar ruta</value> <value xml:lang="fr">Modification gamme</value> - <value xml:lang="it">Aggiorna Ciclo</value> + <value xml:lang="it">Aggiorna ciclo</value> <value xml:lang="pt_BR">Editar rota</value> <value xml:lang="ro">Actualizare Ciclu</value> <value xml:lang="th">à¹à¸à¹à¹à¸ Routing</value> @@ -1496,7 +1500,7 @@ <value xml:lang="en">Edit Routing Product Link</value> <value xml:lang="es">Editar asociación de producto a ruta</value> <value xml:lang="fr">Modification des liens article - gamme</value> - <value xml:lang="it">Aggiorna Link Prodotto Ciclo</value> + <value xml:lang="it">Aggiorna link prodotto-ciclo</value> <value xml:lang="pt_BR">Editar link da rota do produto</value> <value xml:lang="ro">Actualizare Link Ciclu Produs </value> <value xml:lang="th">à¹à¸à¹à¹à¸ Routing à¸à¸²à¸£à¹à¸à¸·à¹à¸à¸¡à¸à¹à¸à¸ªà¸´à¸à¸à¹à¸²</value> @@ -1707,7 +1711,7 @@ <value xml:lang="en">Find Production Run</value> <value xml:lang="es">Buscar órdenes de producción</value> <value xml:lang="fr">Recherche d'ordre de fabrication</value> - <value xml:lang="it">Ricerca Ordine di Produzione</value> + <value xml:lang="it">Ricerca ordine di produzione</value> <value xml:lang="pt_BR">Procurar execuções de produção</value> <value xml:lang="ro">Cauta Comanda de Productie</value> <value xml:lang="th">à¸à¹à¸à¸«à¸²à¸à¸²à¸£à¸à¸¥à¸´à¸à¸ªà¸´à¸à¸à¹à¸²</value> @@ -1719,7 +1723,7 @@ <value xml:lang="en">Find Routing</value> <value xml:lang="es">Buscar ruta</value> <value xml:lang="fr">Recherche de gamme</value> - <value xml:lang="it">Ricerca Ciclo</value> + <value xml:lang="it">Ricerca ciclo</value> <value xml:lang="pt_BR">Procurar rota</value> <value xml:lang="ro">Cauta Ciclu</value> <value xml:lang="th">à¸à¹à¸à¸«à¸² Routing</value> @@ -1974,7 +1978,7 @@ <value xml:lang="en">JobShop</value> <value xml:lang="es">Producción</value> <value xml:lang="fr">Ordres de fabrication</value> - <value xml:lang="it">Ordine di Produzione</value> + <value xml:lang="it">Ordine di produzione</value> <value xml:lang="pt_BR">Pedidos de fabricação</value> <value xml:lang="ro">Comanda de Productie</value> <value xml:lang="th">à¸à¸µà¹à¸à¸³à¸à¸²à¸</value> @@ -2009,7 +2013,7 @@ <value xml:lang="en">List Of Production Run Components</value> <value xml:lang="es">Lista de componentes de la orden de producción</value> <value xml:lang="fr">Liste de production de l'ordre de fabrication</value> - <value xml:lang="it">Lista dei Componenti dell'Ordine di Produzione</value> + <value xml:lang="it">Lista dei componenti dell'ordine di produzione</value> <value xml:lang="pt_BR">Lista de componentes para execução de produção</value> <value xml:lang="th">รายà¸à¸²à¸£à¸à¸à¸à¸à¸²à¸£à¸à¸¥à¸´à¸à¸ªà¸´à¸à¸à¹à¸²</value> <value xml:lang="zh">ç产è¿è¡ç»ä»¶å表</value> @@ -2020,7 +2024,7 @@ <value xml:lang="en">List Of Production Run Fixed Assets</value> <value xml:lang="es">Lista de activos fijos de la orden de producción</value> <value xml:lang="fr">Liste de production des cours des machines</value> - <value xml:lang="it">Lista dei Cespiti Ordine di Produzione</value> + <value xml:lang="it">Lista dei cespiti ordine di produzione</value> <value xml:lang="pt_BR">Lista de Ativos fixos para execução de produção</value> <value xml:lang="ro">Lista Mijloacelor Fixe pentru Comanda de Productie</value> <value xml:lang="th">รายà¸à¸²à¸£à¸à¸à¸à¸à¸²à¸£à¸à¸¥à¸´à¸à¸ªà¸´à¸à¸à¹à¸²à¸à¸²à¸à¸ªà¸´à¸à¸à¸£à¸±à¸à¸¢à¹à¹à¸¡à¹à¸à¸²à¸§à¸£</value> @@ -2495,7 +2499,7 @@ <value xml:lang="en">New Routing</value> <value xml:lang="es">Nueva ruta</value> <value xml:lang="fr">Nouvelle gamme</value> - <value xml:lang="it">Nuovo Ciclo</value> + <value xml:lang="it">Nuovo ciclo</value> <value xml:lang="pt_BR">Nova rota</value> <value xml:lang="ro">Nou Ciclu</value> <value xml:lang="th">Routing à¹à¸«à¸¡à¹</value> @@ -2798,7 +2802,7 @@ <value xml:lang="en">Product Routing link doesn't exist</value> <value xml:lang="es">La relación con la ruta no existe</value> <value xml:lang="fr">Le lien article-gamme saisi, n'existe pas</value> - <value xml:lang="it">Link Ciclo Prodotto inesistente</value> + <value xml:lang="it">Link ciclo-prodotto inesistente</value> <value xml:lang="pt_BR">Relação do produto com a rota não existe</value> <value xml:lang="ro">Link Ciclu Produs inexistent</value> <value xml:lang="th">à¹à¸¡à¹à¸¡à¸µà¸à¸²à¸£à¹à¸à¸·à¹à¸à¸¡à¹à¸¢à¸à¸à¸±à¸à¸ªà¸´à¸à¸à¹à¸²</value> @@ -3061,7 +3065,7 @@ <value xml:lang="en">Production Run Name</value> <value xml:lang="es">Nombre de orden de producción</value> <value xml:lang="fr">Nom de l'ordre de fabrication</value> - <value xml:lang="it">Nome Ordine di Produzione</value> + <value xml:lang="it">Nome ordine di produzione</value> <value xml:lang="pt_BR">Nome da execução de produção</value> <value xml:lang="ro">Nume Comanda de Productie</value> <value xml:lang="th">à¸à¸·à¹à¸à¸à¸¥à¸´à¸à¸à¸¥</value> @@ -3590,7 +3594,7 @@ <value xml:lang="en">Routing has no Routing Task</value> <value xml:lang="es">La ruta no tiene tareas asociadas</value> <value xml:lang="fr">La gamme n'a pas opération</value> - <value xml:lang="it">Il Ciclo non ha Operazioni</value> + <value xml:lang="it">Il ciclo non ha operazioni</value> <value xml:lang="pt_BR">A rota não possui tarefas associadas</value> <value xml:lang="ro">Ciclul nu are Operatii</value> <value xml:lang="th">à¹à¸¡à¹à¸¡à¸µà¸à¸²à¸£à¸à¸³à¸à¸²à¸</value> @@ -3602,7 +3606,7 @@ <value xml:lang="en">Routing Id</value> <value xml:lang="es">Código de ruta</value> <value xml:lang="fr">Réf. de gamme</value> - <value xml:lang="it">Codice Ciclo</value> + <value xml:lang="it">Codice ciclo</value> <value xml:lang="pt_BR">Id da rota</value> <value xml:lang="ro">Cod Ciclu</value> <value xml:lang="th">รหัส Routing </value> @@ -3614,7 +3618,7 @@ <value xml:lang="en">RoutingId is missing</value> <value xml:lang="es">Falta código de ruta</value> <value xml:lang="fr">Réf. de gamme manquante</value> - <value xml:lang="it">Codice Ciclo è mancante</value> + <value xml:lang="it">Codice ciclo mancante</value> <value xml:lang="pt_BR">Id de rota está faltando</value> <value xml:lang="ro">Cod Ciclu lipseste</value> <value xml:lang="th">à¹à¸¡à¹à¹à¸à¹à¹à¸ªà¹ Routing</value> @@ -3626,7 +3630,7 @@ <value xml:lang="en">Routing Name</value> <value xml:lang="es">Nombre de ruta</value> <value xml:lang="fr">Nom de la gamme</value> - <value xml:lang="it">Nome Ciclo</value> + <value xml:lang="it">Nome ciclo</value> <value xml:lang="pt_BR">Nome da rota</value> <value xml:lang="ro">Nome Ciclu</value> <value xml:lang="th">à¸à¸·à¹à¸ Routing</value> @@ -3638,7 +3642,7 @@ <value xml:lang="en">The Routing Seq Id format is not correct</value> <value xml:lang="es">El formato usado para el código de secuencia no es correcto</value> <value xml:lang="fr">La réf. séq. de format de la gamme est incorrecte</value> - <value xml:lang="it">Codice Ciclo Seq formato non è corretto</value> + <value xml:lang="it">Il formato del codice ciclo seq non è corretto</value> <value xml:lang="pt_BR">O formato do Id de sequência da rota não está correto</value> <value xml:lang="ro">Cod Ciclu Seq format incorect</value> <value xml:lang="th">รูà¸à¹à¸à¸à¸£à¸«à¸±à¸ª Routing à¹à¸¡à¹à¸à¸¹à¸à¸à¹à¸à¸</value> @@ -3650,7 +3654,7 @@ <value xml:lang="en">Routing SeqId is Missing</value> <value xml:lang="es">Falta el código de secuencia</value> <value xml:lang="fr">Réf. séq. de gamme manquante</value> - <value xml:lang="it">Codice Ciclo Seq è Mancante</value> + <value xml:lang="it">Codice ciclo seq mancante</value> <value xml:lang="pt_BR">O Id da sequência de rota está faltando</value> <value xml:lang="ro">Cod Ciclu Seq Lipseste</value> <value xml:lang="th">à¹à¸¡à¹à¹à¸à¹à¹à¸ªà¹à¸£à¸«à¸±à¸ªà¸¥à¸³à¸à¸±à¸ Routing</value> @@ -3886,7 +3890,7 @@ <value xml:lang="en">Start Date</value> <value xml:lang="es">Fecha de inicio</value> <value xml:lang="fr">Date de début</value> - <value xml:lang="it">Data Inizio</value> + <value xml:lang="it">Data di inizio</value> <value xml:lang="pt_BR">Data de inÃcio</value> <value xml:lang="ro">Data Initiala</value> <value xml:lang="th">วัà¸à¹à¸£à¸´à¹à¸¡à¸à¹à¸</value> @@ -4449,7 +4453,7 @@ <value xml:lang="en">Edit Routing</value> <value xml:lang="es">Editar ruta</value> <value xml:lang="fr">Modifier la gamme</value> - <value xml:lang="it">Aggiorna Ciclo</value> + <value xml:lang="it">Aggiorna ciclo</value> <value xml:lang="pt_BR">Editar Rota</value> <value xml:lang="ro">Actualizare Ciclu</value> <value xml:lang="th">à¹à¸à¹à¹à¸ Routing</value> @@ -4461,7 +4465,7 @@ <value xml:lang="en">Edit Routing-Product Link</value> <value xml:lang="es">Editar asociación con producto</value> <value xml:lang="fr">Modification des liens article - gamme</value> - <value xml:lang="it">Aggiorna Link Ciclo-Prodotto</value> + <value xml:lang="it">Aggiorna link ciclo-prodotto</value> <value xml:lang="pt_BR">Editar associação entre rota e produto</value> <value xml:lang="ro">Actualizare Link Ciclu-Produs</value> <value xml:lang="th">à¹à¸à¹à¹à¸ Routing à¸à¸²à¸£à¹à¸à¸·à¹à¸à¸¡à¹à¸¢à¸à¸ªà¸´à¸à¸à¹à¸²</value> @@ -4602,7 +4606,7 @@ <value xml:lang="en">Find Routing</value> <value xml:lang="es">Buscar ruta</value> <value xml:lang="fr">Recherche de gammes</value> - <value xml:lang="it">Ricerca Ciclo</value> + <value xml:lang="it">Ricerca ciclo</value> <value xml:lang="pt_BR">Buscar rota</value> <value xml:lang="ro">Cauta Ciclu</value> <value xml:lang="th">à¸à¹à¸à¸«à¸² Routing</value> @@ -4673,7 +4677,7 @@ <value xml:lang="en">Lookup Routing</value> <value xml:lang="es">Buscar ruta</value> <value xml:lang="fr">Rechercher un ou des gammes</value> - <value xml:lang="it">Ricerca Ciclo</value> + <value xml:lang="it">Ricerca ciclo</value> <value xml:lang="pt_BR">Buscar rota</value> <value xml:lang="ro">Cauta Ciclu</value> <value xml:lang="th">à¸à¹à¸à¸«à¸² Routing</value> Modified: ofbiz/branches/jackrabbit20100709/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml?rev=1094250&r1=1094249&r2=1094250&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml Mon Apr 18 06:21:43 2011 @@ -152,7 +152,7 @@ under the License. <if> <condition> <or> - <if-compare field="parameters.failIfItemsAreNotAvailable" operator="equals" value="Y" type="String"/> + <if-empty field="parameters.failIfItemsAreNotOnHand"/> <if-compare field="parameters.failIfItemsAreNotOnHand" operator="equals" value="Y" type="String"/> </or> </condition> Modified: ofbiz/branches/jackrabbit20100709/applications/manufacturing/servicedef/services_production_run.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/manufacturing/servicedef/services_production_run.xml?rev=1094250&r1=1094249&r2=1094250&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/manufacturing/servicedef/services_production_run.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/manufacturing/servicedef/services_production_run.xml Mon Apr 18 06:21:43 2011 @@ -191,9 +191,9 @@ under the License. with type PRUNT_PROD_NEEDED is retrieved and used to get the quantity; its status is also updated to COMPLETED after the issuance is done. If locationSeqIds are provided, then the items are only issued from the inventory items associated to the locations. - If failIfItemsAreNotAvailable is set to "Y" (the default is "N") then the service fails if there isn not enough inventory available: + If failIfItemsAreNotAvailable is set to "Y" (the default is "Y") then the service fails if there is not enough inventory available: no reservation will be stolen. - If failIfItemsAreNotOnHand is set to "Y" (the default is "N") then the service fails if there isn not enough inventory: + If failIfItemsAreNotOnHand is set to "Y" (the default is "Y") then the service fails if there is not enough inventory: no items with negative qoh will be created. </description> <attribute name="workEffortId" type="String" mode="IN" optional="false"/> Modified: ofbiz/branches/jackrabbit20100709/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml?rev=1094250&r1=1094249&r2=1094250&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml Mon Apr 18 06:21:43 2011 @@ -35,7 +35,7 @@ under the License. <field name="routingId" title="${uiLabelMap.ManufacturingRoutingId}"><lookup target-form-name="LookupRouting" size="16"/></field> <field name="workEffortName" title="${uiLabelMap.ManufacturingProductionRunName}"><text size="30"/></field> <field name="description" title="${uiLabelMap.CommonDescription}"><text size="50"/></field> - <field name="createDependentProductionRuns"> + <field name="createDependentProductionRuns" title="${uiLabelMap.ManufacturingCreateDependentProductionRuns}"> <drop-down allow-empty="false"> <option key="N" description="${uiLabelMap.CommonNo}"/> <option key="Y" description="${uiLabelMap.CommonYes}"/> Modified: ofbiz/branches/jackrabbit20100709/applications/manufacturing/widget/manufacturing/JobshopScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/manufacturing/widget/manufacturing/JobshopScreens.xml?rev=1094250&r1=1094249&r2=1094250&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/manufacturing/widget/manufacturing/JobshopScreens.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/manufacturing/widget/manufacturing/JobshopScreens.xml Mon Apr 18 06:21:43 2011 @@ -521,7 +521,7 @@ under the License. <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="menu-bar"> <container style="button-bar"> - <link target="CreateProductionRun" text="${uiLabelMap.ManufacturingCreateProductionRun}" style="buttontext"/> + <link target="CreateProductionRun" text="${uiLabelMap.ManufacturingCreateProductionRun}" style="buttontext create"/> </container> </decorator-section> <decorator-section name="search-options"> Modified: ofbiz/branches/jackrabbit20100709/applications/order/config/OrderErrorUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/config/OrderErrorUiLabels.xml?rev=1094250&r1=1094249&r2=1094250&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/order/config/OrderErrorUiLabels.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/order/config/OrderErrorUiLabels.xml Mon Apr 18 06:21:43 2011 @@ -4238,7 +4238,7 @@ <value xml:lang="zh_TW">é¯èª¤ï¼æ¥æ¾é·å®è¨å®è¡å¤±æ</value> </property> <property key="checkhelper.select_method_of_payment"> - <value xml:lang="de">Bitte wählen sie eine Zahlweise.</value> + <value xml:lang="de">Bitte wählen Sie eine Zahlungsart.</value> <value xml:lang="en">Please select a method of payment.</value> <value xml:lang="es">Por favor, seleccione un método de pago.</value> <value xml:lang="fr">S'il vous plaît choisissez un moyen de paiement.</value> Modified: ofbiz/branches/jackrabbit20100709/applications/order/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/entitydef/entitymodel.xml?rev=1094250&r1=1094249&r2=1094250&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/order/entitydef/entitymodel.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/order/entitydef/entitymodel.xml Mon Apr 18 06:21:43 2011 @@ -2800,6 +2800,7 @@ under the License. <field name="shoppingListItemSeqId" type="id-ne"></field> <field name="productId" type="id"></field> <field name="quantity" type="fixed-point"></field> + <field name="modifiedPrice" type="currency-precise"/> <field name="reservStart" type="date-time"></field> <field name="reservLength" type="fixed-point"></field> <field name="reservPersons" type="fixed-point"></field> Propchange: ofbiz/branches/jackrabbit20100709/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 18 06:21:43 2011 @@ -2,4 +2,4 @@ /ofbiz/branches/dojo1.4/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:951708-952957 /ofbiz/branches/jquery/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:952958-1044489 /ofbiz/branches/multitenant20100310/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:921280-927264 -/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:962442-1090146 +/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:962442-1094239 Modified: ofbiz/branches/jackrabbit20100709/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml?rev=1094250&r1=1094249&r2=1094250&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml Mon Apr 18 06:21:43 2011 @@ -232,13 +232,16 @@ under the License. <map-to-map map="calcPriceInBaseMap" to-map="calcPriceInMap"/> <set field="calcPriceInMap.product" from-field="product"/> <set field="calcPriceInMap.quantity" from-field="shoppingListItem.quantity"/> - <call-service service-name="calculateProductPrice" in-map-name="calcPriceInMap"> - <result-to-field result-name="price" field="calcPriceOutMap.price"/> - </call-service> + <if-not-empty field="shoppingListItem.modifiedPrice"> + <call-service service-name="calculateProductPrice" in-map-name="calcPriceInMap"> + <result-to-field result-name="price" field="calcPriceOutMap.price"/> + </call-service> + </if-not-empty> + <set field="itemPrice" from-field="shoppingListItem.modifiedPrice" default-value="${calcPriceOutMap.price}"/> <calculate field="totalPrice"> <calcop field="totalPrice" operator="add"/> <calcop operator="multiply"> - <calcop operator="get" field="calcPriceOutMap.price"/> + <calcop operator="get" field="itemPrice"/> <calcop operator="get" field="shoppingListItem.quantity"/> </calcop> </calculate> Modified: ofbiz/branches/jackrabbit20100709/applications/order/servicedef/services_shoppinglist.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/servicedef/services_shoppinglist.xml?rev=1094250&r1=1094249&r2=1094250&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/order/servicedef/services_shoppinglist.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/order/servicedef/services_shoppinglist.xml Mon Apr 18 06:21:43 2011 @@ -101,6 +101,7 @@ under the License. <attribute name="shoppingListId" type="String" mode="IN" optional="false"/> <attribute name="productId" type="String" mode="IN" optional="true"/> <attribute name="quantity" type="BigDecimal" mode="IN" optional="true"/> + <attribute name="modifiedPrice" type="BigDecimal" mode="IN" optional="true"/> <attribute name="reservStart" type="Timestamp" mode="IN" optional="true"/> <attribute name="reservLength" type="BigDecimal" mode="IN" optional="true"/> <attribute name="reservPersons" type="BigDecimal" mode="IN" optional="true"/> Modified: ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java?rev=1094250&r1=1094249&r2=1094250&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java (original) +++ ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java Mon Apr 18 06:21:43 2011 @@ -43,6 +43,7 @@ import org.ofbiz.base.util.UtilFormatOut import org.ofbiz.base.util.UtilGenerics; import org.ofbiz.base.util.UtilHttp; import org.ofbiz.base.util.UtilMisc; +import org.ofbiz.base.util.UtilNumber; import org.ofbiz.base.util.UtilProperties; import org.ofbiz.base.util.UtilValidate; import org.ofbiz.entity.Delegator; @@ -400,6 +401,13 @@ public class ShoppingCartEvents { // parse the quantity try { quantity = (BigDecimal) ObjectType.simpleTypeConvert(quantityStr, "BigDecimal", null, locale); + //For quantity we should test if we allow to add decimal quantity for this product an productStore : if not then round to 0 + if(! ProductWorker.isDecimalQuantityOrderAllowed(delegator, productId, cart.getProductStoreId())){ + quantity = quantity.setScale(0, UtilNumber.getBigDecimalRoundingMode("order.rounding")); + } + else { + quantity = quantity.setScale(UtilNumber.getBigDecimalScale("order.decimals"), UtilNumber.getBigDecimalRoundingMode("order.rounding")); + } } catch (Exception e) { Debug.logWarning(e, "Problems parsing quantity string: " + quantityStr, module); quantity = BigDecimal.ONE; Modified: ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartHelper.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartHelper.java?rev=1094250&r1=1094249&r2=1094250&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartHelper.java (original) +++ ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartHelper.java Mon Apr 18 06:21:43 2011 @@ -38,6 +38,7 @@ import org.ofbiz.base.util.GeneralExcept import org.ofbiz.base.util.ObjectType; import org.ofbiz.base.util.UtilHttp; import org.ofbiz.base.util.UtilMisc; +import org.ofbiz.base.util.UtilNumber; import org.ofbiz.base.util.UtilProperties; import org.ofbiz.base.util.UtilValidate; import org.ofbiz.entity.Delegator; @@ -743,6 +744,13 @@ public class ShoppingCartHelper { } } else { quantity = (BigDecimal) ObjectType.simpleTypeConvert(quantString, "BigDecimal", null, locale); + //For quantity we should test if we allow to add decimal quantity for this product an productStore : if not then round to 0 + if(! ProductWorker.isDecimalQuantityOrderAllowed(delegator, item.getProductId(), cart.getProductStoreId())){ + quantity = quantity.setScale(0, UtilNumber.getBigDecimalRoundingMode("order.rounding")); + } + else { + quantity = quantity.setScale(UtilNumber.getBigDecimalScale("order.decimals"), UtilNumber.getBigDecimalRoundingMode("order.rounding")); + } if (quantity.compareTo(BigDecimal.ZERO) < 0) { String errMsg = UtilProperties.getMessage(resource_error, "cart.quantity_not_positive_number", this.cart.getLocale()); errorMsgs.add(errMsg); Modified: ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java?rev=1094250&r1=1094249&r2=1094250&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java (original) +++ ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java Mon Apr 18 06:21:43 2011 @@ -1012,6 +1012,7 @@ public class ShoppingCartServices { amount = BigDecimal.ZERO; } */ + BigDecimal modifiedPrice = shoppingListItem.getBigDecimal("modifiedPrice"); BigDecimal quantity = shoppingListItem.getBigDecimal("quantity"); if (quantity == null) { quantity = BigDecimal.ZERO; @@ -1033,6 +1034,15 @@ public class ShoppingCartServices { Debug.logError(e, module); return ServiceUtil.returnError(e.getMessage()); } + + // set the modified price + if (modifiedPrice != null && modifiedPrice.doubleValue() != 0) { + ShoppingCartItem item = cart.findCartItem(itemIndex); + if (item != null) { + item.setIsModifiedPrice(true); + item.setBasePrice(modifiedPrice); + } + } } // flag the item w/ the orderItemSeqId so we can reference it Modified: ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductDisplayWorker.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductDisplayWorker.java?rev=1094250&r1=1094249&r2=1094250&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductDisplayWorker.java (original) +++ ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductDisplayWorker.java Mon Apr 18 06:21:43 2011 @@ -36,6 +36,7 @@ import javolution.util.FastMap; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilGenerics; import org.ofbiz.base.util.UtilMisc; +import org.ofbiz.base.util.UtilNumber; import org.ofbiz.base.util.UtilValidate; import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntity; @@ -46,6 +47,7 @@ import org.ofbiz.order.shoppingcart.Shop import org.ofbiz.order.shoppingcart.ShoppingCartItem; import org.ofbiz.product.catalog.CatalogWorker; import org.ofbiz.product.category.CategoryWorker; +import org.ofbiz.product.product.ProductWorker; public class ProductDisplayWorker { @@ -282,6 +284,14 @@ public class ProductDisplayWorker { String prodId = entry.getKey(); Integer quantity = entry.getValue(); BigDecimal occs = productQuantities.get(prodId); + //For quantity we should test if we allow to add decimal quantity for this product an productStore : if not then round to 0 + if(! ProductWorker.isDecimalQuantityOrderAllowed(delegator, (String)prodId, cart.getProductStoreId())){ + occs = occs.setScale(0, UtilNumber.getBigDecimalRoundingMode("order.rounding")); + } + else { + occs = occs.setScale(UtilNumber.getBigDecimalScale("order.decimals"), UtilNumber.getBigDecimalRoundingMode("order.rounding")); + } + productQuantities.put(prodId, occs); BigDecimal nqdbl = quantityModifier.multiply(new BigDecimal(quantity)).add(occs.multiply(occurancesModifier)); newMetric.put(prodId, nqdbl); Modified: ofbiz/branches/jackrabbit20100709/applications/party/config/PartyErrorUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/party/config/PartyErrorUiLabels.xml?rev=1094250&r1=1094249&r2=1094250&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/party/config/PartyErrorUiLabels.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/party/config/PartyErrorUiLabels.xml Mon Apr 18 06:21:43 2011 @@ -1157,7 +1157,7 @@ <value xml:lang="zh_TW">ç¡æ³æ´æ°äººå¡è³è¨ (è®å¤±æ)ï¼${0}</value> </property> <property key="person.update.success"> - <value xml:lang="de">Person erfolgreich aktualisiert.</value> + <value xml:lang="de">Persönliche Daten erfolgreich aktualisiert.</value> <value xml:lang="en">Person successfully updated.</value> <value xml:lang="es">Actualización finalizada correctamente</value> <value xml:lang="fr">Personne mise à jour avec succès.</value> Modified: ofbiz/branches/jackrabbit20100709/applications/party/config/PartyUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/party/config/PartyUiLabels.xml?rev=1094250&r1=1094249&r2=1094250&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/party/config/PartyUiLabels.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/party/config/PartyUiLabels.xml Mon Apr 18 06:21:43 2011 @@ -1148,7 +1148,7 @@ <value xml:lang="es">Sugerencia para clave</value> <value xml:lang="fr">Astuce du mot de passe</value> <value xml:lang="hi_IN">पासवरà¥à¤¡ सà¥à¤à¤¾à¤µ</value> - <value xml:lang="it">Suggerimento Password</value> + <value xml:lang="it">Suggerimento password</value> <value xml:lang="nl">Hint wachtwoord</value> <value xml:lang="pt_BR">Dica de senha</value> <value xml:lang="ro">Sugeriment PAROLA</value> @@ -3524,7 +3524,7 @@ <value xml:lang="es">Usuario</value> <value xml:lang="fr">Client utilisateur</value> <value xml:lang="hi_IN">à¤à¤ªà¤¯à¥à¤à¤à¤°à¥à¤¤à¤¾ à¤à¥à¤°à¤¾à¤¹à¤</value> - <value xml:lang="it">Utente Client</value> + <value xml:lang="it">Utente client</value> <value xml:lang="nl">Client User</value> <value xml:lang="pt_BR">Usuário</value> <value xml:lang="pt_PT">Nome de Utilizador do Cliente </value> @@ -5641,7 +5641,7 @@ <value xml:lang="es">Continuar sesión</value> <value xml:lang="fr">Session suivante</value> <value xml:lang="hi_IN">सतà¥à¤° à¤à¤¾ ठनà¥à¤à¤®à¤¨ à¤à¤°à¥à¤</value> - <value xml:lang="it">Segue Sessione</value> + <value xml:lang="it">Segui sessione</value> <value xml:lang="nl">Volg sessie</value> <value xml:lang="pt_BR">Continuar sessão</value> <value xml:lang="pt_PT">Prosseguir Sessão</value> @@ -5928,7 +5928,7 @@ <value xml:lang="es">Encontrar pista</value> <value xml:lang="fr">Enregistrement de pointage</value> <value xml:lang="hi_IN">हिठà¤à¥à¤°à¥à¤à¥à¤à¥à¤°à¤°</value> - <value xml:lang="it">Traccia Colpi</value> + <value xml:lang="it">Traccia dei colpi</value> <value xml:lang="nl">Hit Tracker</value> <value xml:lang="pt_BR">Encontrar pista</value> <value xml:lang="pt_PT">Encontrar Pista </value> @@ -6038,7 +6038,7 @@ <value xml:lang="es">Origen</value> <value xml:lang="fr">Origine</value> <value xml:lang="hi_IN">पà¥à¤°à¤¾à¤°à¤à¤à¤¿à¤ à¤à¤¾à¤·à¤¾</value> - <value xml:lang="it">Iniziale Locale</value> + <value xml:lang="it">Lingua iniziale</value> <value xml:lang="nl">Initialen Locale</value> <value xml:lang="pt_BR">Origem inicial</value> <value xml:lang="pt_PT">Inicial da Localidade</value> @@ -6054,7 +6054,7 @@ <value xml:lang="es">Referencia inicial</value> <value xml:lang="fr">Référence initiale </value> <value xml:lang="hi_IN">पà¥à¤°à¤¾à¤°à¤à¤à¤¿à¤ सà¤à¤¦à¤°à¥à¤</value> - <value xml:lang="it">Iniziale Riferimento</value> + <value xml:lang="it">Riferimento iniziale</value> <value xml:lang="nl">Initial Referer</value> <value xml:lang="pt_BR">Referência inicial</value> <value xml:lang="pt_PT">Inicial de Referência</value> @@ -6070,7 +6070,7 @@ <value xml:lang="es">Petición inicial</value> <value xml:lang="fr">Demande initiale</value> <value xml:lang="hi_IN">पà¥à¤°à¤¾à¤°à¤à¤à¤¿à¤ ठनà¥à¤°à¥à¤§</value> - <value xml:lang="it">Iniziale Richiesta</value> + <value xml:lang="it">Richiesta iniziale</value> <value xml:lang="nl">Initial Request</value> <value xml:lang="pt_BR">Requisição inicial</value> <value xml:lang="pt_PT">Inicial do Pedido</value> @@ -6086,7 +6086,7 @@ <value xml:lang="es">Inicial</value> <value xml:lang="fr">Utilisateur initial</value> <value xml:lang="hi_IN">पà¥à¤°à¤¾à¤°à¤à¤à¤¿à¤ पà¥à¤°à¤¯à¥à¤à¥à¤¤à¤¾ à¤à¤à¥à¤à¤</value> - <value xml:lang="it">Iniziale User Agent</value> + <value xml:lang="it">User agent iniziale</value> <value xml:lang="nl">Initial User Agent</value> <value xml:lang="pt_BR">Usuário inicial</value> <value xml:lang="pt_PT">Inicial do Agente Utilizador</value> @@ -8077,7 +8077,7 @@ <value xml:lang="en">Page Push/Following</value> <value xml:lang="es">Siguiente</value> <value xml:lang="fr">Page envoyée / page suivante</value> - <value xml:lang="it">Pagina Precedente/Successiva</value> + <value xml:lang="it">Pagina precedente/successiva</value> <value xml:lang="nl">Page Push/Following</value> <value xml:lang="pt_BR">Página anterior/seguinte</value> <value xml:lang="pt_PT">Carregar Página/Seguinte</value> @@ -10210,7 +10210,7 @@ <value xml:lang="es">Aún activo</value> <value xml:lang="fr">Encore actif (ve)</value> <value xml:lang="hi_IN">ठब तठसà¤à¥à¤°à¤¿à¤¯</value> - <value xml:lang="it">Ancora Attivo</value> + <value xml:lang="it">Ancora attivo</value> <value xml:lang="nl">Nog steeds actief</value> <value xml:lang="pt_BR">Ainda ativo</value> <value xml:lang="pt_PT">Ainda Activo</value> @@ -10808,7 +10808,7 @@ <value xml:lang="es">Usuario creado</value> <value xml:lang="fr">Création d'un utilisateur</value> <value xml:lang="hi_IN">à¤à¤ªà¤¯à¥à¤à¤à¤°à¥à¤¤à¤¾ बनाया à¤à¤¯à¤¾</value> - <value xml:lang="it">Utente Creatore</value> + <value xml:lang="it">Creato utente</value> <value xml:lang="nl">Gebruiker aangemaakt</value> <value xml:lang="pt_BR">Usuário criado</value> <value xml:lang="pt_PT">Utilizador Criado</value> @@ -11042,7 +11042,7 @@ <value xml:lang="en">Visit Detail</value> <value xml:lang="es">Detalle de visita</value> <value xml:lang="fr">Détail des visites</value> - <value xml:lang="it">Dettagli Visita</value> + <value xml:lang="it">Dettagli visita</value> <value xml:lang="nl">Detail webbezoek</value> <value xml:lang="pt_BR">Detalhes de visita</value> <value xml:lang="pt_PT">Detalhe de Visita</value> @@ -11057,7 +11057,7 @@ <value xml:lang="en">VisitID / SessionID</value> <value xml:lang="es">Código de visita / código de sesión</value> <value xml:lang="fr">Ident. de la visite / de la session</value> - <value xml:lang="it">Numero Visita / Numero Sessione</value> + <value xml:lang="it">Numero visita / Numero sessione</value> <value xml:lang="nl">Bezoek-ID/Sessie-ID</value> <value xml:lang="pt_BR">ID da visita / ID da sessão</value> <value xml:lang="pt_PT">Id da Visita/Id da secção</value> @@ -11076,7 +11076,7 @@ <value xml:lang="nl">Bezoek-Id</value> <value xml:lang="pt_BR">ID da visita</value> <value xml:lang="pt_PT">Id da Visita</value> - <value xml:lang="ro">Numero Visita</value> + <value xml:lang="ro">Numero visita</value> <value xml:lang="ru">Ðод поÑеÑениÑ</value> <value xml:lang="th">รหัสà¸à¸²à¸£à¹à¸¢à¸µà¹à¸¢à¸¡à¸à¸¡</value> <value xml:lang="zh">访é®æ è¯</value> Modified: ofbiz/branches/jackrabbit20100709/applications/party/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/party/servicedef/services.xml?rev=1094250&r1=1094249&r2=1094250&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/party/servicedef/services.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/party/servicedef/services.xml Mon Apr 18 06:21:43 2011 @@ -79,6 +79,8 @@ under the License. <attribute name="description" type="String" mode="IN" optional="true"/> <attribute name="externalId" type="String" mode="IN" optional="true"/> <attribute name="statusId" type="String" mode="IN" optional="true"/> + <override name="firstName" mode="IN" type="String" optional="false"/> + <override name="lastName" mode="IN" type="String" optional="false"/> </service> <service name="createPersonAndUserLogin" engine="simple" require-new-transaction="true" location="component://party/script/org/ofbiz/party/party/PartySimpleMethods.xml" invoke="createPersonAndUserLogin" auth="false"> Propchange: ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 18 06:21:43 2011 @@ -2,4 +2,4 @@ /ofbiz/branches/dojo1.4/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:951708-952957 /ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:952958-1044489 /ofbiz/branches/multitenant20100310/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:921280-927264 -/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:962442-1090146 +/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:962442-1094239 Modified: ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/party/profileblocks/Contact.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/party/profileblocks/Contact.ftl?rev=1094250&r1=1094249&r2=1094250&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/party/profileblocks/Contact.ftl (original) +++ ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/party/profileblocks/Contact.ftl Mon Apr 18 06:21:43 2011 @@ -88,7 +88,7 @@ under the License. <#if contactMechPurposeType?has_content> <#assign popUptitle = contactMechPurposeType.get("description",locale) + uiLabelMap.CommonGeoLocation> </#if> - <a href="javascript:popUp('<@ofbizUrl>PartyGeoLocation?geoPointId=${postalAddress.geoPointId}</@ofbizUrl>', '${popUptitle?if_exists}', '450', '550')" class="buttontext">${uiLabelMap.CommonGeoLocation}</a> + <a href="javascript:popUp('<@ofbizUrl>PartyGeoLocation?geoPointId=${postalAddress.geoPointId}&partyId=${partyId}</@ofbizUrl>', '${popUptitle?if_exists}', '450', '550')" class="buttontext">${uiLabelMap.CommonGeoLocation}</a> </#if> <#elseif "TELECOM_NUMBER" = contactMech.contactMechTypeId> <#assign telecomNumber = contactMechMap.telecomNumber> |
Free forum by Nabble | Edit this page |