[pal-cvs 2832] [577] updated db.

svnno****@sourc***** svnno****@sourc*****
2007年 9月 23日 (日) 16:48:27 JST


Revision: 577
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=577
Author:   shinsuke
Date:     2007-09-23 16:48:26 +0900 (Sun, 23 Sep 2007)

Log Message:
-----------
updated db. added order complete page.

Modified Paths:
--------------
    pompei/portlets/pompei-core/trunk/dbflute/schema/project-schema-pompei.xml
    pompei/portlets/pompei-core/trunk/src/main/config/pompei.clay
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiConstants.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsOrderFormBhv.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsOrderProductBhv.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsProductBhv.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsOrderFormDao.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsOrderProductDao.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsProductDao.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderForm.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderProduct.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsProduct.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderFormDbm.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderProductDbm.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/ProductDbm.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsOrderFormCQ.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsOrderProductCQ.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsProductCQ.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsOrderFormCQ.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsOrderProductCQ.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsProductCQ.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/OrderFormCIQ.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/OrderProductCIQ.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/ProductCIQ.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/OrderFormDxo.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/OrderService.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/CustomerServiceImpl.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/OrderServiceImpl.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutConfirmAction.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutConfirmPage.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/PaymentSelectAction.java
    pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/db/create_table.sql
    pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/checkoutComplete.html
    pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/checkoutConfirm.html

Added Paths:
-----------
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutCompleteAction.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutCompletePage.java


-------------- next part --------------
Modified: pompei/portlets/pompei-core/trunk/dbflute/schema/project-schema-pompei.xml
===================================================================
--- pompei/portlets/pompei-core/trunk/dbflute/schema/project-schema-pompei.xml	2007-09-23 07:44:28 UTC (rev 576)
+++ pompei/portlets/pompei-core/trunk/dbflute/schema/project-schema-pompei.xml	2007-09-23 07:48:26 UTC (rev 577)
@@ -392,14 +392,16 @@
             default="GENERATED_BY_DEFAULT"
             javaType="java.math.BigDecimal" name="ORDER_FORM_ID"
             primaryKey="true" required="true" type="BIGINT"/>
+        <column dbType="VARCHAR" javaType="String"
+            name="ORDER_FORM_NUMBER" required="true" size="32" type="VARCHAR"/>
         <column dbType="BIGINT" javaType="java.math.BigDecimal"
-            name="CUSTOMER_ID" required="true" type="BIGINT"/>
+            name="CUSTOMER_ID" type="BIGINT"/>
         <column dbType="CHAR" javaType="String" name="CUSTOMER_GENDER"
             required="true" size="1" type="CHAR"/>
         <column dbType="VARCHAR" javaType="String"
             name="CUSTOMER_FIRSTNAME" required="true" size="32" type="VARCHAR"/>
         <column dbType="VARCHAR" javaType="String"
-            name="CUSTOMER_LASTNAME" size="32" type="VARCHAR"/>
+            name="CUSTOMER_LASTNAME" required="true" size="32" type="VARCHAR"/>
         <column dbType="DATE" javaType="java.util.Date"
             name="CUSTOMER_DAY_OF_BIRTH" required="true" type="DATE"/>
         <column dbType="VARCHAR" javaType="String"
@@ -495,11 +497,13 @@
         <column dbType="CHAR" javaType="String" name="CURRENCY_CODE"
             required="true" size="3" type="CHAR"/>
         <column dbType="DECIMAL" javaType="java.math.BigDecimal"
-            name="DELIVERY_PRICE" required="true" size="14" type="DECIMAL"/>
+            name="DELIVERY_PRICE" size="14" type="DECIMAL"/>
         <column dbType="DECIMAL" javaType="java.math.BigDecimal"
-            name="FINAL_PRICE" required="true" size="14" type="DECIMAL"/>
+            name="SUB_TOTAL_PRICE" size="14" type="DECIMAL"/>
         <column dbType="DECIMAL" javaType="java.math.BigDecimal"
-            name="TAX" required="true" size="14" type="DECIMAL"/>
+            name="TAX" size="14" type="DECIMAL"/>
+        <column dbType="DECIMAL" javaType="java.math.BigDecimal"
+            name="TOTAL_PRICE" required="true" size="14" type="DECIMAL"/>
         <foreign-key foreignTable="CURRENCY" name="FK_ORDERS_6">
             <reference foreign="CURRENCY_ID" local="CURRENCY_ID"/>
         </foreign-key>
@@ -526,9 +530,7 @@
         <column dbType="BIGINT" javaType="java.math.BigDecimal"
             name="PRODUCT_ID" required="true" type="BIGINT"/>
         <column dbType="VARCHAR" javaType="String" name="MODEL"
-            size="32" type="VARCHAR"/>
-        <column dbType="VARCHAR" javaType="String" name="NAME"
-            required="true" size="64" type="VARCHAR"/>
+            size="64" type="VARCHAR"/>
         <column dbType="DECIMAL" javaType="java.math.BigDecimal"
             name="PRICE" required="true" size="15" type="DECIMAL"/>
         <column dbType="DECIMAL" javaType="java.math.BigDecimal"
@@ -682,9 +684,9 @@
             javaType="java.math.BigDecimal" name="PRODUCT_ID"
             primaryKey="true" required="true" type="BIGINT"/>
         <column dbType="VARCHAR" javaType="String" name="MODEL"
-            size="32" type="VARCHAR"/>
+            size="64" type="VARCHAR"/>
         <column dbType="INTEGER" javaType="java.math.BigDecimal"
-            name="QUANTITY" required="true" type="INTEGER"/>
+            name="QUANTITY" type="INTEGER"/>
         <column dbType="DECIMAL" javaType="java.math.BigDecimal"
             name="PRICE" required="true" size="15" type="DECIMAL"/>
         <column dbType="DECIMAL" javaType="java.math.BigDecimal"
@@ -693,8 +695,6 @@
             size="64" type="VARCHAR"/>
         <column dbType="VARCHAR" javaType="String" name="THUMBNAIL"
             size="64" type="VARCHAR"/>
-        <column dbType="INTEGER" javaType="java.math.BigDecimal"
-            name="STOCK" type="INTEGER"/>
         <column dbType="INTEGER" default="0"
             javaType="java.math.BigDecimal" name="ORDERED"
             required="true" type="INTEGER"/>

Modified: pompei/portlets/pompei-core/trunk/src/main/config/pompei.clay
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/config/pompei.clay	2007-09-23 07:44:28 UTC (rev 576)
+++ pompei/portlets/pompei-core/trunk/src/main/config/pompei.clay	2007-09-23 07:48:26 UTC (rev 577)
@@ -1124,8 +1124,15 @@
 <variant type-name-pattern="BIGINT ZEROFILL"/>
 </data-type>
 </column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="CUSTOMER_ID" remarks="" uid="1350e24:11525502e7d:-7f7b">
+<column alias="" auto-increment="false" column-size="32" decimal-digits="0" default-value="" mandatory="true" name="ORDER_FORM_NUMBER" remarks="" uid="ec1f9e:115310155b0:-7fcc">
 <column-description></column-description>
+<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
+<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
+<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
+</data-type>
+</column>
+<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="false" name="CUSTOMER_ID" remarks="" uid="1350e24:11525502e7d:-7f7b">
+<column-description></column-description>
 <data-type jdbc-type="-5" name="BIGINT" selected-variant-pattern="BIGINT">
 <variant type-name-pattern="BIGINT"/>
 <variant precision-max="19" precision-min="0" precision-variable="%n" type-name-pattern="BIGINT(%n)"/>
@@ -1152,7 +1159,7 @@
 <variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
 </data-type>
 </column>
-<column alias="" auto-increment="false" column-size="32" decimal-digits="0" default-value="" mandatory="false" name="CUSTOMER_LASTNAME" remarks="" uid="1350e24:11525502e7d:-7f78">
+<column alias="" auto-increment="false" column-size="32" decimal-digits="0" default-value="" mandatory="true" name="CUSTOMER_LASTNAME" remarks="" uid="1350e24:11525502e7d:-7f78">
 <column-description></column-description>
 <data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
 <variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
@@ -1513,10 +1520,11 @@
 <variant precision-max="255" precision-min="0" precision-variable="%n" type-name-pattern="CHAR(%n) BINARY"/>
 </data-type>
 </column>
-<column alias="" auto-increment="false" column-size="14" decimal-digits="6" default-value="" mandatory="true" name="DELIVERY_PRICE" remarks="" uid="1350e24:11525502e7d:-7f48">
+<column alias="" auto-increment="false" column-size="14" decimal-digits="6" default-value="" mandatory="false" name="DELIVERY_PRICE" remarks="" uid="1350e24:11525502e7d:-7f48">
 <column-description></column-description>
 <data-type jdbc-type="3" name="DECIMAL" selected-variant-pattern="DECIMAL(%p, %s)">
 <variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="DECIMAL(%p, %s)"/>
+<variant type-name-pattern="DECIMAL"/>
 <variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="DECIMAL(%n)"/>
 <variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="DECIMAL(%n) UNSIGNED"/>
 <variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="DECIMAL(%n) UNSIGNED ZEROFILL"/>
@@ -1526,10 +1534,11 @@
 <variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="DECIMAL(%p, %s) ZEROFILL"/>
 </data-type>
 </column>
-<column alias="" auto-increment="false" column-size="14" decimal-digits="6" default-value="" mandatory="true" name="FINAL_PRICE" remarks="" uid="1350e24:11525502e7d:-7f47">
+<column alias="" auto-increment="false" column-size="14" decimal-digits="6" default-value="" mandatory="false" name="SUB_TOTAL_PRICE" remarks="" uid="148ab5c:1152d143877:-7fcc">
 <column-description></column-description>
 <data-type jdbc-type="3" name="DECIMAL" selected-variant-pattern="DECIMAL(%p, %s)">
 <variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="DECIMAL(%p, %s)"/>
+<variant type-name-pattern="DECIMAL"/>
 <variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="DECIMAL(%n)"/>
 <variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="DECIMAL(%n) UNSIGNED"/>
 <variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="DECIMAL(%n) UNSIGNED ZEROFILL"/>
@@ -1539,10 +1548,11 @@
 <variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="DECIMAL(%p, %s) ZEROFILL"/>
 </data-type>
 </column>
-<column alias="" auto-increment="false" column-size="14" decimal-digits="6" default-value="" mandatory="true" name="TAX" remarks="" uid="1350e24:11525502e7d:-7f46">
+<column alias="" auto-increment="false" column-size="14" decimal-digits="6" default-value="" mandatory="false" name="TAX" remarks="" uid="1350e24:11525502e7d:-7f46">
 <column-description></column-description>
 <data-type jdbc-type="3" name="DECIMAL" selected-variant-pattern="DECIMAL(%p, %s)">
 <variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="DECIMAL(%p, %s)"/>
+<variant type-name-pattern="DECIMAL"/>
 <variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="DECIMAL(%n)"/>
 <variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="DECIMAL(%n) UNSIGNED"/>
 <variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="DECIMAL(%n) UNSIGNED ZEROFILL"/>
@@ -1552,6 +1562,20 @@
 <variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="DECIMAL(%p, %s) ZEROFILL"/>
 </data-type>
 </column>
+<column alias="" auto-increment="false" column-size="14" decimal-digits="6" default-value="" mandatory="true" name="TOTAL_PRICE" remarks="" uid="1350e24:11525502e7d:-7f47">
+<column-description></column-description>
+<data-type jdbc-type="3" name="DECIMAL" selected-variant-pattern="DECIMAL(%p, %s)">
+<variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="DECIMAL(%p, %s)"/>
+<variant type-name-pattern="DECIMAL"/>
+<variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="DECIMAL(%n)"/>
+<variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="DECIMAL(%n) UNSIGNED"/>
+<variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="DECIMAL(%n) UNSIGNED ZEROFILL"/>
+<variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="DECIMAL(%n) ZEROFILL"/>
+<variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="DECIMAL(%p, %s) UNSIGNED"/>
+<variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="DECIMAL(%p, %s) UNSIGNED ZEROFILL"/>
+<variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="DECIMAL(%p, %s) ZEROFILL"/>
+</data-type>
+</column>
 </column-list>
 <primary-key alias="" name="SQL070831021755840" remarks="" uid="1350e24:11525502e7d:-7f7d">
 <primary-key-description></primary-key-description>
@@ -1653,20 +1677,13 @@
 <variant type-name-pattern="BIGINT ZEROFILL"/>
 </data-type>
 </column>
-<column alias="" auto-increment="false" column-size="32" decimal-digits="0" default-value="" mandatory="false" name="MODEL" remarks="" uid="1350e24:11525502e7d:-7f3d">
+<column alias="" auto-increment="false" column-size="64" decimal-digits="0" default-value="" mandatory="false" name="MODEL" remarks="" uid="1350e24:11525502e7d:-7f3d">
 <column-description></column-description>
 <data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
 <variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
 <variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
 </data-type>
 </column>
-<column alias="" auto-increment="false" column-size="64" decimal-digits="0" default-value="" mandatory="true" name="NAME" remarks="" uid="1350e24:11525502e7d:-7f3c">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
 <column alias="" auto-increment="false" column-size="15" decimal-digits="4" default-value="" mandatory="true" name="PRICE" remarks="" uid="1350e24:11525502e7d:-7f3b">
 <column-description></column-description>
 <data-type jdbc-type="3" name="DECIMAL" selected-variant-pattern="DECIMAL(%p, %s)">
@@ -2178,14 +2195,14 @@
 <variant type-name-pattern="BIGINT ZEROFILL"/>
 </data-type>
 </column>
-<column alias="" auto-increment="false" column-size="32" decimal-digits="0" default-value="" mandatory="false" name="MODEL" remarks="" uid="1350e24:11525502e7d:-7f07">
+<column alias="" auto-increment="false" column-size="64" decimal-digits="0" default-value="" mandatory="false" name="MODEL" remarks="" uid="1350e24:11525502e7d:-7f07">
 <column-description></column-description>
 <data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
 <variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
 <variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
 </data-type>
 </column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="QUANTITY" remarks="" uid="1350e24:11525502e7d:-7f06">
+<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="false" name="QUANTITY" remarks="" uid="1350e24:11525502e7d:-7f06">
 <column-description></column-description>
 <data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
 <variant type-name-pattern="INTEGER"/>
@@ -2238,19 +2255,6 @@
 <variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
 </data-type>
 </column>
-<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="false" name="STOCK" remarks="" uid="1350e24:11525502e7d:-7f01">
-<column-description></column-description>
-<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
-<variant type-name-pattern="INTEGER"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n)"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) UNSIGNED ZEROFILL"/>
-<variant precision-max="10" precision-min="0" precision-variable="%n" type-name-pattern="INTEGER(%n) ZEROFILL"/>
-<variant type-name-pattern="INTEGER UNSIGNED"/>
-<variant type-name-pattern="INTEGER UNSIGNED ZEROFILL"/>
-<variant type-name-pattern="INTEGER ZEROFILL"/>
-</data-type>
-</column>
 <column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="0" mandatory="true" name="ORDERED" remarks="" uid="1350e24:11525502e7d:-7f00">
 <column-description></column-description>
 <data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiConstants.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiConstants.java	2007-09-23 07:44:28 UTC (rev 576)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiConstants.java	2007-09-23 07:48:26 UTC (rev 577)
@@ -41,7 +41,7 @@
 
     public static final String BANK_PAYMENT_METHOD = "BANK";
 
-    public static final String CARD_PAYMENT_METHOD = "CREDITCARD";
+    public static final String CREDITCARD_PAYMENT_METHOD = "CREDITCARD";
 
     public static final String DELIVERY_ADDRESS_BOOK_ID = "deliveryAddressBookId";
 
@@ -59,11 +59,15 @@
 
     public static final String DELIVERY_METHOD_ID = "deliveryMethodId";
 
-    public static final String CUSTOMERS_BASKET_ID_LIST = "customersBasketIdList";
+    public static final String CUSTOMER_BASKET_ID_LIST = "customersBasketIdList";
 
     public static final BigDecimal ROOT_CATEGORY_ID = new BigDecimal(1);
 
     public static final BigDecimal TRUE_BIGDECIMAL = new BigDecimal(1);
 
     public static final BigDecimal FALSE_BIGDECIMAL = new BigDecimal(0);
+
+    public static final BigDecimal DEFAULT_ORDER_STATUS = new BigDecimal(1);
+
+    public static final BigDecimal DEFAULT_CURRENCY_ID = new BigDecimal(1);
 }

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsOrderFormBhv.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsOrderFormBhv.java	2007-09-23 07:44:28 UTC (rev 576)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsOrderFormBhv.java	2007-09-23 07:48:26 UTC (rev 577)
@@ -30,7 +30,7 @@
  *     ORDER_FORM_ID
  * 
  * [column-property]
- *     ORDER_FORM_ID, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_DAY_OF_BIRTH, CUSTOMER_EMAIL_ADDRESS, CUSTOMER_COMPANY, CUSTOMER_DEPARTMENT, CUSTOMER_STREET_ADDRESS, CUSTOMER_SUBURB, CUSTOMER_CITY, CUSTOMER_STATE, CUSTOMER_POSTCODE, CUSTOMER_COUNTRY_NAME, CUSTOMER_TELEPHONE, CUSTOMER_LOCALE_NAME, DELIVERY_COMPANY, DELIVERY_DEPARTMENT, DELIVERY_FIRSTNAME, DELIVERY_LASTNAME, DELIVERY_STREET_ADDRESS, DELIVERY_SUBURB, DELIVERY_CITY, DELIVERY_STATE, DELIVERY_POSTCODE, DELIVERY_COUNTRY_NAME, DELIVERY_TELEPHONE, DELIVERY_LOCALE_NAME, BILLING_COMPANY, BILLING_DEPARTMENT, BILLING_FIRSTNAME, BILLING_LASTNAME, BILLING_STREET_ADDRESS, BILLING_SUBURB, BILLING_CITY, BILLING_STATE, BILLING_POSTCODE, BILLING_COUNTRY_NAME, BILLING_TELEPHONE, BILLING_LOCALE_NAME, PAYMENT_METHOD_ID, PAYMENT_METHOD_CODE, ORDER_CARD_INFO_ID, DELIVERY_METHOD_ID, DELIVERY_METHOD_CODE, LAST_MODIFIED, ORDER_STATUS_ID, PURCHASED_DATE, FINISHED_DATE, CURRENCY_ID, CURRENCY_CODE, DELIVERY_PRICE, FINAL_PRICE, TAX
+ *     ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_DAY_OF_BIRTH, CUSTOMER_EMAIL_ADDRESS, CUSTOMER_COMPANY, CUSTOMER_DEPARTMENT, CUSTOMER_STREET_ADDRESS, CUSTOMER_SUBURB, CUSTOMER_CITY, CUSTOMER_STATE, CUSTOMER_POSTCODE, CUSTOMER_COUNTRY_NAME, CUSTOMER_TELEPHONE, CUSTOMER_LOCALE_NAME, DELIVERY_COMPANY, DELIVERY_DEPARTMENT, DELIVERY_FIRSTNAME, DELIVERY_LASTNAME, DELIVERY_STREET_ADDRESS, DELIVERY_SUBURB, DELIVERY_CITY, DELIVERY_STATE, DELIVERY_POSTCODE, DELIVERY_COUNTRY_NAME, DELIVERY_TELEPHONE, DELIVERY_LOCALE_NAME, BILLING_COMPANY, BILLING_DEPARTMENT, BILLING_FIRSTNAME, BILLING_LASTNAME, BILLING_STREET_ADDRESS, BILLING_SUBURB, BILLING_CITY, BILLING_STATE, BILLING_POSTCODE, BILLING_COUNTRY_NAME, BILLING_TELEPHONE, BILLING_LOCALE_NAME, PAYMENT_METHOD_ID, PAYMENT_METHOD_CODE, ORDER_CARD_INFO_ID, DELIVERY_METHOD_ID, DELIVERY_METHOD_CODE, LAST_MODIFIED, ORDER_STATUS_ID, PURCHASED_DATE, FINISHED_DATE, CURRENCY_ID, CURRENCY_CODE, DELIVERY_PRICE, SUB_TOTAL_PRICE, TAX, TOTAL_PRICE
  * 
  * [foreign-property]
  *     currency, customer, deliveryMethod, orderStatus, paymentMethod
@@ -1490,6 +1490,7 @@
         final java.util.Set<String> names = sourceMyEntity.getModifiedPropertyNames();
 
         if (names.contains("orderFormId")) { destinationMyEntity.setOrderFormId(sourceMyEntity.getOrderFormId()); }
+        if (names.contains("orderFormNumber")) { destinationMyEntity.setOrderFormNumber(sourceMyEntity.getOrderFormNumber()); }
         if (names.contains("customerId")) { destinationMyEntity.setCustomerId(sourceMyEntity.getCustomerId()); }
         if (names.contains("customerGender")) { destinationMyEntity.setCustomerGender(sourceMyEntity.getCustomerGender()); }
         if (names.contains("customerFirstname")) { destinationMyEntity.setCustomerFirstname(sourceMyEntity.getCustomerFirstname()); }
@@ -1542,8 +1543,9 @@
         if (names.contains("currencyId")) { destinationMyEntity.setCurrencyId(sourceMyEntity.getCurrencyId()); }
         if (names.contains("currencyCode")) { destinationMyEntity.setCurrencyCode(sourceMyEntity.getCurrencyCode()); }
         if (names.contains("deliveryPrice")) { destinationMyEntity.setDeliveryPrice(sourceMyEntity.getDeliveryPrice()); }
-        if (names.contains("finalPrice")) { destinationMyEntity.setFinalPrice(sourceMyEntity.getFinalPrice()); }
+        if (names.contains("subTotalPrice")) { destinationMyEntity.setSubTotalPrice(sourceMyEntity.getSubTotalPrice()); }
         if (names.contains("tax")) { destinationMyEntity.setTax(sourceMyEntity.getTax()); }
+        if (names.contains("totalPrice")) { destinationMyEntity.setTotalPrice(sourceMyEntity.getTotalPrice()); }
 
     }
 

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsOrderProductBhv.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsOrderProductBhv.java	2007-09-23 07:44:28 UTC (rev 576)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsOrderProductBhv.java	2007-09-23 07:48:26 UTC (rev 577)
@@ -28,7 +28,7 @@
  *     ORDER_PRODUCT_ID
  * 
  * [column-property]
- *     ORDER_PRODUCT_ID, ORDER_FORM_ID, PRODUCT_ID, MODEL, NAME, PRICE, FINAL_PRICE, TAX, QUANTITY
+ *     ORDER_PRODUCT_ID, ORDER_FORM_ID, PRODUCT_ID, MODEL, PRICE, FINAL_PRICE, TAX, QUANTITY
  * 
  * [foreign-property]
  *     orderForm, product
@@ -682,7 +682,6 @@
         if (names.contains("orderFormId")) { destinationMyEntity.setOrderFormId(sourceMyEntity.getOrderFormId()); }
         if (names.contains("productId")) { destinationMyEntity.setProductId(sourceMyEntity.getProductId()); }
         if (names.contains("model")) { destinationMyEntity.setModel(sourceMyEntity.getModel()); }
-        if (names.contains("name")) { destinationMyEntity.setName(sourceMyEntity.getName()); }
         if (names.contains("price")) { destinationMyEntity.setPrice(sourceMyEntity.getPrice()); }
         if (names.contains("finalPrice")) { destinationMyEntity.setFinalPrice(sourceMyEntity.getFinalPrice()); }
         if (names.contains("tax")) { destinationMyEntity.setTax(sourceMyEntity.getTax()); }

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsProductBhv.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsProductBhv.java	2007-09-23 07:44:28 UTC (rev 576)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsProductBhv.java	2007-09-23 07:48:26 UTC (rev 577)
@@ -30,7 +30,7 @@
  *     PRODUCT_ID
  * 
  * [column-property]
- *     PRODUCT_ID, MODEL, QUANTITY, PRICE, WEIGHT, IMAGE, THUMBNAIL, STOCK, ORDERED, STATUS, DATE_ADDED, LAST_MODIFIED, DATE_AVAILABLE, TAX_CLASS_ID, MANUFACTURER_ID
+ *     PRODUCT_ID, MODEL, QUANTITY, PRICE, WEIGHT, IMAGE, THUMBNAIL, ORDERED, STATUS, DATE_ADDED, LAST_MODIFIED, DATE_AVAILABLE, TAX_CLASS_ID, MANUFACTURER_ID
  * 
  * [foreign-property]
  *     manufacturer, taxClass
@@ -2293,7 +2293,6 @@
         if (names.contains("weight")) { destinationMyEntity.setWeight(sourceMyEntity.getWeight()); }
         if (names.contains("image")) { destinationMyEntity.setImage(sourceMyEntity.getImage()); }
         if (names.contains("thumbnail")) { destinationMyEntity.setThumbnail(sourceMyEntity.getThumbnail()); }
-        if (names.contains("stock")) { destinationMyEntity.setStock(sourceMyEntity.getStock()); }
         if (names.contains("ordered")) { destinationMyEntity.setOrdered(sourceMyEntity.getOrdered()); }
         if (names.contains("status")) { destinationMyEntity.setStatus(sourceMyEntity.getStatus()); }
         if (names.contains("dateAdded")) { destinationMyEntity.setDateAdded(sourceMyEntity.getDateAdded()); }

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsOrderFormDao.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsOrderFormDao.java	2007-09-23 07:44:28 UTC (rev 576)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsOrderFormDao.java	2007-09-23 07:48:26 UTC (rev 577)
@@ -11,7 +11,7 @@
  *     ORDER_FORM_ID
  * 
  * [column-property]
- *     ORDER_FORM_ID, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_DAY_OF_BIRTH, CUSTOMER_EMAIL_ADDRESS, CUSTOMER_COMPANY, CUSTOMER_DEPARTMENT, CUSTOMER_STREET_ADDRESS, CUSTOMER_SUBURB, CUSTOMER_CITY, CUSTOMER_STATE, CUSTOMER_POSTCODE, CUSTOMER_COUNTRY_NAME, CUSTOMER_TELEPHONE, CUSTOMER_LOCALE_NAME, DELIVERY_COMPANY, DELIVERY_DEPARTMENT, DELIVERY_FIRSTNAME, DELIVERY_LASTNAME, DELIVERY_STREET_ADDRESS, DELIVERY_SUBURB, DELIVERY_CITY, DELIVERY_STATE, DELIVERY_POSTCODE, DELIVERY_COUNTRY_NAME, DELIVERY_TELEPHONE, DELIVERY_LOCALE_NAME, BILLING_COMPANY, BILLING_DEPARTMENT, BILLING_FIRSTNAME, BILLING_LASTNAME, BILLING_STREET_ADDRESS, BILLING_SUBURB, BILLING_CITY, BILLING_STATE, BILLING_POSTCODE, BILLING_COUNTRY_NAME, BILLING_TELEPHONE, BILLING_LOCALE_NAME, PAYMENT_METHOD_ID, PAYMENT_METHOD_CODE, ORDER_CARD_INFO_ID, DELIVERY_METHOD_ID, DELIVERY_METHOD_CODE, LAST_MODIFIED, ORDER_STATUS_ID, PURCHASED_DATE, FINISHED_DATE, CURRENCY_ID, CURRENCY_CODE, DELIVERY_PRICE, FINAL_PRICE, TAX
+ *     ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_DAY_OF_BIRTH, CUSTOMER_EMAIL_ADDRESS, CUSTOMER_COMPANY, CUSTOMER_DEPARTMENT, CUSTOMER_STREET_ADDRESS, CUSTOMER_SUBURB, CUSTOMER_CITY, CUSTOMER_STATE, CUSTOMER_POSTCODE, CUSTOMER_COUNTRY_NAME, CUSTOMER_TELEPHONE, CUSTOMER_LOCALE_NAME, DELIVERY_COMPANY, DELIVERY_DEPARTMENT, DELIVERY_FIRSTNAME, DELIVERY_LASTNAME, DELIVERY_STREET_ADDRESS, DELIVERY_SUBURB, DELIVERY_CITY, DELIVERY_STATE, DELIVERY_POSTCODE, DELIVERY_COUNTRY_NAME, DELIVERY_TELEPHONE, DELIVERY_LOCALE_NAME, BILLING_COMPANY, BILLING_DEPARTMENT, BILLING_FIRSTNAME, BILLING_LASTNAME, BILLING_STREET_ADDRESS, BILLING_SUBURB, BILLING_CITY, BILLING_STATE, BILLING_POSTCODE, BILLING_COUNTRY_NAME, BILLING_TELEPHONE, BILLING_LOCALE_NAME, PAYMENT_METHOD_ID, PAYMENT_METHOD_CODE, ORDER_CARD_INFO_ID, DELIVERY_METHOD_ID, DELIVERY_METHOD_CODE, LAST_MODIFIED, ORDER_STATUS_ID, PURCHASED_DATE, FINISHED_DATE, CURRENCY_ID, CURRENCY_CODE, DELIVERY_PRICE, SUB_TOTAL_PRICE, TAX, TOTAL_PRICE
  * 
  * [foreign-property]
  *     currency, customer, deliveryMethod, orderStatus, paymentMethod
@@ -51,7 +51,7 @@
     public int getCountAll();
 
     /** SQL-Annotation for getListAll(). */
-    public static final String getListAll_SQL = "select ORDER_FORM_ID, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_DAY_OF_BIRTH, CUSTOMER_EMAIL_ADDRESS, CUSTOMER_COMPANY, CUSTOMER_DEPARTMENT, CUSTOMER_STREET_ADDRESS, CUSTOMER_SUBURB, CUSTOMER_CITY, CUSTOMER_STATE, CUSTOMER_POSTCODE, CUSTOMER_COUNTRY_NAME, CUSTOMER_TELEPHONE, CUSTOMER_LOCALE_NAME, DELIVERY_COMPANY, DELIVERY_DEPARTMENT, DELIVERY_FIRSTNAME, DELIVERY_LASTNAME, DELIVERY_STREET_ADDRESS, DELIVERY_SUBURB, DELIVERY_CITY, DELIVERY_STATE, DELIVERY_POSTCODE, DELIVERY_COUNTRY_NAME, DELIVERY_TELEPHONE, DELIVERY_LOCALE_NAME, BILLING_COMPANY, BILLING_DEPARTMENT, BILLING_FIRSTNAME, BILLING_LASTNAME, BILLING_STREET_ADDRESS, BILLING_SUBURB, BILLING_CITY, BILLING_STATE, BILLING_POSTCODE, BILLING_COUNTRY_NAME, BILLING_TELEPHONE, BILLING_LOCALE_NAME, PAYMENT_METHOD_ID, PAYMENT_METHOD_CODE, ORDER_CARD_INFO_ID, DELIVERY_METHOD_ID, DELIVERY_METHOD_CODE, LAST_MODIFIED, ORDER_STATUS_ID, PURCHASED_DATE, FINISHED_DATE, CURRENCY_ID, CURRENCY_CODE, DELIVERY_PRICE, FINAL_PRICE, TAX from ORDER_FORM";
+    public static final String getListAll_SQL = "select ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_DAY_OF_BIRTH, CUSTOMER_EMAIL_ADDRESS, CUSTOMER_COMPANY, CUSTOMER_DEPARTMENT, CUSTOMER_STREET_ADDRESS, CUSTOMER_SUBURB, CUSTOMER_CITY, CUSTOMER_STATE, CUSTOMER_POSTCODE, CUSTOMER_COUNTRY_NAME, CUSTOMER_TELEPHONE, CUSTOMER_LOCALE_NAME, DELIVERY_COMPANY, DELIVERY_DEPARTMENT, DELIVERY_FIRSTNAME, DELIVERY_LASTNAME, DELIVERY_STREET_ADDRESS, DELIVERY_SUBURB, DELIVERY_CITY, DELIVERY_STATE, DELIVERY_POSTCODE, DELIVERY_COUNTRY_NAME, DELIVERY_TELEPHONE, DELIVERY_LOCALE_NAME, BILLING_COMPANY, BILLING_DEPARTMENT, BILLING_FIRSTNAME, BILLING_LASTNAME, BILLING_STREET_ADDRESS, BILLING_SUBURB, BILLING_CITY, BILLING_STATE, BILLING_POSTCODE, BILLING_COUNTRY_NAME, BILLING_TELEPHONE, BILLING_LOCALE_NAME, PAYMENT_METHOD_ID, PAYMENT_METHOD_CODE, ORDER_CARD_INFO_ID, DELIVERY_METHOD_ID, DELIVERY_METHOD_CODE, LAST_MODIFIED, ORDER_STATUS_ID, PURCHASED_DATE, FINISHED_DATE, CURRENCY_ID, CURRENCY_CODE, DELIVERY_PRICE, SUB_TOTAL_PRICE, TAX, TOTAL_PRICE from ORDER_FORM";
 
     /**
      * Get list as all.
@@ -61,7 +61,7 @@
     public java.util.List<OrderForm> getListAll();
 
     /** SQL-Annotation for getEntity(). */
