OFBiz › OFBiz - Commits

svn commit: r1128865 [5/27] - in /ofbiz/branches/jackrabbit20100709: ./ applications/accounting/config/ applications/accounting/src/org/ofbiz/accounting/invoice/ applications/accounting/src/org/ofbiz/accounting/payment/ applications/accounting/src/org/...

‹ Previous Topic Next Topic ›
 
classic Classic list List threaded Threaded
♦
♦
 1 message Options
sascharodekamp
Reply | Threaded
Open this post in threaded view
♦
♦
|

svn commit: r1128865 [5/27] - in /ofbiz/branches/jackrabbit20100709: ./ applications/accounting/config/ applications/accounting/src/org/ofbiz/accounting/invoice/ applications/accounting/src/org/ofbiz/accounting/payment/ applications/accounting/src/org/...

sascharodekamp
Modified: ofbiz/branches/jackrabbit20100709/applications/product/config/ProductUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/config/ProductUiLabels.xml?rev=1128865&r1=1128864&r2=1128865&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/product/config/ProductUiLabels.xml Sun May 29 11:02:09 2011
@@ -23,18 +23,6 @@
         <value xml:lang="de">Neues Merkmal für dieses Produkt erstellen</value>
         <value xml:lang="en">Add new Product Feature to current product</value>
     </property>
-    <property key="Approve">
-        <value xml:lang="en">Approve</value>
-        <value xml:lang="th">ยืนยัน</value>
-    </property>
-    <property key="Approved">
-        <value xml:lang="en">Approved</value>
-        <value xml:lang="th">ยืนยันแล้ว</value>
-    </property>
-    <property key="AutomaticResize">
-        <value xml:lang="en">Automatic Resize</value>
-        <value xml:lang="th">เปลี่ยนขนาดอัตโนมัติ</value>
-    </property>
     <property key="CatalogWebAnalytics">
         <value xml:lang="en">Web Analytics</value>
         <value xml:lang="it">Analisi Web</value>
@@ -50,18 +38,6 @@
         <value xml:lang="it">Tipi di analisi Web</value>
         <value xml:lang="zh_TW">網站分析型態</value>
     </property>
-    <property key="ChooseImageToReplace">
-        <value xml:lang="en">Choose Image to Replace</value>
-        <value xml:lang="th">เลือกภาพสำหรับแทนที่</value>
-    </property>
-    <property key="ChooseProductID">
-        <value xml:lang="en">Choose Product ID</value>
-        <value xml:lang="th">เลือกรหัสสินค้า</value>
-    </property>
-    <property key="ChooseReplacementImage">
-        <value xml:lang="en">Choose Replacement Image</value>
-        <value xml:lang="th">เลือกภาพที่จะแทนที่</value>
-    </property>
     <property key="CreateNewProductFeatureType">
         <value xml:lang="de">Neuen Merkmaltyp erstellen</value>
         <value xml:lang="en">Create New Product Feature Type</value>
@@ -3482,6 +3458,9 @@
         <value xml:lang="zh">上次价格</value>
         <value xml:lang="zh_TW">上次價格</value>
     </property>
+    <property key="FormFieldTitle_shippingPrice">
+        <value xml:lang="en">Shipping Price</value>
+    </property>
     <property key="FormFieldTitle_levelId">
         <value xml:lang="de">Ebene ID</value>
         <value xml:lang="en">Level Id</value>
@@ -4191,6 +4170,19 @@
         <value xml:lang="zh">产品目录分类类型标识</value>
         <value xml:lang="zh_TW">產品目錄分類類型ID</value>
     </property>
+    <property key="FormFieldTitle_prodCatalogName">
+        <value xml:lang="de">Katalogname</value>
+        <value xml:lang="en">Catalog Name</value>
+        <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="ro">Nume Catalog</value>
+        <value xml:lang="ru">Имя каталога</value>
+        <value xml:lang="th">ชื่อหมวดหมู่</value>
+        <value xml:lang="zh">目录名称</value>
+        <value xml:lang="zh_TW">目錄名稱</value>
+    </property>
     <property key="FormFieldTitle_prodSearchExcludeVariant">
         <value xml:lang="de">Produktsuche schliesst die Variante aus</value>
         <value xml:lang="en">Prod Search Exclude Variant</value>
@@ -5396,7 +5388,7 @@
         <value xml:lang="zh">副标题</value>
         <value xml:lang="zh_TW">副標題</value>
     </property>
-    <property key="FormFieldTitle_supplierCommissionPerc">
+    <!-- property key="FormFieldTitle_supplierCommissionPerc">
         <value xml:lang="de">Lieferant Kommission Prozent</value>
         <value xml:lang="en">Supplier Commission Perc</value>
         <value xml:lang="es">Porcentaje de comisión del proveedor</value>
@@ -5407,7 +5399,7 @@
         <value xml:lang="th">เปอร์เซ็นต์ค่าคอมมิชชันของผู้จัดหาสิ่งของ</value>
         <value xml:lang="zh">供货商佣金百分比</value>
         <value xml:lang="zh_TW">供貨商佣金百分比</value>
-    </property>
+    </property-->
     <property key="FormFieldTitle_supplierPrefOrderId">
         <value xml:lang="de">Lieferant präferierte Auftragsnummer ID</value>
         <value xml:lang="en">Supplier Pref Order Id</value>
@@ -5795,59 +5787,188 @@
         <value xml:lang="zh">人工服务好的标准类型标识</value>
         <value xml:lang="zh_TW">工項成品規範類型ID</value>
     </property>
-    <property key="Gallery">
-        <value xml:lang="de">Gallerie</value>
-        <value xml:lang="en">Gallery</value>
-        <value xml:lang="th">แกลลอรี่</value>
-    </property>
-    <property key="ImageApprove">
-        <value xml:lang="de">Bestätigen</value>
-        <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>
-    </property>
-    <property key="ImageFrames">
-        <value xml:lang="en">Image Frames</value>
-        <value xml:lang="th">เฟรม</value>
-    </property>
     <property key="ImageManagement">
         <value xml:lang="en">Image Management</value>
         <value xml:lang="th">จัดการรูปภาพ</value>
     </property>
+    <property key="ImageManagementAction">
+        <value xml:lang="en">Action</value>
+    </property>
+    <property key="ImageManagementAltForumCode">
+        <value xml:lang="en">Alt Forum Code</value>
+    </property>
+    <property key="ImageManagementAltForumThumbnail">
+        <value xml:lang="en">Alt Forum Thumbnail</value>
+    </property>
     <property key="ImageManagementApplication">
         <value xml:lang="en">Image Management Application</value>
         <value xml:lang="th">โปรแกรมจัดการรูปภาพ</value>
     </property>
