svn commit: r1090153 [2/20] - in /ofbiz/branches/jackrabbit2010
Locked
svn commit: r1090153 [2/20] - in /ofbiz/branches/jackrabbit2010
 
|
Propchange: ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy
------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Apr 8 08:07:00 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-1084618 +/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:962442-1090146 Modified: ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/js/PartyProfileContent.js URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/js/PartyProfileContent.js?rev=1090153&r1=1090152&r2=1090153&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/js/PartyProfileContent.js (original) +++ ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/js/PartyProfileContent.js Fri Apr 8 08:07:00 2011 @@ -19,7 +19,7 @@ under the License. /** * - **/ + */ var uiLabelJsonObject = null; jQuery(document).ready(function() { @@ -29,10 +29,7 @@ jQuery(document).ready(function() { uiLabelJsonObjects = getJSONuiLabels(labelObject); - jQuery("#uploadPartyContent").bind("submit", uploadPartyContent); - jQuery("#uploadPartyContent").bind("submit", getUploadProgressStatus); jQuery("#progress_bar").progressbar({value: 0}); - }); function uploadPartyContent(event){ @@ -42,16 +39,22 @@ function uploadPartyContent(event){ if(infodiv.length < 1){ jQuery('<div id="content-messages"></div>').insertAfter(jQuery("#partyContentList")); } - if(targetFrame.length < 1){ + if (targetFrame.length < 1){ jQuery('#partyContent').append("<iframe id='target_upload' name='target_upload' style='display: none' src=''> </iframe>"); } jQuery('#uploadPartyContent').attr("target", "target_upload"); + + var labelField = jQuery("#progressBarSavingMsg"); + if (labelField.length) { + labelField.remove(); + } } function uploadCompleted(){ var iframePartyContentList = jQuery("#target_upload").contents().find("#partyContentList").html(); - // update partyContentList - copy the Data from the iFrame partyContentList to the page partyContentList + // update partyContentList - copy the Data from the iFrame partyContentList + // to the page partyContentList jQuery("#partyContentList").html(iframePartyContentList); jQuery('#progressBarSavingMsg').html(uiLabelJsonObjects.CommonUiLabels[2]); @@ -65,7 +68,8 @@ function uploadCompleted(){ function checkIframeStatus() { var iframePartyContentList = null; - // if the new partyContentList isn't created wait a few ms and call the method again + // if the new partyContentList isn't created wait a few ms and call the + // method again jQuery.fjTimer({ interval: 500, repeat: true, Modified: ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/party/profileblocks/Content.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/party/profileblocks/Content.ftl?rev=1090153&r1=1090152&r2=1090153&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/party/profileblocks/Content.ftl (original) +++ ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/party/profileblocks/Content.ftl Fri Apr 8 08:07:00 2011 @@ -32,26 +32,38 @@ under the License. <input type="hidden" name="contentTypeId" value="DOCUMENT"/> <input type="hidden" name="statusId" value="CTNT_PUBLISHED"/> <input type="hidden" name="partyId" value="${partyId}" id="contentPartyId"/> - <input type="file" name="uploadedFile" size="20"/> - <div class="label">${uiLabelMap.PartyIsPublic}</div> - <select name="isPublic"> - <option value="N">${uiLabelMap.CommonNo}</option> - <option value="Y">${uiLabelMap.CommonYes}</option> - </select> - <select name="partyContentTypeId"> + <input type="file" name="uploadedFile" class="required error" size="25"/> + <div> + <select name="partyContentTypeId" class="required error"> <option value="">${uiLabelMap.PartySelectPurpose}</option> <#list partyContentTypes as partyContentType> <option value="${partyContentType.partyContentTypeId}">${partyContentType.get("description", locale)?default(partyContentType.partyContentTypeId)}</option> </#list> </select> + </div> + <div class="label">${uiLabelMap.PartyIsPublic}</div> + <select name="isPublic"> + <option value="N">${uiLabelMap.CommonNo}</option> + <option value="Y">${uiLabelMap.CommonYes}</option> + </select> <select name="roleTypeId"> <option value="">${uiLabelMap.PartySelectRole}</option> <#list roles as role> <option value="${role.roleTypeId}" <#if role.roleTypeId == "_NA_">selected="selected"</#if>>${role.get("description", locale)?default(role.roleTypeId)}</option> </#list> </select> - <input type="submit" value="${uiLabelMap.CommonUpload}"/> + <input type="submit" value="${uiLabelMap.CommonUpload}" /> </form> <div id='progress_bar'><div></div></div> </div> </div> + <script type="text/javascript"> + jQuery("#uploadPartyContent").validate({ + submitHandler: function(form) { + <#-- call upload scripts - functions defined in PartyProfileContent.js --> + uploadPartyContent(); + getUploadProgressStatus(); + form.submit(); + } + }); + </script> Modified: ofbiz/branches/jackrabbit20100709/applications/product/config/ImageProperties.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/config/ImageProperties.xml?rev=1090153&r1=1090152&r2=1090153&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/product/config/ImageProperties.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/product/config/ImageProperties.xml Fri Apr 8 08:07:00 2011 @@ -17,8 +17,12 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> + +<!-- + # The uploaded image is scaled in each size tye , you can descrease or increase size types ; size type name doesn't have to contain space + # Just one configured dimension on two is allowed to restrict just one image dimension, whatever its proportions +--> <imageSize xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <format name="extension" value="jpg"/> <size name="small"> <dimension name="height" value="50"/> <dimension name="width" value="50"/> Modified: ofbiz/branches/jackrabbit20100709/applications/product/config/ProductEntityLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/config/ProductEntityLabels.xml?rev=1090153&r1=1090152&r2=1090153&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/product/config/ProductEntityLabels.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/product/config/ProductEntityLabels.xml Fri Apr 8 08:07:00 2011 @@ -2257,6 +2257,10 @@ <value xml:lang="zh">å©æ¶¦ç¾åæ¯</value> <value xml:lang="zh_TW">å©æ½¤ç¾åæ¯</value> </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> + </property> <property key="ProductPriceActionType.description.PRICE_WFLAT"> <value xml:lang="de">Grosshandelspreis übersteuern</value> <value xml:lang="en">Wholesale Amount Override</value> @@ -3012,6 +3016,21 @@ <value xml:lang="zh">被ç</value> <value xml:lang="zh_TW">被ç</value> </property> + <property key="ProductCategoryLinkType.description.PCLT_SEARCH_PARAM"> + <value xml:lang="de">Suchparameter</value> + <value xml:lang="en">Search Parameters</value> + <value xml:lang="fr">Paramètres de recherche</value> + </property> + <property key="ProductCategoryLinkType.description.PCLT_ABS_URL"> + <value xml:lang="de">Absolute URL</value> + <value xml:lang="en">Absolute URL</value> + <value xml:lang="fr">URL absolue</value> + </property> + <property key="ProductCategoryLinkType.description.PCLT_CAT_ID"> + <value xml:lang="de">Kategorie ID</value> + <value xml:lang="en">Category ID</value> + <value xml:lang="fr">Ref. de catégorie</value> + </property> <!-- Field Descriptions --> <!-- ProdCatalog --> Modified: ofbiz/branches/jackrabbit20100709/applications/product/config/ProductUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/config/ProductUiLabels.xml?rev=1090153&r1=1090152&r2=1090153&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/product/config/ProductUiLabels.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/product/config/ProductUiLabels.xml Fri Apr 8 08:07:00 2011 @@ -82,7 +82,7 @@ <value xml:lang="es">OFBiz: Administrador de Almacén</value> <value xml:lang="fr">OFBiz: Gestion de stock</value> <value xml:lang="it">OFBiz: Gestione stabilimenti</value> - <value xml:lang="nl">OFBiz: Faciliteit Manager</value> + <value xml:lang="nl">OFBiz: Faciliteit Manager</value> <value xml:lang="ro">OFBiz: Gestiune Compartimente</value> <value xml:lang="ru">OFBiz: УпÑавление обÑекÑами</value> <value xml:lang="th">OFBiz: à¸à¸²à¸£à¸à¸±à¸à¸à¸²à¸£à¸à¸¥à¸±à¸à¸ªà¸´à¸à¸à¹à¸²</value> @@ -93,7 +93,7 @@ <value xml:lang="en">Part of the Open For Business Family of Open Source Software</value> <value xml:lang="fr">Un module de la famille Open For Business, logiciel libre de gestion d'entreprise.</value> <value xml:lang="it">Un modulo della famiglia di software open source Open For Business</value> - <value xml:lang="nl">Deel van de 'Open For Business' familie van open source software</value> + <value xml:lang="nl">Deel van de 'Open For Business' familie van open source software</value> <value xml:lang="zh">å¼æºè½¯ä»¶OFBizçç»æé¨å</value> <value xml:lang="zh_TW">éæºè»ä»¶OFBizççµæé¨å</value> </property> @@ -2188,14 +2188,14 @@ </property> <property key="FormFieldTitle_canclAutmExtTime"> <value xml:lang="en">The time period (before the end of the thruedate) after which the automatic extension of the subscription will be executed.</value> - <value xml:lang="fr">Durée (avant la date de fin) après laquelle l'abonn. sera automatiquement étendu</value> + <value xml:lang="fr">Durée (avant la date de fin) après laquelle l'abonn. sera automatiquement étendu</value> <value xml:lang="it">Il periodo di tempo (prima della data di termine) dopo che l'estensione automatica dell'abbonamento verrà eseguita.</value> <value xml:lang="zh">å¨è¦æ§è¡ç订é èªå¨å»¶æåçæ¶é´æ®µ(å¨ç»ææ¥æç»æå)</value> <value xml:lang="zh_TW">å¨è¦å·è¡çè¨é±èªå延æå¾çæé段(å¨çµææ¥æçµæå)</value> </property> <property key="FormFieldTitle_canclAutmExtTimeUomId"> <value xml:lang="en">Unit Of Measure used for the automatic extension of the subscription.</value> - <value xml:lang="fr">Unité de temps utilisée pour l'extension automatique de l'abonnement</value> + <value xml:lang="fr">Unité de temps utilisée pour l'extension automatique de l'abonnement</value> </property> <property key="FormFieldTitle_carrierId"> <value xml:lang="de">Transportunternehmen ID</value> @@ -5788,7 +5788,6 @@ <value xml:lang="en">Approve</value> <value xml:lang="th">ยืà¸à¸¢à¸±à¸à¸£à¸¹à¸à¸ าà¸</value> </property> - <property key="ImageCropping"> <value xml:lang="en">Image Cropping</value> <value xml:lang="th">à¸à¸±à¸à¸ าà¸</value> @@ -6179,7 +6178,7 @@ <value xml:lang="es">Elegir CategorÃa Principal</value> <value xml:lang="fr">Choix de la catégorie principale</value> <value xml:lang="it">Lista categorie principali</value> - <value xml:lang="nl">Lijst van hoofdcategoriën</value> + <value xml:lang="nl">Lijst van hoofdcategoriën</value> <value xml:lang="ro">Alege Categoria Principala</value> <value xml:lang="ru">ÐÑбÑ. коÑнев. каÑегоÑиÑ</value> <value xml:lang="th">à¹à¸¥à¸·à¸à¸à¸«à¸¡à¸§à¸à¸«à¸¡à¸¹à¹à¸à¸µà¹à¹à¸à¹à¸£à¸±à¸à¸à¸§à¸²à¸¡à¸à¸´à¸¢à¸¡</value> @@ -6298,7 +6297,7 @@ <value xml:lang="es">Editar CategorÃa</value> <value xml:lang="fr">Modification de la catégorie</value> <value xml:lang="it">Mostra Categoria</value> - <value xml:lang="nl">Wijzig categorie</value> + <value xml:lang="nl">Wijzig categorie</value> <value xml:lang="ro">Afiseaza Categoria</value> <value xml:lang="ru">РедакÑиÑоваÑÑ ÐºÐ°ÑегоÑиÑ</value> <value xml:lang="th">à¹à¸à¹à¹à¸à¸«à¸¡à¸§à¸à¸«à¸¡à¸¹à¹</value> @@ -6380,7 +6379,7 @@ <value xml:lang="es">Editar Productos de una CategorÃa</value> <value xml:lang="fr">Modification des catégories</value> <value xml:lang="it">Aggiorna categoria prodotti</value> - <value xml:lang="nl">Wijzig categorieproducten</value> + <value xml:lang="nl">Wijzig categorieproducten</value> <value xml:lang="ro">Actualizeaza Categoria Produs</value> <value xml:lang="ru">ÐзмениÑÑ ÐºÐ°ÑегоÑÐ¸Ñ Ð¿ÑодÑкÑов</value> <value xml:lang="th">à¹à¸à¹à¹à¸à¸«à¸¡à¸§à¸à¸«à¸¡à¸¹à¹à¸ªà¸´à¸à¸à¹à¸²</value> @@ -6393,7 +6392,7 @@ <value xml:lang="es">Editar jerarquÃa de una CategorÃa</value> <value xml:lang="fr">Modification de la hiérarchie des catégorie</value> <value xml:lang="it">Aggiorna gerarchia</value> - <value xml:lang="nl">Wijzig categorie hiërarchie</value> + <value xml:lang="nl">Wijzig categorie hiërarchie</value> <value xml:lang="ro">Actualizeaza Categoria Sosire</value> <value xml:lang="ru">ÐзмениÑÑ Ð¿Ð¾Ð´ÑиненноÑÑÑ ÐºÐ°ÑегоÑии</value> <value xml:lang="th">Edit Category Rollup</value> @@ -6652,7 +6651,7 @@ <value xml:lang="es">Editar Producto</value> <value xml:lang="fr">Modification de l'article</value> <value xml:lang="it">Aggiorna prodotto</value> - <value xml:lang="nl">Wijzig product</value> + <value xml:lang="nl">Wijzig product</value> <value xml:lang="ro">Actualizeaza Produs</value> <value xml:lang="ru">РедакÑиÑоваÑÑ Ð¿ÑодÑкÑ</value> <value xml:lang="th">à¹à¸à¹à¹à¸à¸ªà¸´à¸à¸à¹à¸²</value> @@ -7002,7 +7001,7 @@ <value xml:lang="es">Editar Reglas de Precio de un Producto</value> <value xml:lang="fr">Modification des règles de prix des articles</value> <value xml:lang="it">Aggiorna Regole Prezzo Prodotto</value> - <value xml:lang="nl">Wijzig productprijsregels</value> + <value xml:lang="nl">Wijzig productprijsregels</value> <value xml:lang="ro">Actualizeaza Reguli Pret Produs</value> <value xml:lang="ru">ÐзмениÑÑ Ð¿Ñавила назнаÑÐµÐ½Ð¸Ñ ÑÐµÐ½Ñ Ð¿ÑодÑкÑа</value> <value xml:lang="th">à¹à¸à¹à¹à¸à¸à¹à¸à¸à¸³à¸«à¸à¸à¸£à¸²à¸à¸²à¸ªà¸´à¸à¸à¹à¸²</value> @@ -7582,7 +7581,7 @@ <value xml:lang="es">Buscar Regla de Precios de Productos</value> <value xml:lang="fr">Recherche de règles de prix</value> <value xml:lang="it">Ricerca Regole Prezzo Prodotto</value> - <value xml:lang="nl">Zoek productprijsregels</value> + <value xml:lang="nl">Zoek productprijsregels</value> <value xml:lang="ro">Cauta Reguli Pret Produs</value> <value xml:lang="ru">ÐайÑи пÑавила назнаÑÐµÐ½Ð¸Ñ ÑÐµÐ½Ñ Ð¿ÑодÑкÑа</value> <value xml:lang="th">à¸à¹à¸à¸«à¸²à¸ªà¸à¸²à¸à¸°à¸£à¸²à¸à¸²à¸ªà¸´à¸à¸à¹à¸²</value> @@ -7870,7 +7869,7 @@ <value xml:lang="es">Buscar Producto y precio</value> <value xml:lang="fr">Rechercher un ou des prix d'un article</value> <value xml:lang="it">Ricerca prodotti e prezzi</value> - <value xml:lang="nl">Zoeken productprijs</value> + <value xml:lang="nl">Zoeken productprijs</value> <value xml:lang="ro">Cauta Produse si Preturi</value> <value xml:lang="ru">ÐÑкаÑÑ Ð¿ÑодÑÐºÑ Ð¸ ÑенÑ</value> <value xml:lang="th">à¸à¹à¸à¸«à¸²à¸ªà¸´à¸à¸à¹à¸²à¹à¸¥à¸°à¸£à¸²à¸à¸²</value> @@ -7883,7 +7882,7 @@ <value xml:lang="es">Buscar tienda de producto</value> <value xml:lang="fr">Rechercher un ou des centres de profit</value> <value xml:lang="it">Ricerca Negozi</value> - <value xml:lang="nl">Zoeken winkel</value> + <value xml:lang="nl">Zoeken winkel</value> <value xml:lang="ro">Cauta Magazine</value> <value xml:lang="ru">ÐÑкаÑÑ Ñклад пÑодÑкÑов</value> <value xml:lang="th">à¸à¹à¸à¸«à¸²à¸à¸¥à¸±à¸à¸ªà¸´à¸à¸à¹à¸²</value> @@ -8761,7 +8760,7 @@ <value xml:lang="es">Añadir Regla de Precios</value> <value xml:lang="fr">Ajouter des règles de prix</value> <value xml:lang="it">Aggiungi regola di prezzo</value> - <value xml:lang="nl">Toevoegen prijsregel</value> + <value xml:lang="nl">Toevoegen prijsregel</value> <value xml:lang="ro">Adauga Reguli Pret</value> <value xml:lang="ru">ÐобавиÑÑ Ð¿Ñавило</value> <value xml:lang="th">à¹à¸à¸´à¹à¸¡à¸à¹à¸à¸à¸±à¸à¸à¸±à¸à¸£à¸²à¸à¸²</value> @@ -9019,7 +9018,7 @@ <value xml:lang="en">Add To Compare</value> <value xml:lang="fr">Comparer</value> <value xml:lang="it">Confronta</value> - <value xml:lang="nl">Voeg toe aan vergelijklijst</value> + <value xml:lang="nl">Voeg toe aan vergelijklijst</value> <value xml:lang="zh_TW">å¢å å°æ¯è¼é ç®</value> </property> <property key="ProductAddToCompareListSuccess"> @@ -9247,7 +9246,7 @@ <value xml:lang="es">Palabra clave alterna para la Enciclopedia</value> <value xml:lang="fr">Thésaurus de mots clés de remplacement</value> <value xml:lang="it">Dizionario dei sinonimi delle parole chiave</value> - <value xml:lang="nl">Alternieve trefwoordsynoniemen</value> + <value xml:lang="nl">Alternieve trefwoordsynoniemen</value> <value xml:lang="ro">Alternare Cheie Dictionar</value> <value xml:lang="ru">СловаÑÑ Ð°Ð»ÑÑеÑнаÑивнÑÑ ÐºÐ»ÑÑевÑÑ Ñлов</value> <value xml:lang="th">Alternate KeyWord Thesaurus</value> @@ -9700,7 +9699,7 @@ <value xml:lang="es">Creación Automática de Palabras Clave para todos los Productos</value> <value xml:lang="fr">Création automatique de mots-clés pour tout article</value> <value xml:lang="it">Creazione automatica chiavi per tutti i prodotti</value> - <value xml:lang="nl">Automatisch aanmaken trefwoorden voor alle producten</value> + <value xml:lang="nl">Automatisch aanmaken trefwoorden voor alle producten</value> <value xml:lang="ro">Creatie Automatica Chei pentru Toate Produsele </value> <value xml:lang="ru">ÐвÑомаÑиÑеÑки ÑоздаÑÑ ÐºÐ»ÑÑевÑе Ñлова Ð´Ð»Ñ Ð²ÑÐµÑ Ð¿ÑодÑкÑов</value> <value xml:lang="th">สรà¹à¸²à¸à¸à¸µà¸¢à¹à¹à¸§à¸´à¸£à¹à¸à¸à¸±à¸à¹à¸à¸¡à¸±à¸à¸´à¸ªà¸³à¸«à¸£à¸±à¸à¸ªà¸´à¸à¸à¹à¸²à¸à¸±à¹à¸à¸«à¸¡à¸</value> @@ -9788,7 +9787,7 @@ <value xml:lang="es">Regresar a Editar CategorÃa</value> <value xml:lang="fr">Revenir à l'édition des catégories</value> <value xml:lang="it">Torna all'aggiornamento della categoria</value> - <value xml:lang="nl">Terug naar wijzigen categorie</value> + <value xml:lang="nl">Terug naar wijzigen categorie</value> <value xml:lang="ro">Intoarcete la Actualizarea Categoriei</value> <value xml:lang="ru">ÐбÑаÑно к ÑедакÑиÑÐ¾Ð²Ð°Ð½Ð¸Ñ ÐºÐ°ÑегоÑии</value> <value xml:lang="th">à¸à¸¥à¸±à¸à¹à¸à¸¢à¸±à¸à¸à¸²à¸£à¹à¸à¹à¹à¸à¸«à¸¡à¸§à¸à¸«à¸¡à¸¹à¹</value> @@ -10159,7 +10158,7 @@ <value xml:lang="es">Página Principal de Administración de Catálogos</value> <value xml:lang="fr">Gestion des articles - Page Principale -</value> <value xml:lang="it">Pagina principale amministrazione cataloghi</value> - <value xml:lang="nl">Hoofdpagina catalogusbeheer</value> + <value xml:lang="nl">Hoofdpagina catalogusbeheer</value> <value xml:lang="ro">Pagina Principala Administratie Cataloage</value> <value xml:lang="ru">ÐÐ»Ð°Ð²Ð½Ð°Ñ ÑÑÑаниÑа админиÑÑÑиÑÐ¾Ð²Ð°Ð½Ð¸Ñ ÐºÐ°Ñалога</value> <value xml:lang="th">หà¸à¹à¸²à¸«à¸¥à¸±à¸à¸à¸²à¸£à¸à¸±à¸à¸à¸²à¸£à¸«à¸¡à¸§à¸à¸«à¸¡à¸¹à¹</value> @@ -10194,7 +10193,7 @@ <value xml:lang="es">Lista detallada de Catálogos</value> <value xml:lang="fr">Liste des catalogues</value> <value xml:lang="it">Lista dei cataloghi</value> - <value xml:lang="nl">Lijst van catalogi</value> + <value xml:lang="nl">Lijst van catalogi</value> <value xml:lang="ro">Lista Detaliu Catalog</value> <value xml:lang="ru">СпиÑок каÑалогов</value> <value xml:lang="th">รายà¸à¸²à¸£à¸£à¸²à¸¢à¸¥à¸°à¹à¸à¸µà¸¢à¸à¸«à¸¡à¸§à¸à¸«à¸¡à¸¹à¹</value> @@ -10232,7 +10231,7 @@ <value xml:lang="es">Aplicación de Administración de Catálogos</value> <value xml:lang="fr">Application de gestion des articles</value> <value xml:lang="it">Applicazione Gestione Cataloghi</value> - <value xml:lang="nl">Catalogus Manager</value> + <value xml:lang="nl">Catalogus Manager</value> <value xml:lang="ro">Aplicatie Gestiune Catalog</value> <value xml:lang="ru">УпÑавление каÑалогом пÑодÑкÑов</value> <value xml:lang="th">à¹à¸à¸£à¹à¸à¸£à¸¡à¸à¸£à¸°à¸¢à¸¸à¸à¸à¹à¸à¸²à¸£à¸à¸±à¸à¸à¸²à¸£à¸«à¸¡à¸§à¸à¸«à¸¡à¸¹à¹</value> @@ -10257,7 +10256,7 @@ <value xml:lang="es">Nombre de Catálogo</value> <value xml:lang="fr">Nom du catalogue</value> <value xml:lang="it">Nome catalogo</value> - <value xml:lang="nl">Catalogusnaam</value> + <value xml:lang="nl">Catalogusnaam</value> <value xml:lang="ro">Nume Catalog</value> <value xml:lang="ru">ÐÐ¼Ñ ÐºÐ°Ñалога</value> <value xml:lang="th">à¸à¸·à¹à¸à¸«à¸¡à¸§à¸à¸«à¸¡à¸¹à¹</value> @@ -10270,7 +10269,7 @@ <value xml:lang="es">Nombre de Catálogo [Código]</value> <value xml:lang="fr">Catalogue ; Nom ; [Réf.]</value> <value xml:lang="it">Nome catalogo [Codice]</value> - <value xml:lang="nl">Catalogusnaam [ID]</value> + <value xml:lang="nl">Catalogusnaam [ID]</value> <value xml:lang="ro">Nume Catalog [Cod]</value> <value xml:lang="ru">ÐÐ¼Ñ ÐºÐ°Ñалога [Ðод]</value> <value xml:lang="th">à¸à¸·à¹à¸à¸«à¸¡à¸§à¸à¸«à¸¡à¸¹à¹ [รหัส]</value> @@ -10469,7 +10468,7 @@ <value xml:lang="es">Productos de esta CategorÃa</value> <value xml:lang="fr">Articles de cette catégorie</value> <value xml:lang="it">Prodotti per questa categoria</value> - <value xml:lang="nl">Producten in deze categorie</value> + <value xml:lang="nl">Producten in deze categorie</value> <value xml:lang="ro">Produse pentru aceasta categorie</value> <value xml:lang="ru">ÐÑодÑкÑÑ Ð¸Ð· каÑегоÑии</value> <value xml:lang="th">สิà¸à¸à¹à¸²à¸à¸²à¸à¸«à¸¡à¸§à¸à¸«à¸¡à¸¹à¹à¸à¸µà¹</value> @@ -10746,7 +10745,7 @@ <value xml:lang="es">Elegir CategorÃa principal</value> <value xml:lang="fr">Choisir une catégorie supérieure</value> <value xml:lang="it">Lista categorie principali</value> - <value xml:lang="nl">Lijst van hoofdcategoriën</value> + <value xml:lang="nl">Lijst van hoofdcategoriën</value> <value xml:lang="ro">Alege Categorii Principale</value> <value xml:lang="ru">ÐаÑегоÑÐ¸Ñ Ð²ÐµÑÑ . ÑÑовнÑ</value> <value xml:lang="th">à¹à¸¥à¸·à¸à¸à¸«à¸¡à¸§à¸à¸«à¸¡à¸¹à¹</value> @@ -10886,14 +10885,14 @@ <value xml:lang="zh">æ¡ä»¶</value> <value xml:lang="zh_TW">æ¢ä»¶</value> </property> - <property key="ProductConditionsActionsRemoveBefore"> + <property key="ProductConditionsActionsRemoveBefore"> <value xml:lang="en">To remove a price rule, you must before remove all conditions and actions OR disable it by entering a Thru Date</value> <value xml:lang="fr">Pour supprimer une règle de prix, vous devez d'abord supprimer toutes les conditions et actions. Vous pouvez aussi la désactiver en entrant une date de fin appropriée</value> - </property> - <property key="ProductConditionsThenActions"> + </property> + <property key="ProductConditionsThenActions"> <value xml:lang="en">If multiple conditions are entered they are tested logically as and AND statement. Therefore all Conditions must be TRUE for the price rule to execute (same for actions)</value> <value xml:lang="fr">Si toutes les conditions sont vérifiées, alors les actions sont exécutées (autrement dit ET logique entre conditions, de même pour les actions)</value> - </property> + </property> <property key="ProductConfigItem"> <value xml:lang="de">Konfigurationsposition</value> <value xml:lang="en">Config Item</value> @@ -10953,7 +10952,7 @@ <value xml:lang="es">Configuraciones</value> <value xml:lang="fr">Configurations</value> <value xml:lang="it">Configurazioni</value> - <value xml:lang="nl">Configuraties</value> + <value xml:lang="nl">Configuraties</value> <value xml:lang="ro">Configuratii</value> <value xml:lang="ru">ÐонÑигÑÑаÑии</value> <value xml:lang="th">à¸à¸±à¸§à¹à¸¥à¸·à¸à¸</value> @@ -11318,7 +11317,7 @@ <value xml:lang="es">Crear nuevo Catálogo</value> <value xml:lang="fr">Création d'un nouveau catalogue</value> <value xml:lang="it">Creare nuovo catalogo</value> - <value xml:lang="nl">Aanmaken nieuwe catalogus</value> + <value xml:lang="nl">Aanmaken nieuwe catalogus</value> <value xml:lang="ro">Creare Nou Catalog</value> <value xml:lang="ru">ÐовÑй каÑалог</value> <value xml:lang="th">สรà¹à¸²à¸à¸«à¸¡à¸§à¸à¸«à¸¡à¸¹à¹à¹à¸«à¸¡à¹</value> @@ -11331,7 +11330,7 @@ <value xml:lang="es">Crear nueva CategorÃa</value> <value xml:lang="fr">Création d'une nouvelle catégorie</value> <value xml:lang="it">Creare nuova categoria</value> - <value xml:lang="nl">Aanmaken nieuwe categorie</value> + <value xml:lang="nl">Aanmaken nieuwe categorie</value> <value xml:lang="ro">Creare Noua Categorie</value> <value xml:lang="ru">ÐÐ¾Ð²Ð°Ñ ÐºÐ°ÑегоÑиÑ</value> <value xml:lang="th">สรà¹à¸²à¸à¸«à¸¡à¸§à¸à¸«à¸¡à¸¹à¹à¹à¸«à¸¡à¹</value> @@ -11412,7 +11411,7 @@ <value xml:lang="es">Crear nuevo Producto</value> <value xml:lang="fr">Création d'un nouvel article</value> <value xml:lang="it">Creare nuovo prodotto</value> - <value xml:lang="nl">Aanmaken nieuw product</value> + <value xml:lang="nl">Aanmaken nieuw product</value> <value xml:lang="ro">Creare Nou Produs</value> <value xml:lang="ru">ÐовÑй пÑодÑкÑ</value> <value xml:lang="th">สรà¹à¸²à¸à¸ªà¸´à¸à¸à¹à¸²à¹à¸«à¸¡à¹</value> @@ -11461,7 +11460,7 @@ <value xml:lang="es">Crear Nueva Tienda de Productos</value> <value xml:lang="fr">Création d'un nouveau centre de profit</value> <value xml:lang="it">Nuovo negozio</value> - <value xml:lang="nl">Aanmaken nieuwe winkel</value> + <value xml:lang="nl">Aanmaken nieuwe winkel</value> <value xml:lang="ro">Creare Nou Magazin</value> <value xml:lang="ru">СоздаÑÑ Ð½Ð¾Ð²Ñй Ñклад</value> <value xml:lang="th">สรà¹à¸²à¸à¸à¸¥à¸±à¸à¸ªà¸´à¸à¸à¹à¸²à¹à¸«à¸¡à¹</value> @@ -12122,7 +12121,7 @@ <value xml:lang="es">Editar Catálogo</value> <value xml:lang="fr">Modification du catalogue</value> <value xml:lang="it">Aggiorna catalogo</value> - <value xml:lang="nl">Wijzig catalogus</value> + <value xml:lang="nl">Wijzig catalogus</value> <value xml:lang="ro">Actualizeaza Catalog</value> <value xml:lang="ru">РедакÑиÑоваÑÑ</value> <value xml:lang="th">à¹à¸à¹à¹à¸à¸«à¸¡à¸§à¸à¸«à¸¡à¸¹à¹</value> @@ -12135,7 +12134,7 @@ <value xml:lang="es">Editar Catálogo con Código</value> <value xml:lang="fr">Modification de catalogue (saisir ou rechercher sa référence)</value> <value xml:lang="it">Aggiorna catalogo con codice</value> - <value xml:lang="nl">Wijzigen catalogus met [ID]</value> + <value xml:lang="nl">Wijzigen catalogus met [ID]</value> <value xml:lang="ro">Actualizeaza Catalog cu Cod Catalog</value> <value xml:lang="ru">РедакÑиÑоваÑÑ ÐºÐ°Ñалог Ñ ÐºÐ¾Ð´Ð¾Ð¼</value> <value xml:lang="th">à¹à¸à¹à¹à¸à¸«à¸¡à¸§à¸à¸«à¸¡à¸¹à¹à¸à¹à¸§à¸¢à¸£à¸«à¸±à¸ªà¸«à¸¡à¸§à¸à¸«à¸¡à¸¹à¹</value> @@ -12148,7 +12147,7 @@ <value xml:lang="es">Editar CategorÃa</value> <value xml:lang="fr">Modification de la catégorie</value> <value xml:lang="it">Aggiorna categoria</value> - <value xml:lang="nl">Wijzig categorie</value> + <value xml:lang="nl">Wijzig categorie</value> <value xml:lang="ro">Actualizeaza Categoria</value> <value xml:lang="ru">РедакÑиÑоваÑÑ</value> <value xml:lang="th">à¹à¸à¹à¹à¸à¸«à¸¡à¸§à¸à¸«à¸¡à¸¹à¹</value> @@ -12161,7 +12160,7 @@ <value xml:lang="es">Editar CategorÃa con Código</value> <value xml:lang="fr">Modification de la catégorie (saisir ou rechercher sa référence)</value> <value xml:lang="it">Aggiorna categoria con codice</value> - <value xml:lang="nl">Wijzigen categorie met [ID]</value> + <value xml:lang="nl">Wijzigen categorie met [ID]</value> <value xml:lang="ro">Actualizeaza Categoria cu Cod Categorie</value> <value xml:lang="ru">РедакÑиÑоваÑÑ ÐºÐ°ÑегоÑÐ¸Ñ Ñ ÐºÐ¾Ð´Ð¾Ð¼</value> <value xml:lang="th">à¹à¸à¹à¹à¸à¸«à¸¡à¸§à¸à¸«à¸¡à¸¹à¹à¸à¹à¸§à¸¢à¸£à¸«à¸±à¸ªà¸«à¸¡à¸§à¸à¸«à¸¡à¸¹à¹</value> @@ -12258,7 +12257,7 @@ <value xml:lang="es">Editar Producto</value> <value xml:lang="fr">Modification de l'article</value> <value xml:lang="it">Aggiorna prodotto</value> - <value xml:lang="nl">Wijzig product</value> + <value xml:lang="nl">Wijzig product</value> <value xml:lang="ro">Actualizeaza Produs</value> <value xml:lang="ru">РедакÑиÑоваÑÑ</value> <value xml:lang="th">à¹à¸à¹à¹à¸à¸ªà¸´à¸à¸à¹à¸²</value> @@ -12291,7 +12290,7 @@ <value xml:lang="es">Editar Producto con Código</value> <value xml:lang="fr">Modification de l'article (saisir ou rechercher sa référence)</value> <value xml:lang="it">Aggiorna prodotto con codice</value> - <value xml:lang="nl">Wijzigen product met [ID]</value> + <value xml:lang="nl">Wijzigen product met [ID]</value> <value xml:lang="ro">Actualizeaza Produs cu Cod Produs</value> <value xml:lang="ru">РедакÑиÑоваÑÑ Ð¿ÑодÑÐºÑ Ñ ÐºÐ¾Ð´Ð¾Ð¼</value> <value xml:lang="th">à¹à¸à¹à¹à¸à¸ªà¸´à¸à¸à¹à¸²à¸à¹à¸§à¸¢à¸£à¸«à¸±à¸ªà¸ªà¸´à¸à¸à¹à¸²</value> @@ -12435,7 +12434,7 @@ <property key="ProductErrorNothingToExport"> <value xml:lang="en">ERROR: Nothing To Export</value> <value xml:lang="fr">ERREUR : rien à exporter</value> - </property> + </property> <property key="ProductErrorShipmentNotPurchaseShipment"> <value xml:lang="de">Lieferung ${shipmentId} ist keine Einkaufslieferung</value> <value xml:lang="en">Shipment ${shipmentId} is not a Purchase Shipment</value> @@ -12901,7 +12900,7 @@ <value xml:lang="th">หà¸à¹à¸§à¸¢à¸à¹à¸³à¸«à¸à¸±à¸à¹à¸£à¸´à¹à¸¡à¸à¹à¸</value> <value xml:lang="zh">缺çééåä½</value> <value xml:lang="zh_TW">é è¨ééå®ä½</value> - </property> + </property> <property key="ProductFacilityGroup"> <value xml:lang="de">Einrichtungsgruppe</value> <value xml:lang="en">Facility Group</value> @@ -13166,7 +13165,7 @@ <value xml:lang="es">Carga rápida del Catálogo en el caché</value> <value xml:lang="fr">Chargement rapide d'article dans le cache</value> <value xml:lang="it">Caricamento veloce di un catalogo nella cache</value> - <value xml:lang="nl">Catalogus in cache laden</value> + <value xml:lang="nl">Catalogus in cache laden</value> <value xml:lang="ro">Incarcare Rapida Catalog in Cache</value> <value xml:lang="ru">ÐÑÑÑÑÐ°Ñ Ð·Ð°Ð³ÑÑзка каÑалога в кÑÑ</value> <value xml:lang="th">Fast Load Catalog into Cache</value> @@ -13268,7 +13267,7 @@ <value xml:lang="es">CaracterÃsticas</value> <value xml:lang="fr">Caractéristiques</value> <value xml:lang="it">Caratteristiche</value> - <value xml:lang="nl">Kenmerken</value> + <value xml:lang="nl">Kenmerken</value> <value xml:lang="ro">Caracteristici</value> <value xml:lang="ru">ÐÑобенноÑÑи</value> <value xml:lang="th">ลัà¸à¸©à¸à¸°</value> @@ -13412,7 +13411,7 @@ <value xml:lang="es">CaracterÃsticas</value> <value xml:lang="fr">Caractéristiques</value> <value xml:lang="it">Caratteristiche</value> - <value xml:lang="nl">Kenmerken</value> + <value xml:lang="nl">Kenmerken</value> <value xml:lang="ro">Caracteristica</value> <value xml:lang="ru">ÐÑобенноÑÑи</value> <value xml:lang="th">ลัà¸à¸©à¸à¸°</value> @@ -13496,7 +13495,7 @@ <value xml:lang="es">Buscar producto</value> <value xml:lang="fr">Recherche d'un article</value> <value xml:lang="it">Ricerca prodotto</value> - <value xml:lang="nl">Zoek product</value> + <value xml:lang="nl">Zoek product</value> <value xml:lang="ro">Cauta Produs</value> <value xml:lang="ru">ÐÑкаÑÑ</value> <value xml:lang="th">à¸à¹à¸à¸«à¸²à¸ªà¸´à¸à¸à¹à¸²</value> @@ -13509,7 +13508,7 @@ <value xml:lang="es">Buscar producto con Código</value> <value xml:lang="fr">Recherche d'un article avec sa référence</value> <value xml:lang="it">Ricerca prodotto per codice</value> - <value xml:lang="nl">Zoeken product met [ID]</value> + <value xml:lang="nl">Zoeken product met [ID]</value> <value xml:lang="ro">Cauta Produs cu Valoare Cod</value> <value xml:lang="ru">ÐÑкаÑÑ Ð¿ÑодÑÐºÑ Ñ ÐºÐ¾Ð´Ð¾Ð¼</value> <value xml:lang="th">à¸à¹à¸à¸«à¸²à¸ªà¸´à¸à¸à¹à¸²à¸à¹à¸§à¸¢à¸à¹à¸²à¸£à¸«à¸±à¸ª</value> @@ -13802,7 +13801,7 @@ <value xml:lang="es">Regla Global de precios</value> <value xml:lang="fr">Règle globale de prix</value> <value xml:lang="it">Regola Globale Prezzi</value> - <value xml:lang="nl">Algemene prijsregel</value> + <value xml:lang="nl">Algemene prijsregel</value> <value xml:lang="ro">Regula Globala Pret</value> <value xml:lang="ru">ÐлобалÑное пÑавило ÑенообÑазованиÑ</value> <value xml:lang="th">à¸à¹à¸à¸à¸±à¸à¸à¸±à¸à¸£à¸²à¸à¸²à¹à¸à¸¢à¸£à¸§à¸¡</value> @@ -13815,7 +13814,7 @@ <value xml:lang="es">Reglas Globales de precios</value> <value xml:lang="fr">Règles globales de prix</value> <value xml:lang="it">Regole di prezzo globali</value> - <value xml:lang="nl">Algemene prijsregels</value> + <value xml:lang="nl">Algemene prijsregels</value> <value xml:lang="ro">Regula Globala Preturi</value> <value xml:lang="ru">ÐлобалÑнÑе пÑавила ÑенообÑазованиÑ</value> <value xml:lang="th">à¸à¹à¸à¸à¸±à¸à¸à¸±à¸à¸£à¸²à¸à¸²à¹à¸à¸¢à¸£à¸§à¸¡</value> @@ -16415,7 +16414,7 @@ <value xml:lang="es">Nuevo catálogo</value> <value xml:lang="fr">Nouveau catalogue</value> <value xml:lang="it">Nuovo Catalogo Prodotti</value> - <value xml:lang="nl">Nieuwe productcatalogus</value> + <value xml:lang="nl">Nieuwe productcatalogus</value> <value xml:lang="ro">Nou Catalog Produse</value> <value xml:lang="ru">ÐовÑй каÑалог</value> <value xml:lang="th">หมวà¸à¸«à¸¡à¸¹à¹à¸ªà¸´à¸à¸à¹à¸²à¹à¸«à¸¡à¹</value> @@ -16931,7 +16930,7 @@ <value xml:lang="es">No se encontraron reglas de precio</value> <value xml:lang="fr">Règles de prix non trouvées</value> <value xml:lang="it">Nessuna regola di prezzo trovata</value> - <value xml:lang="nl">Geen prijsregels gevonden</value> + <value xml:lang="nl">Geen prijsregels gevonden</value> <value xml:lang="ro">Nici-o regula de Pret Gasita ProductNoProductsInCategory=Nici-un produs in categorie</value> <value xml:lang="ru">Ðе Ð½Ð°Ð¹Ð´ÐµÐ½Ñ Ð¿Ñавила ÑенообÑазованиÑ</value> <value xml:lang="th">à¹à¸¡à¹à¸à¸à¸à¹à¸à¸à¸±à¸à¸à¸±à¸à¸£à¸²à¸à¸²</value> @@ -18756,7 +18755,7 @@ <value xml:lang="es">Regla de precio [CÃDIGO]</value> <value xml:lang="fr">Modifier la règle de prix [Réf.]</value> <value xml:lang="it">Regola prezzo [Codice]</value> - <value xml:lang="nl">Prijsregel [ID]</value> + <value xml:lang="nl">Prijsregel [ID]</value> <value xml:lang="ro">Regula Pret [Cod]</value> <value xml:lang="ru">пÑавила ÑенообÑÐ°Ð·Ð¾Ð²Ð°Ð½Ð¸Ñ [Ðод]</value> <value xml:lang="th">à¸à¸·à¹à¸à¸à¹à¸à¸à¸³à¸«à¸à¸à¸£à¸²à¸à¸² [รหัส]</value> @@ -18768,7 +18767,7 @@ <value xml:lang="es">Nombre de la regla de precio [CÃDIGO]</value> <value xml:lang="fr">Nom de la règle de prix [Réf.]</value> <value xml:lang="it">Nome regola prezzo [Codice]</value> - <value xml:lang="nl">Naam prijsregel [ID]</value> + <value xml:lang="nl">Naam prijsregel [ID]</value> <value xml:lang="ro">Nume Regula Pret [Cod]</value> <value xml:lang="ru">ÐÐ¼Ñ Ð¿Ñавила ÑенообÑÐ°Ð·Ð¾Ð²Ð°Ð½Ð¸Ñ [Ðод]</value> <value xml:lang="th">à¸à¸·à¹à¸à¸à¹à¸à¸à¸³à¸«à¸à¸à¸£à¸²à¸à¸² [รหัส]</value> @@ -18781,7 +18780,7 @@ <value xml:lang="es">Reglas de precio</value> <value xml:lang="fr">Règles de prix</value> <value xml:lang="it">Regole Prezzo</value> - <value xml:lang="nl">Prijsregels</value> + <value xml:lang="nl">Prijsregels</value> <value xml:lang="ro">Regula Pret</value> <value xml:lang="ru">ЦенообÑазование</value> <value xml:lang="th">à¸à¹à¸à¸à¸³à¸«à¸à¸à¸£à¸²à¸à¸²</value> @@ -18833,6 +18832,10 @@ <value xml:lang="zh">ä»·æ ¼</value> <value xml:lang="zh_TW">å¹æ ¼</value> </property> + <property key="ProductPricesWarning"> + <value xml:lang="en">You need to set a least a Default Price of type Purchase/Initial for the price calculation to work</value> + <value xml:lang="fr">Vous devez définir au moins un prix par défault de type Achat/Initial pour que le calcul des prix fonctionne</value> + </property> <property key="ProductPrimaryCategory"> <value xml:lang="de">Primäre Kategorie</value> <value xml:lang="en">Primary Category</value> @@ -18965,7 +18968,7 @@ <value xml:lang="es">Lista de catálogos de productos</value> <value xml:lang="fr">Liste des catalogues</value> <value xml:lang="it">Lista cataloghi prodotti</value> - <value xml:lang="nl">Lijst van catalogi</value> + <value xml:lang="nl">Lijst van catalogi</value> <value xml:lang="ro">Lista Cataloage Produs</value> <value xml:lang="ru">СпиÑок пÑодÑкÑовÑÑ ÐºÐ°Ñалогов</value> <value xml:lang="th">รายà¸à¸²à¸£à¸«à¸¡à¸§à¸à¸«à¸¡à¸¹à¹à¸ªà¸´à¸à¸à¹à¸²</value> @@ -19445,7 +19448,7 @@ <value xml:lang="es">Lista de tiendas de productos</value> <value xml:lang="fr">Liste des centres de profit</value> <value xml:lang="it">Lista dei negozi</value> - <value xml:lang="nl">Lijst van winkels</value> + <value xml:lang="nl">Lijst van winkels</value> <value xml:lang="ro">Lista Magazin</value> <value xml:lang="ru">СпиÑок Ñкладов</value> <value xml:lang="th">รายà¸à¸²à¸£à¸à¸¥à¸±à¸à¸ªà¸´à¸à¸à¹à¸²</value> @@ -19706,7 +19709,7 @@ <value xml:lang="es">Promociones</value> <value xml:lang="fr">Promotions</value> <value xml:lang="it">Promozioni</value> - <value xml:lang="nl">Promoties</value> + <value xml:lang="nl">Promoties</value> <value xml:lang="ro">Promotii</value> <value xml:lang="ru">ÐкÑии</value> <value xml:lang="th">à¹à¸à¸£à¹à¸¡à¸à¸±à¸</value> @@ -20323,7 +20326,7 @@ <value xml:lang="es">Crear rápido Virtuales a partir de variantes</value> <value xml:lang="fr">Créer rapidement un article virtuel depuis des variantes</value> <value xml:lang="it">Creazione veloce di un articolo virtuale da varianti</value> - <value xml:lang="nl">Aanmaken virtuele producten van variantproducten</value> + <value xml:lang="nl">Aanmaken virtuele producten van variantproducten</value> <value xml:lang="ro">Creare Rapida Virtuala de Variante</value> <value xml:lang="ru">ÐÑÑÑÑо ÑоздаÑÑ Ð²Ð¸ÑÑÑалÑнÑй из ваÑианÑов</value> <value xml:lang="th">สรà¹à¸²à¸à¸à¸±à¹à¸à¸«à¸¡à¸à¸à¸²à¸à¸à¸²à¸£à¹à¸à¸¥à¸µà¹à¸¢à¸à¹à¸à¸¥à¸à¸à¸¢à¹à¸²à¸à¸£à¸§à¸à¹à¸£à¹à¸§</value> @@ -21179,7 +21182,7 @@ <value xml:lang="es">Revisiones</value> <value xml:lang="fr">Approbations</value> <value xml:lang="it">Recensioni</value> - <value xml:lang="nl">Klantbeoordelingen</value> + <value xml:lang="nl">Klantbeoordelingen</value> <value xml:lang="ro">Recenzii</value> <value xml:lang="ru">ÐÑзÑвÑ</value> <value xml:lang="th">à¸à¸£à¸§à¸à¸ªà¸à¸</value> @@ -21214,7 +21217,7 @@ <value xml:lang="es">JerarquÃa</value> <value xml:lang="fr">Hiérarchie</value> <value xml:lang="it">Gerarchia</value> - <value xml:lang="nl">Hiërarchie</value> + <value xml:lang="nl">Hiërarchie</value> <value xml:lang="ro">Sosire</value> <value xml:lang="ru">ÐеÑаÑÑ Ð¸Ñ</value> <value xml:lang="th">Rollup</value> @@ -21553,7 +21556,7 @@ <value xml:lang="es">Buscar Productos</value> <value xml:lang="fr">Rechercher l'article</value> <value xml:lang="it">Ricerca prodotti</value> - <value xml:lang="nl">Zoeken producten</value> + <value xml:lang="nl">Zoeken producten</value> <value xml:lang="ro">Cauta Produse </value> <value xml:lang="ru">ÐоиÑк пÑодÑкÑов</value> <value xml:lang="th">à¸à¹à¸à¸«à¸²à¸ªà¸´à¸à¸à¹à¸²</value> @@ -22513,7 +22516,7 @@ <value xml:lang="es">EnvÃo</value> <value xml:lang="fr">Expédition</value> <value xml:lang="it">Metodi di Spedizione</value> - <value xml:lang="nl">Verzendmethoden</value> + <value xml:lang="nl">Verzendmethoden</value> <value xml:lang="ru">ÐоÑÑавки</value> <value xml:lang="th">à¸à¸²à¸£à¸à¸à¸ªà¹à¸</value> <value xml:lang="zh">éè´§</value> @@ -22990,7 +22993,7 @@ <value xml:lang="es">Nombre de tienda [código]</value> <value xml:lang="fr">Nom du centre de profit [Réf.]</value> <value xml:lang="it">Nome Negozio [Codice]</value> - <value xml:lang="nl">Naam winkel [ID]</value> + <value xml:lang="nl">Naam winkel [ID]</value> <value xml:lang="ro">Nume Magazin [Cod]</value> <value xml:lang="ru">ÐÐ¼Ñ Ñклада [Ðод]</value> <value xml:lang="th">à¸à¸·à¹à¸à¸à¸¥à¸±à¸à¸ªà¸´à¸à¸à¹à¸² [รหัส]</value> @@ -23075,7 +23078,7 @@ <value xml:lang="es">Tiendas</value> <value xml:lang="fr">Centres de profit</value> <value xml:lang="it">Negozi</value> - <value xml:lang="nl">Winkels</value> + <value xml:lang="nl">Winkels</value> <value xml:lang="ro">Magazine</value> <value xml:lang="ru">ТоÑговÑе ÑоÑки</value> <value xml:lang="th">à¸à¸¥à¸±à¸à¸ªà¸´à¸à¸à¹à¸²</value> @@ -23273,7 +23276,7 @@ <value xml:lang="es">Suscripciones</value> <value xml:lang="fr">Abonnements</value> <value xml:lang="it">Abbonamenti</value> - <value xml:lang="nl">Abonnementen</value> + <value xml:lang="nl">Abonnementen</value> <value xml:lang="ro">Abonamente</value> <value xml:lang="ru">ÐодпиÑки</value> <value xml:lang="th">à¸à¸²à¸£à¸ªà¸±à¹à¸à¸à¸·à¹à¸</value> @@ -23586,7 +23589,7 @@ <value xml:lang="es">Tesauro</value> <value xml:lang="fr">Thésaurus</value> <value xml:lang="it">Sinonimi</value> - <value xml:lang="nl">Trefwoord synoniemen</value> + <value xml:lang="nl">Trefwoord synoniemen</value> <value xml:lang="ro">Sinonime</value> <value xml:lang="ru">СловаÑи</value> <value xml:lang="th">สาราà¸à¸¸à¸à¸£à¸¡</value> @@ -24864,6 +24867,10 @@ <value xml:lang="en">Upload</value> <value xml:lang="th">à¸à¸±à¸à¹à¸«à¸¥à¸</value> </property> + <property key="UseCartQuantity"> + <value xml:lang="en">Use cart quantity</value> + <value xml:lang="fr">Utiliser la quantité du panier</value> + </property> <property key="WelcomeMessage"> <value xml:lang="en">Welcome to the Image Management</value> <value xml:lang="th">ยิà¸à¸à¸µà¸à¹à¸à¸à¸£à¸±à¸à¸ªà¸¹à¹à¸£à¸à¸à¸à¸²à¸£à¸à¸±à¸à¸à¸²à¸£à¸£à¸¹à¸à¸ าà¸</value> Modified: ofbiz/branches/jackrabbit20100709/applications/product/config/shipment.properties URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/config/shipment.properties?rev=1090153&r1=1090152&r2=1090153&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/product/config/shipment.properties (original) +++ ofbiz/branches/jackrabbit20100709/applications/product/config/shipment.properties Fri Apr 8 08:07:00 2011 @@ -176,10 +176,6 @@ shipment.dhl.access.password=YOUR DHL Sh shipment.dhl.access.accountNbr=YOUR DHL ShipIT ACCOUNT NUMBER shipment.dhl.access.shippingKey=YOUR DHL ShipIT SHIPPING KEY -# DHL Shipment Label configuration -shipment.dhl.label.image.format=PNG - - ############################################ # FedEx Ship Manager Direct Configuration ############################################ Modified: ofbiz/branches/jackrabbit20100709/applications/product/data/ProductTypeData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/data/ProductTypeData.xml?rev=1090153&r1=1090152&r2=1090153&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/product/data/ProductTypeData.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/product/data/ProductTypeData.xml Fri Apr 8 08:07:00 2011 @@ -434,6 +434,7 @@ under the License. <Enumeration description="Product for [Special Promo] Price" enumCode="PROD_SPPRC" enumId="PROMO_PROD_SPPRC" sequenceId="08" enumTypeId="PROD_PROMO_ACTION"/> <Enumeration description="Shipping X% discount" enumCode="SHIP_CHARGE" enumId="PROMO_SHIP_CHARGE" sequenceId="09" enumTypeId="PROD_PROMO_ACTION"/> <Enumeration description="Call Service" enumCode="SERVICE" enumId="PROMO_SERVICE" sequenceId="10" enumTypeId="PROD_PROMO_ACTION"/> + <Enumeration description="Tax % Discount" enumCode="TAX_PERCENT" enumId="PROMO_TAX_PERCENT" sequenceId="11" enumTypeId="PROD_PROMO_ACTION"/> <EnumerationType description="Product Rating Field Type" enumTypeId="PROD_RATING_TYPE" hasTable="N" parentTypeId=""/> <Enumeration description="Min Rating" enumCode="MIN" enumId="PRDR_MIN" sequenceId="01" enumTypeId="PROD_RATING_TYPE"/> @@ -602,8 +603,7 @@ under the License. <RoleType roleTypeId="IMAGEAPPROVER" hasTable="N" description="Image Approver"/> <ProductContentType description="Image" hasTable="N" parentTypeId="" productContentTypeId="IMAGE"/> - <ProductContentType description="Image Thumbnail" hasTable="N" parentTypeId="" productContentTypeId="DEFAULT_IMAGE"/> - <ProductContentType description="Frame" hasTable="N" parentTypeId="" productContentTypeId="FRAME"/> + <ProductContentType description="Default Image" hasTable="N" parentTypeId="" productContentTypeId="DEFAULT_IMAGE"/> <ContentType contentTypeId="IMAGE_FRAME" description="Frame Image"/> Modified: ofbiz/branches/jackrabbit20100709/applications/product/script/org/ofbiz/product/imagemanagement/ImageManagementEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/script/org/ofbiz/product/imagemanagement/ImageManagementEvents.xml?rev=1090153&r1=1090152&r2=1090153&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/product/script/org/ofbiz/product/imagemanagement/ImageManagementEvents.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/product/script/org/ofbiz/product/imagemanagement/ImageManagementEvents.xml Fri Apr 8 08:07:00 2011 @@ -46,15 +46,14 @@ under the License. </entity-and> <if-not-empty field="productContentAndInfos"> <first-from-list entry="productContentAndInfo" list="productContentAndInfos"/> + + <script location="component://product/webapp/catalog/WEB-INF/actions/imagemanagement/SetDefaultImage.groovy"/> + <entity-one value-field="product" entity-name="Product"> <field-map field-name="productId" from-field="parameters.productId"/> </entity-one> <set field="product.originalImageUrl" from-field="productContentAndInfo.drObjectInfo"/> <store-value value-field="product"/> - - <!--<set field="setThumbnailMap.productId" from-field="parameters.productId"/> - <set field="setThumbnailMap.contentIdTo" from-field="parameters.contentIdTo"/> - <call-service service-name="setThumbnail" in-map-name="setThumbnailMap"/>--> </if-not-empty> </simple-method> </simple-methods> Modified: ofbiz/branches/jackrabbit20100709/applications/product/script/org/ofbiz/product/price/PriceServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/script/org/ofbiz/product/price/PriceServices.xml?rev=1090153&r1=1090152&r2=1090153&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/product/script/org/ofbiz/product/price/PriceServices.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/product/script/org/ofbiz/product/price/PriceServices.xml Fri Apr 8 08:07:00 2011 @@ -239,6 +239,9 @@ under the License. <make-value value-field="newEntity" entity-name="ProductPriceRule"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> + <if-empty field="parameters.fromDate"> + <now-timestamp field="newEntity.fromDate"/> + </if-empty> <sequenced-id sequence-name="ProductPriceRule" field="newEntity.productPriceRuleId"/> <field-to-result field="newEntity.productPriceRuleId" result-name="productPriceRuleId"/> Propchange: ofbiz/branches/jackrabbit20100709/applications/product/script/org/ofbiz/product/test/InventoryTests.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Apr 8 08:07:00 2011 @@ -2,4 +2,4 @@ /ofbiz/branches/dojo1.4/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:951708-952957 /ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:952958-1044489 /ofbiz/branches/multitenant20100310/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:921280-927264 -/ofbiz/trunk/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:962442-1084618 +/ofbiz/trunk/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:962442-1090146 Modified: ofbiz/branches/jackrabbit20100709/applications/product/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/servicedef/services.xml?rev=1090153&r1=1090152&r2=1090153&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/product/servicedef/services.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/product/servicedef/services.xml Fri Apr 8 08:07:00 2011 @@ -1497,13 +1497,6 @@ under the License. <attribute name="partyId" mode="IN" type="String" optional="false"/> </service> - <service name="setThumbnail" engine="java" - location="org.ofbiz.product.imagemanagement.ImageManagementServices" invoke="setThumbnail" auth="true"> - <description>Set Thumbnail for product</description> - <attribute mode="IN" name="contentIdTo" optional="false" type="String"/> - <attribute mode="IN" name="productId" optional="false" type="String"/> - </service> - <service name="resizeAllImageOfProduct" engine="simple" location="component://product/script/org/ofbiz/product/imagemanagement/ImageManagementServices.xml" invoke="resizeAllImageOfProduct" auth="true"> <description>Resize All Image Of Product.</description> Modified: ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/category/CategoryServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/category/CategoryServices.java?rev=1090153&r1=1090152&r2=1090153&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/category/CategoryServices.java (original) +++ ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/category/CategoryServices.java Fri Apr 8 08:07:00 2011 @@ -406,6 +406,7 @@ public class CategoryServices { Delegator delegator = (Delegator) request.getAttribute("delegator"); String productCategoryId = request.getParameter("productCategoryId"); String isCatalog = request.getParameter("isCatalog"); + String isCategoryType = request.getParameter("isCategoryType"); String entityName = null; String primaryKeyName = null; @@ -419,18 +420,23 @@ public class CategoryServices { List categoryList = FastList.newInstance(); List<GenericValue> childOfCats; + List<String> sortList = org.ofbiz.base.util.UtilMisc.toList("sequenceNum", "title"); try { GenericValue category = delegator.findByPrimaryKey(entityName ,UtilMisc.toMap(primaryKeyName, productCategoryId)); if (UtilValidate.isNotEmpty(category)) { - if (isCatalog.equals("true")) { + if (isCatalog.equals("true") && isCategoryType.equals("false")) { CategoryWorker.getRelatedCategories(request, "ChildCatalogList", CatalogWorker.getCatalogTopCategoryId(request, productCategoryId), true); - childOfCats = (List<GenericValue>) request.getAttribute("ChildCatalogList"); + childOfCats = EntityUtil.filterByDate((List<GenericValue>) request.getAttribute("ChildCatalogList")); + + } else if(isCatalog.equals("false") && isCategoryType.equals("false")){ + childOfCats = EntityUtil.filterByDate(delegator.findByAnd("ProductCategoryRollupAndChild", UtilMisc.toMap( + "parentProductCategoryId", productCategoryId ))); } else { - childOfCats = delegator.findByAnd("ProductCategoryRollup", UtilMisc.toMap( - "parentProductCategoryId", productCategoryId )); + childOfCats = EntityUtil.filterByDate(delegator.findByAnd("ProdCatalogCategory", UtilMisc.toMap("prodCatalogId", productCategoryId))); } if (UtilValidate.isNotEmpty(childOfCats)) { + for (GenericValue childOfCat : childOfCats ) { Object catId = null; @@ -443,8 +449,8 @@ public class CategoryServices { List<GenericValue> childList = null; // Get the child list of chosen category - childList = delegator.findByAnd("ProductCategoryRollup", UtilMisc.toMap( - "parentProductCategoryId", catId)); + childList = EntityUtil.filterByDate(delegator.findByAnd("ProductCategoryRollup", UtilMisc.toMap( + "parentProductCategoryId", catId))); // Get the chosen category information for the categoryContentWrapper GenericValue cate = delegator.findByPrimaryKey("ProductCategory" ,UtilMisc.toMap("productCategoryId",catId)); @@ -457,9 +463,12 @@ public class CategoryServices { Map dataAttrMap = FastMap.newInstance(); CategoryContentWrapper categoryContentWrapper = new CategoryContentWrapper(cate, request); + String title = null; if (UtilValidate.isNotEmpty(categoryContentWrapper.get(catNameField))) { - dataMap.put("title", categoryContentWrapper.get(catNameField)+"["+catId+"]"); + title = categoryContentWrapper.get(catNameField)+" "+"["+catId+"]"; + dataMap.put("title", title); } else { + title = catId.toString(); dataMap.put("title", catId); } dataAttrMap.put("onClick","window.location.href='EditCategory?productCategoryId="+catId+"'; return false;"); @@ -471,10 +480,13 @@ public class CategoryServices { attrMap.put("isCatalog", false); attrMap.put("rel", "CATEGORY"); josonMap.put("attr",attrMap); + josonMap.put("sequenceNum",childOfCat.get("sequenceNum")); + josonMap.put("title",title); categoryList.add(josonMap); } - toJsonObjectList(categoryList,response); + List<Map<Object, Object>> sortedCategoryList = UtilMisc.sortMaps(categoryList, sortList); + toJsonObjectList(sortedCategoryList,response); } } } catch (GenericEntityException e) { Modified: ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/image/ScaleImage.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/image/ScaleImage.java?rev=1090153&r1=1090152&r2=1090153&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/image/ScaleImage.java (original) +++ ofbiz/branches/jackrabbit20100709/applications/product/src/org/ofbiz/product/image/ScaleImage.java Fri Apr 8 08:07:00 2011 @@ -23,6 +23,8 @@ import java.awt.image.ImagingOpException import java.awt.image.RenderedImage; import java.io.File; import java.io.IOException; +import java.lang.NullPointerException; +import java.lang.SecurityException; import java.util.Iterator; import java.util.List; import java.util.Locale; @@ -118,7 +120,6 @@ public class ScaleImage { filenameExpander = FlexibleStringExpander.getInstance(filenameFormat); id = (String) context.get("productId"); fileLocation = filenameExpander.expandString(UtilMisc.toMap("location", "products", "id", id, "type", "original")); - Debug.logWarning("fileLocation for view type = MAIN : " + fileLocation,module); } else if (viewType.toLowerCase().contains("additional") && viewNumber != null && !viewNumber.equals("0")) { String filenameFormat = UtilProperties.getPropertyValue("catalog", "image.filename.additionalviewsize.format"); filenameExpander = FlexibleStringExpander.getInstance(filenameFormat); @@ -138,7 +139,7 @@ public class ScaleImage { } /* get original BUFFERED IMAGE */ - resultBufImgMap.putAll(ImageTransform.getBufferedImage(imageServerPath + "/" + fileLocation + "." + imgExtension, locale)); + resultBufImgMap.putAll(ImageTransform.getBufferedImage(imageServerPath + "/" + fileLocation + "." + imgExtension, locale)); if (resultBufImgMap.containsKey("responseMessage") && resultBufImgMap.get("responseMessage").equals("success")) { bufImg = (BufferedImage) resultBufImgMap.get("bufferedImage"); @@ -153,16 +154,18 @@ public class ScaleImage { return result; } - /* scale Image for each Size Type */ - Iterator<String> sizeIter = sizeTypeList.iterator(); - while (sizeIter.hasNext()) { - String sizeType = sizeIter.next(); + /* Scale image for each size from ImageProperties.xml */ + for (Map.Entry<String, Map<String, String>> entry : imgPropertyMap.entrySet()) { + String sizeType = entry.getKey(); + + // Scale resultScaleImgMap.putAll(ImageTransform.scaleImage(bufImg, imgHeight, imgWidth, imgPropertyMap, sizeType, locale)); + /* Write the new image file */ if (resultScaleImgMap.containsKey("responseMessage") && resultScaleImgMap.get("responseMessage").equals("success")) { bufNewImg = (BufferedImage) resultScaleImgMap.get("bufferedImage"); - // write the New Scaled Image + // Build full path for the new scaled image String newFileLocation = null; filenameToUse = sizeType + filenameToUse.substring(filenameToUse.lastIndexOf(".")); if (viewType.toLowerCase().contains("main")) { @@ -170,21 +173,38 @@ public class ScaleImage { } else if (viewType.toLowerCase().contains("additional")) { newFileLocation = filenameExpander.expandString(UtilMisc.toMap("location", "products", "id", id, "viewtype", viewType, "sizetype", sizeType)); } - String newFilePathPrefix = ""; if (newFileLocation.lastIndexOf("/") != -1) { newFilePathPrefix = newFileLocation.substring(0, newFileLocation.lastIndexOf("/") + 1); // adding 1 to include the trailing slash - } - + } + // Directory String targetDirectory = imageServerPath + "/" + newFilePathPrefix; - File targetDir = new File(targetDirectory); - if (!targetDir.exists()) { - boolean created = targetDir.mkdirs(); - if (!created) { - String errMsg = UtilProperties.getMessage(resource, "ScaleImage.unable_to_create_target_directory", locale) + " - " + targetDirectory; - Debug.logFatal(errMsg, module); - return ServiceUtil.returnError(errMsg); + try { + // Create the new directory + File targetDir = new File(targetDirectory); + if (!targetDir.exists()) { + boolean created = targetDir.mkdirs(); + if (!created) { + String errMsg = UtilProperties.getMessage(resource, "ScaleImage.unable_to_create_target_directory", locale) + " - " + targetDirectory; + Debug.logFatal(errMsg, module); + return ServiceUtil.returnError(errMsg); + } + // Delete existing image files + // Images aren't ordered by productId (${location}/${viewtype}/${sizetype}/${id}) !!! BE CAREFUL !!! + } else if (newFileLocation.endsWith("/" + id)) { + try { + File[] files = targetDir.listFiles(); + for(File file : files) { + if (file.isFile() && file.getName().startsWith(id)) { + file.delete(); + } + } + } catch (SecurityException e) { + Debug.logError(e,module); + } } + } catch (NullPointerException e) { + Debug.logError(e,module); } // write new image @@ -202,12 +222,14 @@ public class ScaleImage { return result; } - /* write Return Result */ - String imageUrl = imageUrlPrefix + "/" + newFileLocation + "." + imgExtension; - imgUrlMap.put(sizeType, imageUrl); + // Save each Url + if (sizeTypeList.contains(sizeType)) { + String imageUrl = imageUrlPrefix + "/" + newFileLocation + "." + imgExtension; + imgUrlMap.put(sizeType, imageUrl); + } } // scaleImgMap - } // sizeIter + } // Loop over sizeType result.put("responseMessage", "success"); result.put("imageUrlMap", imgUrlMap); @@ -221,10 +243,10 @@ public class ScaleImage { return ServiceUtil.returnError(errMsg); } } - + public static Map<String, Object> scaleImageManageInAllSize(Map<String, ? extends Object> context, String filenameToUse, String viewType, String viewNumber , String imageType) throws IllegalArgumentException, ImagingOpException, IOException, JDOMException { - + /* VARIABLES */ Locale locale = (Locale) context.get("locale"); List<String> sizeTypeList = null; @@ -243,7 +265,7 @@ public class ScaleImage { Map<String, Object> resultBufImgMap = FastMap.newInstance(); Map<String, Object> resultScaleImgMap = FastMap.newInstance(); Map<String, Object> result = FastMap.newInstance(); - + /* ImageProperties.xml */ String imgPropertyFullPath = System.getProperty("ofbiz.home") + "/applications/product/config/ImageProperties.xml"; resultXMLMap.putAll(ImageTransform.getXMLValue(imgPropertyFullPath, locale)); @@ -255,7 +277,7 @@ public class ScaleImage { result.put("errorMessage", errMsg); return result; } - + /* IMAGE */ // get Name and Extension index = filenameToUse.lastIndexOf("."); @@ -265,7 +287,7 @@ public class ScaleImage { String mainFilenameFormat = UtilProperties.getPropertyValue("catalog", "image.filename.format"); String imageServerPath = FlexibleStringExpander.expandString(UtilProperties.getPropertyValue("catalog", "image.server.path"), context); String imageUrlPrefix = UtilProperties.getPropertyValue("catalog", "image.url.prefix"); - + String id = null; String type = null; if (viewType.toLowerCase().contains("main")) { @@ -294,7 +316,7 @@ public class ScaleImage { if (resultBufImgMap.containsKey("responseMessage") && resultBufImgMap.get("responseMessage").equals("success")) { bufImg = (BufferedImage) resultBufImgMap.get("bufferedImage"); - + // get Dimensions imgHeight = (double) bufImg.getHeight(); imgWidth = (double) bufImg.getWidth(); @@ -304,23 +326,23 @@ public class ScaleImage { result.put("errorMessage", errMsg); return result; } - + // new Filename Format FlexibleStringExpander addFilenameExpander = mainFilenameExpander; if (viewType.toLowerCase().contains("additional")) { String addFilenameFormat = UtilProperties.getPropertyValue("catalog", "image.filename.additionalviewsize.format"); addFilenameExpander = FlexibleStringExpander.getInstance(addFilenameFormat); } - + /* scale Image for each Size Type */ Iterator<String> sizeIter = sizeTypeList.iterator(); while (sizeIter.hasNext()) { String sizeType = sizeIter.next(); resultScaleImgMap.putAll(ImageTransform.scaleImage(bufImg, imgHeight, imgWidth, imgPropertyMap, sizeType, locale)); - + if (resultScaleImgMap.containsKey("responseMessage") && resultScaleImgMap.get("responseMessage").equals("success")) { bufNewImg = (BufferedImage) resultScaleImgMap.get("bufferedImage"); - + // write the New Scaled Image String newFileLocation = null; if (viewType.toLowerCase().contains("main")) { @@ -332,7 +354,7 @@ public class ScaleImage { if (newFileLocation.lastIndexOf("/") != -1) { newFilePathPrefix = newFileLocation.substring(0, newFileLocation.lastIndexOf("/") + 1); // adding 1 to include the trailing slash } - + String targetDirectory = imageServerPath + "/" + newFilePathPrefix; File targetDir = new File(targetDirectory); if (!targetDir.exists()) { @@ -343,7 +365,7 @@ public class ScaleImage { return ServiceUtil.returnError(errMsg); } } - + // write new image try { ImageIO.write((RenderedImage) bufNewImg, imgExtension, new File(imageServerPath + "/" + newFilePathPrefix + filenameToUse)); @@ -358,19 +380,19 @@ public class ScaleImage { result.put("errorMessage", errMsg); return result; } - + /* write Return Result */ String imageUrl = imageUrlPrefix + "/" + newFilePathPrefix + filenameToUse; imgUrlMap.put(sizeType, imageUrl); - + } // scaleImgMap } // sizeIter - + result.put("responseMessage", "success"); result.put("imageUrlMap", imgUrlMap); result.put("original", resultBufImgMap); return result; - + } else { String errMsg = UtilProperties.getMessage(resource, "ScaleImage.unable_to_scale_original_image", locale) + " : " + filenameToUse; Debug.logError(errMsg, module); |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |