svn commit: r573572 - in /ofbiz/trunk/applications: accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java product/entitydef/entitymodel_shipment.xml

[sichen]

Author: sichen
Date: Fri Sep  7 06:19:34 2007
New Revision: 573572

URL: http://svn.apache.org/viewvc?rev=573572&view=rev
Log:
Change Shipment.additionalShippingChargeDesc to addtlShippingChargeDesc instead of using the col-name attribute

Modified:
    ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java
    ofbiz/trunk/applications/product/entitydef/entitymodel_shipment.xml

Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java?rev=573572&r1=573571&r2=573572&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java (original)
+++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java Fri Sep  7 06:19:34 2007
@@ -1352,7 +1352,7 @@
                         Map createOrderAdjustmentContext = new HashMap();
                         createOrderAdjustmentContext.put("orderId", orderId);
                         createOrderAdjustmentContext.put("orderAdjustmentTypeId", "SHIPPING_CHARGES");
-                        String addtlChargeDescription = shipment.getString("additionalShippingChargeDesc");
+                        String addtlChargeDescription = shipment.getString("addtlShippingChargeDesc");
                         if (UtilValidate.isEmpty(addtlChargeDescription)) {
                             addtlChargeDescription = UtilProperties.getMessage(resource, "AccountingAdditionalShippingChargeForShipment", UtilMisc.toMap("shipmentId", shipmentId), locale);
                         }

Modified: ofbiz/trunk/applications/product/entitydef/entitymodel_shipment.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/entitydef/entitymodel_shipment.xml?rev=573572&r1=573571&r2=573572&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/entitydef/entitymodel_shipment.xml (original)
+++ ofbiz/trunk/applications/product/entitydef/entitymodel_shipment.xml Fri Sep  7 06:19:34 2007
@@ -545,7 +545,7 @@
       <field name="partyIdTo" type="id"></field>
       <field name="partyIdFrom" type="id"></field>
       <field name="additionalShippingCharge" type="currency-amount"></field>
-      <field name="additionalShippingChargeDesc" type="long-varchar" col-name="ADDTL_SHIPPING_CHARGE_DESC"></field>
+      <field name="addtlShippingChargeDesc" type="long-varchar"></field>
       <field name="createdDate" type="date-time"></field>
       <field name="createdByUserLogin" type="id-vlong"></field>
       <field name="lastModifiedDate" type="date-time"></field>

[David E Jones-2]

Thanks Si, this is much cleaner.

-David


[hidden email] wrote:

> Author: sichen
> Date: Fri Sep  7 06:19:34 2007
> New Revision: 573572
>
> URL: http://svn.apache.org/viewvc?rev=573572&view=rev
> Log:
> Change Shipment.additionalShippingChargeDesc to addtlShippingChargeDesc instead of using the col-name attribute
>
> Modified:
>     ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java
>     ofbiz/trunk/applications/product/entitydef/entitymodel_shipment.xml
>
> Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java?rev=573572&r1=573571&r2=573572&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java (original)
> +++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java Fri Sep  7 06:19:34 2007
> @@ -1352,7 +1352,7 @@
>                          Map createOrderAdjustmentContext = new HashMap();
>                          createOrderAdjustmentContext.put("orderId", orderId);
>                          createOrderAdjustmentContext.put("orderAdjustmentTypeId", "SHIPPING_CHARGES");
> -                        String addtlChargeDescription = shipment.getString("additionalShippingChargeDesc");
> +                        String addtlChargeDescription = shipment.getString("addtlShippingChargeDesc");
>                          if (UtilValidate.isEmpty(addtlChargeDescription)) {
>                              addtlChargeDescription = UtilProperties.getMessage(resource, "AccountingAdditionalShippingChargeForShipment", UtilMisc.toMap("shipmentId", shipmentId), locale);
>                          }
>
> Modified: ofbiz/trunk/applications/product/entitydef/entitymodel_shipment.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/entitydef/entitymodel_shipment.xml?rev=573572&r1=573571&r2=573572&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/product/entitydef/entitymodel_shipment.xml (original)
> +++ ofbiz/trunk/applications/product/entitydef/entitymodel_shipment.xml Fri Sep  7 06:19:34 2007
> @@ -545,7 +545,7 @@
>        <field name="partyIdTo" type="id"></field>
>        <field name="partyIdFrom" type="id"></field>
>        <field name="additionalShippingCharge" type="currency-amount"></field>
> -      <field name="additionalShippingChargeDesc" type="long-varchar" col-name="ADDTL_SHIPPING_CHARGE_DESC"></field>
> +      <field name="addtlShippingChargeDesc" type="long-varchar"></field>
>        <field name="createdDate" type="date-time"></field>
>        <field name="createdByUserLogin" type="id-vlong"></field>
>        <field name="lastModifiedDate" type="date-time"></field>
>
>