-    public static final String getEntity_SQL = "select ORDER_FORM_ID, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_DAY_OF_BIRTH, CUSTOMER_EMAIL_ADDRESS, CUSTOMER_COMPANY, CUSTOMER_DEPARTMENT, CUSTOMER_STREET_ADDRESS, CUSTOMER_SUBURB, CUSTOMER_CITY, CUSTOMER_STATE, CUSTOMER_POSTCODE, CUSTOMER_COUNTRY_NAME, CUSTOMER_TELEPHONE, CUSTOMER_LOCALE_NAME, DELIVERY_COMPANY, DELIVERY_DEPARTMENT, DELIVERY_FIRSTNAME, DELIVERY_LASTNAME, DELIVERY_STREET_ADDRESS, DELIVERY_SUBURB, DELIVERY_CITY, DELIVERY_STATE, DELIVERY_POSTCODE, DELIVERY_COUNTRY_NAME, DELIVERY_TELEPHONE, DELIVERY_LOCALE_NAME, BILLING_COMPANY, BILLING_DEPARTMENT, BILLING_FIRSTNAME, BILLING_LASTNAME, BILLING_STREET_ADDRESS, BILLING_SUBURB, BILLING_CITY, BILLING_STATE, BILLING_POSTCODE, BILLING_COUNTRY_NAME, BILLING_TELEPHONE, BILLING_LOCALE_NAME, PAYMENT_METHOD_ID, PAYMENT_METHOD_CODE, ORDER_CARD_INFO_ID, DELIVERY_METHOD_ID, DELIVERY_METHOD_CODE, LAST_MODIFIED, ORDER_STATUS_ID, PURCHASED_DATE, FINISHED_DATE, CURRENCY_ID, CURRENCY_CODE, DELIVERY_PRICE, FINAL_PRICE, TAX from ORDER_FORM where ORDER_FORM.ORDER_FORM_ID = /*orderFormId*/null";
+    public static final String getEntity_SQL = "select ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_DAY_OF_BIRTH, CUSTOMER_EMAIL_ADDRESS, CUSTOMER_COMPANY, CUSTOMER_DEPARTMENT, CUSTOMER_STREET_ADDRESS, CUSTOMER_SUBURB, CUSTOMER_CITY, CUSTOMER_STATE, CUSTOMER_POSTCODE, CUSTOMER_COUNTRY_NAME, CUSTOMER_TELEPHONE, CUSTOMER_LOCALE_NAME, DELIVERY_COMPANY, DELIVERY_DEPARTMENT, DELIVERY_FIRSTNAME, DELIVERY_LASTNAME, DELIVERY_STREET_ADDRESS, DELIVERY_SUBURB, DELIVERY_CITY, DELIVERY_STATE, DELIVERY_POSTCODE, DELIVERY_COUNTRY_NAME, DELIVERY_TELEPHONE, DELIVERY_LOCALE_NAME, BILLING_COMPANY, BILLING_DEPARTMENT, BILLING_FIRSTNAME, BILLING_LASTNAME, BILLING_STREET_ADDRESS, BILLING_SUBURB, BILLING_CITY, BILLING_STATE, BILLING_POSTCODE, BILLING_COUNTRY_NAME, BILLING_TELEPHONE, BILLING_LOCALE_NAME, PAYMENT_METHOD_ID, PAYMENT_METHOD_CODE, ORDER_CARD_INFO_ID, DELIVERY_METHOD_ID, DELIVERY_METHOD_CODE, LAST_MODIFIED, ORDER_STATUS_ID, PURCHASED_DATE, FINISHED_DATE, CURRENCY_ID, CURRENCY_CODE, DELIVERY_PRICE, SUB_TOTAL_PRICE, TAX, TOTAL_PRICE from ORDER_FORM where ORDER_FORM.ORDER_FORM_ID = /*orderFormId*/null";
 
     /** Args-Annotation for getEntity(). */
     public static final String getEntity_ARGS = "orderFormId";

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsOrderProductDao.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsOrderProductDao.java	2007-09-23 07:44:28 UTC (rev 576)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsOrderProductDao.java	2007-09-23 07:48:26 UTC (rev 577)
@@ -11,7 +11,7 @@
  *     ORDER_PRODUCT_ID
  * 
  * [column-property]
- *     ORDER_PRODUCT_ID, ORDER_FORM_ID, PRODUCT_ID, MODEL, NAME, PRICE, FINAL_PRICE, TAX, QUANTITY
+ *     ORDER_PRODUCT_ID, ORDER_FORM_ID, PRODUCT_ID, MODEL, PRICE, FINAL_PRICE, TAX, QUANTITY
  * 
  * [foreign-property]
  *     orderForm, product
@@ -51,7 +51,7 @@
     public int getCountAll();
 
     /** SQL-Annotation for getListAll(). */
-    public static final String getListAll_SQL = "select ORDER_PRODUCT_ID, ORDER_FORM_ID, PRODUCT_ID, MODEL, NAME, PRICE, FINAL_PRICE, TAX, QUANTITY from ORDER_PRODUCT";
+    public static final String getListAll_SQL = "select ORDER_PRODUCT_ID, ORDER_FORM_ID, PRODUCT_ID, MODEL, PRICE, FINAL_PRICE, TAX, QUANTITY from ORDER_PRODUCT";
 
     /**
      * Get list as all.
@@ -61,7 +61,7 @@
     public java.util.List<OrderProduct> getListAll();
 
     /** SQL-Annotation for getEntity(). */
-    public static final String getEntity_SQL = "select ORDER_PRODUCT_ID, ORDER_FORM_ID, PRODUCT_ID, MODEL, NAME, PRICE, FINAL_PRICE, TAX, QUANTITY from ORDER_PRODUCT where ORDER_PRODUCT.ORDER_PRODUCT_ID = /*orderProductId*/null";
+    public static final String getEntity_SQL = "select ORDER_PRODUCT_ID, ORDER_FORM_ID, PRODUCT_ID, MODEL, PRICE, FINAL_PRICE, TAX, QUANTITY from ORDER_PRODUCT where ORDER_PRODUCT.ORDER_PRODUCT_ID = /*orderProductId*/null";
 
     /** Args-Annotation for getEntity(). */
     public static final String getEntity_ARGS = "orderProductId";

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsProductDao.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsProductDao.java	2007-09-23 07:44:28 UTC (rev 576)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsProductDao.java	2007-09-23 07:48:26 UTC (rev 577)
@@ -11,7 +11,7 @@
  *     PRODUCT_ID
  * 
  * [column-property]
- *     PRODUCT_ID, MODEL, QUANTITY, PRICE, WEIGHT, IMAGE, THUMBNAIL, STOCK, ORDERED, STATUS, DATE_ADDED, LAST_MODIFIED, DATE_AVAILABLE, TAX_CLASS_ID, MANUFACTURER_ID
+ *     PRODUCT_ID, MODEL, QUANTITY, PRICE, WEIGHT, IMAGE, THUMBNAIL, ORDERED, STATUS, DATE_ADDED, LAST_MODIFIED, DATE_AVAILABLE, TAX_CLASS_ID, MANUFACTURER_ID
  * 
  * [foreign-property]
  *     manufacturer, taxClass
@@ -51,7 +51,7 @@
     public int getCountAll();
 
     /** SQL-Annotation for getListAll(). */
-    public static final String getListAll_SQL = "select PRODUCT_ID, MODEL, QUANTITY, PRICE, WEIGHT, IMAGE, THUMBNAIL, STOCK, ORDERED, STATUS, DATE_ADDED, LAST_MODIFIED, DATE_AVAILABLE, TAX_CLASS_ID, MANUFACTURER_ID from PRODUCT";
+    public static final String getListAll_SQL = "select PRODUCT_ID, MODEL, QUANTITY, PRICE, WEIGHT, IMAGE, THUMBNAIL, ORDERED, STATUS, DATE_ADDED, LAST_MODIFIED, DATE_AVAILABLE, TAX_CLASS_ID, MANUFACTURER_ID from PRODUCT";
 
     /**
      * Get list as all.
@@ -61,7 +61,7 @@
     public java.util.List<Product> getListAll();
 
     /** SQL-Annotation for getEntity(). */
-    public static final String getEntity_SQL = "select PRODUCT_ID, MODEL, QUANTITY, PRICE, WEIGHT, IMAGE, THUMBNAIL, STOCK, ORDERED, STATUS, DATE_ADDED, LAST_MODIFIED, DATE_AVAILABLE, TAX_CLASS_ID, MANUFACTURER_ID from PRODUCT where PRODUCT.PRODUCT_ID = /*productId*/null";
+    public static final String getEntity_SQL = "select PRODUCT_ID, MODEL, QUANTITY, PRICE, WEIGHT, IMAGE, THUMBNAIL, ORDERED, STATUS, DATE_ADDED, LAST_MODIFIED, DATE_AVAILABLE, TAX_CLASS_ID, MANUFACTURER_ID from PRODUCT where PRODUCT.PRODUCT_ID = /*productId*/null";
 
     /** Args-Annotation for getEntity(). */
     public static final String getEntity_ARGS = "productId";

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderForm.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderForm.java	2007-09-23 07:44:28 UTC (rev 576)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderForm.java	2007-09-23 07:48:26 UTC (rev 577)
@@ -14,7 +14,7 @@
  *     ORDER_FORM_ID
  * 
  * [column-property]
- *     ORDER_FORM_ID, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_DAY_OF_BIRTH, CUSTOMER_EMAIL_ADDRESS, CUSTOMER_COMPANY, CUSTOMER_DEPARTMENT, CUSTOMER_STREET_ADDRESS, CUSTOMER_SUBURB, CUSTOMER_CITY, CUSTOMER_STATE, CUSTOMER_POSTCODE, CUSTOMER_COUNTRY_NAME, CUSTOMER_TELEPHONE, CUSTOMER_LOCALE_NAME, DELIVERY_COMPANY, DELIVERY_DEPARTMENT, DELIVERY_FIRSTNAME, DELIVERY_LASTNAME, DELIVERY_STREET_ADDRESS, DELIVERY_SUBURB, DELIVERY_CITY, DELIVERY_STATE, DELIVERY_POSTCODE, DELIVERY_COUNTRY_NAME, DELIVERY_TELEPHONE, DELIVERY_LOCALE_NAME, BILLING_COMPANY, BILLING_DEPARTMENT, BILLING_FIRSTNAME, BILLING_LASTNAME, BILLING_STREET_ADDRESS, BILLING_SUBURB, BILLING_CITY, BILLING_STATE, BILLING_POSTCODE, BILLING_COUNTRY_NAME, BILLING_TELEPHONE, BILLING_LOCALE_NAME, PAYMENT_METHOD_ID, PAYMENT_METHOD_CODE, ORDER_CARD_INFO_ID, DELIVERY_METHOD_ID, DELIVERY_METHOD_CODE, LAST_MODIFIED, ORDER_STATUS_ID, PURCHASED_DATE, FINISHED_DATE, CURRENCY_ID, CURRENCY_CODE, DELIVERY_PRICE, FINAL_PRICE, TAX
+ *     ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_DAY_OF_BIRTH, CUSTOMER_EMAIL_ADDRESS, CUSTOMER_COMPANY, CUSTOMER_DEPARTMENT, CUSTOMER_STREET_ADDRESS, CUSTOMER_SUBURB, CUSTOMER_CITY, CUSTOMER_STATE, CUSTOMER_POSTCODE, CUSTOMER_COUNTRY_NAME, CUSTOMER_TELEPHONE, CUSTOMER_LOCALE_NAME, DELIVERY_COMPANY, DELIVERY_DEPARTMENT, DELIVERY_FIRSTNAME, DELIVERY_LASTNAME, DELIVERY_STREET_ADDRESS, DELIVERY_SUBURB, DELIVERY_CITY, DELIVERY_STATE, DELIVERY_POSTCODE, DELIVERY_COUNTRY_NAME, DELIVERY_TELEPHONE, DELIVERY_LOCALE_NAME, BILLING_COMPANY, BILLING_DEPARTMENT, BILLING_FIRSTNAME, BILLING_LASTNAME, BILLING_STREET_ADDRESS, BILLING_SUBURB, BILLING_CITY, BILLING_STATE, BILLING_POSTCODE, BILLING_COUNTRY_NAME, BILLING_TELEPHONE, BILLING_LOCALE_NAME, PAYMENT_METHOD_ID, PAYMENT_METHOD_CODE, ORDER_CARD_INFO_ID, DELIVERY_METHOD_ID, DELIVERY_METHOD_CODE, LAST_MODIFIED, ORDER_STATUS_ID, PURCHASED_DATE, FINISHED_DATE, CURRENCY_ID, CURRENCY_CODE, DELIVERY_PRICE, SUB_TOTAL_PRICE, TAX, TOTAL_PRICE
  * 
  * [foreign-property]
  *     currency, customer, deliveryMethod, orderStatus, paymentMethod
@@ -60,7 +60,10 @@
     /** The value of orderFormId. PK : INC : BIGINT : NotNull : Default=[GENERATED_BY_DEFAULT] */
     protected java.math.BigDecimal _orderFormId;
 
-    /** The value of customerId. BIGINT : NotNull : FK to CUSTOMER */
+    /** The value of orderFormNumber. VARCHAR(32) : NotNull */
+    protected String _orderFormNumber;
+
+    /** The value of customerId. BIGINT : FK to CUSTOMER */
     protected java.math.BigDecimal _customerId;
 
     /** The value of customerGender. CHAR(1) : NotNull */
@@ -69,7 +72,7 @@
     /** The value of customerFirstname. VARCHAR(32) : NotNull */
     protected String _customerFirstname;
 
-    /** The value of customerLastname. VARCHAR(32) */
+    /** The value of customerLastname. VARCHAR(32) : NotNull */
     protected String _customerLastname;
 
     /** The value of customerDayOfBirth. DATE : NotNull */
@@ -213,15 +216,18 @@
     /** The value of currencyCode. CHAR(3) : NotNull */
     protected String _currencyCode;
 
-    /** The value of deliveryPrice. DECIMAL(14) : NotNull */
+    /** The value of deliveryPrice. DECIMAL(14) */
     protected java.math.BigDecimal _deliveryPrice;
 
-    /** The value of finalPrice. DECIMAL(14) : NotNull */
-    protected java.math.BigDecimal _finalPrice;
+    /** The value of subTotalPrice. DECIMAL(14) */
+    protected java.math.BigDecimal _subTotalPrice;
 
-    /** The value of tax. DECIMAL(14) : NotNull */
+    /** The value of tax. DECIMAL(14) */
     protected java.math.BigDecimal _tax;
 
+    /** The value of totalPrice. DECIMAL(14) : NotNull */
+    protected java.math.BigDecimal _totalPrice;
+
     // ===================================================================================
     //                                                                         Constructor
     //                                                                         ===========
@@ -311,12 +317,36 @@
         this._orderFormId = orderFormId;
     }
 
-    /** Column Annotation for S2Dao. BIGINT : NotNull : FK to CUSTOMER */
+    /** Column Annotation for S2Dao. VARCHAR(32) : NotNull */
+    public static final String orderFormNumber_COLUMN = "ORDER_FORM_NUMBER";
+
+    /**
+     * Get the value of orderFormNumber. <br />
+     * {VARCHAR(32) : NotNull}
+     * 
+     * @return The value of orderFormNumber. (Nullable)
+     */
+    public String getOrderFormNumber() {
+        return _orderFormNumber;
+    }
+
+    /**
+     * Set the value of orderFormNumber. <br />
+     * {VARCHAR(32) : NotNull}
+     * 
+     * @param orderFormNumber The value of orderFormNumber. (Nullable)
+     */
+    public void setOrderFormNumber(String orderFormNumber) {
+        _modifiedProperties.addPropertyName("orderFormNumber");
+        this._orderFormNumber = orderFormNumber;
+    }
+
+    /** Column Annotation for S2Dao. BIGINT : FK to CUSTOMER */
     public static final String customerId_COLUMN = "CUSTOMER_ID";
 
     /**
      * Get the value of customerId. <br />
-     * {BIGINT : NotNull : FK to CUSTOMER}
+     * {BIGINT : FK to CUSTOMER}
      * 
      * @return The value of customerId. (Nullable)
      */
@@ -326,7 +356,7 @@
 
     /**
      * Set the value of customerId. <br />
-     * {BIGINT : NotNull : FK to CUSTOMER}
+     * {BIGINT : FK to CUSTOMER}
      * 
      * @param customerId The value of customerId. (Nullable)
      */
@@ -383,12 +413,12 @@
         this._customerFirstname = customerFirstname;
     }
 
-    /** Column Annotation for S2Dao. VARCHAR(32) */
+    /** Column Annotation for S2Dao. VARCHAR(32) : NotNull */
     public static final String customerLastname_COLUMN = "CUSTOMER_LASTNAME";
 
     /**
      * Get the value of customerLastname. <br />
-     * {VARCHAR(32)}
+     * {VARCHAR(32) : NotNull}
      * 
      * @return The value of customerLastname. (Nullable)
      */
@@ -398,7 +428,7 @@
 
     /**
      * Set the value of customerLastname. <br />
-     * {VARCHAR(32)}
+     * {VARCHAR(32) : NotNull}
      * 
      * @param customerLastname The value of customerLastname. (Nullable)
      */
@@ -1535,12 +1565,12 @@
         this._currencyCode = currencyCode;
     }
 
-    /** Column Annotation for S2Dao. DECIMAL(14) : NotNull */
+    /** Column Annotation for S2Dao. DECIMAL(14) */
     public static final String deliveryPrice_COLUMN = "DELIVERY_PRICE";
 
     /**
      * Get the value of deliveryPrice. <br />
-     * {DECIMAL(14) : NotNull}
+     * {DECIMAL(14)}
      * 
      * @return The value of deliveryPrice. (Nullable)
      */
@@ -1550,7 +1580,7 @@
 
     /**
      * Set the value of deliveryPrice. <br />
-     * {DECIMAL(14) : NotNull}
+     * {DECIMAL(14)}
      * 
      * @param deliveryPrice The value of deliveryPrice. (Nullable)
      */
@@ -1559,36 +1589,36 @@
         this._deliveryPrice = deliveryPrice;
     }
 
-    /** Column Annotation for S2Dao. DECIMAL(14) : NotNull */
-    public static final String finalPrice_COLUMN = "FINAL_PRICE";
+    /** Column Annotation for S2Dao. DECIMAL(14) */
+    public static final String subTotalPrice_COLUMN = "SUB_TOTAL_PRICE";
 
     /**
-     * Get the value of finalPrice. <br />
-     * {DECIMAL(14) : NotNull}
+     * Get the value of subTotalPrice. <br />
+     * {DECIMAL(14)}
      * 
-     * @return The value of finalPrice. (Nullable)
+     * @return The value of subTotalPrice. (Nullable)
      */
-    public java.math.BigDecimal getFinalPrice() {
-        return _finalPrice;
+    public java.math.BigDecimal getSubTotalPrice() {
+        return _subTotalPrice;
     }
 
     /**
-     * Set the value of finalPrice. <br />
-     * {DECIMAL(14) : NotNull}
+     * Set the value of subTotalPrice. <br />
+     * {DECIMAL(14)}
      * 
-     * @param finalPrice The value of finalPrice. (Nullable)
+     * @param subTotalPrice The value of subTotalPrice. (Nullable)
      */
-    public void setFinalPrice(java.math.BigDecimal finalPrice) {
-        _modifiedProperties.addPropertyName("finalPrice");
-        this._finalPrice = finalPrice;
+    public void setSubTotalPrice(java.math.BigDecimal subTotalPrice) {
+        _modifiedProperties.addPropertyName("subTotalPrice");
+        this._subTotalPrice = subTotalPrice;
     }
 
-    /** Column Annotation for S2Dao. DECIMAL(14) : NotNull */
+    /** Column Annotation for S2Dao. DECIMAL(14) */
     public static final String tax_COLUMN = "TAX";
 
     /**
      * Get the value of tax. <br />
-     * {DECIMAL(14) : NotNull}
+     * {DECIMAL(14)}
      * 
      * @return The value of tax. (Nullable)
      */
@@ -1598,7 +1628,7 @@
 
     /**
      * Set the value of tax. <br />
-     * {DECIMAL(14) : NotNull}
+     * {DECIMAL(14)}
      * 
      * @param tax The value of tax. (Nullable)
      */
@@ -1607,20 +1637,44 @@
         this._tax = tax;
     }
 
+    /** Column Annotation for S2Dao. DECIMAL(14) : NotNull */
+    public static final String totalPrice_COLUMN = "TOTAL_PRICE";
 
+    /**
+     * Get the value of totalPrice. <br />
+     * {DECIMAL(14) : NotNull}
+     * 
+     * @return The value of totalPrice. (Nullable)
+     */
+    public java.math.BigDecimal getTotalPrice() {
+        return _totalPrice;
+    }
+
+    /**
+     * Set the value of totalPrice. <br />
+     * {DECIMAL(14) : NotNull}
+     * 
+     * @param totalPrice The value of totalPrice. (Nullable)
+     */
+    public void setTotalPrice(java.math.BigDecimal totalPrice) {
+        _modifiedProperties.addPropertyName("totalPrice");
+        this._totalPrice = totalPrice;
+    }
+
+
     // ===================================================================================
     //                                                                     Classify Method
     //                                                                     ===============
-                                                                                                              
+                                                                                                                  
     // ===================================================================================
     //                                                        Classification Determination
     //                                                        ============================
-                                                                                                              
+                                                                                                                  
 
     // ===================================================================================
     //                                                               Classification Getter
     //                                                               =====================
-                                                                                                              
+                                                                                                                  
 
     // ===================================================================================
     //                                                                       Foreign Table
@@ -2181,6 +2235,7 @@
         final StringBuffer sb = new StringBuffer();
 
         sb.append(delimiter).append(getOrderFormId());
+        sb.append(delimiter).append(getOrderFormNumber());
         sb.append(delimiter).append(getCustomerId());
         sb.append(delimiter).append(getCustomerGender());
         sb.append(delimiter).append(getCustomerFirstname());
@@ -2233,8 +2288,9 @@
         sb.append(delimiter).append(getCurrencyId());
         sb.append(delimiter).append(getCurrencyCode());
         sb.append(delimiter).append(getDeliveryPrice());
-        sb.append(delimiter).append(getFinalPrice());
+        sb.append(delimiter).append(getSubTotalPrice());
         sb.append(delimiter).append(getTax());
+        sb.append(delimiter).append(getTotalPrice());
 
         sb.delete(0, delimiter.length());
         sb.insert(0, "{").append("}");

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderProduct.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderProduct.java	2007-09-23 07:44:28 UTC (rev 576)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderProduct.java	2007-09-23 07:48:26 UTC (rev 577)
@@ -14,7 +14,7 @@
  *     ORDER_PRODUCT_ID
  * 
  * [column-property]
- *     ORDER_PRODUCT_ID, ORDER_FORM_ID, PRODUCT_ID, MODEL, NAME, PRICE, FINAL_PRICE, TAX, QUANTITY
+ *     ORDER_PRODUCT_ID, ORDER_FORM_ID, PRODUCT_ID, MODEL, PRICE, FINAL_PRICE, TAX, QUANTITY
  * 
  * [foreign-property]
  *     orderForm, product
@@ -66,12 +66,9 @@
     /** The value of productId. BIGINT : NotNull : FK to PRODUCT */
     protected java.math.BigDecimal _productId;
 
-    /** The value of model. VARCHAR(32) */
+    /** The value of model. VARCHAR(64) */
     protected String _model;
 
-    /** The value of name. VARCHAR(64) : NotNull */
-    protected String _name;
-
     /** The value of price. DECIMAL(15) : NotNull */
     protected java.math.BigDecimal _price;
 
@@ -221,12 +218,12 @@
         this._productId = productId;
     }
 
-    /** Column Annotation for S2Dao. VARCHAR(32) */
+    /** Column Annotation for S2Dao. VARCHAR(64) */
     public static final String model_COLUMN = "MODEL";
 
     /**
      * Get the value of model. <br />
-     * {VARCHAR(32)}
+     * {VARCHAR(64)}
      * 
      * @return The value of model. (Nullable)
      */
@@ -236,7 +233,7 @@
 
     /**
      * Set the value of model. <br />
-     * {VARCHAR(32)}
+     * {VARCHAR(64)}
      * 
      * @param model The value of model. (Nullable)
      */
@@ -245,30 +242,6 @@
         this._model = model;
     }
 
-    /** Column Annotation for S2Dao. VARCHAR(64) : NotNull */
-    public static final String name_COLUMN = "NAME";
-
-    /**
-     * Get the value of name. <br />
-     * {VARCHAR(64) : NotNull}
-     * 
-     * @return The value of name. (Nullable)
-     */
-    public String getName() {
-        return _name;
-    }
-
-    /**
-     * Set the value of name. <br />
-     * {VARCHAR(64) : NotNull}
-     * 
-     * @param name The value of name. (Nullable)
-     */
-    public void setName(String name) {
-        _modifiedProperties.addPropertyName("name");
-        this._name = name;
-    }
-
     /** Column Annotation for S2Dao. DECIMAL(15) : NotNull */
     public static final String price_COLUMN = "PRICE";
 
@@ -369,16 +342,16 @@
     // ===================================================================================
     //                                                                     Classify Method
     //                                                                     ===============
-                  
+                
     // ===================================================================================
     //                                                        Classification Determination
     //                                                        ============================
-                  
+                
 
     // ===================================================================================
     //                                                               Classification Getter
     //                                                               =====================
-                  
+                
 
     // ===================================================================================
     //                                                                       Foreign Table
@@ -589,7 +562,6 @@
         sb.append(delimiter).append(getOrderFormId());
         sb.append(delimiter).append(getProductId());
         sb.append(delimiter).append(getModel());
-        sb.append(delimiter).append(getName());
         sb.append(delimiter).append(getPrice());
         sb.append(delimiter).append(getFinalPrice());
         sb.append(delimiter).append(getTax());

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsProduct.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsProduct.java	2007-09-23 07:44:28 UTC (rev 576)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsProduct.java	2007-09-23 07:48:26 UTC (rev 577)
@@ -14,7 +14,7 @@
  *     PRODUCT_ID
  * 
  * [column-property]
- *     PRODUCT_ID, MODEL, QUANTITY, PRICE, WEIGHT, IMAGE, THUMBNAIL, STOCK, ORDERED, STATUS, DATE_ADDED, LAST_MODIFIED, DATE_AVAILABLE, TAX_CLASS_ID, MANUFACTURER_ID
+ *     PRODUCT_ID, MODEL, QUANTITY, PRICE, WEIGHT, IMAGE, THUMBNAIL, ORDERED, STATUS, DATE_ADDED, LAST_MODIFIED, DATE_AVAILABLE, TAX_CLASS_ID, MANUFACTURER_ID
  * 
  * [foreign-property]
  *     manufacturer, taxClass
@@ -60,10 +60,10 @@
     /** The value of productId. PK : INC : BIGINT : NotNull : Default=[GENERATED_BY_DEFAULT] */
     protected java.math.BigDecimal _productId;
 
-    /** The value of model. VARCHAR(32) */
+    /** The value of model. VARCHAR(64) */
     protected String _model;
 
-    /** The value of quantity. INTEGER : NotNull */
+    /** The value of quantity. INTEGER */
     protected java.math.BigDecimal _quantity;
 
     /** The value of price. DECIMAL(15) : NotNull */
@@ -78,9 +78,6 @@
     /** The value of thumbnail. VARCHAR(64) */
     protected String _thumbnail;
 
-    /** The value of stock. INTEGER */
-    protected java.math.BigDecimal _stock;
-
     /** The value of ordered. INTEGER : NotNull : Default=[0] */
     protected java.math.BigDecimal _ordered;
 
@@ -191,12 +188,12 @@
         this._productId = productId;
     }
 
-    /** Column Annotation for S2Dao. VARCHAR(32) */
+    /** Column Annotation for S2Dao. VARCHAR(64) */
     public static final String model_COLUMN = "MODEL";
 
     /**
      * Get the value of model. <br />
-     * {VARCHAR(32)}
+     * {VARCHAR(64)}
      * 
      * @return The value of model. (Nullable)
      */
@@ -206,7 +203,7 @@
 
     /**
      * Set the value of model. <br />
-     * {VARCHAR(32)}
+     * {VARCHAR(64)}
      * 
      * @param model The value of model. (Nullable)
      */
@@ -215,12 +212,12 @@
         this._model = model;
     }
 
-    /** Column Annotation for S2Dao. INTEGER : NotNull */
+    /** Column Annotation for S2Dao. INTEGER */
     public static final String quantity_COLUMN = "QUANTITY";
 
     /**
      * Get the value of quantity. <br />
-     * {INTEGER : NotNull}
+     * {INTEGER}
      * 
      * @return The value of quantity. (Nullable)
      */
@@ -230,7 +227,7 @@
 
     /**
      * Set the value of quantity. <br />
-     * {INTEGER : NotNull}
+     * {INTEGER}
      * 
      * @param quantity The value of quantity. (Nullable)
      */
@@ -335,30 +332,6 @@
         this._thumbnail = thumbnail;
     }
 