-    <property key="ImageRecentlyApproved">
-        <value xml:lang="en">Recently Approved</value>
-        <value xml:lang="th">รูปภาพยืนยันล่าสุด</value>
+    <property key="ImageManamentApprove">
+        <value xml:lang="de">Bestätigen</value>
+        <value xml:lang="en">Approve</value>
+        <value xml:lang="th">อนุมัติ</value>
+    </property>
+    <property key="ImageManamentApprovedDate">
+        <value xml:lang="en">Approved Date</value>
+        <value xml:lang="th">วันที่อนุมัติ</value>
+    </property>
+    <property key="ImageManagementCaption">
+        <value xml:lang="en">Caption</value>
+        <value xml:lang="th">คำอธิบายภาพ</value>
+    </property>
+    <property key="ImageManagementChooseExistFrame">
+        <value xml:lang="en">Choose Exist Frame</value>
+        <value xml:lang="th">เลือกกรอกรูปภาพที่มีอยู่</value>
+    </property>
+    <property key="ImageManagementChooseImageToReplace">
+        <value xml:lang="en">Choose Image to Replace</value>
+        <value xml:lang="th">เลือกรูปภาพสำหรับแทนที่</value>
+    </property>
+    <property key="ImageManagementChooseProductID">
+        <value xml:lang="en">Choose Product ID</value>
+        <value xml:lang="th">เลือกรหัสสินค้า</value>
+    </property>
+    <property key="ImageManagementChooseReplacementImage">
+        <value xml:lang="en">Choose Replacement Image</value>
+        <value xml:lang="th">เลือกรูปภาพที่จะแทนที่</value>
+    </property>
+    <property key="ImageManagementCrop">
+        <value xml:lang="en">Crop</value>
+        <value xml:lang="th">ตัดรูปภาพ</value>
+    </property>
+    <property key="ImageManagementDefaultImage">
+        <value xml:lang="en">Default Image</value>
+    </property>
+    <property key="ImageManagementDirectLink">
+        <value xml:lang="en">Direct Link</value>
+        <value xml:lang="th">เชื่อมโยงโดยตรง</value>
+    </property>
+    <property key="ImageManagementFrame">
+        <value xml:lang="en">Frame</value>
+        <value xml:lang="th">กรอบรูปภาพ</value>
     </property>
-    <property key="ImageRejected">
-        <value xml:lang="en">Rejected</value>
-        <value xml:lang="th">ปฏิเสธรูปภาพ</value>
+    <property key="ImageManagementForumCode">
+        <value xml:lang="en">Forum Code</value>
+        <value xml:lang="th">รหัสฟอรั่ม</value>
     </property>
-    <property key="ImageRotating">
+    <property key="ImageManagementForumThumbnail">
+        <value xml:lang="en">Forum Thumbnail</value>
+        <value xml:lang="th">รูปภาพย่อฟอรั่ม</value>
+    </property>
+    <property key="ImageManagementGallery">
+        <value xml:lang="de">Gallerie</value>
+        <value xml:lang="en">Gallery</value>
+        <value xml:lang="th">แกลลอรี่</value>
+    </property>
+    <property key="ImageManagementHTMLCode">
+        <value xml:lang="en">HTML Code</value>
+    </property>
+    <property key="ImageManagementHTMLThumbnail">
+        <value xml:lang="en">HTML Thumbnail</value>
+    </property>
+    <property key="ImageManagementImageCropping">
+        <value xml:lang="en">Image Cropping</value>
+        <value xml:lang="th">ตัดรูปภาพ</value>
+    </property>
+    <property key="ImageManagementImageFrames">
+        <value xml:lang="en">Image Frame</value>
+        <value xml:lang="th">กรอบรูปภาพ</value>
+    </property>
+    <property key="ImageManagementImageHeight">
+        <value xml:lang="en">Image Height</value>
+        <value xml:lang="th">ความสูงของรูปภาพ</value>
+    </property>
+    <property key="ImageManagementImageName">
+        <value xml:lang="en">Image Name</value>
+        <value xml:lang="th">ชื่อรูปภาพ</value>
+    </property>
+    <property key="ImageManagementImageRotating">
         <value xml:lang="en">Image Rotating</value>
-        <value xml:lang="th">หมุนภาพ</value>
+        <value xml:lang="th">หมุนรูปภาพ</value>
     </property>
-    <property key="ImageUpload">
-        <value xml:lang="en">Upload</value>
-        <value xml:lang="th">อัพโหลดรูป</value>
+    <property key="ImageManagementImageToReplace">
+        <value xml:lang="en">Image to Replace</value>
+        <value xml:lang="th">ภาพที่จะเปลี่ยน</value>
     </property>
-    <property key="ImageUploadList">
+    <property key="ImageManagementImageUploadList">
         <value xml:lang="en">Image Upload List</value>
         <value xml:lang="th">รูปภาพที่อัพโหลด</value>
     </property>
-    <property key="ImageWatermarking">
+    <property key="ImageManagementImageWatermarking">
         <value xml:lang="en">Image Watermarking</value>
+        <value xml:lang="th">ลายน้ำรูปภาพ</value>
+    </property>
+    <property key="ImageManagementImageWidth">
+        <value xml:lang="en">Image Width</value>
+        <value xml:lang="th">ความกว้างของรูปภาพ</value>
+    </property>
+    <property key="ImageManagementOpacity">
+        <value xml:lang="en">Opacity</value>
+        <value xml:lang="th">ความทึบแสง</value>
+    </property>
+    <property key="ImageManagementRecentlyApproved">
+        <value xml:lang="en">Recently Approved</value>
+        <value xml:lang="th">อนุมัติล่าสุด</value>
+    </property>
+    <property key="ImageManagementRejectedBy">
+        <value xml:lang="en">Rejected By</value>
+        <value xml:lang="th">ผู้ไม่ยอมรับ</value>
+    </property>
+    <property key="ImageManagementRejectedReason">
+        <value xml:lang="en">Rejected Reason</value>
+        <value xml:lang="th">เหตุผลที่ไม่ยอมรับ</value>
+    </property>
+    <property key="ImageManagementReplace">
+        <value xml:lang="en">Replace</value>
+        <value xml:lang="th">แทนที่</value>
+    </property>
+    <property key="ImageManagementReplacementImage">
+        <value xml:lang="en">Replacement Image</value>
+        <value xml:lang="th">เปลี่ยนรูปภาพ</value>
+    </property>
+    <property key="ImageManagementResize">
+        <value xml:lang="en">Resize</value>
+        <value xml:lang="th">เปลี่ยนขนาด</value>
+    </property>
+    <property key="ImageManagementRotate">
+        <value xml:lang="en">Rotate</value>
+        <value xml:lang="th">หมุนรูปภาพ</value>
+    </property>
+    <property key="ImageManagementSetDefault">
+        <value xml:lang="en">Set Default</value>
+    </property>
+    <property key="ImageManagementShare">
+        <value xml:lang="en">Share</value>
+        <value xml:lang="th">แบ่งบัน</value>
+    </property>
+    <property key="ImageManagementShareImage">
+        <value xml:lang="en">Share Image</value>
+        <value xml:lang="th">แบ่งบันรูปภาพ</value>
+    </property>
+    <property key="ImageManagementSortOrder">
+        <value xml:lang="en">Sort Order</value>
+        <value xml:lang="th">เรียงลำดับ</value>
+    </property>
+    <property key="ImageManagementTextColor">
+        <value xml:lang="en">Text Color</value>
+        <value xml:lang="th">สีตัวอักษร</value>
+    </property>
+    <property key="ImageManagementTextSize">
+        <value xml:lang="en">Text Size</value>
+        <value xml:lang="th">ขนาดตัวอักษร</value>
+    </property>
+    <property key="ImageManagementUploadNewFrame">
+        <value xml:lang="en">Upload New Frame</value>
+        <value xml:lang="th">อัพโหลดกรอกรูปภาพใหม่</value>
+    </property>
+    <property key="ImageManagementWatermark">
+        <value xml:lang="en">Watermark</value>
         <value xml:lang="th">ลายน้ำ</value>
     </property>
