svn commit: r1188359 - in /ofbiz/trunk/applications/order: config/OrderUiLabels.xml widget/ordermgr/OrderForms.xml widget/ordermgr/ReturnForms.xml

[erwan]

Author: erwan
Date: Mon Oct 24 20:29:36 2011
New Revision: 1188359

URL: http://svn.apache.org/viewvc?rev=1188359&view=rev
Log:
Adding new uiLabel OrderChangedByUser, and adding uilabels when missing in OrderQuantityHistory, OrderUnitPriceHistory, OrderShipmentMethodHistory and ReturnAndReceivedQuantityHistory forms

Modified:
    ofbiz/trunk/applications/order/config/OrderUiLabels.xml
    ofbiz/trunk/applications/order/widget/ordermgr/OrderForms.xml
    ofbiz/trunk/applications/order/widget/ordermgr/ReturnForms.xml

Modified: ofbiz/trunk/applications/order/config/OrderUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderUiLabels.xml?rev=1188359&r1=1188358&r2=1188359&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/config/OrderUiLabels.xml (original)
+++ ofbiz/trunk/applications/order/config/OrderUiLabels.xml Mon Oct 24 20:29:36 2011
@@ -2279,6 +2279,10 @@
         <value xml:lang="zh">纸箱</value>
         <value xml:lang="zh_TW">紙箱</value>
     </property>
+    <property key="OrderChangedByUser">
+        <value xml:lang="en">Changed by user</value>
+        <value xml:lang="fr">Par l'utilisateur</value>
+    </property>
     <property key="OrderCheckout">
         <value xml:lang="cs">Objednávka</value>
         <value xml:lang="de">Bestellung</value>

Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderForms.xml?rev=1188359&r1=1188358&r2=1188359&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/OrderForms.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/OrderForms.xml Mon Oct 24 20:29:36 2011
@@ -151,9 +151,9 @@ under the License.
 
     <form name="OrderShipmentMethodHistory" type="list" list-name="orderShipmentHistories"
             odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
-        <field name="shipmentMethod"><display/></field>
-        <field name="changedDate"><display/></field>
-        <field name="changedByUser"><display/></field>
+        <field name="shipmentMethod" title="${uiLabelMap.ProductShipmentMethod}"><display/></field>
+        <field name="changedDate" title="${uiLabelMap.CommonDate}"><display/></field>
+        <field name="changedByUser" title="${uiLabelMap.OrderChangedByUser}"><display/></field>
     </form>
 
     <form name="OrderUnitPriceHistory" type="list" list-name="orderUnitPriceHistories"
@@ -161,8 +161,8 @@ under the License.
         <field name="productId"><display/></field>
         <field name="oldValue"><display type="currency"/></field>
         <field name="newValue"><display type="currency"/></field>
-        <field name="changedDate"><display/></field>
-        <field name="changedByUser"><display/></field>
+        <field name="changedDate" title="${uiLabelMap.CommonDate}"><display/></field>
+        <field name="changedByUser" title="${uiLabelMap.OrderChangedByUser}"><display/></field>
     </form>
 
     <form name="OrderQuantityHistory" type="list" list-name="orderQuantityHistories"
@@ -170,8 +170,8 @@ under the License.
         <field name="productId"><display/></field>
         <field name="oldValue"><display/></field>
         <field name="newValue"><display/></field>
-        <field name="changedDate"><display/></field>
-        <field name="changedByUser"><display/></field>
+        <field name="changedDate" title="${uiLabelMap.CommonDate}"><display/></field>
+        <field name="changedByUser" title="${uiLabelMap.OrderChangedByUser}"><display/></field>
     </form>
     
     <!-- Forms Specific to portlet -->

Modified: ofbiz/trunk/applications/order/widget/ordermgr/ReturnForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/ReturnForms.xml?rev=1188359&r1=1188358&r2=1188359&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/ReturnForms.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/ReturnForms.xml Mon Oct 24 20:29:36 2011
@@ -198,7 +198,7 @@ under the License.
         <field name="returnId"><display description="${returnId}"/></field>
         <field name="oldValueText"><display/></field>
         <field name="newValueText"><display/></field>
-        <field name="changedDate"><display/></field>
+        <field name="changedDate" title="${uiLabelMap.CommonDate}"><display/></field>
         <field name="changedByInfo" title="${uiLabelMap.FormFieldTitle_modifiedByUserLoginId}"><display/></field>
     </form>
     <form name="ReturnReasonHistory" type="list" list-name="orderReturnItemHistories"