-    /** Column Annotation for S2Dao. INTEGER */
-    public static final String stock_COLUMN = "STOCK";
-
-    /**
-     * Get the value of stock. <br />
-     * {INTEGER}
-     * 
-     * @return The value of stock. (Nullable)
-     */
-    public java.math.BigDecimal getStock() {
-        return _stock;
-    }
-
-    /**
-     * Set the value of stock. <br />
-     * {INTEGER}
-     * 
-     * @param stock The value of stock. (Nullable)
-     */
-    public void setStock(java.math.BigDecimal stock) {
-        _modifiedProperties.addPropertyName("stock");
-        this._stock = stock;
-    }
-
     /** Column Annotation for S2Dao. INTEGER : NotNull : Default=[0] */
     public static final String ordered_COLUMN = "ORDERED";
 
@@ -531,16 +504,16 @@
     // ===================================================================================
     //                                                                     Classify Method
     //                                                                     ===============
-                              
+                            
     // ===================================================================================
     //                                                        Classification Determination
     //                                                        ============================
-                              
+                            
 
     // ===================================================================================
     //                                                               Classification Getter
     //                                                               =====================
-                              
+                            
 
     // ===================================================================================
     //                                                                       Foreign Table
@@ -1073,7 +1046,6 @@
         sb.append(delimiter).append(getWeight());
         sb.append(delimiter).append(getImage());
         sb.append(delimiter).append(getThumbnail());
-        sb.append(delimiter).append(getStock());
         sb.append(delimiter).append(getOrdered());
         sb.append(delimiter).append(getStatus());
         sb.append(delimiter).append(getDateAdded());

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderFormDbm.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderFormDbm.java	2007-09-23 07:44:28 UTC (rev 576)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderFormDbm.java	2007-09-23 07:48:26 UTC (rev 577)
@@ -16,7 +16,7 @@
  *     ORDER_FORM_ID
  * 
  * [column-property]
- *     ORDER_FORM_ID, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_DAY_OF_BIRTH, CUSTOMER_EMAIL_ADDRESS, CUSTOMER_COMPANY, CUSTOMER_DEPARTMENT, CUSTOMER_STREET_ADDRESS, CUSTOMER_SUBURB, CUSTOMER_CITY, CUSTOMER_STATE, CUSTOMER_POSTCODE, CUSTOMER_COUNTRY_NAME, CUSTOMER_TELEPHONE, CUSTOMER_LOCALE_NAME, DELIVERY_COMPANY, DELIVERY_DEPARTMENT, DELIVERY_FIRSTNAME, DELIVERY_LASTNAME, DELIVERY_STREET_ADDRESS, DELIVERY_SUBURB, DELIVERY_CITY, DELIVERY_STATE, DELIVERY_POSTCODE, DELIVERY_COUNTRY_NAME, DELIVERY_TELEPHONE, DELIVERY_LOCALE_NAME, BILLING_COMPANY, BILLING_DEPARTMENT, BILLING_FIRSTNAME, BILLING_LASTNAME, BILLING_STREET_ADDRESS, BILLING_SUBURB, BILLING_CITY, BILLING_STATE, BILLING_POSTCODE, BILLING_COUNTRY_NAME, BILLING_TELEPHONE, BILLING_LOCALE_NAME, PAYMENT_METHOD_ID, PAYMENT_METHOD_CODE, ORDER_CARD_INFO_ID, DELIVERY_METHOD_ID, DELIVERY_METHOD_CODE, LAST_MODIFIED, ORDER_STATUS_ID, PURCHASED_DATE, FINISHED_DATE, CURRENCY_ID, CURRENCY_CODE, DELIVERY_PRICE, FINAL_PRICE, TAX
+ *     ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_DAY_OF_BIRTH, CUSTOMER_EMAIL_ADDRESS, CUSTOMER_COMPANY, CUSTOMER_DEPARTMENT, CUSTOMER_STREET_ADDRESS, CUSTOMER_SUBURB, CUSTOMER_CITY, CUSTOMER_STATE, CUSTOMER_POSTCODE, CUSTOMER_COUNTRY_NAME, CUSTOMER_TELEPHONE, CUSTOMER_LOCALE_NAME, DELIVERY_COMPANY, DELIVERY_DEPARTMENT, DELIVERY_FIRSTNAME, DELIVERY_LASTNAME, DELIVERY_STREET_ADDRESS, DELIVERY_SUBURB, DELIVERY_CITY, DELIVERY_STATE, DELIVERY_POSTCODE, DELIVERY_COUNTRY_NAME, DELIVERY_TELEPHONE, DELIVERY_LOCALE_NAME, BILLING_COMPANY, BILLING_DEPARTMENT, BILLING_FIRSTNAME, BILLING_LASTNAME, BILLING_STREET_ADDRESS, BILLING_SUBURB, BILLING_CITY, BILLING_STATE, BILLING_POSTCODE, BILLING_COUNTRY_NAME, BILLING_TELEPHONE, BILLING_LOCALE_NAME, PAYMENT_METHOD_ID, PAYMENT_METHOD_CODE, ORDER_CARD_INFO_ID, DELIVERY_METHOD_ID, DELIVERY_METHOD_CODE, LAST_MODIFIED, ORDER_STATUS_ID, PURCHASED_DATE, FINISHED_DATE, CURRENCY_ID, CURRENCY_CODE, DELIVERY_PRICE, SUB_TOTAL_PRICE, TAX, TOTAL_PRICE
  * 
  * [foreign-property]
  *     currency, customer, deliveryMethod, orderStatus, paymentMethod
@@ -95,13 +95,15 @@
     //                                        --------------
     /** Db-name of ORDER_FORM_ID. PK : INC : BIGINT : NotNull : Default=[GENERATED_BY_DEFAULT] */
     public static final String DB_NAME_ORDER_FORM_ID = "ORDER_FORM_ID";
-    /** Db-name of CUSTOMER_ID. BIGINT : NotNull : FK to CUSTOMER */
+    /** Db-name of ORDER_FORM_NUMBER. VARCHAR(32) : NotNull */
+    public static final String DB_NAME_ORDER_FORM_NUMBER = "ORDER_FORM_NUMBER";
+    /** Db-name of CUSTOMER_ID. BIGINT : FK to CUSTOMER */
     public static final String DB_NAME_CUSTOMER_ID = "CUSTOMER_ID";
     /** Db-name of CUSTOMER_GENDER. CHAR(1) : NotNull */
     public static final String DB_NAME_CUSTOMER_GENDER = "CUSTOMER_GENDER";
     /** Db-name of CUSTOMER_FIRSTNAME. VARCHAR(32) : NotNull */
     public static final String DB_NAME_CUSTOMER_FIRSTNAME = "CUSTOMER_FIRSTNAME";
-    /** Db-name of CUSTOMER_LASTNAME. VARCHAR(32) */
+    /** Db-name of CUSTOMER_LASTNAME. VARCHAR(32) : NotNull */
     public static final String DB_NAME_CUSTOMER_LASTNAME = "CUSTOMER_LASTNAME";
     /** Db-name of CUSTOMER_DAY_OF_BIRTH. DATE : NotNull */
     public static final String DB_NAME_CUSTOMER_DAY_OF_BIRTH = "CUSTOMER_DAY_OF_BIRTH";
@@ -197,15 +199,19 @@
     public static final String DB_NAME_CURRENCY_ID = "CURRENCY_ID";
     /** Db-name of CURRENCY_CODE. CHAR(3) : NotNull */
     public static final String DB_NAME_CURRENCY_CODE = "CURRENCY_CODE";
-    /** Db-name of DELIVERY_PRICE. DECIMAL(14) : NotNull */
+    /** Db-name of DELIVERY_PRICE. DECIMAL(14) */
     public static final String DB_NAME_DELIVERY_PRICE = "DELIVERY_PRICE";
-    /** Db-name of FINAL_PRICE. DECIMAL(14) : NotNull */
-    public static final String DB_NAME_FINAL_PRICE = "FINAL_PRICE";
-    /** Db-name of TAX. DECIMAL(14) : NotNull */
+    /** Db-name of SUB_TOTAL_PRICE. DECIMAL(14) */
+    public static final String DB_NAME_SUB_TOTAL_PRICE = "SUB_TOTAL_PRICE";
+    /** Db-name of TAX. DECIMAL(14) */
     public static final String DB_NAME_TAX = "TAX";
+    /** Db-name of TOTAL_PRICE. DECIMAL(14) : NotNull */
+    public static final String DB_NAME_TOTAL_PRICE = "TOTAL_PRICE";
 
     /** @deprecated Deprecated! So use DB_NAME_OrderFormId. */
     public static final String COLUMN_DB_NAME_OF_OrderFormId = "ORDER_FORM_ID";
+    /** @deprecated Deprecated! So use DB_NAME_OrderFormNumber. */
+    public static final String COLUMN_DB_NAME_OF_OrderFormNumber = "ORDER_FORM_NUMBER";
     /** @deprecated Deprecated! So use DB_NAME_CustomerId. */
     public static final String COLUMN_DB_NAME_OF_CustomerId = "CUSTOMER_ID";
     /** @deprecated Deprecated! So use DB_NAME_CustomerGender. */
@@ -310,23 +316,27 @@
     public static final String COLUMN_DB_NAME_OF_CurrencyCode = "CURRENCY_CODE";
     /** @deprecated Deprecated! So use DB_NAME_DeliveryPrice. */
     public static final String COLUMN_DB_NAME_OF_DeliveryPrice = "DELIVERY_PRICE";
-    /** @deprecated Deprecated! So use DB_NAME_FinalPrice. */
-    public static final String COLUMN_DB_NAME_OF_FinalPrice = "FINAL_PRICE";
+    /** @deprecated Deprecated! So use DB_NAME_SubTotalPrice. */
+    public static final String COLUMN_DB_NAME_OF_SubTotalPrice = "SUB_TOTAL_PRICE";
     /** @deprecated Deprecated! So use DB_NAME_Tax. */
     public static final String COLUMN_DB_NAME_OF_Tax = "TAX";
+    /** @deprecated Deprecated! So use DB_NAME_TotalPrice. */
+    public static final String COLUMN_DB_NAME_OF_TotalPrice = "TOTAL_PRICE";
 
     // -----------------------------------------------------
     //                       Column Prop-Name(JavaBeansRule)
     //                       -------------------------------
     /** Prop-name(JavaBeansRule) of orderFormId. PK : INC : BIGINT : NotNull : Default=[GENERATED_BY_DEFAULT] */
     public static final String PROPERTY_NAME_orderFormId = "orderFormId";
-    /** Prop-name(JavaBeansRule) of customerId. BIGINT : NotNull : FK to CUSTOMER */
+    /** Prop-name(JavaBeansRule) of orderFormNumber. VARCHAR(32) : NotNull */
+    public static final String PROPERTY_NAME_orderFormNumber = "orderFormNumber";
+    /** Prop-name(JavaBeansRule) of customerId. BIGINT : FK to CUSTOMER */
     public static final String PROPERTY_NAME_customerId = "customerId";
     /** Prop-name(JavaBeansRule) of customerGender. CHAR(1) : NotNull */
     public static final String PROPERTY_NAME_customerGender = "customerGender";
     /** Prop-name(JavaBeansRule) of customerFirstname. VARCHAR(32) : NotNull */
     public static final String PROPERTY_NAME_customerFirstname = "customerFirstname";
-    /** Prop-name(JavaBeansRule) of customerLastname. VARCHAR(32) */
+    /** Prop-name(JavaBeansRule) of customerLastname. VARCHAR(32) : NotNull */
     public static final String PROPERTY_NAME_customerLastname = "customerLastname";
     /** Prop-name(JavaBeansRule) of customerDayOfBirth. DATE : NotNull */
     public static final String PROPERTY_NAME_customerDayOfBirth = "customerDayOfBirth";
@@ -422,25 +432,29 @@
     public static final String PROPERTY_NAME_currencyId = "currencyId";
     /** Prop-name(JavaBeansRule) of currencyCode. CHAR(3) : NotNull */
     public static final String PROPERTY_NAME_currencyCode = "currencyCode";
-    /** Prop-name(JavaBeansRule) of deliveryPrice. DECIMAL(14) : NotNull */
+    /** Prop-name(JavaBeansRule) of deliveryPrice. DECIMAL(14) */
     public static final String PROPERTY_NAME_deliveryPrice = "deliveryPrice";
-    /** Prop-name(JavaBeansRule) of finalPrice. DECIMAL(14) : NotNull */
-    public static final String PROPERTY_NAME_finalPrice = "finalPrice";
-    /** Prop-name(JavaBeansRule) of tax. DECIMAL(14) : NotNull */
+    /** Prop-name(JavaBeansRule) of subTotalPrice. DECIMAL(14) */
+    public static final String PROPERTY_NAME_subTotalPrice = "subTotalPrice";
+    /** Prop-name(JavaBeansRule) of tax. DECIMAL(14) */
     public static final String PROPERTY_NAME_tax = "tax";
+    /** Prop-name(JavaBeansRule) of totalPrice. DECIMAL(14) : NotNull */
+    public static final String PROPERTY_NAME_totalPrice = "totalPrice";
 
     // -----------------------------------------------------
     //                                  Column Cap-Prop-Name
     //                                  --------------------
     /** Cap-prop-name of orderFormId. PK : INC : BIGINT : NotNull : Default=[GENERATED_BY_DEFAULT] */
     public static final String CAP_PROP_NAME_OrderFormId = "OrderFormId";
-    /** Cap-prop-name of customerId. BIGINT : NotNull : FK to CUSTOMER */
+    /** Cap-prop-name of orderFormNumber. VARCHAR(32) : NotNull */
+    public static final String CAP_PROP_NAME_OrderFormNumber = "OrderFormNumber";
+    /** Cap-prop-name of customerId. BIGINT : FK to CUSTOMER */
     public static final String CAP_PROP_NAME_CustomerId = "CustomerId";
     /** Cap-prop-name of customerGender. CHAR(1) : NotNull */
     public static final String CAP_PROP_NAME_CustomerGender = "CustomerGender";
     /** Cap-prop-name of customerFirstname. VARCHAR(32) : NotNull */
     public static final String CAP_PROP_NAME_CustomerFirstname = "CustomerFirstname";
-    /** Cap-prop-name of customerLastname. VARCHAR(32) */
+    /** Cap-prop-name of customerLastname. VARCHAR(32) : NotNull */
     public static final String CAP_PROP_NAME_CustomerLastname = "CustomerLastname";
     /** Cap-prop-name of customerDayOfBirth. DATE : NotNull */
     public static final String CAP_PROP_NAME_CustomerDayOfBirth = "CustomerDayOfBirth";
@@ -536,15 +550,19 @@
     public static final String CAP_PROP_NAME_CurrencyId = "CurrencyId";
     /** Cap-prop-name of currencyCode. CHAR(3) : NotNull */
     public static final String CAP_PROP_NAME_CurrencyCode = "CurrencyCode";
-    /** Cap-prop-name of deliveryPrice. DECIMAL(14) : NotNull */
+    /** Cap-prop-name of deliveryPrice. DECIMAL(14) */
     public static final String CAP_PROP_NAME_DeliveryPrice = "DeliveryPrice";
-    /** Cap-prop-name of finalPrice. DECIMAL(14) : NotNull */
-    public static final String CAP_PROP_NAME_FinalPrice = "FinalPrice";
-    /** Cap-prop-name of tax. DECIMAL(14) : NotNull */
+    /** Cap-prop-name of subTotalPrice. DECIMAL(14) */
+    public static final String CAP_PROP_NAME_SubTotalPrice = "SubTotalPrice";
+    /** Cap-prop-name of tax. DECIMAL(14) */
     public static final String CAP_PROP_NAME_Tax = "Tax";
+    /** Cap-prop-name of totalPrice. DECIMAL(14) : NotNull */
+    public static final String CAP_PROP_NAME_TotalPrice = "TotalPrice";
 
     /** @deprecated Deprecated! So use CAP_PROP_NAME_OrderFormId. */
     public static final String COLUMN_CAP_PROP_NAME_OF_OrderFormId = "OrderFormId";
+    /** @deprecated Deprecated! So use CAP_PROP_NAME_OrderFormNumber. */
+    public static final String COLUMN_CAP_PROP_NAME_OF_OrderFormNumber = "OrderFormNumber";
     /** @deprecated Deprecated! So use CAP_PROP_NAME_CustomerId. */
     public static final String COLUMN_CAP_PROP_NAME_OF_CustomerId = "CustomerId";
     /** @deprecated Deprecated! So use CAP_PROP_NAME_CustomerGender. */
@@ -649,23 +667,27 @@
     public static final String COLUMN_CAP_PROP_NAME_OF_CurrencyCode = "CurrencyCode";
     /** @deprecated Deprecated! So use CAP_PROP_NAME_DeliveryPrice. */
     public static final String COLUMN_CAP_PROP_NAME_OF_DeliveryPrice = "DeliveryPrice";
-    /** @deprecated Deprecated! So use CAP_PROP_NAME_FinalPrice. */
-    public static final String COLUMN_CAP_PROP_NAME_OF_FinalPrice = "FinalPrice";
+    /** @deprecated Deprecated! So use CAP_PROP_NAME_SubTotalPrice. */
+    public static final String COLUMN_CAP_PROP_NAME_OF_SubTotalPrice = "SubTotalPrice";
     /** @deprecated Deprecated! So use CAP_PROP_NAME_Tax. */
     public static final String COLUMN_CAP_PROP_NAME_OF_Tax = "Tax";
+    /** @deprecated Deprecated! So use CAP_PROP_NAME_TotalPrice. */
+    public static final String COLUMN_CAP_PROP_NAME_OF_TotalPrice = "TotalPrice";
 
     // -----------------------------------------------------
     //                                Column Uncap-Prop-Name
     //                                ----------------------
     /** Uncap-prop-name of orderFormId. PK : INC : BIGINT : NotNull : Default=[GENERATED_BY_DEFAULT] */
     public static final String UNCAP_PROP_NAME_orderFormId = "orderFormId";
-    /** Uncap-prop-name of customerId. BIGINT : NotNull : FK to CUSTOMER */
+    /** Uncap-prop-name of orderFormNumber. VARCHAR(32) : NotNull */
+    public static final String UNCAP_PROP_NAME_orderFormNumber = "orderFormNumber";
+    /** Uncap-prop-name of customerId. BIGINT : FK to CUSTOMER */
     public static final String UNCAP_PROP_NAME_customerId = "customerId";
     /** Uncap-prop-name of customerGender. CHAR(1) : NotNull */
     public static final String UNCAP_PROP_NAME_customerGender = "customerGender";
     /** Uncap-prop-name of customerFirstname. VARCHAR(32) : NotNull */
     public static final String UNCAP_PROP_NAME_customerFirstname = "customerFirstname";
-    /** Uncap-prop-name of customerLastname. VARCHAR(32) */
+    /** Uncap-prop-name of customerLastname. VARCHAR(32) : NotNull */
     public static final String UNCAP_PROP_NAME_customerLastname = "customerLastname";
     /** Uncap-prop-name of customerDayOfBirth. DATE : NotNull */
     public static final String UNCAP_PROP_NAME_customerDayOfBirth = "customerDayOfBirth";
@@ -761,15 +783,19 @@
     public static final String UNCAP_PROP_NAME_currencyId = "currencyId";
     /** Uncap-prop-name of currencyCode. CHAR(3) : NotNull */
     public static final String UNCAP_PROP_NAME_currencyCode = "currencyCode";
-    /** Uncap-prop-name of deliveryPrice. DECIMAL(14) : NotNull */
+    /** Uncap-prop-name of deliveryPrice. DECIMAL(14) */
     public static final String UNCAP_PROP_NAME_deliveryPrice = "deliveryPrice";
-    /** Uncap-prop-name of finalPrice. DECIMAL(14) : NotNull */
-    public static final String UNCAP_PROP_NAME_finalPrice = "finalPrice";
-    /** Uncap-prop-name of tax. DECIMAL(14) : NotNull */
+    /** Uncap-prop-name of subTotalPrice. DECIMAL(14) */
+    public static final String UNCAP_PROP_NAME_subTotalPrice = "subTotalPrice";
+    /** Uncap-prop-name of tax. DECIMAL(14) */
     public static final String UNCAP_PROP_NAME_tax = "tax";
+    /** Uncap-prop-name of totalPrice. DECIMAL(14) : NotNull */
+    public static final String UNCAP_PROP_NAME_totalPrice = "totalPrice";
 
     /** @deprecated Deprecated! So use UNCAP_PROP_NAME_OrderFormId. */
     public static final String COLUMN_UNCAP_PROP_NAME_OF_OrderFormId = "orderFormId";
+    /** @deprecated Deprecated! So use UNCAP_PROP_NAME_OrderFormNumber. */
+    public static final String COLUMN_UNCAP_PROP_NAME_OF_OrderFormNumber = "orderFormNumber";
     /** @deprecated Deprecated! So use UNCAP_PROP_NAME_CustomerId. */
     public static final String COLUMN_UNCAP_PROP_NAME_OF_CustomerId = "customerId";
     /** @deprecated Deprecated! So use UNCAP_PROP_NAME_CustomerGender. */
@@ -874,10 +900,12 @@
     public static final String COLUMN_UNCAP_PROP_NAME_OF_CurrencyCode = "currencyCode";
     /** @deprecated Deprecated! So use UNCAP_PROP_NAME_DeliveryPrice. */
     public static final String COLUMN_UNCAP_PROP_NAME_OF_DeliveryPrice = "deliveryPrice";
-    /** @deprecated Deprecated! So use UNCAP_PROP_NAME_FinalPrice. */
-    public static final String COLUMN_UNCAP_PROP_NAME_OF_FinalPrice = "finalPrice";
+    /** @deprecated Deprecated! So use UNCAP_PROP_NAME_SubTotalPrice. */
+    public static final String COLUMN_UNCAP_PROP_NAME_OF_SubTotalPrice = "subTotalPrice";
     /** @deprecated Deprecated! So use UNCAP_PROP_NAME_Tax. */
     public static final String COLUMN_UNCAP_PROP_NAME_OF_Tax = "tax";
+    /** @deprecated Deprecated! So use UNCAP_PROP_NAME_TotalPrice. */
+    public static final String COLUMN_UNCAP_PROP_NAME_OF_TotalPrice = "totalPrice";
 
     // -----------------------------------------------------
     //                                          Foreign Name
@@ -959,6 +987,7 @@
         map.put(TABLE_DB_NAME.toLowerCase(), TABLE_PROPERTY_NAME);
 
         map.put(DB_NAME_ORDER_FORM_ID.toLowerCase(), PROPERTY_NAME_orderFormId);
+        map.put(DB_NAME_ORDER_FORM_NUMBER.toLowerCase(), PROPERTY_NAME_orderFormNumber);
         map.put(DB_NAME_CUSTOMER_ID.toLowerCase(), PROPERTY_NAME_customerId);
         map.put(DB_NAME_CUSTOMER_GENDER.toLowerCase(), PROPERTY_NAME_customerGender);
         map.put(DB_NAME_CUSTOMER_FIRSTNAME.toLowerCase(), PROPERTY_NAME_customerFirstname);
@@ -1011,8 +1040,9 @@
         map.put(DB_NAME_CURRENCY_ID.toLowerCase(), PROPERTY_NAME_currencyId);
         map.put(DB_NAME_CURRENCY_CODE.toLowerCase(), PROPERTY_NAME_currencyCode);
         map.put(DB_NAME_DELIVERY_PRICE.toLowerCase(), PROPERTY_NAME_deliveryPrice);
-        map.put(DB_NAME_FINAL_PRICE.toLowerCase(), PROPERTY_NAME_finalPrice);
+        map.put(DB_NAME_SUB_TOTAL_PRICE.toLowerCase(), PROPERTY_NAME_subTotalPrice);
         map.put(DB_NAME_TAX.toLowerCase(), PROPERTY_NAME_tax);
+        map.put(DB_NAME_TOTAL_PRICE.toLowerCase(), PROPERTY_NAME_totalPrice);
 
         _dbNamePropertyNameKeyToLowerMap = java.util.Collections.unmodifiableMap(map);
         return _dbNamePropertyNameKeyToLowerMap;
@@ -1028,6 +1058,7 @@
         map.put(TABLE_PROPERTY_NAME.toLowerCase(), TABLE_DB_NAME);
 
         map.put(PROPERTY_NAME_orderFormId.toLowerCase(), DB_NAME_ORDER_FORM_ID);
+        map.put(PROPERTY_NAME_orderFormNumber.toLowerCase(), DB_NAME_ORDER_FORM_NUMBER);
         map.put(PROPERTY_NAME_customerId.toLowerCase(), DB_NAME_CUSTOMER_ID);
         map.put(PROPERTY_NAME_customerGender.toLowerCase(), DB_NAME_CUSTOMER_GENDER);
         map.put(PROPERTY_NAME_customerFirstname.toLowerCase(), DB_NAME_CUSTOMER_FIRSTNAME);
@@ -1080,8 +1111,9 @@
         map.put(PROPERTY_NAME_currencyId.toLowerCase(), DB_NAME_CURRENCY_ID);
         map.put(PROPERTY_NAME_currencyCode.toLowerCase(), DB_NAME_CURRENCY_CODE);
         map.put(PROPERTY_NAME_deliveryPrice.toLowerCase(), DB_NAME_DELIVERY_PRICE);
-        map.put(PROPERTY_NAME_finalPrice.toLowerCase(), DB_NAME_FINAL_PRICE);
+        map.put(PROPERTY_NAME_subTotalPrice.toLowerCase(), DB_NAME_SUB_TOTAL_PRICE);
         map.put(PROPERTY_NAME_tax.toLowerCase(), DB_NAME_TAX);
+        map.put(PROPERTY_NAME_totalPrice.toLowerCase(), DB_NAME_TOTAL_PRICE);
 
         _propertyNameDbNameKeyToLowerMap = java.util.Collections.unmodifiableMap(map);
         return _propertyNameDbNameKeyToLowerMap;
@@ -1099,6 +1131,7 @@
         map.put(TABLE_DB_NAME, TABLE_CAP_PROP_NAME);
 
         map.put(DB_NAME_ORDER_FORM_ID, CAP_PROP_NAME_OrderFormId);
+        map.put(DB_NAME_ORDER_FORM_NUMBER, CAP_PROP_NAME_OrderFormNumber);
         map.put(DB_NAME_CUSTOMER_ID, CAP_PROP_NAME_CustomerId);
         map.put(DB_NAME_CUSTOMER_GENDER, CAP_PROP_NAME_CustomerGender);
         map.put(DB_NAME_CUSTOMER_FIRSTNAME, CAP_PROP_NAME_CustomerFirstname);
@@ -1151,8 +1184,9 @@
         map.put(DB_NAME_CURRENCY_ID, CAP_PROP_NAME_CurrencyId);
         map.put(DB_NAME_CURRENCY_CODE, CAP_PROP_NAME_CurrencyCode);
         map.put(DB_NAME_DELIVERY_PRICE, CAP_PROP_NAME_DeliveryPrice);
-        map.put(DB_NAME_FINAL_PRICE, CAP_PROP_NAME_FinalPrice);
+        map.put(DB_NAME_SUB_TOTAL_PRICE, CAP_PROP_NAME_SubTotalPrice);
         map.put(DB_NAME_TAX, CAP_PROP_NAME_Tax);
+        map.put(DB_NAME_TOTAL_PRICE, CAP_PROP_NAME_TotalPrice);
 
         _dbNameCapPropNameMap = java.util.Collections.unmodifiableMap(map);
         return _dbNameCapPropNameMap;
@@ -1170,6 +1204,7 @@
         map.put(TABLE_DB_NAME, TABLE_UNCAP_PROP_NAME);
 
         map.put(DB_NAME_ORDER_FORM_ID, UNCAP_PROP_NAME_orderFormId);
+        map.put(DB_NAME_ORDER_FORM_NUMBER, UNCAP_PROP_NAME_orderFormNumber);
         map.put(DB_NAME_CUSTOMER_ID, UNCAP_PROP_NAME_customerId);
         map.put(DB_NAME_CUSTOMER_GENDER, UNCAP_PROP_NAME_customerGender);
         map.put(DB_NAME_CUSTOMER_FIRSTNAME, UNCAP_PROP_NAME_customerFirstname);
@@ -1222,8 +1257,9 @@
         map.put(DB_NAME_CURRENCY_ID, UNCAP_PROP_NAME_currencyId);
         map.put(DB_NAME_CURRENCY_CODE, UNCAP_PROP_NAME_currencyCode);
         map.put(DB_NAME_DELIVERY_PRICE, UNCAP_PROP_NAME_deliveryPrice);
-        map.put(DB_NAME_FINAL_PRICE, UNCAP_PROP_NAME_finalPrice);
+        map.put(DB_NAME_SUB_TOTAL_PRICE, UNCAP_PROP_NAME_subTotalPrice);
         map.put(DB_NAME_TAX, UNCAP_PROP_NAME_tax);
+        map.put(DB_NAME_TOTAL_PRICE, UNCAP_PROP_NAME_totalPrice);
 
         _dbNameUncapPropNameMap = java.util.Collections.unmodifiableMap(map);
         return _dbNameUncapPropNameMap;
@@ -1241,6 +1277,7 @@
         map.put(TABLE_CAP_PROP_NAME, TABLE_DB_NAME);
 
         map.put(CAP_PROP_NAME_OrderFormId, DB_NAME_ORDER_FORM_ID);
+        map.put(CAP_PROP_NAME_OrderFormNumber, DB_NAME_ORDER_FORM_NUMBER);
         map.put(CAP_PROP_NAME_CustomerId, DB_NAME_CUSTOMER_ID);
         map.put(CAP_PROP_NAME_CustomerGender, DB_NAME_CUSTOMER_GENDER);
         map.put(CAP_PROP_NAME_CustomerFirstname, DB_NAME_CUSTOMER_FIRSTNAME);
@@ -1293,8 +1330,9 @@
         map.put(CAP_PROP_NAME_CurrencyId, DB_NAME_CURRENCY_ID);
         map.put(CAP_PROP_NAME_CurrencyCode, DB_NAME_CURRENCY_CODE);
         map.put(CAP_PROP_NAME_DeliveryPrice, DB_NAME_DELIVERY_PRICE);
-        map.put(CAP_PROP_NAME_FinalPrice, DB_NAME_FINAL_PRICE);
+        map.put(CAP_PROP_NAME_SubTotalPrice, DB_NAME_SUB_TOTAL_PRICE);
         map.put(CAP_PROP_NAME_Tax, DB_NAME_TAX);
+        map.put(CAP_PROP_NAME_TotalPrice, DB_NAME_TOTAL_PRICE);
 
         _capPropNameDbNameMap = java.util.Collections.unmodifiableMap(map);
         return _capPropNameDbNameMap;
@@ -1312,6 +1350,7 @@
         map.put(TABLE_CAP_PROP_NAME, TABLE_UNCAP_PROP_NAME);
 
         map.put(CAP_PROP_NAME_OrderFormId, UNCAP_PROP_NAME_orderFormId);
+        map.put(CAP_PROP_NAME_OrderFormNumber, UNCAP_PROP_NAME_orderFormNumber);
         map.put(CAP_PROP_NAME_CustomerId, UNCAP_PROP_NAME_customerId);
         map.put(CAP_PROP_NAME_CustomerGender, UNCAP_PROP_NAME_customerGender);
         map.put(CAP_PROP_NAME_CustomerFirstname, UNCAP_PROP_NAME_customerFirstname);