-    <property key="Manage">
-        <value xml:lang="en">Manage</value>
-        <value xml:lang="th">จัดการ</value>
+    <property key="ImageManagementWelcomeMessage">
+        <value xml:lang="en">Welcome to the Image Management</value>
+        <value xml:lang="th">ยินดีต้อนรับสู้รบบการจัดการรูปภาพ</value>
     </property>
     <property key="MetaDescription">
         <value xml:lang="en">Meta Description</value>
@@ -8032,6 +8153,9 @@
         <value xml:lang="zh">产品导出</value>
         <value xml:lang="zh_TW">產品導出</value>
     </property>
+    <property key="PageTitleProductPricesHistory">
+        <value xml:lang="en">Product Price History</value>
+    </property>
     <property key="PageTitleProductStocktake">
         <value xml:lang="en">Product Stocktake</value>
         <value xml:lang="fr">Inventaire d'un article</value>
@@ -8292,6 +8416,18 @@
         <value xml:lang="zh">账户</value>
         <value xml:lang="zh_TW">帳戶</value>
     </property>
+    <property key="ProductAction">
+        <value xml:lang="en">Action</value>
+    </property>
+    <property key="ProductActionsCategoriesForAction">
+        <value xml:lang="en">Actions Categories For Action</value>
+    </property>
+    <property key="ProductActionForRule">
+        <value xml:lang="en">Action For Rule</value>
+    </property>
+    <property key="ProductActionsProductsForAction">
+        <value xml:lang="en">Actions Products For Action</value>
+    </property>
     <property key="ProductActionType">
         <value xml:lang="de">Aktionstyp</value>
         <value xml:lang="en">Action Type</value>
@@ -8446,6 +8582,12 @@
         <value xml:lang="zh">实际运输</value>
         <value xml:lang="zh_TW">實際運輸</value>
     </property>
+    <property key="ProductAddActionCategory">
+        <value xml:lang="en">Add Action Category</value>
+    </property>
+    <property key="ProductAddActionProducts">
+        <value xml:lang="en">Add Action Products</value>
+    </property>
     <property key="ProductAddAdditionalImages">
         <value xml:lang="en">Add Additional Images</value>
     </property>
@@ -8507,6 +8649,12 @@
         <value xml:lang="en">Add Communication Event</value>
         <value xml:lang="it">Aggiungi evento comunicazione</value>
     </property>
+    <property key="ProductAddConditionCategory">
+        <value xml:lang="en">Add Condition Category</value>
+    </property>
+    <property key="ProductAddConditionProducts">
+        <value xml:lang="en">Add Condition Products</value>
+    </property>
     <property key="ProductAddContentCategory">
         <value xml:lang="de">Inhalt zu Kategorie hinzufügen</value>
         <value xml:lang="en">Add Content to Category</value>
@@ -9095,7 +9243,7 @@
         <value xml:lang="zh">地址</value>
         <value xml:lang="zh_TW">地址</value>
     </property>
-    <property key="ProductAdvancedSearch">
+    <property key="ProductAdvancedSearch">Product
         <value xml:lang="cs">Rozšířené hledání</value>
         <value xml:lang="de">Erweiterte Suche</value>
         <value xml:lang="en">Advanced Search</value>
@@ -10267,19 +10415,6 @@
         <value xml:lang="zh">这个应用程序主要用于维护产品目录相关信息</value>
         <value xml:lang="zh_TW">這個應用程式主要用于維護產品目錄相關資訊</value>
     </property>
-    <property key="ProductCatalogName">
-        <value xml:lang="de">Katalogname</value>
-        <value xml:lang="en">Catalog Name</value>
-        <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="ro">Nume Catalog</value>
-        <value xml:lang="ru">Имя каталога</value>
-        <value xml:lang="th">ชื่อหมวดหมู่</value>
-        <value xml:lang="zh">目录名称</value>
-        <value xml:lang="zh_TW">目錄名稱</value>
-    </property>
     <property key="ProductCatalogNameId">
         <value xml:lang="de">Katalogname [ID]</value>
         <value xml:lang="en">Catalog Name [Id]</value>
@@ -10301,6 +10436,9 @@
         <value xml:lang="en">Security Error: to run ${resourceDescription} you must have the CATALOG_DELETE or CATALOG_ADMIN permission</value>
         <value xml:lang="it">Errore di sicurezza: per eseguire ${resourceDescription} tu devi avere il permesso CATALOG_DELETE o CATALOG_ADMIN</value>
     </property>
+    <property key="ProductCatalogSeoCreate">
+        <value xml:lang="en">Create SEO category/products</value>
+    </property>
     <property key="ProductCatalogUpdatePermissionError">
         <value xml:lang="en">Security Error: to run ${resourceDescription} you must have the CATALOG_UPDATE or CATALOG_ADMIN permission</value>
         <value xml:lang="it">Errore di sicurezza: per eseguire ${resourceDescription} tu devi avere il permesso CATALOG_UPDATE o CATALOG_ADMIN</value>
@@ -10890,6 +11028,9 @@
         <value xml:lang="zh">组件</value>
         <value xml:lang="zh_TW">元件</value>
     </property>
+    <property key="ProductCondition">
+        <value xml:lang="en">Condition</value>
+    </property>
     <property key="ProductConditions">
         <value xml:lang="de">Bedingungen</value>
         <value xml:lang="en">Conditions</value>
@@ -10907,11 +11048,23 @@
         <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="ProductConditionsCategoriesForCondition">
+        <value xml:lang="en">Conditions Categories For Condition</value>
+    </property>
+    <property key="ProductConditionsForRule">
+        <value xml:lang="en">Conditions For Rule</value>
+    </property>
+    <property key="ProductConditionsProductsForCondition">
+        <value xml:lang="en">Conditions Products For Condition</value>
+    </property>
     <property key="ProductConditionsThenActions">
         <value xml:lang="de">Wenn mehrere Bedingungen eingegeben wurde, sind sie logisch UND verknüpft. Daher müssen alle Bedingungen WAHR sein und die Preisregel auszuführen (gleiches für Aktionen)</value>
         <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 key="ProductConditionValue">
