svn commit: r1098140 - in /ofbiz/trunk/applications/product: config/ProductUiLabels.xml entitydef/entitymodel.xml widget/catalog/ProductForms.xml

Author: jleroux
Date: Sat Apr 30 19:26:20 2011
New Revision: 1098140

URL: http://svn.apache.org/viewvc?rev=1098140&view=rev
Log:
A patch from Sam Hamilton "Add the shipping costs of a product from a supplier per product" https://issues.apache.org/jira/browse/OFBIZ-4269

This patch allows the saving of a shipping price the supplier charges to get the item to you on a per product basis.


Modified:
    ofbiz/trunk/applications/product/config/ProductUiLabels.xml
    ofbiz/trunk/applications/product/entitydef/entitymodel.xml
    ofbiz/trunk/applications/product/widget/catalog/ProductForms.xml

Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.xml?rev=1098140&r1=1098139&r2=1098140&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Sat Apr 30 19:26:20 2011
@@ -3458,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>

Modified: ofbiz/trunk/applications/product/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/entitydef/entitymodel.xml?rev=1098140&r1=1098139&r2=1098140&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/product/entitydef/entitymodel.xml Sat Apr 30 19:26:20 2011
@@ -4680,6 +4680,7 @@ 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>

Modified: ofbiz/trunk/applications/product/widget/catalog/ProductForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ProductForms.xml?rev=1098140&r1=1098139&r2=1098140&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/ProductForms.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/ProductForms.xml Sat Apr 30 19:26:20 2011
@@ -950,6 +950,9 @@ under the License.
         <field name="lastPrice" sort-field="true">
             <display type="currency" currency="${currencyUomId}"/>
         </field>
+        <field name="shippingPrice">
+            <display type="currency" currency="${currencyUomId}"/>
+        </field>
         <field name="editLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
             <hyperlink target="EditProductSuppliers" description="${uiLabelMap.CommonEdit}" also-hidden="false">
                 <parameter param-name="productId"/>