[OFBiz] SVN: r5921 - in trunk/applications/product: entitydef src/org/ofbiz/shipment/shipment

[jaz at svn.ofbiz.org]

Author: jaz
Date: 2005-10-06 14:24:09 -0500 (Thu, 06 Oct 2005)
New Revision: 5921

Modified:
   trunk/applications/product/entitydef/entitymodel_odbc.xml
   trunk/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java
Log:
changed PK back to shipmentId on the ODBC tables; order#/shipGrp is not unique enough. Fixed country field (was putting in state)


Modified: trunk/applications/product/entitydef/entitymodel_odbc.xml
===================================================================
--- trunk/applications/product/entitydef/entitymodel_odbc.xml	2005-10-06 10:41:59 UTC (rev 5920)
+++ trunk/applications/product/entitydef/entitymodel_odbc.xml	2005-10-06 19:24:09 UTC (rev 5921)
@@ -54,21 +54,19 @@
     <entity entity-name="OdbcPackageOut"
             package-name="org.ofbiz.odbc.shipment"
             title="Shipment Package Out Integration Entity">
-      <field name="orderInfoKey" type="id-vlong"></field>
       <field name="shipmentId" type="id-ne"></field>
       <field name="shipmentPackageSeqId" type="id-ne"></field>
       <field name="orderId" type="id"></field>
       <field name="shipGroupSeqId" type="id"></field>
       <field name="shipmentBoxTypeId" type="id"></field>
       <field name="weight" type="floating-point"></field>
-      <prim-key field="orderInfoKey"/>
+      <prim-key field="shipmentId"/>
       <prim-key field="shipmentPackageSeqId"/>
     </entity>
 
     <entity entity-name="OdbcShipmentOut"
             package-name="org.ofbiz.odbc.shipment"
             title="Shipment Out Integration Entity">
-      <field name="orderInfoKey" type="id-vlong"></field>
       <field name="shipmentId" type="id-ne"></field>
       <field name="partyId" type="id"></field>
       <field name="orderId" type="id"></field>
@@ -88,7 +86,7 @@
       <field name="stateProvinceGeoId" type="id"></field>
       <field name="numberOfPackages" type="numeric"></field>
       <field name="handlingInstructions" type="long-varchar"></field>
-      <prim-key field="orderInfoKey"/>
+      <prim-key field="shipmentId"/>
     </entity>
 
     <entity entity-name="OdbcPackageIn"
@@ -110,6 +108,6 @@
       <prim-key field="shipmentId"/>
       <prim-key field="shipmentPackageSeqId"/>
       <prim-key field="externalShipmentId"/>
-      <prim-key field="voidIndicator"/>        
+      <prim-key field="voidIndicator"/>
     </entity>
 </entitymodel>
\ No newline at end of file

Modified: trunk/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java
===================================================================
--- trunk/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java	2005-10-06 10:41:59 UTC (rev 5920)
+++ trunk/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java	2005-10-06 19:24:09 UTC (rev 5921)
@@ -590,7 +590,7 @@
             stageShip.set("city", address.get("city"));
             stageShip.set("postalCode", address.get("postalCode"));
             stageShip.set("postalCodeExt", address.get("postalCodeExt"));
-            stageShip.set("countryGeoId", address.get("stateProvinceGeoId"));
+            stageShip.set("countryGeoId", address.get("countryGeoId"));
             stageShip.set("stateProvinceGeoId", address.get("stateProvinceGeoId"));
             stageShip.set("numberOfPackages", new Integer(packages.size()));
             stageShip.set("handlingInstructions", shipment.get("handlingInstructions"));