+        <value xml:lang="en">Condition Value</value>
+    </property>
     <property key="ProductConfigItem">
         <value xml:lang="de">Konfigurationsposition</value>
         <value xml:lang="en">Config Item</value>
@@ -11306,6 +11459,9 @@
         <value xml:lang="en">Country of Origin</value>
         <value xml:lang="it">Paese di origine</value>
     </property>
+    <property key="ProductCreateAction">
+        <value xml:lang="en">Create Action</value>
+    </property>
     <property key="ProductCreateAProductFeatureCategory">
         <value xml:lang="de">Produktmerkmal Kategorie erstellen</value>
         <value xml:lang="en">Create a Product Feature Category</value>
@@ -11318,6 +11474,9 @@
         <value xml:lang="zh">创建一个产品特征分类</value>
         <value xml:lang="zh_TW">創建一個產品特性分類</value>
     </property>
+    <property key="ProductCreateCondition">
+        <value xml:lang="en">Create Condition</value>
+    </property>
     <property key="ProductCreateInformationNewSupplier">
         <value xml:lang="de">Informationen zu neuem Lieferant erstellen</value>
         <value xml:lang="en">Create information for new supplier</value>
@@ -14087,6 +14246,9 @@
         <value xml:lang="zh"> 日期/时间记录表示当前时间在开始日期之前或结束日期之后。如果开始日期是红色， 那么关联还没有开始；如果结束日期是红色， 那么关联已经过期了 (并且可能应该删除)。</value>
         <value xml:lang="zh_TW"> 日期/時間記錄表示當前時間在開始日期之前或結束日期之後。如果開始日期是紅色， 那麼關聯還沒有開始；如果結束日期是紅色， 那麼關聯已經過期了 (並且可能應該刪除)。</value>
     </property>
+    <property key="ProductHistory">
+        <value xml:lang="en">History</value>
+    </property>
     <property key="ProductHost">
         <value xml:lang="de">Server</value>
         <value xml:lang="en">Host</value>
@@ -16650,6 +16812,12 @@
         <value xml:lang="zh">下次送货</value>
         <value xml:lang="zh_TW">下次送貨</value>
     </property>
+    <property key="ProductNoActionCategories">
+        <value xml:lang="en">No Action Categories</value>
+    </property>
+    <property key="ProductNoActionProducts">
+        <value xml:lang="en">No Action Products</value>
+    </property>
     <property key="ProductNoCategorySpecified">
         <value xml:lang="de">Keine Kategorie ausgewählt</value>
         <value xml:lang="en">No category specified</value>
@@ -16686,6 +16854,12 @@
         <value xml:lang="zh">没有找到下级组</value>
         <value xml:lang="zh_TW">沒有找到下級組</value>
     </property>
+    <property key="ProductNoConditionCategories">
+        <value xml:lang="en">No Condition Categories</value>
+    </property>
+    <property key="ProductNoConditionProducts">
+        <value xml:lang="en">No Condition Products</value>
+    </property>
     <property key="ProductNoDescription">
         <value xml:lang="de">Keine Beschreibung</value>
         <value xml:lang="en">No description</value>
@@ -21333,6 +21507,9 @@
         <value xml:lang="zh">规则名称， 描述， 开始日期， 结束日期</value>
         <value xml:lang="zh_TW">規則名稱， 描述， 開始日期， 結束日期</value>
     </property>
+    <property key="ProductRule">
+        <value xml:lang="en">Rule</value>
+    </property>
     <property key="ProductRules">
         <value xml:lang="de">Regeln</value>
         <value xml:lang="en">Rules</value>
@@ -22913,6 +23090,10 @@
         <value xml:lang="zh">州</value>
         <value xml:lang="zh_TW">州</value>
     </property>
+    <property key="ProductStatus">
+        <value xml:lang="en">Product Status</value>
+        <value xml:lang="th">สถานะสินค้า</value>
+    </property>
     <property key="ProductStatusId">
         <value xml:lang="de">Status ID</value>
         <value xml:lang="en">Status Id</value>
@@ -24173,6 +24354,12 @@
         <value xml:lang="zh">更新产品变型</value>
         <value xml:lang="zh_TW">更新產品變體</value>
     </property>
+    <property key="ProductUpdateRelatedURLContentCategory">
+        <value xml:lang="en">Update Related URL Content for Category</value>
+    </property>
+    <property key="ProductUpdateSEOContentCategory">
+        <value xml:lang="en">Update SEO Content for Category</value>
+    </property>
     <property key="ProductUpdateShipping">
         <value xml:lang="de">Lieferung aktualisieren</value>
         <value xml:lang="en">Update Shipping</value>
@@ -24864,40 +25051,8 @@
         <value xml:lang="zh">你搜索</value>
         <value xml:lang="zh_TW">你所搜索的</value>
     </property>
-    <property key="RecentlyApproved">
-        <value xml:lang="en">Recently Approved</value>
-        <value xml:lang="th">แกลลอรี่</value>
-    </property>
-    <property key="Rejected">
-        <value xml:lang="en">Rejected</value>
-        <value xml:lang="th">ปฏิเสธ</value>
-    </property>
-    <property key="Rename">
-        <value xml:lang="en">Rename</value>
-        <value xml:lang="th">เปลี่ยนชื่อ</value>
-    </property>
-    <property key="Replace">
-        <value xml:lang="en">Replace</value>
-        <value xml:lang="th">แทนที่</value>
-    </property>
-    <property key="Resize">
-        <value xml:lang="en">Resize</value>
-        <value xml:lang="th">เปลี่ยนขนาด</value>
-    </property>
-    <property key="ShareImage">
-        <value xml:lang="en">Share Image</value>
-        <value xml:lang="th">แบ่งบันภาพ</value>
-    </property>
-    <property key="Upload">
-        <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>
-    </property>
 </resource>

Modified: ofbiz/branches/jackrabbit20100709/applications/product/data/ProductTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/data/ProductTypeData.xml?rev=1128865&r1=1128864&r2=1128865&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/product/data/ProductTypeData.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/product/data/ProductTypeData.xml Sun May 29 11:02:09 2011
@@ -231,6 +231,7 @@ under the License.
     <ProductCategoryContentType description="Page Title" hasTable="N" parentTypeId="" prodCatContentTypeId="PAGE_TITLE"/>
     <ProductCategoryContentType description="Meta Keyword" hasTable="N" parentTypeId="" prodCatContentTypeId="META_KEYWORD"/>
     <ProductCategoryContentType description="Meta Description" hasTable="N" parentTypeId="" prodCatContentTypeId="META_DESCRIPTION"/>
+    <ProductCategoryContentType description="Related URL" hasTable="N" parentTypeId="" prodCatContentTypeId="RELATED_URL"/>
 
     <ProductContentType description="Online Access" hasTable="N" parentTypeId="" productContentTypeId="ONLINE_ACCESS"/>
     <ProductContentType description="Digital Download" hasTable="N" parentTypeId="" productContentTypeId="DIGITAL_DOWNLOAD"/>
