You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by sa...@apache.org on 2011/10/25 13:48:31 UTC
svn commit: r1188617 - in /ofbiz/branches/jackrabbit20100709: ./
applications/accounting/config/ applications/manufacturing/config/
applications/marketing/config/ applications/order/config/
applications/order/src/org/ofbiz/order/order/ applications/ord...
Author: sascharodekamp
Date: Tue Oct 25 11:48:30 2011
New Revision: 1188617
URL: http://svn.apache.org/viewvc?rev=1188617&view=rev
Log:
Update the Jackrabbit branch with the current trunk version to keep the branch up to date
Modified:
ofbiz/branches/jackrabbit20100709/ (props changed)
ofbiz/branches/jackrabbit20100709/applications/accounting/config/AccountingEntityLabels.xml
ofbiz/branches/jackrabbit20100709/applications/manufacturing/config/ManufacturingUiLabels.xml
ofbiz/branches/jackrabbit20100709/applications/marketing/config/MarketingUiLabels.xml
ofbiz/branches/jackrabbit20100709/applications/order/config/OrderUiLabels.xml
ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/order/OrderServices.java
ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java
ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java
ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderHistory.groovy
ofbiz/branches/jackrabbit20100709/applications/order/widget/ordermgr/OrderForms.xml
ofbiz/branches/jackrabbit20100709/applications/order/widget/ordermgr/ReturnForms.xml
ofbiz/branches/jackrabbit20100709/applications/party/config/PartyUiLabels.xml
ofbiz/branches/jackrabbit20100709/applications/party/widget/partymgr/CommunicationEventScreens.xml
ofbiz/branches/jackrabbit20100709/applications/product/config/ProductEntityLabels.xml
ofbiz/branches/jackrabbit20100709/applications/product/config/ProductUiLabels.xml
ofbiz/branches/jackrabbit20100709/applications/product/script/org/ofbiz/shipment/test/ShipmentTests.xml
ofbiz/branches/jackrabbit20100709/applications/product/servicedef/services_pricepromo.xml
ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/promo/PromoServices.java
ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/shipment/test/IssuanceTest.java
ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl
ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/promo/FindProductPromoCode.ftl
ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/CommonScreens.xml
ofbiz/branches/jackrabbit20100709/framework/common/config/CommonEntityLabels.xml
ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/EmailOrderScreens.xml
Propchange: ofbiz/branches/jackrabbit20100709/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 25 11:48:30 2011
@@ -2,4 +2,4 @@
/ofbiz/branches/dojo1.4:951708-952957
/ofbiz/branches/jquery:952958-1044489
/ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:962442-1186940
+/ofbiz/trunk:962442-1188616
Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/config/AccountingEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/config/AccountingEntityLabels.xml?rev=1188617&r1=1188616&r2=1188617&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/accounting/config/AccountingEntityLabels.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/accounting/config/AccountingEntityLabels.xml Tue Oct 25 11:48:30 2011
@@ -646,7 +646,7 @@
</property>
<property key="FixedAssetType.description.GROUP_EQUIPMENT">
<value xml:lang="en">Group of machines, used for task and routing definition</value>
- <value xml:lang="fr">Groupe de machines, utilisé pour la définition de tâches et routages</value>
+ <value xml:lang="fr">Groupe de machines, utilisé pour la définition de tâches et de gamme de fabrication</value>
<value xml:lang="hi_IN">मशà¥à¤¨à¥à¤ à¤à¤¾ समà¥à¤¹ à¤à¤¾à¤°à¥à¤¯ à¤à¤° परिà¤à¤¾à¤·à¤¾ à¤
नà¥à¤®à¤¾à¤°à¥à¤à¤£ à¤à¥ लिठपà¥à¤°à¤¯à¥à¤ à¤à¤¿à¤¯à¤¾ à¤à¤¾à¤¤à¤¾ हà¥</value>
<value xml:lang="it">Gruppo di macchine, usato nelle operazioni e cicli di produzione</value>
<value xml:lang="pt_BR">Grupo de Máquinas, usado para definição de tarefas e rota</value>
@@ -671,7 +671,7 @@
</property>
<property key="FixedAssetType.description.PRODUCTION_EQUIPMENT">
<value xml:lang="en">The fixed asset used in the operation-routing definition</value>
- <value xml:lang="fr">Actif immobilisé utilisé dans la définition de routages et tâches</value>
+ <value xml:lang="fr">Actif immobilisé utilisé dans la définition de gammes et tâches</value>
<value xml:lang="hi_IN">à¤à¤ªà¤°à¥à¤¶à¤¨-परिà¤à¤¾à¤·à¤¾ à¤
नà¥à¤®à¤¾à¤°à¥à¤à¤£ मà¥à¤ à¤
à¤à¤² सà¤à¤ªà¤¤à¥à¤¤à¤¿ à¤à¤¾ à¤à¤ªà¤¯à¥à¤</value>
<value xml:lang="it">Attrezzature usate nelle operazioni e cicli di produzione</value>
<value xml:lang="pt_BR">Ativo fixo usado na definição de rota operacional</value>
Modified: ofbiz/branches/jackrabbit20100709/applications/manufacturing/config/ManufacturingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/manufacturing/config/ManufacturingUiLabels.xml?rev=1188617&r1=1188616&r2=1188617&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/manufacturing/config/ManufacturingUiLabels.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/manufacturing/config/ManufacturingUiLabels.xml Tue Oct 25 11:48:30 2011
@@ -2299,7 +2299,7 @@
<value xml:lang="de">Materialien werden für aktuellen Arbeitsgang benötigt</value>
<value xml:lang="en">Materials Required By The Running Task</value>
<value xml:lang="es">Materiales requeridos para la tarea en ejecución</value>
- <value xml:lang="fr">Matériaux exigé par l'opération en cours d'exécution</value>
+ <value xml:lang="fr">Matériaux exigés par l'opération en cours d'exécution</value>
<value xml:lang="it">Materiali Richiesti dall'Operazione in Esecuzione</value>
<value xml:lang="pt_BR">Materiais necessário para tarefa em execução</value>
<value xml:lang="th">à¸à¹à¸à¸¡à¸¹à¸¥à¸à¸µà¹à¸à¹à¸à¸à¸à¸²à¸£à¹à¸à¸¢à¸à¸²à¸£à¸à¸³à¸à¸²à¸à¸à¸¢à¹à¸²à¸à¸à¹à¸à¹à¸à¸·à¹à¸à¸</value>
@@ -4141,7 +4141,7 @@
<value xml:lang="de">Zwei Arbeitsgänge mit der gleichen Folgenummer und im gleichen Zeitraum</value>
<value xml:lang="en">Two routing task with same SeqId and same period</value>
<value xml:lang="es">Existen dos tareas con la misma secuencia y periodo</value>
- <value xml:lang="fr">Deux opérations de gammes avce la même réf. séq. et la même période</value>
+ <value xml:lang="fr">Deux opérations de gammes avec le même n° de séq. et la même date de début</value>
<value xml:lang="it">Due Operazioni con stesso Codice Seq e stesso periodo</value>
<value xml:lang="pt_BR">Existem duas tarefas de rota com o mesmo Id de sequência no mesmo intervalo de tempo</value>
<value xml:lang="ro">Doua Operatii cu acelasi Cod Seq si aceiasi perioda </value>
Modified: ofbiz/branches/jackrabbit20100709/applications/marketing/config/MarketingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/marketing/config/MarketingUiLabels.xml?rev=1188617&r1=1188616&r2=1188617&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/marketing/config/MarketingUiLabels.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/marketing/config/MarketingUiLabels.xml Tue Oct 25 11:48:30 2011
@@ -1085,7 +1085,7 @@
<property key="MarketingTrackingCodeDefaultProdCatalogId">
<value xml:lang="en">Default Product Catalog Id</value>
<value xml:lang="es">Catálogo</value>
- <value xml:lang="fr">Réf. du catalogue produit par défault</value>
+ <value xml:lang="fr">Catalogue produit par défaut</value>
<value xml:lang="it">Codice Catalogo Default</value>
<value xml:lang="nl">Standaard catalogus</value>
<value xml:lang="pt_BR">ID do Catálogo de Produtos Padrão</value>
Modified: ofbiz/branches/jackrabbit20100709/applications/order/config/OrderUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/config/OrderUiLabels.xml?rev=1188617&r1=1188616&r2=1188617&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/order/config/OrderUiLabels.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/order/config/OrderUiLabels.xml Tue Oct 25 11:48:30 2011
@@ -1078,7 +1078,7 @@
<value xml:lang="de">Anzahl Paletten</value>
<value xml:lang="en">Skids Pallets</value>
<value xml:lang="es">Número de palés</value>
- <value xml:lang="fr">Pallettes</value>
+ <value xml:lang="fr">Palettes</value>
<value xml:lang="it">Numero di Pallets</value>
<value xml:lang="nl">Aantal pallets</value>
<value xml:lang="pt_BR">Deslizador de Pallets</value>
@@ -1824,7 +1824,7 @@
<value xml:lang="de">Genehmigt</value>
<value xml:lang="en">Approved</value>
<value xml:lang="es">Aprobada</value>
- <value xml:lang="fr">Approuvées</value>
+ <value xml:lang="fr">Approuvée</value>
<value xml:lang="it">Approvato</value>
<value xml:lang="nl">Goedgekeurd</value>
<value xml:lang="pt_BR">Aprovado</value>
@@ -1839,7 +1839,7 @@
<value xml:lang="de">Produktbedarf bestätigen</value>
<value xml:lang="en">Approved Product Requirements</value>
<value xml:lang="es">Aprobados requisitos de producto</value>
- <value xml:lang="fr">Besoins approuvées</value>
+ <value xml:lang="fr">Besoins approuvés</value>
<value xml:lang="it">Fabbisogni Prodotto Approvati</value>
<value xml:lang="nl">Goedgekeurde productbehoeften</value>
<value xml:lang="pt_BR">Requisitos do produto aprovados</value>
@@ -2279,6 +2279,10 @@
<value xml:lang="zh">纸箱</value>
<value xml:lang="zh_TW">ç´ç®±</value>
</property>
+ <property key="OrderChangedByUser">
+ <value xml:lang="en">Changed by user</value>
+ <value xml:lang="fr">Par l'utilisateur</value>
+ </property>
<property key="OrderCheckout">
<value xml:lang="cs">Objednávka</value>
<value xml:lang="de">Bestellung</value>
@@ -2508,7 +2512,7 @@
<value xml:lang="de">Abgeschlossen</value>
<value xml:lang="en">Completed</value>
<value xml:lang="es">Terminado</value>
- <value xml:lang="fr">Terminées</value>
+ <value xml:lang="fr">Terminée</value>
<value xml:lang="it">Completato</value>
<value xml:lang="nl">Afgehandeld</value>
<value xml:lang="pt_BR">ConcluÃdo</value>
@@ -2683,7 +2687,7 @@
<value xml:lang="de">Erstellt</value>
<value xml:lang="en">Created</value>
<value xml:lang="es">Creado</value>
- <value xml:lang="fr">Création</value>
+ <value xml:lang="fr">Créée</value>
<value xml:lang="it">Creato</value>
<value xml:lang="nl">Aangemaakt op</value>
<value xml:lang="ro">Creat</value>
@@ -3233,7 +3237,7 @@
</property>
<property key="OrderDoNotInclude">
<value xml:lang="en">Do Not Include</value>
- <value xml:lang="fr">N'est pas inclu</value>
+ <value xml:lang="fr">N'est pas inclus</value>
<value xml:lang="it">Non includere</value>
<value xml:lang="pt_BR">Não incluir</value>
</property>
@@ -7423,7 +7427,7 @@
<value xml:lang="de">Hängige Aufträge</value>
<value xml:lang="en">Orders Pending</value>
<value xml:lang="es">Pedidos de venta pendientes</value>
- <value xml:lang="fr">Commande de vente en attente</value>
+ <value xml:lang="fr">Commandes de vente en attente</value>
<value xml:lang="it">Ordini Sospesi</value>
<value xml:lang="nl">Orders in behandeling</value>
<value xml:lang="pt_BR">Pedidos pendentes</value>
@@ -8893,7 +8897,7 @@
<value xml:lang="de">Abgelehnt</value>
<value xml:lang="en">Rejected</value>
<value xml:lang="es">Rechazada</value>
- <value xml:lang="fr">Rejeté</value>
+ <value xml:lang="fr">Rejetée</value>
<value xml:lang="it">Scartato</value>
<value xml:lang="nl">Rejected</value>
<value xml:lang="pt_BR">Rejeitado</value>
@@ -8990,7 +8994,7 @@
<value xml:lang="de">Einkäufe pro Organisation Bericht</value>
<value xml:lang="en">Purchases by Organization Report</value>
<value xml:lang="es">Informe de compras por organización</value>
- <value xml:lang="fr">Etat des achats par organisations</value>
+ <value xml:lang="fr">Etat des achats par organisation</value>
<value xml:lang="it">Report Acquisti per Organizzazione</value>
<value xml:lang="nl">Purchases by Organization Report</value>
<value xml:lang="pt_BR">Relatório de compras por organização</value>
@@ -9004,7 +9008,7 @@
<value xml:lang="de">Einkäufe pro Zahlungsmethode Bericht</value>
<value xml:lang="en">Purchases by Payment Method Report</value>
<value xml:lang="es">Informe de compras por método de pago</value>
- <value xml:lang="fr">Etat des achats par modes de paiement</value>
+ <value xml:lang="fr">Etat des achats par mode de paiement</value>
<value xml:lang="it">Report Acquisti per Metodo di Pagamento</value>
<value xml:lang="nl">Purchases by Payment Method Report</value>
<value xml:lang="pt_BR">Relatório de compras por métodos de pagamentos </value>
@@ -9032,7 +9036,7 @@
<value xml:lang="de">Verkäufe pro Laden Bericht</value>
<value xml:lang="en">Sales by Store Report</value>
<value xml:lang="es">Informe de ventas por tienda</value>
- <value xml:lang="fr">Etat des ventes par centres de profit</value>
+ <value xml:lang="fr">Etat des ventes par centre de profit</value>
<value xml:lang="it">Report Vendite per Negozio</value>
<value xml:lang="nl">Sales by Store Report</value>
<value xml:lang="pt_BR">Relatório de vendas por loja</value>
@@ -11077,7 +11081,7 @@
<value xml:lang="de">Pallette</value>
<value xml:lang="en">Skids Pallets</value>
<value xml:lang="es">Paletas</value>
- <value xml:lang="fr">Pallettes</value>
+ <value xml:lang="fr">Palettes</value>
<value xml:lang="it">Pallets</value>
<value xml:lang="pt_BR">Pallets</value>
<value xml:lang="th">Skids Pallets</value>
Modified: ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/order/OrderServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/order/OrderServices.java?rev=1188617&r1=1188616&r2=1188617&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/order/OrderServices.java (original)
+++ ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/order/OrderServices.java Tue Oct 25 11:48:30 2011
@@ -2347,31 +2347,6 @@ public class OrderServices {
"OrderYouDoNotHavePermissionToChangeThisOrdersStatus",locale));
}
- if ("Y".equals(context.get("setItemStatus"))) {
- String newItemStatusId = null;
- if ("ORDER_APPROVED".equals(statusId)) {
- newItemStatusId = "ITEM_APPROVED";
- } else if ("ORDER_COMPLETED".equals(statusId)) {
- newItemStatusId = "ITEM_COMPLETED";
- } else if ("ORDER_CANCELLED".equals(statusId)) {
- newItemStatusId = "ITEM_CANCELLED";
- }
-
- if (newItemStatusId != null) {
- try {
- Map<String, Object> resp = dispatcher.runSync("changeOrderItemStatus", UtilMisc.<String, Object>toMap("orderId", orderId, "statusId", newItemStatusId, "userLogin", userLogin));
- if (ServiceUtil.isError(resp)) {
- return ServiceUtil.returnError(UtilProperties.getMessage(resource_error,
- "OrderErrorCouldNotChangeItemStatus", locale) + newItemStatusId, null, null, resp);
- }
- } catch (GenericServiceException e) {
- Debug.logError(e, "Error changing item status to " + newItemStatusId + ": " + e.toString(), module);
- return ServiceUtil.returnError(UtilProperties.getMessage(resource_error,
- "OrderErrorCouldNotChangeItemStatus", locale) + newItemStatusId + ": " + e.toString());
- }
- }
- }
-
try {
GenericValue orderHeader = delegator.findByPrimaryKey("OrderHeader", UtilMisc.toMap("orderId", orderId));
@@ -2381,6 +2356,7 @@ public class OrderServices {
}
// first save off the old status
successResult.put("oldStatusId", orderHeader.get("statusId"));
+ successResult.put("orderTypeId", orderHeader.get("orderTypeId"));
if (Debug.verboseOn()) Debug.logVerbose("[OrderServices.setOrderStatus] : From Status : " + orderHeader.getString("statusId"), module);
if (Debug.verboseOn()) Debug.logVerbose("[OrderServices.setOrderStatus] : To Status : " + statusId, module);
@@ -2418,7 +2394,6 @@ public class OrderServices {
successResult.put("needsInventoryIssuance", orderHeader.get("needsInventoryIssuance"));
successResult.put("grandTotal", orderHeader.get("grandTotal"));
- successResult.put("orderTypeId", orderHeader.get("orderTypeId"));
//Debug.logInfo("For setOrderStatus orderHeader is " + orderHeader, module);
} catch (GenericEntityException e) {
return ServiceUtil.returnError(UtilProperties.getMessage(resource_error,
@@ -2435,6 +2410,31 @@ public class OrderServices {
}
}
+ if ("Y".equals(context.get("setItemStatus"))) {
+ String newItemStatusId = null;
+ if ("ORDER_APPROVED".equals(statusId)) {
+ newItemStatusId = "ITEM_APPROVED";
+ } else if ("ORDER_COMPLETED".equals(statusId)) {
+ newItemStatusId = "ITEM_COMPLETED";
+ } else if ("ORDER_CANCELLED".equals(statusId)) {
+ newItemStatusId = "ITEM_CANCELLED";
+ }
+
+ if (newItemStatusId != null) {
+ try {
+ Map<String, Object> resp = dispatcher.runSync("changeOrderItemStatus", UtilMisc.<String, Object>toMap("orderId", orderId, "statusId", newItemStatusId, "userLogin", userLogin));
+ if (ServiceUtil.isError(resp)) {
+ return ServiceUtil.returnError(UtilProperties.getMessage(resource_error,
+ "OrderErrorCouldNotChangeItemStatus", locale) + newItemStatusId, null, null, resp);
+ }
+ } catch (GenericServiceException e) {
+ Debug.logError(e, "Error changing item status to " + newItemStatusId + ": " + e.toString(), module);
+ return ServiceUtil.returnError(UtilProperties.getMessage(resource_error,
+ "OrderErrorCouldNotChangeItemStatus", locale) + newItemStatusId + ": " + e.toString());
+ }
+ }
+ }
+
successResult.put("orderStatusId", statusId);
//Debug.logInfo("For setOrderStatus successResult is " + successResult, module);
return successResult;
@@ -3641,7 +3641,7 @@ public class OrderServices {
}
// set the item in the selected ship group
- item.setShipBeforeDate(itemDesiredDeliveryDate);
+ item.setDesiredDeliveryDate(itemDesiredDeliveryDate);
cart.clearItemShipInfo(item);
cart.setItemShipGroupQty(item, item.getQuantity(), shipGroupIdx);
}
Modified: ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java?rev=1188617&r1=1188616&r2=1188617&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java (original)
+++ ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java Tue Oct 25 11:48:30 2011
@@ -231,6 +231,9 @@ public class ShoppingCart implements Ite
while (itIt.hasNext()) {
cartLines.add(new ShoppingCartItem(itIt.next()));
}
+
+ this.facilityId = cart.facilityId;
+ this.webSiteId = cart.webSiteId;
}
/** Creates new empty ShoppingCart object. */
@@ -262,6 +265,7 @@ public class ShoppingCart implements Ite
// since default cart is of type SALES_ORDER, set to store's payToPartyId
this.billFromVendorPartyId = productStore.getString("payToPartyId");
}
+ this.facilityId = productStore.getString("inventoryFacilityId");
}
}
@@ -3531,17 +3535,17 @@ public class ShoppingCart implements Ite
if (UtilValidate.isEmpty(item.getOrderItemSeqId())) {
String orderItemSeqId = UtilFormatOut.formatPaddedNumber(nextItemSeq, 5);
item.setOrderItemSeqId(orderItemSeqId);
+ nextItemSeq++;
} else {
try {
int thisSeqId = Integer.parseInt(item.getOrderItemSeqId());
if (thisSeqId > nextItemSeq) {
- nextItemSeq = thisSeqId;
+ nextItemSeq = thisSeqId + 1;
}
} catch (NumberFormatException e) {
Debug.logError(e, module);
}
}
- nextItemSeq++;
// the initial status for all item types
String initialStatus = "ITEM_CREATED";
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=1188617&r1=1188616&r2=1188617&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 Tue Oct 25 11:48:30 2011
@@ -503,6 +503,7 @@ public class ShoppingCartServices {
cartItem.setShoppingList(item.getString("shoppingListId"), item.getString("shoppingListItemSeqId"));
cartItem.setIsModifiedPrice("Y".equals(item.getString("isModifiedPrice")));
cartItem.setName(item.getString("itemDescription"));
+ cartItem.setExternalId(item.getString("externalId"));
// load order item attributes
List<GenericValue> orderItemAttributesList = null;
@@ -614,7 +615,7 @@ public class ShoppingCartServices {
// set the item seq in the cart
if (nextItemSeq > 0) {
try {
- cart.setNextItemSeq(nextItemSeq);
+ cart.setNextItemSeq(nextItemSeq+1);
} catch (GeneralException e) {
Debug.logError(e, module);
return ServiceUtil.returnError(e.getMessage());
@@ -929,7 +930,7 @@ public class ShoppingCartServices {
// set the item seq in the cart
if (nextItemSeq > 0) {
try {
- cart.setNextItemSeq(nextItemSeq);
+ cart.setNextItemSeq(nextItemSeq+1);
} catch (GeneralException e) {
Debug.logError(e, module);
return ServiceUtil.returnError(e.getMessage());
@@ -1076,7 +1077,7 @@ public class ShoppingCartServices {
// set the item seq in the cart
if (nextItemSeq > 0) {
try {
- cart.setNextItemSeq(nextItemSeq);
+ cart.setNextItemSeq(nextItemSeq+1);
} catch (GeneralException e) {
Debug.logError(e, module);
return ServiceUtil.returnError(e.getMessage());
Modified: ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderHistory.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderHistory.groovy?rev=1188617&r1=1188616&r2=1188617&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderHistory.groovy (original)
+++ ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderHistory.groovy Tue Oct 25 11:48:30 2011
@@ -44,12 +44,14 @@ if (orderHeader) {
orderShipmentHistory = [:];
if ("shipmentMethodTypeId".equals(shipmentMethodHistory.changedFieldName)) {
shipmentMethodType = delegator.findOne("ShipmentMethodType", ["shipmentMethodTypeId" : shipmentMethodHistory.newValueText], false);
- carrierPartyHistories.each { carrierPartyHistory ->
- if (carrierPartyHistory.lastUpdatedTxStamp == shipmentMethodHistory.lastUpdatedTxStamp) {
- if ("_NA_".equals(carrierPartyHistory.newValueText)) {
- orderShipmentHistory.shipmentMethod = shipmentMethodType.description;
- } else {
- orderShipmentHistory.shipmentMethod = carrierPartyHistory.newValueText + " " + shipmentMethodType.description;
+ if (shipmentMethodType != null){
+ carrierPartyHistories.each { carrierPartyHistory ->
+ if (carrierPartyHistory.lastUpdatedTxStamp == shipmentMethodHistory.lastUpdatedTxStamp) {
+ if ("_NA_".equals(carrierPartyHistory.newValueText)) {
+ orderShipmentHistory.shipmentMethod = shipmentMethodType.description;
+ } else {
+ orderShipmentHistory.shipmentMethod = carrierPartyHistory.newValueText + " " + shipmentMethodType.description;
+ }
}
}
}
Modified: ofbiz/branches/jackrabbit20100709/applications/order/widget/ordermgr/OrderForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/widget/ordermgr/OrderForms.xml?rev=1188617&r1=1188616&r2=1188617&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/order/widget/ordermgr/OrderForms.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/order/widget/ordermgr/OrderForms.xml Tue Oct 25 11:48:30 2011
@@ -151,9 +151,9 @@ under the License.
<form name="OrderShipmentMethodHistory" type="list" list-name="orderShipmentHistories"
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
- <field name="shipmentMethod"><display/></field>
- <field name="changedDate"><display/></field>
- <field name="changedByUser"><display/></field>
+ <field name="shipmentMethod" title="${uiLabelMap.ProductShipmentMethod}"><display/></field>
+ <field name="changedDate" title="${uiLabelMap.CommonDate}"><display/></field>
+ <field name="changedByUser" title="${uiLabelMap.OrderChangedByUser}"><display/></field>
</form>
<form name="OrderUnitPriceHistory" type="list" list-name="orderUnitPriceHistories"
@@ -161,8 +161,8 @@ under the License.
<field name="productId"><display/></field>
<field name="oldValue"><display type="currency"/></field>
<field name="newValue"><display type="currency"/></field>
- <field name="changedDate"><display/></field>
- <field name="changedByUser"><display/></field>
+ <field name="changedDate" title="${uiLabelMap.CommonDate}"><display/></field>
+ <field name="changedByUser" title="${uiLabelMap.OrderChangedByUser}"><display/></field>
</form>
<form name="OrderQuantityHistory" type="list" list-name="orderQuantityHistories"
@@ -170,8 +170,8 @@ under the License.
<field name="productId"><display/></field>
<field name="oldValue"><display/></field>
<field name="newValue"><display/></field>
- <field name="changedDate"><display/></field>
- <field name="changedByUser"><display/></field>
+ <field name="changedDate" title="${uiLabelMap.CommonDate}"><display/></field>
+ <field name="changedByUser" title="${uiLabelMap.OrderChangedByUser}"><display/></field>
</form>
<!-- Forms Specific to portlet -->
Modified: ofbiz/branches/jackrabbit20100709/applications/order/widget/ordermgr/ReturnForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/widget/ordermgr/ReturnForms.xml?rev=1188617&r1=1188616&r2=1188617&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/order/widget/ordermgr/ReturnForms.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/order/widget/ordermgr/ReturnForms.xml Tue Oct 25 11:48:30 2011
@@ -198,7 +198,7 @@ under the License.
<field name="returnId"><display description="${returnId}"/></field>
<field name="oldValueText"><display/></field>
<field name="newValueText"><display/></field>
- <field name="changedDate"><display/></field>
+ <field name="changedDate" title="${uiLabelMap.CommonDate}"><display/></field>
<field name="changedByInfo" title="${uiLabelMap.FormFieldTitle_modifiedByUserLoginId}"><display/></field>
</form>
<form name="ReturnReasonHistory" type="list" list-name="orderReturnItemHistories"
Modified: ofbiz/branches/jackrabbit20100709/applications/party/config/PartyUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/party/config/PartyUiLabels.xml?rev=1188617&r1=1188616&r2=1188617&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/party/config/PartyUiLabels.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/party/config/PartyUiLabels.xml Tue Oct 25 11:48:30 2011
@@ -5553,6 +5553,7 @@
</property>
<property key="PartyFindCommunicationsByOrder">
<value xml:lang="en">Find Communications by Order</value>
+ <value xml:lang="fr">Communications liées à une commande</value>
<value xml:lang="zh_TW">以è¨å®æ¥è©¢éè¨</value>
</property>
<property key="PartyFindParty">
Modified: ofbiz/branches/jackrabbit20100709/applications/party/widget/partymgr/CommunicationEventScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/party/widget/partymgr/CommunicationEventScreens.xml?rev=1188617&r1=1188616&r2=1188617&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/party/widget/partymgr/CommunicationEventScreens.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/party/widget/partymgr/CommunicationEventScreens.xml Tue Oct 25 11:48:30 2011
@@ -586,12 +586,7 @@ under the License.
<decorator-screen name="CommonCommunicationEventDecorator" location="${parameters.communicationEventDecoratorLocation}">
<decorator-section name="body">
<screenlet title="${uiLabelMap.PartyCommEventPurposes}">
- <container style="button-bar">
- <link style="smallSubmit" target="AddCommContent" text="${uiLabelMap.PartyNewCommPurpose}">
- <parameter param-name="communicationEventId"/>
- <parameter param-name="partyId"/>
- </link>
- </container>
+ <include-form location="component://party/widget/partymgr/CommunicationEventForms.xml" name="AddEventPurpose"/>
<include-form location="component://party/widget/partymgr/CommunicationEventForms.xml" name="ListCommPurposes"/>
</screenlet>
</decorator-section>
Modified: ofbiz/branches/jackrabbit20100709/applications/product/config/ProductEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/config/ProductEntityLabels.xml?rev=1188617&r1=1188616&r2=1188617&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/product/config/ProductEntityLabels.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/product/config/ProductEntityLabels.xml Tue Oct 25 11:48:30 2011
@@ -2156,7 +2156,7 @@
<value xml:lang="de">Aktionspreis übersteuern</value>
<value xml:lang="en">Promo Amount Override</value>
<value xml:lang="es">Reemplazo de precio promocional</value>
- <value xml:lang="fr">Remplacement du prix promotionnel</value>
+ <value xml:lang="fr">Usage du prix promotionnel + valeur</value>
<value xml:lang="it">Sostituzione importo promozione</value>
<value xml:lang="ro">Substitutie Valoare Promotie</value>
<value xml:lang="ru">ÐамеÑение акÑионного колиÑеÑÑва</value>
@@ -2214,13 +2214,13 @@
</property>
<property key="ProductPriceActionType.description.PRICE_POWHS">
<value xml:lang="en">Percent Of Wholesale</value>
- <value xml:lang="fr">Pourcentage de la vente en gros</value>
+ <value xml:lang="fr">Pourcentage du prix de gros</value>
</property>
<property key="ProductPriceActionType.description.PRICE_WFLAT">
<value xml:lang="de">Grosshandelspreis übersteuern</value>
<value xml:lang="en">Wholesale Amount Override</value>
<value xml:lang="es">Reemplazo de la cantidad de venta</value>
- <value xml:lang="fr">Remplacement de la quantité en gros</value>
+ <value xml:lang="fr">Usage du prix de gros + valeur</value>
<value xml:lang="it">Sostituzione importo all'ingrosso</value>
<value xml:lang="ro">Substitutie Valoare la Intrare</value>
<value xml:lang="ru">ÐамеÑение опÑового колиÑеÑÑва</value>
Modified: ofbiz/branches/jackrabbit20100709/applications/product/config/ProductUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/config/ProductUiLabels.xml?rev=1188617&r1=1188616&r2=1188617&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/product/config/ProductUiLabels.xml Tue Oct 25 11:48:30 2011
@@ -4740,7 +4740,7 @@
<value xml:lang="de">Wiederbestellung Menge</value>
<value xml:lang="en">Reorder Quantity</value>
<value xml:lang="es">Cantidad para repetición de pedido</value>
- <value xml:lang="fr">Commander à nouveau la quantité</value>
+ <value xml:lang="fr">Quantité de ré-approvisionnement</value>
<value xml:lang="it">Quantità Riordino</value>
<value xml:lang="ru">ÐолиÑеÑÑво Ð´Ð»Ñ Ð¿ÐµÑезаказа</value>
<value xml:lang="th">à¸à¸³à¸à¸§à¸à¸à¸²à¸£à¸ªà¸±à¹à¸à¸ªà¸´à¸à¸à¹à¸²à¸à¸µà¸à¸à¸£à¸±à¹à¸</value>
@@ -10186,7 +10186,7 @@
<value xml:lang="de">Nach Datum</value>
<value xml:lang="en">By Date</value>
<value xml:lang="es">Por fecha</value>
- <value xml:lang="fr">Par dates</value>
+ <value xml:lang="fr">Par date</value>
<value xml:lang="it">Per Data</value>
<value xml:lang="th">à¹à¸à¸¢à¸§à¸±à¸à¸à¸µà¹</value>
<value xml:lang="zh">ææ¥æ</value>
@@ -10196,7 +10196,7 @@
<value xml:lang="de">Nach Bestandsposition</value>
<value xml:lang="en">By Inventory Item</value>
<value xml:lang="es">Por Ãtem de inventario</value>
- <value xml:lang="fr">Par lignes de stock</value>
+ <value xml:lang="fr">Par ligne de stock</value>
<value xml:lang="it">Per Riga Inventario</value>
<value xml:lang="th">à¹à¸à¸¢à¸£à¸²à¸¢à¸à¸²à¸£à¸ªà¸´à¸à¸à¹à¸²à¸à¸à¹à¸«à¸¥à¸·à¸</value>
<value xml:lang="zh">æåºåæç»</value>
@@ -10206,7 +10206,7 @@
<value xml:lang="de">Nach Produkt</value>
<value xml:lang="en">By Product</value>
<value xml:lang="es">Por producto</value>
- <value xml:lang="fr">Par articles</value>
+ <value xml:lang="fr">Par article</value>
<value xml:lang="it">Per Prodotto</value>
<value xml:lang="th">à¹à¸à¸¢à¸ªà¸´à¸à¸à¹à¸²</value>
<value xml:lang="zh">æ产å</value>
@@ -14744,6 +14744,10 @@
<value xml:lang="en">The request transfer amount is not available, the available to promise ${atp} is not sufficient for the desired transfer quantity ${xferQty} on the Inventory Item with ID ${inventoryItemId}</value>
<value xml:lang="it">La richiesta di trasferimento non è disponibile, la disponibilità promessa ${atp} non è sufficiente per la quantità desiderata di trasferimento ${xferQty} sulla riga inventario ${inventoryItemId}</value>
</property>
+ <property key="ProductInventoryItemInitialQuantity">
+ <value xml:lang="en">Initiale Qty</value>
+ <value xml:lang="fr">Qté Ini.</value>
+ </property>
<property key="ProductInventoryItemLookupProblem">
<value xml:lang="en">Inventory Item/Transfer lookup problem: ${errorString}</value>
<value xml:lang="it">Problema nella ricerca della riga di inventario/trasferimento: ${errorString}</value>
@@ -19812,6 +19816,10 @@
<value xml:lang="en">: is not a valid promo code; must be between 1 and 20 characters</value>
<value xml:lang="it">: non è un codice promozione valido; deve essere fra 1 e 20 caratteri</value>
</property>
+ <property key="ProductPromoCodeLength">
+ <value xml:lang="de">Aktionscodelänge</value>
+ <value xml:lang="en">product promo code length</value>
+ </property>
<property key="ProductPromoCodeParties">
<value xml:lang="de">Aktionscode Akteure</value>
<value xml:lang="en">Promo Code Parties</value>
@@ -19905,6 +19913,26 @@
<value xml:lang="zh">ç¨æ·è¾å
¥</value>
<value xml:lang="zh_TW">ç¨æ¶è¼¸å
¥</value>
</property>
+ <property key="ProductPromoLayoutSmart">
+ <value xml:lang="de">clever</value>
+ <value xml:lang="en">smart</value>
+ </property>
+ <property key="ProductPromoLayoutNormal">
+ <value xml:lang="de">normal</value>
+ <value xml:lang="en">normal</value>
+ </property>
+ <property key="ProductPromoLayoutSeqNum">
+ <value xml:lang="de">Sequenz</value>
+ <value xml:lang="en">sequence</value>
+ </property>
+ <property key="ProductPromoCodeLayout">
+ <value xml:lang="de">Aussehen vom Aktionscode</value>
+ <value xml:lang="en">Promo code layout</value>
+ </property>
+ <property key="ProductPromoCodeLayoutTooltip">
+ <value xml:lang="de">"clever": Vermeidet ähnliche Zeichen (0 und O, ...) | "normal": Alphanummerisch | "sequenz": Laufnummer</value>
+ <value xml:lang="en">"smart": Avoids equal Chars (0 and O, ...) | "normal": alphanumeric | "sequence": Sequence Number</value>
+ </property>
<property key="ProductPromos">
<value xml:lang="de">Aktionen</value>
<value xml:lang="en">Promos</value>
Modified: ofbiz/branches/jackrabbit20100709/applications/product/script/org/ofbiz/shipment/test/ShipmentTests.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/script/org/ofbiz/shipment/test/ShipmentTests.xml?rev=1188617&r1=1188616&r2=1188617&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/product/script/org/ofbiz/shipment/test/ShipmentTests.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/product/script/org/ofbiz/shipment/test/ShipmentTests.xml Tue Oct 25 11:48:30 2011
@@ -203,10 +203,10 @@ under the License.
<log level="info" message="====================Create a Shipment Route Segment test case=========================================="/>
<entity-and list="shipments" entity-name="Shipment">
<field-map field-name="primaryOrderId" value="DEMO10090"/>
+ <field-map field-name="shipmentId" value="9998"/>
</entity-and>
<first-from-list entry="shipment" list="shipments"/>
<set field="shipRouteSegMap.shipmentId" from-field="shipment.shipmentId"/>
-
<entity-one entity-name="UserLogin" value-field="shipRouteSegMap.userLogin">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
Modified: ofbiz/branches/jackrabbit20100709/applications/product/servicedef/services_pricepromo.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/servicedef/services_pricepromo.xml?rev=1188617&r1=1188616&r2=1188617&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/product/servicedef/services_pricepromo.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/product/servicedef/services_pricepromo.xml Tue Oct 25 11:48:30 2011
@@ -270,6 +270,8 @@ under the License.
<exclude field-name="lastModifiedByUserLogin"/>
</auto-attributes>
<attribute name="quantity" type="Long" mode="IN" optional="false"/>
+ <attribute name="codeLength" type="Integer" mode="IN" optional="true" default-value="8"/>
+ <attribute name="promoCodeLayout" type="String" mode="IN" optional="true" default-value="sequence"/>
</service>
<service name="createProductPromoCond" default-entity-name="ProductPromoCond" engine="simple"
Modified: ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/promo/PromoServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/promo/PromoServices.java?rev=1188617&r1=1188616&r2=1188617&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/promo/PromoServices.java (original)
+++ ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/promo/PromoServices.java Tue Oct 25 11:48:30 2011
@@ -31,6 +31,7 @@ import java.util.Map;
import javolution.util.FastList;
import javolution.util.FastMap;
+import org.apache.commons.lang.RandomStringUtils;
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.UtilDateTime;
import org.ofbiz.base.util.UtilMisc;
@@ -55,33 +56,68 @@ public class PromoServices {
public final static String module = PromoServices.class.getName();
public static final String resource = "ProductUiLabels";
-
+ protected final static char[] smartChars = { 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'K', 'L', 'M', 'N', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y',
+ 'Z', '2', '3', '4', '5', '6', '7', '8', '9' };
+
public static Map<String, Object> createProductPromoCodeSet(DispatchContext dctx, Map<String, ? extends Object> context) {
- //Delegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
LocalDispatcher dispatcher = dctx.getDispatcher();
Long quantity = (Long) context.get("quantity");
- Locale locale = (Locale) context.get("locale");
- //Long useLimitPerCode = (Long) context.get("useLimitPerCode");
- //Long useLimitPerCustomer = (Long) context.get("useLimitPerCustomer");
- //GenericValue promoItem = null;
- //GenericValue newItem = null;
+ int codeLength = (Integer) context.get("codeLength");
+ String promoCodeLayout = (String) context.get("promoCodeLayout");
+ // For PromoCodes we give the option not to use chars that are easy to mix up like 0<>O, 1<>I, ...
+ boolean useSmartLayout = false;
+ boolean useNormalLayout = false;
+ if ("smart".equals(promoCodeLayout)) {
+ useSmartLayout = true;
+ } else if ("normal".equals(promoCodeLayout)) {
+ useNormalLayout = true;
+ }
+
+ String newPromoCodeId = "";
StringBuilder bankOfNumbers = new StringBuilder();
- for (long i = 0; i < quantity.longValue(); i++) {
+ bankOfNumbers.append("Following PromoCodes have been created: ");
+ for (long i = 0; i < quantity; i++) {
Map<String, Object> createProductPromoCodeMap = null;
+ boolean foundUniqueNewCode = false;
+ long count = 0;
+
+ while (!foundUniqueNewCode) {
+ if (useSmartLayout) {
+ newPromoCodeId = RandomStringUtils.random(codeLength, smartChars);
+ } else if (useNormalLayout) {
+ newPromoCodeId = RandomStringUtils.randomAlphanumeric(codeLength);
+ }
+ GenericValue existingPromoCode = null;
+ try {
+ existingPromoCode = delegator.findByPrimaryKeyCache("ProductPromoCode", "productPromoCodeId", newPromoCodeId);
+ }
+ catch (GenericEntityException e) {
+ Debug.logWarning("Could not find ProductPromoCode for just generated ID: " + newPromoCodeId, module);
+ }
+ if (existingPromoCode == null) {
+ foundUniqueNewCode = true;
+ }
+
+ count++;
+ if (count > 999999) {
+ return ServiceUtil.returnError("Unable to locate unique PromoCode! Length [" + codeLength + "]");
+ }
+ }
try {
- createProductPromoCodeMap = dispatcher.runSync("createProductPromoCode", dctx.makeValidContext("createProductPromoCode", "IN", context));
+ Map<String, Object> newContext = dctx.makeValidContext("createProductPromoCode", "IN", context);
+ newContext.put("productPromoCodeId", newPromoCodeId);
+ createProductPromoCodeMap = dispatcher.runSync("createProductPromoCode", newContext);
} catch (GenericServiceException err) {
- return ServiceUtil.returnError(UtilProperties.getMessage(resource,
- "ProductPromoCodeCannotBeCreated", locale), null, null, createProductPromoCodeMap);
+ return ServiceUtil.returnError("Could not create a bank of promo codes", null, null, createProductPromoCodeMap);
}
if (ServiceUtil.isError(createProductPromoCodeMap)) {
// what to do here? try again?
- return ServiceUtil.returnError(UtilProperties.getMessage(resource,
- "ProductPromoCodeCannotBeCreated", locale), null, null, createProductPromoCodeMap);
+ return ServiceUtil.returnError("Could not create a bank of promo codes", null, null, createProductPromoCodeMap);
}
bankOfNumbers.append((String) createProductPromoCodeMap.get("productPromoCodeId"));
- bankOfNumbers.append("<br/>");
+ bankOfNumbers.append(",");
}
return ServiceUtil.returnSuccess(bankOfNumbers.toString());
Modified: ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/shipment/test/IssuanceTest.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/shipment/test/IssuanceTest.java?rev=1188617&r1=1188616&r2=1188617&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/shipment/test/IssuanceTest.java (original)
+++ ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/shipment/test/IssuanceTest.java Tue Oct 25 11:48:30 2011
@@ -78,7 +78,7 @@ public class IssuanceTest extends OFBizT
assertTrue("Incorrect quantity in OrderShipment. Expected 6.00000 actual " + actual, actual.compareTo(BigDecimal.valueOf(6L))==0);
// Test the ItemIssuances are correct
- List<GenericValue> itemIssuances = delegator.getRelated("ItemIssuance", null, null, orderHeader);
+ List<GenericValue> itemIssuances = delegator.getRelated("ItemIssuance", null, UtilMisc.toList("itemIssuanceId"), orderHeader);
assertFalse("No ItemIssuances for order", UtilValidate.isEmpty(itemIssuances));
assertEquals( "Incorrect number of ItemIssuances for order", 2, itemIssuances.size());
Modified: ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl?rev=1188617&r1=1188616&r2=1188617&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl Tue Oct 25 11:48:30 2011
@@ -119,7 +119,7 @@ under the License.
</#if>
<label>${uiLabelMap.OrderSelectShippingMethod}:</label>
<select name = "carrierShipmentMethod">
- <option value = "${productPromoCond.carrierShippingMethod?if_exists}">${carrierParty?if_exists} ${description}</option>
+ <option value = "${carrierShippingMethod?if_exists}">${carrierParty?if_exists} ${description}</option>
<option value = ""> </option>
<#list carrierShipmentMethods as carrierShipmentMethod>
<#assign shipmentMethodType = carrierShipmentMethod.getRelatedOneCache("ShipmentMethodType")>
Modified: ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/promo/FindProductPromoCode.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/promo/FindProductPromoCode.ftl?rev=1188617&r1=1188616&r2=1188617&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/promo/FindProductPromoCode.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/promo/FindProductPromoCode.ftl Tue Oct 25 11:48:30 2011
@@ -53,6 +53,15 @@ under the License.
<form method="post" action="<@o...@ofbizUrl>">
<input type="hidden" name="productPromoId" value="${productPromoId}"/>
<span class="label">${uiLabelMap.CommonQuantity}:</span><input type="text" size="5" name="quantity" />
+ <span class="label">${uiLabelMap.ProductPromoCodeLength}:</span><input type="text" size="12" name="codeLength" />
+ <span class="label">${uiLabelMap.ProductPromoCodeLayout}:</span>
+ <select name="promoCodeLayout">
+ <option value="smart">${uiLabelMap.ProductPromoLayoutSmart}</option>
+ <option value="normal">${uiLabelMap.ProductPromoLayoutNormal}</option>
+ <option value="sequence">${uiLabelMap.ProductPromoLayoutSeqNum}</option>
+ </select>
+ <span class="tooltip">${uiLabelMap.ProductPromoCodeLayoutTooltip}</span>
+ <br />
<span class="label">${uiLabelMap.ProductPromoUserEntered}:</span>
<select name="userEntered">
<option value="Y">${uiLabelMap.CommonY}</option>
Modified: ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/CommonScreens.xml?rev=1188617&r1=1188616&r2=1188617&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/CommonScreens.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/CommonScreens.xml Tue Oct 25 11:48:30 2011
@@ -43,7 +43,7 @@ under the License.
<set field="applicationTitle" value="${uiLabelMap.ProductCatalogManagerApplication}" global="true"/>
<set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/development-bundle/external/jquery.cookie.js" global="true"/>
<set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/jsTree/jquery.jstree.js" global="true"/>
- <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.8.13.custom.min.js" global="true"/>
+ <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/js/jquery-ui-1.8.13.custom.min.js" global="true"/>
</actions>
<widgets>
<include-screen name="ApplicationDecorator" location="component://commonext/widget/CommonScreens.xml"/>
Modified: ofbiz/branches/jackrabbit20100709/framework/common/config/CommonEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/common/config/CommonEntityLabels.xml?rev=1188617&r1=1188616&r2=1188617&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/framework/common/config/CommonEntityLabels.xml (original)
+++ ofbiz/branches/jackrabbit20100709/framework/common/config/CommonEntityLabels.xml Tue Oct 25 11:48:30 2011
@@ -9916,7 +9916,7 @@
<value xml:lang="de">Geplant</value>
<value xml:lang="en">Scheduled</value>
<value xml:lang="es">Planificado</value>
- <value xml:lang="fr">Plannifiée</value>
+ <value xml:lang="fr">Planifiée</value>
<value xml:lang="it">Schedulata</value>
<value xml:lang="pt">Agendado</value>
<value xml:lang="ro">Planificata</value>
Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/EmailOrderScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/EmailOrderScreens.xml?rev=1188617&r1=1188616&r2=1188617&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/EmailOrderScreens.xml (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/EmailOrderScreens.xml Tue Oct 25 11:48:30 2011
@@ -83,6 +83,7 @@ under the License.
<property-map resource="EcommerceUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
+ <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
<set field="title" value="${uiLabelMap.PageTitleOrderConfirmationNotice}"/>
<set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce"/>
<set field="allowAnonymousView" value="Y"/> <!-- this field will instruction OrderStatus.groovy to allow an anonymous order to be viewed by anybody, so the email confirmation screen will work -->