@@ -1364,8 +1403,9 @@
         map.put(CAP_PROP_NAME_CurrencyId, UNCAP_PROP_NAME_currencyId);
         map.put(CAP_PROP_NAME_CurrencyCode, UNCAP_PROP_NAME_currencyCode);
         map.put(CAP_PROP_NAME_DeliveryPrice, UNCAP_PROP_NAME_deliveryPrice);
-        map.put(CAP_PROP_NAME_FinalPrice, UNCAP_PROP_NAME_finalPrice);
+        map.put(CAP_PROP_NAME_SubTotalPrice, UNCAP_PROP_NAME_subTotalPrice);
         map.put(CAP_PROP_NAME_Tax, UNCAP_PROP_NAME_tax);
+        map.put(CAP_PROP_NAME_TotalPrice, UNCAP_PROP_NAME_totalPrice);
 
         _capPropNameUncapPropNameMap = java.util.Collections.unmodifiableMap(map);
         return _capPropNameUncapPropNameMap;
@@ -1383,6 +1423,7 @@
         map.put(TABLE_UNCAP_PROP_NAME, TABLE_DB_NAME);
 
         map.put(UNCAP_PROP_NAME_orderFormId, DB_NAME_ORDER_FORM_ID);
+        map.put(UNCAP_PROP_NAME_orderFormNumber, DB_NAME_ORDER_FORM_NUMBER);
         map.put(UNCAP_PROP_NAME_customerId, DB_NAME_CUSTOMER_ID);
         map.put(UNCAP_PROP_NAME_customerGender, DB_NAME_CUSTOMER_GENDER);
         map.put(UNCAP_PROP_NAME_customerFirstname, DB_NAME_CUSTOMER_FIRSTNAME);
@@ -1435,8 +1476,9 @@
         map.put(UNCAP_PROP_NAME_currencyId, DB_NAME_CURRENCY_ID);
         map.put(UNCAP_PROP_NAME_currencyCode, DB_NAME_CURRENCY_CODE);
         map.put(UNCAP_PROP_NAME_deliveryPrice, DB_NAME_DELIVERY_PRICE);
-        map.put(UNCAP_PROP_NAME_finalPrice, DB_NAME_FINAL_PRICE);
+        map.put(UNCAP_PROP_NAME_subTotalPrice, DB_NAME_SUB_TOTAL_PRICE);
         map.put(UNCAP_PROP_NAME_tax, DB_NAME_TAX);
+        map.put(UNCAP_PROP_NAME_totalPrice, DB_NAME_TOTAL_PRICE);
 
         _uncapPropNameDbNameMap = java.util.Collections.unmodifiableMap(map);
         return _uncapPropNameDbNameMap;
@@ -1454,6 +1496,7 @@
         map.put(TABLE_UNCAP_PROP_NAME, TABLE_CAP_PROP_NAME);
 
         map.put(UNCAP_PROP_NAME_orderFormId, CAP_PROP_NAME_OrderFormId);
+        map.put(UNCAP_PROP_NAME_orderFormNumber, CAP_PROP_NAME_OrderFormNumber);
         map.put(UNCAP_PROP_NAME_customerId, CAP_PROP_NAME_CustomerId);
         map.put(UNCAP_PROP_NAME_customerGender, CAP_PROP_NAME_CustomerGender);
         map.put(UNCAP_PROP_NAME_customerFirstname, CAP_PROP_NAME_CustomerFirstname);
@@ -1506,8 +1549,9 @@
         map.put(UNCAP_PROP_NAME_currencyId, CAP_PROP_NAME_CurrencyId);
         map.put(UNCAP_PROP_NAME_currencyCode, CAP_PROP_NAME_CurrencyCode);
         map.put(UNCAP_PROP_NAME_deliveryPrice, CAP_PROP_NAME_DeliveryPrice);
-        map.put(UNCAP_PROP_NAME_finalPrice, CAP_PROP_NAME_FinalPrice);
+        map.put(UNCAP_PROP_NAME_subTotalPrice, CAP_PROP_NAME_SubTotalPrice);
         map.put(UNCAP_PROP_NAME_tax, CAP_PROP_NAME_Tax);
+        map.put(UNCAP_PROP_NAME_totalPrice, CAP_PROP_NAME_TotalPrice);
 
         _uncapPropNameCapPropNameMap = java.util.Collections.unmodifiableMap(map);
         return _uncapPropNameCapPropNameMap;
@@ -1717,6 +1761,7 @@
     public java.util.List<ColumnInfo> getColumnInfoList() {
         final java.util.List<ColumnInfo> columnInfoList = new java.util.ArrayList<ColumnInfo>();
         columnInfoList.add(columnOrderFormId());
+        columnInfoList.add(columnOrderFormNumber());
         columnInfoList.add(columnCustomerId());
         columnInfoList.add(columnCustomerGender());
         columnInfoList.add(columnCustomerFirstname());
@@ -1769,8 +1814,9 @@
         columnInfoList.add(columnCurrencyId());
         columnInfoList.add(columnCurrencyCode());
         columnInfoList.add(columnDeliveryPrice());
-        columnInfoList.add(columnFinalPrice());
+        columnInfoList.add(columnSubTotalPrice());
         columnInfoList.add(columnTax());
+        columnInfoList.add(columnTotalPrice());
         return columnInfoList;
     }
 
@@ -1826,7 +1872,7 @@
      * @deprecated Please use getColumnInfoList()
      */
     public String getColumnDbNameCommaString() {
-        return "ORDER_FORM_ID, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_DAY_OF_BIRTH, CUSTOMER_EMAIL_ADDRESS, CUSTOMER_COMPANY, CUSTOMER_DEPARTMENT, CUSTOMER_STREET_ADDRESS, CUSTOMER_SUBURB, CUSTOMER_CITY, CUSTOMER_STATE, CUSTOMER_POSTCODE, CUSTOMER_COUNTRY_NAME, CUSTOMER_TELEPHONE, CUSTOMER_LOCALE_NAME, DELIVERY_COMPANY, DELIVERY_DEPARTMENT, DELIVERY_FIRSTNAME, DELIVERY_LASTNAME, DELIVERY_STREET_ADDRESS, DELIVERY_SUBURB, DELIVERY_CITY, DELIVERY_STATE, DELIVERY_POSTCODE, DELIVERY_COUNTRY_NAME, DELIVERY_TELEPHONE, DELIVERY_LOCALE_NAME, BILLING_COMPANY, BILLING_DEPARTMENT, BILLING_FIRSTNAME, BILLING_LASTNAME, BILLING_STREET_ADDRESS, BILLING_SUBURB, BILLING_CITY, BILLING_STATE, BILLING_POSTCODE, BILLING_COUNTRY_NAME, BILLING_TELEPHONE, BILLING_LOCALE_NAME, PAYMENT_METHOD_ID, PAYMENT_METHOD_CODE, ORDER_CARD_INFO_ID, DELIVERY_METHOD_ID, DELIVERY_METHOD_CODE, LAST_MODIFIED, ORDER_STATUS_ID, PURCHASED_DATE, FINISHED_DATE, CURRENCY_ID, CURRENCY_CODE, DELIVERY_PRICE, FINAL_PRICE, TAX";
+        return "ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_DAY_OF_BIRTH, CUSTOMER_EMAIL_ADDRESS, CUSTOMER_COMPANY, CUSTOMER_DEPARTMENT, CUSTOMER_STREET_ADDRESS, CUSTOMER_SUBURB, CUSTOMER_CITY, CUSTOMER_STATE, CUSTOMER_POSTCODE, CUSTOMER_COUNTRY_NAME, CUSTOMER_TELEPHONE, CUSTOMER_LOCALE_NAME, DELIVERY_COMPANY, DELIVERY_DEPARTMENT, DELIVERY_FIRSTNAME, DELIVERY_LASTNAME, DELIVERY_STREET_ADDRESS, DELIVERY_SUBURB, DELIVERY_CITY, DELIVERY_STATE, DELIVERY_POSTCODE, DELIVERY_COUNTRY_NAME, DELIVERY_TELEPHONE, DELIVERY_LOCALE_NAME, BILLING_COMPANY, BILLING_DEPARTMENT, BILLING_FIRSTNAME, BILLING_LASTNAME, BILLING_STREET_ADDRESS, BILLING_SUBURB, BILLING_CITY, BILLING_STATE, BILLING_POSTCODE, BILLING_COUNTRY_NAME, BILLING_TELEPHONE, BILLING_LOCALE_NAME, PAYMENT_METHOD_ID, PAYMENT_METHOD_CODE, ORDER_CARD_INFO_ID, DELIVERY_METHOD_ID, DELIVERY_METHOD_CODE, LAST_MODIFIED, ORDER_STATUS_ID, PURCHASED_DATE, FINISHED_DATE, CURRENCY_ID, CURRENCY_CODE, DELIVERY_PRICE, SUB_TOTAL_PRICE, TAX, TOTAL_PRICE";
     }
 
     /**
@@ -1836,6 +1882,12 @@
         return new ColumnInfo(this, "ORDER_FORM_ID", "orderFormId", java.math.BigDecimal.class, true);
     }
     /**
+     * @return Column information of orderFormNumber. (NotNull)
+     */
+    public ColumnInfo columnOrderFormNumber() {
+        return new ColumnInfo(this, "ORDER_FORM_NUMBER", "orderFormNumber", String.class, false);
+    }
+    /**
      * @return Column information of customerId. (NotNull)
      */
     public ColumnInfo columnCustomerId() {
@@ -2148,10 +2200,10 @@
         return new ColumnInfo(this, "DELIVERY_PRICE", "deliveryPrice", java.math.BigDecimal.class, false);
     }
     /**
-     * @return Column information of finalPrice. (NotNull)
+     * @return Column information of subTotalPrice. (NotNull)
      */
-    public ColumnInfo columnFinalPrice() {
-        return new ColumnInfo(this, "FINAL_PRICE", "finalPrice", java.math.BigDecimal.class, false);
+    public ColumnInfo columnSubTotalPrice() {
+        return new ColumnInfo(this, "SUB_TOTAL_PRICE", "subTotalPrice", java.math.BigDecimal.class, false);
     }
     /**
      * @return Column information of tax. (NotNull)
@@ -2159,6 +2211,12 @@
     public ColumnInfo columnTax() {
         return new ColumnInfo(this, "TAX", "tax", java.math.BigDecimal.class, false);
     }
+    /**
+     * @return Column information of totalPrice. (NotNull)
+     */
+    public ColumnInfo columnTotalPrice() {
+        return new ColumnInfo(this, "TOTAL_PRICE", "totalPrice", java.math.BigDecimal.class, false);
+    }
 
     // ===================================================================================
     //                                                                         Unique Info
@@ -2489,6 +2547,7 @@
         }
 
         public RelationTrace columnOrderFormId() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnOrderFormId()); }
+        public RelationTrace columnOrderFormNumber() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnOrderFormNumber()); }
         public RelationTrace columnCustomerId() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnCustomerId()); }
         public RelationTrace columnCustomerGender() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnCustomerGender()); }
         public RelationTrace columnCustomerFirstname() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnCustomerFirstname()); }
@@ -2541,8 +2600,9 @@
         public RelationTrace columnCurrencyId() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnCurrencyId()); }
         public RelationTrace columnCurrencyCode() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnCurrencyCode()); }
         public RelationTrace columnDeliveryPrice() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnDeliveryPrice()); }
-        public RelationTrace columnFinalPrice() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnFinalPrice()); }
+        public RelationTrace columnSubTotalPrice() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnSubTotalPrice()); }
         public RelationTrace columnTax() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnTax()); }
+        public RelationTrace columnTotalPrice() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnTotalPrice()); }
     }
 
     // ===================================================================================
@@ -2614,6 +2674,7 @@
         final MapStringValueAnalyzer analyzer = new MapStringValueAnalyzer(columnValueMap, entity.getModifiedPropertyNames());
 
         if (analyzer.init("ORDER_FORM_ID", "orderFormId", "orderFormId")) { myEntity.setOrderFormId(analyzer.analyzeNumber(java.math.BigDecimal.class)); };
+        if (analyzer.init("ORDER_FORM_NUMBER", "orderFormNumber", "orderFormNumber")) { myEntity.setOrderFormNumber(analyzer.analyzeString(String.class)); };
         if (analyzer.init("CUSTOMER_ID", "customerId", "customerId")) { myEntity.setCustomerId(analyzer.analyzeNumber(java.math.BigDecimal.class)); };
         if (analyzer.init("CUSTOMER_GENDER", "customerGender", "customerGender")) { myEntity.setCustomerGender(analyzer.analyzeString(String.class)); };
         if (analyzer.init("CUSTOMER_FIRSTNAME", "customerFirstname", "customerFirstname")) { myEntity.setCustomerFirstname(analyzer.analyzeString(String.class)); };
@@ -2666,8 +2727,9 @@
         if (analyzer.init("CURRENCY_ID", "currencyId", "currencyId")) { myEntity.setCurrencyId(analyzer.analyzeNumber(java.math.BigDecimal.class)); };
         if (analyzer.init("CURRENCY_CODE", "currencyCode", "currencyCode")) { myEntity.setCurrencyCode(analyzer.analyzeString(String.class)); };
         if (analyzer.init("DELIVERY_PRICE", "deliveryPrice", "deliveryPrice")) { myEntity.setDeliveryPrice(analyzer.analyzeNumber(java.math.BigDecimal.class)); };
-        if (analyzer.init("FINAL_PRICE", "finalPrice", "finalPrice")) { myEntity.setFinalPrice(analyzer.analyzeNumber(java.math.BigDecimal.class)); };
+        if (analyzer.init("SUB_TOTAL_PRICE", "subTotalPrice", "subTotalPrice")) { myEntity.setSubTotalPrice(analyzer.analyzeNumber(java.math.BigDecimal.class)); };
         if (analyzer.init("TAX", "tax", "tax")) { myEntity.setTax(analyzer.analyzeNumber(java.math.BigDecimal.class)); };
+        if (analyzer.init("TOTAL_PRICE", "totalPrice", "totalPrice")) { myEntity.setTotalPrice(analyzer.analyzeNumber(java.math.BigDecimal.class)); };
 
     }
 
@@ -2741,6 +2803,7 @@
         final String mapMarkAndStartBrace = MAP_STRING_MAP_MARK + startBrace;
         final StringBuffer sb = new StringBuffer();
         helpAppendingColumnValueString(sb, delimiter, equal, "ORDER_FORM_ID", myEntity.getOrderFormId());
+        helpAppendingColumnValueString(sb, delimiter, equal, "ORDER_FORM_NUMBER", myEntity.getOrderFormNumber());
         helpAppendingColumnValueString(sb, delimiter, equal, "CUSTOMER_ID", myEntity.getCustomerId());
         helpAppendingColumnValueString(sb, delimiter, equal, "CUSTOMER_GENDER", myEntity.getCustomerGender());
         helpAppendingColumnValueString(sb, delimiter, equal, "CUSTOMER_FIRSTNAME", myEntity.getCustomerFirstname());
@@ -2793,8 +2856,9 @@
         helpAppendingColumnValueString(sb, delimiter, equal, "CURRENCY_ID", myEntity.getCurrencyId());
         helpAppendingColumnValueString(sb, delimiter, equal, "CURRENCY_CODE", myEntity.getCurrencyCode());
         helpAppendingColumnValueString(sb, delimiter, equal, "DELIVERY_PRICE", myEntity.getDeliveryPrice());
-        helpAppendingColumnValueString(sb, delimiter, equal, "FINAL_PRICE", myEntity.getFinalPrice());
+        helpAppendingColumnValueString(sb, delimiter, equal, "SUB_TOTAL_PRICE", myEntity.getSubTotalPrice());
         helpAppendingColumnValueString(sb, delimiter, equal, "TAX", myEntity.getTax());
+        helpAppendingColumnValueString(sb, delimiter, equal, "TOTAL_PRICE", myEntity.getTotalPrice());
 
         sb.delete(0, delimiter.length()).insert(0, mapMarkAndStartBrace).append(endBrace);
         return sb.toString();
@@ -2850,6 +2914,7 @@
         final OrderForm myEntity = downcast(entity);
         final java.util.Map<String, Object> valueMap = new java.util.LinkedHashMap<String, Object>();
         valueMap.put("ORDER_FORM_ID", myEntity.getOrderFormId());
+        valueMap.put("ORDER_FORM_NUMBER", myEntity.getOrderFormNumber());
         valueMap.put("CUSTOMER_ID", myEntity.getCustomerId());
         valueMap.put("CUSTOMER_GENDER", myEntity.getCustomerGender());
         valueMap.put("CUSTOMER_FIRSTNAME", myEntity.getCustomerFirstname());
@@ -2902,8 +2967,9 @@
         valueMap.put("CURRENCY_ID", myEntity.getCurrencyId());
         valueMap.put("CURRENCY_CODE", myEntity.getCurrencyCode());
         valueMap.put("DELIVERY_PRICE", myEntity.getDeliveryPrice());
-        valueMap.put("FINAL_PRICE", myEntity.getFinalPrice());
+        valueMap.put("SUB_TOTAL_PRICE", myEntity.getSubTotalPrice());
         valueMap.put("TAX", myEntity.getTax());
+        valueMap.put("TOTAL_PRICE", myEntity.getTotalPrice());
         return valueMap;
     }
 
@@ -2927,6 +2993,7 @@
         final OrderForm myEntity = downcast(entity);
         final java.util.Map<String, String> valueMap = new java.util.LinkedHashMap<String, String>();
         valueMap.put("ORDER_FORM_ID", helpGettingColumnStringValue(myEntity.getOrderFormId()));
+        valueMap.put("ORDER_FORM_NUMBER", helpGettingColumnStringValue(myEntity.getOrderFormNumber()));
         valueMap.put("CUSTOMER_ID", helpGettingColumnStringValue(myEntity.getCustomerId()));
         valueMap.put("CUSTOMER_GENDER", helpGettingColumnStringValue(myEntity.getCustomerGender()));
         valueMap.put("CUSTOMER_FIRSTNAME", helpGettingColumnStringValue(myEntity.getCustomerFirstname()));
@@ -2979,8 +3046,9 @@
         valueMap.put("CURRENCY_ID", helpGettingColumnStringValue(myEntity.getCurrencyId()));
         valueMap.put("CURRENCY_CODE", helpGettingColumnStringValue(myEntity.getCurrencyCode()));
         valueMap.put("DELIVERY_PRICE", helpGettingColumnStringValue(myEntity.getDeliveryPrice()));
-        valueMap.put("FINAL_PRICE", helpGettingColumnStringValue(myEntity.getFinalPrice()));
+        valueMap.put("SUB_TOTAL_PRICE", helpGettingColumnStringValue(myEntity.getSubTotalPrice()));
         valueMap.put("TAX", helpGettingColumnStringValue(myEntity.getTax()));
+        valueMap.put("TOTAL_PRICE", helpGettingColumnStringValue(myEntity.getTotalPrice()));
         return valueMap;
     }
 
@@ -3005,9 +3073,9 @@
     public String getPreparedInsertClause(PreparedInsertClauseOption preparedInsertClauseOption) {
         if (preparedInsertClauseOption.getTablePrefix() != null) {
             final String tablePrefix = preparedInsertClauseOption.getTablePrefix();
-            return "insert into " + tablePrefix + "ORDER_FORM(ORDER_FORM_ID, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_DAY_OF_BIRTH, CUSTOMER_EMAIL_ADDRESS, CUSTOMER_COMPANY, CUSTOMER_DEPARTMENT, CUSTOMER_STREET_ADDRESS, CUSTOMER_SUBURB, CUSTOMER_CITY, CUSTOMER_STATE, CUSTOMER_POSTCODE, CUSTOMER_COUNTRY_NAME, CUSTOMER_TELEPHONE, CUSTOMER_LOCALE_NAME, DELIVERY_COMPANY, DELIVERY_DEPARTMENT, DELIVERY_FIRSTNAME, DELIVERY_LASTNAME, DELIVERY_STREET_ADDRESS, DELIVERY_SUBURB, DELIVERY_CITY, DELIVERY_STATE, DELIVERY_POSTCODE, DELIVERY_COUNTRY_NAME, DELIVERY_TELEPHONE, DELIVERY_LOCALE_NAME, BILLING_COMPANY, BILLING_DEPARTMENT, BILLING_FIRSTNAME, BILLING_LASTNAME, BILLING_STREET_ADDRESS, BILLING_SUBURB, BILLING_CITY, BILLING_STATE, BILLING_POSTCODE, BILLING_COUNTRY_NAME, BILLING_TELEPHONE, BILLING_LOCALE_NAME, PAYMENT_METHOD_ID, PAYMENT_METHOD_CODE, ORDER_CARD_INFO_ID, DELIVERY_METHOD_ID, DELIVERY_METHOD_CODE, LAST_MODIFIED, ORDER_STATUS_ID, PURCHASED_DATE, FINISHED_DATE, CURRENCY_ID, CURRENCY_CODE, DELIVERY_PRICE, FINAL_PRICE, TAX) values(? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? )";
+            return "insert into " + tablePrefix + "ORDER_FORM(ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_DAY_OF_BIRTH, CUSTOMER_EMAIL_ADDRESS, CUSTOMER_COMPANY, CUSTOMER_DEPARTMENT, CUSTOMER_STREET_ADDRESS, CUSTOMER_SUBURB, CUSTOMER_CITY, CUSTOMER_STATE, CUSTOMER_POSTCODE, CUSTOMER_COUNTRY_NAME, CUSTOMER_TELEPHONE, CUSTOMER_LOCALE_NAME, DELIVERY_COMPANY, DELIVERY_DEPARTMENT, DELIVERY_FIRSTNAME, DELIVERY_LASTNAME, DELIVERY_STREET_ADDRESS, DELIVERY_SUBURB, DELIVERY_CITY, DELIVERY_STATE, DELIVERY_POSTCODE, DELIVERY_COUNTRY_NAME, DELIVERY_TELEPHONE, DELIVERY_LOCALE_NAME, BILLING_COMPANY, BILLING_DEPARTMENT, BILLING_FIRSTNAME, BILLING_LASTNAME, BILLING_STREET_ADDRESS, BILLING_SUBURB, BILLING_CITY, BILLING_STATE, BILLING_POSTCODE, BILLING_COUNTRY_NAME, BILLING_TELEPHONE, BILLING_LOCALE_NAME, PAYMENT_METHOD_ID, PAYMENT_METHOD_CODE, ORDER_CARD_INFO_ID, DELIVERY_METHOD_ID, DELIVERY_METHOD_CODE, LAST_MODIFIED, ORDER_STATUS_ID, PURCHASED_DATE, FINISHED_DATE, CURRENCY_ID, CURRENCY_CODE, DELIVERY_PRICE, SUB_TOTAL_PRICE, TAX, TOTAL_PRICE) values(? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? )";
         }
-        return "insert into ORDER_FORM(ORDER_FORM_ID, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_DAY_OF_BIRTH, CUSTOMER_EMAIL_ADDRESS, CUSTOMER_COMPANY, CUSTOMER_DEPARTMENT, CUSTOMER_STREET_ADDRESS, CUSTOMER_SUBURB, CUSTOMER_CITY, CUSTOMER_STATE, CUSTOMER_POSTCODE, CUSTOMER_COUNTRY_NAME, CUSTOMER_TELEPHONE, CUSTOMER_LOCALE_NAME, DELIVERY_COMPANY, DELIVERY_DEPARTMENT, DELIVERY_FIRSTNAME, DELIVERY_LASTNAME, DELIVERY_STREET_ADDRESS, DELIVERY_SUBURB, DELIVERY_CITY, DELIVERY_STATE, DELIVERY_POSTCODE, DELIVERY_COUNTRY_NAME, DELIVERY_TELEPHONE, DELIVERY_LOCALE_NAME, BILLING_COMPANY, BILLING_DEPARTMENT, BILLING_FIRSTNAME, BILLING_LASTNAME, BILLING_STREET_ADDRESS, BILLING_SUBURB, BILLING_CITY, BILLING_STATE, BILLING_POSTCODE, BILLING_COUNTRY_NAME, BILLING_TELEPHONE, BILLING_LOCALE_NAME, PAYMENT_METHOD_ID, PAYMENT_METHOD_CODE, ORDER_CARD_INFO_ID, DELIVERY_METHOD_ID, DELIVERY_METHOD_CODE, LAST_MODIFIED, ORDER_STATUS_ID, PURCHASED_DATE, FINISHED_DATE, CURRENCY_ID, CURRENCY_CODE, DELIVERY_PRICE, FINAL_PRICE, TAX) values(? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? )";
+        return "insert into ORDER_FORM(ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_DAY_OF_BIRTH, CUSTOMER_EMAIL_ADDRESS, CUSTOMER_COMPANY, CUSTOMER_DEPARTMENT, CUSTOMER_STREET_ADDRESS, CUSTOMER_SUBURB, CUSTOMER_CITY, CUSTOMER_STATE, CUSTOMER_POSTCODE, CUSTOMER_COUNTRY_NAME, CUSTOMER_TELEPHONE, CUSTOMER_LOCALE_NAME, DELIVERY_COMPANY, DELIVERY_DEPARTMENT, DELIVERY_FIRSTNAME, DELIVERY_LASTNAME, DELIVERY_STREET_ADDRESS, DELIVERY_SUBURB, DELIVERY_CITY, DELIVERY_STATE, DELIVERY_POSTCODE, DELIVERY_COUNTRY_NAME, DELIVERY_TELEPHONE, DELIVERY_LOCALE_NAME, BILLING_COMPANY, BILLING_DEPARTMENT, BILLING_FIRSTNAME, BILLING_LASTNAME, BILLING_STREET_ADDRESS, BILLING_SUBURB, BILLING_CITY, BILLING_STATE, BILLING_POSTCODE, BILLING_COUNTRY_NAME, BILLING_TELEPHONE, BILLING_LOCALE_NAME, PAYMENT_METHOD_ID, PAYMENT_METHOD_CODE, ORDER_CARD_INFO_ID, DELIVERY_METHOD_ID, DELIVERY_METHOD_CODE, LAST_MODIFIED, ORDER_STATUS_ID, PURCHASED_DATE, FINISHED_DATE, CURRENCY_ID, CURRENCY_CODE, DELIVERY_PRICE, SUB_TOTAL_PRICE, TAX, TOTAL_PRICE) values(? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? )";
     }
 
     // ===================================================================================

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderProductDbm.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderProductDbm.java	2007-09-23 07:44:28 UTC (rev 576)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderProductDbm.java	2007-09-23 07:48:26 UTC (rev 577)
@@ -16,7 +16,7 @@
  *     ORDER_PRODUCT_ID
  * 
  * [column-property]
- *     ORDER_PRODUCT_ID, ORDER_FORM_ID, PRODUCT_ID, MODEL, NAME, PRICE, FINAL_PRICE, TAX, QUANTITY
+ *     ORDER_PRODUCT_ID, ORDER_FORM_ID, PRODUCT_ID, MODEL, PRICE, FINAL_PRICE, TAX, QUANTITY
  * 
  * [foreign-property]
  *     orderForm, product
@@ -99,10 +99,8 @@
     public static final String DB_NAME_ORDER_FORM_ID = "ORDER_FORM_ID";
     /** Db-name of PRODUCT_ID. BIGINT : NotNull : FK to PRODUCT */
     public static final String DB_NAME_PRODUCT_ID = "PRODUCT_ID";
-    /** Db-name of MODEL. VARCHAR(32) */
+    /** Db-name of MODEL. VARCHAR(64) */
     public static final String DB_NAME_MODEL = "MODEL";
-    /** Db-name of NAME. VARCHAR(64) : NotNull */
-    public static final String DB_NAME_NAME = "NAME";
     /** Db-name of PRICE. DECIMAL(15) : NotNull */
     public static final String DB_NAME_PRICE = "PRICE";
     /** Db-name of FINAL_PRICE. DECIMAL(15) : NotNull */
@@ -120,8 +118,6 @@
     public static final String COLUMN_DB_NAME_OF_ProductId = "PRODUCT_ID";
     /** @deprecated Deprecated! So use DB_NAME_Model. */
     public static final String COLUMN_DB_NAME_OF_Model = "MODEL";
-    /** @deprecated Deprecated! So use DB_NAME_Name. */
-    public static final String COLUMN_DB_NAME_OF_Name = "NAME";
     /** @deprecated Deprecated! So use DB_NAME_Price. */
     public static final String COLUMN_DB_NAME_OF_Price = "PRICE";
     /** @deprecated Deprecated! So use DB_NAME_FinalPrice. */
@@ -140,10 +136,8 @@
     public static final String PROPERTY_NAME_orderFormId = "orderFormId";
     /** Prop-name(JavaBeansRule) of productId. BIGINT : NotNull : FK to PRODUCT */
     public static final String PROPERTY_NAME_productId = "productId";
-    /** Prop-name(JavaBeansRule) of model. VARCHAR(32) */
+    /** Prop-name(JavaBeansRule) of model. VARCHAR(64) */
     public static final String PROPERTY_NAME_model = "model";
-    /** Prop-name(JavaBeansRule) of name. VARCHAR(64) : NotNull */
-    public static final String PROPERTY_NAME_name = "name";
     /** Prop-name(JavaBeansRule) of price. DECIMAL(15) : NotNull */
     public static final String PROPERTY_NAME_price = "price";
     /** Prop-name(JavaBeansRule) of finalPrice. DECIMAL(15) : NotNull */
@@ -162,10 +156,8 @@
     public static final String CAP_PROP_NAME_OrderFormId = "OrderFormId";
     /** Cap-prop-name of productId. BIGINT : NotNull : FK to PRODUCT */
     public static final String CAP_PROP_NAME_ProductId = "ProductId";
-    /** Cap-prop-name of model. VARCHAR(32) */
+    /** Cap-prop-name of model. VARCHAR(64) */
     public static final String CAP_PROP_NAME_Model = "Model";
-    /** Cap-prop-name of name. VARCHAR(64) : NotNull */
-    public static final String CAP_PROP_NAME_Name = "Name";
     /** Cap-prop-name of price. DECIMAL(15) : NotNull */
     public static final String CAP_PROP_NAME_Price = "Price";
     /** Cap-prop-name of finalPrice. DECIMAL(15) : NotNull */
@@ -183,8 +175,6 @@
     public static final String COLUMN_CAP_PROP_NAME_OF_ProductId = "ProductId";
     /** @deprecated Deprecated! So use CAP_PROP_NAME_Model. */
     public static final String COLUMN_CAP_PROP_NAME_OF_Model = "Model";
-    /** @deprecated Deprecated! So use CAP_PROP_NAME_Name. */
-    public static final String COLUMN_CAP_PROP_NAME_OF_Name = "Name";
     /** @deprecated Deprecated! So use CAP_PROP_NAME_Price. */
     public static final String COLUMN_CAP_PROP_NAME_OF_Price = "Price";
     /** @deprecated Deprecated! So use CAP_PROP_NAME_FinalPrice. */
@@ -203,10 +193,8 @@
     public static final String UNCAP_PROP_NAME_orderFormId = "orderFormId";
     /** Uncap-prop-name of productId. BIGINT : NotNull : FK to PRODUCT */
     public static final String UNCAP_PROP_NAME_productId = "productId";