@@ -278,6 +279,10 @@ under the License.
     <ProductContentType description="Image - Additional View 4 Medium" hasTable="N" parentTypeId="" productContentTypeId="XTRA_IMG_4_MEDIUM"/>
     <ProductContentType description="Image - Additional View 4 Large" hasTable="N" parentTypeId="" productContentTypeId="XTRA_IMG_4_LARGE"/>
     <ProductContentType description="Image - Additional View 4 Detail" hasTable="N" parentTypeId="" productContentTypeId="XTRA_IMG_4_DETAIL"/>
+    <ProductContentType description="Image - Additional View Small" hasTable="N" parentTypeId="" productContentTypeId="XTRA_IMG_L_SMALL"/>
+    <ProductContentType description="Image - Additional View Medium" hasTable="N" parentTypeId="" productContentTypeId="XTRA_IMG_L_MEDIUM"/>
+    <ProductContentType description="Image - Additional View Large" hasTable="N" parentTypeId="" productContentTypeId="XTRA_IMG_L_LARGE"/>
+    <ProductContentType description="Image - Additional View Detail" hasTable="N" parentTypeId="" productContentTypeId="XTRA_IMG_L_DETAIL"/>
     <ProductContentType description="Add To Cart Label" hasTable="N" parentTypeId="" productContentTypeId="ADDTOCART_LABEL"/>
     <ProductContentType description="Add To Cart Image" hasTable="N" parentTypeId="" productContentTypeId="ADDTOCART_IMAGE"/>
     <ProductContentType description="Short Sales Pitch" hasTable="N" parentTypeId="" productContentTypeId="SHORT_SALES_PITCH"/>

Modified: ofbiz/branches/jackrabbit20100709/applications/product/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/entitydef/entitymodel.xml?rev=1128865&r1=1128864&r2=1128865&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/product/entitydef/entitymodel.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/product/entitydef/entitymodel.xml Sun May 29 11:02:09 2011
@@ -4680,11 +4680,12 @@ under the License.
       <field name="agreementId" type="id"></field>
       <field name="agreementItemSeqId" type="id"></field>
       <field name="lastPrice" type="currency-precise"></field>
+      <field name="shippingPrice" type="currency-precise"></field>
       <field name="currencyUomId" type="id"></field>
       <field name="supplierProductName" type="name"></field>
       <field name="supplierProductId" type="id"></field>
       <field name="canDropShip" type="indicator"></field>
-      <field name="supplierCommissionPerc" type="fixed-point"></field>
+      <!-- field name="supplierCommissionPerc" type="fixed-point"><description>Unused field, better use commission run using agreements in accounting</description></field-->
       <field name="comments" type="comment"></field>
       <prim-key field="productId"/>
       <prim-key field="partyId"/>
@@ -4763,10 +4764,9 @@ under the License.
         <field name="productStoreId" type="id-ne"></field>
         <field name="webAnalyticsTypeId" type="id-ne"></field>
         <field name="webSiteId" type="id"></field>
-        <field name="webAnalyticsCode" type="value"></field>
+        <field name="webAnalyticsCode" type="very-long"><description>copy in here the analitics javascript code without the beginning- and end&lt;script&gt; tags</description></field>
         <field name="isEnabled" type="indicator"></field>
         <field name="description" type="description"></field>
-        <field name="contentId" type="id"></field>
         <prim-key field="productStoreId"/>
         <prim-key field="webAnalyticsTypeId"/>      
         <relation type="one" fk-name="WANA_PROD_STORE" rel-entity-name="ProductStore">
@@ -4778,9 +4778,6 @@ under the License.
         <relation type="one" fk-name="WANA_WEBSITE" rel-entity-name="WebSite">
             <key-map field-name="webSiteId"/>
         </relation>
-        <relation type="one-nofk" fk-name="WANA_CNT_CNT" rel-entity-name="Content">
-            <key-map field-name="contentId"/>
-        </relation>
     </entity>
 
     <entity entity-name="WebAnalyticsType" package-name="org.ofbiz.product.catalog"

Modified: ofbiz/branches/jackrabbit20100709/applications/product/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/ofbiz-component.xml?rev=1128865&r1=1128864&r2=1128865&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/product/ofbiz-component.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/product/ofbiz-component.xml Sun May 29 11:02:09 2011
@@ -42,7 +42,6 @@ under the License.
     <entity-resource type="data" reader-name="seed" loader="main" location="data/ApiSchemaDhl.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/DimensionTypeData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/ProductPortletData.xml"/>
-    <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoWebAnalyticsContentData.xml"/>
 
     <service-resource type="model" loader="main" location="servicedef/services.xml"/>
     <service-resource type="model" loader="main" location="servicedef/services_facility.xml"/>

Modified: ofbiz/branches/jackrabbit20100709/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml?rev=1128865&r1=1128864&r2=1128865&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml Sun May 29 11:02:09 2011
@@ -520,4 +520,140 @@ under the License.
         <call-simple-method method-name="catalogPermissionCheck"/>
     </simple-method>
 
+    <simple-method method-name="createMissingCategoryAndProductAltUrls" short-description="create missing category and product alternative urls.">
+        <now-timestamp field="now"/>
+        <field-to-result field="parameters.prodCatalogId" result-name="prodCatalogId"/>
+        <set field="categoriesUpdated" value="0" type="Integer"/>
+        <set field="productsUpdated" value="0" type="Integer"/>
+        <entity-and list="prodCatalogCategoryList" entity-name="ProdCatalogCategory" filter-by-date="false">
+            <field-map field-name="prodCatalogId" from-field="parameters.prodCatalogId"/>
+        </entity-and>
+        
+        <!-- Get all categories -->
+        <call-class-method method-name="newInstance" class-name="javolution.util.FastList" ret-field="parameters.productCategories"/>
+        <iterate entry="prodCatalogCategory" list="prodCatalogCategoryList">
+            <set field="rootProductCategoryId" from-field="prodCatalogCategory.productCategoryId"/>
+            <entity-and list="productCategoryRollupList" entity-name="ProductCategoryRollup" filter-by-date="true">
+                <field-map field-name="parentProductCategoryId" from-field="rootProductCategoryId"/>
+            </entity-and>
+            <set field="parameters.parentProductCategoryId" from-field="rootProductCategoryId"/>
+            <call-simple-method method-name="createMissingCategoryAltUrlInline"/>
+        </iterate>
+        
+        <iterate entry="productCategoryList" list="parameters.productCategories">
+        
+            <!-- Create Product Category Alternative URLs -->
+            <entity-condition list="productCategoryContentAndInfoList" entity-name="ProductCategoryContentAndInfo" filter-by-date="true" use-cache="true">
+                <condition-list combine="and">
+                    <condition-expr field-name="productCategoryId" from-field="productCategoryList.productCategoryId"/>
+                    <condition-expr field-name="prodCatContentTypeId" value="ALTERNATIVE_URL"/>
+                </condition-list>
+                <order-by field-name="-fromDate"/>
+            </entity-condition>
+            
+            <if-empty field="productCategoryContentAndInfoList">
+                <set field="createSimpleTextContentForCategoryCtx.fromDate" from-field="now"/>
+                <set field="createSimpleTextContentForCategoryCtx.prodCatContentTypeId" value="ALTERNATIVE_URL"/>
+                <set field="createSimpleTextContentForCategoryCtx.localeString" value="en"/>
+                <set field="createSimpleTextContentForCategoryCtx.productCategoryId" from-field="productCategoryList.productCategoryId"/>
+                
+                <if-empty field="productCategoryList.categoryName">
+                    <entity-condition list="productCategoryContentList" entity-name="ProductCategoryContentAndInfo" filter-by-date="true" use-cache="true">
+                        <condition-list combine="and">
+                            <condition-expr field-name="productCategoryId" from-field="productCategoryList.productCategoryId"/>
+                            <condition-expr field-name="prodCatContentTypeId" value="CATEGORY_NAME"/>
+                        </condition-list>
+                        <order-by field-name="-fromDate"/>
+                    </entity-condition>
+                    <if-not-empty field="productCategoryContentList">
+                        <first-from-list entry="productCategoryContent" list="productCategoryContentList"/>
+                        <set field="getContentAndDataResourceCtx.contentId" from-field="productCategoryContent.contentId"/>
+                        <call-service service-name="getContentAndDataResource" in-map-name="getContentAndDataResourceCtx">
+                            <result-to-field result-name="resultData" field="resultMap"/>
+                        </call-service>
+                        
+                        <set field="electronicText" from-field="resultMap.electronicText"/>
+                        <set field="createSimpleTextContentForCategoryCtx.text" from-field="electronicText.textData"/>
+                    </if-not-empty>
+                <else>
+                    <set field="createSimpleTextContentForCategoryCtx.text" from-field="productCategoryList.categoryName"/>
+                </else>
+                </if-empty>
+                <if-not-empty field="createSimpleTextContentForCategoryCtx.text">
+                    <call-service service-name="createSimpleTextContentForCategory" in-map-name="`Ctx"/>
+                    <calculate field="$categoriesUpdated">
+                        <calcop operator="add" field="categoriesUpdated">
+                            <number value="1"/>                
+                        </calcop>
+                    </calculate>
+                </if-not-empty>
+                <check-errors/>
+            </if-empty>
+            
+            <!-- Create Product Alternative URLs -->
+            <entity-condition list="productCategoryMemberList" entity-name="ProductCategoryMember" filter-by-date="true" use-cache="true">
+                <condition-list combine="and">
+                    <condition-expr field-name="productCategoryId" from-field="productCategoryList.productCategoryId"/>
+                </condition-list>
+                <order-by field-name="-fromDate"/>
+            </entity-condition>
+            
+            <iterate entry="productCategoryMember" list="productCategoryMemberList">
+                <set field="product.productId" from-field="productCategoryMember.productId"/>
+                <entity-condition list="ProductContentAndInfoList" entity-name="ProductContentAndInfo" filter-by-date="true" use-cache="true">
+                    <condition-list combine="and">
+                        <condition-expr field-name="productId" from-field="product.productId"/>
+                        <condition-expr field-name="productContentTypeId" value="ALTERNATIVE_URL"/>
+                    </condition-list>
+                    <order-by field-name="-fromDate"/>
+                </entity-condition>
+                
+                <if-empty field="ProductContentAndInfoList">
+                    <entity-one value-field="productMap" entity-name="Product">
+                        <field-map field-name="productId" from-field="product.productId"/>
+                    </entity-one>
+                    <set field="createSimpleTextContentForProductCtx.fromDate" from-field="now"/>
+                    <set field="createSimpleTextContentForProductCtx.productContentTypeId" value="ALTERNATIVE_URL"/>
+                    <set field="createSimpleTextContentForProductCtx.localeString" value="en"/>
+                    <set field="createSimpleTextContentForProductCtx.productId" from-field="product.productId"/>
+                    <if-empty field="productMap.internalName">
+                       <set field="createSimpleTextContentForProductCtx.text" from-field="productMap.productName"/>
+                    <else>
+                       <set field="createSimpleTextContentForProductCtx.text" from-field="productMap.internalName"/>
+                    </else>
+                    </if-empty>
+                    <if-not-empty field="createSimpleTextContentForProductCtx.text">
+                        <call-service service-name="createSimpleTextContentForProduct" in-map-name="createSimpleTextContentForProductCtx"/>
+                        <calculate field="$productsUpdated">
+                            <calcop operator="add" field="productsUpdated">
+                                <number value="1"/>                
+                            </calcop>
+                        </calculate>
+                    </if-not-empty>
+                    <check-errors/>
+                </if-empty>
+            </iterate>
+        </iterate>
+        <set field="categoriesUpdatedMessage" value="Categories updated: ${categoriesUpdated}"/>
+        <field-to-list list="successMessageList" field="categoriesUpdatedMessage"/>
+        <set field="productsUpdatedMessage" value="Products updated: ${productsUpdated}"/>
+        <field-to-list list="successMessageList" field="productsUpdatedMessage"/>
+    </simple-method>
+    <simple-method method-name="createMissingCategoryAltUrlInline" short-description="create missing category alternative inline">
+        <entity-and list="productCategoryRollups" entity-name="ProductCategoryRollup" filter-by-date="true">
+            <field-map field-name="parentProductCategoryId" from-field="parameters.parentProductCategoryId"/>
+        </entity-and>
+        <iterate entry="productCategoryRollup" list="productCategoryRollups">
+            <!-- append product category to list -->
+            <entity-one value-field="productCategory" entity-name="ProductCategory">
+                <field-map field-name="productCategoryId" from-field="productCategoryRollup.productCategoryId"/>
+            </entity-one>
+            <field-to-list list="parameters.productCategories" field="productCategory"/>
+            
+            <!-- find rollup product categories -->
+            <set field="parameters.parentProductCategoryId" from-field="productCategoryRollup.productCategoryId"/>
+            <call-simple-method method-name="createMissingCategoryAltUrlInline"/>
+            <check-errors/>
+        </iterate>
+    </simple-method>
 </simple-methods>

Modified: ofbiz/branches/jackrabbit20100709/applications/product/script/org/ofbiz/product/category/CategoryContentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/script/org/ofbiz/product/category/CategoryContentServices.xml?rev=1128865&r1=1128864&r2=1128865&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/product/script/org/ofbiz/product/category/CategoryContentServices.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/product/script/org/ofbiz/product/category/CategoryContentServices.xml Sun May 29 11:02:09 2011
@@ -70,7 +70,7 @@ under the License.
         <set-service-fields service-name="updateSimpleTextContent" map="parameters" to-map="updateSimpleText"/>
         <call-service service-name="updateSimpleTextContent" in-map-name="updateSimpleText"/>
     </simple-method>