-    /** Uncap-prop-name of model. VARCHAR(32) */
+    /** Uncap-prop-name of model. VARCHAR(64) */
     public static final String UNCAP_PROP_NAME_model = "model";
-    /** Uncap-prop-name of name. VARCHAR(64) : NotNull */
-    public static final String UNCAP_PROP_NAME_name = "name";
     /** Uncap-prop-name of price. DECIMAL(15) : NotNull */
     public static final String UNCAP_PROP_NAME_price = "price";
     /** Uncap-prop-name of finalPrice. DECIMAL(15) : NotNull */
@@ -224,8 +212,6 @@
     public static final String COLUMN_UNCAP_PROP_NAME_OF_ProductId = "productId";
     /** @deprecated Deprecated! So use UNCAP_PROP_NAME_Model. */
     public static final String COLUMN_UNCAP_PROP_NAME_OF_Model = "model";
-    /** @deprecated Deprecated! So use UNCAP_PROP_NAME_Name. */
-    public static final String COLUMN_UNCAP_PROP_NAME_OF_Name = "name";
     /** @deprecated Deprecated! So use UNCAP_PROP_NAME_Price. */
     public static final String COLUMN_UNCAP_PROP_NAME_OF_Price = "price";
     /** @deprecated Deprecated! So use UNCAP_PROP_NAME_FinalPrice. */
@@ -270,7 +256,6 @@
         map.put(DB_NAME_ORDER_FORM_ID.toLowerCase(), PROPERTY_NAME_orderFormId);
         map.put(DB_NAME_PRODUCT_ID.toLowerCase(), PROPERTY_NAME_productId);
         map.put(DB_NAME_MODEL.toLowerCase(), PROPERTY_NAME_model);
-        map.put(DB_NAME_NAME.toLowerCase(), PROPERTY_NAME_name);
         map.put(DB_NAME_PRICE.toLowerCase(), PROPERTY_NAME_price);
         map.put(DB_NAME_FINAL_PRICE.toLowerCase(), PROPERTY_NAME_finalPrice);
         map.put(DB_NAME_TAX.toLowerCase(), PROPERTY_NAME_tax);
@@ -293,7 +278,6 @@
         map.put(PROPERTY_NAME_orderFormId.toLowerCase(), DB_NAME_ORDER_FORM_ID);
         map.put(PROPERTY_NAME_productId.toLowerCase(), DB_NAME_PRODUCT_ID);
         map.put(PROPERTY_NAME_model.toLowerCase(), DB_NAME_MODEL);
-        map.put(PROPERTY_NAME_name.toLowerCase(), DB_NAME_NAME);
         map.put(PROPERTY_NAME_price.toLowerCase(), DB_NAME_PRICE);
         map.put(PROPERTY_NAME_finalPrice.toLowerCase(), DB_NAME_FINAL_PRICE);
         map.put(PROPERTY_NAME_tax.toLowerCase(), DB_NAME_TAX);
@@ -318,7 +302,6 @@
         map.put(DB_NAME_ORDER_FORM_ID, CAP_PROP_NAME_OrderFormId);
         map.put(DB_NAME_PRODUCT_ID, CAP_PROP_NAME_ProductId);
         map.put(DB_NAME_MODEL, CAP_PROP_NAME_Model);
-        map.put(DB_NAME_NAME, CAP_PROP_NAME_Name);
         map.put(DB_NAME_PRICE, CAP_PROP_NAME_Price);
         map.put(DB_NAME_FINAL_PRICE, CAP_PROP_NAME_FinalPrice);
         map.put(DB_NAME_TAX, CAP_PROP_NAME_Tax);
@@ -343,7 +326,6 @@
         map.put(DB_NAME_ORDER_FORM_ID, UNCAP_PROP_NAME_orderFormId);
         map.put(DB_NAME_PRODUCT_ID, UNCAP_PROP_NAME_productId);
         map.put(DB_NAME_MODEL, UNCAP_PROP_NAME_model);
-        map.put(DB_NAME_NAME, UNCAP_PROP_NAME_name);
         map.put(DB_NAME_PRICE, UNCAP_PROP_NAME_price);
         map.put(DB_NAME_FINAL_PRICE, UNCAP_PROP_NAME_finalPrice);
         map.put(DB_NAME_TAX, UNCAP_PROP_NAME_tax);
@@ -368,7 +350,6 @@
         map.put(CAP_PROP_NAME_OrderFormId, DB_NAME_ORDER_FORM_ID);
         map.put(CAP_PROP_NAME_ProductId, DB_NAME_PRODUCT_ID);
         map.put(CAP_PROP_NAME_Model, DB_NAME_MODEL);
-        map.put(CAP_PROP_NAME_Name, DB_NAME_NAME);
         map.put(CAP_PROP_NAME_Price, DB_NAME_PRICE);
         map.put(CAP_PROP_NAME_FinalPrice, DB_NAME_FINAL_PRICE);
         map.put(CAP_PROP_NAME_Tax, DB_NAME_TAX);
@@ -393,7 +374,6 @@
         map.put(CAP_PROP_NAME_OrderFormId, UNCAP_PROP_NAME_orderFormId);
         map.put(CAP_PROP_NAME_ProductId, UNCAP_PROP_NAME_productId);
         map.put(CAP_PROP_NAME_Model, UNCAP_PROP_NAME_model);
-        map.put(CAP_PROP_NAME_Name, UNCAP_PROP_NAME_name);
         map.put(CAP_PROP_NAME_Price, UNCAP_PROP_NAME_price);
         map.put(CAP_PROP_NAME_FinalPrice, UNCAP_PROP_NAME_finalPrice);
         map.put(CAP_PROP_NAME_Tax, UNCAP_PROP_NAME_tax);
@@ -418,7 +398,6 @@
         map.put(UNCAP_PROP_NAME_orderFormId, DB_NAME_ORDER_FORM_ID);
         map.put(UNCAP_PROP_NAME_productId, DB_NAME_PRODUCT_ID);
         map.put(UNCAP_PROP_NAME_model, DB_NAME_MODEL);
-        map.put(UNCAP_PROP_NAME_name, DB_NAME_NAME);
         map.put(UNCAP_PROP_NAME_price, DB_NAME_PRICE);
         map.put(UNCAP_PROP_NAME_finalPrice, DB_NAME_FINAL_PRICE);
         map.put(UNCAP_PROP_NAME_tax, DB_NAME_TAX);
@@ -443,7 +422,6 @@
         map.put(UNCAP_PROP_NAME_orderFormId, CAP_PROP_NAME_OrderFormId);
         map.put(UNCAP_PROP_NAME_productId, CAP_PROP_NAME_ProductId);
         map.put(UNCAP_PROP_NAME_model, CAP_PROP_NAME_Model);
-        map.put(UNCAP_PROP_NAME_name, CAP_PROP_NAME_Name);
         map.put(UNCAP_PROP_NAME_price, CAP_PROP_NAME_Price);
         map.put(UNCAP_PROP_NAME_finalPrice, CAP_PROP_NAME_FinalPrice);
         map.put(UNCAP_PROP_NAME_tax, CAP_PROP_NAME_Tax);
@@ -660,7 +638,6 @@
         columnInfoList.add(columnOrderFormId());
         columnInfoList.add(columnProductId());
         columnInfoList.add(columnModel());
-        columnInfoList.add(columnName());
         columnInfoList.add(columnPrice());
         columnInfoList.add(columnFinalPrice());
         columnInfoList.add(columnTax());