-    <simple-method method-name="updateContentSEOForCategory" short-description="Update Category SEO">
+    <simple-method method-name="updateContentSEOForCategory" short-description="Update SEO Content For Product Category">
         <if-not-empty field="parameters.title">
             <entity-and list="productCategoryContents" entity-name="ProductCategoryContentAndInfo">
                 <field-map field-name="productCategoryId" from-field="parameters.productCategoryId"/>
@@ -138,4 +138,49 @@ under the License.
             </if-not-empty>
         </if-not-empty>
     </simple-method>
+    <simple-method method-name="createRelatedUrlContentForCategory" short-description="Create Related URL Content For Product Category">
+        <set field="dataResource.dataResourceName" from-field="parameters.title"/>
+        <set field="dataResource.dataResourceTypeId" value="URL_RESOURCE"/>
+        <set field="dataResource.mimeTypeId" value="text/plain"/>
+        <set field="url" value="${groovy: temp = parameters.url;
+            temp = temp.trim();
+            if(temp.indexOf(&quot;http://&quot;) == 0) return temp;
+            if(temp.indexOf(&quot;https://&quot;) == 0) return temp;
+            if(temp.indexOf(&quot;http://&quot;) != 0) return &quot;http://&quot; + temp;
+        }" type="String"/>
+        <set field="dataResource.objectInfo" from-field="url"/>
+        <set field="dataResource.localeString" from-field="parameters.localeString"/>
+        <call-service service-name="createDataResource" in-map-name="dataResource">
+            <result-to-field result-name="dataResourceId" field="parameters.dataResourceId"/>
+        </call-service>
+        
+        <set field="content.contentTypeId" value="DOCUMENT"/>
+        <set field="content.dataResourceId" from-field="parameters.dataResourceId"/>
+        <set field="content.contentName" from-field="parameters.title"/>
+        <set field="content.description" from-field="parameters.description"/>
+        <set field="content.localeString" from-field="parameters.localeString"/>
+        <set field="content.createdByUserLogin" from-field="userLogin.userLoginId"/>
+        <call-service service-name="createContent" in-map-name="content">
+            <result-to-field result-name="contentId" field="parameters.contentId"/>
+        </call-service>
+        
+        <set-service-fields service-name="createCategoryContent" map="parameters" to-map="createCategoryContentMap"/>
+        <call-service service-name="createCategoryContent" in-map-name="createCategoryContentMap"/>
+    </simple-method>
+    <simple-method method-name="updateRelatedUrlContentForCategory" short-description="Update Related URL Content For Product Category">
+        <set-service-fields service-name="updateCategoryContent" map="parameters" to-map="updateCategoryContent"/>
+        <call-service service-name="updateCategoryContent" in-map-name="updateCategoryContent"/>
+        
+        <set field="dataResource.dataResourceId" from-field="parameters.dataResourceId"/>
+        <set field="dataResource.dataResourceName" from-field="parameters.title"/>
+        <set field="dataResource.objectInfo" from-field="parameters.url"/>
+        <set field="dataResource.localeString" from-field="parameters.localeString"/>
+        <call-service service-name="updateDataResource" in-map-name="dataResource"/>
+        
+        <set field="updateContent.contentId" from-field="parameters.contentId"/>
+        <set field="updateContent.contentName" from-field="parameters.title"/>
+        <set field="updateContent.description" from-field="parameters.description"/>
+        <set field="updateContent.localeString" from-field="parameters.localeString"/>
+        <call-service service-name="updateContent" in-map-name="updateContent"/>
+    </simple-method>
 </simple-methods>

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=1128865&r1=1128864&r2=1128865&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 Sun May 29 11:02:09 2011
@@ -46,14 +46,13 @@ 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">
+            <!--<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"/>
+            <store-value value-field="product"/>-->
         </if-not-empty>
     </simple-method>
 </simple-methods>

Modified: ofbiz/branches/jackrabbit20100709/applications/product/script/org/ofbiz/product/imagemanagement/ImageManagementServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/script/org/ofbiz/product/imagemanagement/ImageManagementServices.xml?rev=1128865&r1=1128864&r2=1128865&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/product/script/org/ofbiz/product/imagemanagement/ImageManagementServices.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/product/script/org/ofbiz/product/imagemanagement/ImageManagementServices.xml Sun May 29 11:02:09 2011
@@ -127,27 +127,41 @@ under the License.
     </simple-method>
   
     <simple-method method-name="removeProductContentAndImageFile" short-description="Remove Content From Product and Image File">
-        <entity-and list="contentAssocs" entity-name="ContentAssoc">
+        <entity-and entity-name="ProductContent" list="checkDefaultImage">
+            <field-map field-name="productId" from-field="parameters.productId"/>
             <field-map field-name="contentId" from-field="parameters.contentId"/>
-            <field-map field-name="contentAssocTypeId" value="IMAGE_THUMBNAIL"/>
+            <field-map field-name="productContentTypeId" value="DEFAULT_IMAGE"/>
         </entity-and>
-        <if-not-empty field="contentAssocs">
-            <iterate entry="contentAssoc" list="contentAssocs">
-                <remove-value value-field="contentAssoc"/>
-                
-                <set field="removeContent.contentId" from-field="contentAssoc.contentIdTo"/>
-                <set field="removeContent.productId" from-field="parameters.productId"/>
-                <call-service service-name="removeProductContentForImageManagement" in-map-name="removeContent"/>
-            </iterate>
-        </if-not-empty>
-        
-        <make-value value-field="lookupPKMap" entity-name="ProductContent"/>
-        <set-pk-fields map="parameters" value-field="lookupPKMap"/>
-        <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
-        <remove-value value-field="lookedUpValue"/>
-        <set field="removeContent.contentId" from-field="parameters.contentId"/>
-        <set field="removeContent.productId" from-field="parameters.productId"/>
-        <call-service service-name="removeProductContentForImageManagement" in-map-name="removeContent"/>
+        <if-empty field="checkDefaultImage">
+            <entity-and list="contentAssocs" entity-name="ContentAssoc">
+                <field-map field-name="contentId" from-field="parameters.contentId"/>
+                <field-map field-name="contentAssocTypeId" value="IMAGE_THUMBNAIL"/>
+            </entity-and>
+            <if-not-empty field="contentAssocs">
+                <iterate entry="contentAssoc" list="contentAssocs">
+                    <remove-value value-field="contentAssoc"/>
+                    
+                    <set field="removeContent.contentId" from-field="contentAssoc.contentIdTo"/>
+                    <set field="removeContent.productId" from-field="parameters.productId"/>
+                    <call-service service-name="removeProductContentForImageManagement" in-map-name="removeContent"/>
+                </iterate>
+            </if-not-empty>
+            
+            <make-value value-field="lookupPKMap" entity-name="ProductContent"/>
+            <set-pk-fields map="parameters" value-field="lookupPKMap"/>
+            <find-by-primary-key map="lookupPKMap" value-field="lookedUpValue"/>
+            <remove-value value-field="lookedUpValue"/>
+            <set field="removeContent.contentId" from-field="parameters.contentId"/>
+            <set field="removeContent.productId" from-field="parameters.productId"/>
+            <call-service service-name="removeProductContentForImageManagement" in-map-name="removeContent"/>
+        <else>
+            <add-error>
+                <fail-property resource="ProductErrorUiLabels" property="ImageManagementErrorRmoveDefaultImage"/>
+            </add-error>
+            <log level="error" message="Cannot remove image contentId ${parameters.contentId}"/>
+            <check-errors/>
+        </else>
+        </if-empty>
     </simple-method>
     
     <simple-method method-name="removeProductContentForImageManagement" short-description="Remove Content From Product">

Modified: ofbiz/branches/jackrabbit20100709/applications/product/script/org/ofbiz/product/product/ProductContentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/script/org/ofbiz/product/product/ProductContentServices.xml?rev=1128865&r1=1128864&r2=1128865&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/product/script/org/ofbiz/product/product/ProductContentServices.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/product/script/org/ofbiz/product/product/ProductContentServices.xml Sun May 29 11:02:09 2011
@@ -78,6 +78,8 @@ under the License.
         <set-service-fields service-name="persistContentAndAssoc" map="parameters" to-map="persistContentAndAssoc"/>
         <set field="persistContentAndAssoc.contentTypeId" value="DOCUMENT"/>
         <set field="persistContentAndAssoc.dataResourceTypeId" value="IMAGE_OBJECT"/>
+        <set field="persistContentAndAssoc.contentName" from-field="parameters._imageData_fileName"/>
+        <set field="persistContentAndAssoc.mimeTypeId" from-field="parameters._imageData_contentType"/>
         <call-service service-name="persistContentAndAssoc" in-map-name="persistContentAndAssoc" break-on-error="true" >
             <result-to-field result-name="contentId" field="createProductContent.contentId"/>
         </call-service>

Propchange: ofbiz/branches/jackrabbit20100709/applications/product/script/org/ofbiz/product/test/InventoryTests.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun May 29 11:02:09 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-1096699
+/ofbiz/trunk/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:962442-1128853

Modified: ofbiz/branches/jackrabbit20100709/applications/product/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/servicedef/services.xml?rev=1128865&r1=1128864&r2=1128865&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/product/servicedef/services.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/product/servicedef/services.xml Sun May 29 11:02:09 2011
@@ -972,13 +972,38 @@ under the License.
 
     <service name="updateContentSEOForCategory" engine="simple"
             location="component://product/script/org/ofbiz/product/category/CategoryContentServices.xml" invoke="updateContentSEOForCategory" auth="true">
-        <description>Update Category SEO</description>
+        <description>Update SEO Content For Product Category</description>
         <attribute name="productCategoryId" mode="IN" type="String" optional="false"/>
         <attribute name="title" mode="IN" type="String" optional="true"/>
         <attribute name="metaKeyword" mode="IN" type="String" optional="true"/>
         <attribute name="metaDescription" mode="IN" type="String" optional="true"/>
     </service>
 
+    <service name="createRelatedUrlContentForCategory" engine="simple" default-entity-name="ProductCategoryContent"
+            location="component://product/script/org/ofbiz/product/category/CategoryContentServices.xml" invoke="createRelatedUrlContentForCategory" auth="true">
+        <description>Create Related URL Content For Product Category</description>
+        <auto-attributes include="pk" mode="IN" optional="false"/>
+        <auto-attributes include="nonpk" mode="IN" optional="true"/>
+        <attribute name="title" type="String" mode="IN" optional="false"/>
+        <attribute name="description" type="String" mode="IN" optional="false"/>
+        <attribute name="url" type="String" mode="IN" optional="false"/>
+        <attribute name="localeString" type="String" mode="IN" optional="true"/>
+        <override name="contentId" optional="true"/>
+        <override name="fromDate" optional="true"/>
+    </service>
+    <service name="updateRelatedUrlContentForCategory" engine="simple" default-entity-name="ProductCategoryContent"
+            location="component://product/script/org/ofbiz/product/category/CategoryContentServices.xml" invoke="updateRelatedUrlContentForCategory" auth="true">
+        <description>Update Related URL Content For Product Category</description>
+        <auto-attributes include="pk" mode="IN" optional="false"/>
+        <auto-attributes include="nonpk" mode="IN" optional="true"/>
+        <attribute name="contentId" type="String" mode="IN" optional="false"/>
+        <attribute name="dataResourceId" type="String" mode="IN" optional="false"/>
+        <attribute name="title" type="String" mode="IN" optional="true"/>
+        <attribute name="description" type="String" mode="IN" optional="true"/>
+        <attribute name="url" type="String" mode="IN" optional="true"/>
+        <attribute name="localeString" type="String" mode="IN" optional="true"/>
+    </service>
+
     <!-- ProductFeatureDataResource services -->
     <service name="createProductFeatureDataResource" default-entity-name="ProductFeatureDataResource" engine="simple"
             location="component://product/script/org/ofbiz/product/product/ProductContentServices.xml" invoke="createProductFeatureDataResource" auth="true">
@@ -1582,4 +1607,10 @@ under the License.
         <attribute name="productCategoryId" mode="OUT" type="String" optional="true"/>
     </service>
     
+    <!-- Alternative URLs -->
+    <service name="createMissingCategoryAndProductAltUrls" engine="simple"
+                location="component://product/script/org/ofbiz/product/catalog/CatalogServices.xml" invoke="createMissingCategoryAndProductAltUrls" auth="true" use-transaction="false">
+        <description>Create missing Category and Product Alternative URLs</description>
+        <attribute name="prodCatalogId" mode="INOUT" type="String" optional="false"/>
+    </service>
 </services>

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=1128865&r1=1128864&r2=1128865&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/product/servicedef/services_pricepromo.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/product/servicedef/services_pricepromo.xml Sun May 29 11:02:09 2011
@@ -38,6 +38,7 @@ under the License.
         <attribute name="quantity" type="BigDecimal" mode="IN" optional="true"/>
         <attribute name="amount" type="BigDecimal" mode="IN" optional="true"/>
         <attribute name="currencyUomId" type="String" mode="IN" optional="true"/>
+        <attribute name="currencyUomIdTo" type="String" mode="IN" optional="true"/>
         <attribute name="productPricePurposeId" type="String" mode="IN" optional="true"><!-- defaults to PURCHASE --></attribute>
         <attribute name="termUomId" type="String" mode="IN" optional="true"><!-- if specified ProductPrice records will be filtered by this, ensures for purposes like recurring prices that only the recurring term desired is taken into consideration --></attribute>
         <attribute name="autoUserLogin" type="org.ofbiz.entity.GenericValue" mode="IN" optional="true"/>


Free forum by Nabble Edit this page