@@ -720,7 +697,7 @@
      * @deprecated Please use getColumnInfoList()
      */
     public String getColumnDbNameCommaString() {
-        return "ORDER_PRODUCT_ID, ORDER_FORM_ID, PRODUCT_ID, MODEL, NAME, PRICE, FINAL_PRICE, TAX, QUANTITY";
+        return "ORDER_PRODUCT_ID, ORDER_FORM_ID, PRODUCT_ID, MODEL, PRICE, FINAL_PRICE, TAX, QUANTITY";
     }
 
     /**
@@ -748,12 +725,6 @@
         return new ColumnInfo(this, "MODEL", "model", String.class, false);
     }
     /**
-     * @return Column information of name. (NotNull)
-     */
-    public ColumnInfo columnName() {
-        return new ColumnInfo(this, "NAME", "name", String.class, false);
-    }
-    /**
      * @return Column information of price. (NotNull)
      */
     public ColumnInfo columnPrice() {
@@ -921,7 +892,6 @@
         public RelationTrace columnOrderFormId() { return fixTrace(_relationList, OrderProductDbm.getInstance().columnOrderFormId()); }
         public RelationTrace columnProductId() { return fixTrace(_relationList, OrderProductDbm.getInstance().columnProductId()); }
         public RelationTrace columnModel() { return fixTrace(_relationList, OrderProductDbm.getInstance().columnModel()); }
-        public RelationTrace columnName() { return fixTrace(_relationList, OrderProductDbm.getInstance().columnName()); }
         public RelationTrace columnPrice() { return fixTrace(_relationList, OrderProductDbm.getInstance().columnPrice()); }
         public RelationTrace columnFinalPrice() { return fixTrace(_relationList, OrderProductDbm.getInstance().columnFinalPrice()); }
         public RelationTrace columnTax() { return fixTrace(_relationList, OrderProductDbm.getInstance().columnTax()); }
@@ -1000,7 +970,6 @@
         if (analyzer.init("ORDER_FORM_ID", "orderFormId", "orderFormId")) { myEntity.setOrderFormId(analyzer.analyzeNumber(java.math.BigDecimal.class)); };
         if (analyzer.init("PRODUCT_ID", "productId", "productId")) { myEntity.setProductId(analyzer.analyzeNumber(java.math.BigDecimal.class)); };
         if (analyzer.init("MODEL", "model", "model")) { myEntity.setModel(analyzer.analyzeString(String.class)); };
-        if (analyzer.init("NAME", "name", "name")) { myEntity.setName(analyzer.analyzeString(String.class)); };
         if (analyzer.init("PRICE", "price", "price")) { myEntity.setPrice(analyzer.analyzeNumber(java.math.BigDecimal.class)); };
         if (analyzer.init("FINAL_PRICE", "finalPrice", "finalPrice")) { myEntity.setFinalPrice(analyzer.analyzeNumber(java.math.BigDecimal.class)); };
         if (analyzer.init("TAX", "tax", "tax")) { myEntity.setTax(analyzer.analyzeNumber(java.math.BigDecimal.class)); };
@@ -1081,7 +1050,6 @@
         helpAppendingColumnValueString(sb, delimiter, equal, "ORDER_FORM_ID", myEntity.getOrderFormId());
         helpAppendingColumnValueString(sb, delimiter, equal, "PRODUCT_ID", myEntity.getProductId());
         helpAppendingColumnValueString(sb, delimiter, equal, "MODEL", myEntity.getModel());
-        helpAppendingColumnValueString(sb, delimiter, equal, "NAME", myEntity.getName());
         helpAppendingColumnValueString(sb, delimiter, equal, "PRICE", myEntity.getPrice());
         helpAppendingColumnValueString(sb, delimiter, equal, "FINAL_PRICE", myEntity.getFinalPrice());
         helpAppendingColumnValueString(sb, delimiter, equal, "TAX", myEntity.getTax());
@@ -1144,7 +1112,6 @@
         valueMap.put("ORDER_FORM_ID", myEntity.getOrderFormId());
         valueMap.put("PRODUCT_ID", myEntity.getProductId());
         valueMap.put("MODEL", myEntity.getModel());
-        valueMap.put("NAME", myEntity.getName());
         valueMap.put("PRICE", myEntity.getPrice());
         valueMap.put("FINAL_PRICE", myEntity.getFinalPrice());
         valueMap.put("TAX", myEntity.getTax());
@@ -1175,7 +1142,6 @@
         valueMap.put("ORDER_FORM_ID", helpGettingColumnStringValue(myEntity.getOrderFormId()));
         valueMap.put("PRODUCT_ID", helpGettingColumnStringValue(myEntity.getProductId()));
         valueMap.put("MODEL", helpGettingColumnStringValue(myEntity.getModel()));
-        valueMap.put("NAME", helpGettingColumnStringValue(myEntity.getName()));
         valueMap.put("PRICE", helpGettingColumnStringValue(myEntity.getPrice()));
         valueMap.put("FINAL_PRICE", helpGettingColumnStringValue(myEntity.getFinalPrice()));
         valueMap.put("TAX", helpGettingColumnStringValue(myEntity.getTax()));
@@ -1204,9 +1170,9 @@
     public String getPreparedInsertClause(PreparedInsertClauseOption preparedInsertClauseOption) {
         if (preparedInsertClauseOption.getTablePrefix() != null) {
             final String tablePrefix = preparedInsertClauseOption.getTablePrefix();
-            return "insert into " + tablePrefix + "ORDER_PRODUCT(ORDER_PRODUCT_ID, ORDER_FORM_ID, PRODUCT_ID, MODEL, NAME, PRICE, FINAL_PRICE, TAX, QUANTITY) values(? , ? , ? , ? , ? , ? , ? , ? , ? )";
+            return "insert into " + tablePrefix + "ORDER_PRODUCT(ORDER_PRODUCT_ID, ORDER_FORM_ID, PRODUCT_ID, MODEL, PRICE, FINAL_PRICE, TAX, QUANTITY) values(? , ? , ? , ? , ? , ? , ? , ? )";
         }
-        return "insert into ORDER_PRODUCT(ORDER_PRODUCT_ID, ORDER_FORM_ID, PRODUCT_ID, MODEL, NAME, PRICE, FINAL_PRICE, TAX, QUANTITY) values(? , ? , ? , ? , ? , ? , ? , ? , ? )";
+        return "insert into ORDER_PRODUCT(ORDER_PRODUCT_ID, ORDER_FORM_ID, PRODUCT_ID, MODEL, PRICE, FINAL_PRICE, TAX, QUANTITY) values(? , ? , ? , ? , ? , ? , ? , ? )";
     }
 
     // ===================================================================================

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/ProductDbm.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/ProductDbm.java	2007-09-23 07:44:28 UTC (rev 576)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/ProductDbm.java	2007-09-23 07:48:26 UTC (rev 577)
@@ -16,7 +16,7 @@
  *     PRODUCT_ID
  * 
  * [column-property]
- *     PRODUCT_ID, MODEL, QUANTITY, PRICE, WEIGHT, IMAGE, THUMBNAIL, STOCK, ORDERED, STATUS, DATE_ADDED, LAST_MODIFIED, DATE_AVAILABLE, TAX_CLASS_ID, MANUFACTURER_ID
+ *     PRODUCT_ID, MODEL, QUANTITY, PRICE, WEIGHT, IMAGE, THUMBNAIL, ORDERED, STATUS, DATE_ADDED, LAST_MODIFIED, DATE_AVAILABLE, TAX_CLASS_ID, MANUFACTURER_ID
  * 
  * [foreign-property]
  *     manufacturer, taxClass
@@ -95,9 +95,9 @@
     //                                        --------------
     /** Db-name of PRODUCT_ID. PK : INC : BIGINT : NotNull : Default=[GENERATED_BY_DEFAULT] */
     public static final String DB_NAME_PRODUCT_ID = "PRODUCT_ID";
-    /** Db-name of MODEL. VARCHAR(32) */
+    /** Db-name of MODEL. VARCHAR(64) */
     public static final String DB_NAME_MODEL = "MODEL";
-    /** Db-name of QUANTITY. INTEGER : NotNull */
+    /** Db-name of QUANTITY. INTEGER */
     public static final String DB_NAME_QUANTITY = "QUANTITY";
     /** Db-name of PRICE. DECIMAL(15) : NotNull */
     public static final String DB_NAME_PRICE = "PRICE";
@@ -107,8 +107,6 @@
     public static final String DB_NAME_IMAGE = "IMAGE";
     /** Db-name of THUMBNAIL. VARCHAR(64) */
     public static final String DB_NAME_THUMBNAIL = "THUMBNAIL";
-    /** Db-name of STOCK. INTEGER */
-    public static final String DB_NAME_STOCK = "STOCK";
     /** Db-name of ORDERED. INTEGER : NotNull : Default=[0] */
     public static final String DB_NAME_ORDERED = "ORDERED";
     /** Db-name of STATUS. INTEGER : NotNull */
@@ -138,8 +136,6 @@
     public static final String COLUMN_DB_NAME_OF_Image = "IMAGE";
     /** @deprecated Deprecated! So use DB_NAME_Thumbnail. */
     public static final String COLUMN_DB_NAME_OF_Thumbnail = "THUMBNAIL";
-    /** @deprecated Deprecated! So use DB_NAME_Stock. */
-    public static final String COLUMN_DB_NAME_OF_Stock = "STOCK";
     /** @deprecated Deprecated! So use DB_NAME_Ordered. */
     public static final String COLUMN_DB_NAME_OF_Ordered = "ORDERED";
     /** @deprecated Deprecated! So use DB_NAME_Status. */
@@ -160,9 +156,9 @@
     //                       -------------------------------
     /** Prop-name(JavaBeansRule) of productId. PK : INC : BIGINT : NotNull : Default=[GENERATED_BY_DEFAULT] */
     public static final String PROPERTY_NAME_productId = "productId";
-    /** Prop-name(JavaBeansRule) of model. VARCHAR(32) */
+    /** Prop-name(JavaBeansRule) of model. VARCHAR(64) */
     public static final String PROPERTY_NAME_model = "model";
-    /** Prop-name(JavaBeansRule) of quantity. INTEGER : NotNull */
+    /** Prop-name(JavaBeansRule) of quantity. INTEGER */
     public static final String PROPERTY_NAME_quantity = "quantity";
     /** Prop-name(JavaBeansRule) of price. DECIMAL(15) : NotNull */
     public static final String PROPERTY_NAME_price = "price";
@@ -172,8 +168,6 @@
     public static final String PROPERTY_NAME_image = "image";
     /** Prop-name(JavaBeansRule) of thumbnail. VARCHAR(64) */
     public static final String PROPERTY_NAME_thumbnail = "thumbnail";
-    /** Prop-name(JavaBeansRule) of stock. INTEGER */
-    public static final String PROPERTY_NAME_stock = "stock";
     /** Prop-name(JavaBeansRule) of ordered. INTEGER : NotNull : Default=[0] */
     public static final String PROPERTY_NAME_ordered = "ordered";
     /** Prop-name(JavaBeansRule) of status. INTEGER : NotNull */
@@ -194,9 +188,9 @@
     //                                  --------------------
     /** Cap-prop-name of productId. PK : INC : BIGINT : NotNull : Default=[GENERATED_BY_DEFAULT] */
     public static final String CAP_PROP_NAME_ProductId = "ProductId";
-    /** Cap-prop-name of model. VARCHAR(32) */
+    /** Cap-prop-name of model. VARCHAR(64) */
     public static final String CAP_PROP_NAME_Model = "Model";
-    /** Cap-prop-name of quantity. INTEGER : NotNull */
+    /** Cap-prop-name of quantity. INTEGER */
     public static final String CAP_PROP_NAME_Quantity = "Quantity";
     /** Cap-prop-name of price. DECIMAL(15) : NotNull */
     public static final String CAP_PROP_NAME_Price = "Price";
@@ -206,8 +200,6 @@
     public static final String CAP_PROP_NAME_Image = "Image";
     /** Cap-prop-name of thumbnail. VARCHAR(64) */
     public static final String CAP_PROP_NAME_Thumbnail = "Thumbnail";
-    /** Cap-prop-name of stock. INTEGER */
-    public static final String CAP_PROP_NAME_Stock = "Stock";
     /** Cap-prop-name of ordered. INTEGER : NotNull : Default=[0] */
     public static final String CAP_PROP_NAME_Ordered = "Ordered";
     /** Cap-prop-name of status. INTEGER : NotNull */
@@ -237,8 +229,6 @@
     public static final String COLUMN_CAP_PROP_NAME_OF_Image = "Image";
     /** @deprecated Deprecated! So use CAP_PROP_NAME_Thumbnail. */
     public static final String COLUMN_CAP_PROP_NAME_OF_Thumbnail = "Thumbnail";
-    /** @deprecated Deprecated! So use CAP_PROP_NAME_Stock. */
-    public static final String COLUMN_CAP_PROP_NAME_OF_Stock = "Stock";
     /** @deprecated Deprecated! So use CAP_PROP_NAME_Ordered. */
     public static final String COLUMN_CAP_PROP_NAME_OF_Ordered = "Ordered";
     /** @deprecated Deprecated! So use CAP_PROP_NAME_Status. */
@@ -259,9 +249,9 @@
     //                                ----------------------
     /** Uncap-prop-name of productId. PK : INC : BIGINT : NotNull : Default=[GENERATED_BY_DEFAULT] */
     public static final String UNCAP_PROP_NAME_productId = "productId";
-    /** Uncap-prop-name of model. VARCHAR(32) */
+    /** Uncap-prop-name of model. VARCHAR(64) */
     public static final String UNCAP_PROP_NAME_model = "model";
-    /** Uncap-prop-name of quantity. INTEGER : NotNull */
+    /** Uncap-prop-name of quantity. INTEGER */
     public static final String UNCAP_PROP_NAME_quantity = "quantity";
     /** Uncap-prop-name of price. DECIMAL(15) : NotNull */
     public static final String UNCAP_PROP_NAME_price = "price";
@@ -271,8 +261,6 @@
     public static final String UNCAP_PROP_NAME_image = "image";
     /** Uncap-prop-name of thumbnail. VARCHAR(64) */
     public static final String UNCAP_PROP_NAME_thumbnail = "thumbnail";
-    /** Uncap-prop-name of stock. INTEGER */
-    public static final String UNCAP_PROP_NAME_stock = "stock";
     /** Uncap-prop-name of ordered. INTEGER : NotNull : Default=[0] */
     public static final String UNCAP_PROP_NAME_ordered = "ordered";
     /** Uncap-prop-name of status. INTEGER : NotNull */
@@ -302,8 +290,6 @@
     public static final String COLUMN_UNCAP_PROP_NAME_OF_Image = "image";
     /** @deprecated Deprecated! So use UNCAP_PROP_NAME_Thumbnail. */
     public static final String COLUMN_UNCAP_PROP_NAME_OF_Thumbnail = "thumbnail";
-    /** @deprecated Deprecated! So use UNCAP_PROP_NAME_Stock. */
-    public static final String COLUMN_UNCAP_PROP_NAME_OF_Stock = "stock";
     /** @deprecated Deprecated! So use UNCAP_PROP_NAME_Ordered. */
     public static final String COLUMN_UNCAP_PROP_NAME_OF_Ordered = "ordered";
     /** @deprecated Deprecated! So use UNCAP_PROP_NAME_Status. */
@@ -423,7 +409,6 @@
         map.put(DB_NAME_WEIGHT.toLowerCase(), PROPERTY_NAME_weight);
         map.put(DB_NAME_IMAGE.toLowerCase(), PROPERTY_NAME_image);
         map.put(DB_NAME_THUMBNAIL.toLowerCase(), PROPERTY_NAME_thumbnail);
-        map.put(DB_NAME_STOCK.toLowerCase(), PROPERTY_NAME_stock);
         map.put(DB_NAME_ORDERED.toLowerCase(), PROPERTY_NAME_ordered);
         map.put(DB_NAME_STATUS.toLowerCase(), PROPERTY_NAME_status);
         map.put(DB_NAME_DATE_ADDED.toLowerCase(), PROPERTY_NAME_dateAdded);
@@ -452,7 +437,6 @@
         map.put(PROPERTY_NAME_weight.toLowerCase(), DB_NAME_WEIGHT);
         map.put(PROPERTY_NAME_image.toLowerCase(), DB_NAME_IMAGE);
         map.put(PROPERTY_NAME_thumbnail.toLowerCase(), DB_NAME_THUMBNAIL);
-        map.put(PROPERTY_NAME_stock.toLowerCase(), DB_NAME_STOCK);
         map.put(PROPERTY_NAME_ordered.toLowerCase(), DB_NAME_ORDERED);
         map.put(PROPERTY_NAME_status.toLowerCase(), DB_NAME_STATUS);
         map.put(PROPERTY_NAME_dateAdded.toLowerCase(), DB_NAME_DATE_ADDED);
@@ -483,7 +467,6 @@
         map.put(DB_NAME_WEIGHT, CAP_PROP_NAME_Weight);
         map.put(DB_NAME_IMAGE, CAP_PROP_NAME_Image);
         map.put(DB_NAME_THUMBNAIL, CAP_PROP_NAME_Thumbnail);
-        map.put(DB_NAME_STOCK, CAP_PROP_NAME_Stock);
         map.put(DB_NAME_ORDERED, CAP_PROP_NAME_Ordered);
         map.put(DB_NAME_STATUS, CAP_PROP_NAME_Status);
         map.put(DB_NAME_DATE_ADDED, CAP_PROP_NAME_DateAdded);
@@ -514,7 +497,6 @@
         map.put(DB_NAME_WEIGHT, UNCAP_PROP_NAME_weight);
         map.put(DB_NAME_IMAGE, UNCAP_PROP_NAME_image);
         map.put(DB_NAME_THUMBNAIL, UNCAP_PROP_NAME_thumbnail);
-        map.put(DB_NAME_STOCK, UNCAP_PROP_NAME_stock);
         map.put(DB_NAME_ORDERED, UNCAP_PROP_NAME_ordered);
         map.put(DB_NAME_STATUS, UNCAP_PROP_NAME_status);
         map.put(DB_NAME_DATE_ADDED, UNCAP_PROP_NAME_dateAdded);
@@ -545,7 +527,6 @@
         map.put(CAP_PROP_NAME_Weight, DB_NAME_WEIGHT);
         map.put(CAP_PROP_NAME_Image, DB_NAME_IMAGE);
         map.put(CAP_PROP_NAME_Thumbnail, DB_NAME_THUMBNAIL);
-        map.put(CAP_PROP_NAME_Stock, DB_NAME_STOCK);
         map.put(CAP_PROP_NAME_Ordered, DB_NAME_ORDERED);
         map.put(CAP_PROP_NAME_Status, DB_NAME_STATUS);
         map.put(CAP_PROP_NAME_DateAdded, DB_NAME_DATE_ADDED);
@@ -576,7 +557,6 @@
         map.put(CAP_PROP_NAME_Weight, UNCAP_PROP_NAME_weight);
         map.put(CAP_PROP_NAME_Image, UNCAP_PROP_NAME_image);
         map.put(CAP_PROP_NAME_Thumbnail, UNCAP_PROP_NAME_thumbnail);
-        map.put(CAP_PROP_NAME_Stock, UNCAP_PROP_NAME_stock);
         map.put(CAP_PROP_NAME_Ordered, UNCAP_PROP_NAME_ordered);
         map.put(CAP_PROP_NAME_Status, UNCAP_PROP_NAME_status);
         map.put(CAP_PROP_NAME_DateAdded, UNCAP_PROP_NAME_dateAdded);
@@ -607,7 +587,6 @@
         map.put(UNCAP_PROP_NAME_weight, DB_NAME_WEIGHT);
         map.put(UNCAP_PROP_NAME_image, DB_NAME_IMAGE);
         map.put(UNCAP_PROP_NAME_thumbnail, DB_NAME_THUMBNAIL);
-        map.put(UNCAP_PROP_NAME_stock, DB_NAME_STOCK);
         map.put(UNCAP_PROP_NAME_ordered, DB_NAME_ORDERED);
         map.put(UNCAP_PROP_NAME_status, DB_NAME_STATUS);
         map.put(UNCAP_PROP_NAME_dateAdded, DB_NAME_DATE_ADDED);
@@ -638,7 +617,6 @@
         map.put(UNCAP_PROP_NAME_weight, CAP_PROP_NAME_Weight);
         map.put(UNCAP_PROP_NAME_image, CAP_PROP_NAME_Image);
         map.put(UNCAP_PROP_NAME_thumbnail, CAP_PROP_NAME_Thumbnail);
-        map.put(UNCAP_PROP_NAME_stock, CAP_PROP_NAME_Stock);
         map.put(UNCAP_PROP_NAME_ordered, CAP_PROP_NAME_Ordered);
         map.put(UNCAP_PROP_NAME_status, CAP_PROP_NAME_Status);
         map.put(UNCAP_PROP_NAME_dateAdded, CAP_PROP_NAME_DateAdded);
@@ -861,7 +839,6 @@
         columnInfoList.add(columnWeight());
         columnInfoList.add(columnImage());
         columnInfoList.add(columnThumbnail());
-        columnInfoList.add(columnStock());
         columnInfoList.add(columnOrdered());
         columnInfoList.add(columnStatus());
         columnInfoList.add(columnDateAdded());
@@ -924,7 +901,7 @@
      * @deprecated Please use getColumnInfoList()
      */
     public String getColumnDbNameCommaString() {
-        return "PRODUCT_ID, MODEL, QUANTITY, PRICE, WEIGHT, IMAGE, THUMBNAIL, STOCK, ORDERED, STATUS, DATE_ADDED, LAST_MODIFIED, DATE_AVAILABLE, TAX_CLASS_ID, MANUFACTURER_ID";
+        return "PRODUCT_ID, MODEL, QUANTITY, PRICE, WEIGHT, IMAGE, THUMBNAIL, ORDERED, STATUS, DATE_ADDED, LAST_MODIFIED, DATE_AVAILABLE, TAX_CLASS_ID, MANUFACTURER_ID";
     }
 
     /**
@@ -970,12 +947,6 @@
         return new ColumnInfo(this, "THUMBNAIL", "thumbnail", String.class, false);
     }
     /**
-     * @return Column information of stock. (NotNull)
-     */
-    public ColumnInfo columnStock() {
-        return new ColumnInfo(this, "STOCK", "stock", java.math.BigDecimal.class, false);
-    }
-    /**
      * @return Column information of ordered. (NotNull)
      */
     public ColumnInfo columnOrdered() {
@@ -1395,7 +1366,6 @@
         public RelationTrace columnWeight() { return fixTrace(_relationList, ProductDbm.getInstance().columnWeight()); }
         public RelationTrace columnImage() { return fixTrace(_relationList, ProductDbm.getInstance().columnImage()); }
         public RelationTrace columnThumbnail() { return fixTrace(_relationList, ProductDbm.getInstance().columnThumbnail()); }
-        public RelationTrace columnStock() { return fixTrace(_relationList, ProductDbm.getInstance().columnStock()); }
         public RelationTrace columnOrdered() { return fixTrace(_relationList, ProductDbm.getInstance().columnOrdered()); }
         public RelationTrace columnStatus() { return fixTrace(_relationList, ProductDbm.getInstance().columnStatus()); }
         public RelationTrace columnDateAdded() { return fixTrace(_relationList, ProductDbm.getInstance().columnDateAdded()); }
@@ -1480,7 +1450,6 @@
         if (analyzer.init("WEIGHT", "weight", "weight")) { myEntity.setWeight(analyzer.analyzeNumber(java.math.BigDecimal.class)); };
         if (analyzer.init("IMAGE", "image", "image")) { myEntity.setImage(analyzer.analyzeString(String.class)); };
         if (analyzer.init("THUMBNAIL", "thumbnail", "thumbnail")) { myEntity.setThumbnail(analyzer.analyzeString(String.class)); };
-        if (analyzer.init("STOCK", "stock", "stock")) { myEntity.setStock(analyzer.analyzeNumber(java.math.BigDecimal.class)); };
         if (analyzer.init("ORDERED", "ordered", "ordered")) { myEntity.setOrdered(analyzer.analyzeNumber(java.math.BigDecimal.class)); };
         if (analyzer.init("STATUS", "status", "status")) { myEntity.setStatus(analyzer.analyzeNumber(java.math.BigDecimal.class)); };
         if (analyzer.init("DATE_ADDED", "dateAdded", "dateAdded")) { myEntity.setDateAdded(analyzer.analyzeDate(java.sql.Timestamp.class)); };
@@ -1567,7 +1536,6 @@
         helpAppendingColumnValueString(sb, delimiter, equal, "WEIGHT", myEntity.getWeight());
         helpAppendingColumnValueString(sb, delimiter, equal, "IMAGE", myEntity.getImage());
         helpAppendingColumnValueString(sb, delimiter, equal, "THUMBNAIL", myEntity.getThumbnail());
-        helpAppendingColumnValueString(sb, delimiter, equal, "STOCK", myEntity.getStock());
         helpAppendingColumnValueString(sb, delimiter, equal, "ORDERED", myEntity.getOrdered());
         helpAppendingColumnValueString(sb, delimiter, equal, "STATUS", myEntity.getStatus());
         helpAppendingColumnValueString(sb, delimiter, equal, "DATE_ADDED", myEntity.getDateAdded());
@@ -1636,7 +1604,6 @@
         valueMap.put("WEIGHT", myEntity.getWeight());
         valueMap.put("IMAGE", myEntity.getImage());
         valueMap.put("THUMBNAIL", myEntity.getThumbnail());
-        valueMap.put("STOCK", myEntity.getStock());
         valueMap.put("ORDERED", myEntity.getOrdered());
         valueMap.put("STATUS", myEntity.getStatus());
         valueMap.put("DATE_ADDED", myEntity.getDateAdded());
@@ -1673,7 +1640,6 @@
         valueMap.put("WEIGHT", helpGettingColumnStringValue(myEntity.getWeight()));
         valueMap.put("IMAGE", helpGettingColumnStringValue(myEntity.getImage()));
         valueMap.put("THUMBNAIL", helpGettingColumnStringValue(myEntity.getThumbnail()));
-        valueMap.put("STOCK", helpGettingColumnStringValue(myEntity.getStock()));
         valueMap.put("ORDERED", helpGettingColumnStringValue(myEntity.getOrdered()));
         valueMap.put("STATUS", helpGettingColumnStringValue(myEntity.getStatus()));
         valueMap.put("DATE_ADDED", helpGettingColumnStringValue(myEntity.getDateAdded()));
@@ -1705,9 +1671,9 @@
     public String getPreparedInsertClause(PreparedInsertClauseOption preparedInsertClauseOption) {
         if (preparedInsertClauseOption.getTablePrefix() != null) {
             final String tablePrefix = preparedInsertClauseOption.getTablePrefix();
-            return "insert into " + tablePrefix + "PRODUCT(PRODUCT_ID, MODEL, QUANTITY, PRICE, WEIGHT, IMAGE, THUMBNAIL, STOCK, ORDERED, STATUS, DATE_ADDED, LAST_MODIFIED, DATE_AVAILABLE, TAX_CLASS_ID, MANUFACTURER_ID) values(? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? )";
+            return "insert into " + tablePrefix + "PRODUCT(PRODUCT_ID, MODEL, QUANTITY, PRICE, WEIGHT, IMAGE, THUMBNAIL, ORDERED, STATUS, DATE_ADDED, LAST_MODIFIED, DATE_AVAILABLE, TAX_CLASS_ID, MANUFACTURER_ID) values(? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? )";
         }
-        return "insert into PRODUCT(PRODUCT_ID, MODEL, QUANTITY, PRICE, WEIGHT, IMAGE, THUMBNAIL, STOCK, ORDERED, STATUS, DATE_ADDED, LAST_MODIFIED, DATE_AVAILABLE, TAX_CLASS_ID, MANUFACTURER_ID) values(? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? )";
+        return "insert into PRODUCT(PRODUCT_ID, MODEL, QUANTITY, PRICE, WEIGHT, IMAGE, THUMBNAIL, ORDERED, STATUS, DATE_ADDED, LAST_MODIFIED, DATE_AVAILABLE, TAX_CLASS_ID, MANUFACTURER_ID) values(? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? )";
     }
 
     // ===================================================================================

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsOrderFormCQ.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsOrderFormCQ.java	2007-09-23 07:44:28 UTC (rev 576)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsOrderFormCQ.java	2007-09-23 07:48:26 UTC (rev 577)
@@ -325,6 +325,150 @@
 
     abstract protected ConditionValue getCValueOrderFormId();
       
+    /** Column db name of orderFormNumber. */
+    protected static final String COL_ORDER_FORM_NUMBER = "ORDER_FORM_NUMBER";
+
+    /** Column java name of orderFormNumber. */
+    protected static final String J_OrderFormNumber = "OrderFormNumber";
+
+    /** Column uncapitalised java name of orderFormNumber. */
+    protected static final String UJ_orderFormNumber = "orderFormNumber";
+    
+    /**
+     * Set the value of orderFormNumber using equal. { = }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param orderFormNumber The value of orderFormNumber as equal.
+     */
+    public void setOrderFormNumber_Equal(String orderFormNumber) {
+        registerOrderFormNumber(ConditionKey.CK_EQUAL, filterRemoveEmptyString(orderFormNumber));
+    }
+                  
+    /**
+     * Set the value of orderFormNumber using notEqual. { != }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param orderFormNumber The value of orderFormNumber as notEqual.
+     */
+    public void setOrderFormNumber_NotEqual(String orderFormNumber) {
+        registerOrderFormNumber(ConditionKey.CK_NOT_EQUAL, filterRemoveEmptyString(orderFormNumber));
+    }
+            
+    /**
+     * Set the value of orderFormNumber using greaterThan. { &gt; }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param orderFormNumber The value of orderFormNumber as greaterThan.
+     */
+    public void setOrderFormNumber_GreaterThan(String orderFormNumber) {
+        registerOrderFormNumber(ConditionKey.CK_GREATER_THAN, filterRemoveEmptyString(orderFormNumber));
+    }
+            
+    /**
+     * Set the value of orderFormNumber using lessThan. { &lt; }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param orderFormNumber The value of orderFormNumber as lessThan.
+     */
+    public void setOrderFormNumber_LessThan(String orderFormNumber) {
+        registerOrderFormNumber(ConditionKey.CK_LESS_THAN, filterRemoveEmptyString(orderFormNumber));
+    }
+            
+    /**
+     * Set the value of orderFormNumber using greaterEqual. { &gt;= }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param orderFormNumber The value of orderFormNumber as greaterEqual.
+     */
+    public void setOrderFormNumber_GreaterEqual(String orderFormNumber) {
+        registerOrderFormNumber(ConditionKey.CK_GREATER_EQUAL, filterRemoveEmptyString(orderFormNumber));
+    }
+            
+    /**
+     * Set the value of orderFormNumber using lessEqual. { &lt;= }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param orderFormNumber The value of orderFormNumber as lessEqual.
+     */
+    public void setOrderFormNumber_LessEqual(String orderFormNumber) {
+        registerOrderFormNumber(ConditionKey.CK_LESS_EQUAL, filterRemoveEmptyString(orderFormNumber));
+    }
+            
+    /**
+     * Set the value of orderFormNumber using prefixSearch. { like 'xxx%' }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param orderFormNumber The value of orderFormNumber as prefixSearch.
+     */
+    public void setOrderFormNumber_PrefixSearch(String orderFormNumber) {
+        registerOrderFormNumber(ConditionKey.CK_PREFIX_SEARCH, filterRemoveEmptyString(orderFormNumber));
+    }
+            
+    /**
+     * Set the value of orderFormNumber using likeSearch. { like '%xxx%' }
+     * If the value is null or empty-string, this condition is ignored.
+     * You can invoke this method several times and the conditions are set up.
+     * 
+     * @param orderFormNumber The value of orderFormNumber as likeSearch.
+     * @param likeSearchOption The option of like-search. (NotNull)
+     */
+    public void setOrderFormNumber_LikeSearch(String orderFormNumber, jp.sf.pal.pompei.allcommon.cbean.coption.LikeSearchOption likeSearchOption) {
+        registerLikeSearchQuery(ConditionKey.CK_LIKE_SEARCH, filterRemoveEmptyString(orderFormNumber), getCValueOrderFormNumber(), COL_ORDER_FORM_NUMBER, J_OrderFormNumber, UJ_orderFormNumber, likeSearchOption);
+    }
+            
+    /**
+     * Set the value of orderFormNumber using inScope. { in ('a', 'b') }
+     * If the element in the list is null or empty-string, the condition-element is ignored.
+     * 
+     * @param orderFormNumberList The value of orderFormNumber as inScope.
+     */
+    public void setOrderFormNumber_InScope(java.util.List<String> orderFormNumberList) {
+        registerOrderFormNumber(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyStringFromList(orderFormNumberList));
+    }
+
+    /**
+     * Set the value of orderFormNumber using inScope. { in ('a', 'b') }
+     * If the element in the list is null or empty-string, the condition-element is ignored.
+     * 
+     * @param orderFormNumber The value of orderFormNumber as inScope.
+     * @param inScopeOption The option of in-scope. (NotNull)
+     */
+    public void setOrderFormNumber_InScope(String orderFormNumber, jp.sf.pal.pompei.allcommon.cbean.coption.InScopeOption inScopeOption) {
+        registerInScopeQuery(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyString(orderFormNumber), getCValueOrderFormNumber(), COL_ORDER_FORM_NUMBER, J_OrderFormNumber, UJ_orderFormNumber, inScopeOption);
+    }
+            
+    /**
+     * Set the value of orderFormNumber using notInScope. { not in ('a', 'b') }
+     * If the element in the list is null or empty-string, the condition-element is ignored.
+     * 
+     * @param orderFormNumberList The value of orderFormNumber as notInScope.
+     */
+    public void setOrderFormNumber_NotInScope(java.util.List<String> orderFormNumberList) {
+        registerOrderFormNumber(ConditionKey.CK_NOT_IN_SCOPE, filterRemoveEmptyStringFromList(orderFormNumberList));
+    }
+                                                    
+    /**
+     * Register condition of orderFormNumber.
+     * 
+     * @param key Condition key. (NotNull)
+     * @param value The value of orderFormNumber. (Nullable)
+     */
+    protected void registerOrderFormNumber(ConditionKey key, Object value) {
+        registerQuery(key, value, getCValueOrderFormNumber(), COL_ORDER_FORM_NUMBER, J_OrderFormNumber, UJ_orderFormNumber);
+    }
+
+    /**
+     * Register inline condition of orderFormNumber.
+     * 
+     * @param key Condition key. (NotNull)
+     * @param value The value of orderFormNumber. (Nullable)
+     */
+    protected void registerInlineOrderFormNumber(ConditionKey key, Object value) {
+        registerInlineQuery(key, value, getCValueOrderFormNumber(), COL_ORDER_FORM_NUMBER, J_OrderFormNumber, UJ_orderFormNumber);
+    }
+
+    abstract protected ConditionValue getCValueOrderFormNumber();
+      
     /** Column db name of customerId. */
     protected static final String COL_CUSTOMER_ID = "CUSTOMER_ID";
 
@@ -424,8 +568,22 @@
     }
 
     abstract public void keepCustomerId_InScopeSubQuery_Customer(jp.sf.pal.pompei.cbean.cq.CustomerCQ subQuery);
-                                          
+                                      
     /**
+     * Set the value of customerId using isNull. { is null }
+     */
+    public void setCustomerId_IsNull() {
+        registerCustomerId(ConditionKey.CK_IS_NULL, DUMMY_OBJECT);
+    }
+
+    /**
+     * Set the value of customerId using isNotNull. { is not null }
+     */
+    public void setCustomerId_IsNotNull() {
+        registerCustomerId(ConditionKey.CK_IS_NOT_NULL, DUMMY_OBJECT);
+    }
+        
+    /**
      * Register condition of customerId.
      * 
      * @param key Condition key. (NotNull)
@@ -856,22 +1014,8 @@
     public void setCustomerLastname_NotInScope(java.util.List<String> customerLastnameList) {
         registerCustomerLastname(ConditionKey.CK_NOT_IN_SCOPE, filterRemoveEmptyStringFromList(customerLastnameList));
     }
-                                                
+                                                    
     /**
-     * Set the value of customerLastname using isNull. { is null }
-     */
-    public void setCustomerLastname_IsNull() {
-        registerCustomerLastname(ConditionKey.CK_IS_NULL, DUMMY_OBJECT);
-    }
-
-    /**
-     * Set the value of customerLastname using isNotNull. { is not null }
-     */
-    public void setCustomerLastname_IsNotNull() {
-        registerCustomerLastname(ConditionKey.CK_IS_NOT_NULL, DUMMY_OBJECT);
-    }
-        
-    /**
      * Register condition of customerLastname.
      * 
      * @param key Condition key. (NotNull)
@@ -7732,8 +7876,22 @@
     public void setDeliveryPrice_NotInScope(java.util.List<java.math.BigDecimal> deliveryPriceList) {
         registerDeliveryPrice(ConditionKey.CK_NOT_IN_SCOPE, deliveryPriceList);
     }
-                                                
+                                            
     /**
+     * Set the value of deliveryPrice using isNull. { is null }
+     */
+    public void setDeliveryPrice_IsNull() {
+        registerDeliveryPrice(ConditionKey.CK_IS_NULL, DUMMY_OBJECT);
+    }
+
+    /**
+     * Set the value of deliveryPrice using isNotNull. { is not null }
+     */
+    public void setDeliveryPrice_IsNotNull() {
+        registerDeliveryPrice(ConditionKey.CK_IS_NOT_NULL, DUMMY_OBJECT);
+    }
+        
+    /**
      * Register condition of deliveryPrice.
      * 
      * @param key Condition key. (NotNull)
@@ -7755,110 +7913,124 @@
 
     abstract protected ConditionValue getCValueDeliveryPrice();
       
-    /** Column db name of finalPrice. */
-    protected static final String COL_FINAL_PRICE = "FINAL_PRICE";
+    /** Column db name of subTotalPrice. */
+    protected static final String COL_SUB_TOTAL_PRICE = "SUB_TOTAL_PRICE";
 
-    /** Column java name of finalPrice. */
-    protected static final String J_FinalPrice = "FinalPrice";
+    /** Column java name of subTotalPrice. */
+    protected static final String J_SubTotalPrice = "SubTotalPrice";
 
-    /** Column uncapitalised java name of finalPrice. */
-    protected static final String UJ_finalPrice = "finalPrice";
+    /** Column uncapitalised java name of subTotalPrice. */
+    protected static final String UJ_subTotalPrice = "subTotalPrice";
             
     /**
-     * Set the value of finalPrice using equal. { = }
+     * Set the value of subTotalPrice using equal. { = }
      * 
-     * @param finalPrice The value of finalPrice as equal.
+     * @param subTotalPrice The value of subTotalPrice as equal.
      */
-    public void setFinalPrice_Equal(java.math.BigDecimal finalPrice) {
-        registerFinalPrice(ConditionKey.CK_EQUAL, finalPrice);
+    public void setSubTotalPrice_Equal(java.math.BigDecimal subTotalPrice) {
+        registerSubTotalPrice(ConditionKey.CK_EQUAL, subTotalPrice);
     }
             
     /**
-     * Set the value of finalPrice using notEqual. { != }
+     * Set the value of subTotalPrice using notEqual. { != }
      * 
-     * @param finalPrice The value of finalPrice as notEqual.
+     * @param subTotalPrice The value of subTotalPrice as notEqual.
      */
-    public void setFinalPrice_NotEqual(java.math.BigDecimal finalPrice) {
-        registerFinalPrice(ConditionKey.CK_NOT_EQUAL, finalPrice);
+    public void setSubTotalPrice_NotEqual(java.math.BigDecimal subTotalPrice) {
+        registerSubTotalPrice(ConditionKey.CK_NOT_EQUAL, subTotalPrice);
     }
             
     /**
-     * Set the value of finalPrice using greaterThan. { &gt; }
+     * Set the value of subTotalPrice using greaterThan. { &gt; }
      * 
-     * @param finalPrice The value of finalPrice as greaterThan.
+     * @param subTotalPrice The value of subTotalPrice as greaterThan.
      */
-    public void setFinalPrice_GreaterThan(java.math.BigDecimal finalPrice) {
-        registerFinalPrice(ConditionKey.CK_GREATER_THAN, finalPrice);
+    public void setSubTotalPrice_GreaterThan(java.math.BigDecimal subTotalPrice) {
+        registerSubTotalPrice(ConditionKey.CK_GREATER_THAN, subTotalPrice);
     }
             
     /**
-     * Set the value of finalPrice using lessThan. { &lt; }
+     * Set the value of subTotalPrice using lessThan. { &lt; }
      * 
-     * @param finalPrice The value of finalPrice as lessThan.
+     * @param subTotalPrice The value of subTotalPrice as lessThan.
      */
-    public void setFinalPrice_LessThan(java.math.BigDecimal finalPrice) {
-        registerFinalPrice(ConditionKey.CK_LESS_THAN, finalPrice);
+    public void setSubTotalPrice_LessThan(java.math.BigDecimal subTotalPrice) {
+        registerSubTotalPrice(ConditionKey.CK_LESS_THAN, subTotalPrice);
     }
             
     /**
-     * Set the value of finalPrice using greaterEqual. { &gt;= }
+     * Set the value of subTotalPrice using greaterEqual. { &gt;= }
      * 
-     * @param finalPrice The value of finalPrice as greaterEqual.
+     * @param subTotalPrice The value of subTotalPrice as greaterEqual.
      */
-    public void setFinalPrice_GreaterEqual(java.math.BigDecimal finalPrice) {
-        registerFinalPrice(ConditionKey.CK_GREATER_EQUAL, finalPrice);
+    public void setSubTotalPrice_GreaterEqual(java.math.BigDecimal subTotalPrice) {
+        registerSubTotalPrice(ConditionKey.CK_GREATER_EQUAL, subTotalPrice);
     }
             
     /**
-     * Set the value of finalPrice using lessEqual. { &lt;= }
+     * Set the value of subTotalPrice using lessEqual. { &lt;= }
      * 
-     * @param finalPrice The value of finalPrice as lessEqual.
+     * @param subTotalPrice The value of subTotalPrice as lessEqual.
      */
-    public void setFinalPrice_LessEqual(java.math.BigDecimal finalPrice) {
-        registerFinalPrice(ConditionKey.CK_LESS_EQUAL, finalPrice);
+    public void setSubTotalPrice_LessEqual(java.math.BigDecimal subTotalPrice) {
+        registerSubTotalPrice(ConditionKey.CK_LESS_EQUAL, subTotalPrice);
     }
                   
     /**
-     * Set the value of finalPrice using inScope. { in (a, b) }
+     * Set the value of subTotalPrice using inScope. { in (a, b) }
      * If the element in the list is null or empty-string, the condition-element is ignored.
      * 
-     * @param finalPriceList The value of finalPrice as inScope.
+     * @param subTotalPriceList The value of subTotalPrice as inScope.
      */
-    public void setFinalPrice_InScope(java.util.List<java.math.BigDecimal> finalPriceList) {
-        registerFinalPrice(ConditionKey.CK_IN_SCOPE, finalPriceList);
+    public void setSubTotalPrice_InScope(java.util.List<java.math.BigDecimal> subTotalPriceList) {
+        registerSubTotalPrice(ConditionKey.CK_IN_SCOPE, subTotalPriceList);
     }
             
     /**
-     * Set the value of finalPrice using notInScope. { not in (a, b) }
+     * Set the value of subTotalPrice using notInScope. { not in (a, b) }
      * If the element in the list is null or empty-string, the condition-element is ignored.
      * 
-     * @param finalPriceList The value of finalPrice as notInScope.
+     * @param subTotalPriceList The value of subTotalPrice as notInScope.
      */
-    public void setFinalPrice_NotInScope(java.util.List<java.math.BigDecimal> finalPriceList) {
-        registerFinalPrice(ConditionKey.CK_NOT_IN_SCOPE, finalPriceList);
+    public void setSubTotalPrice_NotInScope(java.util.List<java.math.BigDecimal> subTotalPriceList) {
+        registerSubTotalPrice(ConditionKey.CK_NOT_IN_SCOPE, subTotalPriceList);
     }
-                                                
+                                            
     /**
-     * Register condition of finalPrice.
+     * Set the value of subTotalPrice using isNull. { is null }
+     */
+    public void setSubTotalPrice_IsNull() {
+        registerSubTotalPrice(ConditionKey.CK_IS_NULL, DUMMY_OBJECT);
+    }
+
+    /**
+     * Set the value of subTotalPrice using isNotNull. { is not null }
+     */
+    public void setSubTotalPrice_IsNotNull() {
+        registerSubTotalPrice(ConditionKey.CK_IS_NOT_NULL, DUMMY_OBJECT);
+    }
+        
+    /**
+     * Register condition of subTotalPrice.
      * 
      * @param key Condition key. (NotNull)
-     * @param value The value of finalPrice. (Nullable)
+     * @param value The value of subTotalPrice. (Nullable)
      */
-    protected void registerFinalPrice(ConditionKey key, Object value) {
-        registerQuery(key, value, getCValueFinalPrice(), COL_FINAL_PRICE, J_FinalPrice, UJ_finalPrice);
+    protected void registerSubTotalPrice(ConditionKey key, Object value) {
+        registerQuery(key, value, getCValueSubTotalPrice(), COL_SUB_TOTAL_PRICE, J_SubTotalPrice, UJ_subTotalPrice);
     }
 
     /**
-     * Register inline condition of finalPrice.
+     * Register inline condition of subTotalPrice.
      * 
      * @param key Condition key. (NotNull)
-     * @param value The value of finalPrice. (Nullable)
+     * @param value The value of subTotalPrice. (Nullable)
      */
-    protected void registerInlineFinalPrice(ConditionKey key, Object value) {
-        registerInlineQuery(key, value, getCValueFinalPrice(), COL_FINAL_PRICE, J_FinalPrice, UJ_finalPrice);
+    protected void registerInlineSubTotalPrice(ConditionKey key, Object value) {
+        registerInlineQuery(key, value, getCValueSubTotalPrice(), COL_SUB_TOTAL_PRICE, J_SubTotalPrice, UJ_subTotalPrice);
     }
 
-    abstract protected ConditionValue getCValueFinalPrice();
+    abstract protected ConditionValue getCValueSubTotalPrice();
       
     /** Column db name of tax. */
     protected static final String COL_TAX = "TAX";
@@ -7942,8 +8114,22 @@
     public void setTax_NotInScope(java.util.List<java.math.BigDecimal> taxList) {
         registerTax(ConditionKey.CK_NOT_IN_SCOPE, taxList);
     }
-                                                
+                                            
     /**
+     * Set the value of tax using isNull. { is null }
+     */
+    public void setTax_IsNull() {
+        registerTax(ConditionKey.CK_IS_NULL, DUMMY_OBJECT);
+    }
+
+    /**
+     * Set the value of tax using isNotNull. { is not null }
+     */
+    public void setTax_IsNotNull() {
+        registerTax(ConditionKey.CK_IS_NOT_NULL, DUMMY_OBJECT);
+    }
+        
+    /**
      * Register condition of tax.
      * 
      * @param key Condition key. (NotNull)
@@ -7964,6 +8150,111 @@
     }
 
     abstract protected ConditionValue getCValueTax();
+      
+    /** Column db name of totalPrice. */
+    protected static final String COL_TOTAL_PRICE = "TOTAL_PRICE";
+
+    /** Column java name of totalPrice. */
+    protected static final String J_TotalPrice = "TotalPrice";
+
+    /** Column uncapitalised java name of totalPrice. */
+    protected static final String UJ_totalPrice = "totalPrice";
+            
+    /**
+     * Set the value of totalPrice using equal. { = }
+     * 
+     * @param totalPrice The value of totalPrice as equal.
+     */
+    public void setTotalPrice_Equal(java.math.BigDecimal totalPrice) {
+        registerTotalPrice(ConditionKey.CK_EQUAL, totalPrice);
+    }
+            
+    /**
+     * Set the value of totalPrice using notEqual. { != }
+     * 
+     * @param totalPrice The value of totalPrice as notEqual.
+     */
+    public void setTotalPrice_NotEqual(java.math.BigDecimal totalPrice) {
+        registerTotalPrice(ConditionKey.CK_NOT_EQUAL, totalPrice);
+    }
+            
+    /**
+     * Set the value of totalPrice using greaterThan. { &gt; }
+     * 
+     * @param totalPrice The value of totalPrice as greaterThan.
+     */
+    public void setTotalPrice_GreaterThan(java.math.BigDecimal totalPrice) {
+        registerTotalPrice(ConditionKey.CK_GREATER_THAN, totalPrice);
+    }
+            
+    /**
+     * Set the value of totalPrice using lessThan. { &lt; }
+     * 
+     * @param totalPrice The value of totalPrice as lessThan.
+     */
+    public void setTotalPrice_LessThan(java.math.BigDecimal totalPrice) {
+        registerTotalPrice(ConditionKey.CK_LESS_THAN, totalPrice);
+    }
+            
+    /**
+     * Set the value of totalPrice using greaterEqual. { &gt;= }
+     * 
+     * @param totalPrice The value of totalPrice as greaterEqual.
+     */
+    public void setTotalPrice_GreaterEqual(java.math.BigDecimal totalPrice) {
+        registerTotalPrice(ConditionKey.CK_GREATER_EQUAL, totalPrice);
+    }
+            
+    /**
+     * Set the value of totalPrice using lessEqual. { &lt;= }
+     * 
+     * @param totalPrice The value of totalPrice as lessEqual.
+     */
+    public void setTotalPrice_LessEqual(java.math.BigDecimal totalPrice) {
+        registerTotalPrice(ConditionKey.CK_LESS_EQUAL, totalPrice);
+    }
+                  
+    /**
+     * Set the value of totalPrice using inScope. { in (a, b) }
+     * If the element in the list is null or empty-string, the condition-element is ignored.
+     * 
+     * @param totalPriceList The value of totalPrice as inScope.
+     */
+    public void setTotalPrice_InScope(java.util.List<java.math.BigDecimal> totalPriceList) {
+        registerTotalPrice(ConditionKey.CK_IN_SCOPE, totalPriceList);
+    }
+            
+    /**
+     * Set the value of totalPrice using notInScope. { not in (a, b) }
+     * If the element in the list is null or empty-string, the condition-element is ignored.
+     * 
+     * @param totalPriceList The value of totalPrice as notInScope.
+     */
+    public void setTotalPrice_NotInScope(java.util.List<java.math.BigDecimal> totalPriceList) {
+        registerTotalPrice(ConditionKey.CK_NOT_IN_SCOPE, totalPriceList);
+    }
+                                                
+    /**
+     * Register condition of totalPrice.
+     * 
+     * @param key Condition key. (NotNull)
+     * @param value The value of totalPrice. (Nullable)
+     */
+    protected void registerTotalPrice(ConditionKey key, Object value) {
+        registerQuery(key, value, getCValueTotalPrice(), COL_TOTAL_PRICE, J_TotalPrice, UJ_totalPrice);
+    }
+
+    /**
+     * Register inline condition of totalPrice.
+     * 
+     * @param key Condition key. (NotNull)
+     * @param value The value of totalPrice. (Nullable)
+     */
+    protected void registerInlineTotalPrice(ConditionKey key, Object value) {
+        registerInlineQuery(key, value, getCValueTotalPrice(), COL_TOTAL_PRICE, J_TotalPrice, UJ_totalPrice);
+    }
+
+    abstract protected ConditionValue getCValueTotalPrice();
   
     // ===================================================================================
     //                                                                      Basic Override

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsOrderProductCQ.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsOrderProductCQ.java	2007-09-23 07:44:28 UTC (rev 576)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsOrderProductCQ.java	2007-09-23 07:48:26 UTC (rev 577)
@@ -557,150 +557,6 @@
 
     abstract protected ConditionValue getCValueModel();
       
-    /** Column db name of name. */
-    protected static final String COL_NAME = "NAME";
-
-    /** Column java name of name. */
-    protected static final String J_Name = "Name";
-
-    /** Column uncapitalised java name of name. */
-    protected static final String UJ_name = "name";
-    
-    /**
-     * Set the value of name using equal. { = }
-     * If the value is null or empty-string, this condition is ignored.
-     * 
-     * @param name The value of name as equal.
-     */
-    public void setName_Equal(String name) {
-        registerName(ConditionKey.CK_EQUAL, filterRemoveEmptyString(name));
-    }
-                  
-    /**
-     * Set the value of name using notEqual. { != }
-     * If the value is null or empty-string, this condition is ignored.
-     * 
-     * @param name The value of name as notEqual.
-     */
-    public void setName_NotEqual(String name) {
-        registerName(ConditionKey.CK_NOT_EQUAL, filterRemoveEmptyString(name));
-    }
-            
-    /**
-     * Set the value of name using greaterThan. { &gt; }
-     * If the value is null or empty-string, this condition is ignored.
-     * 
-     * @param name The value of name as greaterThan.
-     */
-    public void setName_GreaterThan(String name) {
-        registerName(ConditionKey.CK_GREATER_THAN, filterRemoveEmptyString(name));
-    }
-            
-    /**
-     * Set the value of name using lessThan. { &lt; }
-     * If the value is null or empty-string, this condition is ignored.
-     * 
-     * @param name The value of name as lessThan.
-     */
-    public void setName_LessThan(String name) {
-        registerName(ConditionKey.CK_LESS_THAN, filterRemoveEmptyString(name));
-    }
-            
-    /**
-     * Set the value of name using greaterEqual. { &gt;= }
-     * If the value is null or empty-string, this condition is ignored.
-     * 
-     * @param name The value of name as greaterEqual.
-     */
-    public void setName_GreaterEqual(String name) {
-        registerName(ConditionKey.CK_GREATER_EQUAL, filterRemoveEmptyString(name));
-    }
-            
-    /**
-     * Set the value of name using lessEqual. { &lt;= }
-     * If the value is null or empty-string, this condition is ignored.
-     * 
-     * @param name The value of name as lessEqual.
-     */
-    public void setName_LessEqual(String name) {
-        registerName(ConditionKey.CK_LESS_EQUAL, filterRemoveEmptyString(name));
-    }
-            
-    /**
-     * Set the value of name using prefixSearch. { like 'xxx%' }
-     * If the value is null or empty-string, this condition is ignored.
-     * 
-     * @param name The value of name as prefixSearch.
-     */
-    public void setName_PrefixSearch(String name) {
-        registerName(ConditionKey.CK_PREFIX_SEARCH, filterRemoveEmptyString(name));
-    }
-            
-    /**
-     * Set the value of name using likeSearch. { like '%xxx%' }
-     * If the value is null or empty-string, this condition is ignored.
-     * You can invoke this method several times and the conditions are set up.
-     * 
-     * @param name The value of name as likeSearch.
-     * @param likeSearchOption The option of like-search. (NotNull)
-     */
-    public void setName_LikeSearch(String name, jp.sf.pal.pompei.allcommon.cbean.coption.LikeSearchOption likeSearchOption) {
-        registerLikeSearchQuery(ConditionKey.CK_LIKE_SEARCH, filterRemoveEmptyString(name), getCValueName(), COL_NAME, J_Name, UJ_name, likeSearchOption);
-    }
-            
-    /**
-     * Set the value of name using inScope. { in ('a', 'b') }
-     * If the element in the list is null or empty-string, the condition-element is ignored.
-     * 
-     * @param nameList The value of name as inScope.
-     */
-    public void setName_InScope(java.util.List<String> nameList) {
-        registerName(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyStringFromList(nameList));
-    }
-
-    /**
-     * Set the value of name using inScope. { in ('a', 'b') }
-     * If the element in the list is null or empty-string, the condition-element is ignored.
-     * 
-     * @param name The value of name as inScope.
-     * @param inScopeOption The option of in-scope. (NotNull)
-     */
-    public void setName_InScope(String name, jp.sf.pal.pompei.allcommon.cbean.coption.InScopeOption inScopeOption) {
-        registerInScopeQuery(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyString(name), getCValueName(), COL_NAME, J_Name, UJ_name, inScopeOption);
-    }
-            
-    /**
-     * Set the value of name using notInScope. { not in ('a', 'b') }
-     * If the element in the list is null or empty-string, the condition-element is ignored.
-     * 
-     * @param nameList The value of name as notInScope.
-     */
-    public void setName_NotInScope(java.util.List<String> nameList) {
-        registerName(ConditionKey.CK_NOT_IN_SCOPE, filterRemoveEmptyStringFromList(nameList));
-    }
-                                                    
-    /**
-     * Register condition of name.
-     * 
-     * @param key Condition key. (NotNull)
-     * @param value The value of name. (Nullable)
-     */
-    protected void registerName(ConditionKey key, Object value) {
-        registerQuery(key, value, getCValueName(), COL_NAME, J_Name, UJ_name);
-    }
-
-    /**
-     * Register inline condition of name.
-     * 
-     * @param key Condition key. (NotNull)
-     * @param value The value of name. (Nullable)
-     */
-    protected void registerInlineName(ConditionKey key, Object value) {
-        registerInlineQuery(key, value, getCValueName(), COL_NAME, J_Name, UJ_name);
-    }
-
-    abstract protected ConditionValue getCValueName();
-      
     /** Column db name of price. */
     protected static final String COL_PRICE = "PRICE";
 

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsProductCQ.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsProductCQ.java	2007-09-23 07:44:28 UTC (rev 576)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsProductCQ.java	2007-09-23 07:48:26 UTC (rev 577)
@@ -769,8 +769,22 @@
     public void setQuantity_NotInScope(java.util.List<java.math.BigDecimal> quantityList) {
         registerQuantity(ConditionKey.CK_NOT_IN_SCOPE, quantityList);
     }
-                                                
+                                            
     /**
+     * Set the value of quantity using isNull. { is null }
+     */
+    public void setQuantity_IsNull() {
+        registerQuantity(ConditionKey.CK_IS_NULL, DUMMY_OBJECT);
+    }
+
+    /**
+     * Set the value of quantity using isNotNull. { is not null }
+     */
+    public void setQuantity_IsNotNull() {
+        registerQuantity(ConditionKey.CK_IS_NOT_NULL, DUMMY_OBJECT);
+    }
+        
+    /**
      * Register condition of quantity.
      * 
      * @param key Condition key. (NotNull)
@@ -1332,125 +1346,6 @@
 
     abstract protected ConditionValue getCValueThumbnail();
       
-    /** Column db name of stock. */
-    protected static final String COL_STOCK = "STOCK";
-
-    /** Column java name of stock. */
-    protected static final String J_Stock = "Stock";
-
-    /** Column uncapitalised java name of stock. */
-    protected static final String UJ_stock = "stock";
-            
-    /**
-     * Set the value of stock using equal. { = }
-     * 
-     * @param stock The value of stock as equal.
-     */
-    public void setStock_Equal(java.math.BigDecimal stock) {
-        registerStock(ConditionKey.CK_EQUAL, stock);
-    }
-            
-    /**
-     * Set the value of stock using notEqual. { != }
-     * 
-     * @param stock The value of stock as notEqual.
-     */
-    public void setStock_NotEqual(java.math.BigDecimal stock) {
-        registerStock(ConditionKey.CK_NOT_EQUAL, stock);
-    }
-            
-    /**
-     * Set the value of stock using greaterThan. { &gt; }
-     * 
-     * @param stock The value of stock as greaterThan.
-     */
-    public void setStock_GreaterThan(java.math.BigDecimal stock) {
-        registerStock(ConditionKey.CK_GREATER_THAN, stock);
-    }
-            
-    /**
-     * Set the value of stock using lessThan. { &lt; }
-     * 
-     * @param stock The value of stock as lessThan.
-     */
-    public void setStock_LessThan(java.math.BigDecimal stock) {
-        registerStock(ConditionKey.CK_LESS_THAN, stock);
-    }
-            
-    /**
-     * Set the value of stock using greaterEqual. { &gt;= }
-     * 
-     * @param stock The value of stock as greaterEqual.
-     */
-    public void setStock_GreaterEqual(java.math.BigDecimal stock) {
-        registerStock(ConditionKey.CK_GREATER_EQUAL, stock);
-    }
-            
-    /**
-     * Set the value of stock using lessEqual. { &lt;= }
-     * 
-     * @param stock The value of stock as lessEqual.
-     */
-    public void setStock_LessEqual(java.math.BigDecimal stock) {
-        registerStock(ConditionKey.CK_LESS_EQUAL, stock);
-    }
-                  
-    /**
-     * Set the value of stock using inScope. { in (a, b) }
-     * If the element in the list is null or empty-string, the condition-element is ignored.
-     * 
-     * @param stockList The value of stock as inScope.
-     */
-    public void setStock_InScope(java.util.List<java.math.BigDecimal> stockList) {
-        registerStock(ConditionKey.CK_IN_SCOPE, stockList);
-    }
-            
-    /**
-     * Set the value of stock using notInScope. { not in (a, b) }
-     * If the element in the list is null or empty-string, the condition-element is ignored.
-     * 
-     * @param stockList The value of stock as notInScope.
-     */
-    public void setStock_NotInScope(java.util.List<java.math.BigDecimal> stockList) {
-        registerStock(ConditionKey.CK_NOT_IN_SCOPE, stockList);
-    }
-                                            
-    /**
-     * Set the value of stock using isNull. { is null }
-     */
-    public void setStock_IsNull() {
-        registerStock(ConditionKey.CK_IS_NULL, DUMMY_OBJECT);
-    }
-
-    /**
-     * Set the value of stock using isNotNull. { is not null }
-     */
-    public void setStock_IsNotNull() {
-        registerStock(ConditionKey.CK_IS_NOT_NULL, DUMMY_OBJECT);
-    }
-        
-    /**
-     * Register condition of stock.
-     * 
-     * @param key Condition key. (NotNull)
-     * @param value The value of stock. (Nullable)
-     */
-    protected void registerStock(ConditionKey key, Object value) {
-        registerQuery(key, value, getCValueStock(), COL_STOCK, J_Stock, UJ_stock);
-    }
-
-    /**
-     * Register inline condition of stock.
-     * 
-     * @param key Condition key. (NotNull)
-     * @param value The value of stock. (Nullable)
-     */
-    protected void registerInlineStock(ConditionKey key, Object value) {
-        registerInlineQuery(key, value, getCValueStock(), COL_STOCK, J_Stock, UJ_stock);
-    }
-
-    abstract protected ConditionValue getCValueStock();
-      
     /** Column db name of ordered. */
     protected static final String COL_ORDERED = "ORDERED";
 

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsOrderFormCQ.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsOrderFormCQ.java	2007-09-23 07:44:28 UTC (rev 576)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsOrderFormCQ.java	2007-09-23 07:48:26 UTC (rev 577)
@@ -73,6 +73,24 @@
     }
   
     /**
+     * Include select-column of orderFormNumber as mine.
+     * Alias name is java-name of this column.
+     * Be careful to whether your table have the same column.
+     */
+    public void includeAsMine_OrderFormNumber() {
+        registerIncludedSelectColumn("OrderFormNumber", getRealColumnName("ORDER_FORM_NUMBER"));
+    }
+
+    /**
+     * Include select-column of orderFormNumber as mine.
+     * 
+     * @param aliasName Alias name. {select columnName as aliasName from ...} This should not contain comma. (NotNull)
+     */
+    public void includeAsMine_OrderFormNumber(String aliasName) {
+        registerIncludedSelectColumn(aliasName, getRealColumnName("ORDER_FORM_NUMBER"));
+    }
+  
+    /**
      * Include select-column of customerId as mine.
      * Alias name is java-name of this column.
      * Be careful to whether your table have the same column.
@@ -1009,21 +1027,21 @@
     }
   
     /**
-     * Include select-column of finalPrice as mine.
+     * Include select-column of subTotalPrice as mine.
      * Alias name is java-name of this column.
      * Be careful to whether your table have the same column.
      */
-    public void includeAsMine_FinalPrice() {
-        registerIncludedSelectColumn("FinalPrice", getRealColumnName("FINAL_PRICE"));
+    public void includeAsMine_SubTotalPrice() {
+        registerIncludedSelectColumn("SubTotalPrice", getRealColumnName("SUB_TOTAL_PRICE"));
     }
 
     /**
-     * Include select-column of finalPrice as mine.
+     * Include select-column of subTotalPrice as mine.
      * 
      * @param aliasName Alias name. {select columnName as aliasName from ...} This should not contain comma. (NotNull)
      */
-    public void includeAsMine_FinalPrice(String aliasName) {
-        registerIncludedSelectColumn(aliasName, getRealColumnName("FINAL_PRICE"));
+    public void includeAsMine_SubTotalPrice(String aliasName) {
+        registerIncludedSelectColumn(aliasName, getRealColumnName("SUB_TOTAL_PRICE"));
     }
   
     /**
@@ -1044,6 +1062,24 @@
         registerIncludedSelectColumn(aliasName, getRealColumnName("TAX"));
     }
   
+    /**
+     * Include select-column of totalPrice as mine.
+     * Alias name is java-name of this column.
+     * Be careful to whether your table have the same column.
+     */
+    public void includeAsMine_TotalPrice() {
+        registerIncludedSelectColumn("TotalPrice", getRealColumnName("TOTAL_PRICE"));
+    }
+
+    /**
+     * Include select-column of totalPrice as mine.
+     * 
+     * @param aliasName Alias name. {select columnName as aliasName from ...} This should not contain comma. (NotNull)
+     */
+    public void includeAsMine_TotalPrice(String aliasName) {
+        registerIncludedSelectColumn(aliasName, getRealColumnName("TOTAL_PRICE"));
+    }
+  
     // ===================================================================================
     //                                                                               Query
     //                                                                               =====
@@ -1254,6 +1290,48 @@
     }
       
     // /- - - - - - - - - - - - - - - - - - - - - - -
+    //   Column = [ORDER_FORM_NUMBER]
+    // - - - - - - - - -/
+
+    /** The attribute of orderFormNumber. */
+    protected ConditionValue _orderFormNumber;
+
+    /**
+     * Get the value of orderFormNumber.
+     * 
+     * @return The value of orderFormNumber.
+     */
+    public ConditionValue getOrderFormNumber() {
+        if (_orderFormNumber == null) {
+            _orderFormNumber = new ConditionValue();
+        }
+        return _orderFormNumber;
+    }
+
+    protected ConditionValue getCValueOrderFormNumber() {
+        return getOrderFormNumber();
+    }
+
+                                                  
+    /**
+     * Add order-by of orderFormNumber as ASC.
+     * 
+     * @return this. (NotNull)
+     */
+    public BsOrderFormCQ addOrderBy_OrderFormNumber_Asc() {
+        getSqlClause().registerOrderBy(getRealColumnName(COL_ORDER_FORM_NUMBER), null, true);return this;
+    }
+
+    /**
+     * Add order-by of orderFormNumber as DESC.
+     * 
+     * @return this. (NotNull)
+     */
+    public BsOrderFormCQ addOrderBy_OrderFormNumber_Desc() {
+        getSqlClause().registerOrderBy(getRealColumnName(COL_ORDER_FORM_NUMBER), null, false);return this;
+    }
+      
+    // /- - - - - - - - - - - - - - - - - - - - - - -
     //   Column = [CUSTOMER_ID]
     // - - - - - - - - -/
 
@@ -1292,7 +1370,7 @@
     public void keepCustomerId_InScopeSubQuery_Customer(CustomerCQ subQuery) {
         _customerId_InScopeSubQuery_Customer = subQuery;
     }
-                                          
+                                              
     /**
      * Add order-by of customerId as ASC.
      * 
@@ -1418,7 +1496,7 @@
         return getCustomerLastname();
     }
 
-                                                      
+                                                  
     /**
      * Add order-by of customerLastname as ASC.
      * 
@@ -3498,7 +3576,7 @@
         return getDeliveryPrice();
     }
 
-                                                  
+                                                      
     /**
      * Add order-by of deliveryPrice as ASC.
      * 
@@ -3518,45 +3596,45 @@
     }
       
     // /- - - - - - - - - - - - - - - - - - - - - - -
-    //   Column = [FINAL_PRICE]
+    //   Column = [SUB_TOTAL_PRICE]
     // - - - - - - - - -/
 
-    /** The attribute of finalPrice. */
-    protected ConditionValue _finalPrice;
+    /** The attribute of subTotalPrice. */
+    protected ConditionValue _subTotalPrice;
 
     /**
-     * Get the value of finalPrice.
+     * Get the value of subTotalPrice.
      * 
-     * @return The value of finalPrice.
+     * @return The value of subTotalPrice.
      */
-    public ConditionValue getFinalPrice() {
-        if (_finalPrice == null) {
-            _finalPrice = new ConditionValue();
+    public ConditionValue getSubTotalPrice() {
+        if (_subTotalPrice == null) {
+            _subTotalPrice = new ConditionValue();
         }
-        return _finalPrice;
+        return _subTotalPrice;
     }
 
-    protected ConditionValue getCValueFinalPrice() {
-        return getFinalPrice();
+    protected ConditionValue getCValueSubTotalPrice() {
+        return getSubTotalPrice();
     }
 
-                                                  
+                                                      
     /**
-     * Add order-by of finalPrice as ASC.
+     * Add order-by of subTotalPrice as ASC.
      * 
      * @return this. (NotNull)
      */
-    public BsOrderFormCQ addOrderBy_FinalPrice_Asc() {
-        getSqlClause().registerOrderBy(getRealColumnName(COL_FINAL_PRICE), null, true);return this;
+    public BsOrderFormCQ addOrderBy_SubTotalPrice_Asc() {
+        getSqlClause().registerOrderBy(getRealColumnName(COL_SUB_TOTAL_PRICE), null, true);return this;
     }
 
     /**
-     * Add order-by of finalPrice as DESC.
+     * Add order-by of subTotalPrice as DESC.
      * 
      * @return this. (NotNull)
      */
-    public BsOrderFormCQ addOrderBy_FinalPrice_Desc() {
-        getSqlClause().registerOrderBy(getRealColumnName(COL_FINAL_PRICE), null, false);return this;
+    public BsOrderFormCQ addOrderBy_SubTotalPrice_Desc() {
+        getSqlClause().registerOrderBy(getRealColumnName(COL_SUB_TOTAL_PRICE), null, false);return this;
     }
       
     // /- - - - - - - - - - - - - - - - - - - - - - -
@@ -3582,7 +3660,7 @@
         return getTax();
     }
 
-                                                  
+                                                      
     /**
      * Add order-by of tax as ASC.
      * 
@@ -3601,6 +3679,48 @@
         getSqlClause().registerOrderBy(getRealColumnName(COL_TAX), null, false);return this;
     }
       
+    // /- - - - - - - - - - - - - - - - - - - - - - -
+    //   Column = [TOTAL_PRICE]
+    // - - - - - - - - -/
+
+    /** The attribute of totalPrice. */
+    protected ConditionValue _totalPrice;
+
+    /**
+     * Get the value of totalPrice.
+     * 
+     * @return The value of totalPrice.
+     */
+    public ConditionValue getTotalPrice() {
+        if (_totalPrice == null) {
+            _totalPrice = new ConditionValue();
+        }
+        return _totalPrice;
+    }
+
+    protected ConditionValue getCValueTotalPrice() {
+        return getTotalPrice();
+    }
+
+                                                  
+    /**
+     * Add order-by of totalPrice as ASC.
+     * 
+     * @return this. (NotNull)
+     */
+    public BsOrderFormCQ addOrderBy_TotalPrice_Asc() {
+        getSqlClause().registerOrderBy(getRealColumnName(COL_TOTAL_PRICE), null, true);return this;
+    }
+
+    /**
+     * Add order-by of totalPrice as DESC.
+     * 
+     * @return this. (NotNull)
+     */
+    public BsOrderFormCQ addOrderBy_TotalPrice_Desc() {
+        getSqlClause().registerOrderBy(getRealColumnName(COL_TOTAL_PRICE), null, false);return this;
+    }
+      
     // ===================================================================================
     //                                                                         Union Query
     //                                                                         ===========

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsOrderProductCQ.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsOrderProductCQ.java	2007-09-23 07:44:28 UTC (rev 576)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsOrderProductCQ.java	2007-09-23 07:48:26 UTC (rev 577)
@@ -127,24 +127,6 @@
     }
   
     /**
-     * Include select-column of name as mine.
-     * Alias name is java-name of this column.
-     * Be careful to whether your table have the same column.
-     */
-    public void includeAsMine_Name() {
-        registerIncludedSelectColumn("Name", getRealColumnName("NAME"));
-    }
-
-    /**
-     * Include select-column of name as mine.
-     * 
-     * @param aliasName Alias name. {select columnName as aliasName from ...} This should not contain comma. (NotNull)
-     */
-    public void includeAsMine_Name(String aliasName) {
-        registerIncludedSelectColumn(aliasName, getRealColumnName("NAME"));
-    }
-  
-    /**
      * Include select-column of price as mine.
      * Alias name is java-name of this column.
      * Be careful to whether your table have the same column.
@@ -424,48 +406,6 @@
     }
       
     // /- - - - - - - - - - - - - - - - - - - - - - -
-    //   Column = [NAME]
-    // - - - - - - - - -/
-
-    /** The attribute of name. */
-    protected ConditionValue _name;
-
-    /**
-     * Get the value of name.
-     * 
-     * @return The value of name.
-     */
-    public ConditionValue getName() {
-        if (_name == null) {
-            _name = new ConditionValue();
-        }
-        return _name;
-    }
-
-    protected ConditionValue getCValueName() {
-        return getName();
-    }
-
-                                                  
-    /**
-     * Add order-by of name as ASC.
-     * 
-     * @return this. (NotNull)
-     */
-    public BsOrderProductCQ addOrderBy_Name_Asc() {
-        getSqlClause().registerOrderBy(getRealColumnName(COL_NAME), null, true);return this;
-    }
-
-    /**
-     * Add order-by of name as DESC.
-     * 
-     * @return this. (NotNull)
-     */
-    public BsOrderProductCQ addOrderBy_Name_Desc() {
-        getSqlClause().registerOrderBy(getRealColumnName(COL_NAME), null, false);return this;
-    }
-      
-    // /- - - - - - - - - - - - - - - - - - - - - - -
     //   Column = [PRICE]
     // - - - - - - - - -/
 

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsProductCQ.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsProductCQ.java	2007-09-23 07:44:28 UTC (rev 576)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsProductCQ.java	2007-09-23 07:48:26 UTC (rev 577)
@@ -181,24 +181,6 @@
     }
   
     /**
-     * Include select-column of stock as mine.
-     * Alias name is java-name of this column.
-     * Be careful to whether your table have the same column.
-     */
-    public void includeAsMine_Stock() {
-        registerIncludedSelectColumn("Stock", getRealColumnName("STOCK"));
-    }
-
-    /**
-     * Include select-column of stock as mine.
-     * 
-     * @param aliasName Alias name. {select columnName as aliasName from ...} This should not contain comma. (NotNull)
-     */
-    public void includeAsMine_Stock(String aliasName) {
-        registerIncludedSelectColumn(aliasName, getRealColumnName("STOCK"));
-    }
-  
-    /**
      * Include select-column of ordered as mine.
      * Alias name is java-name of this column.
      * Be careful to whether your table have the same column.
@@ -790,7 +772,7 @@
         return getQuantity();
     }
 
-                                                  
+                                                      
     /**
      * Add order-by of quantity as ASC.
      * 
@@ -978,48 +960,6 @@
     }
       
     // /- - - - - - - - - - - - - - - - - - - - - - -
-    //   Column = [STOCK]
-    // - - - - - - - - -/
-
-    /** The attribute of stock. */
-    protected ConditionValue _stock;
-
-    /**
-     * Get the value of stock.
-     * 
-     * @return The value of stock.
-     */
-    public ConditionValue getStock() {
-        if (_stock == null) {
-            _stock = new ConditionValue();
-        }
-        return _stock;
-    }
-
-    protected ConditionValue getCValueStock() {
-        return getStock();
-    }
-
-                                                      
-    /**
-     * Add order-by of stock as ASC.
-     * 
-     * @return this. (NotNull)
-     */
-    public BsProductCQ addOrderBy_Stock_Asc() {
-        getSqlClause().registerOrderBy(getRealColumnName(COL_STOCK), null, true);return this;
-    }
-
-    /**
-     * Add order-by of stock as DESC.
-     * 
-     * @return this. (NotNull)
-     */
-    public BsProductCQ addOrderBy_Stock_Desc() {
-        getSqlClause().registerOrderBy(getRealColumnName(COL_STOCK), null, false);return this;
-    }
-      
-    // /- - - - - - - - - - - - - - - - - - - - - - -
     //   Column = [ORDERED]
     // - - - - - - - - -/
 

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/OrderFormCIQ.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/OrderFormCIQ.java	2007-09-23 07:44:28 UTC (rev 576)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/OrderFormCIQ.java	2007-09-23 07:48:26 UTC (rev 577)
@@ -130,6 +130,14 @@
     }
                                                       
     // /- - - - - - - - - - - - - - - - - - - - - - -
+    //   Column = [ORDER_FORM_NUMBER]
+    // - - - - - - - - -/
+    protected ConditionValue getCValueOrderFormNumber() {
+        return _myCQ.getOrderFormNumber();
+    }
+
+                                                        
+    // /- - - - - - - - - - - - - - - - - - - - - - -
     //   Column = [CUSTOMER_ID]
     // - - - - - - - - -/
     protected ConditionValue getCValueCustomerId() {
@@ -140,7 +148,7 @@
     public void keepCustomerId_InScopeSubQuery_Customer(jp.sf.pal.pompei.cbean.cq.CustomerCQ subQuery) {
         _myCQ.keepCustomerId_InScopeSubQuery_Customer(subQuery);
     }
-                                                
+                                                    
     // /- - - - - - - - - - - - - - - - - - - - - - -
     //   Column = [CUSTOMER_GENDER]
     // - - - - - - - - -/
@@ -164,7 +172,7 @@
         return _myCQ.getCustomerLastname();
     }
 
-                                                            
+                                                        
     // /- - - - - - - - - - - - - - - - - - - - - - -
     //   Column = [CUSTOMER_DAY_OF_BIRTH]
     // - - - - - - - - -/
@@ -564,15 +572,15 @@
         return _myCQ.getDeliveryPrice();
     }
 
-                                                        
+                                                            
     // /- - - - - - - - - - - - - - - - - - - - - - -
-    //   Column = [FINAL_PRICE]
+    //   Column = [SUB_TOTAL_PRICE]
     // - - - - - - - - -/
-    protected ConditionValue getCValueFinalPrice() {
-        return _myCQ.getFinalPrice();
+    protected ConditionValue getCValueSubTotalPrice() {
+        return _myCQ.getSubTotalPrice();
     }
 
-                                                        
+                                                            
     // /- - - - - - - - - - - - - - - - - - - - - - -
     //   Column = [TAX]
     // - - - - - - - - -/
@@ -580,5 +588,13 @@
         return _myCQ.getTax();
     }
 
+                                                            
+    // /- - - - - - - - - - - - - - - - - - - - - - -
+    //   Column = [TOTAL_PRICE]
+    // - - - - - - - - -/
+    protected ConditionValue getCValueTotalPrice() {
+        return _myCQ.getTotalPrice();
+    }
+
                                                         
 }

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/OrderProductCIQ.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/OrderProductCIQ.java	2007-09-23 07:44:28 UTC (rev 576)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/OrderProductCIQ.java	2007-09-23 07:48:26 UTC (rev 577)
@@ -117,14 +117,6 @@
 
                                                             
     // /- - - - - - - - - - - - - - - - - - - - - - -
-    //   Column = [NAME]
-    // - - - - - - - - -/
-    protected ConditionValue getCValueName() {
-        return _myCQ.getName();
-    }
-
-                                                        
-    // /- - - - - - - - - - - - - - - - - - - - - - -
     //   Column = [PRICE]
     // - - - - - - - - -/
     protected ConditionValue getCValuePrice() {

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/ProductCIQ.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/ProductCIQ.java	2007-09-23 07:44:28 UTC (rev 576)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/ProductCIQ.java	2007-09-23 07:48:26 UTC (rev 577)
@@ -198,7 +198,7 @@
         return _myCQ.getQuantity();
     }
 
-                                                        
+                                                            
     // /- - - - - - - - - - - - - - - - - - - - - - -
     //   Column = [PRICE]
     // - - - - - - - - -/
@@ -232,14 +232,6 @@
 
                                                             
     // /- - - - - - - - - - - - - - - - - - - - - - -
-    //   Column = [STOCK]
-    // - - - - - - - - -/
-    protected ConditionValue getCValueStock() {
-        return _myCQ.getStock();
-    }
-
-                                                            
-    // /- - - - - - - - - - - - - - - - - - - - - - -
     //   Column = [ORDERED]
     // - - - - - - - - -/
     protected ConditionValue getCValueOrdered() {

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/OrderFormDxo.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/OrderFormDxo.java	2007-09-23 07:44:28 UTC (rev 576)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/OrderFormDxo.java	2007-09-23 07:48:26 UTC (rev 577)
@@ -6,7 +6,11 @@
 
 import org.seasar.extension.dxo.annotation.ConversionRule;
 
+import jp.sf.pal.pompei.exentity.AddressBook;
+import jp.sf.pal.pompei.exentity.Customer;
 import jp.sf.pal.pompei.exentity.OrderForm;
+import jp.sf.pal.pompei.exentity.OrderProduct;
+import jp.sf.pal.pompei.exentity.Product;
 import jp.sf.pal.pompei.web.admin.order.OrderConfirmPage;
 import jp.sf.pal.pompei.web.admin.order.OrderEditPage;
 
@@ -26,4 +30,52 @@
 
     void convert(OrderForm orders, OrderEditPage orderEditPage);
 
+    // TODO above method is really needed?
+
+    @ConversionRule("customerId : customerId" + ",customerGender : gender"
+            + ",customerFirstname : firstname" + ",customerLastname : lastname"
+            + ",customerDayOfBirth : dayOfBirth"
+            + ",customerEmailAddress : emailAddress")
+    public void convertToCustomer(Customer customer, OrderForm orderForm);
+
+    @ConversionRule("customerFirstname : firstname"
+            + ",customerLastname : lastname" + ",customerCompany : company"
+            + ",customerDepartment : department"
+            + ",customerStreetAddress : streetAddress"
+            + ",customerSuburb : suburb" + ",customerCity : city"
+            + ",customerState : state" + ",customerPostcode : postcode"
+            + ",customerCompany : company"
+            + ",customerCountryName : country.name"
+            + ",customerTelephone : telephone"
+            + ",customerLocaleName : language.localeName")
+    public void convertToCustomerAddressBook(AddressBook addressBook,
+            OrderForm orderForm);
+
+    @ConversionRule("deliveryFirstname : firstname"
+            + ",deliveryLastname : lastname" + ",deliveryCompany : company"
+            + ",deliveryDepartment : department"
+            + ",deliveryStreetAddress : streetAddress"
+            + ",deliverySuburb : suburb" + ",deliveryCity : city"
+            + ",deliveryState : state" + ",deliveryPostcode : postcode"
+            + ",deliveryCompany : company"
+            + ",deliveryCountryName : country.name"
+            + ",deliveryTelephone : telephone"
+            + ",deliveryLocaleName : language.localeName")
+    public void convertToDeliveryAddressBook(AddressBook addressBook,
+            OrderForm orderForm);
+
+    @ConversionRule("billingFirstname : firstname"
+            + ",billingLastname : lastname" + ",billingCompany : company"
+            + ",billingDepartment : department"
+            + ",billingStreetAddress : streetAddress"
+            + ",billingSuburb : suburb" + ",billingCity : city"
+            + ",billingState : state" + ",billingPostcode : postcode"
+            + ",billingCompany : company"
+            + ",billingCountryName : country.name"
+            + ",billingTelephone : telephone"
+            + ",billingLocaleName : language.localeName")
+    public void convertToBillingAddressBook(AddressBook addressBook,
+            OrderForm orderForm);
+
+    public void convert(Product product, OrderProduct orderProduct);
 }

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/OrderService.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/OrderService.java	2007-09-23 07:44:28 UTC (rev 576)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/OrderService.java	2007-09-23 07:48:26 UTC (rev 577)
@@ -4,7 +4,14 @@
 import java.math.BigDecimal;
 import java.util.List;
 
+import jp.sf.pal.common.CommonException;
+import jp.sf.pal.pompei.exentity.AddressBook;
+import jp.sf.pal.pompei.exentity.Currency;
+import jp.sf.pal.pompei.exentity.Customer;
+import jp.sf.pal.pompei.exentity.DeliveryMethod;
+import jp.sf.pal.pompei.exentity.OrderCardInfo;
 import jp.sf.pal.pompei.exentity.OrderForm;
+import jp.sf.pal.pompei.exentity.PaymentMethod;
 
 public interface OrderService extends Serializable {
 
@@ -14,4 +21,14 @@
 
     public List<OrderForm> getOrderList();
 
+    public String addOrderForm(Customer customer,
+            List<BigDecimal> customerBasketIdList,
+            AddressBook customerAddressBook, AddressBook deliveryAddressBook,
+            AddressBook billingAddressBook, PaymentMethod paymentMethod,
+            DeliveryMethod deliveryMethod, OrderCardInfo orderCardInfo,
+            Currency currency, BigDecimal subTotalPrice,
+            BigDecimal deliveryPrice, BigDecimal tax, BigDecimal totalPrice)
+            throws CommonException;
+
+    public Currency getCurrency(BigDecimal currencyId);
 }

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/CustomerServiceImpl.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/CustomerServiceImpl.java	2007-09-23 07:44:28 UTC (rev 576)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/CustomerServiceImpl.java	2007-09-23 07:48:26 UTC (rev 577)
@@ -114,6 +114,7 @@
         cb.setupSelect_Country();
         // needed(for tax)
         cb.setupSelect_Zone();
+        cb.setupSelect_Language();
         cb.query().setAddressBookId_Equal(addressBookId);
         return getAddressBookBhv().selectEntity(cb);
     }

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/OrderServiceImpl.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/OrderServiceImpl.java	2007-09-23 07:44:28 UTC (rev 576)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/OrderServiceImpl.java	2007-09-23 07:48:26 UTC (rev 577)
@@ -1,11 +1,32 @@
 package jp.sf.pal.pompei.service.impl;
 
 import java.math.BigDecimal;
+import java.sql.Timestamp;
+import java.util.Date;
 import java.util.List;
 
+import jp.sf.pal.common.CommonException;
+import jp.sf.pal.pompei.PompeiConstants;
+import jp.sf.pal.pompei.cbean.CurrencyCB;
+import jp.sf.pal.pompei.cbean.CustomerBasketCB;
 import jp.sf.pal.pompei.cbean.OrderFormCB;
+import jp.sf.pal.pompei.dxo.OrderFormDxo;
+import jp.sf.pal.pompei.exbhv.CurrencyBhv;
+import jp.sf.pal.pompei.exbhv.CustomerBasketBhv;
+import jp.sf.pal.pompei.exbhv.OrderCardInfoBhv;
 import jp.sf.pal.pompei.exbhv.OrderFormBhv;
+import jp.sf.pal.pompei.exbhv.OrderProductBhv;
+import jp.sf.pal.pompei.exbhv.ProductBhv;
+import jp.sf.pal.pompei.exentity.AddressBook;
+import jp.sf.pal.pompei.exentity.Currency;
+import jp.sf.pal.pompei.exentity.Customer;
+import jp.sf.pal.pompei.exentity.CustomerBasket;
+import jp.sf.pal.pompei.exentity.DeliveryMethod;
+import jp.sf.pal.pompei.exentity.OrderCardInfo;
 import jp.sf.pal.pompei.exentity.OrderForm;
+import jp.sf.pal.pompei.exentity.OrderProduct;
+import jp.sf.pal.pompei.exentity.PaymentMethod;
+import jp.sf.pal.pompei.exentity.Product;
 import jp.sf.pal.pompei.service.OrderService;
 
 public class OrderServiceImpl implements OrderService {
@@ -15,8 +36,20 @@
      */
     private static final long serialVersionUID = -6452405711117279851L;
 
-    OrderFormBhv orderFormBhv;
+    private OrderFormBhv orderFormBhv;
 
+    private CurrencyBhv currencyBhv;
+
+    private OrderCardInfoBhv orderCardInfoBhv;
+
+    private CustomerBasketBhv customerBasketBhv;
+
+    private OrderProductBhv orderProductBhv;
+
+    private ProductBhv productBhv;
+
+    private OrderFormDxo orderFormDxo;
+
     public List<OrderForm> getOrderList() {
         OrderFormCB ordersCB = new OrderFormCB();
         //        ordersCB.setupSelect_OrderFormStatus();
@@ -35,6 +68,150 @@
         //        ordersBhv.insertOrUpdate(orders);
     }
 
+    public String addOrderForm(Customer customer,
+            List<BigDecimal> customerBasketIdList,
+            AddressBook customerAddressBook, AddressBook deliveryAddressBook,
+            AddressBook billingAddressBook, PaymentMethod paymentMethod,
+            DeliveryMethod deliveryMethod, OrderCardInfo orderCardInfo,
+            Currency currency, BigDecimal subTotalPrice,
+            BigDecimal deliveryPrice, BigDecimal tax, BigDecimal totalPrice)
+            throws CommonException {
+        String orderFormNumber = null;
+        if (customer == null || customerBasketIdList == null
+                || customerAddressBook == null || deliveryAddressBook == null
+                || billingAddressBook == null || paymentMethod == null
+                || deliveryMethod == null || currency == null
+                || totalPrice == null) {
+            //TODO put message
+            throw new CommonException("", "Some parameters are null.");
+        }
+
+        if (customerBasketIdList.isEmpty()) {
+            //TODO put message
+            throw new CommonException("", "The basket is empty.");
+        }
+
+        Date now = new Date();
+        OrderForm orderForm = new OrderForm();
+        orderForm.setOrderFormNumber(Long.toString(now.getTime()));
+        getOrderFormDxo().convertToCustomerAddressBook(customerAddressBook,
+                orderForm);
+        getOrderFormDxo().convertToDeliveryAddressBook(deliveryAddressBook,
+                orderForm);
+        getOrderFormDxo().convertToBillingAddressBook(billingAddressBook,
+                orderForm);
+        getOrderFormDxo().convertToCustomer(customer, orderForm);
+        // payment method
+        orderForm.setPaymentMethodId(paymentMethod.getPaymentMethodId());
+        orderForm.setPaymentMethodCode(paymentMethod.getCode());
+        // card info
+        if (PompeiConstants.CREDITCARD_PAYMENT_METHOD.equals(paymentMethod
+                .getCode())) {
+            //TODO insert card info
+            if (orderCardInfo == null) {
+                //TODO put message
+                throw new CommonException("", "A card info is null.");
+            }
+            getOrderCardInfoBhv().insert(orderCardInfo);
+            orderForm.setOrderCardInfoId(orderCardInfo.getOrderCardInfoId());
+        }
+        // delivery method
+        orderForm.setDeliveryMethodId(deliveryMethod.getDeliveryMethodId());
+        orderForm.setDeliveryMethodCode(deliveryMethod.getCode());
+        // time
+        orderForm.setLastModified(new Timestamp(now.getTime()));
+        orderForm.setPurchasedDate(new Timestamp(now.getTime()));
+        // order status
+        orderForm.setOrderStatusId(PompeiConstants.DEFAULT_ORDER_STATUS);
+        //  currency
+        orderForm.setCurrencyId(currency.getCurrencyId());
+        orderForm.setCurrencyCode(currency.getCode());
+        // price
+        orderForm.setSubTotalPrice(subTotalPrice);
+        orderForm.setDeliveryPrice(deliveryPrice);
+        orderForm.setTax(tax);
+        orderForm.setTotalPrice(totalPrice);
+
+        getOrderFormBhv().insert(orderForm);
+
+        // update orderFormNumber
+        orderFormNumber = orderForm.getOrderFormNumber()
+                + orderForm.getOrderFormId().toString();
+        orderForm.setOrderFormNumber(orderFormNumber);
+        getOrderFormBhv().update(orderForm);
+
+        // customer basket
+        for (BigDecimal customerBasketId : customerBasketIdList) {
+            //TODO
+            CustomerBasketCB cb = new CustomerBasketCB();
+            cb.setupSelect_Product();
+            cb.setupSelect_Customer();
+            cb.query().setCustomerBasketId_Equal(customerBasketId);
+            CustomerBasket customerBasket = getCustomerBasketBhv()
+                    .selectEntity(cb);
+            if (customerBasket == null) {
+                //TODO put message
+                throw new CommonException("",
+                        "Could not find a customer basket:"
+                                + customerBasketId.toString());
+            }
+            if (customerBasket.getCustomer() == null
+                    || customerBasket.getProduct() == null) {
+                //TODO put message
+                throw new CommonException("",
+                        "Could not find a customer or product in the basket:"
+                                + customerBasket.getCustomer() + ","
+                                + customerBasket.getProduct());
+            }
+            // check customer info
+            if (!customer.getCustomerId().equals(
+                    customerBasket.getCustomer().getCustomerId())) {
+                //TODO put message
+                throw new CommonException("", "Invalid customer info:"
+                        + customer.getCustomerId());
+            }
+
+            OrderProduct orderProduct = new OrderProduct();
+            getOrderFormDxo()
+                    .convert(customerBasket.getProduct(), orderProduct);
+            orderProduct.setOrderFormId(orderForm.getOrderFormId());
+            // TODO bargain price
+            orderProduct.setFinalPrice(customerBasket.getFinalPrice());
+            //TODO tax
+            orderProduct.setTax(new BigDecimal(0));
+            orderProduct.setQuantity(customerBasket.getQuantity());
+
+            //TODO sync?
+            Product product = customerBasket.getProduct();
+            if (product.getQuantity() != null) {
+                BigDecimal quantity = product.getQuantity().subtract(
+                        customerBasket.getQuantity());
+                if (quantity.intValue() < 0) {
+                    //TODO put message
+                    throw new CommonException("", "The product is a shortage."
+                            + customer.getCustomerId());
+                }
+                product.setQuantity(quantity);
+                getProductBhv().update(product);
+            }
+
+            getOrderProductBhv().insert(orderProduct);
+
+            // delete customerBasket
+            getCustomerBasketBhv().delete(customerBasket);
+        }
+
+        // TODO send mail
+
+        return orderFormNumber;
+    }
+
+    public Currency getCurrency(BigDecimal currencyId) {
+        CurrencyCB cb = new CurrencyCB();
+        cb.query().setCurrencyId_Equal(currencyId);
+        return getCurrencyBhv().selectEntity(cb);
+    }
+
     public OrderFormBhv getOrderFormBhv() {
         return orderFormBhv;
     }
@@ -43,4 +220,88 @@
         this.orderFormBhv = ordersBhv;
     }
 
+    /**
+     * @return currencyBhv
+     */
+    public CurrencyBhv getCurrencyBhv() {
+        return currencyBhv;
+    }
+
+    /**
+     * @param currencyBhv 設定する currencyBhv
+     */
+    public void setCurrencyBhv(CurrencyBhv currencyBhv) {
+        this.currencyBhv = currencyBhv;
+    }
+
+    /**
+     * @return orderFormDxo
+     */
+    public OrderFormDxo getOrderFormDxo() {
+        return orderFormDxo;
+    }
+
+    /**
+     * @param orderFormDxo 設定する orderFormDxo
+     */
+    public void setOrderFormDxo(OrderFormDxo orderFormDxo) {
+        this.orderFormDxo = orderFormDxo;
+    }
+
+    /**
+     * @return orderCardInfoBhv
+     */
+    public OrderCardInfoBhv getOrderCardInfoBhv() {
+        return orderCardInfoBhv;
+    }
+
+    /**
+     * @param orderCardInfoBhv 設定する orderCardInfoBhv
+     */
+    public void setOrderCardInfoBhv(OrderCardInfoBhv orderCardInfoBhv) {
+        this.orderCardInfoBhv = orderCardInfoBhv;
+    }
+
+    /**
+     * @return customerBasketBhv
+     */
+    public CustomerBasketBhv getCustomerBasketBhv() {
+        return customerBasketBhv;
+    }
+
+    /**
+     * @param customerBasketBhv 設定する customerBasketBhv
+     */
+    public void setCustomerBasketBhv(CustomerBasketBhv customerBasketBhv) {
+        this.customerBasketBhv = customerBasketBhv;
+    }
+
+    /**
+     * @return orderProductBhv
+     */
+    public OrderProductBhv getOrderProductBhv() {
+        return orderProductBhv;
+    }
+
+    /**
+     * @param orderProductBhv 設定する orderProductBhv
+     */
+    public void setOrderProductBhv(OrderProductBhv orderProductBhv) {
+        this.orderProductBhv = orderProductBhv;
+    }
+
+    /**
+     * @return productBhv
+     */
+    public ProductBhv getProductBhv() {
+        return productBhv;
+    }
+
+    /**
+     * @param productBhv 設定する productBhv
+     */
+    public void setProductBhv(ProductBhv productBhv) {
+        this.productBhv = productBhv;
+    }
+
 }

Added: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutCompleteAction.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutCompleteAction.java	2007-09-23 07:44:28 UTC (rev 576)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutCompleteAction.java	2007-09-23 07:48:26 UTC (rev 577)
@@ -0,0 +1,80 @@
+package jp.sf.pal.pompei.web.user.checkout;
+
+import java.io.Serializable;
+
+import javax.faces.context.FacesContext;
+
+import jp.sf.pal.pompei.exentity.Customer;
+import jp.sf.pal.pompei.service.CustomerService;
+
+public class CheckoutCompleteAction implements Serializable {
+
+    /**
+     * 
+     */
+    private static final long serialVersionUID = 4915206497601066893L;
+
+    /**
+     * 
+     */
+    private CheckoutCompletePage checkoutCompletePage;
+
+    private CustomerService customerService;
+
+    public Class<?> initialize() {
+        return null;
+    }
+
+    public Class<?> prerender() {
+        // check login
+        String remoteUser = FacesContext.getCurrentInstance()
+                .getExternalContext().getRemoteUser();
+        if (remoteUser == null) {
+            return UserInfoEditPage.class;
+        }
+
+        // check user info
+        Customer customers = getCustomerService().getCustomerByPortalId(
+                remoteUser);
+        if (customers == null) {
+            return UserInfoEditPage.class;
+        }
+
+        if (getCheckoutCompletePage().getOrderFormNumber() == null) {
+            // TODO put message
+            return UserInfoEditPage.class;
+        }
+
+        return null;
+    }
+
+    /**
+     * @return checkoutCompletePage
+     */
+    public CheckoutCompletePage getCheckoutCompletePage() {
+        return checkoutCompletePage;
+    }
+
+    /**
+     * @param checkoutCompletePage 設定する checkoutCompletePage
+     */
+    public void setCheckoutCompletePage(
+            CheckoutCompletePage checkoutCompletePage) {
+        this.checkoutCompletePage = checkoutCompletePage;
+    }
+
+    /**
+     * @return customerService
+     */
+    public CustomerService getCustomerService() {
+        return customerService;
+    }
+
+    /**
+     * @param customerService 設定する customerService
+     */
+    public void setCustomerService(CustomerService customerService) {
+        this.customerService = customerService;
+    }
+
+}


Property changes on: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutCompleteAction.java
___________________________________________________________________
Name: svn:eol-style
   + native

Added: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutCompletePage.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutCompletePage.java	2007-09-23 07:44:28 UTC (rev 576)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutCompletePage.java	2007-09-23 07:48:26 UTC (rev 577)
@@ -0,0 +1,22 @@
+package jp.sf.pal.pompei.web.user.checkout;
+
+import java.io.Serializable;
+
+public class CheckoutCompletePage implements Serializable {
+
+    /**
+     * 
+     */
+    private static final long serialVersionUID = 9223139080392778328L;
+
+    private String orderFormNumber;
+
+    public String getOrderFormNumber() {
+        return orderFormNumber;
+    }
+
+    public void setOrderFormNumber(String orderFormNumber) {
+        this.orderFormNumber = orderFormNumber;
+    }
+
+}


Property changes on: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutCompletePage.java
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutConfirmAction.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutConfirmAction.java	2007-09-23 07:44:28 UTC (rev 576)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutConfirmAction.java	2007-09-23 07:48:26 UTC (rev 577)
@@ -9,14 +9,18 @@
 
 import javax.faces.context.FacesContext;
 
+import jp.sf.pal.common.CommonException;
 import jp.sf.pal.common.util.FacesMessageUtil;
 import jp.sf.pal.pompei.PompeiConstants;
 import jp.sf.pal.pompei.dxo.CustomerDxo;
+import jp.sf.pal.pompei.dxo.OrderFormDxo;
 import jp.sf.pal.pompei.exentity.AddressBook;
+import jp.sf.pal.pompei.exentity.Currency;
+import jp.sf.pal.pompei.exentity.Customer;
 import jp.sf.pal.pompei.exentity.CustomerBasket;
-import jp.sf.pal.pompei.exentity.Customer;
 import jp.sf.pal.pompei.exentity.DeliveryMethodDescription;
 import jp.sf.pal.pompei.exentity.ManufacturerDescription;
+import jp.sf.pal.pompei.exentity.OrderCardInfo;
 import jp.sf.pal.pompei.exentity.PaymentMethodDescription;
 import jp.sf.pal.pompei.exentity.ProductDescription;
 import jp.sf.pal.pompei.exentity.TaxRate;
@@ -25,6 +29,7 @@
 import jp.sf.pal.pompei.service.CustomerService;
 import jp.sf.pal.pompei.service.DeliveryMethodSerivce;
 import jp.sf.pal.pompei.service.ManufacturerService;
+import jp.sf.pal.pompei.service.OrderService;
 import jp.sf.pal.pompei.service.PaymentMethodService;
 import jp.sf.pal.pompei.service.ProductService;
 import jp.sf.pal.pompei.service.TaxService;
@@ -63,8 +68,12 @@
 
     private TaxService taxService;
 
+    private OrderService orderService;
+
     private CustomerDxo customerDxo;
 
+    private OrderFormDxo orderFormDxo;
+
     private S2Container container;
 
     public Class<?> initialize() {
@@ -128,7 +137,7 @@
         getCheckoutConfirmPage().setSubTotalPrice(subTotalPrice);
         getCheckoutConfirmPage().setCustomerBasketItems(products);
 
-        orderProcessMap.put(PompeiConstants.CUSTOMERS_BASKET_ID_LIST,
+        orderProcessMap.put(PompeiConstants.CUSTOMER_BASKET_ID_LIST,
                 customersBasketIdList);
 
         // address
@@ -163,9 +172,6 @@
                 new BigDecimal(100));
         getCheckoutConfirmPage().setTax(tax);
 
-        // total
-        getCheckoutConfirmPage().setTotalPrice(subTotalPrice.add(tax));
-
         // payment
         BigDecimal paymentMethodId = (BigDecimal) orderProcessMap
                 .get(PompeiConstants.PAYMENT_METHOD_ID);
@@ -197,12 +203,14 @@
         getCheckoutConfirmPage().setDeliveryMethodName(dmd.getName());
 
         // delivery fee
-        String deliveryMethodObjectName = dmd.getDeliveryMethod().getObjectName();
+        String deliveryMethodObjectName = dmd.getDeliveryMethod()
+                .getObjectName();
+        BigDecimal deliveryPrice = new BigDecimal(0);
         try {
             DeliveryMethodCalculator dmc = (DeliveryMethodCalculator) getContainer()
                     .getComponent(deliveryMethodObjectName);
-            getCheckoutConfirmPage().setDeliveryPrice(
-                    dmc.calculate(baskets, deliveryAddressBook));
+            deliveryPrice = dmc.calculate(baskets, deliveryAddressBook);
+            getCheckoutConfirmPage().setDeliveryPrice(deliveryPrice);
         } catch (ComponentNotFoundRuntimeException e) {
             //TODO put message
             //TODO logger
@@ -214,15 +222,103 @@
             //TODO logger
         }
 
+        // total
+        getCheckoutConfirmPage().setTotalPrice(
+                subTotalPrice.add(tax).add(deliveryPrice));
+
         // render FacesMessages
         FacesMessageUtil.renderMessages();
         return null;
     }
 
-    @TakeOver(type = TakeOverType.NEVER)
+    @TakeOver(type = TakeOverType.INCLUDE, properties = "orderFormNumber")
     public Class<?> doConfirm() {
-        //TODO
-        return null;
+        // check login
+        String remoteUser = FacesContext.getCurrentInstance()
+                .getExternalContext().getRemoteUser();
+        if (remoteUser == null) {
+            return UserInfoEditPage.class;
+        }
+
+        // check user info
+        Customer customer = getCustomerService().getCustomerByPortalId(
+                remoteUser);
+        if (customer == null) {
+            return UserInfoEditPage.class;
+        }
+
+        Map<String, Object> map = (Map<String, Object>) SessionUtil
+                .getFromLocalScope(getCheckoutConfirmPage().getOrderProcessId());
+        if (map == null) {
+            // expires session
+            // TODO clear session info for card
+            // TODO put message
+            return UserInfoEditPage.class;
+        }
+
+        BigDecimal paymentMethodId = (BigDecimal) map
+                .get(PompeiConstants.PAYMENT_METHOD_ID);
+        String cardCode = (String) map.get(PompeiConstants.CARD_TYPE);
+        String cardNumber = (String) map.get(PompeiConstants.CARD_NUMBER);
+        String cardOwner = (String) map.get(PompeiConstants.CARD_OWNER);
+        String cardExpires = (String) map.get(PompeiConstants.CARD_EXPIRES);
+        BigDecimal deliveryMethodId = (BigDecimal) map
+                .get(PompeiConstants.DELIVERY_METHOD_ID);
+        String deliveryAddressBookIdStr = (String) map
+                .get(PompeiConstants.DELIVERY_ADDRESS_BOOK_ID);
+        List<BigDecimal> customerBasketIdList = (List<BigDecimal>) map
+                .get(PompeiConstants.CUSTOMER_BASKET_ID_LIST);
+        if (paymentMethodId == null || deliveryMethodId == null
+                || deliveryAddressBookIdStr == null
+                || customerBasketIdList == null) {
+            // TODO put message
+            return null;
+        }
+
+        OrderCardInfo orderCardInfo = null;
+        if (cardCode != null) {
+            orderCardInfo.setCardCode(cardCode);
+            orderCardInfo.setCardNumber(cardNumber);
+            orderCardInfo.setCardOwner(cardOwner);
+            orderCardInfo.setCardExpires(cardExpires);
+        }
+
+        BigDecimal deliveryAddressBookId = new BigDecimal(
+                deliveryAddressBookIdStr);
+
+        PaymentMethodDescription pmd = getPaymentMethodService()
+                .getPaymentMethodDescription(paymentMethodId);
+        DeliveryMethodDescription dmd = getDeliveryMethodSerivce()
+                .getDeliveryMethodDescription(deliveryMethodId);
+        AddressBook defaultAddressBook = getCustomerService()
+                .getDefaultAddressBook(customer.getCustomerId());
+        AddressBook deliveryAddressBook = getCustomerService().getAddressBook(
+                deliveryAddressBookId);
+        Currency currency = getOrderService().getCurrency(
+                PompeiConstants.DEFAULT_CURRENCY_ID);
+
+        // TODO select billing address book
+        // TODO currency
+        try {
+            String orderFormNumber = getOrderService().addOrderForm(customer,
+                    customerBasketIdList, defaultAddressBook,
+                    deliveryAddressBook, defaultAddressBook,
+                    pmd.getPaymentMethod(), dmd.getDeliveryMethod(),
+                    orderCardInfo, currency,
+                    getCheckoutConfirmPage().getSubTotalPrice(),
+                    getCheckoutConfirmPage().getDeliveryPrice(),
+                    getCheckoutConfirmPage().getTax(),
+                    getCheckoutConfirmPage().getTotalPrice());
+            getCheckoutConfirmPage().setOrderFormNumber(orderFormNumber);
+        } catch (CommonException e) {
+            FacesMessageUtil.addErrorMessage(e.getMessageId());
+            //TODO logger
+        } catch (Exception e) {
+            //TODO put message
+            //TODO logger
+        }
+
+        return CheckoutCompletePage.class;
     }
 
     @TakeOver(type = TakeOverType.NEVER)
@@ -380,4 +476,32 @@
         this.paymentMethodService = paymentMethodService;
     }
 
+    /**
+     * @return orderFormDxo
+     */
+    public OrderFormDxo getOrderFormDxo() {
+        return orderFormDxo;
+    }
+
+    /**
+     * @param orderFormDxo 設定する orderFormDxo
+     */
+    public void setOrderFormDxo(OrderFormDxo orderFormDxo) {
+        this.orderFormDxo = orderFormDxo;
+    }
+
+    /**
+     * @return orderService
+     */
+    public OrderService getOrderService() {
+        return orderService;
+    }
+
+    /**
+     * @param orderService 設定する orderService
+     */
+    public void setOrderService(OrderService orderService) {
+        this.orderService = orderService;
+    }
+
 }

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutConfirmPage.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutConfirmPage.java	2007-09-23 07:44:28 UTC (rev 576)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutConfirmPage.java	2007-09-23 07:48:26 UTC (rev 577)
@@ -64,6 +64,8 @@
 
     private BigDecimal totalPrice;
 
+    private String orderFormNumber;
+
     /**
      * @return labelHelper
      */
@@ -280,4 +282,18 @@
     public String getGenderString() {
         return getLabelHelper().getLabelValue(gender);
     }
+
+    /**
+     * @return orderFormNumber
+     */
+    public String getOrderFormNumber() {
+        return orderFormNumber;
+    }
+
+    /**
+     * @param orderFormNumber 設定する orderFormNumber
+     */
+    public void setOrderFormNumber(String orderFormNumber) {
+        this.orderFormNumber = orderFormNumber;
+    }
 }

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/PaymentSelectAction.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/PaymentSelectAction.java	2007-09-23 07:44:28 UTC (rev 576)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/PaymentSelectAction.java	2007-09-23 07:48:26 UTC (rev 577)
@@ -95,6 +95,20 @@
 
     @TakeOver(type = TakeOverType.INCLUDE, properties = "orderProcessId")
     public Class<?> doNext() {
+        // check login
+        String remoteUser = FacesContext.getCurrentInstance()
+                .getExternalContext().getRemoteUser();
+        if (remoteUser == null) {
+            return UserInfoEditPage.class;
+        }
+
+        // check user info
+        Customer customer = getCustomerService().getCustomerByPortalId(
+                remoteUser);
+        if (customer == null) {
+            return UserInfoEditPage.class;
+        }
+
         Map<String, Object> map = (Map<String, Object>) SessionUtil
                 .getFromLocalScope(getPaymentSelectPage().getOrderProcessId());
         if (map == null) {
@@ -122,7 +136,7 @@
         map.put(PompeiConstants.PAYMENT_METHOD_ID, pmd.getPaymentMethodId());
 
         // card
-        if (PompeiConstants.CARD_PAYMENT_METHOD.equals(pmd.getPaymentMethod()
+        if (PompeiConstants.CREDITCARD_PAYMENT_METHOD.equals(pmd.getPaymentMethod()
                 .getCode())) {
             // card type
             if (!StringUtil.isEmpty(getPaymentSelectPage().getCcOwner())) {

Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/db/create_table.sql
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/db/create_table.sql	2007-09-23 07:44:28 UTC (rev 576)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/db/create_table.sql	2007-09-23 07:48:26 UTC (rev 577)
@@ -124,10 +124,11 @@
 
 CREATE TABLE ORDER_FORM (
        ORDER_FORM_ID BIGINT NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 100, INCREMENT BY 1)
-     , CUSTOMER_ID BIGINT NOT NULL
+     , ORDER_FORM_NUMBER VARCHAR(32) NOT NULL
+     , CUSTOMER_ID BIGINT
      , CUSTOMER_GENDER CHAR(1) NOT NULL
      , CUSTOMER_FIRSTNAME VARCHAR(32) NOT NULL
-     , CUSTOMER_LASTNAME VARCHAR(32)
+     , CUSTOMER_LASTNAME VARCHAR(32) NOT NULL
      , CUSTOMER_DAY_OF_BIRTH DATE NOT NULL
      , CUSTOMER_EMAIL_ADDRESS VARCHAR(128) NOT NULL
      , CUSTOMER_COMPANY VARCHAR(128)
@@ -175,21 +176,21 @@
      , FINISHED_DATE TIMESTAMP
      , CURRENCY_ID INTEGER
      , CURRENCY_CODE CHAR(3) NOT NULL
-     , DELIVERY_PRICE DECIMAL(14, 6) NOT NULL
-     , FINAL_PRICE DECIMAL(14, 6) NOT NULL
-     , TAX DECIMAL(14, 6) NOT NULL
+     , DELIVERY_PRICE DECIMAL(14, 6)
+     , SUB_TOTAL_PRICE DECIMAL(14, 6)
+     , TAX DECIMAL(14, 6)
+     , TOTAL_PRICE DECIMAL(14, 6) NOT NULL
      , PRIMARY KEY (ORDER_FORM_ID)
 );
 
 CREATE TABLE PRODUCT (
        PRODUCT_ID BIGINT NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 100, INCREMENT BY 1)
-     , MODEL VARCHAR(32)
-     , QUANTITY INTEGER NOT NULL
+     , MODEL VARCHAR(64)
+     , QUANTITY INTEGER
      , PRICE DECIMAL(15, 4) NOT NULL
      , WEIGHT DECIMAL(5, 2)
      , IMAGE VARCHAR(64)
      , THUMBNAIL VARCHAR(64)
-     , STOCK INTEGER
      , ORDERED INTEGER NOT NULL DEFAULT 0
      , STATUS INTEGER NOT NULL
      , DATE_ADDED TIMESTAMP NOT NULL
@@ -288,8 +289,7 @@
        ORDER_PRODUCT_ID BIGINT NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 100, INCREMENT BY 1)
      , ORDER_FORM_ID BIGINT NOT NULL
      , PRODUCT_ID BIGINT NOT NULL
-     , MODEL VARCHAR(32)
-     , NAME VARCHAR(64) NOT NULL
+     , MODEL VARCHAR(64)
      , PRICE DECIMAL(15, 4) NOT NULL
      , FINAL_PRICE DECIMAL(15,4) NOT NULL
      , TAX DECIMAL(7, 4) NOT NULL

Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/checkoutComplete.html
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/checkoutComplete.html	2007-09-23 07:44:28 UTC (rev 576)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/checkoutComplete.html	2007-09-23 07:48:26 UTC (rev 577)
@@ -6,18 +6,20 @@
     <title id="title-head">注文受付画面</title>
   </head>
   <body>
-    <form id="Form">
+    <form id="checkoutCompleteForm">
       <h2>
-        <span id="title">注文受付</span>
+        <label>注文受付</label>
       </h2>
-      <div>
-        <span id="messages"></span>
-      </div>
+      <div>
+        <span id="messages"></span>
+      </div>
+      <div>
+        <label>注文番号:</label><span id="orderFormNumber"></span>
+      </div>
       <label>注文を受け付けました。
 <br />ご注文有難うございました。
 <br />またのご利用をお待ちしております。</label>
       <br />
-<!-- TODO Link to a product page -->
     </form>
   </body>
 </html>

Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/checkoutConfirm.html
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/checkoutConfirm.html	2007-09-23 07:44:28 UTC (rev 576)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/checkoutConfirm.html	2007-09-23 07:48:26 UTC (rev 577)
@@ -6,7 +6,7 @@
     <title id="title-head">注文確認画面</title>
   </head>
   <body>
-    <form id="Form">
+    <form id="checkoutConfirmForm">
       <input id="orderProcessId" type="hidden"/>
       <div>
         <span id="allMessages"></span>
@@ -59,19 +59,19 @@
               <tfoot>
                 <tr>
                   <td colspan="4" align="right">小計</td>
-                  <td colspan="2"><span id="subTotalPrice">30,000</span></td>
+                  <td colspan="2"><span id="subTotalPrice">30,000</span><input type="hidden" id="subTotalPrice-hidden"/></td>
                 </tr>
                 <tr>
                   <td colspan="4" align="right">送料</td>
-                  <td colspan="2"><span id="deliveryPrice">1000</span></td>
+                  <td colspan="2"><span id="deliveryPrice">1000</span><input type="hidden" id="deliveryPrice-hidden"/></td>
                 </tr>
                 <tr>
                   <td colspan="4" align="right">消費税</td>
-                  <td colspan="2"><span id="tax">50</span></td>
+                  <td colspan="2"><span id="tax">50</span><input type="hidden" id="tax-hidden"/></td>
                 </tr>
                 <tr>
                   <td colspan="4" align="right">合計</td>
-                  <td colspan="2"><span id="totalPrice">31,050</span></td>
+                  <td colspan="2"><span id="totalPrice">31,050</span><input type="hidden" id="totalPrice-hidden"/></td>
                 </tr>
               </tfoot>
             </table>


pal-cvs メーリングリストの案内