[pal-cvs 2854] [599] updated db(added yomi and code).

Back to archive index

svnno****@sourc***** svnno****@sourc*****
2007年 10月 1日 (月) 22:00:16 JST


Revision: 599
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=599
Author:   shinsuke
Date:     2007-10-01 22:00:14 +0900 (Mon, 01 Oct 2007)

Log Message:
-----------
updated db(added yomi and code). updated page for editing user info.

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/bsbhv/BsAddressBookBhv.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsCustomerBhv.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/bsdao/BsAddressBookDao.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsCustomerDao.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/bsentity/BsAddressBook.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsCustomer.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/dbmeta/AddressBookDbm.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/CustomerDbm.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/cbean/cq/bs/AbstractBsAddressBookCQ.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsCustomerCQ.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/BsAddressBookCQ.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsCustomerCQ.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/ciq/AddressBookCIQ.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/CustomerCIQ.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/dxo/CustomerDxo.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserInfoEditAction.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserInfoEditPage.java
    pompei/portlets/pompei-core/trunk/src/main/resources/appMessages.properties
    pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/admin/order/label.properties
    pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/checkout/label.properties
    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/userInfoEdit.html


-------------- 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-30 13:20:43 UTC (rev 598)
+++ pompei/portlets/pompei-core/trunk/dbflute/schema/project-schema-pompei.xml	2007-10-01 13:00:14 UTC (rev 599)
@@ -14,9 +14,13 @@
         <column dbType="VARCHAR" javaType="String" name="DEPARTMENT"
             size="64" type="VARCHAR"/>
         <column dbType="VARCHAR" javaType="String" name="FIRSTNAME"
-            required="true" size="32" type="VARCHAR"/>
+            required="true" size="40" type="VARCHAR"/>
         <column dbType="VARCHAR" javaType="String" name="LASTNAME"
-            required="true" size="32" type="VARCHAR"/>
+            required="true" size="40" type="VARCHAR"/>
+        <column dbType="VARCHAR" javaType="String"
+            name="FIRSTNAME_DESCRIPTION" size="40" type="VARCHAR"/>
+        <column dbType="VARCHAR" javaType="String"
+            name="LASTNAME_DESCRIPTION" size="40" type="VARCHAR"/>
         <column dbType="VARCHAR" javaType="String" name="STREET_ADDRESS"
             required="true" size="255" type="VARCHAR"/>
         <column dbType="VARCHAR" javaType="String" name="SUBURB"
@@ -202,9 +206,13 @@
         <column dbType="CHAR" javaType="String" name="GENDER"
             required="true" size="1" type="CHAR"/>
         <column dbType="VARCHAR" javaType="String" name="FIRSTNAME"
-            required="true" size="32" type="VARCHAR"/>
+            required="true" size="40" type="VARCHAR"/>
         <column dbType="VARCHAR" javaType="String" name="LASTNAME"
-            required="true" size="32" type="VARCHAR"/>
+            required="true" size="40" type="VARCHAR"/>
+        <column dbType="VARCHAR" javaType="String"
+            name="FIRSTNAME_DESCRIPTION" size="40" type="VARCHAR"/>
+        <column dbType="VARCHAR" javaType="String"
+            name="LASTNAME_DESCRIPTION" size="40" type="VARCHAR"/>
         <column dbType="VARCHAR" javaType="String" name="NICKNAME"
             size="64" type="VARCHAR"/>
         <column dbType="DATE" default="0000-00-00 00:00:00"
@@ -403,9 +411,13 @@
         <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"/>
+            name="CUSTOMER_FIRSTNAME" required="true" size="40" type="VARCHAR"/>
         <column dbType="VARCHAR" javaType="String"
-            name="CUSTOMER_LASTNAME" required="true" size="32" type="VARCHAR"/>
+            name="CUSTOMER_LASTNAME" required="true" size="40" type="VARCHAR"/>
+        <column dbType="VARCHAR" javaType="String"
+            name="CUSTOMER_FIRSTNAME_DESCRIPTION" size="40" type="VARCHAR"/>
+        <column dbType="VARCHAR" javaType="String"
+            name="CUSTOMER_LASTNAME_DESCRIPTION" size="40" type="VARCHAR"/>
         <column dbType="DATE" javaType="java.util.Date"
             name="CUSTOMER_DAY_OF_BIRTH" required="true" type="DATE"/>
         <column dbType="VARCHAR" javaType="String"
@@ -435,10 +447,14 @@
         <column dbType="VARCHAR" javaType="String"
             name="DELIVERY_DEPARTMENT" size="64" type="VARCHAR"/>
         <column dbType="VARCHAR" javaType="String"
-            name="DELIVERY_FIRSTNAME" required="true" size="32" type="VARCHAR"/>
+            name="DELIVERY_FIRSTNAME" required="true" size="40" type="VARCHAR"/>
         <column dbType="VARCHAR" javaType="String"
-            name="DELIVERY_LASTNAME" required="true" size="32" type="VARCHAR"/>
+            name="DELIVERY_LASTNAME" required="true" size="40" type="VARCHAR"/>
         <column dbType="VARCHAR" javaType="String"
+            name="DELIVERY_FIRSTNAME_DESCRIPTION" size="40" type="VARCHAR"/>
+        <column dbType="VARCHAR" javaType="String"
+            name="DELIVERY_LAST_DESCRIPTION" size="40" type="VARCHAR"/>
+        <column dbType="VARCHAR" javaType="String"
             name="DELIVERY_STREET_ADDRESS" required="true" size="255" type="VARCHAR"/>
         <column dbType="VARCHAR" javaType="String"
             name="DELIVERY_SUBURB" size="32" type="VARCHAR"/>
@@ -459,10 +475,14 @@
         <column dbType="VARCHAR" javaType="String"
             name="BILLING_DEPARTMENT" size="64" type="VARCHAR"/>
         <column dbType="VARCHAR" javaType="String"
-            name="BILLING_FIRSTNAME" required="true" size="32" type="VARCHAR"/>
+            name="BILLING_FIRSTNAME" required="true" size="40" type="VARCHAR"/>
         <column dbType="VARCHAR" javaType="String"
-            name="BILLING_LASTNAME" required="true" size="32" type="VARCHAR"/>
+            name="BILLING_LASTNAME" required="true" size="40" type="VARCHAR"/>
         <column dbType="VARCHAR" javaType="String"
+            name="BILLING_FIRSTNAME_DESCRIPTION" size="40" type="VARCHAR"/>
+        <column dbType="VARCHAR" javaType="String"
+            name="BILLING_LASTNAME_DESCRIPTION" size="40" type="VARCHAR"/>
+        <column dbType="VARCHAR" javaType="String"
             name="BILLING_STREET_ADDRESS" required="true" size="255" type="VARCHAR"/>
         <column dbType="VARCHAR" javaType="String" name="BILLING_SUBURB"
             size="32" type="VARCHAR"/>
@@ -549,6 +569,7 @@
             name="ORDER_FORM_ID" required="true" type="BIGINT"/>
         <column dbType="BIGINT" javaType="java.math.BigDecimal"
             name="PRODUCT_ID" required="true" type="BIGINT"/>
+        <column dbType="VARCHAR" javaType="String" name="CODE" size="64" type="VARCHAR"/>
         <column dbType="VARCHAR" javaType="String" name="MODEL"
             size="64" type="VARCHAR"/>
         <column dbType="DECIMAL" javaType="java.math.BigDecimal"

Modified: pompei/portlets/pompei-core/trunk/src/main/config/pompei.clay
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/config/pompei.clay	2007-09-30 13:20:43 UTC (rev 598)
+++ pompei/portlets/pompei-core/trunk/src/main/config/pompei.clay	2007-10-01 13:00:14 UTC (rev 599)
@@ -9,7 +9,7 @@
 <table-list>
 <table alias="" name="ADDRESS_BOOK" remarks="" uid="1350e24:11525502e7d:-7ffe">
 <table-description></table-description>
-<table-figure-bounds height="340" width="277" x="2226" y="364"/>
+<table-figure-bounds height="369" width="289" x="2226" y="364"/>
 <column-list>
 <column alias="" auto-increment="true" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="ADDRESS_BOOK_ID" remarks="" uid="1350e24:11525502e7d:-7ffc">
 <column-description></column-description>
@@ -50,18 +50,34 @@
 <variant precision-max="4000" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
 </data-type>
 </column>
-<column alias="" auto-increment="false" column-size="32" decimal-digits="0" default-value="" mandatory="true" name="FIRSTNAME" remarks="" uid="1350e24:11525502e7d:-7ff8">
+<column alias="" auto-increment="false" column-size="40" decimal-digits="0" default-value="" mandatory="true" name="FIRSTNAME" remarks="" uid="1350e24:11525502e7d:-7ff8">
 <column-description></column-description>
 <data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="4000" 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)"/>
+<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="true" name="LASTNAME" remarks="" uid="1350e24:11525502e7d:-7ff7">
+<column alias="" auto-increment="false" column-size="40" decimal-digits="0" default-value="" mandatory="true" name="LASTNAME" remarks="" uid="1350e24:11525502e7d:-7ff7">
 <column-description></column-description>
 <data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="4000" 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)"/>
+<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="40" decimal-digits="0" default-value="" mandatory="false" name="FIRSTNAME_DESCRIPTION" remarks="" uid="c82493:1155849a434:-7fc9">
+<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="40" decimal-digits="0" default-value="" mandatory="false" name="LASTNAME_DESCRIPTION" remarks="" uid="c82493:1155849a434:-7fc8">
+<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="255" decimal-digits="0" default-value="" mandatory="true" name="STREET_ADDRESS" remarks="" uid="1350e24:11525502e7d:-7ff6">
 <column-description></column-description>
 <data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
@@ -405,7 +421,7 @@
 </table>
 <table alias="" name="CUSTOMER" remarks="" uid="1350e24:11525502e7d:-7fd0">
 <table-description></table-description>
-<table-figure-bounds height="201" width="244" x="2328" y="787"/>
+<table-figure-bounds height="237" width="288" x="2328" y="787"/>
 <column-list>
 <column alias="" auto-increment="true" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="CUSTOMER_ID" remarks="" uid="1350e24:11525502e7d:-7fce">
 <column-description></column-description>
@@ -433,18 +449,34 @@
 <variant type-name-pattern="CHAR"/>
 </data-type>
 </column>
-<column alias="" auto-increment="false" column-size="32" decimal-digits="0" default-value="" mandatory="true" name="FIRSTNAME" remarks="" uid="1350e24:11525502e7d:-7fcb">
+<column alias="" auto-increment="false" column-size="40" decimal-digits="0" default-value="" mandatory="true" name="FIRSTNAME" remarks="" uid="1350e24:11525502e7d:-7fcb">
 <column-description></column-description>
 <data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="4000" 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)"/>
+<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="true" name="LASTNAME" remarks="" uid="1350e24:11525502e7d:-7fca">
+<column alias="" auto-increment="false" column-size="40" decimal-digits="0" default-value="" mandatory="true" name="LASTNAME" remarks="" uid="1350e24:11525502e7d:-7fca">
 <column-description></column-description>
 <data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="4000" 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)"/>
+<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="40" decimal-digits="0" default-value="" mandatory="false" name="FIRSTNAME_DESCRIPTION" remarks="" uid="c82493:1155849a434:-7fce">
+<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="40" decimal-digits="0" default-value="" mandatory="false" name="LASTNAME_DESCRIPTION" remarks="" uid="c82493:1155849a434:-7fcd">
+<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="false" name="NICKNAME" remarks="" uid="1350e24:11525502e7d:-7fc9">
 <column-description></column-description>
 <data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
@@ -1127,7 +1159,7 @@
 </table>
 <table alias="" name="ORDER_FORM" remarks="" uid="1350e24:11525502e7d:-7f7e">
 <table-description></table-description>
-<table-figure-bounds height="-1" width="-1" x="27" y="910"/>
+<table-figure-bounds height="1102" width="378" x="27" y="910"/>
 <column-list>
 <column alias="" auto-increment="true" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="ORDER_FORM_ID" remarks="" uid="1350e24:11525502e7d:-7f7c">
 <column-description></column-description>
@@ -1170,20 +1202,34 @@
 <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="32" decimal-digits="0" default-value="" mandatory="true" name="CUSTOMER_FIRSTNAME" remarks="" uid="1350e24:11525502e7d:-7f79">
+<column alias="" auto-increment="false" column-size="40" decimal-digits="0" default-value="" mandatory="true" name="CUSTOMER_FIRSTNAME" remarks="" uid="1350e24:11525502e7d:-7f79">
 <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="32" decimal-digits="0" default-value="" mandatory="true" name="CUSTOMER_LASTNAME" remarks="" uid="1350e24:11525502e7d:-7f78">
+<column alias="" auto-increment="false" column-size="40" 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)"/>
 <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="40" decimal-digits="0" default-value="" mandatory="false" name="CUSTOMER_FIRSTNAME_DESCRIPTION" remarks="" uid="c82493:1155849a434:-7fc5">
+<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="40" decimal-digits="0" default-value="" mandatory="false" name="CUSTOMER_LASTNAME_DESCRIPTION" remarks="" uid="c82493:1155849a434:-7fc4">
+<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="CUSTOMER_DAY_OF_BIRTH" remarks="" uid="1350e24:11525502e7d:-7f77">
 <column-description></column-description>
 <data-type jdbc-type="91" literal-prefix="'" literal-suffix="'" name="DATE" selected-variant-pattern="DATE">
@@ -1281,20 +1327,34 @@
 <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="true" name="DELIVERY_FIRSTNAME" remarks="" uid="1350e24:11525502e7d:-7f69">
+<column alias="" auto-increment="false" column-size="40" decimal-digits="0" default-value="" mandatory="true" name="DELIVERY_FIRSTNAME" remarks="" uid="1350e24:11525502e7d:-7f69">
 <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="32" decimal-digits="0" default-value="" mandatory="true" name="DELIVERY_LASTNAME" remarks="" uid="1350e24:11525502e7d:-7f68">
+<column alias="" auto-increment="false" column-size="40" decimal-digits="0" default-value="" mandatory="true" name="DELIVERY_LASTNAME" remarks="" uid="1350e24:11525502e7d:-7f68">
 <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="40" decimal-digits="0" default-value="" mandatory="false" name="DELIVERY_FIRSTNAME_DESCRIPTION" remarks="" uid="c82493:1155849a434:-7fc3">
+<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="40" decimal-digits="0" default-value="" mandatory="false" name="DELIVERY_LAST_DESCRIPTION" remarks="" uid="c82493:1155849a434:-7fc2">
+<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="255" decimal-digits="0" default-value="" mandatory="true" name="DELIVERY_STREET_ADDRESS" remarks="" uid="1350e24:11525502e7d:-7f67">
 <column-description></column-description>
 <data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
@@ -1361,20 +1421,34 @@
 <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="true" name="BILLING_FIRSTNAME" remarks="" uid="1350e24:11525502e7d:-7f5d">
+<column alias="" auto-increment="false" column-size="40" decimal-digits="0" default-value="" mandatory="true" name="BILLING_FIRSTNAME" remarks="" uid="1350e24:11525502e7d:-7f5d">
 <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="32" decimal-digits="0" default-value="" mandatory="true" name="BILLING_LASTNAME" remarks="" uid="1350e24:11525502e7d:-7f5c">
+<column alias="" auto-increment="false" column-size="40" decimal-digits="0" default-value="" mandatory="true" name="BILLING_LASTNAME" remarks="" uid="1350e24:11525502e7d:-7f5c">
 <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="40" decimal-digits="0" default-value="" mandatory="false" name="BILLING_FIRSTNAME_DESCRIPTION" remarks="" uid="c82493:1155849a434:-7fc1">
+<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="40" decimal-digits="0" default-value="" mandatory="false" name="BILLING_LASTNAME_DESCRIPTION" remarks="" uid="c82493:1155849a434:-7fc0">
+<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="255" decimal-digits="0" default-value="" mandatory="true" name="BILLING_STREET_ADDRESS" remarks="" uid="1350e24:11525502e7d:-7f5b">
 <column-description></column-description>
 <data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
@@ -1652,7 +1726,7 @@
 </table>
 <table alias="" name="ORDER_PRODUCT" remarks="" uid="1350e24:11525502e7d:-7f42">
 <table-description></table-description>
-<table-figure-bounds height="-1" width="-1" x="441" y="1910"/>
+<table-figure-bounds height="-1" width="-1" x="475" y="1915"/>
 <column-list>
 <column alias="" auto-increment="true" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="ORDER_PRODUCT_ID" remarks="" uid="1350e24:11525502e7d:-7f40">
 <column-description></column-description>
@@ -1693,6 +1767,13 @@
 <variant type-name-pattern="BIGINT ZEROFILL"/>
 </data-type>
 </column>
+<column alias="" auto-increment="false" column-size="64" decimal-digits="0" default-value="" mandatory="false" name="CODE" remarks="" uid="1f530d8:115531622f1:-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="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)">
@@ -1886,7 +1967,7 @@
 </table>
 <table alias="" name="ORDER_PRODUCT_DOWNLOAD" remarks="" uid="1350e24:11525502e7d:-7f2a">
 <table-description></table-description>
-<table-figure-bounds height="-1" width="-1" x="795" y="1362"/>
+<table-figure-bounds height="-1" width="-1" x="823" y="1389"/>
 <column-list>
 <column alias="" auto-increment="true" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="ORDER_PRODUCT_DOWNLOAD_ID" remarks="" uid="1350e24:11525502e7d:-7f28">
 <column-description></column-description>
@@ -2146,7 +2227,7 @@
 </table>
 <table alias="" name="ORDER_COMMENT" remarks="" uid="1350e24:11525502e7d:-7f10">
 <table-description></table-description>
-<table-figure-bounds height="-1" width="-1" x="24" y="1998"/>
+<table-figure-bounds height="-1" width="-1" x="30" y="2092"/>
 <column-list>
 <column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="ORDER_FORM_ID" remarks="" uid="1350e24:11525502e7d:-7f0e">
 <column-description></column-description>

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsAddressBookBhv.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsAddressBookBhv.java	2007-09-30 13:20:43 UTC (rev 598)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsAddressBookBhv.java	2007-10-01 13:00:14 UTC (rev 599)
@@ -28,7 +28,7 @@
  *     ADDRESS_BOOK_ID
  * 
  * [column-property]
- *     ADDRESS_BOOK_ID, CUSTOMER_ID, COMPANY, DEPARTMENT, FIRSTNAME, LASTNAME, STREET_ADDRESS, SUBURB, CITY, STATE, POSTCODE, TELEPHONE, FAX, CELLPHONE, DEFAULT_ADDRESS, LANGUAGE_ID, COUNTRY_ID, ZONE_ID
+ *     ADDRESS_BOOK_ID, CUSTOMER_ID, COMPANY, DEPARTMENT, FIRSTNAME, LASTNAME, FIRSTNAME_DESCRIPTION, LASTNAME_DESCRIPTION, STREET_ADDRESS, SUBURB, CITY, STATE, POSTCODE, TELEPHONE, FAX, CELLPHONE, DEFAULT_ADDRESS, LANGUAGE_ID, COUNTRY_ID, ZONE_ID
  * 
  * [foreign-property]
  *     country, customer, language, zone
@@ -724,6 +724,8 @@
         if (names.contains("department")) { destinationMyEntity.setDepartment(sourceMyEntity.getDepartment()); }
         if (names.contains("firstname")) { destinationMyEntity.setFirstname(sourceMyEntity.getFirstname()); }
         if (names.contains("lastname")) { destinationMyEntity.setLastname(sourceMyEntity.getLastname()); }
+        if (names.contains("firstnameDescription")) { destinationMyEntity.setFirstnameDescription(sourceMyEntity.getFirstnameDescription()); }
+        if (names.contains("lastnameDescription")) { destinationMyEntity.setLastnameDescription(sourceMyEntity.getLastnameDescription()); }
         if (names.contains("streetAddress")) { destinationMyEntity.setStreetAddress(sourceMyEntity.getStreetAddress()); }
         if (names.contains("suburb")) { destinationMyEntity.setSuburb(sourceMyEntity.getSuburb()); }
         if (names.contains("city")) { destinationMyEntity.setCity(sourceMyEntity.getCity()); }

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsCustomerBhv.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsCustomerBhv.java	2007-09-30 13:20:43 UTC (rev 598)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsCustomerBhv.java	2007-10-01 13:00:14 UTC (rev 599)
@@ -30,7 +30,7 @@
  *     CUSTOMER_ID
  * 
  * [column-property]
- *     CUSTOMER_ID, PORTAL_ID, GENDER, FIRSTNAME, LASTNAME, NICKNAME, DAY_OF_BIRTH, EMAIL_ADDRESS, LAST_MODIFIED, DATE_ADDED
+ *     CUSTOMER_ID, PORTAL_ID, GENDER, FIRSTNAME, LASTNAME, FIRSTNAME_DESCRIPTION, LASTNAME_DESCRIPTION, NICKNAME, DAY_OF_BIRTH, EMAIL_ADDRESS, LAST_MODIFIED, DATE_ADDED
  * 
  * [foreign-property]
  *     
@@ -1521,6 +1521,8 @@
         if (names.contains("gender")) { destinationMyEntity.setGender(sourceMyEntity.getGender()); }
         if (names.contains("firstname")) { destinationMyEntity.setFirstname(sourceMyEntity.getFirstname()); }
         if (names.contains("lastname")) { destinationMyEntity.setLastname(sourceMyEntity.getLastname()); }
+        if (names.contains("firstnameDescription")) { destinationMyEntity.setFirstnameDescription(sourceMyEntity.getFirstnameDescription()); }
+        if (names.contains("lastnameDescription")) { destinationMyEntity.setLastnameDescription(sourceMyEntity.getLastnameDescription()); }
         if (names.contains("nickname")) { destinationMyEntity.setNickname(sourceMyEntity.getNickname()); }
         if (names.contains("dayOfBirth")) { destinationMyEntity.setDayOfBirth(sourceMyEntity.getDayOfBirth()); }
         if (names.contains("emailAddress")) { destinationMyEntity.setEmailAddress(sourceMyEntity.getEmailAddress()); }

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-30 13:20:43 UTC (rev 598)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsOrderFormBhv.java	2007-10-01 13:00:14 UTC (rev 599)
@@ -30,7 +30,7 @@
  *     ORDER_FORM_ID
  * 
  * [column-property]
- *     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
+ *     ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_FIRSTNAME_DESCRIPTION, CUSTOMER_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, DELIVERY_LAST_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, BILLING_LASTNAME_DESCRIPTION, 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
@@ -1495,6 +1495,8 @@
         if (names.contains("customerGender")) { destinationMyEntity.setCustomerGender(sourceMyEntity.getCustomerGender()); }
         if (names.contains("customerFirstname")) { destinationMyEntity.setCustomerFirstname(sourceMyEntity.getCustomerFirstname()); }
         if (names.contains("customerLastname")) { destinationMyEntity.setCustomerLastname(sourceMyEntity.getCustomerLastname()); }
+        if (names.contains("customerFirstnameDescription")) { destinationMyEntity.setCustomerFirstnameDescription(sourceMyEntity.getCustomerFirstnameDescription()); }
+        if (names.contains("customerLastnameDescription")) { destinationMyEntity.setCustomerLastnameDescription(sourceMyEntity.getCustomerLastnameDescription()); }
         if (names.contains("customerDayOfBirth")) { destinationMyEntity.setCustomerDayOfBirth(sourceMyEntity.getCustomerDayOfBirth()); }
         if (names.contains("customerEmailAddress")) { destinationMyEntity.setCustomerEmailAddress(sourceMyEntity.getCustomerEmailAddress()); }
         if (names.contains("customerCompany")) { destinationMyEntity.setCustomerCompany(sourceMyEntity.getCustomerCompany()); }
@@ -1511,6 +1513,8 @@
         if (names.contains("deliveryDepartment")) { destinationMyEntity.setDeliveryDepartment(sourceMyEntity.getDeliveryDepartment()); }
         if (names.contains("deliveryFirstname")) { destinationMyEntity.setDeliveryFirstname(sourceMyEntity.getDeliveryFirstname()); }
         if (names.contains("deliveryLastname")) { destinationMyEntity.setDeliveryLastname(sourceMyEntity.getDeliveryLastname()); }
+        if (names.contains("deliveryFirstnameDescription")) { destinationMyEntity.setDeliveryFirstnameDescription(sourceMyEntity.getDeliveryFirstnameDescription()); }
+        if (names.contains("deliveryLastDescription")) { destinationMyEntity.setDeliveryLastDescription(sourceMyEntity.getDeliveryLastDescription()); }
         if (names.contains("deliveryStreetAddress")) { destinationMyEntity.setDeliveryStreetAddress(sourceMyEntity.getDeliveryStreetAddress()); }
         if (names.contains("deliverySuburb")) { destinationMyEntity.setDeliverySuburb(sourceMyEntity.getDeliverySuburb()); }
         if (names.contains("deliveryCity")) { destinationMyEntity.setDeliveryCity(sourceMyEntity.getDeliveryCity()); }
@@ -1523,6 +1527,8 @@
         if (names.contains("billingDepartment")) { destinationMyEntity.setBillingDepartment(sourceMyEntity.getBillingDepartment()); }
         if (names.contains("billingFirstname")) { destinationMyEntity.setBillingFirstname(sourceMyEntity.getBillingFirstname()); }
         if (names.contains("billingLastname")) { destinationMyEntity.setBillingLastname(sourceMyEntity.getBillingLastname()); }
+        if (names.contains("billingFirstnameDescription")) { destinationMyEntity.setBillingFirstnameDescription(sourceMyEntity.getBillingFirstnameDescription()); }
+        if (names.contains("billingLastnameDescription")) { destinationMyEntity.setBillingLastnameDescription(sourceMyEntity.getBillingLastnameDescription()); }
         if (names.contains("billingStreetAddress")) { destinationMyEntity.setBillingStreetAddress(sourceMyEntity.getBillingStreetAddress()); }
         if (names.contains("billingSuburb")) { destinationMyEntity.setBillingSuburb(sourceMyEntity.getBillingSuburb()); }
         if (names.contains("billingCity")) { destinationMyEntity.setBillingCity(sourceMyEntity.getBillingCity()); }

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-30 13:20:43 UTC (rev 598)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsOrderProductBhv.java	2007-10-01 13:00:14 UTC (rev 599)
@@ -28,7 +28,7 @@
  *     ORDER_PRODUCT_ID
  * 
  * [column-property]
- *     ORDER_PRODUCT_ID, ORDER_FORM_ID, PRODUCT_ID, MODEL, PRICE, FINAL_PRICE, TAX, QUANTITY
+ *     ORDER_PRODUCT_ID, ORDER_FORM_ID, PRODUCT_ID, CODE, MODEL, PRICE, FINAL_PRICE, TAX, QUANTITY
  * 
  * [foreign-property]
  *     orderForm, product
@@ -681,6 +681,7 @@
         if (names.contains("orderProductId")) { destinationMyEntity.setOrderProductId(sourceMyEntity.getOrderProductId()); }
         if (names.contains("orderFormId")) { destinationMyEntity.setOrderFormId(sourceMyEntity.getOrderFormId()); }
         if (names.contains("productId")) { destinationMyEntity.setProductId(sourceMyEntity.getProductId()); }
+        if (names.contains("code")) { destinationMyEntity.setCode(sourceMyEntity.getCode()); }
         if (names.contains("model")) { destinationMyEntity.setModel(sourceMyEntity.getModel()); }
         if (names.contains("price")) { destinationMyEntity.setPrice(sourceMyEntity.getPrice()); }
         if (names.contains("finalPrice")) { destinationMyEntity.setFinalPrice(sourceMyEntity.getFinalPrice()); }

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsAddressBookDao.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsAddressBookDao.java	2007-09-30 13:20:43 UTC (rev 598)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsAddressBookDao.java	2007-10-01 13:00:14 UTC (rev 599)
@@ -11,7 +11,7 @@
  *     ADDRESS_BOOK_ID
  * 
  * [column-property]
- *     ADDRESS_BOOK_ID, CUSTOMER_ID, COMPANY, DEPARTMENT, FIRSTNAME, LASTNAME, STREET_ADDRESS, SUBURB, CITY, STATE, POSTCODE, TELEPHONE, FAX, CELLPHONE, DEFAULT_ADDRESS, LANGUAGE_ID, COUNTRY_ID, ZONE_ID
+ *     ADDRESS_BOOK_ID, CUSTOMER_ID, COMPANY, DEPARTMENT, FIRSTNAME, LASTNAME, FIRSTNAME_DESCRIPTION, LASTNAME_DESCRIPTION, STREET_ADDRESS, SUBURB, CITY, STATE, POSTCODE, TELEPHONE, FAX, CELLPHONE, DEFAULT_ADDRESS, LANGUAGE_ID, COUNTRY_ID, ZONE_ID
  * 
  * [foreign-property]
  *     country, customer, language, zone
@@ -51,7 +51,7 @@
     public int getCountAll();
 
     /** SQL-Annotation for getListAll(). */
-    public static final String getListAll_SQL = "select ADDRESS_BOOK_ID, CUSTOMER_ID, COMPANY, DEPARTMENT, FIRSTNAME, LASTNAME, STREET_ADDRESS, SUBURB, CITY, STATE, POSTCODE, TELEPHONE, FAX, CELLPHONE, DEFAULT_ADDRESS, LANGUAGE_ID, COUNTRY_ID, ZONE_ID from ADDRESS_BOOK";
+    public static final String getListAll_SQL = "select ADDRESS_BOOK_ID, CUSTOMER_ID, COMPANY, DEPARTMENT, FIRSTNAME, LASTNAME, FIRSTNAME_DESCRIPTION, LASTNAME_DESCRIPTION, STREET_ADDRESS, SUBURB, CITY, STATE, POSTCODE, TELEPHONE, FAX, CELLPHONE, DEFAULT_ADDRESS, LANGUAGE_ID, COUNTRY_ID, ZONE_ID from ADDRESS_BOOK";
 
     /**
      * Get list as all.
@@ -61,7 +61,7 @@
     public java.util.List<AddressBook> getListAll();
 
     /** SQL-Annotation for getEntity(). */
-    public static final String getEntity_SQL = "select ADDRESS_BOOK_ID, CUSTOMER_ID, COMPANY, DEPARTMENT, FIRSTNAME, LASTNAME, STREET_ADDRESS, SUBURB, CITY, STATE, POSTCODE, TELEPHONE, FAX, CELLPHONE, DEFAULT_ADDRESS, LANGUAGE_ID, COUNTRY_ID, ZONE_ID from ADDRESS_BOOK where ADDRESS_BOOK.ADDRESS_BOOK_ID = /*addressBookId*/null";
+    public static final String getEntity_SQL = "select ADDRESS_BOOK_ID, CUSTOMER_ID, COMPANY, DEPARTMENT, FIRSTNAME, LASTNAME, FIRSTNAME_DESCRIPTION, LASTNAME_DESCRIPTION, STREET_ADDRESS, SUBURB, CITY, STATE, POSTCODE, TELEPHONE, FAX, CELLPHONE, DEFAULT_ADDRESS, LANGUAGE_ID, COUNTRY_ID, ZONE_ID from ADDRESS_BOOK where ADDRESS_BOOK.ADDRESS_BOOK_ID = /*addressBookId*/null";
 
     /** Args-Annotation for getEntity(). */
     public static final String getEntity_ARGS = "addressBookId";

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsCustomerDao.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsCustomerDao.java	2007-09-30 13:20:43 UTC (rev 598)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsCustomerDao.java	2007-10-01 13:00:14 UTC (rev 599)
@@ -11,7 +11,7 @@
  *     CUSTOMER_ID
  * 
  * [column-property]
- *     CUSTOMER_ID, PORTAL_ID, GENDER, FIRSTNAME, LASTNAME, NICKNAME, DAY_OF_BIRTH, EMAIL_ADDRESS, LAST_MODIFIED, DATE_ADDED
+ *     CUSTOMER_ID, PORTAL_ID, GENDER, FIRSTNAME, LASTNAME, FIRSTNAME_DESCRIPTION, LASTNAME_DESCRIPTION, NICKNAME, DAY_OF_BIRTH, EMAIL_ADDRESS, LAST_MODIFIED, DATE_ADDED
  * 
  * [foreign-property]
  *     
@@ -51,7 +51,7 @@
     public int getCountAll();
 
     /** SQL-Annotation for getListAll(). */
-    public static final String getListAll_SQL = "select CUSTOMER_ID, PORTAL_ID, GENDER, FIRSTNAME, LASTNAME, NICKNAME, DAY_OF_BIRTH, EMAIL_ADDRESS, LAST_MODIFIED, DATE_ADDED from CUSTOMER";
+    public static final String getListAll_SQL = "select CUSTOMER_ID, PORTAL_ID, GENDER, FIRSTNAME, LASTNAME, FIRSTNAME_DESCRIPTION, LASTNAME_DESCRIPTION, NICKNAME, DAY_OF_BIRTH, EMAIL_ADDRESS, LAST_MODIFIED, DATE_ADDED from CUSTOMER";
 
     /**
      * Get list as all.
@@ -61,7 +61,7 @@
     public java.util.List<Customer> getListAll();
 
     /** SQL-Annotation for getEntity(). */
-    public static final String getEntity_SQL = "select CUSTOMER_ID, PORTAL_ID, GENDER, FIRSTNAME, LASTNAME, NICKNAME, DAY_OF_BIRTH, EMAIL_ADDRESS, LAST_MODIFIED, DATE_ADDED from CUSTOMER where CUSTOMER.CUSTOMER_ID = /*customerId*/null";
+    public static final String getEntity_SQL = "select CUSTOMER_ID, PORTAL_ID, GENDER, FIRSTNAME, LASTNAME, FIRSTNAME_DESCRIPTION, LASTNAME_DESCRIPTION, NICKNAME, DAY_OF_BIRTH, EMAIL_ADDRESS, LAST_MODIFIED, DATE_ADDED from CUSTOMER where CUSTOMER.CUSTOMER_ID = /*customerId*/null";
 
     /** Args-Annotation for getEntity(). */
     public static final String getEntity_ARGS = "customerId";

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-30 13:20:43 UTC (rev 598)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsOrderFormDao.java	2007-10-01 13:00:14 UTC (rev 599)
@@ -11,7 +11,7 @@
  *     ORDER_FORM_ID
  * 
  * [column-property]
- *     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
+ *     ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_FIRSTNAME_DESCRIPTION, CUSTOMER_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, DELIVERY_LAST_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, BILLING_LASTNAME_DESCRIPTION, 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, 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";
+    public static final String getListAll_SQL = "select ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_FIRSTNAME_DESCRIPTION, CUSTOMER_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, DELIVERY_LAST_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, BILLING_LASTNAME_DESCRIPTION, 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, 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";
+    public static final String getEntity_SQL = "select ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_FIRSTNAME_DESCRIPTION, CUSTOMER_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, DELIVERY_LAST_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, BILLING_LASTNAME_DESCRIPTION, 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-30 13:20:43 UTC (rev 598)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsOrderProductDao.java	2007-10-01 13:00:14 UTC (rev 599)
@@ -11,7 +11,7 @@
  *     ORDER_PRODUCT_ID
  * 
  * [column-property]
- *     ORDER_PRODUCT_ID, ORDER_FORM_ID, PRODUCT_ID, MODEL, PRICE, FINAL_PRICE, TAX, QUANTITY
+ *     ORDER_PRODUCT_ID, ORDER_FORM_ID, PRODUCT_ID, CODE, 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, PRICE, FINAL_PRICE, TAX, QUANTITY from ORDER_PRODUCT";
+    public static final String getListAll_SQL = "select ORDER_PRODUCT_ID, ORDER_FORM_ID, PRODUCT_ID, CODE, 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, 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, CODE, 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/bsentity/BsAddressBook.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsAddressBook.java	2007-09-30 13:20:43 UTC (rev 598)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsAddressBook.java	2007-10-01 13:00:14 UTC (rev 599)
@@ -14,7 +14,7 @@
  *     ADDRESS_BOOK_ID
  * 
  * [column-property]
- *     ADDRESS_BOOK_ID, CUSTOMER_ID, COMPANY, DEPARTMENT, FIRSTNAME, LASTNAME, STREET_ADDRESS, SUBURB, CITY, STATE, POSTCODE, TELEPHONE, FAX, CELLPHONE, DEFAULT_ADDRESS, LANGUAGE_ID, COUNTRY_ID, ZONE_ID
+ *     ADDRESS_BOOK_ID, CUSTOMER_ID, COMPANY, DEPARTMENT, FIRSTNAME, LASTNAME, FIRSTNAME_DESCRIPTION, LASTNAME_DESCRIPTION, STREET_ADDRESS, SUBURB, CITY, STATE, POSTCODE, TELEPHONE, FAX, CELLPHONE, DEFAULT_ADDRESS, LANGUAGE_ID, COUNTRY_ID, ZONE_ID
  * 
  * [foreign-property]
  *     country, customer, language, zone
@@ -69,12 +69,18 @@
     /** The value of department. VARCHAR(64) */
     protected String _department;
 
-    /** The value of firstname. VARCHAR(32) : NotNull */
+    /** The value of firstname. VARCHAR(40) : NotNull */
     protected String _firstname;
 
-    /** The value of lastname. VARCHAR(32) : NotNull */
+    /** The value of lastname. VARCHAR(40) : NotNull */
     protected String _lastname;
 
+    /** The value of firstnameDescription. VARCHAR(40) */
+    protected String _firstnameDescription;
+
+    /** The value of lastnameDescription. VARCHAR(40) */
+    protected String _lastnameDescription;
+
     /** The value of streetAddress. VARCHAR(255) : NotNull */
     protected String _streetAddress;
 
@@ -272,12 +278,12 @@
         this._department = department;
     }
 
-    /** Column Annotation for S2Dao. VARCHAR(32) : NotNull */
+    /** Column Annotation for S2Dao. VARCHAR(40) : NotNull */
     public static final String firstname_COLUMN = "FIRSTNAME";
 
     /**
      * Get the value of firstname. <br />
-     * {VARCHAR(32) : NotNull}
+     * {VARCHAR(40) : NotNull}
      * 
      * @return The value of firstname. (Nullable)
      */
@@ -287,7 +293,7 @@
 
     /**
      * Set the value of firstname. <br />
-     * {VARCHAR(32) : NotNull}
+     * {VARCHAR(40) : NotNull}
      * 
      * @param firstname The value of firstname. (Nullable)
      */
@@ -296,12 +302,12 @@
         this._firstname = firstname;
     }
 
-    /** Column Annotation for S2Dao. VARCHAR(32) : NotNull */
+    /** Column Annotation for S2Dao. VARCHAR(40) : NotNull */
     public static final String lastname_COLUMN = "LASTNAME";
 
     /**
      * Get the value of lastname. <br />
-     * {VARCHAR(32) : NotNull}
+     * {VARCHAR(40) : NotNull}
      * 
      * @return The value of lastname. (Nullable)
      */
@@ -311,7 +317,7 @@
 
     /**
      * Set the value of lastname. <br />
-     * {VARCHAR(32) : NotNull}
+     * {VARCHAR(40) : NotNull}
      * 
      * @param lastname The value of lastname. (Nullable)
      */
@@ -320,6 +326,54 @@
         this._lastname = lastname;
     }
 
+    /** Column Annotation for S2Dao. VARCHAR(40) */
+    public static final String firstnameDescription_COLUMN = "FIRSTNAME_DESCRIPTION";
+
+    /**
+     * Get the value of firstnameDescription. <br />
+     * {VARCHAR(40)}
+     * 
+     * @return The value of firstnameDescription. (Nullable)
+     */
+    public String getFirstnameDescription() {
+        return _firstnameDescription;
+    }
+
+    /**
+     * Set the value of firstnameDescription. <br />
+     * {VARCHAR(40)}
+     * 
+     * @param firstnameDescription The value of firstnameDescription. (Nullable)
+     */
+    public void setFirstnameDescription(String firstnameDescription) {
+        _modifiedProperties.addPropertyName("firstnameDescription");
+        this._firstnameDescription = firstnameDescription;
+    }
+
+    /** Column Annotation for S2Dao. VARCHAR(40) */
+    public static final String lastnameDescription_COLUMN = "LASTNAME_DESCRIPTION";
+
+    /**
+     * Get the value of lastnameDescription. <br />
+     * {VARCHAR(40)}
+     * 
+     * @return The value of lastnameDescription. (Nullable)
+     */
+    public String getLastnameDescription() {
+        return _lastnameDescription;
+    }
+
+    /**
+     * Set the value of lastnameDescription. <br />
+     * {VARCHAR(40)}
+     * 
+     * @param lastnameDescription The value of lastnameDescription. (Nullable)
+     */
+    public void setLastnameDescription(String lastnameDescription) {
+        _modifiedProperties.addPropertyName("lastnameDescription");
+        this._lastnameDescription = lastnameDescription;
+    }
+
     /** Column Annotation for S2Dao. VARCHAR(255) : NotNull */
     public static final String streetAddress_COLUMN = "STREET_ADDRESS";
 
@@ -612,16 +666,16 @@
     // ===================================================================================
     //                                                                     Classify Method
     //                                                                     ===============
-                                    
+                                        
     // ===================================================================================
     //                                                        Classification Determination
     //                                                        ============================
-                                    
+                                        
 
     // ===================================================================================
     //                                                               Classification Getter
     //                                                               =====================
-                                    
+                                        
 
     // ===================================================================================
     //                                                                       Foreign Table
@@ -934,6 +988,8 @@
         sb.append(delimiter).append(getDepartment());
         sb.append(delimiter).append(getFirstname());
         sb.append(delimiter).append(getLastname());
+        sb.append(delimiter).append(getFirstnameDescription());
+        sb.append(delimiter).append(getLastnameDescription());
         sb.append(delimiter).append(getStreetAddress());
         sb.append(delimiter).append(getSuburb());
         sb.append(delimiter).append(getCity());

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsCustomer.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsCustomer.java	2007-09-30 13:20:43 UTC (rev 598)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsCustomer.java	2007-10-01 13:00:14 UTC (rev 599)
@@ -14,7 +14,7 @@
  *     CUSTOMER_ID
  * 
  * [column-property]
- *     CUSTOMER_ID, PORTAL_ID, GENDER, FIRSTNAME, LASTNAME, NICKNAME, DAY_OF_BIRTH, EMAIL_ADDRESS, LAST_MODIFIED, DATE_ADDED
+ *     CUSTOMER_ID, PORTAL_ID, GENDER, FIRSTNAME, LASTNAME, FIRSTNAME_DESCRIPTION, LASTNAME_DESCRIPTION, NICKNAME, DAY_OF_BIRTH, EMAIL_ADDRESS, LAST_MODIFIED, DATE_ADDED
  * 
  * [foreign-property]
  *     
@@ -66,12 +66,18 @@
     /** The value of gender. CHAR(1) : NotNull */
     protected String _gender;
 
-    /** The value of firstname. VARCHAR(32) : NotNull */
+    /** The value of firstname. VARCHAR(40) : NotNull */
     protected String _firstname;
 
-    /** The value of lastname. VARCHAR(32) : NotNull */
+    /** The value of lastname. VARCHAR(40) : NotNull */
     protected String _lastname;
 
+    /** The value of firstnameDescription. VARCHAR(40) */
+    protected String _firstnameDescription;
+
+    /** The value of lastnameDescription. VARCHAR(40) */
+    protected String _lastnameDescription;
+
     /** The value of nickname. VARCHAR(64) */
     protected String _nickname;
 
@@ -224,12 +230,12 @@
         this._gender = gender;
     }
 
-    /** Column Annotation for S2Dao. VARCHAR(32) : NotNull */
+    /** Column Annotation for S2Dao. VARCHAR(40) : NotNull */
     public static final String firstname_COLUMN = "FIRSTNAME";
 
     /**
      * Get the value of firstname. <br />
-     * {VARCHAR(32) : NotNull}
+     * {VARCHAR(40) : NotNull}
      * 
      * @return The value of firstname. (Nullable)
      */
@@ -239,7 +245,7 @@
 
     /**
      * Set the value of firstname. <br />
-     * {VARCHAR(32) : NotNull}
+     * {VARCHAR(40) : NotNull}
      * 
      * @param firstname The value of firstname. (Nullable)
      */
@@ -248,12 +254,12 @@
         this._firstname = firstname;
     }
 
-    /** Column Annotation for S2Dao. VARCHAR(32) : NotNull */
+    /** Column Annotation for S2Dao. VARCHAR(40) : NotNull */
     public static final String lastname_COLUMN = "LASTNAME";
 
     /**
      * Get the value of lastname. <br />
-     * {VARCHAR(32) : NotNull}
+     * {VARCHAR(40) : NotNull}
      * 
      * @return The value of lastname. (Nullable)
      */
@@ -263,7 +269,7 @@
 
     /**
      * Set the value of lastname. <br />
-     * {VARCHAR(32) : NotNull}
+     * {VARCHAR(40) : NotNull}
      * 
      * @param lastname The value of lastname. (Nullable)
      */
@@ -272,6 +278,54 @@
         this._lastname = lastname;
     }
 
+    /** Column Annotation for S2Dao. VARCHAR(40) */
+    public static final String firstnameDescription_COLUMN = "FIRSTNAME_DESCRIPTION";
+
+    /**
+     * Get the value of firstnameDescription. <br />
+     * {VARCHAR(40)}
+     * 
+     * @return The value of firstnameDescription. (Nullable)
+     */
+    public String getFirstnameDescription() {
+        return _firstnameDescription;
+    }
+
+    /**
+     * Set the value of firstnameDescription. <br />
+     * {VARCHAR(40)}
+     * 
+     * @param firstnameDescription The value of firstnameDescription. (Nullable)
+     */
+    public void setFirstnameDescription(String firstnameDescription) {
+        _modifiedProperties.addPropertyName("firstnameDescription");
+        this._firstnameDescription = firstnameDescription;
+    }
+
+    /** Column Annotation for S2Dao. VARCHAR(40) */
+    public static final String lastnameDescription_COLUMN = "LASTNAME_DESCRIPTION";
+
+    /**
+     * Get the value of lastnameDescription. <br />
+     * {VARCHAR(40)}
+     * 
+     * @return The value of lastnameDescription. (Nullable)
+     */
+    public String getLastnameDescription() {
+        return _lastnameDescription;
+    }
+
+    /**
+     * Set the value of lastnameDescription. <br />
+     * {VARCHAR(40)}
+     * 
+     * @param lastnameDescription The value of lastnameDescription. (Nullable)
+     */
+    public void setLastnameDescription(String lastnameDescription) {
+        _modifiedProperties.addPropertyName("lastnameDescription");
+        this._lastnameDescription = lastnameDescription;
+    }
+
     /** Column Annotation for S2Dao. VARCHAR(64) */
     public static final String nickname_COLUMN = "NICKNAME";
 
@@ -396,16 +450,16 @@
     // ===================================================================================
     //                                                                     Classify Method
     //                                                                     ===============
-                    
+                        
     // ===================================================================================
     //                                                        Classification Determination
     //                                                        ============================
-                    
+                        
 
     // ===================================================================================
     //                                                               Classification Getter
     //                                                               =====================
-                    
+                        
 
     // ===================================================================================
     //                                                                       Foreign Table
@@ -691,6 +745,8 @@
         sb.append(delimiter).append(getGender());
         sb.append(delimiter).append(getFirstname());
         sb.append(delimiter).append(getLastname());
+        sb.append(delimiter).append(getFirstnameDescription());
+        sb.append(delimiter).append(getLastnameDescription());
         sb.append(delimiter).append(getNickname());
         sb.append(delimiter).append(getDayOfBirth());
         sb.append(delimiter).append(getEmailAddress());

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-30 13:20:43 UTC (rev 598)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderForm.java	2007-10-01 13:00:14 UTC (rev 599)
@@ -14,7 +14,7 @@
  *     ORDER_FORM_ID
  * 
  * [column-property]
- *     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
+ *     ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_FIRSTNAME_DESCRIPTION, CUSTOMER_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, DELIVERY_LAST_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, BILLING_LASTNAME_DESCRIPTION, 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
@@ -69,12 +69,18 @@
     /** The value of customerGender. CHAR(1) : NotNull */
     protected String _customerGender;
 
-    /** The value of customerFirstname. VARCHAR(32) : NotNull */
+    /** The value of customerFirstname. VARCHAR(40) : NotNull */
     protected String _customerFirstname;
 
-    /** The value of customerLastname. VARCHAR(32) : NotNull */
+    /** The value of customerLastname. VARCHAR(40) : NotNull */
     protected String _customerLastname;
 
+    /** The value of customerFirstnameDescription. VARCHAR(40) */
+    protected String _customerFirstnameDescription;
+
+    /** The value of customerLastnameDescription. VARCHAR(40) */
+    protected String _customerLastnameDescription;
+
     /** The value of customerDayOfBirth. DATE : NotNull */
     protected java.util.Date _customerDayOfBirth;
 
@@ -117,12 +123,18 @@
     /** The value of deliveryDepartment. VARCHAR(64) */
     protected String _deliveryDepartment;
 
-    /** The value of deliveryFirstname. VARCHAR(32) : NotNull */
+    /** The value of deliveryFirstname. VARCHAR(40) : NotNull */
     protected String _deliveryFirstname;
 
-    /** The value of deliveryLastname. VARCHAR(32) : NotNull */
+    /** The value of deliveryLastname. VARCHAR(40) : NotNull */
     protected String _deliveryLastname;
 
+    /** The value of deliveryFirstnameDescription. VARCHAR(40) */
+    protected String _deliveryFirstnameDescription;
+
+    /** The value of deliveryLastDescription. VARCHAR(40) */
+    protected String _deliveryLastDescription;
+
     /** The value of deliveryStreetAddress. VARCHAR(255) : NotNull */
     protected String _deliveryStreetAddress;
 
@@ -153,12 +165,18 @@
     /** The value of billingDepartment. VARCHAR(64) */
     protected String _billingDepartment;
 
-    /** The value of billingFirstname. VARCHAR(32) : NotNull */
+    /** The value of billingFirstname. VARCHAR(40) : NotNull */
     protected String _billingFirstname;
 
-    /** The value of billingLastname. VARCHAR(32) : NotNull */
+    /** The value of billingLastname. VARCHAR(40) : NotNull */
     protected String _billingLastname;
 
+    /** The value of billingFirstnameDescription. VARCHAR(40) */
+    protected String _billingFirstnameDescription;
+
+    /** The value of billingLastnameDescription. VARCHAR(40) */
+    protected String _billingLastnameDescription;
+
     /** The value of billingStreetAddress. VARCHAR(255) : NotNull */
     protected String _billingStreetAddress;
 
@@ -389,12 +407,12 @@
         this._customerGender = customerGender;
     }
 
-    /** Column Annotation for S2Dao. VARCHAR(32) : NotNull */
+    /** Column Annotation for S2Dao. VARCHAR(40) : NotNull */
     public static final String customerFirstname_COLUMN = "CUSTOMER_FIRSTNAME";
 
     /**
      * Get the value of customerFirstname. <br />
-     * {VARCHAR(32) : NotNull}
+     * {VARCHAR(40) : NotNull}
      * 
      * @return The value of customerFirstname. (Nullable)
      */
@@ -404,7 +422,7 @@
 
     /**
      * Set the value of customerFirstname. <br />
-     * {VARCHAR(32) : NotNull}
+     * {VARCHAR(40) : NotNull}
      * 
      * @param customerFirstname The value of customerFirstname. (Nullable)
      */
@@ -413,12 +431,12 @@
         this._customerFirstname = customerFirstname;
     }
 
-    /** Column Annotation for S2Dao. VARCHAR(32) : NotNull */
+    /** Column Annotation for S2Dao. VARCHAR(40) : NotNull */
     public static final String customerLastname_COLUMN = "CUSTOMER_LASTNAME";
 
     /**
      * Get the value of customerLastname. <br />
-     * {VARCHAR(32) : NotNull}
+     * {VARCHAR(40) : NotNull}
      * 
      * @return The value of customerLastname. (Nullable)
      */
@@ -428,7 +446,7 @@
 
     /**
      * Set the value of customerLastname. <br />
-     * {VARCHAR(32) : NotNull}
+     * {VARCHAR(40) : NotNull}
      * 
      * @param customerLastname The value of customerLastname. (Nullable)
      */
@@ -437,6 +455,54 @@
         this._customerLastname = customerLastname;
     }
 
+    /** Column Annotation for S2Dao. VARCHAR(40) */
+    public static final String customerFirstnameDescription_COLUMN = "CUSTOMER_FIRSTNAME_DESCRIPTION";
+
+    /**
+     * Get the value of customerFirstnameDescription. <br />
+     * {VARCHAR(40)}
+     * 
+     * @return The value of customerFirstnameDescription. (Nullable)
+     */
+    public String getCustomerFirstnameDescription() {
+        return _customerFirstnameDescription;
+    }
+
+    /**
+     * Set the value of customerFirstnameDescription. <br />
+     * {VARCHAR(40)}
+     * 
+     * @param customerFirstnameDescription The value of customerFirstnameDescription. (Nullable)
+     */
+    public void setCustomerFirstnameDescription(String customerFirstnameDescription) {
+        _modifiedProperties.addPropertyName("customerFirstnameDescription");
+        this._customerFirstnameDescription = customerFirstnameDescription;
+    }
+
+    /** Column Annotation for S2Dao. VARCHAR(40) */
+    public static final String customerLastnameDescription_COLUMN = "CUSTOMER_LASTNAME_DESCRIPTION";
+
+    /**
+     * Get the value of customerLastnameDescription. <br />
+     * {VARCHAR(40)}
+     * 
+     * @return The value of customerLastnameDescription. (Nullable)
+     */
+    public String getCustomerLastnameDescription() {
+        return _customerLastnameDescription;
+    }
+
+    /**
+     * Set the value of customerLastnameDescription. <br />
+     * {VARCHAR(40)}
+     * 
+     * @param customerLastnameDescription The value of customerLastnameDescription. (Nullable)
+     */
+    public void setCustomerLastnameDescription(String customerLastnameDescription) {
+        _modifiedProperties.addPropertyName("customerLastnameDescription");
+        this._customerLastnameDescription = customerLastnameDescription;
+    }
+
     /** Column Annotation for S2Dao. DATE : NotNull */
     public static final String customerDayOfBirth_COLUMN = "CUSTOMER_DAY_OF_BIRTH";
 
@@ -773,12 +839,12 @@
         this._deliveryDepartment = deliveryDepartment;
     }
 
-    /** Column Annotation for S2Dao. VARCHAR(32) : NotNull */
+    /** Column Annotation for S2Dao. VARCHAR(40) : NotNull */
     public static final String deliveryFirstname_COLUMN = "DELIVERY_FIRSTNAME";
 
     /**
      * Get the value of deliveryFirstname. <br />
-     * {VARCHAR(32) : NotNull}
+     * {VARCHAR(40) : NotNull}
      * 
      * @return The value of deliveryFirstname. (Nullable)
      */
@@ -788,7 +854,7 @@
 
     /**
      * Set the value of deliveryFirstname. <br />
-     * {VARCHAR(32) : NotNull}
+     * {VARCHAR(40) : NotNull}
      * 
      * @param deliveryFirstname The value of deliveryFirstname. (Nullable)
      */
@@ -797,12 +863,12 @@
         this._deliveryFirstname = deliveryFirstname;
     }
 
-    /** Column Annotation for S2Dao. VARCHAR(32) : NotNull */
+    /** Column Annotation for S2Dao. VARCHAR(40) : NotNull */
     public static final String deliveryLastname_COLUMN = "DELIVERY_LASTNAME";
 
     /**
      * Get the value of deliveryLastname. <br />
-     * {VARCHAR(32) : NotNull}
+     * {VARCHAR(40) : NotNull}
      * 
      * @return The value of deliveryLastname. (Nullable)
      */
@@ -812,7 +878,7 @@
 
     /**
      * Set the value of deliveryLastname. <br />
-     * {VARCHAR(32) : NotNull}
+     * {VARCHAR(40) : NotNull}
      * 
      * @param deliveryLastname The value of deliveryLastname. (Nullable)
      */
@@ -821,6 +887,54 @@
         this._deliveryLastname = deliveryLastname;
     }
 
+    /** Column Annotation for S2Dao. VARCHAR(40) */
+    public static final String deliveryFirstnameDescription_COLUMN = "DELIVERY_FIRSTNAME_DESCRIPTION";
+
+    /**
+     * Get the value of deliveryFirstnameDescription. <br />
+     * {VARCHAR(40)}
+     * 
+     * @return The value of deliveryFirstnameDescription. (Nullable)
+     */
+    public String getDeliveryFirstnameDescription() {
+        return _deliveryFirstnameDescription;
+    }
+
+    /**
+     * Set the value of deliveryFirstnameDescription. <br />
+     * {VARCHAR(40)}
+     * 
+     * @param deliveryFirstnameDescription The value of deliveryFirstnameDescription. (Nullable)
+     */
+    public void setDeliveryFirstnameDescription(String deliveryFirstnameDescription) {
+        _modifiedProperties.addPropertyName("deliveryFirstnameDescription");
+        this._deliveryFirstnameDescription = deliveryFirstnameDescription;
+    }
+
+    /** Column Annotation for S2Dao. VARCHAR(40) */
+    public static final String deliveryLastDescription_COLUMN = "DELIVERY_LAST_DESCRIPTION";
+
+    /**
+     * Get the value of deliveryLastDescription. <br />
+     * {VARCHAR(40)}
+     * 
+     * @return The value of deliveryLastDescription. (Nullable)
+     */
+    public String getDeliveryLastDescription() {
+        return _deliveryLastDescription;
+    }
+
+    /**
+     * Set the value of deliveryLastDescription. <br />
+     * {VARCHAR(40)}
+     * 
+     * @param deliveryLastDescription The value of deliveryLastDescription. (Nullable)
+     */
+    public void setDeliveryLastDescription(String deliveryLastDescription) {
+        _modifiedProperties.addPropertyName("deliveryLastDescription");
+        this._deliveryLastDescription = deliveryLastDescription;
+    }
+
     /** Column Annotation for S2Dao. VARCHAR(255) : NotNull */
     public static final String deliveryStreetAddress_COLUMN = "DELIVERY_STREET_ADDRESS";
 
@@ -1061,12 +1175,12 @@
         this._billingDepartment = billingDepartment;
     }
 
-    /** Column Annotation for S2Dao. VARCHAR(32) : NotNull */
+    /** Column Annotation for S2Dao. VARCHAR(40) : NotNull */
     public static final String billingFirstname_COLUMN = "BILLING_FIRSTNAME";
 
     /**
      * Get the value of billingFirstname. <br />
-     * {VARCHAR(32) : NotNull}
+     * {VARCHAR(40) : NotNull}
      * 
      * @return The value of billingFirstname. (Nullable)
      */
@@ -1076,7 +1190,7 @@
 
     /**
      * Set the value of billingFirstname. <br />
-     * {VARCHAR(32) : NotNull}
+     * {VARCHAR(40) : NotNull}
      * 
      * @param billingFirstname The value of billingFirstname. (Nullable)
      */
@@ -1085,12 +1199,12 @@
         this._billingFirstname = billingFirstname;
     }
 
-    /** Column Annotation for S2Dao. VARCHAR(32) : NotNull */
+    /** Column Annotation for S2Dao. VARCHAR(40) : NotNull */
     public static final String billingLastname_COLUMN = "BILLING_LASTNAME";
 
     /**
      * Get the value of billingLastname. <br />
-     * {VARCHAR(32) : NotNull}
+     * {VARCHAR(40) : NotNull}
      * 
      * @return The value of billingLastname. (Nullable)
      */
@@ -1100,7 +1214,7 @@
 
     /**
      * Set the value of billingLastname. <br />
-     * {VARCHAR(32) : NotNull}
+     * {VARCHAR(40) : NotNull}
      * 
      * @param billingLastname The value of billingLastname. (Nullable)
      */
@@ -1109,6 +1223,54 @@
         this._billingLastname = billingLastname;
     }
 
+    /** Column Annotation for S2Dao. VARCHAR(40) */
+    public static final String billingFirstnameDescription_COLUMN = "BILLING_FIRSTNAME_DESCRIPTION";
+
+    /**
+     * Get the value of billingFirstnameDescription. <br />
+     * {VARCHAR(40)}
+     * 
+     * @return The value of billingFirstnameDescription. (Nullable)
+     */
+    public String getBillingFirstnameDescription() {
+        return _billingFirstnameDescription;
+    }
+
+    /**
+     * Set the value of billingFirstnameDescription. <br />
+     * {VARCHAR(40)}
+     * 
+     * @param billingFirstnameDescription The value of billingFirstnameDescription. (Nullable)
+     */
+    public void setBillingFirstnameDescription(String billingFirstnameDescription) {
+        _modifiedProperties.addPropertyName("billingFirstnameDescription");
+        this._billingFirstnameDescription = billingFirstnameDescription;
+    }
+
+    /** Column Annotation for S2Dao. VARCHAR(40) */
+    public static final String billingLastnameDescription_COLUMN = "BILLING_LASTNAME_DESCRIPTION";
+
+    /**
+     * Get the value of billingLastnameDescription. <br />
+     * {VARCHAR(40)}
+     * 
+     * @return The value of billingLastnameDescription. (Nullable)
+     */
+    public String getBillingLastnameDescription() {
+        return _billingLastnameDescription;
+    }
+
+    /**
+     * Set the value of billingLastnameDescription. <br />
+     * {VARCHAR(40)}
+     * 
+     * @param billingLastnameDescription The value of billingLastnameDescription. (Nullable)
+     */
+    public void setBillingLastnameDescription(String billingLastnameDescription) {
+        _modifiedProperties.addPropertyName("billingLastnameDescription");
+        this._billingLastnameDescription = billingLastnameDescription;
+    }
+
     /** Column Annotation for S2Dao. VARCHAR(255) : NotNull */
     public static final String billingStreetAddress_COLUMN = "BILLING_STREET_ADDRESS";
 
@@ -1665,16 +1827,16 @@
     // ===================================================================================
     //                                                                     Classify Method
     //                                                                     ===============
-                                                                                                                  
+                                                                                                                              
     // ===================================================================================
     //                                                        Classification Determination
     //                                                        ============================
-                                                                                                                  
+                                                                                                                              
 
     // ===================================================================================
     //                                                               Classification Getter
     //                                                               =====================
-                                                                                                                  
+                                                                                                                              
 
     // ===================================================================================
     //                                                                       Foreign Table
@@ -2240,6 +2402,8 @@
         sb.append(delimiter).append(getCustomerGender());
         sb.append(delimiter).append(getCustomerFirstname());
         sb.append(delimiter).append(getCustomerLastname());
+        sb.append(delimiter).append(getCustomerFirstnameDescription());
+        sb.append(delimiter).append(getCustomerLastnameDescription());
         sb.append(delimiter).append(getCustomerDayOfBirth());
         sb.append(delimiter).append(getCustomerEmailAddress());
         sb.append(delimiter).append(getCustomerCompany());
@@ -2256,6 +2420,8 @@
         sb.append(delimiter).append(getDeliveryDepartment());
         sb.append(delimiter).append(getDeliveryFirstname());
         sb.append(delimiter).append(getDeliveryLastname());
+        sb.append(delimiter).append(getDeliveryFirstnameDescription());
+        sb.append(delimiter).append(getDeliveryLastDescription());
         sb.append(delimiter).append(getDeliveryStreetAddress());
         sb.append(delimiter).append(getDeliverySuburb());
         sb.append(delimiter).append(getDeliveryCity());
@@ -2268,6 +2434,8 @@
         sb.append(delimiter).append(getBillingDepartment());
         sb.append(delimiter).append(getBillingFirstname());
         sb.append(delimiter).append(getBillingLastname());
+        sb.append(delimiter).append(getBillingFirstnameDescription());
+        sb.append(delimiter).append(getBillingLastnameDescription());
         sb.append(delimiter).append(getBillingStreetAddress());
         sb.append(delimiter).append(getBillingSuburb());
         sb.append(delimiter).append(getBillingCity());

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-30 13:20:43 UTC (rev 598)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderProduct.java	2007-10-01 13:00:14 UTC (rev 599)
@@ -14,7 +14,7 @@
  *     ORDER_PRODUCT_ID
  * 
  * [column-property]
- *     ORDER_PRODUCT_ID, ORDER_FORM_ID, PRODUCT_ID, MODEL, PRICE, FINAL_PRICE, TAX, QUANTITY
+ *     ORDER_PRODUCT_ID, ORDER_FORM_ID, PRODUCT_ID, CODE, MODEL, PRICE, FINAL_PRICE, TAX, QUANTITY
  * 
  * [foreign-property]
  *     orderForm, product
@@ -66,6 +66,9 @@
     /** The value of productId. BIGINT : NotNull : FK to PRODUCT */
     protected java.math.BigDecimal _productId;
 
+    /** The value of code. VARCHAR(64) */
+    protected String _code;
+
     /** The value of model. VARCHAR(64) */
     protected String _model;
 
@@ -219,6 +222,30 @@
     }
 
     /** Column Annotation for S2Dao. VARCHAR(64) */
+    public static final String code_COLUMN = "CODE";
+
+    /**
+     * Get the value of code. <br />
+     * {VARCHAR(64)}
+     * 
+     * @return The value of code. (Nullable)
+     */
+    public String getCode() {
+        return _code;
+    }
+
+    /**
+     * Set the value of code. <br />
+     * {VARCHAR(64)}
+     * 
+     * @param code The value of code. (Nullable)
+     */
+    public void setCode(String code) {
+        _modifiedProperties.addPropertyName("code");
+        this._code = code;
+    }
+
+    /** Column Annotation for S2Dao. VARCHAR(64) */
     public static final String model_COLUMN = "MODEL";
 
     /**
@@ -342,16 +369,16 @@
     // ===================================================================================
     //                                                                     Classify Method
     //                                                                     ===============
-                
+                  
     // ===================================================================================
     //                                                        Classification Determination
     //                                                        ============================
-                
+                  
 
     // ===================================================================================
     //                                                               Classification Getter
     //                                                               =====================
-                
+                  
 
     // ===================================================================================
     //                                                                       Foreign Table
@@ -561,6 +588,7 @@
         sb.append(delimiter).append(getOrderProductId());
         sb.append(delimiter).append(getOrderFormId());
         sb.append(delimiter).append(getProductId());
+        sb.append(delimiter).append(getCode());
         sb.append(delimiter).append(getModel());
         sb.append(delimiter).append(getPrice());
         sb.append(delimiter).append(getFinalPrice());

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/AddressBookDbm.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/AddressBookDbm.java	2007-09-30 13:20:43 UTC (rev 598)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/AddressBookDbm.java	2007-10-01 13:00:14 UTC (rev 599)
@@ -16,7 +16,7 @@
  *     ADDRESS_BOOK_ID
  * 
  * [column-property]
- *     ADDRESS_BOOK_ID, CUSTOMER_ID, COMPANY, DEPARTMENT, FIRSTNAME, LASTNAME, STREET_ADDRESS, SUBURB, CITY, STATE, POSTCODE, TELEPHONE, FAX, CELLPHONE, DEFAULT_ADDRESS, LANGUAGE_ID, COUNTRY_ID, ZONE_ID
+ *     ADDRESS_BOOK_ID, CUSTOMER_ID, COMPANY, DEPARTMENT, FIRSTNAME, LASTNAME, FIRSTNAME_DESCRIPTION, LASTNAME_DESCRIPTION, STREET_ADDRESS, SUBURB, CITY, STATE, POSTCODE, TELEPHONE, FAX, CELLPHONE, DEFAULT_ADDRESS, LANGUAGE_ID, COUNTRY_ID, ZONE_ID
  * 
  * [foreign-property]
  *     country, customer, language, zone
@@ -101,10 +101,14 @@
     public static final String DB_NAME_COMPANY = "COMPANY";
     /** Db-name of DEPARTMENT. VARCHAR(64) */
     public static final String DB_NAME_DEPARTMENT = "DEPARTMENT";
-    /** Db-name of FIRSTNAME. VARCHAR(32) : NotNull */
+    /** Db-name of FIRSTNAME. VARCHAR(40) : NotNull */
     public static final String DB_NAME_FIRSTNAME = "FIRSTNAME";
-    /** Db-name of LASTNAME. VARCHAR(32) : NotNull */
+    /** Db-name of LASTNAME. VARCHAR(40) : NotNull */
     public static final String DB_NAME_LASTNAME = "LASTNAME";
+    /** Db-name of FIRSTNAME_DESCRIPTION. VARCHAR(40) */
+    public static final String DB_NAME_FIRSTNAME_DESCRIPTION = "FIRSTNAME_DESCRIPTION";
+    /** Db-name of LASTNAME_DESCRIPTION. VARCHAR(40) */
+    public static final String DB_NAME_LASTNAME_DESCRIPTION = "LASTNAME_DESCRIPTION";
     /** Db-name of STREET_ADDRESS. VARCHAR(255) : NotNull */
     public static final String DB_NAME_STREET_ADDRESS = "STREET_ADDRESS";
     /** Db-name of SUBURB. VARCHAR(32) */
@@ -142,6 +146,10 @@
     public static final String COLUMN_DB_NAME_OF_Firstname = "FIRSTNAME";
     /** @deprecated Deprecated! So use DB_NAME_Lastname. */
     public static final String COLUMN_DB_NAME_OF_Lastname = "LASTNAME";
+    /** @deprecated Deprecated! So use DB_NAME_FirstnameDescription. */
+    public static final String COLUMN_DB_NAME_OF_FirstnameDescription = "FIRSTNAME_DESCRIPTION";
+    /** @deprecated Deprecated! So use DB_NAME_LastnameDescription. */
+    public static final String COLUMN_DB_NAME_OF_LastnameDescription = "LASTNAME_DESCRIPTION";
     /** @deprecated Deprecated! So use DB_NAME_StreetAddress. */
     public static final String COLUMN_DB_NAME_OF_StreetAddress = "STREET_ADDRESS";
     /** @deprecated Deprecated! So use DB_NAME_Suburb. */
@@ -178,10 +186,14 @@
     public static final String PROPERTY_NAME_company = "company";
     /** Prop-name(JavaBeansRule) of department. VARCHAR(64) */
     public static final String PROPERTY_NAME_department = "department";
-    /** Prop-name(JavaBeansRule) of firstname. VARCHAR(32) : NotNull */
+    /** Prop-name(JavaBeansRule) of firstname. VARCHAR(40) : NotNull */
     public static final String PROPERTY_NAME_firstname = "firstname";
-    /** Prop-name(JavaBeansRule) of lastname. VARCHAR(32) : NotNull */
+    /** Prop-name(JavaBeansRule) of lastname. VARCHAR(40) : NotNull */
     public static final String PROPERTY_NAME_lastname = "lastname";
+    /** Prop-name(JavaBeansRule) of firstnameDescription. VARCHAR(40) */
+    public static final String PROPERTY_NAME_firstnameDescription = "firstnameDescription";
+    /** Prop-name(JavaBeansRule) of lastnameDescription. VARCHAR(40) */
+    public static final String PROPERTY_NAME_lastnameDescription = "lastnameDescription";
     /** Prop-name(JavaBeansRule) of streetAddress. VARCHAR(255) : NotNull */
     public static final String PROPERTY_NAME_streetAddress = "streetAddress";
     /** Prop-name(JavaBeansRule) of suburb. VARCHAR(32) */
@@ -218,10 +230,14 @@
     public static final String CAP_PROP_NAME_Company = "Company";
     /** Cap-prop-name of department. VARCHAR(64) */
     public static final String CAP_PROP_NAME_Department = "Department";
-    /** Cap-prop-name of firstname. VARCHAR(32) : NotNull */
+    /** Cap-prop-name of firstname. VARCHAR(40) : NotNull */
     public static final String CAP_PROP_NAME_Firstname = "Firstname";
-    /** Cap-prop-name of lastname. VARCHAR(32) : NotNull */
+    /** Cap-prop-name of lastname. VARCHAR(40) : NotNull */
     public static final String CAP_PROP_NAME_Lastname = "Lastname";
+    /** Cap-prop-name of firstnameDescription. VARCHAR(40) */
+    public static final String CAP_PROP_NAME_FirstnameDescription = "FirstnameDescription";
+    /** Cap-prop-name of lastnameDescription. VARCHAR(40) */
+    public static final String CAP_PROP_NAME_LastnameDescription = "LastnameDescription";
     /** Cap-prop-name of streetAddress. VARCHAR(255) : NotNull */
     public static final String CAP_PROP_NAME_StreetAddress = "StreetAddress";
     /** Cap-prop-name of suburb. VARCHAR(32) */
@@ -259,6 +275,10 @@
     public static final String COLUMN_CAP_PROP_NAME_OF_Firstname = "Firstname";
     /** @deprecated Deprecated! So use CAP_PROP_NAME_Lastname. */
     public static final String COLUMN_CAP_PROP_NAME_OF_Lastname = "Lastname";
+    /** @deprecated Deprecated! So use CAP_PROP_NAME_FirstnameDescription. */
+    public static final String COLUMN_CAP_PROP_NAME_OF_FirstnameDescription = "FirstnameDescription";
+    /** @deprecated Deprecated! So use CAP_PROP_NAME_LastnameDescription. */
+    public static final String COLUMN_CAP_PROP_NAME_OF_LastnameDescription = "LastnameDescription";
     /** @deprecated Deprecated! So use CAP_PROP_NAME_StreetAddress. */
     public static final String COLUMN_CAP_PROP_NAME_OF_StreetAddress = "StreetAddress";
     /** @deprecated Deprecated! So use CAP_PROP_NAME_Suburb. */
@@ -295,10 +315,14 @@
     public static final String UNCAP_PROP_NAME_company = "company";
     /** Uncap-prop-name of department. VARCHAR(64) */
     public static final String UNCAP_PROP_NAME_department = "department";
-    /** Uncap-prop-name of firstname. VARCHAR(32) : NotNull */
+    /** Uncap-prop-name of firstname. VARCHAR(40) : NotNull */
     public static final String UNCAP_PROP_NAME_firstname = "firstname";
-    /** Uncap-prop-name of lastname. VARCHAR(32) : NotNull */
+    /** Uncap-prop-name of lastname. VARCHAR(40) : NotNull */
     public static final String UNCAP_PROP_NAME_lastname = "lastname";
+    /** Uncap-prop-name of firstnameDescription. VARCHAR(40) */
+    public static final String UNCAP_PROP_NAME_firstnameDescription = "firstnameDescription";
+    /** Uncap-prop-name of lastnameDescription. VARCHAR(40) */
+    public static final String UNCAP_PROP_NAME_lastnameDescription = "lastnameDescription";
     /** Uncap-prop-name of streetAddress. VARCHAR(255) : NotNull */
     public static final String UNCAP_PROP_NAME_streetAddress = "streetAddress";
     /** Uncap-prop-name of suburb. VARCHAR(32) */
@@ -336,6 +360,10 @@
     public static final String COLUMN_UNCAP_PROP_NAME_OF_Firstname = "firstname";
     /** @deprecated Deprecated! So use UNCAP_PROP_NAME_Lastname. */
     public static final String COLUMN_UNCAP_PROP_NAME_OF_Lastname = "lastname";
+    /** @deprecated Deprecated! So use UNCAP_PROP_NAME_FirstnameDescription. */
+    public static final String COLUMN_UNCAP_PROP_NAME_OF_FirstnameDescription = "firstnameDescription";
+    /** @deprecated Deprecated! So use UNCAP_PROP_NAME_LastnameDescription. */
+    public static final String COLUMN_UNCAP_PROP_NAME_OF_LastnameDescription = "lastnameDescription";
     /** @deprecated Deprecated! So use UNCAP_PROP_NAME_StreetAddress. */
     public static final String COLUMN_UNCAP_PROP_NAME_OF_StreetAddress = "streetAddress";
     /** @deprecated Deprecated! So use UNCAP_PROP_NAME_Suburb. */
@@ -410,6 +438,8 @@
         map.put(DB_NAME_DEPARTMENT.toLowerCase(), PROPERTY_NAME_department);
         map.put(DB_NAME_FIRSTNAME.toLowerCase(), PROPERTY_NAME_firstname);
         map.put(DB_NAME_LASTNAME.toLowerCase(), PROPERTY_NAME_lastname);
+        map.put(DB_NAME_FIRSTNAME_DESCRIPTION.toLowerCase(), PROPERTY_NAME_firstnameDescription);
+        map.put(DB_NAME_LASTNAME_DESCRIPTION.toLowerCase(), PROPERTY_NAME_lastnameDescription);
         map.put(DB_NAME_STREET_ADDRESS.toLowerCase(), PROPERTY_NAME_streetAddress);
         map.put(DB_NAME_SUBURB.toLowerCase(), PROPERTY_NAME_suburb);
         map.put(DB_NAME_CITY.toLowerCase(), PROPERTY_NAME_city);
@@ -442,6 +472,8 @@
         map.put(PROPERTY_NAME_department.toLowerCase(), DB_NAME_DEPARTMENT);
         map.put(PROPERTY_NAME_firstname.toLowerCase(), DB_NAME_FIRSTNAME);
         map.put(PROPERTY_NAME_lastname.toLowerCase(), DB_NAME_LASTNAME);
+        map.put(PROPERTY_NAME_firstnameDescription.toLowerCase(), DB_NAME_FIRSTNAME_DESCRIPTION);
+        map.put(PROPERTY_NAME_lastnameDescription.toLowerCase(), DB_NAME_LASTNAME_DESCRIPTION);
         map.put(PROPERTY_NAME_streetAddress.toLowerCase(), DB_NAME_STREET_ADDRESS);
         map.put(PROPERTY_NAME_suburb.toLowerCase(), DB_NAME_SUBURB);
         map.put(PROPERTY_NAME_city.toLowerCase(), DB_NAME_CITY);
@@ -476,6 +508,8 @@
         map.put(DB_NAME_DEPARTMENT, CAP_PROP_NAME_Department);
         map.put(DB_NAME_FIRSTNAME, CAP_PROP_NAME_Firstname);
         map.put(DB_NAME_LASTNAME, CAP_PROP_NAME_Lastname);
+        map.put(DB_NAME_FIRSTNAME_DESCRIPTION, CAP_PROP_NAME_FirstnameDescription);
+        map.put(DB_NAME_LASTNAME_DESCRIPTION, CAP_PROP_NAME_LastnameDescription);
         map.put(DB_NAME_STREET_ADDRESS, CAP_PROP_NAME_StreetAddress);
         map.put(DB_NAME_SUBURB, CAP_PROP_NAME_Suburb);
         map.put(DB_NAME_CITY, CAP_PROP_NAME_City);
@@ -510,6 +544,8 @@
         map.put(DB_NAME_DEPARTMENT, UNCAP_PROP_NAME_department);
         map.put(DB_NAME_FIRSTNAME, UNCAP_PROP_NAME_firstname);
         map.put(DB_NAME_LASTNAME, UNCAP_PROP_NAME_lastname);
+        map.put(DB_NAME_FIRSTNAME_DESCRIPTION, UNCAP_PROP_NAME_firstnameDescription);
+        map.put(DB_NAME_LASTNAME_DESCRIPTION, UNCAP_PROP_NAME_lastnameDescription);
         map.put(DB_NAME_STREET_ADDRESS, UNCAP_PROP_NAME_streetAddress);
         map.put(DB_NAME_SUBURB, UNCAP_PROP_NAME_suburb);
         map.put(DB_NAME_CITY, UNCAP_PROP_NAME_city);
@@ -544,6 +580,8 @@
         map.put(CAP_PROP_NAME_Department, DB_NAME_DEPARTMENT);
         map.put(CAP_PROP_NAME_Firstname, DB_NAME_FIRSTNAME);
         map.put(CAP_PROP_NAME_Lastname, DB_NAME_LASTNAME);
+        map.put(CAP_PROP_NAME_FirstnameDescription, DB_NAME_FIRSTNAME_DESCRIPTION);
+        map.put(CAP_PROP_NAME_LastnameDescription, DB_NAME_LASTNAME_DESCRIPTION);
         map.put(CAP_PROP_NAME_StreetAddress, DB_NAME_STREET_ADDRESS);
         map.put(CAP_PROP_NAME_Suburb, DB_NAME_SUBURB);
         map.put(CAP_PROP_NAME_City, DB_NAME_CITY);
@@ -578,6 +616,8 @@
         map.put(CAP_PROP_NAME_Department, UNCAP_PROP_NAME_department);
         map.put(CAP_PROP_NAME_Firstname, UNCAP_PROP_NAME_firstname);
         map.put(CAP_PROP_NAME_Lastname, UNCAP_PROP_NAME_lastname);
+        map.put(CAP_PROP_NAME_FirstnameDescription, UNCAP_PROP_NAME_firstnameDescription);
+        map.put(CAP_PROP_NAME_LastnameDescription, UNCAP_PROP_NAME_lastnameDescription);
         map.put(CAP_PROP_NAME_StreetAddress, UNCAP_PROP_NAME_streetAddress);
         map.put(CAP_PROP_NAME_Suburb, UNCAP_PROP_NAME_suburb);
         map.put(CAP_PROP_NAME_City, UNCAP_PROP_NAME_city);
@@ -612,6 +652,8 @@
         map.put(UNCAP_PROP_NAME_department, DB_NAME_DEPARTMENT);
         map.put(UNCAP_PROP_NAME_firstname, DB_NAME_FIRSTNAME);
         map.put(UNCAP_PROP_NAME_lastname, DB_NAME_LASTNAME);
+        map.put(UNCAP_PROP_NAME_firstnameDescription, DB_NAME_FIRSTNAME_DESCRIPTION);
+        map.put(UNCAP_PROP_NAME_lastnameDescription, DB_NAME_LASTNAME_DESCRIPTION);
         map.put(UNCAP_PROP_NAME_streetAddress, DB_NAME_STREET_ADDRESS);
         map.put(UNCAP_PROP_NAME_suburb, DB_NAME_SUBURB);
         map.put(UNCAP_PROP_NAME_city, DB_NAME_CITY);
@@ -646,6 +688,8 @@
         map.put(UNCAP_PROP_NAME_department, CAP_PROP_NAME_Department);
         map.put(UNCAP_PROP_NAME_firstname, CAP_PROP_NAME_Firstname);
         map.put(UNCAP_PROP_NAME_lastname, CAP_PROP_NAME_Lastname);
+        map.put(UNCAP_PROP_NAME_firstnameDescription, CAP_PROP_NAME_FirstnameDescription);
+        map.put(UNCAP_PROP_NAME_lastnameDescription, CAP_PROP_NAME_LastnameDescription);
         map.put(UNCAP_PROP_NAME_streetAddress, CAP_PROP_NAME_StreetAddress);
         map.put(UNCAP_PROP_NAME_suburb, CAP_PROP_NAME_Suburb);
         map.put(UNCAP_PROP_NAME_city, CAP_PROP_NAME_City);
@@ -872,6 +916,8 @@
         columnInfoList.add(columnDepartment());
         columnInfoList.add(columnFirstname());
         columnInfoList.add(columnLastname());
+        columnInfoList.add(columnFirstnameDescription());
+        columnInfoList.add(columnLastnameDescription());
         columnInfoList.add(columnStreetAddress());
         columnInfoList.add(columnSuburb());
         columnInfoList.add(columnCity());
@@ -939,7 +985,7 @@
      * @deprecated Please use getColumnInfoList()
      */
     public String getColumnDbNameCommaString() {
-        return "ADDRESS_BOOK_ID, CUSTOMER_ID, COMPANY, DEPARTMENT, FIRSTNAME, LASTNAME, STREET_ADDRESS, SUBURB, CITY, STATE, POSTCODE, TELEPHONE, FAX, CELLPHONE, DEFAULT_ADDRESS, LANGUAGE_ID, COUNTRY_ID, ZONE_ID";
+        return "ADDRESS_BOOK_ID, CUSTOMER_ID, COMPANY, DEPARTMENT, FIRSTNAME, LASTNAME, FIRSTNAME_DESCRIPTION, LASTNAME_DESCRIPTION, STREET_ADDRESS, SUBURB, CITY, STATE, POSTCODE, TELEPHONE, FAX, CELLPHONE, DEFAULT_ADDRESS, LANGUAGE_ID, COUNTRY_ID, ZONE_ID";
     }
 
     /**
@@ -979,6 +1025,18 @@
         return new ColumnInfo(this, "LASTNAME", "lastname", String.class, false);
     }
     /**
+     * @return Column information of firstnameDescription. (NotNull)
+     */
+    public ColumnInfo columnFirstnameDescription() {
+        return new ColumnInfo(this, "FIRSTNAME_DESCRIPTION", "firstnameDescription", String.class, false);
+    }
+    /**
+     * @return Column information of lastnameDescription. (NotNull)
+     */
+    public ColumnInfo columnLastnameDescription() {
+        return new ColumnInfo(this, "LASTNAME_DESCRIPTION", "lastnameDescription", String.class, false);
+    }
+    /**
      * @return Column information of streetAddress. (NotNull)
      */
     public ColumnInfo columnStreetAddress() {
@@ -1238,6 +1296,8 @@
         public RelationTrace columnDepartment() { return fixTrace(_relationList, AddressBookDbm.getInstance().columnDepartment()); }
         public RelationTrace columnFirstname() { return fixTrace(_relationList, AddressBookDbm.getInstance().columnFirstname()); }
         public RelationTrace columnLastname() { return fixTrace(_relationList, AddressBookDbm.getInstance().columnLastname()); }
+        public RelationTrace columnFirstnameDescription() { return fixTrace(_relationList, AddressBookDbm.getInstance().columnFirstnameDescription()); }
+        public RelationTrace columnLastnameDescription() { return fixTrace(_relationList, AddressBookDbm.getInstance().columnLastnameDescription()); }
         public RelationTrace columnStreetAddress() { return fixTrace(_relationList, AddressBookDbm.getInstance().columnStreetAddress()); }
         public RelationTrace columnSuburb() { return fixTrace(_relationList, AddressBookDbm.getInstance().columnSuburb()); }
         public RelationTrace columnCity() { return fixTrace(_relationList, AddressBookDbm.getInstance().columnCity()); }
@@ -1326,6 +1386,8 @@
         if (analyzer.init("DEPARTMENT", "department", "department")) { myEntity.setDepartment(analyzer.analyzeString(String.class)); };
         if (analyzer.init("FIRSTNAME", "firstname", "firstname")) { myEntity.setFirstname(analyzer.analyzeString(String.class)); };
         if (analyzer.init("LASTNAME", "lastname", "lastname")) { myEntity.setLastname(analyzer.analyzeString(String.class)); };
+        if (analyzer.init("FIRSTNAME_DESCRIPTION", "firstnameDescription", "firstnameDescription")) { myEntity.setFirstnameDescription(analyzer.analyzeString(String.class)); };
+        if (analyzer.init("LASTNAME_DESCRIPTION", "lastnameDescription", "lastnameDescription")) { myEntity.setLastnameDescription(analyzer.analyzeString(String.class)); };
         if (analyzer.init("STREET_ADDRESS", "streetAddress", "streetAddress")) { myEntity.setStreetAddress(analyzer.analyzeString(String.class)); };
         if (analyzer.init("SUBURB", "suburb", "suburb")) { myEntity.setSuburb(analyzer.analyzeString(String.class)); };
         if (analyzer.init("CITY", "city", "city")) { myEntity.setCity(analyzer.analyzeString(String.class)); };
@@ -1416,6 +1478,8 @@
         helpAppendingColumnValueString(sb, delimiter, equal, "DEPARTMENT", myEntity.getDepartment());
         helpAppendingColumnValueString(sb, delimiter, equal, "FIRSTNAME", myEntity.getFirstname());
         helpAppendingColumnValueString(sb, delimiter, equal, "LASTNAME", myEntity.getLastname());
+        helpAppendingColumnValueString(sb, delimiter, equal, "FIRSTNAME_DESCRIPTION", myEntity.getFirstnameDescription());
+        helpAppendingColumnValueString(sb, delimiter, equal, "LASTNAME_DESCRIPTION", myEntity.getLastnameDescription());
         helpAppendingColumnValueString(sb, delimiter, equal, "STREET_ADDRESS", myEntity.getStreetAddress());
         helpAppendingColumnValueString(sb, delimiter, equal, "SUBURB", myEntity.getSuburb());
         helpAppendingColumnValueString(sb, delimiter, equal, "CITY", myEntity.getCity());
@@ -1488,6 +1552,8 @@
         valueMap.put("DEPARTMENT", myEntity.getDepartment());
         valueMap.put("FIRSTNAME", myEntity.getFirstname());
         valueMap.put("LASTNAME", myEntity.getLastname());
+        valueMap.put("FIRSTNAME_DESCRIPTION", myEntity.getFirstnameDescription());
+        valueMap.put("LASTNAME_DESCRIPTION", myEntity.getLastnameDescription());
         valueMap.put("STREET_ADDRESS", myEntity.getStreetAddress());
         valueMap.put("SUBURB", myEntity.getSuburb());
         valueMap.put("CITY", myEntity.getCity());
@@ -1528,6 +1594,8 @@
         valueMap.put("DEPARTMENT", helpGettingColumnStringValue(myEntity.getDepartment()));
         valueMap.put("FIRSTNAME", helpGettingColumnStringValue(myEntity.getFirstname()));
         valueMap.put("LASTNAME", helpGettingColumnStringValue(myEntity.getLastname()));
+        valueMap.put("FIRSTNAME_DESCRIPTION", helpGettingColumnStringValue(myEntity.getFirstnameDescription()));
+        valueMap.put("LASTNAME_DESCRIPTION", helpGettingColumnStringValue(myEntity.getLastnameDescription()));
         valueMap.put("STREET_ADDRESS", helpGettingColumnStringValue(myEntity.getStreetAddress()));
         valueMap.put("SUBURB", helpGettingColumnStringValue(myEntity.getSuburb()));
         valueMap.put("CITY", helpGettingColumnStringValue(myEntity.getCity()));
@@ -1564,9 +1632,9 @@
     public String getPreparedInsertClause(PreparedInsertClauseOption preparedInsertClauseOption) {
         if (preparedInsertClauseOption.getTablePrefix() != null) {
             final String tablePrefix = preparedInsertClauseOption.getTablePrefix();
-            return "insert into " + tablePrefix + "ADDRESS_BOOK(ADDRESS_BOOK_ID, CUSTOMER_ID, COMPANY, DEPARTMENT, FIRSTNAME, LASTNAME, STREET_ADDRESS, SUBURB, CITY, STATE, POSTCODE, TELEPHONE, FAX, CELLPHONE, DEFAULT_ADDRESS, LANGUAGE_ID, COUNTRY_ID, ZONE_ID) values(? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? )";
+            return "insert into " + tablePrefix + "ADDRESS_BOOK(ADDRESS_BOOK_ID, CUSTOMER_ID, COMPANY, DEPARTMENT, FIRSTNAME, LASTNAME, FIRSTNAME_DESCRIPTION, LASTNAME_DESCRIPTION, STREET_ADDRESS, SUBURB, CITY, STATE, POSTCODE, TELEPHONE, FAX, CELLPHONE, DEFAULT_ADDRESS, LANGUAGE_ID, COUNTRY_ID, ZONE_ID) values(? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? )";
         }
-        return "insert into ADDRESS_BOOK(ADDRESS_BOOK_ID, CUSTOMER_ID, COMPANY, DEPARTMENT, FIRSTNAME, LASTNAME, STREET_ADDRESS, SUBURB, CITY, STATE, POSTCODE, TELEPHONE, FAX, CELLPHONE, DEFAULT_ADDRESS, LANGUAGE_ID, COUNTRY_ID, ZONE_ID) values(? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? )";
+        return "insert into ADDRESS_BOOK(ADDRESS_BOOK_ID, CUSTOMER_ID, COMPANY, DEPARTMENT, FIRSTNAME, LASTNAME, FIRSTNAME_DESCRIPTION, LASTNAME_DESCRIPTION, STREET_ADDRESS, SUBURB, CITY, STATE, POSTCODE, TELEPHONE, FAX, CELLPHONE, DEFAULT_ADDRESS, LANGUAGE_ID, COUNTRY_ID, ZONE_ID) values(? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? )";
     }
 
     // ===================================================================================

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/CustomerDbm.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/CustomerDbm.java	2007-09-30 13:20:43 UTC (rev 598)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/CustomerDbm.java	2007-10-01 13:00:14 UTC (rev 599)
@@ -16,7 +16,7 @@
  *     CUSTOMER_ID
  * 
  * [column-property]
- *     CUSTOMER_ID, PORTAL_ID, GENDER, FIRSTNAME, LASTNAME, NICKNAME, DAY_OF_BIRTH, EMAIL_ADDRESS, LAST_MODIFIED, DATE_ADDED
+ *     CUSTOMER_ID, PORTAL_ID, GENDER, FIRSTNAME, LASTNAME, FIRSTNAME_DESCRIPTION, LASTNAME_DESCRIPTION, NICKNAME, DAY_OF_BIRTH, EMAIL_ADDRESS, LAST_MODIFIED, DATE_ADDED
  * 
  * [foreign-property]
  *     
@@ -99,10 +99,14 @@
     public static final String DB_NAME_PORTAL_ID = "PORTAL_ID";
     /** Db-name of GENDER. CHAR(1) : NotNull */
     public static final String DB_NAME_GENDER = "GENDER";
-    /** Db-name of FIRSTNAME. VARCHAR(32) : NotNull */
+    /** Db-name of FIRSTNAME. VARCHAR(40) : NotNull */
     public static final String DB_NAME_FIRSTNAME = "FIRSTNAME";
-    /** Db-name of LASTNAME. VARCHAR(32) : NotNull */
+    /** Db-name of LASTNAME. VARCHAR(40) : NotNull */
     public static final String DB_NAME_LASTNAME = "LASTNAME";
+    /** Db-name of FIRSTNAME_DESCRIPTION. VARCHAR(40) */
+    public static final String DB_NAME_FIRSTNAME_DESCRIPTION = "FIRSTNAME_DESCRIPTION";
+    /** Db-name of LASTNAME_DESCRIPTION. VARCHAR(40) */
+    public static final String DB_NAME_LASTNAME_DESCRIPTION = "LASTNAME_DESCRIPTION";
     /** Db-name of NICKNAME. VARCHAR(64) */
     public static final String DB_NAME_NICKNAME = "NICKNAME";
     /** Db-name of DAY_OF_BIRTH. DATE : NotNull : Default=[0000-00-00 00:00:00] */
@@ -124,6 +128,10 @@
     public static final String COLUMN_DB_NAME_OF_Firstname = "FIRSTNAME";
     /** @deprecated Deprecated! So use DB_NAME_Lastname. */
     public static final String COLUMN_DB_NAME_OF_Lastname = "LASTNAME";
+    /** @deprecated Deprecated! So use DB_NAME_FirstnameDescription. */
+    public static final String COLUMN_DB_NAME_OF_FirstnameDescription = "FIRSTNAME_DESCRIPTION";
+    /** @deprecated Deprecated! So use DB_NAME_LastnameDescription. */
+    public static final String COLUMN_DB_NAME_OF_LastnameDescription = "LASTNAME_DESCRIPTION";
     /** @deprecated Deprecated! So use DB_NAME_Nickname. */
     public static final String COLUMN_DB_NAME_OF_Nickname = "NICKNAME";
     /** @deprecated Deprecated! So use DB_NAME_DayOfBirth. */
@@ -144,10 +152,14 @@
     public static final String PROPERTY_NAME_portalId = "portalId";
     /** Prop-name(JavaBeansRule) of gender. CHAR(1) : NotNull */
     public static final String PROPERTY_NAME_gender = "gender";
-    /** Prop-name(JavaBeansRule) of firstname. VARCHAR(32) : NotNull */
+    /** Prop-name(JavaBeansRule) of firstname. VARCHAR(40) : NotNull */
     public static final String PROPERTY_NAME_firstname = "firstname";
-    /** Prop-name(JavaBeansRule) of lastname. VARCHAR(32) : NotNull */
+    /** Prop-name(JavaBeansRule) of lastname. VARCHAR(40) : NotNull */
     public static final String PROPERTY_NAME_lastname = "lastname";
+    /** Prop-name(JavaBeansRule) of firstnameDescription. VARCHAR(40) */
+    public static final String PROPERTY_NAME_firstnameDescription = "firstnameDescription";
+    /** Prop-name(JavaBeansRule) of lastnameDescription. VARCHAR(40) */
+    public static final String PROPERTY_NAME_lastnameDescription = "lastnameDescription";
     /** Prop-name(JavaBeansRule) of nickname. VARCHAR(64) */
     public static final String PROPERTY_NAME_nickname = "nickname";
     /** Prop-name(JavaBeansRule) of dayOfBirth. DATE : NotNull : Default=[0000-00-00 00:00:00] */
@@ -168,10 +180,14 @@
     public static final String CAP_PROP_NAME_PortalId = "PortalId";
     /** Cap-prop-name of gender. CHAR(1) : NotNull */
     public static final String CAP_PROP_NAME_Gender = "Gender";
-    /** Cap-prop-name of firstname. VARCHAR(32) : NotNull */
+    /** Cap-prop-name of firstname. VARCHAR(40) : NotNull */
     public static final String CAP_PROP_NAME_Firstname = "Firstname";
-    /** Cap-prop-name of lastname. VARCHAR(32) : NotNull */
+    /** Cap-prop-name of lastname. VARCHAR(40) : NotNull */
     public static final String CAP_PROP_NAME_Lastname = "Lastname";
+    /** Cap-prop-name of firstnameDescription. VARCHAR(40) */
+    public static final String CAP_PROP_NAME_FirstnameDescription = "FirstnameDescription";
+    /** Cap-prop-name of lastnameDescription. VARCHAR(40) */
+    public static final String CAP_PROP_NAME_LastnameDescription = "LastnameDescription";
     /** Cap-prop-name of nickname. VARCHAR(64) */
     public static final String CAP_PROP_NAME_Nickname = "Nickname";
     /** Cap-prop-name of dayOfBirth. DATE : NotNull : Default=[0000-00-00 00:00:00] */
@@ -193,6 +209,10 @@
     public static final String COLUMN_CAP_PROP_NAME_OF_Firstname = "Firstname";
     /** @deprecated Deprecated! So use CAP_PROP_NAME_Lastname. */
     public static final String COLUMN_CAP_PROP_NAME_OF_Lastname = "Lastname";
+    /** @deprecated Deprecated! So use CAP_PROP_NAME_FirstnameDescription. */
+    public static final String COLUMN_CAP_PROP_NAME_OF_FirstnameDescription = "FirstnameDescription";
+    /** @deprecated Deprecated! So use CAP_PROP_NAME_LastnameDescription. */
+    public static final String COLUMN_CAP_PROP_NAME_OF_LastnameDescription = "LastnameDescription";
     /** @deprecated Deprecated! So use CAP_PROP_NAME_Nickname. */
     public static final String COLUMN_CAP_PROP_NAME_OF_Nickname = "Nickname";
     /** @deprecated Deprecated! So use CAP_PROP_NAME_DayOfBirth. */
@@ -213,10 +233,14 @@
     public static final String UNCAP_PROP_NAME_portalId = "portalId";
     /** Uncap-prop-name of gender. CHAR(1) : NotNull */
     public static final String UNCAP_PROP_NAME_gender = "gender";
-    /** Uncap-prop-name of firstname. VARCHAR(32) : NotNull */
+    /** Uncap-prop-name of firstname. VARCHAR(40) : NotNull */
     public static final String UNCAP_PROP_NAME_firstname = "firstname";
-    /** Uncap-prop-name of lastname. VARCHAR(32) : NotNull */
+    /** Uncap-prop-name of lastname. VARCHAR(40) : NotNull */
     public static final String UNCAP_PROP_NAME_lastname = "lastname";
+    /** Uncap-prop-name of firstnameDescription. VARCHAR(40) */
+    public static final String UNCAP_PROP_NAME_firstnameDescription = "firstnameDescription";
+    /** Uncap-prop-name of lastnameDescription. VARCHAR(40) */
+    public static final String UNCAP_PROP_NAME_lastnameDescription = "lastnameDescription";
     /** Uncap-prop-name of nickname. VARCHAR(64) */
     public static final String UNCAP_PROP_NAME_nickname = "nickname";
     /** Uncap-prop-name of dayOfBirth. DATE : NotNull : Default=[0000-00-00 00:00:00] */
@@ -238,6 +262,10 @@
     public static final String COLUMN_UNCAP_PROP_NAME_OF_Firstname = "firstname";
     /** @deprecated Deprecated! So use UNCAP_PROP_NAME_Lastname. */
     public static final String COLUMN_UNCAP_PROP_NAME_OF_Lastname = "lastname";
+    /** @deprecated Deprecated! So use UNCAP_PROP_NAME_FirstnameDescription. */
+    public static final String COLUMN_UNCAP_PROP_NAME_OF_FirstnameDescription = "firstnameDescription";
+    /** @deprecated Deprecated! So use UNCAP_PROP_NAME_LastnameDescription. */
+    public static final String COLUMN_UNCAP_PROP_NAME_OF_LastnameDescription = "lastnameDescription";
     /** @deprecated Deprecated! So use UNCAP_PROP_NAME_Nickname. */
     public static final String COLUMN_UNCAP_PROP_NAME_OF_Nickname = "nickname";
     /** @deprecated Deprecated! So use UNCAP_PROP_NAME_DayOfBirth. */
@@ -309,6 +337,8 @@
         map.put(DB_NAME_GENDER.toLowerCase(), PROPERTY_NAME_gender);
         map.put(DB_NAME_FIRSTNAME.toLowerCase(), PROPERTY_NAME_firstname);
         map.put(DB_NAME_LASTNAME.toLowerCase(), PROPERTY_NAME_lastname);
+        map.put(DB_NAME_FIRSTNAME_DESCRIPTION.toLowerCase(), PROPERTY_NAME_firstnameDescription);
+        map.put(DB_NAME_LASTNAME_DESCRIPTION.toLowerCase(), PROPERTY_NAME_lastnameDescription);
         map.put(DB_NAME_NICKNAME.toLowerCase(), PROPERTY_NAME_nickname);
         map.put(DB_NAME_DAY_OF_BIRTH.toLowerCase(), PROPERTY_NAME_dayOfBirth);
         map.put(DB_NAME_EMAIL_ADDRESS.toLowerCase(), PROPERTY_NAME_emailAddress);
@@ -333,6 +363,8 @@
         map.put(PROPERTY_NAME_gender.toLowerCase(), DB_NAME_GENDER);
         map.put(PROPERTY_NAME_firstname.toLowerCase(), DB_NAME_FIRSTNAME);
         map.put(PROPERTY_NAME_lastname.toLowerCase(), DB_NAME_LASTNAME);
+        map.put(PROPERTY_NAME_firstnameDescription.toLowerCase(), DB_NAME_FIRSTNAME_DESCRIPTION);
+        map.put(PROPERTY_NAME_lastnameDescription.toLowerCase(), DB_NAME_LASTNAME_DESCRIPTION);
         map.put(PROPERTY_NAME_nickname.toLowerCase(), DB_NAME_NICKNAME);
         map.put(PROPERTY_NAME_dayOfBirth.toLowerCase(), DB_NAME_DAY_OF_BIRTH);
         map.put(PROPERTY_NAME_emailAddress.toLowerCase(), DB_NAME_EMAIL_ADDRESS);
@@ -359,6 +391,8 @@
         map.put(DB_NAME_GENDER, CAP_PROP_NAME_Gender);
         map.put(DB_NAME_FIRSTNAME, CAP_PROP_NAME_Firstname);
         map.put(DB_NAME_LASTNAME, CAP_PROP_NAME_Lastname);
+        map.put(DB_NAME_FIRSTNAME_DESCRIPTION, CAP_PROP_NAME_FirstnameDescription);
+        map.put(DB_NAME_LASTNAME_DESCRIPTION, CAP_PROP_NAME_LastnameDescription);
         map.put(DB_NAME_NICKNAME, CAP_PROP_NAME_Nickname);
         map.put(DB_NAME_DAY_OF_BIRTH, CAP_PROP_NAME_DayOfBirth);
         map.put(DB_NAME_EMAIL_ADDRESS, CAP_PROP_NAME_EmailAddress);
@@ -385,6 +419,8 @@
         map.put(DB_NAME_GENDER, UNCAP_PROP_NAME_gender);
         map.put(DB_NAME_FIRSTNAME, UNCAP_PROP_NAME_firstname);
         map.put(DB_NAME_LASTNAME, UNCAP_PROP_NAME_lastname);
+        map.put(DB_NAME_FIRSTNAME_DESCRIPTION, UNCAP_PROP_NAME_firstnameDescription);
+        map.put(DB_NAME_LASTNAME_DESCRIPTION, UNCAP_PROP_NAME_lastnameDescription);
         map.put(DB_NAME_NICKNAME, UNCAP_PROP_NAME_nickname);
         map.put(DB_NAME_DAY_OF_BIRTH, UNCAP_PROP_NAME_dayOfBirth);
         map.put(DB_NAME_EMAIL_ADDRESS, UNCAP_PROP_NAME_emailAddress);
@@ -411,6 +447,8 @@
         map.put(CAP_PROP_NAME_Gender, DB_NAME_GENDER);
         map.put(CAP_PROP_NAME_Firstname, DB_NAME_FIRSTNAME);
         map.put(CAP_PROP_NAME_Lastname, DB_NAME_LASTNAME);
+        map.put(CAP_PROP_NAME_FirstnameDescription, DB_NAME_FIRSTNAME_DESCRIPTION);
+        map.put(CAP_PROP_NAME_LastnameDescription, DB_NAME_LASTNAME_DESCRIPTION);
         map.put(CAP_PROP_NAME_Nickname, DB_NAME_NICKNAME);
         map.put(CAP_PROP_NAME_DayOfBirth, DB_NAME_DAY_OF_BIRTH);
         map.put(CAP_PROP_NAME_EmailAddress, DB_NAME_EMAIL_ADDRESS);
@@ -437,6 +475,8 @@
         map.put(CAP_PROP_NAME_Gender, UNCAP_PROP_NAME_gender);
         map.put(CAP_PROP_NAME_Firstname, UNCAP_PROP_NAME_firstname);
         map.put(CAP_PROP_NAME_Lastname, UNCAP_PROP_NAME_lastname);
+        map.put(CAP_PROP_NAME_FirstnameDescription, UNCAP_PROP_NAME_firstnameDescription);
+        map.put(CAP_PROP_NAME_LastnameDescription, UNCAP_PROP_NAME_lastnameDescription);
         map.put(CAP_PROP_NAME_Nickname, UNCAP_PROP_NAME_nickname);
         map.put(CAP_PROP_NAME_DayOfBirth, UNCAP_PROP_NAME_dayOfBirth);
         map.put(CAP_PROP_NAME_EmailAddress, UNCAP_PROP_NAME_emailAddress);
@@ -463,6 +503,8 @@
         map.put(UNCAP_PROP_NAME_gender, DB_NAME_GENDER);
         map.put(UNCAP_PROP_NAME_firstname, DB_NAME_FIRSTNAME);
         map.put(UNCAP_PROP_NAME_lastname, DB_NAME_LASTNAME);
+        map.put(UNCAP_PROP_NAME_firstnameDescription, DB_NAME_FIRSTNAME_DESCRIPTION);
+        map.put(UNCAP_PROP_NAME_lastnameDescription, DB_NAME_LASTNAME_DESCRIPTION);
         map.put(UNCAP_PROP_NAME_nickname, DB_NAME_NICKNAME);
         map.put(UNCAP_PROP_NAME_dayOfBirth, DB_NAME_DAY_OF_BIRTH);
         map.put(UNCAP_PROP_NAME_emailAddress, DB_NAME_EMAIL_ADDRESS);
@@ -489,6 +531,8 @@
         map.put(UNCAP_PROP_NAME_gender, CAP_PROP_NAME_Gender);
         map.put(UNCAP_PROP_NAME_firstname, CAP_PROP_NAME_Firstname);
         map.put(UNCAP_PROP_NAME_lastname, CAP_PROP_NAME_Lastname);
+        map.put(UNCAP_PROP_NAME_firstnameDescription, CAP_PROP_NAME_FirstnameDescription);
+        map.put(UNCAP_PROP_NAME_lastnameDescription, CAP_PROP_NAME_LastnameDescription);
         map.put(UNCAP_PROP_NAME_nickname, CAP_PROP_NAME_Nickname);
         map.put(UNCAP_PROP_NAME_dayOfBirth, CAP_PROP_NAME_DayOfBirth);
         map.put(UNCAP_PROP_NAME_emailAddress, CAP_PROP_NAME_EmailAddress);
@@ -707,6 +751,8 @@
         columnInfoList.add(columnGender());
         columnInfoList.add(columnFirstname());
         columnInfoList.add(columnLastname());
+        columnInfoList.add(columnFirstnameDescription());
+        columnInfoList.add(columnLastnameDescription());
         columnInfoList.add(columnNickname());
         columnInfoList.add(columnDayOfBirth());
         columnInfoList.add(columnEmailAddress());
@@ -767,7 +813,7 @@
      * @deprecated Please use getColumnInfoList()
      */
     public String getColumnDbNameCommaString() {
-        return "CUSTOMER_ID, PORTAL_ID, GENDER, FIRSTNAME, LASTNAME, NICKNAME, DAY_OF_BIRTH, EMAIL_ADDRESS, LAST_MODIFIED, DATE_ADDED";
+        return "CUSTOMER_ID, PORTAL_ID, GENDER, FIRSTNAME, LASTNAME, FIRSTNAME_DESCRIPTION, LASTNAME_DESCRIPTION, NICKNAME, DAY_OF_BIRTH, EMAIL_ADDRESS, LAST_MODIFIED, DATE_ADDED";
     }
 
     /**
@@ -801,6 +847,18 @@
         return new ColumnInfo(this, "LASTNAME", "lastname", String.class, false);
     }
     /**
+     * @return Column information of firstnameDescription. (NotNull)
+     */
+    public ColumnInfo columnFirstnameDescription() {
+        return new ColumnInfo(this, "FIRSTNAME_DESCRIPTION", "firstnameDescription", String.class, false);
+    }
+    /**
+     * @return Column information of lastnameDescription. (NotNull)
+     */
+    public ColumnInfo columnLastnameDescription() {
+        return new ColumnInfo(this, "LASTNAME_DESCRIPTION", "lastnameDescription", String.class, false);
+    }
+    /**
      * @return Column information of nickname. (NotNull)
      */
     public ColumnInfo columnNickname() {
@@ -1059,6 +1117,8 @@
         public RelationTrace columnGender() { return fixTrace(_relationList, CustomerDbm.getInstance().columnGender()); }
         public RelationTrace columnFirstname() { return fixTrace(_relationList, CustomerDbm.getInstance().columnFirstname()); }
         public RelationTrace columnLastname() { return fixTrace(_relationList, CustomerDbm.getInstance().columnLastname()); }
+        public RelationTrace columnFirstnameDescription() { return fixTrace(_relationList, CustomerDbm.getInstance().columnFirstnameDescription()); }
+        public RelationTrace columnLastnameDescription() { return fixTrace(_relationList, CustomerDbm.getInstance().columnLastnameDescription()); }
         public RelationTrace columnNickname() { return fixTrace(_relationList, CustomerDbm.getInstance().columnNickname()); }
         public RelationTrace columnDayOfBirth() { return fixTrace(_relationList, CustomerDbm.getInstance().columnDayOfBirth()); }
         public RelationTrace columnEmailAddress() { return fixTrace(_relationList, CustomerDbm.getInstance().columnEmailAddress()); }
@@ -1139,6 +1199,8 @@
         if (analyzer.init("GENDER", "gender", "gender")) { myEntity.setGender(analyzer.analyzeString(String.class)); };
         if (analyzer.init("FIRSTNAME", "firstname", "firstname")) { myEntity.setFirstname(analyzer.analyzeString(String.class)); };
         if (analyzer.init("LASTNAME", "lastname", "lastname")) { myEntity.setLastname(analyzer.analyzeString(String.class)); };
+        if (analyzer.init("FIRSTNAME_DESCRIPTION", "firstnameDescription", "firstnameDescription")) { myEntity.setFirstnameDescription(analyzer.analyzeString(String.class)); };
+        if (analyzer.init("LASTNAME_DESCRIPTION", "lastnameDescription", "lastnameDescription")) { myEntity.setLastnameDescription(analyzer.analyzeString(String.class)); };
         if (analyzer.init("NICKNAME", "nickname", "nickname")) { myEntity.setNickname(analyzer.analyzeString(String.class)); };
         if (analyzer.init("DAY_OF_BIRTH", "dayOfBirth", "dayOfBirth")) { myEntity.setDayOfBirth(analyzer.analyzeDate(java.util.Date.class)); };
         if (analyzer.init("EMAIL_ADDRESS", "emailAddress", "emailAddress")) { myEntity.setEmailAddress(analyzer.analyzeString(String.class)); };
@@ -1221,6 +1283,8 @@
         helpAppendingColumnValueString(sb, delimiter, equal, "GENDER", myEntity.getGender());
         helpAppendingColumnValueString(sb, delimiter, equal, "FIRSTNAME", myEntity.getFirstname());
         helpAppendingColumnValueString(sb, delimiter, equal, "LASTNAME", myEntity.getLastname());
+        helpAppendingColumnValueString(sb, delimiter, equal, "FIRSTNAME_DESCRIPTION", myEntity.getFirstnameDescription());
+        helpAppendingColumnValueString(sb, delimiter, equal, "LASTNAME_DESCRIPTION", myEntity.getLastnameDescription());
         helpAppendingColumnValueString(sb, delimiter, equal, "NICKNAME", myEntity.getNickname());
         helpAppendingColumnValueString(sb, delimiter, equal, "DAY_OF_BIRTH", myEntity.getDayOfBirth());
         helpAppendingColumnValueString(sb, delimiter, equal, "EMAIL_ADDRESS", myEntity.getEmailAddress());
@@ -1285,6 +1349,8 @@
         valueMap.put("GENDER", myEntity.getGender());
         valueMap.put("FIRSTNAME", myEntity.getFirstname());
         valueMap.put("LASTNAME", myEntity.getLastname());
+        valueMap.put("FIRSTNAME_DESCRIPTION", myEntity.getFirstnameDescription());
+        valueMap.put("LASTNAME_DESCRIPTION", myEntity.getLastnameDescription());
         valueMap.put("NICKNAME", myEntity.getNickname());
         valueMap.put("DAY_OF_BIRTH", myEntity.getDayOfBirth());
         valueMap.put("EMAIL_ADDRESS", myEntity.getEmailAddress());
@@ -1317,6 +1383,8 @@
         valueMap.put("GENDER", helpGettingColumnStringValue(myEntity.getGender()));
         valueMap.put("FIRSTNAME", helpGettingColumnStringValue(myEntity.getFirstname()));
         valueMap.put("LASTNAME", helpGettingColumnStringValue(myEntity.getLastname()));
+        valueMap.put("FIRSTNAME_DESCRIPTION", helpGettingColumnStringValue(myEntity.getFirstnameDescription()));
+        valueMap.put("LASTNAME_DESCRIPTION", helpGettingColumnStringValue(myEntity.getLastnameDescription()));
         valueMap.put("NICKNAME", helpGettingColumnStringValue(myEntity.getNickname()));
         valueMap.put("DAY_OF_BIRTH", helpGettingColumnStringValue(myEntity.getDayOfBirth()));
         valueMap.put("EMAIL_ADDRESS", helpGettingColumnStringValue(myEntity.getEmailAddress()));
@@ -1346,9 +1414,9 @@
     public String getPreparedInsertClause(PreparedInsertClauseOption preparedInsertClauseOption) {
         if (preparedInsertClauseOption.getTablePrefix() != null) {
             final String tablePrefix = preparedInsertClauseOption.getTablePrefix();
-            return "insert into " + tablePrefix + "CUSTOMER(CUSTOMER_ID, PORTAL_ID, GENDER, FIRSTNAME, LASTNAME, NICKNAME, DAY_OF_BIRTH, EMAIL_ADDRESS, LAST_MODIFIED, DATE_ADDED) values(? , ? , ? , ? , ? , ? , ? , ? , ? , ? )";
+            return "insert into " + tablePrefix + "CUSTOMER(CUSTOMER_ID, PORTAL_ID, GENDER, FIRSTNAME, LASTNAME, FIRSTNAME_DESCRIPTION, LASTNAME_DESCRIPTION, NICKNAME, DAY_OF_BIRTH, EMAIL_ADDRESS, LAST_MODIFIED, DATE_ADDED) values(? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? )";
         }
-        return "insert into CUSTOMER(CUSTOMER_ID, PORTAL_ID, GENDER, FIRSTNAME, LASTNAME, NICKNAME, DAY_OF_BIRTH, EMAIL_ADDRESS, LAST_MODIFIED, DATE_ADDED) values(? , ? , ? , ? , ? , ? , ? , ? , ? , ? )";
+        return "insert into CUSTOMER(CUSTOMER_ID, PORTAL_ID, GENDER, FIRSTNAME, LASTNAME, FIRSTNAME_DESCRIPTION, LASTNAME_DESCRIPTION, NICKNAME, DAY_OF_BIRTH, EMAIL_ADDRESS, LAST_MODIFIED, DATE_ADDED) values(? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? )";
     }
 
     // ===================================================================================

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-30 13:20:43 UTC (rev 598)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderFormDbm.java	2007-10-01 13:00:14 UTC (rev 599)
@@ -16,7 +16,7 @@
  *     ORDER_FORM_ID
  * 
  * [column-property]
- *     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
+ *     ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_FIRSTNAME_DESCRIPTION, CUSTOMER_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, DELIVERY_LAST_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, BILLING_LASTNAME_DESCRIPTION, 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
@@ -101,10 +101,14 @@
     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 */
+    /** Db-name of CUSTOMER_FIRSTNAME. VARCHAR(40) : NotNull */
     public static final String DB_NAME_CUSTOMER_FIRSTNAME = "CUSTOMER_FIRSTNAME";
-    /** Db-name of CUSTOMER_LASTNAME. VARCHAR(32) : NotNull */
+    /** Db-name of CUSTOMER_LASTNAME. VARCHAR(40) : NotNull */
     public static final String DB_NAME_CUSTOMER_LASTNAME = "CUSTOMER_LASTNAME";
+    /** Db-name of CUSTOMER_FIRSTNAME_DESCRIPTION. VARCHAR(40) */
+    public static final String DB_NAME_CUSTOMER_FIRSTNAME_DESCRIPTION = "CUSTOMER_FIRSTNAME_DESCRIPTION";
+    /** Db-name of CUSTOMER_LASTNAME_DESCRIPTION. VARCHAR(40) */
+    public static final String DB_NAME_CUSTOMER_LASTNAME_DESCRIPTION = "CUSTOMER_LASTNAME_DESCRIPTION";
     /** Db-name of CUSTOMER_DAY_OF_BIRTH. DATE : NotNull */
     public static final String DB_NAME_CUSTOMER_DAY_OF_BIRTH = "CUSTOMER_DAY_OF_BIRTH";
     /** Db-name of CUSTOMER_EMAIL_ADDRESS. VARCHAR(128) : NotNull */
@@ -133,10 +137,14 @@
     public static final String DB_NAME_DELIVERY_COMPANY = "DELIVERY_COMPANY";
     /** Db-name of DELIVERY_DEPARTMENT. VARCHAR(64) */
     public static final String DB_NAME_DELIVERY_DEPARTMENT = "DELIVERY_DEPARTMENT";
-    /** Db-name of DELIVERY_FIRSTNAME. VARCHAR(32) : NotNull */
+    /** Db-name of DELIVERY_FIRSTNAME. VARCHAR(40) : NotNull */
     public static final String DB_NAME_DELIVERY_FIRSTNAME = "DELIVERY_FIRSTNAME";
-    /** Db-name of DELIVERY_LASTNAME. VARCHAR(32) : NotNull */
+    /** Db-name of DELIVERY_LASTNAME. VARCHAR(40) : NotNull */
     public static final String DB_NAME_DELIVERY_LASTNAME = "DELIVERY_LASTNAME";
+    /** Db-name of DELIVERY_FIRSTNAME_DESCRIPTION. VARCHAR(40) */
+    public static final String DB_NAME_DELIVERY_FIRSTNAME_DESCRIPTION = "DELIVERY_FIRSTNAME_DESCRIPTION";
+    /** Db-name of DELIVERY_LAST_DESCRIPTION. VARCHAR(40) */
+    public static final String DB_NAME_DELIVERY_LAST_DESCRIPTION = "DELIVERY_LAST_DESCRIPTION";
     /** Db-name of DELIVERY_STREET_ADDRESS. VARCHAR(255) : NotNull */
     public static final String DB_NAME_DELIVERY_STREET_ADDRESS = "DELIVERY_STREET_ADDRESS";
     /** Db-name of DELIVERY_SUBURB. VARCHAR(32) */
@@ -157,10 +165,14 @@
     public static final String DB_NAME_BILLING_COMPANY = "BILLING_COMPANY";
     /** Db-name of BILLING_DEPARTMENT. VARCHAR(64) */
     public static final String DB_NAME_BILLING_DEPARTMENT = "BILLING_DEPARTMENT";
-    /** Db-name of BILLING_FIRSTNAME. VARCHAR(32) : NotNull */
+    /** Db-name of BILLING_FIRSTNAME. VARCHAR(40) : NotNull */
     public static final String DB_NAME_BILLING_FIRSTNAME = "BILLING_FIRSTNAME";
-    /** Db-name of BILLING_LASTNAME. VARCHAR(32) : NotNull */
+    /** Db-name of BILLING_LASTNAME. VARCHAR(40) : NotNull */
     public static final String DB_NAME_BILLING_LASTNAME = "BILLING_LASTNAME";
+    /** Db-name of BILLING_FIRSTNAME_DESCRIPTION. VARCHAR(40) */
+    public static final String DB_NAME_BILLING_FIRSTNAME_DESCRIPTION = "BILLING_FIRSTNAME_DESCRIPTION";
+    /** Db-name of BILLING_LASTNAME_DESCRIPTION. VARCHAR(40) */
+    public static final String DB_NAME_BILLING_LASTNAME_DESCRIPTION = "BILLING_LASTNAME_DESCRIPTION";
     /** Db-name of BILLING_STREET_ADDRESS. VARCHAR(255) : NotNull */
     public static final String DB_NAME_BILLING_STREET_ADDRESS = "BILLING_STREET_ADDRESS";
     /** Db-name of BILLING_SUBURB. VARCHAR(32) */
@@ -220,6 +232,10 @@
     public static final String COLUMN_DB_NAME_OF_CustomerFirstname = "CUSTOMER_FIRSTNAME";
     /** @deprecated Deprecated! So use DB_NAME_CustomerLastname. */
     public static final String COLUMN_DB_NAME_OF_CustomerLastname = "CUSTOMER_LASTNAME";
+    /** @deprecated Deprecated! So use DB_NAME_CustomerFirstnameDescription. */
+    public static final String COLUMN_DB_NAME_OF_CustomerFirstnameDescription = "CUSTOMER_FIRSTNAME_DESCRIPTION";
+    /** @deprecated Deprecated! So use DB_NAME_CustomerLastnameDescription. */
+    public static final String COLUMN_DB_NAME_OF_CustomerLastnameDescription = "CUSTOMER_LASTNAME_DESCRIPTION";
     /** @deprecated Deprecated! So use DB_NAME_CustomerDayOfBirth. */
     public static final String COLUMN_DB_NAME_OF_CustomerDayOfBirth = "CUSTOMER_DAY_OF_BIRTH";
     /** @deprecated Deprecated! So use DB_NAME_CustomerEmailAddress. */
@@ -252,6 +268,10 @@
     public static final String COLUMN_DB_NAME_OF_DeliveryFirstname = "DELIVERY_FIRSTNAME";
     /** @deprecated Deprecated! So use DB_NAME_DeliveryLastname. */
     public static final String COLUMN_DB_NAME_OF_DeliveryLastname = "DELIVERY_LASTNAME";
+    /** @deprecated Deprecated! So use DB_NAME_DeliveryFirstnameDescription. */
+    public static final String COLUMN_DB_NAME_OF_DeliveryFirstnameDescription = "DELIVERY_FIRSTNAME_DESCRIPTION";
+    /** @deprecated Deprecated! So use DB_NAME_DeliveryLastDescription. */
+    public static final String COLUMN_DB_NAME_OF_DeliveryLastDescription = "DELIVERY_LAST_DESCRIPTION";
     /** @deprecated Deprecated! So use DB_NAME_DeliveryStreetAddress. */
     public static final String COLUMN_DB_NAME_OF_DeliveryStreetAddress = "DELIVERY_STREET_ADDRESS";
     /** @deprecated Deprecated! So use DB_NAME_DeliverySuburb. */
@@ -276,6 +296,10 @@
     public static final String COLUMN_DB_NAME_OF_BillingFirstname = "BILLING_FIRSTNAME";
     /** @deprecated Deprecated! So use DB_NAME_BillingLastname. */
     public static final String COLUMN_DB_NAME_OF_BillingLastname = "BILLING_LASTNAME";
+    /** @deprecated Deprecated! So use DB_NAME_BillingFirstnameDescription. */
+    public static final String COLUMN_DB_NAME_OF_BillingFirstnameDescription = "BILLING_FIRSTNAME_DESCRIPTION";
+    /** @deprecated Deprecated! So use DB_NAME_BillingLastnameDescription. */
+    public static final String COLUMN_DB_NAME_OF_BillingLastnameDescription = "BILLING_LASTNAME_DESCRIPTION";
     /** @deprecated Deprecated! So use DB_NAME_BillingStreetAddress. */
     public static final String COLUMN_DB_NAME_OF_BillingStreetAddress = "BILLING_STREET_ADDRESS";
     /** @deprecated Deprecated! So use DB_NAME_BillingSuburb. */
@@ -334,10 +358,14 @@
     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 */
+    /** Prop-name(JavaBeansRule) of customerFirstname. VARCHAR(40) : NotNull */
     public static final String PROPERTY_NAME_customerFirstname = "customerFirstname";
-    /** Prop-name(JavaBeansRule) of customerLastname. VARCHAR(32) : NotNull */
+    /** Prop-name(JavaBeansRule) of customerLastname. VARCHAR(40) : NotNull */
     public static final String PROPERTY_NAME_customerLastname = "customerLastname";
+    /** Prop-name(JavaBeansRule) of customerFirstnameDescription. VARCHAR(40) */
+    public static final String PROPERTY_NAME_customerFirstnameDescription = "customerFirstnameDescription";
+    /** Prop-name(JavaBeansRule) of customerLastnameDescription. VARCHAR(40) */
+    public static final String PROPERTY_NAME_customerLastnameDescription = "customerLastnameDescription";
     /** Prop-name(JavaBeansRule) of customerDayOfBirth. DATE : NotNull */
     public static final String PROPERTY_NAME_customerDayOfBirth = "customerDayOfBirth";
     /** Prop-name(JavaBeansRule) of customerEmailAddress. VARCHAR(128) : NotNull */
@@ -366,10 +394,14 @@
     public static final String PROPERTY_NAME_deliveryCompany = "deliveryCompany";
     /** Prop-name(JavaBeansRule) of deliveryDepartment. VARCHAR(64) */
     public static final String PROPERTY_NAME_deliveryDepartment = "deliveryDepartment";
-    /** Prop-name(JavaBeansRule) of deliveryFirstname. VARCHAR(32) : NotNull */
+    /** Prop-name(JavaBeansRule) of deliveryFirstname. VARCHAR(40) : NotNull */
     public static final String PROPERTY_NAME_deliveryFirstname = "deliveryFirstname";
-    /** Prop-name(JavaBeansRule) of deliveryLastname. VARCHAR(32) : NotNull */
+    /** Prop-name(JavaBeansRule) of deliveryLastname. VARCHAR(40) : NotNull */
     public static final String PROPERTY_NAME_deliveryLastname = "deliveryLastname";
+    /** Prop-name(JavaBeansRule) of deliveryFirstnameDescription. VARCHAR(40) */
+    public static final String PROPERTY_NAME_deliveryFirstnameDescription = "deliveryFirstnameDescription";
+    /** Prop-name(JavaBeansRule) of deliveryLastDescription. VARCHAR(40) */
+    public static final String PROPERTY_NAME_deliveryLastDescription = "deliveryLastDescription";
     /** Prop-name(JavaBeansRule) of deliveryStreetAddress. VARCHAR(255) : NotNull */
     public static final String PROPERTY_NAME_deliveryStreetAddress = "deliveryStreetAddress";
     /** Prop-name(JavaBeansRule) of deliverySuburb. VARCHAR(32) */
@@ -390,10 +422,14 @@
     public static final String PROPERTY_NAME_billingCompany = "billingCompany";
     /** Prop-name(JavaBeansRule) of billingDepartment. VARCHAR(64) */
     public static final String PROPERTY_NAME_billingDepartment = "billingDepartment";
-    /** Prop-name(JavaBeansRule) of billingFirstname. VARCHAR(32) : NotNull */
+    /** Prop-name(JavaBeansRule) of billingFirstname. VARCHAR(40) : NotNull */
     public static final String PROPERTY_NAME_billingFirstname = "billingFirstname";
-    /** Prop-name(JavaBeansRule) of billingLastname. VARCHAR(32) : NotNull */
+    /** Prop-name(JavaBeansRule) of billingLastname. VARCHAR(40) : NotNull */
     public static final String PROPERTY_NAME_billingLastname = "billingLastname";
+    /** Prop-name(JavaBeansRule) of billingFirstnameDescription. VARCHAR(40) */
+    public static final String PROPERTY_NAME_billingFirstnameDescription = "billingFirstnameDescription";
+    /** Prop-name(JavaBeansRule) of billingLastnameDescription. VARCHAR(40) */
+    public static final String PROPERTY_NAME_billingLastnameDescription = "billingLastnameDescription";
     /** Prop-name(JavaBeansRule) of billingStreetAddress. VARCHAR(255) : NotNull */
     public static final String PROPERTY_NAME_billingStreetAddress = "billingStreetAddress";
     /** Prop-name(JavaBeansRule) of billingSuburb. VARCHAR(32) */
@@ -452,10 +488,14 @@
     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 */
+    /** Cap-prop-name of customerFirstname. VARCHAR(40) : NotNull */
     public static final String CAP_PROP_NAME_CustomerFirstname = "CustomerFirstname";
-    /** Cap-prop-name of customerLastname. VARCHAR(32) : NotNull */
+    /** Cap-prop-name of customerLastname. VARCHAR(40) : NotNull */
     public static final String CAP_PROP_NAME_CustomerLastname = "CustomerLastname";
+    /** Cap-prop-name of customerFirstnameDescription. VARCHAR(40) */
+    public static final String CAP_PROP_NAME_CustomerFirstnameDescription = "CustomerFirstnameDescription";
+    /** Cap-prop-name of customerLastnameDescription. VARCHAR(40) */
+    public static final String CAP_PROP_NAME_CustomerLastnameDescription = "CustomerLastnameDescription";
     /** Cap-prop-name of customerDayOfBirth. DATE : NotNull */
     public static final String CAP_PROP_NAME_CustomerDayOfBirth = "CustomerDayOfBirth";
     /** Cap-prop-name of customerEmailAddress. VARCHAR(128) : NotNull */
@@ -484,10 +524,14 @@
     public static final String CAP_PROP_NAME_DeliveryCompany = "DeliveryCompany";
     /** Cap-prop-name of deliveryDepartment. VARCHAR(64) */
     public static final String CAP_PROP_NAME_DeliveryDepartment = "DeliveryDepartment";
-    /** Cap-prop-name of deliveryFirstname. VARCHAR(32) : NotNull */
+    /** Cap-prop-name of deliveryFirstname. VARCHAR(40) : NotNull */
     public static final String CAP_PROP_NAME_DeliveryFirstname = "DeliveryFirstname";
-    /** Cap-prop-name of deliveryLastname. VARCHAR(32) : NotNull */
+    /** Cap-prop-name of deliveryLastname. VARCHAR(40) : NotNull */
     public static final String CAP_PROP_NAME_DeliveryLastname = "DeliveryLastname";
+    /** Cap-prop-name of deliveryFirstnameDescription. VARCHAR(40) */
+    public static final String CAP_PROP_NAME_DeliveryFirstnameDescription = "DeliveryFirstnameDescription";
+    /** Cap-prop-name of deliveryLastDescription. VARCHAR(40) */
+    public static final String CAP_PROP_NAME_DeliveryLastDescription = "DeliveryLastDescription";
     /** Cap-prop-name of deliveryStreetAddress. VARCHAR(255) : NotNull */
     public static final String CAP_PROP_NAME_DeliveryStreetAddress = "DeliveryStreetAddress";
     /** Cap-prop-name of deliverySuburb. VARCHAR(32) */
@@ -508,10 +552,14 @@
     public static final String CAP_PROP_NAME_BillingCompany = "BillingCompany";
     /** Cap-prop-name of billingDepartment. VARCHAR(64) */
     public static final String CAP_PROP_NAME_BillingDepartment = "BillingDepartment";
-    /** Cap-prop-name of billingFirstname. VARCHAR(32) : NotNull */
+    /** Cap-prop-name of billingFirstname. VARCHAR(40) : NotNull */
     public static final String CAP_PROP_NAME_BillingFirstname = "BillingFirstname";
-    /** Cap-prop-name of billingLastname. VARCHAR(32) : NotNull */
+    /** Cap-prop-name of billingLastname. VARCHAR(40) : NotNull */
     public static final String CAP_PROP_NAME_BillingLastname = "BillingLastname";
+    /** Cap-prop-name of billingFirstnameDescription. VARCHAR(40) */
+    public static final String CAP_PROP_NAME_BillingFirstnameDescription = "BillingFirstnameDescription";
+    /** Cap-prop-name of billingLastnameDescription. VARCHAR(40) */
+    public static final String CAP_PROP_NAME_BillingLastnameDescription = "BillingLastnameDescription";
     /** Cap-prop-name of billingStreetAddress. VARCHAR(255) : NotNull */
     public static final String CAP_PROP_NAME_BillingStreetAddress = "BillingStreetAddress";
     /** Cap-prop-name of billingSuburb. VARCHAR(32) */
@@ -571,6 +619,10 @@
     public static final String COLUMN_CAP_PROP_NAME_OF_CustomerFirstname = "CustomerFirstname";
     /** @deprecated Deprecated! So use CAP_PROP_NAME_CustomerLastname. */
     public static final String COLUMN_CAP_PROP_NAME_OF_CustomerLastname = "CustomerLastname";
+    /** @deprecated Deprecated! So use CAP_PROP_NAME_CustomerFirstnameDescription. */
+    public static final String COLUMN_CAP_PROP_NAME_OF_CustomerFirstnameDescription = "CustomerFirstnameDescription";
+    /** @deprecated Deprecated! So use CAP_PROP_NAME_CustomerLastnameDescription. */
+    public static final String COLUMN_CAP_PROP_NAME_OF_CustomerLastnameDescription = "CustomerLastnameDescription";
     /** @deprecated Deprecated! So use CAP_PROP_NAME_CustomerDayOfBirth. */
     public static final String COLUMN_CAP_PROP_NAME_OF_CustomerDayOfBirth = "CustomerDayOfBirth";
     /** @deprecated Deprecated! So use CAP_PROP_NAME_CustomerEmailAddress. */
@@ -603,6 +655,10 @@
     public static final String COLUMN_CAP_PROP_NAME_OF_DeliveryFirstname = "DeliveryFirstname";
     /** @deprecated Deprecated! So use CAP_PROP_NAME_DeliveryLastname. */
     public static final String COLUMN_CAP_PROP_NAME_OF_DeliveryLastname = "DeliveryLastname";
+    /** @deprecated Deprecated! So use CAP_PROP_NAME_DeliveryFirstnameDescription. */
+    public static final String COLUMN_CAP_PROP_NAME_OF_DeliveryFirstnameDescription = "DeliveryFirstnameDescription";
+    /** @deprecated Deprecated! So use CAP_PROP_NAME_DeliveryLastDescription. */
+    public static final String COLUMN_CAP_PROP_NAME_OF_DeliveryLastDescription = "DeliveryLastDescription";
     /** @deprecated Deprecated! So use CAP_PROP_NAME_DeliveryStreetAddress. */
     public static final String COLUMN_CAP_PROP_NAME_OF_DeliveryStreetAddress = "DeliveryStreetAddress";
     /** @deprecated Deprecated! So use CAP_PROP_NAME_DeliverySuburb. */
@@ -627,6 +683,10 @@
     public static final String COLUMN_CAP_PROP_NAME_OF_BillingFirstname = "BillingFirstname";
     /** @deprecated Deprecated! So use CAP_PROP_NAME_BillingLastname. */
     public static final String COLUMN_CAP_PROP_NAME_OF_BillingLastname = "BillingLastname";
+    /** @deprecated Deprecated! So use CAP_PROP_NAME_BillingFirstnameDescription. */
+    public static final String COLUMN_CAP_PROP_NAME_OF_BillingFirstnameDescription = "BillingFirstnameDescription";
+    /** @deprecated Deprecated! So use CAP_PROP_NAME_BillingLastnameDescription. */
+    public static final String COLUMN_CAP_PROP_NAME_OF_BillingLastnameDescription = "BillingLastnameDescription";
     /** @deprecated Deprecated! So use CAP_PROP_NAME_BillingStreetAddress. */
     public static final String COLUMN_CAP_PROP_NAME_OF_BillingStreetAddress = "BillingStreetAddress";
     /** @deprecated Deprecated! So use CAP_PROP_NAME_BillingSuburb. */
@@ -685,10 +745,14 @@
     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 */
+    /** Uncap-prop-name of customerFirstname. VARCHAR(40) : NotNull */
     public static final String UNCAP_PROP_NAME_customerFirstname = "customerFirstname";
-    /** Uncap-prop-name of customerLastname. VARCHAR(32) : NotNull */
+    /** Uncap-prop-name of customerLastname. VARCHAR(40) : NotNull */
     public static final String UNCAP_PROP_NAME_customerLastname = "customerLastname";
+    /** Uncap-prop-name of customerFirstnameDescription. VARCHAR(40) */
+    public static final String UNCAP_PROP_NAME_customerFirstnameDescription = "customerFirstnameDescription";
+    /** Uncap-prop-name of customerLastnameDescription. VARCHAR(40) */
+    public static final String UNCAP_PROP_NAME_customerLastnameDescription = "customerLastnameDescription";
     /** Uncap-prop-name of customerDayOfBirth. DATE : NotNull */
     public static final String UNCAP_PROP_NAME_customerDayOfBirth = "customerDayOfBirth";
     /** Uncap-prop-name of customerEmailAddress. VARCHAR(128) : NotNull */
@@ -717,10 +781,14 @@
     public static final String UNCAP_PROP_NAME_deliveryCompany = "deliveryCompany";
     /** Uncap-prop-name of deliveryDepartment. VARCHAR(64) */
     public static final String UNCAP_PROP_NAME_deliveryDepartment = "deliveryDepartment";
-    /** Uncap-prop-name of deliveryFirstname. VARCHAR(32) : NotNull */
+    /** Uncap-prop-name of deliveryFirstname. VARCHAR(40) : NotNull */
     public static final String UNCAP_PROP_NAME_deliveryFirstname = "deliveryFirstname";
-    /** Uncap-prop-name of deliveryLastname. VARCHAR(32) : NotNull */
+    /** Uncap-prop-name of deliveryLastname. VARCHAR(40) : NotNull */
     public static final String UNCAP_PROP_NAME_deliveryLastname = "deliveryLastname";
+    /** Uncap-prop-name of deliveryFirstnameDescription. VARCHAR(40) */
+    public static final String UNCAP_PROP_NAME_deliveryFirstnameDescription = "deliveryFirstnameDescription";
+    /** Uncap-prop-name of deliveryLastDescription. VARCHAR(40) */
+    public static final String UNCAP_PROP_NAME_deliveryLastDescription = "deliveryLastDescription";
     /** Uncap-prop-name of deliveryStreetAddress. VARCHAR(255) : NotNull */
     public static final String UNCAP_PROP_NAME_deliveryStreetAddress = "deliveryStreetAddress";
     /** Uncap-prop-name of deliverySuburb. VARCHAR(32) */
@@ -741,10 +809,14 @@
     public static final String UNCAP_PROP_NAME_billingCompany = "billingCompany";
     /** Uncap-prop-name of billingDepartment. VARCHAR(64) */
     public static final String UNCAP_PROP_NAME_billingDepartment = "billingDepartment";
-    /** Uncap-prop-name of billingFirstname. VARCHAR(32) : NotNull */
+    /** Uncap-prop-name of billingFirstname. VARCHAR(40) : NotNull */
     public static final String UNCAP_PROP_NAME_billingFirstname = "billingFirstname";
-    /** Uncap-prop-name of billingLastname. VARCHAR(32) : NotNull */
+    /** Uncap-prop-name of billingLastname. VARCHAR(40) : NotNull */
     public static final String UNCAP_PROP_NAME_billingLastname = "billingLastname";
+    /** Uncap-prop-name of billingFirstnameDescription. VARCHAR(40) */
+    public static final String UNCAP_PROP_NAME_billingFirstnameDescription = "billingFirstnameDescription";
+    /** Uncap-prop-name of billingLastnameDescription. VARCHAR(40) */
+    public static final String UNCAP_PROP_NAME_billingLastnameDescription = "billingLastnameDescription";
     /** Uncap-prop-name of billingStreetAddress. VARCHAR(255) : NotNull */
     public static final String UNCAP_PROP_NAME_billingStreetAddress = "billingStreetAddress";
     /** Uncap-prop-name of billingSuburb. VARCHAR(32) */
@@ -804,6 +876,10 @@
     public static final String COLUMN_UNCAP_PROP_NAME_OF_CustomerFirstname = "customerFirstname";
     /** @deprecated Deprecated! So use UNCAP_PROP_NAME_CustomerLastname. */
     public static final String COLUMN_UNCAP_PROP_NAME_OF_CustomerLastname = "customerLastname";
+    /** @deprecated Deprecated! So use UNCAP_PROP_NAME_CustomerFirstnameDescription. */
+    public static final String COLUMN_UNCAP_PROP_NAME_OF_CustomerFirstnameDescription = "customerFirstnameDescription";
+    /** @deprecated Deprecated! So use UNCAP_PROP_NAME_CustomerLastnameDescription. */
+    public static final String COLUMN_UNCAP_PROP_NAME_OF_CustomerLastnameDescription = "customerLastnameDescription";
     /** @deprecated Deprecated! So use UNCAP_PROP_NAME_CustomerDayOfBirth. */
     public static final String COLUMN_UNCAP_PROP_NAME_OF_CustomerDayOfBirth = "customerDayOfBirth";
     /** @deprecated Deprecated! So use UNCAP_PROP_NAME_CustomerEmailAddress. */
@@ -836,6 +912,10 @@
     public static final String COLUMN_UNCAP_PROP_NAME_OF_DeliveryFirstname = "deliveryFirstname";
     /** @deprecated Deprecated! So use UNCAP_PROP_NAME_DeliveryLastname. */
     public static final String COLUMN_UNCAP_PROP_NAME_OF_DeliveryLastname = "deliveryLastname";
+    /** @deprecated Deprecated! So use UNCAP_PROP_NAME_DeliveryFirstnameDescription. */
+    public static final String COLUMN_UNCAP_PROP_NAME_OF_DeliveryFirstnameDescription = "deliveryFirstnameDescription";
+    /** @deprecated Deprecated! So use UNCAP_PROP_NAME_DeliveryLastDescription. */
+    public static final String COLUMN_UNCAP_PROP_NAME_OF_DeliveryLastDescription = "deliveryLastDescription";
     /** @deprecated Deprecated! So use UNCAP_PROP_NAME_DeliveryStreetAddress. */
     public static final String COLUMN_UNCAP_PROP_NAME_OF_DeliveryStreetAddress = "deliveryStreetAddress";
     /** @deprecated Deprecated! So use UNCAP_PROP_NAME_DeliverySuburb. */
@@ -860,6 +940,10 @@
     public static final String COLUMN_UNCAP_PROP_NAME_OF_BillingFirstname = "billingFirstname";
     /** @deprecated Deprecated! So use UNCAP_PROP_NAME_BillingLastname. */
     public static final String COLUMN_UNCAP_PROP_NAME_OF_BillingLastname = "billingLastname";
+    /** @deprecated Deprecated! So use UNCAP_PROP_NAME_BillingFirstnameDescription. */
+    public static final String COLUMN_UNCAP_PROP_NAME_OF_BillingFirstnameDescription = "billingFirstnameDescription";
+    /** @deprecated Deprecated! So use UNCAP_PROP_NAME_BillingLastnameDescription. */
+    public static final String COLUMN_UNCAP_PROP_NAME_OF_BillingLastnameDescription = "billingLastnameDescription";
     /** @deprecated Deprecated! So use UNCAP_PROP_NAME_BillingStreetAddress. */
     public static final String COLUMN_UNCAP_PROP_NAME_OF_BillingStreetAddress = "billingStreetAddress";
     /** @deprecated Deprecated! So use UNCAP_PROP_NAME_BillingSuburb. */
@@ -992,6 +1076,8 @@
         map.put(DB_NAME_CUSTOMER_GENDER.toLowerCase(), PROPERTY_NAME_customerGender);
         map.put(DB_NAME_CUSTOMER_FIRSTNAME.toLowerCase(), PROPERTY_NAME_customerFirstname);
         map.put(DB_NAME_CUSTOMER_LASTNAME.toLowerCase(), PROPERTY_NAME_customerLastname);
+        map.put(DB_NAME_CUSTOMER_FIRSTNAME_DESCRIPTION.toLowerCase(), PROPERTY_NAME_customerFirstnameDescription);
+        map.put(DB_NAME_CUSTOMER_LASTNAME_DESCRIPTION.toLowerCase(), PROPERTY_NAME_customerLastnameDescription);
         map.put(DB_NAME_CUSTOMER_DAY_OF_BIRTH.toLowerCase(), PROPERTY_NAME_customerDayOfBirth);
         map.put(DB_NAME_CUSTOMER_EMAIL_ADDRESS.toLowerCase(), PROPERTY_NAME_customerEmailAddress);
         map.put(DB_NAME_CUSTOMER_COMPANY.toLowerCase(), PROPERTY_NAME_customerCompany);
@@ -1008,6 +1094,8 @@
         map.put(DB_NAME_DELIVERY_DEPARTMENT.toLowerCase(), PROPERTY_NAME_deliveryDepartment);
         map.put(DB_NAME_DELIVERY_FIRSTNAME.toLowerCase(), PROPERTY_NAME_deliveryFirstname);
         map.put(DB_NAME_DELIVERY_LASTNAME.toLowerCase(), PROPERTY_NAME_deliveryLastname);
+        map.put(DB_NAME_DELIVERY_FIRSTNAME_DESCRIPTION.toLowerCase(), PROPERTY_NAME_deliveryFirstnameDescription);
+        map.put(DB_NAME_DELIVERY_LAST_DESCRIPTION.toLowerCase(), PROPERTY_NAME_deliveryLastDescription);
         map.put(DB_NAME_DELIVERY_STREET_ADDRESS.toLowerCase(), PROPERTY_NAME_deliveryStreetAddress);
         map.put(DB_NAME_DELIVERY_SUBURB.toLowerCase(), PROPERTY_NAME_deliverySuburb);
         map.put(DB_NAME_DELIVERY_CITY.toLowerCase(), PROPERTY_NAME_deliveryCity);
@@ -1020,6 +1108,8 @@
         map.put(DB_NAME_BILLING_DEPARTMENT.toLowerCase(), PROPERTY_NAME_billingDepartment);
         map.put(DB_NAME_BILLING_FIRSTNAME.toLowerCase(), PROPERTY_NAME_billingFirstname);
         map.put(DB_NAME_BILLING_LASTNAME.toLowerCase(), PROPERTY_NAME_billingLastname);
+        map.put(DB_NAME_BILLING_FIRSTNAME_DESCRIPTION.toLowerCase(), PROPERTY_NAME_billingFirstnameDescription);
+        map.put(DB_NAME_BILLING_LASTNAME_DESCRIPTION.toLowerCase(), PROPERTY_NAME_billingLastnameDescription);
         map.put(DB_NAME_BILLING_STREET_ADDRESS.toLowerCase(), PROPERTY_NAME_billingStreetAddress);
         map.put(DB_NAME_BILLING_SUBURB.toLowerCase(), PROPERTY_NAME_billingSuburb);
         map.put(DB_NAME_BILLING_CITY.toLowerCase(), PROPERTY_NAME_billingCity);
@@ -1063,6 +1153,8 @@
         map.put(PROPERTY_NAME_customerGender.toLowerCase(), DB_NAME_CUSTOMER_GENDER);
         map.put(PROPERTY_NAME_customerFirstname.toLowerCase(), DB_NAME_CUSTOMER_FIRSTNAME);
         map.put(PROPERTY_NAME_customerLastname.toLowerCase(), DB_NAME_CUSTOMER_LASTNAME);
+        map.put(PROPERTY_NAME_customerFirstnameDescription.toLowerCase(), DB_NAME_CUSTOMER_FIRSTNAME_DESCRIPTION);
+        map.put(PROPERTY_NAME_customerLastnameDescription.toLowerCase(), DB_NAME_CUSTOMER_LASTNAME_DESCRIPTION);
         map.put(PROPERTY_NAME_customerDayOfBirth.toLowerCase(), DB_NAME_CUSTOMER_DAY_OF_BIRTH);
         map.put(PROPERTY_NAME_customerEmailAddress.toLowerCase(), DB_NAME_CUSTOMER_EMAIL_ADDRESS);
         map.put(PROPERTY_NAME_customerCompany.toLowerCase(), DB_NAME_CUSTOMER_COMPANY);
@@ -1079,6 +1171,8 @@
         map.put(PROPERTY_NAME_deliveryDepartment.toLowerCase(), DB_NAME_DELIVERY_DEPARTMENT);
         map.put(PROPERTY_NAME_deliveryFirstname.toLowerCase(), DB_NAME_DELIVERY_FIRSTNAME);
         map.put(PROPERTY_NAME_deliveryLastname.toLowerCase(), DB_NAME_DELIVERY_LASTNAME);
+        map.put(PROPERTY_NAME_deliveryFirstnameDescription.toLowerCase(), DB_NAME_DELIVERY_FIRSTNAME_DESCRIPTION);
+        map.put(PROPERTY_NAME_deliveryLastDescription.toLowerCase(), DB_NAME_DELIVERY_LAST_DESCRIPTION);
         map.put(PROPERTY_NAME_deliveryStreetAddress.toLowerCase(), DB_NAME_DELIVERY_STREET_ADDRESS);
         map.put(PROPERTY_NAME_deliverySuburb.toLowerCase(), DB_NAME_DELIVERY_SUBURB);
         map.put(PROPERTY_NAME_deliveryCity.toLowerCase(), DB_NAME_DELIVERY_CITY);
@@ -1091,6 +1185,8 @@
         map.put(PROPERTY_NAME_billingDepartment.toLowerCase(), DB_NAME_BILLING_DEPARTMENT);
         map.put(PROPERTY_NAME_billingFirstname.toLowerCase(), DB_NAME_BILLING_FIRSTNAME);
         map.put(PROPERTY_NAME_billingLastname.toLowerCase(), DB_NAME_BILLING_LASTNAME);
+        map.put(PROPERTY_NAME_billingFirstnameDescription.toLowerCase(), DB_NAME_BILLING_FIRSTNAME_DESCRIPTION);
+        map.put(PROPERTY_NAME_billingLastnameDescription.toLowerCase(), DB_NAME_BILLING_LASTNAME_DESCRIPTION);
         map.put(PROPERTY_NAME_billingStreetAddress.toLowerCase(), DB_NAME_BILLING_STREET_ADDRESS);
         map.put(PROPERTY_NAME_billingSuburb.toLowerCase(), DB_NAME_BILLING_SUBURB);
         map.put(PROPERTY_NAME_billingCity.toLowerCase(), DB_NAME_BILLING_CITY);
@@ -1136,6 +1232,8 @@
         map.put(DB_NAME_CUSTOMER_GENDER, CAP_PROP_NAME_CustomerGender);
         map.put(DB_NAME_CUSTOMER_FIRSTNAME, CAP_PROP_NAME_CustomerFirstname);
         map.put(DB_NAME_CUSTOMER_LASTNAME, CAP_PROP_NAME_CustomerLastname);
+        map.put(DB_NAME_CUSTOMER_FIRSTNAME_DESCRIPTION, CAP_PROP_NAME_CustomerFirstnameDescription);
+        map.put(DB_NAME_CUSTOMER_LASTNAME_DESCRIPTION, CAP_PROP_NAME_CustomerLastnameDescription);
         map.put(DB_NAME_CUSTOMER_DAY_OF_BIRTH, CAP_PROP_NAME_CustomerDayOfBirth);
         map.put(DB_NAME_CUSTOMER_EMAIL_ADDRESS, CAP_PROP_NAME_CustomerEmailAddress);
         map.put(DB_NAME_CUSTOMER_COMPANY, CAP_PROP_NAME_CustomerCompany);
@@ -1152,6 +1250,8 @@
         map.put(DB_NAME_DELIVERY_DEPARTMENT, CAP_PROP_NAME_DeliveryDepartment);
         map.put(DB_NAME_DELIVERY_FIRSTNAME, CAP_PROP_NAME_DeliveryFirstname);
         map.put(DB_NAME_DELIVERY_LASTNAME, CAP_PROP_NAME_DeliveryLastname);
+        map.put(DB_NAME_DELIVERY_FIRSTNAME_DESCRIPTION, CAP_PROP_NAME_DeliveryFirstnameDescription);
+        map.put(DB_NAME_DELIVERY_LAST_DESCRIPTION, CAP_PROP_NAME_DeliveryLastDescription);
         map.put(DB_NAME_DELIVERY_STREET_ADDRESS, CAP_PROP_NAME_DeliveryStreetAddress);
         map.put(DB_NAME_DELIVERY_SUBURB, CAP_PROP_NAME_DeliverySuburb);
         map.put(DB_NAME_DELIVERY_CITY, CAP_PROP_NAME_DeliveryCity);
@@ -1164,6 +1264,8 @@
         map.put(DB_NAME_BILLING_DEPARTMENT, CAP_PROP_NAME_BillingDepartment);
         map.put(DB_NAME_BILLING_FIRSTNAME, CAP_PROP_NAME_BillingFirstname);
         map.put(DB_NAME_BILLING_LASTNAME, CAP_PROP_NAME_BillingLastname);
+        map.put(DB_NAME_BILLING_FIRSTNAME_DESCRIPTION, CAP_PROP_NAME_BillingFirstnameDescription);
+        map.put(DB_NAME_BILLING_LASTNAME_DESCRIPTION, CAP_PROP_NAME_BillingLastnameDescription);
         map.put(DB_NAME_BILLING_STREET_ADDRESS, CAP_PROP_NAME_BillingStreetAddress);
         map.put(DB_NAME_BILLING_SUBURB, CAP_PROP_NAME_BillingSuburb);
         map.put(DB_NAME_BILLING_CITY, CAP_PROP_NAME_BillingCity);
@@ -1209,6 +1311,8 @@
         map.put(DB_NAME_CUSTOMER_GENDER, UNCAP_PROP_NAME_customerGender);
         map.put(DB_NAME_CUSTOMER_FIRSTNAME, UNCAP_PROP_NAME_customerFirstname);
         map.put(DB_NAME_CUSTOMER_LASTNAME, UNCAP_PROP_NAME_customerLastname);
+        map.put(DB_NAME_CUSTOMER_FIRSTNAME_DESCRIPTION, UNCAP_PROP_NAME_customerFirstnameDescription);
+        map.put(DB_NAME_CUSTOMER_LASTNAME_DESCRIPTION, UNCAP_PROP_NAME_customerLastnameDescription);
         map.put(DB_NAME_CUSTOMER_DAY_OF_BIRTH, UNCAP_PROP_NAME_customerDayOfBirth);
         map.put(DB_NAME_CUSTOMER_EMAIL_ADDRESS, UNCAP_PROP_NAME_customerEmailAddress);
         map.put(DB_NAME_CUSTOMER_COMPANY, UNCAP_PROP_NAME_customerCompany);
@@ -1225,6 +1329,8 @@
         map.put(DB_NAME_DELIVERY_DEPARTMENT, UNCAP_PROP_NAME_deliveryDepartment);
         map.put(DB_NAME_DELIVERY_FIRSTNAME, UNCAP_PROP_NAME_deliveryFirstname);
         map.put(DB_NAME_DELIVERY_LASTNAME, UNCAP_PROP_NAME_deliveryLastname);
+        map.put(DB_NAME_DELIVERY_FIRSTNAME_DESCRIPTION, UNCAP_PROP_NAME_deliveryFirstnameDescription);
+        map.put(DB_NAME_DELIVERY_LAST_DESCRIPTION, UNCAP_PROP_NAME_deliveryLastDescription);
         map.put(DB_NAME_DELIVERY_STREET_ADDRESS, UNCAP_PROP_NAME_deliveryStreetAddress);
         map.put(DB_NAME_DELIVERY_SUBURB, UNCAP_PROP_NAME_deliverySuburb);
         map.put(DB_NAME_DELIVERY_CITY, UNCAP_PROP_NAME_deliveryCity);
@@ -1237,6 +1343,8 @@
         map.put(DB_NAME_BILLING_DEPARTMENT, UNCAP_PROP_NAME_billingDepartment);
         map.put(DB_NAME_BILLING_FIRSTNAME, UNCAP_PROP_NAME_billingFirstname);
         map.put(DB_NAME_BILLING_LASTNAME, UNCAP_PROP_NAME_billingLastname);
+        map.put(DB_NAME_BILLING_FIRSTNAME_DESCRIPTION, UNCAP_PROP_NAME_billingFirstnameDescription);
+        map.put(DB_NAME_BILLING_LASTNAME_DESCRIPTION, UNCAP_PROP_NAME_billingLastnameDescription);
         map.put(DB_NAME_BILLING_STREET_ADDRESS, UNCAP_PROP_NAME_billingStreetAddress);
         map.put(DB_NAME_BILLING_SUBURB, UNCAP_PROP_NAME_billingSuburb);
         map.put(DB_NAME_BILLING_CITY, UNCAP_PROP_NAME_billingCity);
@@ -1282,6 +1390,8 @@
         map.put(CAP_PROP_NAME_CustomerGender, DB_NAME_CUSTOMER_GENDER);
         map.put(CAP_PROP_NAME_CustomerFirstname, DB_NAME_CUSTOMER_FIRSTNAME);
         map.put(CAP_PROP_NAME_CustomerLastname, DB_NAME_CUSTOMER_LASTNAME);
+        map.put(CAP_PROP_NAME_CustomerFirstnameDescription, DB_NAME_CUSTOMER_FIRSTNAME_DESCRIPTION);
+        map.put(CAP_PROP_NAME_CustomerLastnameDescription, DB_NAME_CUSTOMER_LASTNAME_DESCRIPTION);
         map.put(CAP_PROP_NAME_CustomerDayOfBirth, DB_NAME_CUSTOMER_DAY_OF_BIRTH);
         map.put(CAP_PROP_NAME_CustomerEmailAddress, DB_NAME_CUSTOMER_EMAIL_ADDRESS);
         map.put(CAP_PROP_NAME_CustomerCompany, DB_NAME_CUSTOMER_COMPANY);
@@ -1298,6 +1408,8 @@
         map.put(CAP_PROP_NAME_DeliveryDepartment, DB_NAME_DELIVERY_DEPARTMENT);
         map.put(CAP_PROP_NAME_DeliveryFirstname, DB_NAME_DELIVERY_FIRSTNAME);
         map.put(CAP_PROP_NAME_DeliveryLastname, DB_NAME_DELIVERY_LASTNAME);
+        map.put(CAP_PROP_NAME_DeliveryFirstnameDescription, DB_NAME_DELIVERY_FIRSTNAME_DESCRIPTION);
+        map.put(CAP_PROP_NAME_DeliveryLastDescription, DB_NAME_DELIVERY_LAST_DESCRIPTION);
         map.put(CAP_PROP_NAME_DeliveryStreetAddress, DB_NAME_DELIVERY_STREET_ADDRESS);
         map.put(CAP_PROP_NAME_DeliverySuburb, DB_NAME_DELIVERY_SUBURB);
         map.put(CAP_PROP_NAME_DeliveryCity, DB_NAME_DELIVERY_CITY);
@@ -1310,6 +1422,8 @@
         map.put(CAP_PROP_NAME_BillingDepartment, DB_NAME_BILLING_DEPARTMENT);
         map.put(CAP_PROP_NAME_BillingFirstname, DB_NAME_BILLING_FIRSTNAME);
         map.put(CAP_PROP_NAME_BillingLastname, DB_NAME_BILLING_LASTNAME);
+        map.put(CAP_PROP_NAME_BillingFirstnameDescription, DB_NAME_BILLING_FIRSTNAME_DESCRIPTION);
+        map.put(CAP_PROP_NAME_BillingLastnameDescription, DB_NAME_BILLING_LASTNAME_DESCRIPTION);
         map.put(CAP_PROP_NAME_BillingStreetAddress, DB_NAME_BILLING_STREET_ADDRESS);
         map.put(CAP_PROP_NAME_BillingSuburb, DB_NAME_BILLING_SUBURB);
         map.put(CAP_PROP_NAME_BillingCity, DB_NAME_BILLING_CITY);
@@ -1355,6 +1469,8 @@
         map.put(CAP_PROP_NAME_CustomerGender, UNCAP_PROP_NAME_customerGender);
         map.put(CAP_PROP_NAME_CustomerFirstname, UNCAP_PROP_NAME_customerFirstname);
         map.put(CAP_PROP_NAME_CustomerLastname, UNCAP_PROP_NAME_customerLastname);
+        map.put(CAP_PROP_NAME_CustomerFirstnameDescription, UNCAP_PROP_NAME_customerFirstnameDescription);
+        map.put(CAP_PROP_NAME_CustomerLastnameDescription, UNCAP_PROP_NAME_customerLastnameDescription);
         map.put(CAP_PROP_NAME_CustomerDayOfBirth, UNCAP_PROP_NAME_customerDayOfBirth);
         map.put(CAP_PROP_NAME_CustomerEmailAddress, UNCAP_PROP_NAME_customerEmailAddress);
         map.put(CAP_PROP_NAME_CustomerCompany, UNCAP_PROP_NAME_customerCompany);
@@ -1371,6 +1487,8 @@
         map.put(CAP_PROP_NAME_DeliveryDepartment, UNCAP_PROP_NAME_deliveryDepartment);
         map.put(CAP_PROP_NAME_DeliveryFirstname, UNCAP_PROP_NAME_deliveryFirstname);
         map.put(CAP_PROP_NAME_DeliveryLastname, UNCAP_PROP_NAME_deliveryLastname);
+        map.put(CAP_PROP_NAME_DeliveryFirstnameDescription, UNCAP_PROP_NAME_deliveryFirstnameDescription);
+        map.put(CAP_PROP_NAME_DeliveryLastDescription, UNCAP_PROP_NAME_deliveryLastDescription);
         map.put(CAP_PROP_NAME_DeliveryStreetAddress, UNCAP_PROP_NAME_deliveryStreetAddress);
         map.put(CAP_PROP_NAME_DeliverySuburb, UNCAP_PROP_NAME_deliverySuburb);
         map.put(CAP_PROP_NAME_DeliveryCity, UNCAP_PROP_NAME_deliveryCity);
@@ -1383,6 +1501,8 @@
         map.put(CAP_PROP_NAME_BillingDepartment, UNCAP_PROP_NAME_billingDepartment);
         map.put(CAP_PROP_NAME_BillingFirstname, UNCAP_PROP_NAME_billingFirstname);
         map.put(CAP_PROP_NAME_BillingLastname, UNCAP_PROP_NAME_billingLastname);
+        map.put(CAP_PROP_NAME_BillingFirstnameDescription, UNCAP_PROP_NAME_billingFirstnameDescription);
+        map.put(CAP_PROP_NAME_BillingLastnameDescription, UNCAP_PROP_NAME_billingLastnameDescription);
         map.put(CAP_PROP_NAME_BillingStreetAddress, UNCAP_PROP_NAME_billingStreetAddress);
         map.put(CAP_PROP_NAME_BillingSuburb, UNCAP_PROP_NAME_billingSuburb);
         map.put(CAP_PROP_NAME_BillingCity, UNCAP_PROP_NAME_billingCity);
@@ -1428,6 +1548,8 @@
         map.put(UNCAP_PROP_NAME_customerGender, DB_NAME_CUSTOMER_GENDER);
         map.put(UNCAP_PROP_NAME_customerFirstname, DB_NAME_CUSTOMER_FIRSTNAME);
         map.put(UNCAP_PROP_NAME_customerLastname, DB_NAME_CUSTOMER_LASTNAME);
+        map.put(UNCAP_PROP_NAME_customerFirstnameDescription, DB_NAME_CUSTOMER_FIRSTNAME_DESCRIPTION);
+        map.put(UNCAP_PROP_NAME_customerLastnameDescription, DB_NAME_CUSTOMER_LASTNAME_DESCRIPTION);
         map.put(UNCAP_PROP_NAME_customerDayOfBirth, DB_NAME_CUSTOMER_DAY_OF_BIRTH);
         map.put(UNCAP_PROP_NAME_customerEmailAddress, DB_NAME_CUSTOMER_EMAIL_ADDRESS);
         map.put(UNCAP_PROP_NAME_customerCompany, DB_NAME_CUSTOMER_COMPANY);
@@ -1444,6 +1566,8 @@
         map.put(UNCAP_PROP_NAME_deliveryDepartment, DB_NAME_DELIVERY_DEPARTMENT);
         map.put(UNCAP_PROP_NAME_deliveryFirstname, DB_NAME_DELIVERY_FIRSTNAME);
         map.put(UNCAP_PROP_NAME_deliveryLastname, DB_NAME_DELIVERY_LASTNAME);
+        map.put(UNCAP_PROP_NAME_deliveryFirstnameDescription, DB_NAME_DELIVERY_FIRSTNAME_DESCRIPTION);
+        map.put(UNCAP_PROP_NAME_deliveryLastDescription, DB_NAME_DELIVERY_LAST_DESCRIPTION);
         map.put(UNCAP_PROP_NAME_deliveryStreetAddress, DB_NAME_DELIVERY_STREET_ADDRESS);
         map.put(UNCAP_PROP_NAME_deliverySuburb, DB_NAME_DELIVERY_SUBURB);
         map.put(UNCAP_PROP_NAME_deliveryCity, DB_NAME_DELIVERY_CITY);
@@ -1456,6 +1580,8 @@
         map.put(UNCAP_PROP_NAME_billingDepartment, DB_NAME_BILLING_DEPARTMENT);
         map.put(UNCAP_PROP_NAME_billingFirstname, DB_NAME_BILLING_FIRSTNAME);
         map.put(UNCAP_PROP_NAME_billingLastname, DB_NAME_BILLING_LASTNAME);
+        map.put(UNCAP_PROP_NAME_billingFirstnameDescription, DB_NAME_BILLING_FIRSTNAME_DESCRIPTION);
+        map.put(UNCAP_PROP_NAME_billingLastnameDescription, DB_NAME_BILLING_LASTNAME_DESCRIPTION);
         map.put(UNCAP_PROP_NAME_billingStreetAddress, DB_NAME_BILLING_STREET_ADDRESS);
         map.put(UNCAP_PROP_NAME_billingSuburb, DB_NAME_BILLING_SUBURB);
         map.put(UNCAP_PROP_NAME_billingCity, DB_NAME_BILLING_CITY);
@@ -1501,6 +1627,8 @@
         map.put(UNCAP_PROP_NAME_customerGender, CAP_PROP_NAME_CustomerGender);
         map.put(UNCAP_PROP_NAME_customerFirstname, CAP_PROP_NAME_CustomerFirstname);
         map.put(UNCAP_PROP_NAME_customerLastname, CAP_PROP_NAME_CustomerLastname);
+        map.put(UNCAP_PROP_NAME_customerFirstnameDescription, CAP_PROP_NAME_CustomerFirstnameDescription);
+        map.put(UNCAP_PROP_NAME_customerLastnameDescription, CAP_PROP_NAME_CustomerLastnameDescription);
         map.put(UNCAP_PROP_NAME_customerDayOfBirth, CAP_PROP_NAME_CustomerDayOfBirth);
         map.put(UNCAP_PROP_NAME_customerEmailAddress, CAP_PROP_NAME_CustomerEmailAddress);
         map.put(UNCAP_PROP_NAME_customerCompany, CAP_PROP_NAME_CustomerCompany);
@@ -1517,6 +1645,8 @@
         map.put(UNCAP_PROP_NAME_deliveryDepartment, CAP_PROP_NAME_DeliveryDepartment);
         map.put(UNCAP_PROP_NAME_deliveryFirstname, CAP_PROP_NAME_DeliveryFirstname);
         map.put(UNCAP_PROP_NAME_deliveryLastname, CAP_PROP_NAME_DeliveryLastname);
+        map.put(UNCAP_PROP_NAME_deliveryFirstnameDescription, CAP_PROP_NAME_DeliveryFirstnameDescription);
+        map.put(UNCAP_PROP_NAME_deliveryLastDescription, CAP_PROP_NAME_DeliveryLastDescription);
         map.put(UNCAP_PROP_NAME_deliveryStreetAddress, CAP_PROP_NAME_DeliveryStreetAddress);
         map.put(UNCAP_PROP_NAME_deliverySuburb, CAP_PROP_NAME_DeliverySuburb);
         map.put(UNCAP_PROP_NAME_deliveryCity, CAP_PROP_NAME_DeliveryCity);
@@ -1529,6 +1659,8 @@
         map.put(UNCAP_PROP_NAME_billingDepartment, CAP_PROP_NAME_BillingDepartment);
         map.put(UNCAP_PROP_NAME_billingFirstname, CAP_PROP_NAME_BillingFirstname);
         map.put(UNCAP_PROP_NAME_billingLastname, CAP_PROP_NAME_BillingLastname);
+        map.put(UNCAP_PROP_NAME_billingFirstnameDescription, CAP_PROP_NAME_BillingFirstnameDescription);
+        map.put(UNCAP_PROP_NAME_billingLastnameDescription, CAP_PROP_NAME_BillingLastnameDescription);
         map.put(UNCAP_PROP_NAME_billingStreetAddress, CAP_PROP_NAME_BillingStreetAddress);
         map.put(UNCAP_PROP_NAME_billingSuburb, CAP_PROP_NAME_BillingSuburb);
         map.put(UNCAP_PROP_NAME_billingCity, CAP_PROP_NAME_BillingCity);
@@ -1766,6 +1898,8 @@
         columnInfoList.add(columnCustomerGender());
         columnInfoList.add(columnCustomerFirstname());
         columnInfoList.add(columnCustomerLastname());
+        columnInfoList.add(columnCustomerFirstnameDescription());
+        columnInfoList.add(columnCustomerLastnameDescription());
         columnInfoList.add(columnCustomerDayOfBirth());
         columnInfoList.add(columnCustomerEmailAddress());
         columnInfoList.add(columnCustomerCompany());
@@ -1782,6 +1916,8 @@
         columnInfoList.add(columnDeliveryDepartment());
         columnInfoList.add(columnDeliveryFirstname());
         columnInfoList.add(columnDeliveryLastname());
+        columnInfoList.add(columnDeliveryFirstnameDescription());
+        columnInfoList.add(columnDeliveryLastDescription());
         columnInfoList.add(columnDeliveryStreetAddress());
         columnInfoList.add(columnDeliverySuburb());
         columnInfoList.add(columnDeliveryCity());
@@ -1794,6 +1930,8 @@
         columnInfoList.add(columnBillingDepartment());
         columnInfoList.add(columnBillingFirstname());
         columnInfoList.add(columnBillingLastname());
+        columnInfoList.add(columnBillingFirstnameDescription());
+        columnInfoList.add(columnBillingLastnameDescription());
         columnInfoList.add(columnBillingStreetAddress());
         columnInfoList.add(columnBillingSuburb());
         columnInfoList.add(columnBillingCity());
@@ -1872,7 +2010,7 @@
      * @deprecated Please use getColumnInfoList()
      */
     public String getColumnDbNameCommaString() {
-        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";
+        return "ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_FIRSTNAME_DESCRIPTION, CUSTOMER_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, DELIVERY_LAST_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, BILLING_LASTNAME_DESCRIPTION, 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";
     }
 
     /**
@@ -1912,6 +2050,18 @@
         return new ColumnInfo(this, "CUSTOMER_LASTNAME", "customerLastname", String.class, false);
     }
     /**
+     * @return Column information of customerFirstnameDescription. (NotNull)
+     */
+    public ColumnInfo columnCustomerFirstnameDescription() {
+        return new ColumnInfo(this, "CUSTOMER_FIRSTNAME_DESCRIPTION", "customerFirstnameDescription", String.class, false);
+    }
+    /**
+     * @return Column information of customerLastnameDescription. (NotNull)
+     */
+    public ColumnInfo columnCustomerLastnameDescription() {
+        return new ColumnInfo(this, "CUSTOMER_LASTNAME_DESCRIPTION", "customerLastnameDescription", String.class, false);
+    }
+    /**
      * @return Column information of customerDayOfBirth. (NotNull)
      */
     public ColumnInfo columnCustomerDayOfBirth() {
@@ -2008,6 +2158,18 @@
         return new ColumnInfo(this, "DELIVERY_LASTNAME", "deliveryLastname", String.class, false);
     }
     /**
+     * @return Column information of deliveryFirstnameDescription. (NotNull)
+     */
+    public ColumnInfo columnDeliveryFirstnameDescription() {
+        return new ColumnInfo(this, "DELIVERY_FIRSTNAME_DESCRIPTION", "deliveryFirstnameDescription", String.class, false);
+    }
+    /**
+     * @return Column information of deliveryLastDescription. (NotNull)
+     */
+    public ColumnInfo columnDeliveryLastDescription() {
+        return new ColumnInfo(this, "DELIVERY_LAST_DESCRIPTION", "deliveryLastDescription", String.class, false);
+    }
+    /**
      * @return Column information of deliveryStreetAddress. (NotNull)
      */
     public ColumnInfo columnDeliveryStreetAddress() {
@@ -2080,6 +2242,18 @@
         return new ColumnInfo(this, "BILLING_LASTNAME", "billingLastname", String.class, false);
     }
     /**
+     * @return Column information of billingFirstnameDescription. (NotNull)
+     */
+    public ColumnInfo columnBillingFirstnameDescription() {
+        return new ColumnInfo(this, "BILLING_FIRSTNAME_DESCRIPTION", "billingFirstnameDescription", String.class, false);
+    }
+    /**
+     * @return Column information of billingLastnameDescription. (NotNull)
+     */
+    public ColumnInfo columnBillingLastnameDescription() {
+        return new ColumnInfo(this, "BILLING_LASTNAME_DESCRIPTION", "billingLastnameDescription", String.class, false);
+    }
+    /**
      * @return Column information of billingStreetAddress. (NotNull)
      */
     public ColumnInfo columnBillingStreetAddress() {
@@ -2552,6 +2726,8 @@
         public RelationTrace columnCustomerGender() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnCustomerGender()); }
         public RelationTrace columnCustomerFirstname() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnCustomerFirstname()); }
         public RelationTrace columnCustomerLastname() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnCustomerLastname()); }
+        public RelationTrace columnCustomerFirstnameDescription() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnCustomerFirstnameDescription()); }
+        public RelationTrace columnCustomerLastnameDescription() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnCustomerLastnameDescription()); }
         public RelationTrace columnCustomerDayOfBirth() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnCustomerDayOfBirth()); }
         public RelationTrace columnCustomerEmailAddress() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnCustomerEmailAddress()); }
         public RelationTrace columnCustomerCompany() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnCustomerCompany()); }
@@ -2568,6 +2744,8 @@
         public RelationTrace columnDeliveryDepartment() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnDeliveryDepartment()); }
         public RelationTrace columnDeliveryFirstname() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnDeliveryFirstname()); }
         public RelationTrace columnDeliveryLastname() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnDeliveryLastname()); }
+        public RelationTrace columnDeliveryFirstnameDescription() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnDeliveryFirstnameDescription()); }
+        public RelationTrace columnDeliveryLastDescription() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnDeliveryLastDescription()); }
         public RelationTrace columnDeliveryStreetAddress() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnDeliveryStreetAddress()); }
         public RelationTrace columnDeliverySuburb() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnDeliverySuburb()); }
         public RelationTrace columnDeliveryCity() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnDeliveryCity()); }
@@ -2580,6 +2758,8 @@
         public RelationTrace columnBillingDepartment() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnBillingDepartment()); }
         public RelationTrace columnBillingFirstname() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnBillingFirstname()); }
         public RelationTrace columnBillingLastname() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnBillingLastname()); }
+        public RelationTrace columnBillingFirstnameDescription() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnBillingFirstnameDescription()); }
+        public RelationTrace columnBillingLastnameDescription() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnBillingLastnameDescription()); }
         public RelationTrace columnBillingStreetAddress() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnBillingStreetAddress()); }
         public RelationTrace columnBillingSuburb() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnBillingSuburb()); }
         public RelationTrace columnBillingCity() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnBillingCity()); }
@@ -2679,6 +2859,8 @@
         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)); };
         if (analyzer.init("CUSTOMER_LASTNAME", "customerLastname", "customerLastname")) { myEntity.setCustomerLastname(analyzer.analyzeString(String.class)); };
+        if (analyzer.init("CUSTOMER_FIRSTNAME_DESCRIPTION", "customerFirstnameDescription", "customerFirstnameDescription")) { myEntity.setCustomerFirstnameDescription(analyzer.analyzeString(String.class)); };
+        if (analyzer.init("CUSTOMER_LASTNAME_DESCRIPTION", "customerLastnameDescription", "customerLastnameDescription")) { myEntity.setCustomerLastnameDescription(analyzer.analyzeString(String.class)); };
         if (analyzer.init("CUSTOMER_DAY_OF_BIRTH", "customerDayOfBirth", "customerDayOfBirth")) { myEntity.setCustomerDayOfBirth(analyzer.analyzeDate(java.util.Date.class)); };
         if (analyzer.init("CUSTOMER_EMAIL_ADDRESS", "customerEmailAddress", "customerEmailAddress")) { myEntity.setCustomerEmailAddress(analyzer.analyzeString(String.class)); };
         if (analyzer.init("CUSTOMER_COMPANY", "customerCompany", "customerCompany")) { myEntity.setCustomerCompany(analyzer.analyzeString(String.class)); };
@@ -2695,6 +2877,8 @@
         if (analyzer.init("DELIVERY_DEPARTMENT", "deliveryDepartment", "deliveryDepartment")) { myEntity.setDeliveryDepartment(analyzer.analyzeString(String.class)); };
         if (analyzer.init("DELIVERY_FIRSTNAME", "deliveryFirstname", "deliveryFirstname")) { myEntity.setDeliveryFirstname(analyzer.analyzeString(String.class)); };
         if (analyzer.init("DELIVERY_LASTNAME", "deliveryLastname", "deliveryLastname")) { myEntity.setDeliveryLastname(analyzer.analyzeString(String.class)); };
+        if (analyzer.init("DELIVERY_FIRSTNAME_DESCRIPTION", "deliveryFirstnameDescription", "deliveryFirstnameDescription")) { myEntity.setDeliveryFirstnameDescription(analyzer.analyzeString(String.class)); };
+        if (analyzer.init("DELIVERY_LAST_DESCRIPTION", "deliveryLastDescription", "deliveryLastDescription")) { myEntity.setDeliveryLastDescription(analyzer.analyzeString(String.class)); };
         if (analyzer.init("DELIVERY_STREET_ADDRESS", "deliveryStreetAddress", "deliveryStreetAddress")) { myEntity.setDeliveryStreetAddress(analyzer.analyzeString(String.class)); };
         if (analyzer.init("DELIVERY_SUBURB", "deliverySuburb", "deliverySuburb")) { myEntity.setDeliverySuburb(analyzer.analyzeString(String.class)); };
         if (analyzer.init("DELIVERY_CITY", "deliveryCity", "deliveryCity")) { myEntity.setDeliveryCity(analyzer.analyzeString(String.class)); };
@@ -2707,6 +2891,8 @@
         if (analyzer.init("BILLING_DEPARTMENT", "billingDepartment", "billingDepartment")) { myEntity.setBillingDepartment(analyzer.analyzeString(String.class)); };
         if (analyzer.init("BILLING_FIRSTNAME", "billingFirstname", "billingFirstname")) { myEntity.setBillingFirstname(analyzer.analyzeString(String.class)); };
         if (analyzer.init("BILLING_LASTNAME", "billingLastname", "billingLastname")) { myEntity.setBillingLastname(analyzer.analyzeString(String.class)); };
+        if (analyzer.init("BILLING_FIRSTNAME_DESCRIPTION", "billingFirstnameDescription", "billingFirstnameDescription")) { myEntity.setBillingFirstnameDescription(analyzer.analyzeString(String.class)); };
+        if (analyzer.init("BILLING_LASTNAME_DESCRIPTION", "billingLastnameDescription", "billingLastnameDescription")) { myEntity.setBillingLastnameDescription(analyzer.analyzeString(String.class)); };
         if (analyzer.init("BILLING_STREET_ADDRESS", "billingStreetAddress", "billingStreetAddress")) { myEntity.setBillingStreetAddress(analyzer.analyzeString(String.class)); };
         if (analyzer.init("BILLING_SUBURB", "billingSuburb", "billingSuburb")) { myEntity.setBillingSuburb(analyzer.analyzeString(String.class)); };
         if (analyzer.init("BILLING_CITY", "billingCity", "billingCity")) { myEntity.setBillingCity(analyzer.analyzeString(String.class)); };
@@ -2808,6 +2994,8 @@
         helpAppendingColumnValueString(sb, delimiter, equal, "CUSTOMER_GENDER", myEntity.getCustomerGender());
         helpAppendingColumnValueString(sb, delimiter, equal, "CUSTOMER_FIRSTNAME", myEntity.getCustomerFirstname());
         helpAppendingColumnValueString(sb, delimiter, equal, "CUSTOMER_LASTNAME", myEntity.getCustomerLastname());
+        helpAppendingColumnValueString(sb, delimiter, equal, "CUSTOMER_FIRSTNAME_DESCRIPTION", myEntity.getCustomerFirstnameDescription());
+        helpAppendingColumnValueString(sb, delimiter, equal, "CUSTOMER_LASTNAME_DESCRIPTION", myEntity.getCustomerLastnameDescription());
         helpAppendingColumnValueString(sb, delimiter, equal, "CUSTOMER_DAY_OF_BIRTH", myEntity.getCustomerDayOfBirth());
         helpAppendingColumnValueString(sb, delimiter, equal, "CUSTOMER_EMAIL_ADDRESS", myEntity.getCustomerEmailAddress());
         helpAppendingColumnValueString(sb, delimiter, equal, "CUSTOMER_COMPANY", myEntity.getCustomerCompany());
@@ -2824,6 +3012,8 @@
         helpAppendingColumnValueString(sb, delimiter, equal, "DELIVERY_DEPARTMENT", myEntity.getDeliveryDepartment());
         helpAppendingColumnValueString(sb, delimiter, equal, "DELIVERY_FIRSTNAME", myEntity.getDeliveryFirstname());
         helpAppendingColumnValueString(sb, delimiter, equal, "DELIVERY_LASTNAME", myEntity.getDeliveryLastname());
+        helpAppendingColumnValueString(sb, delimiter, equal, "DELIVERY_FIRSTNAME_DESCRIPTION", myEntity.getDeliveryFirstnameDescription());
+        helpAppendingColumnValueString(sb, delimiter, equal, "DELIVERY_LAST_DESCRIPTION", myEntity.getDeliveryLastDescription());
         helpAppendingColumnValueString(sb, delimiter, equal, "DELIVERY_STREET_ADDRESS", myEntity.getDeliveryStreetAddress());
         helpAppendingColumnValueString(sb, delimiter, equal, "DELIVERY_SUBURB", myEntity.getDeliverySuburb());
         helpAppendingColumnValueString(sb, delimiter, equal, "DELIVERY_CITY", myEntity.getDeliveryCity());
@@ -2836,6 +3026,8 @@
         helpAppendingColumnValueString(sb, delimiter, equal, "BILLING_DEPARTMENT", myEntity.getBillingDepartment());
         helpAppendingColumnValueString(sb, delimiter, equal, "BILLING_FIRSTNAME", myEntity.getBillingFirstname());
         helpAppendingColumnValueString(sb, delimiter, equal, "BILLING_LASTNAME", myEntity.getBillingLastname());
+        helpAppendingColumnValueString(sb, delimiter, equal, "BILLING_FIRSTNAME_DESCRIPTION", myEntity.getBillingFirstnameDescription());
+        helpAppendingColumnValueString(sb, delimiter, equal, "BILLING_LASTNAME_DESCRIPTION", myEntity.getBillingLastnameDescription());
         helpAppendingColumnValueString(sb, delimiter, equal, "BILLING_STREET_ADDRESS", myEntity.getBillingStreetAddress());
         helpAppendingColumnValueString(sb, delimiter, equal, "BILLING_SUBURB", myEntity.getBillingSuburb());
         helpAppendingColumnValueString(sb, delimiter, equal, "BILLING_CITY", myEntity.getBillingCity());
@@ -2919,6 +3111,8 @@
         valueMap.put("CUSTOMER_GENDER", myEntity.getCustomerGender());
         valueMap.put("CUSTOMER_FIRSTNAME", myEntity.getCustomerFirstname());
         valueMap.put("CUSTOMER_LASTNAME", myEntity.getCustomerLastname());
+        valueMap.put("CUSTOMER_FIRSTNAME_DESCRIPTION", myEntity.getCustomerFirstnameDescription());
+        valueMap.put("CUSTOMER_LASTNAME_DESCRIPTION", myEntity.getCustomerLastnameDescription());
         valueMap.put("CUSTOMER_DAY_OF_BIRTH", myEntity.getCustomerDayOfBirth());
         valueMap.put("CUSTOMER_EMAIL_ADDRESS", myEntity.getCustomerEmailAddress());
         valueMap.put("CUSTOMER_COMPANY", myEntity.getCustomerCompany());
@@ -2935,6 +3129,8 @@
         valueMap.put("DELIVERY_DEPARTMENT", myEntity.getDeliveryDepartment());
         valueMap.put("DELIVERY_FIRSTNAME", myEntity.getDeliveryFirstname());
         valueMap.put("DELIVERY_LASTNAME", myEntity.getDeliveryLastname());
+        valueMap.put("DELIVERY_FIRSTNAME_DESCRIPTION", myEntity.getDeliveryFirstnameDescription());
+        valueMap.put("DELIVERY_LAST_DESCRIPTION", myEntity.getDeliveryLastDescription());
         valueMap.put("DELIVERY_STREET_ADDRESS", myEntity.getDeliveryStreetAddress());
         valueMap.put("DELIVERY_SUBURB", myEntity.getDeliverySuburb());
         valueMap.put("DELIVERY_CITY", myEntity.getDeliveryCity());
@@ -2947,6 +3143,8 @@
         valueMap.put("BILLING_DEPARTMENT", myEntity.getBillingDepartment());
         valueMap.put("BILLING_FIRSTNAME", myEntity.getBillingFirstname());
         valueMap.put("BILLING_LASTNAME", myEntity.getBillingLastname());
+        valueMap.put("BILLING_FIRSTNAME_DESCRIPTION", myEntity.getBillingFirstnameDescription());
+        valueMap.put("BILLING_LASTNAME_DESCRIPTION", myEntity.getBillingLastnameDescription());
         valueMap.put("BILLING_STREET_ADDRESS", myEntity.getBillingStreetAddress());
         valueMap.put("BILLING_SUBURB", myEntity.getBillingSuburb());
         valueMap.put("BILLING_CITY", myEntity.getBillingCity());
@@ -2998,6 +3196,8 @@
         valueMap.put("CUSTOMER_GENDER", helpGettingColumnStringValue(myEntity.getCustomerGender()));
         valueMap.put("CUSTOMER_FIRSTNAME", helpGettingColumnStringValue(myEntity.getCustomerFirstname()));
         valueMap.put("CUSTOMER_LASTNAME", helpGettingColumnStringValue(myEntity.getCustomerLastname()));
+        valueMap.put("CUSTOMER_FIRSTNAME_DESCRIPTION", helpGettingColumnStringValue(myEntity.getCustomerFirstnameDescription()));
+        valueMap.put("CUSTOMER_LASTNAME_DESCRIPTION", helpGettingColumnStringValue(myEntity.getCustomerLastnameDescription()));
         valueMap.put("CUSTOMER_DAY_OF_BIRTH", helpGettingColumnStringValue(myEntity.getCustomerDayOfBirth()));
         valueMap.put("CUSTOMER_EMAIL_ADDRESS", helpGettingColumnStringValue(myEntity.getCustomerEmailAddress()));
         valueMap.put("CUSTOMER_COMPANY", helpGettingColumnStringValue(myEntity.getCustomerCompany()));
@@ -3014,6 +3214,8 @@
         valueMap.put("DELIVERY_DEPARTMENT", helpGettingColumnStringValue(myEntity.getDeliveryDepartment()));
         valueMap.put("DELIVERY_FIRSTNAME", helpGettingColumnStringValue(myEntity.getDeliveryFirstname()));
         valueMap.put("DELIVERY_LASTNAME", helpGettingColumnStringValue(myEntity.getDeliveryLastname()));
+        valueMap.put("DELIVERY_FIRSTNAME_DESCRIPTION", helpGettingColumnStringValue(myEntity.getDeliveryFirstnameDescription()));
+        valueMap.put("DELIVERY_LAST_DESCRIPTION", helpGettingColumnStringValue(myEntity.getDeliveryLastDescription()));
         valueMap.put("DELIVERY_STREET_ADDRESS", helpGettingColumnStringValue(myEntity.getDeliveryStreetAddress()));
         valueMap.put("DELIVERY_SUBURB", helpGettingColumnStringValue(myEntity.getDeliverySuburb()));
         valueMap.put("DELIVERY_CITY", helpGettingColumnStringValue(myEntity.getDeliveryCity()));
@@ -3026,6 +3228,8 @@
         valueMap.put("BILLING_DEPARTMENT", helpGettingColumnStringValue(myEntity.getBillingDepartment()));
         valueMap.put("BILLING_FIRSTNAME", helpGettingColumnStringValue(myEntity.getBillingFirstname()));
         valueMap.put("BILLING_LASTNAME", helpGettingColumnStringValue(myEntity.getBillingLastname()));
+        valueMap.put("BILLING_FIRSTNAME_DESCRIPTION", helpGettingColumnStringValue(myEntity.getBillingFirstnameDescription()));
+        valueMap.put("BILLING_LASTNAME_DESCRIPTION", helpGettingColumnStringValue(myEntity.getBillingLastnameDescription()));
         valueMap.put("BILLING_STREET_ADDRESS", helpGettingColumnStringValue(myEntity.getBillingStreetAddress()));
         valueMap.put("BILLING_SUBURB", helpGettingColumnStringValue(myEntity.getBillingSuburb()));
         valueMap.put("BILLING_CITY", helpGettingColumnStringValue(myEntity.getBillingCity()));
@@ -3073,9 +3277,9 @@
     public String getPreparedInsertClause(PreparedInsertClauseOption preparedInsertClauseOption) {
         if (preparedInsertClauseOption.getTablePrefix() != null) {
             final String tablePrefix = preparedInsertClauseOption.getTablePrefix();
-            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 " + tablePrefix + "ORDER_FORM(ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_FIRSTNAME_DESCRIPTION, CUSTOMER_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, DELIVERY_LAST_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, BILLING_LASTNAME_DESCRIPTION, 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, 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, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_FIRSTNAME_DESCRIPTION, CUSTOMER_LASTNAME_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, DELIVERY_LAST_DESCRIPTION, 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_FIRSTNAME_DESCRIPTION, BILLING_LASTNAME_DESCRIPTION, 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-30 13:20:43 UTC (rev 598)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderProductDbm.java	2007-10-01 13:00:14 UTC (rev 599)
@@ -16,7 +16,7 @@
  *     ORDER_PRODUCT_ID
  * 
  * [column-property]
- *     ORDER_PRODUCT_ID, ORDER_FORM_ID, PRODUCT_ID, MODEL, PRICE, FINAL_PRICE, TAX, QUANTITY
+ *     ORDER_PRODUCT_ID, ORDER_FORM_ID, PRODUCT_ID, CODE, MODEL, PRICE, FINAL_PRICE, TAX, QUANTITY
  * 
  * [foreign-property]
  *     orderForm, product
@@ -99,6 +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 CODE. VARCHAR(64) */
+    public static final String DB_NAME_CODE = "CODE";
     /** Db-name of MODEL. VARCHAR(64) */
     public static final String DB_NAME_MODEL = "MODEL";
     /** Db-name of PRICE. DECIMAL(15) : NotNull */
@@ -116,6 +118,8 @@
     public static final String COLUMN_DB_NAME_OF_OrderFormId = "ORDER_FORM_ID";
     /** @deprecated Deprecated! So use DB_NAME_ProductId. */
     public static final String COLUMN_DB_NAME_OF_ProductId = "PRODUCT_ID";
+    /** @deprecated Deprecated! So use DB_NAME_Code. */
+    public static final String COLUMN_DB_NAME_OF_Code = "CODE";
     /** @deprecated Deprecated! So use DB_NAME_Model. */
     public static final String COLUMN_DB_NAME_OF_Model = "MODEL";
     /** @deprecated Deprecated! So use DB_NAME_Price. */
@@ -136,6 +140,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 code. VARCHAR(64) */
+    public static final String PROPERTY_NAME_code = "code";
     /** Prop-name(JavaBeansRule) of model. VARCHAR(64) */
     public static final String PROPERTY_NAME_model = "model";
     /** Prop-name(JavaBeansRule) of price. DECIMAL(15) : NotNull */
@@ -156,6 +162,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 code. VARCHAR(64) */
+    public static final String CAP_PROP_NAME_Code = "Code";
     /** Cap-prop-name of model. VARCHAR(64) */
     public static final String CAP_PROP_NAME_Model = "Model";
     /** Cap-prop-name of price. DECIMAL(15) : NotNull */
@@ -173,6 +181,8 @@
     public static final String COLUMN_CAP_PROP_NAME_OF_OrderFormId = "OrderFormId";
     /** @deprecated Deprecated! So use CAP_PROP_NAME_ProductId. */
     public static final String COLUMN_CAP_PROP_NAME_OF_ProductId = "ProductId";
+    /** @deprecated Deprecated! So use CAP_PROP_NAME_Code. */
+    public static final String COLUMN_CAP_PROP_NAME_OF_Code = "Code";
     /** @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_Price. */
@@ -193,6 +203,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 code. VARCHAR(64) */
+    public static final String UNCAP_PROP_NAME_code = "code";
     /** Uncap-prop-name of model. VARCHAR(64) */
     public static final String UNCAP_PROP_NAME_model = "model";
     /** Uncap-prop-name of price. DECIMAL(15) : NotNull */
@@ -210,6 +222,8 @@
     public static final String COLUMN_UNCAP_PROP_NAME_OF_OrderFormId = "orderFormId";
     /** @deprecated Deprecated! So use UNCAP_PROP_NAME_ProductId. */
     public static final String COLUMN_UNCAP_PROP_NAME_OF_ProductId = "productId";
+    /** @deprecated Deprecated! So use UNCAP_PROP_NAME_Code. */
+    public static final String COLUMN_UNCAP_PROP_NAME_OF_Code = "code";
     /** @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_Price. */
@@ -255,6 +269,7 @@
         map.put(DB_NAME_ORDER_PRODUCT_ID.toLowerCase(), PROPERTY_NAME_orderProductId);
         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_CODE.toLowerCase(), PROPERTY_NAME_code);
         map.put(DB_NAME_MODEL.toLowerCase(), PROPERTY_NAME_model);
         map.put(DB_NAME_PRICE.toLowerCase(), PROPERTY_NAME_price);
         map.put(DB_NAME_FINAL_PRICE.toLowerCase(), PROPERTY_NAME_finalPrice);
@@ -277,6 +292,7 @@
         map.put(PROPERTY_NAME_orderProductId.toLowerCase(), DB_NAME_ORDER_PRODUCT_ID);
         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_code.toLowerCase(), DB_NAME_CODE);
         map.put(PROPERTY_NAME_model.toLowerCase(), DB_NAME_MODEL);
         map.put(PROPERTY_NAME_price.toLowerCase(), DB_NAME_PRICE);
         map.put(PROPERTY_NAME_finalPrice.toLowerCase(), DB_NAME_FINAL_PRICE);
@@ -301,6 +317,7 @@
         map.put(DB_NAME_ORDER_PRODUCT_ID, CAP_PROP_NAME_OrderProductId);
         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_CODE, CAP_PROP_NAME_Code);
         map.put(DB_NAME_MODEL, CAP_PROP_NAME_Model);
         map.put(DB_NAME_PRICE, CAP_PROP_NAME_Price);
         map.put(DB_NAME_FINAL_PRICE, CAP_PROP_NAME_FinalPrice);
@@ -325,6 +342,7 @@
         map.put(DB_NAME_ORDER_PRODUCT_ID, UNCAP_PROP_NAME_orderProductId);
         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_CODE, UNCAP_PROP_NAME_code);
         map.put(DB_NAME_MODEL, UNCAP_PROP_NAME_model);
         map.put(DB_NAME_PRICE, UNCAP_PROP_NAME_price);
         map.put(DB_NAME_FINAL_PRICE, UNCAP_PROP_NAME_finalPrice);
@@ -349,6 +367,7 @@
         map.put(CAP_PROP_NAME_OrderProductId, DB_NAME_ORDER_PRODUCT_ID);
         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_Code, DB_NAME_CODE);
         map.put(CAP_PROP_NAME_Model, DB_NAME_MODEL);
         map.put(CAP_PROP_NAME_Price, DB_NAME_PRICE);
         map.put(CAP_PROP_NAME_FinalPrice, DB_NAME_FINAL_PRICE);
@@ -373,6 +392,7 @@
         map.put(CAP_PROP_NAME_OrderProductId, UNCAP_PROP_NAME_orderProductId);
         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_Code, UNCAP_PROP_NAME_code);
         map.put(CAP_PROP_NAME_Model, UNCAP_PROP_NAME_model);
         map.put(CAP_PROP_NAME_Price, UNCAP_PROP_NAME_price);
         map.put(CAP_PROP_NAME_FinalPrice, UNCAP_PROP_NAME_finalPrice);
@@ -397,6 +417,7 @@
         map.put(UNCAP_PROP_NAME_orderProductId, DB_NAME_ORDER_PRODUCT_ID);
         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_code, DB_NAME_CODE);
         map.put(UNCAP_PROP_NAME_model, DB_NAME_MODEL);
         map.put(UNCAP_PROP_NAME_price, DB_NAME_PRICE);
         map.put(UNCAP_PROP_NAME_finalPrice, DB_NAME_FINAL_PRICE);
@@ -421,6 +442,7 @@
         map.put(UNCAP_PROP_NAME_orderProductId, CAP_PROP_NAME_OrderProductId);
         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_code, CAP_PROP_NAME_Code);
         map.put(UNCAP_PROP_NAME_model, CAP_PROP_NAME_Model);
         map.put(UNCAP_PROP_NAME_price, CAP_PROP_NAME_Price);
         map.put(UNCAP_PROP_NAME_finalPrice, CAP_PROP_NAME_FinalPrice);
@@ -637,6 +659,7 @@
         columnInfoList.add(columnOrderProductId());
         columnInfoList.add(columnOrderFormId());
         columnInfoList.add(columnProductId());
+        columnInfoList.add(columnCode());
         columnInfoList.add(columnModel());
         columnInfoList.add(columnPrice());
         columnInfoList.add(columnFinalPrice());
@@ -697,7 +720,7 @@
      * @deprecated Please use getColumnInfoList()
      */
     public String getColumnDbNameCommaString() {
-        return "ORDER_PRODUCT_ID, ORDER_FORM_ID, PRODUCT_ID, MODEL, PRICE, FINAL_PRICE, TAX, QUANTITY";
+        return "ORDER_PRODUCT_ID, ORDER_FORM_ID, PRODUCT_ID, CODE, MODEL, PRICE, FINAL_PRICE, TAX, QUANTITY";
     }
 
     /**
@@ -719,6 +742,12 @@
         return new ColumnInfo(this, "PRODUCT_ID", "productId", java.math.BigDecimal.class, false);
     }
     /**
+     * @return Column information of code. (NotNull)
+     */
+    public ColumnInfo columnCode() {
+        return new ColumnInfo(this, "CODE", "code", String.class, false);
+    }
+    /**
      * @return Column information of model. (NotNull)
      */
     public ColumnInfo columnModel() {
@@ -891,6 +920,7 @@
         public RelationTrace columnOrderProductId() { return fixTrace(_relationList, OrderProductDbm.getInstance().columnOrderProductId()); }
         public RelationTrace columnOrderFormId() { return fixTrace(_relationList, OrderProductDbm.getInstance().columnOrderFormId()); }
         public RelationTrace columnProductId() { return fixTrace(_relationList, OrderProductDbm.getInstance().columnProductId()); }
+        public RelationTrace columnCode() { return fixTrace(_relationList, OrderProductDbm.getInstance().columnCode()); }
         public RelationTrace columnModel() { return fixTrace(_relationList, OrderProductDbm.getInstance().columnModel()); }
         public RelationTrace columnPrice() { return fixTrace(_relationList, OrderProductDbm.getInstance().columnPrice()); }
         public RelationTrace columnFinalPrice() { return fixTrace(_relationList, OrderProductDbm.getInstance().columnFinalPrice()); }
@@ -969,6 +999,7 @@
         if (analyzer.init("ORDER_PRODUCT_ID", "orderProductId", "orderProductId")) { myEntity.setOrderProductId(analyzer.analyzeNumber(java.math.BigDecimal.class)); };
         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("CODE", "code", "code")) { myEntity.setCode(analyzer.analyzeString(String.class)); };
         if (analyzer.init("MODEL", "model", "model")) { myEntity.setModel(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)); };
@@ -1049,6 +1080,7 @@
         helpAppendingColumnValueString(sb, delimiter, equal, "ORDER_PRODUCT_ID", myEntity.getOrderProductId());
         helpAppendingColumnValueString(sb, delimiter, equal, "ORDER_FORM_ID", myEntity.getOrderFormId());
         helpAppendingColumnValueString(sb, delimiter, equal, "PRODUCT_ID", myEntity.getProductId());
+        helpAppendingColumnValueString(sb, delimiter, equal, "CODE", myEntity.getCode());
         helpAppendingColumnValueString(sb, delimiter, equal, "MODEL", myEntity.getModel());
         helpAppendingColumnValueString(sb, delimiter, equal, "PRICE", myEntity.getPrice());
         helpAppendingColumnValueString(sb, delimiter, equal, "FINAL_PRICE", myEntity.getFinalPrice());
@@ -1111,6 +1143,7 @@
         valueMap.put("ORDER_PRODUCT_ID", myEntity.getOrderProductId());
         valueMap.put("ORDER_FORM_ID", myEntity.getOrderFormId());
         valueMap.put("PRODUCT_ID", myEntity.getProductId());
+        valueMap.put("CODE", myEntity.getCode());
         valueMap.put("MODEL", myEntity.getModel());
         valueMap.put("PRICE", myEntity.getPrice());
         valueMap.put("FINAL_PRICE", myEntity.getFinalPrice());
@@ -1141,6 +1174,7 @@
         valueMap.put("ORDER_PRODUCT_ID", helpGettingColumnStringValue(myEntity.getOrderProductId()));
         valueMap.put("ORDER_FORM_ID", helpGettingColumnStringValue(myEntity.getOrderFormId()));
         valueMap.put("PRODUCT_ID", helpGettingColumnStringValue(myEntity.getProductId()));
+        valueMap.put("CODE", helpGettingColumnStringValue(myEntity.getCode()));
         valueMap.put("MODEL", helpGettingColumnStringValue(myEntity.getModel()));
         valueMap.put("PRICE", helpGettingColumnStringValue(myEntity.getPrice()));
         valueMap.put("FINAL_PRICE", helpGettingColumnStringValue(myEntity.getFinalPrice()));
@@ -1170,9 +1204,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, PRICE, FINAL_PRICE, TAX, QUANTITY) values(? , ? , ? , ? , ? , ? , ? , ? )";
+            return "insert into " + tablePrefix + "ORDER_PRODUCT(ORDER_PRODUCT_ID, ORDER_FORM_ID, PRODUCT_ID, CODE, MODEL, 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(? , ? , ? , ? , ? , ? , ? , ? )";
+        return "insert into ORDER_PRODUCT(ORDER_PRODUCT_ID, ORDER_FORM_ID, PRODUCT_ID, CODE, MODEL, PRICE, FINAL_PRICE, TAX, QUANTITY) values(? , ? , ? , ? , ? , ? , ? , ? , ? )";
     }
 
     // ===================================================================================

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsAddressBookCQ.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsAddressBookCQ.java	2007-09-30 13:20:43 UTC (rev 598)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsAddressBookCQ.java	2007-10-01 13:00:14 UTC (rev 599)
@@ -881,6 +881,322 @@
 
     abstract protected ConditionValue getCValueLastname();
       
+    /** Column db name of firstnameDescription. */
+    protected static final String COL_FIRSTNAME_DESCRIPTION = "FIRSTNAME_DESCRIPTION";
+
+    /** Column java name of firstnameDescription. */
+    protected static final String J_FirstnameDescription = "FirstnameDescription";
+
+    /** Column uncapitalised java name of firstnameDescription. */
+    protected static final String UJ_firstnameDescription = "firstnameDescription";
+    
+    /**
+     * Set the value of firstnameDescription using equal. { = }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param firstnameDescription The value of firstnameDescription as equal.
+     */
+    public void setFirstnameDescription_Equal(String firstnameDescription) {
+        registerFirstnameDescription(ConditionKey.CK_EQUAL, filterRemoveEmptyString(firstnameDescription));
+    }
+                  
+    /**
+     * Set the value of firstnameDescription using notEqual. { != }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param firstnameDescription The value of firstnameDescription as notEqual.
+     */
+    public void setFirstnameDescription_NotEqual(String firstnameDescription) {
+        registerFirstnameDescription(ConditionKey.CK_NOT_EQUAL, filterRemoveEmptyString(firstnameDescription));
+    }
+            
+    /**
+     * Set the value of firstnameDescription using greaterThan. { &gt; }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param firstnameDescription The value of firstnameDescription as greaterThan.
+     */
+    public void setFirstnameDescription_GreaterThan(String firstnameDescription) {
+        registerFirstnameDescription(ConditionKey.CK_GREATER_THAN, filterRemoveEmptyString(firstnameDescription));
+    }
+            
+    /**
+     * Set the value of firstnameDescription using lessThan. { &lt; }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param firstnameDescription The value of firstnameDescription as lessThan.
+     */
+    public void setFirstnameDescription_LessThan(String firstnameDescription) {
+        registerFirstnameDescription(ConditionKey.CK_LESS_THAN, filterRemoveEmptyString(firstnameDescription));
+    }
+            
+    /**
+     * Set the value of firstnameDescription using greaterEqual. { &gt;= }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param firstnameDescription The value of firstnameDescription as greaterEqual.
+     */
+    public void setFirstnameDescription_GreaterEqual(String firstnameDescription) {
+        registerFirstnameDescription(ConditionKey.CK_GREATER_EQUAL, filterRemoveEmptyString(firstnameDescription));
+    }
+            
+    /**
+     * Set the value of firstnameDescription using lessEqual. { &lt;= }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param firstnameDescription The value of firstnameDescription as lessEqual.
+     */
+    public void setFirstnameDescription_LessEqual(String firstnameDescription) {
+        registerFirstnameDescription(ConditionKey.CK_LESS_EQUAL, filterRemoveEmptyString(firstnameDescription));
+    }
+            
+    /**
+     * Set the value of firstnameDescription using prefixSearch. { like 'xxx%' }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param firstnameDescription The value of firstnameDescription as prefixSearch.
+     */
+    public void setFirstnameDescription_PrefixSearch(String firstnameDescription) {
+        registerFirstnameDescription(ConditionKey.CK_PREFIX_SEARCH, filterRemoveEmptyString(firstnameDescription));
+    }
+            
+    /**
+     * Set the value of firstnameDescription 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 firstnameDescription The value of firstnameDescription as likeSearch.
+     * @param likeSearchOption The option of like-search. (NotNull)
+     */
+    public void setFirstnameDescription_LikeSearch(String firstnameDescription, jp.sf.pal.pompei.allcommon.cbean.coption.LikeSearchOption likeSearchOption) {
+        registerLikeSearchQuery(ConditionKey.CK_LIKE_SEARCH, filterRemoveEmptyString(firstnameDescription), getCValueFirstnameDescription(), COL_FIRSTNAME_DESCRIPTION, J_FirstnameDescription, UJ_firstnameDescription, likeSearchOption);
+    }
+            
+    /**
+     * Set the value of firstnameDescription using inScope. { in ('a', 'b') }
+     * If the element in the list is null or empty-string, the condition-element is ignored.
+     * 
+     * @param firstnameDescriptionList The value of firstnameDescription as inScope.
+     */
+    public void setFirstnameDescription_InScope(java.util.List<String> firstnameDescriptionList) {
+        registerFirstnameDescription(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyStringFromList(firstnameDescriptionList));
+    }
+
+    /**
+     * Set the value of firstnameDescription using inScope. { in ('a', 'b') }
+     * If the element in the list is null or empty-string, the condition-element is ignored.
+     * 
+     * @param firstnameDescription The value of firstnameDescription as inScope.
+     * @param inScopeOption The option of in-scope. (NotNull)
+     */
+    public void setFirstnameDescription_InScope(String firstnameDescription, jp.sf.pal.pompei.allcommon.cbean.coption.InScopeOption inScopeOption) {
+        registerInScopeQuery(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyString(firstnameDescription), getCValueFirstnameDescription(), COL_FIRSTNAME_DESCRIPTION, J_FirstnameDescription, UJ_firstnameDescription, inScopeOption);
+    }
+            
+    /**
+     * Set the value of firstnameDescription using notInScope. { not in ('a', 'b') }
+     * If the element in the list is null or empty-string, the condition-element is ignored.
+     * 
+     * @param firstnameDescriptionList The value of firstnameDescription as notInScope.
+     */
+    public void setFirstnameDescription_NotInScope(java.util.List<String> firstnameDescriptionList) {
+        registerFirstnameDescription(ConditionKey.CK_NOT_IN_SCOPE, filterRemoveEmptyStringFromList(firstnameDescriptionList));
+    }
+                                                
+    /**
+     * Set the value of firstnameDescription using isNull. { is null }
+     */
+    public void setFirstnameDescription_IsNull() {
+        registerFirstnameDescription(ConditionKey.CK_IS_NULL, DUMMY_OBJECT);
+    }
+
+    /**
+     * Set the value of firstnameDescription using isNotNull. { is not null }
+     */
+    public void setFirstnameDescription_IsNotNull() {
+        registerFirstnameDescription(ConditionKey.CK_IS_NOT_NULL, DUMMY_OBJECT);
+    }
+        
+    /**
+     * Register condition of firstnameDescription.
+     * 
+     * @param key Condition key. (NotNull)
+     * @param value The value of firstnameDescription. (Nullable)
+     */
+    protected void registerFirstnameDescription(ConditionKey key, Object value) {
+        registerQuery(key, value, getCValueFirstnameDescription(), COL_FIRSTNAME_DESCRIPTION, J_FirstnameDescription, UJ_firstnameDescription);
+    }
+
+    /**
+     * Register inline condition of firstnameDescription.
+     * 
+     * @param key Condition key. (NotNull)
+     * @param value The value of firstnameDescription. (Nullable)
+     */
+    protected void registerInlineFirstnameDescription(ConditionKey key, Object value) {
+        registerInlineQuery(key, value, getCValueFirstnameDescription(), COL_FIRSTNAME_DESCRIPTION, J_FirstnameDescription, UJ_firstnameDescription);
+    }
+
+    abstract protected ConditionValue getCValueFirstnameDescription();
+      
+    /** Column db name of lastnameDescription. */
+    protected static final String COL_LASTNAME_DESCRIPTION = "LASTNAME_DESCRIPTION";
+
+    /** Column java name of lastnameDescription. */
+    protected static final String J_LastnameDescription = "LastnameDescription";
+
+    /** Column uncapitalised java name of lastnameDescription. */
+    protected static final String UJ_lastnameDescription = "lastnameDescription";
+    
+    /**
+     * Set the value of lastnameDescription using equal. { = }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param lastnameDescription The value of lastnameDescription as equal.
+     */
+    public void setLastnameDescription_Equal(String lastnameDescription) {
+        registerLastnameDescription(ConditionKey.CK_EQUAL, filterRemoveEmptyString(lastnameDescription));
+    }
+                  
+    /**
+     * Set the value of lastnameDescription using notEqual. { != }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param lastnameDescription The value of lastnameDescription as notEqual.
+     */
+    public void setLastnameDescription_NotEqual(String lastnameDescription) {
+        registerLastnameDescription(ConditionKey.CK_NOT_EQUAL, filterRemoveEmptyString(lastnameDescription));
+    }
+            
+    /**
+     * Set the value of lastnameDescription using greaterThan. { &gt; }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param lastnameDescription The value of lastnameDescription as greaterThan.
+     */
+    public void setLastnameDescription_GreaterThan(String lastnameDescription) {
+        registerLastnameDescription(ConditionKey.CK_GREATER_THAN, filterRemoveEmptyString(lastnameDescription));
+    }
+            
+    /**
+     * Set the value of lastnameDescription using lessThan. { &lt; }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param lastnameDescription The value of lastnameDescription as lessThan.
+     */
+    public void setLastnameDescription_LessThan(String lastnameDescription) {
+        registerLastnameDescription(ConditionKey.CK_LESS_THAN, filterRemoveEmptyString(lastnameDescription));
+    }
+            
+    /**
+     * Set the value of lastnameDescription using greaterEqual. { &gt;= }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param lastnameDescription The value of lastnameDescription as greaterEqual.
+     */
+    public void setLastnameDescription_GreaterEqual(String lastnameDescription) {
+        registerLastnameDescription(ConditionKey.CK_GREATER_EQUAL, filterRemoveEmptyString(lastnameDescription));
+    }
+            
+    /**
+     * Set the value of lastnameDescription using lessEqual. { &lt;= }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param lastnameDescription The value of lastnameDescription as lessEqual.
+     */
+    public void setLastnameDescription_LessEqual(String lastnameDescription) {
+        registerLastnameDescription(ConditionKey.CK_LESS_EQUAL, filterRemoveEmptyString(lastnameDescription));
+    }
+            
+    /**
+     * Set the value of lastnameDescription using prefixSearch. { like 'xxx%' }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param lastnameDescription The value of lastnameDescription as prefixSearch.
+     */
+    public void setLastnameDescription_PrefixSearch(String lastnameDescription) {
+        registerLastnameDescription(ConditionKey.CK_PREFIX_SEARCH, filterRemoveEmptyString(lastnameDescription));
+    }
+            
+    /**
+     * Set the value of lastnameDescription 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 lastnameDescription The value of lastnameDescription as likeSearch.
+     * @param likeSearchOption The option of like-search. (NotNull)
+     */
+    public void setLastnameDescription_LikeSearch(String lastnameDescription, jp.sf.pal.pompei.allcommon.cbean.coption.LikeSearchOption likeSearchOption) {
+        registerLikeSearchQuery(ConditionKey.CK_LIKE_SEARCH, filterRemoveEmptyString(lastnameDescription), getCValueLastnameDescription(), COL_LASTNAME_DESCRIPTION, J_LastnameDescription, UJ_lastnameDescription, likeSearchOption);
+    }
+            
+    /**
+     * Set the value of lastnameDescription using inScope. { in ('a', 'b') }
+     * If the element in the list is null or empty-string, the condition-element is ignored.
+     * 
+     * @param lastnameDescriptionList The value of lastnameDescription as inScope.
+     */
+    public void setLastnameDescription_InScope(java.util.List<String> lastnameDescriptionList) {
+        registerLastnameDescription(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyStringFromList(lastnameDescriptionList));
+    }
+
+    /**
+     * Set the value of lastnameDescription using inScope. { in ('a', 'b') }
+     * If the element in the list is null or empty-string, the condition-element is ignored.
+     * 
+     * @param lastnameDescription The value of lastnameDescription as inScope.
+     * @param inScopeOption The option of in-scope. (NotNull)
+     */
+    public void setLastnameDescription_InScope(String lastnameDescription, jp.sf.pal.pompei.allcommon.cbean.coption.InScopeOption inScopeOption) {
+        registerInScopeQuery(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyString(lastnameDescription), getCValueLastnameDescription(), COL_LASTNAME_DESCRIPTION, J_LastnameDescription, UJ_lastnameDescription, inScopeOption);
+    }
+            
+    /**
+     * Set the value of lastnameDescription using notInScope. { not in ('a', 'b') }
+     * If the element in the list is null or empty-string, the condition-element is ignored.
+     * 
+     * @param lastnameDescriptionList The value of lastnameDescription as notInScope.
+     */
+    public void setLastnameDescription_NotInScope(java.util.List<String> lastnameDescriptionList) {
+        registerLastnameDescription(ConditionKey.CK_NOT_IN_SCOPE, filterRemoveEmptyStringFromList(lastnameDescriptionList));
+    }
+                                                
+    /**
+     * Set the value of lastnameDescription using isNull. { is null }
+     */
+    public void setLastnameDescription_IsNull() {
+        registerLastnameDescription(ConditionKey.CK_IS_NULL, DUMMY_OBJECT);
+    }
+
+    /**
+     * Set the value of lastnameDescription using isNotNull. { is not null }
+     */
+    public void setLastnameDescription_IsNotNull() {
+        registerLastnameDescription(ConditionKey.CK_IS_NOT_NULL, DUMMY_OBJECT);
+    }
+        
+    /**
+     * Register condition of lastnameDescription.
+     * 
+     * @param key Condition key. (NotNull)
+     * @param value The value of lastnameDescription. (Nullable)
+     */
+    protected void registerLastnameDescription(ConditionKey key, Object value) {
+        registerQuery(key, value, getCValueLastnameDescription(), COL_LASTNAME_DESCRIPTION, J_LastnameDescription, UJ_lastnameDescription);
+    }
+
+    /**
+     * Register inline condition of lastnameDescription.
+     * 
+     * @param key Condition key. (NotNull)
+     * @param value The value of lastnameDescription. (Nullable)
+     */
+    protected void registerInlineLastnameDescription(ConditionKey key, Object value) {
+        registerInlineQuery(key, value, getCValueLastnameDescription(), COL_LASTNAME_DESCRIPTION, J_LastnameDescription, UJ_lastnameDescription);
+    }
+
+    abstract protected ConditionValue getCValueLastnameDescription();
+      
     /** Column db name of streetAddress. */
     protected static final String COL_STREET_ADDRESS = "STREET_ADDRESS";
 

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsCustomerCQ.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsCustomerCQ.java	2007-09-30 13:20:43 UTC (rev 598)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsCustomerCQ.java	2007-10-01 13:00:14 UTC (rev 599)
@@ -935,6 +935,322 @@
 
     abstract protected ConditionValue getCValueLastname();
       
+    /** Column db name of firstnameDescription. */
+    protected static final String COL_FIRSTNAME_DESCRIPTION = "FIRSTNAME_DESCRIPTION";
+
+    /** Column java name of firstnameDescription. */
+    protected static final String J_FirstnameDescription = "FirstnameDescription";
+
+    /** Column uncapitalised java name of firstnameDescription. */
+    protected static final String UJ_firstnameDescription = "firstnameDescription";
+    
+    /**
+     * Set the value of firstnameDescription using equal. { = }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param firstnameDescription The value of firstnameDescription as equal.
+     */
+    public void setFirstnameDescription_Equal(String firstnameDescription) {
+        registerFirstnameDescription(ConditionKey.CK_EQUAL, filterRemoveEmptyString(firstnameDescription));
+    }
+                  
+    /**
+     * Set the value of firstnameDescription using notEqual. { != }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param firstnameDescription The value of firstnameDescription as notEqual.
+     */
+    public void setFirstnameDescription_NotEqual(String firstnameDescription) {
+        registerFirstnameDescription(ConditionKey.CK_NOT_EQUAL, filterRemoveEmptyString(firstnameDescription));
+    }
+            
+    /**
+     * Set the value of firstnameDescription using greaterThan. { &gt; }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param firstnameDescription The value of firstnameDescription as greaterThan.
+     */
+    public void setFirstnameDescription_GreaterThan(String firstnameDescription) {
+        registerFirstnameDescription(ConditionKey.CK_GREATER_THAN, filterRemoveEmptyString(firstnameDescription));
+    }
+            
+    /**
+     * Set the value of firstnameDescription using lessThan. { &lt; }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param firstnameDescription The value of firstnameDescription as lessThan.
+     */
+    public void setFirstnameDescription_LessThan(String firstnameDescription) {
+        registerFirstnameDescription(ConditionKey.CK_LESS_THAN, filterRemoveEmptyString(firstnameDescription));
+    }
+            
+    /**
+     * Set the value of firstnameDescription using greaterEqual. { &gt;= }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param firstnameDescription The value of firstnameDescription as greaterEqual.
+     */
+    public void setFirstnameDescription_GreaterEqual(String firstnameDescription) {
+        registerFirstnameDescription(ConditionKey.CK_GREATER_EQUAL, filterRemoveEmptyString(firstnameDescription));
+    }
+            
+    /**
+     * Set the value of firstnameDescription using lessEqual. { &lt;= }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param firstnameDescription The value of firstnameDescription as lessEqual.
+     */
+    public void setFirstnameDescription_LessEqual(String firstnameDescription) {
+        registerFirstnameDescription(ConditionKey.CK_LESS_EQUAL, filterRemoveEmptyString(firstnameDescription));
+    }
+            
+    /**
+     * Set the value of firstnameDescription using prefixSearch. { like 'xxx%' }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param firstnameDescription The value of firstnameDescription as prefixSearch.
+     */
+    public void setFirstnameDescription_PrefixSearch(String firstnameDescription) {
+        registerFirstnameDescription(ConditionKey.CK_PREFIX_SEARCH, filterRemoveEmptyString(firstnameDescription));
+    }
+            
+    /**
+     * Set the value of firstnameDescription 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 firstnameDescription The value of firstnameDescription as likeSearch.
+     * @param likeSearchOption The option of like-search. (NotNull)
+     */
+    public void setFirstnameDescription_LikeSearch(String firstnameDescription, jp.sf.pal.pompei.allcommon.cbean.coption.LikeSearchOption likeSearchOption) {
+        registerLikeSearchQuery(ConditionKey.CK_LIKE_SEARCH, filterRemoveEmptyString(firstnameDescription), getCValueFirstnameDescription(), COL_FIRSTNAME_DESCRIPTION, J_FirstnameDescription, UJ_firstnameDescription, likeSearchOption);
+    }
+            
+    /**
+     * Set the value of firstnameDescription using inScope. { in ('a', 'b') }
+     * If the element in the list is null or empty-string, the condition-element is ignored.
+     * 
+     * @param firstnameDescriptionList The value of firstnameDescription as inScope.
+     */
+    public void setFirstnameDescription_InScope(java.util.List<String> firstnameDescriptionList) {
+        registerFirstnameDescription(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyStringFromList(firstnameDescriptionList));
+    }
+
+    /**
+     * Set the value of firstnameDescription using inScope. { in ('a', 'b') }
+     * If the element in the list is null or empty-string, the condition-element is ignored.
+     * 
+     * @param firstnameDescription The value of firstnameDescription as inScope.
+     * @param inScopeOption The option of in-scope. (NotNull)
+     */
+    public void setFirstnameDescription_InScope(String firstnameDescription, jp.sf.pal.pompei.allcommon.cbean.coption.InScopeOption inScopeOption) {
+        registerInScopeQuery(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyString(firstnameDescription), getCValueFirstnameDescription(), COL_FIRSTNAME_DESCRIPTION, J_FirstnameDescription, UJ_firstnameDescription, inScopeOption);
+    }
+            
+    /**
+     * Set the value of firstnameDescription using notInScope. { not in ('a', 'b') }
+     * If the element in the list is null or empty-string, the condition-element is ignored.
+     * 
+     * @param firstnameDescriptionList The value of firstnameDescription as notInScope.
+     */
+    public void setFirstnameDescription_NotInScope(java.util.List<String> firstnameDescriptionList) {
+        registerFirstnameDescription(ConditionKey.CK_NOT_IN_SCOPE, filterRemoveEmptyStringFromList(firstnameDescriptionList));
+    }
+                                                
+    /**
+     * Set the value of firstnameDescription using isNull. { is null }
+     */
+    public void setFirstnameDescription_IsNull() {
+        registerFirstnameDescription(ConditionKey.CK_IS_NULL, DUMMY_OBJECT);
+    }
+
+    /**
+     * Set the value of firstnameDescription using isNotNull. { is not null }
+     */
+    public void setFirstnameDescription_IsNotNull() {
+        registerFirstnameDescription(ConditionKey.CK_IS_NOT_NULL, DUMMY_OBJECT);
+    }
+        
+    /**
+     * Register condition of firstnameDescription.
+     * 
+     * @param key Condition key. (NotNull)
+     * @param value The value of firstnameDescription. (Nullable)
+     */
+    protected void registerFirstnameDescription(ConditionKey key, Object value) {
+        registerQuery(key, value, getCValueFirstnameDescription(), COL_FIRSTNAME_DESCRIPTION, J_FirstnameDescription, UJ_firstnameDescription);
+    }
+
+    /**
+     * Register inline condition of firstnameDescription.
+     * 
+     * @param key Condition key. (NotNull)
+     * @param value The value of firstnameDescription. (Nullable)
+     */
+    protected void registerInlineFirstnameDescription(ConditionKey key, Object value) {
+        registerInlineQuery(key, value, getCValueFirstnameDescription(), COL_FIRSTNAME_DESCRIPTION, J_FirstnameDescription, UJ_firstnameDescription);
+    }
+
+    abstract protected ConditionValue getCValueFirstnameDescription();
+      
+    /** Column db name of lastnameDescription. */
+    protected static final String COL_LASTNAME_DESCRIPTION = "LASTNAME_DESCRIPTION";
+
+    /** Column java name of lastnameDescription. */
+    protected static final String J_LastnameDescription = "LastnameDescription";
+
+    /** Column uncapitalised java name of lastnameDescription. */
+    protected static final String UJ_lastnameDescription = "lastnameDescription";
+    
+    /**
+     * Set the value of lastnameDescription using equal. { = }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param lastnameDescription The value of lastnameDescription as equal.
+     */
+    public void setLastnameDescription_Equal(String lastnameDescription) {
+        registerLastnameDescription(ConditionKey.CK_EQUAL, filterRemoveEmptyString(lastnameDescription));
+    }
+                  
+    /**
+     * Set the value of lastnameDescription using notEqual. { != }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param lastnameDescription The value of lastnameDescription as notEqual.
+     */
+    public void setLastnameDescription_NotEqual(String lastnameDescription) {
+        registerLastnameDescription(ConditionKey.CK_NOT_EQUAL, filterRemoveEmptyString(lastnameDescription));
+    }
+            
+    /**
+     * Set the value of lastnameDescription using greaterThan. { &gt; }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param lastnameDescription The value of lastnameDescription as greaterThan.
+     */
+    public void setLastnameDescription_GreaterThan(String lastnameDescription) {
+        registerLastnameDescription(ConditionKey.CK_GREATER_THAN, filterRemoveEmptyString(lastnameDescription));
+    }
+            
+    /**
+     * Set the value of lastnameDescription using lessThan. { &lt; }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param lastnameDescription The value of lastnameDescription as lessThan.
+     */
+    public void setLastnameDescription_LessThan(String lastnameDescription) {
+        registerLastnameDescription(ConditionKey.CK_LESS_THAN, filterRemoveEmptyString(lastnameDescription));
+    }
+            
+    /**
+     * Set the value of lastnameDescription using greaterEqual. { &gt;= }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param lastnameDescription The value of lastnameDescription as greaterEqual.
+     */
+    public void setLastnameDescription_GreaterEqual(String lastnameDescription) {
+        registerLastnameDescription(ConditionKey.CK_GREATER_EQUAL, filterRemoveEmptyString(lastnameDescription));
+    }
+            
+    /**
+     * Set the value of lastnameDescription using lessEqual. { &lt;= }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param lastnameDescription The value of lastnameDescription as lessEqual.
+     */
+    public void setLastnameDescription_LessEqual(String lastnameDescription) {
+        registerLastnameDescription(ConditionKey.CK_LESS_EQUAL, filterRemoveEmptyString(lastnameDescription));
+    }
+            
+    /**
+     * Set the value of lastnameDescription using prefixSearch. { like 'xxx%' }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param lastnameDescription The value of lastnameDescription as prefixSearch.
+     */
+    public void setLastnameDescription_PrefixSearch(String lastnameDescription) {
+        registerLastnameDescription(ConditionKey.CK_PREFIX_SEARCH, filterRemoveEmptyString(lastnameDescription));
+    }
+            
+    /**
+     * Set the value of lastnameDescription 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 lastnameDescription The value of lastnameDescription as likeSearch.
+     * @param likeSearchOption The option of like-search. (NotNull)
+     */
+    public void setLastnameDescription_LikeSearch(String lastnameDescription, jp.sf.pal.pompei.allcommon.cbean.coption.LikeSearchOption likeSearchOption) {
+        registerLikeSearchQuery(ConditionKey.CK_LIKE_SEARCH, filterRemoveEmptyString(lastnameDescription), getCValueLastnameDescription(), COL_LASTNAME_DESCRIPTION, J_LastnameDescription, UJ_lastnameDescription, likeSearchOption);
+    }
+            
+    /**
+     * Set the value of lastnameDescription using inScope. { in ('a', 'b') }
+     * If the element in the list is null or empty-string, the condition-element is ignored.
+     * 
+     * @param lastnameDescriptionList The value of lastnameDescription as inScope.
+     */
+    public void setLastnameDescription_InScope(java.util.List<String> lastnameDescriptionList) {
+        registerLastnameDescription(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyStringFromList(lastnameDescriptionList));
+    }
+
+    /**
+     * Set the value of lastnameDescription using inScope. { in ('a', 'b') }
+     * If the element in the list is null or empty-string, the condition-element is ignored.
+     * 
+     * @param lastnameDescription The value of lastnameDescription as inScope.
+     * @param inScopeOption The option of in-scope. (NotNull)
+     */
+    public void setLastnameDescription_InScope(String lastnameDescription, jp.sf.pal.pompei.allcommon.cbean.coption.InScopeOption inScopeOption) {
+        registerInScopeQuery(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyString(lastnameDescription), getCValueLastnameDescription(), COL_LASTNAME_DESCRIPTION, J_LastnameDescription, UJ_lastnameDescription, inScopeOption);
+    }
+            
+    /**
+     * Set the value of lastnameDescription using notInScope. { not in ('a', 'b') }
+     * If the element in the list is null or empty-string, the condition-element is ignored.
+     * 
+     * @param lastnameDescriptionList The value of lastnameDescription as notInScope.
+     */
+    public void setLastnameDescription_NotInScope(java.util.List<String> lastnameDescriptionList) {
+        registerLastnameDescription(ConditionKey.CK_NOT_IN_SCOPE, filterRemoveEmptyStringFromList(lastnameDescriptionList));
+    }
+                                                
+    /**
+     * Set the value of lastnameDescription using isNull. { is null }
+     */
+    public void setLastnameDescription_IsNull() {
+        registerLastnameDescription(ConditionKey.CK_IS_NULL, DUMMY_OBJECT);
+    }
+
+    /**
+     * Set the value of lastnameDescription using isNotNull. { is not null }
+     */
+    public void setLastnameDescription_IsNotNull() {
+        registerLastnameDescription(ConditionKey.CK_IS_NOT_NULL, DUMMY_OBJECT);
+    }
+        
+    /**
+     * Register condition of lastnameDescription.
+     * 
+     * @param key Condition key. (NotNull)
+     * @param value The value of lastnameDescription. (Nullable)
+     */
+    protected void registerLastnameDescription(ConditionKey key, Object value) {
+        registerQuery(key, value, getCValueLastnameDescription(), COL_LASTNAME_DESCRIPTION, J_LastnameDescription, UJ_lastnameDescription);
+    }
+
+    /**
+     * Register inline condition of lastnameDescription.
+     * 
+     * @param key Condition key. (NotNull)
+     * @param value The value of lastnameDescription. (Nullable)
+     */
+    protected void registerInlineLastnameDescription(ConditionKey key, Object value) {
+        registerInlineQuery(key, value, getCValueLastnameDescription(), COL_LASTNAME_DESCRIPTION, J_LastnameDescription, UJ_lastnameDescription);
+    }
+
+    abstract protected ConditionValue getCValueLastnameDescription();
+      
     /** Column db name of nickname. */
     protected static final String COL_NICKNAME = "NICKNAME";
 

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-30 13:20:43 UTC (rev 598)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsOrderFormCQ.java	2007-10-01 13:00:14 UTC (rev 599)
@@ -1037,6 +1037,322 @@
 
     abstract protected ConditionValue getCValueCustomerLastname();
       
+    /** Column db name of customerFirstnameDescription. */
+    protected static final String COL_CUSTOMER_FIRSTNAME_DESCRIPTION = "CUSTOMER_FIRSTNAME_DESCRIPTION";
+
+    /** Column java name of customerFirstnameDescription. */
+    protected static final String J_CustomerFirstnameDescription = "CustomerFirstnameDescription";
+
+    /** Column uncapitalised java name of customerFirstnameDescription. */
+    protected static final String UJ_customerFirstnameDescription = "customerFirstnameDescription";
+    
+    /**
+     * Set the value of customerFirstnameDescription using equal. { = }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param customerFirstnameDescription The value of customerFirstnameDescription as equal.
+     */
+    public void setCustomerFirstnameDescription_Equal(String customerFirstnameDescription) {
+        registerCustomerFirstnameDescription(ConditionKey.CK_EQUAL, filterRemoveEmptyString(customerFirstnameDescription));
+    }
+                  
+    /**
+     * Set the value of customerFirstnameDescription using notEqual. { != }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param customerFirstnameDescription The value of customerFirstnameDescription as notEqual.
+     */
+    public void setCustomerFirstnameDescription_NotEqual(String customerFirstnameDescription) {
+        registerCustomerFirstnameDescription(ConditionKey.CK_NOT_EQUAL, filterRemoveEmptyString(customerFirstnameDescription));
+    }
+            
+    /**
+     * Set the value of customerFirstnameDescription using greaterThan. { &gt; }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param customerFirstnameDescription The value of customerFirstnameDescription as greaterThan.
+     */
+    public void setCustomerFirstnameDescription_GreaterThan(String customerFirstnameDescription) {
+        registerCustomerFirstnameDescription(ConditionKey.CK_GREATER_THAN, filterRemoveEmptyString(customerFirstnameDescription));
+    }
+            
+    /**
+     * Set the value of customerFirstnameDescription using lessThan. { &lt; }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param customerFirstnameDescription The value of customerFirstnameDescription as lessThan.
+     */
+    public void setCustomerFirstnameDescription_LessThan(String customerFirstnameDescription) {
+        registerCustomerFirstnameDescription(ConditionKey.CK_LESS_THAN, filterRemoveEmptyString(customerFirstnameDescription));
+    }
+            
+    /**
+     * Set the value of customerFirstnameDescription using greaterEqual. { &gt;= }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param customerFirstnameDescription The value of customerFirstnameDescription as greaterEqual.
+     */
+    public void setCustomerFirstnameDescription_GreaterEqual(String customerFirstnameDescription) {
+        registerCustomerFirstnameDescription(ConditionKey.CK_GREATER_EQUAL, filterRemoveEmptyString(customerFirstnameDescription));
+    }
+            
+    /**
+     * Set the value of customerFirstnameDescription using lessEqual. { &lt;= }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param customerFirstnameDescription The value of customerFirstnameDescription as lessEqual.
+     */
+    public void setCustomerFirstnameDescription_LessEqual(String customerFirstnameDescription) {
+        registerCustomerFirstnameDescription(ConditionKey.CK_LESS_EQUAL, filterRemoveEmptyString(customerFirstnameDescription));
+    }
+            
+    /**
+     * Set the value of customerFirstnameDescription using prefixSearch. { like 'xxx%' }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param customerFirstnameDescription The value of customerFirstnameDescription as prefixSearch.
+     */
+    public void setCustomerFirstnameDescription_PrefixSearch(String customerFirstnameDescription) {
+        registerCustomerFirstnameDescription(ConditionKey.CK_PREFIX_SEARCH, filterRemoveEmptyString(customerFirstnameDescription));
+    }
+            
+    /**
+     * Set the value of customerFirstnameDescription 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 customerFirstnameDescription The value of customerFirstnameDescription as likeSearch.
+     * @param likeSearchOption The option of like-search. (NotNull)
+     */
+    public void setCustomerFirstnameDescription_LikeSearch(String customerFirstnameDescription, jp.sf.pal.pompei.allcommon.cbean.coption.LikeSearchOption likeSearchOption) {
+        registerLikeSearchQuery(ConditionKey.CK_LIKE_SEARCH, filterRemoveEmptyString(customerFirstnameDescription), getCValueCustomerFirstnameDescription(), COL_CUSTOMER_FIRSTNAME_DESCRIPTION, J_CustomerFirstnameDescription, UJ_customerFirstnameDescription, likeSearchOption);
+    }
+            
+    /**
+     * Set the value of customerFirstnameDescription using inScope. { in ('a', 'b') }
+     * If the element in the list is null or empty-string, the condition-element is ignored.
+     * 
+     * @param customerFirstnameDescriptionList The value of customerFirstnameDescription as inScope.
+     */
+    public void setCustomerFirstnameDescription_InScope(java.util.List<String> customerFirstnameDescriptionList) {
+        registerCustomerFirstnameDescription(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyStringFromList(customerFirstnameDescriptionList));
+    }
+
+    /**
+     * Set the value of customerFirstnameDescription using inScope. { in ('a', 'b') }
+     * If the element in the list is null or empty-string, the condition-element is ignored.
+     * 
+     * @param customerFirstnameDescription The value of customerFirstnameDescription as inScope.
+     * @param inScopeOption The option of in-scope. (NotNull)
+     */
+    public void setCustomerFirstnameDescription_InScope(String customerFirstnameDescription, jp.sf.pal.pompei.allcommon.cbean.coption.InScopeOption inScopeOption) {
+        registerInScopeQuery(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyString(customerFirstnameDescription), getCValueCustomerFirstnameDescription(), COL_CUSTOMER_FIRSTNAME_DESCRIPTION, J_CustomerFirstnameDescription, UJ_customerFirstnameDescription, inScopeOption);
+    }
+            
+    /**
+     * Set the value of customerFirstnameDescription using notInScope. { not in ('a', 'b') }
+     * If the element in the list is null or empty-string, the condition-element is ignored.
+     * 
+     * @param customerFirstnameDescriptionList The value of customerFirstnameDescription as notInScope.
+     */
+    public void setCustomerFirstnameDescription_NotInScope(java.util.List<String> customerFirstnameDescriptionList) {
+        registerCustomerFirstnameDescription(ConditionKey.CK_NOT_IN_SCOPE, filterRemoveEmptyStringFromList(customerFirstnameDescriptionList));
+    }
+                                                
+    /**
+     * Set the value of customerFirstnameDescription using isNull. { is null }
+     */
+    public void setCustomerFirstnameDescription_IsNull() {
+        registerCustomerFirstnameDescription(ConditionKey.CK_IS_NULL, DUMMY_OBJECT);
+    }
+
+    /**
+     * Set the value of customerFirstnameDescription using isNotNull. { is not null }
+     */
+    public void setCustomerFirstnameDescription_IsNotNull() {
+        registerCustomerFirstnameDescription(ConditionKey.CK_IS_NOT_NULL, DUMMY_OBJECT);
+    }
+        
+    /**
+     * Register condition of customerFirstnameDescription.
+     * 
+     * @param key Condition key. (NotNull)
+     * @param value The value of customerFirstnameDescription. (Nullable)
+     */
+    protected void registerCustomerFirstnameDescription(ConditionKey key, Object value) {
+        registerQuery(key, value, getCValueCustomerFirstnameDescription(), COL_CUSTOMER_FIRSTNAME_DESCRIPTION, J_CustomerFirstnameDescription, UJ_customerFirstnameDescription);
+    }
+
+    /**
+     * Register inline condition of customerFirstnameDescription.
+     * 
+     * @param key Condition key. (NotNull)
+     * @param value The value of customerFirstnameDescription. (Nullable)
+     */
+    protected void registerInlineCustomerFirstnameDescription(ConditionKey key, Object value) {
+        registerInlineQuery(key, value, getCValueCustomerFirstnameDescription(), COL_CUSTOMER_FIRSTNAME_DESCRIPTION, J_CustomerFirstnameDescription, UJ_customerFirstnameDescription);
+    }
+
+    abstract protected ConditionValue getCValueCustomerFirstnameDescription();
+      
+    /** Column db name of customerLastnameDescription. */
+    protected static final String COL_CUSTOMER_LASTNAME_DESCRIPTION = "CUSTOMER_LASTNAME_DESCRIPTION";
+
+    /** Column java name of customerLastnameDescription. */
+    protected static final String J_CustomerLastnameDescription = "CustomerLastnameDescription";
+
+    /** Column uncapitalised java name of customerLastnameDescription. */
+    protected static final String UJ_customerLastnameDescription = "customerLastnameDescription";
+    
+    /**
+     * Set the value of customerLastnameDescription using equal. { = }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param customerLastnameDescription The value of customerLastnameDescription as equal.
+     */
+    public void setCustomerLastnameDescription_Equal(String customerLastnameDescription) {
+        registerCustomerLastnameDescription(ConditionKey.CK_EQUAL, filterRemoveEmptyString(customerLastnameDescription));
+    }
+                  
+    /**
+     * Set the value of customerLastnameDescription using notEqual. { != }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param customerLastnameDescription The value of customerLastnameDescription as notEqual.
+     */
+    public void setCustomerLastnameDescription_NotEqual(String customerLastnameDescription) {
+        registerCustomerLastnameDescription(ConditionKey.CK_NOT_EQUAL, filterRemoveEmptyString(customerLastnameDescription));
+    }
+            
+    /**
+     * Set the value of customerLastnameDescription using greaterThan. { &gt; }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param customerLastnameDescription The value of customerLastnameDescription as greaterThan.
+     */
+    public void setCustomerLastnameDescription_GreaterThan(String customerLastnameDescription) {
+        registerCustomerLastnameDescription(ConditionKey.CK_GREATER_THAN, filterRemoveEmptyString(customerLastnameDescription));
+    }
+            
+    /**
+     * Set the value of customerLastnameDescription using lessThan. { &lt; }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param customerLastnameDescription The value of customerLastnameDescription as lessThan.
+     */
+    public void setCustomerLastnameDescription_LessThan(String customerLastnameDescription) {
+        registerCustomerLastnameDescription(ConditionKey.CK_LESS_THAN, filterRemoveEmptyString(customerLastnameDescription));
+    }
+            
+    /**
+     * Set the value of customerLastnameDescription using greaterEqual. { &gt;= }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param customerLastnameDescription The value of customerLastnameDescription as greaterEqual.
+     */
+    public void setCustomerLastnameDescription_GreaterEqual(String customerLastnameDescription) {
+        registerCustomerLastnameDescription(ConditionKey.CK_GREATER_EQUAL, filterRemoveEmptyString(customerLastnameDescription));
+    }
+            
+    /**
+     * Set the value of customerLastnameDescription using lessEqual. { &lt;= }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param customerLastnameDescription The value of customerLastnameDescription as lessEqual.
+     */
+    public void setCustomerLastnameDescription_LessEqual(String customerLastnameDescription) {
+        registerCustomerLastnameDescription(ConditionKey.CK_LESS_EQUAL, filterRemoveEmptyString(customerLastnameDescription));
+    }
+            
+    /**
+     * Set the value of customerLastnameDescription using prefixSearch. { like 'xxx%' }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param customerLastnameDescription The value of customerLastnameDescription as prefixSearch.
+     */
+    public void setCustomerLastnameDescription_PrefixSearch(String customerLastnameDescription) {
+        registerCustomerLastnameDescription(ConditionKey.CK_PREFIX_SEARCH, filterRemoveEmptyString(customerLastnameDescription));
+    }
+            
+    /**
+     * Set the value of customerLastnameDescription 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 customerLastnameDescription The value of customerLastnameDescription as likeSearch.
+     * @param likeSearchOption The option of like-search. (NotNull)
+     */
+    public void setCustomerLastnameDescription_LikeSearch(String customerLastnameDescription, jp.sf.pal.pompei.allcommon.cbean.coption.LikeSearchOption likeSearchOption) {
+        registerLikeSearchQuery(ConditionKey.CK_LIKE_SEARCH, filterRemoveEmptyString(customerLastnameDescription), getCValueCustomerLastnameDescription(), COL_CUSTOMER_LASTNAME_DESCRIPTION, J_CustomerLastnameDescription, UJ_customerLastnameDescription, likeSearchOption);
+    }
+            
+    /**
+     * Set the value of customerLastnameDescription using inScope. { in ('a', 'b') }
+     * If the element in the list is null or empty-string, the condition-element is ignored.
+     * 
+     * @param customerLastnameDescriptionList The value of customerLastnameDescription as inScope.
+     */
+    public void setCustomerLastnameDescription_InScope(java.util.List<String> customerLastnameDescriptionList) {
+        registerCustomerLastnameDescription(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyStringFromList(customerLastnameDescriptionList));
+    }
+
+    /**
+     * Set the value of customerLastnameDescription using inScope. { in ('a', 'b') }
+     * If the element in the list is null or empty-string, the condition-element is ignored.
+     * 
+     * @param customerLastnameDescription The value of customerLastnameDescription as inScope.
+     * @param inScopeOption The option of in-scope. (NotNull)
+     */
+    public void setCustomerLastnameDescription_InScope(String customerLastnameDescription, jp.sf.pal.pompei.allcommon.cbean.coption.InScopeOption inScopeOption) {
+        registerInScopeQuery(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyString(customerLastnameDescription), getCValueCustomerLastnameDescription(), COL_CUSTOMER_LASTNAME_DESCRIPTION, J_CustomerLastnameDescription, UJ_customerLastnameDescription, inScopeOption);
+    }
+            
+    /**
+     * Set the value of customerLastnameDescription using notInScope. { not in ('a', 'b') }
+     * If the element in the list is null or empty-string, the condition-element is ignored.
+     * 
+     * @param customerLastnameDescriptionList The value of customerLastnameDescription as notInScope.
+     */
+    public void setCustomerLastnameDescription_NotInScope(java.util.List<String> customerLastnameDescriptionList) {
+        registerCustomerLastnameDescription(ConditionKey.CK_NOT_IN_SCOPE, filterRemoveEmptyStringFromList(customerLastnameDescriptionList));
+    }
+                                                
+    /**
+     * Set the value of customerLastnameDescription using isNull. { is null }
+     */
+    public void setCustomerLastnameDescription_IsNull() {
+        registerCustomerLastnameDescription(ConditionKey.CK_IS_NULL, DUMMY_OBJECT);
+    }
+
+    /**
+     * Set the value of customerLastnameDescription using isNotNull. { is not null }
+     */
+    public void setCustomerLastnameDescription_IsNotNull() {
+        registerCustomerLastnameDescription(ConditionKey.CK_IS_NOT_NULL, DUMMY_OBJECT);
+    }
+        
+    /**
+     * Register condition of customerLastnameDescription.
+     * 
+     * @param key Condition key. (NotNull)
+     * @param value The value of customerLastnameDescription. (Nullable)
+     */
+    protected void registerCustomerLastnameDescription(ConditionKey key, Object value) {
+        registerQuery(key, value, getCValueCustomerLastnameDescription(), COL_CUSTOMER_LASTNAME_DESCRIPTION, J_CustomerLastnameDescription, UJ_customerLastnameDescription);
+    }
+
+    /**
+     * Register inline condition of customerLastnameDescription.
+     * 
+     * @param key Condition key. (NotNull)
+     * @param value The value of customerLastnameDescription. (Nullable)
+     */
+    protected void registerInlineCustomerLastnameDescription(ConditionKey key, Object value) {
+        registerInlineQuery(key, value, getCValueCustomerLastnameDescription(), COL_CUSTOMER_LASTNAME_DESCRIPTION, J_CustomerLastnameDescription, UJ_customerLastnameDescription);
+    }
+
+    abstract protected ConditionValue getCValueCustomerLastnameDescription();
+      
     /** Column db name of customerDayOfBirth. */
     protected static final String COL_CUSTOMER_DAY_OF_BIRTH = "CUSTOMER_DAY_OF_BIRTH";
 
@@ -3391,6 +3707,322 @@
 
     abstract protected ConditionValue getCValueDeliveryLastname();
       
+    /** Column db name of deliveryFirstnameDescription. */
+    protected static final String COL_DELIVERY_FIRSTNAME_DESCRIPTION = "DELIVERY_FIRSTNAME_DESCRIPTION";
+
+    /** Column java name of deliveryFirstnameDescription. */
+    protected static final String J_DeliveryFirstnameDescription = "DeliveryFirstnameDescription";
+
+    /** Column uncapitalised java name of deliveryFirstnameDescription. */
+    protected static final String UJ_deliveryFirstnameDescription = "deliveryFirstnameDescription";
+    
+    /**
+     * Set the value of deliveryFirstnameDescription using equal. { = }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param deliveryFirstnameDescription The value of deliveryFirstnameDescription as equal.
+     */
+    public void setDeliveryFirstnameDescription_Equal(String deliveryFirstnameDescription) {
+        registerDeliveryFirstnameDescription(ConditionKey.CK_EQUAL, filterRemoveEmptyString(deliveryFirstnameDescription));
+    }
+                  
+    /**
+     * Set the value of deliveryFirstnameDescription using notEqual. { != }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param deliveryFirstnameDescription The value of deliveryFirstnameDescription as notEqual.
+     */
+    public void setDeliveryFirstnameDescription_NotEqual(String deliveryFirstnameDescription) {
+        registerDeliveryFirstnameDescription(ConditionKey.CK_NOT_EQUAL, filterRemoveEmptyString(deliveryFirstnameDescription));
+    }
+            
+    /**
+     * Set the value of deliveryFirstnameDescription using greaterThan. { &gt; }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param deliveryFirstnameDescription The value of deliveryFirstnameDescription as greaterThan.
+     */
+    public void setDeliveryFirstnameDescription_GreaterThan(String deliveryFirstnameDescription) {
+        registerDeliveryFirstnameDescription(ConditionKey.CK_GREATER_THAN, filterRemoveEmptyString(deliveryFirstnameDescription));
+    }
+            
+    /**
+     * Set the value of deliveryFirstnameDescription using lessThan. { &lt; }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param deliveryFirstnameDescription The value of deliveryFirstnameDescription as lessThan.
+     */
+    public void setDeliveryFirstnameDescription_LessThan(String deliveryFirstnameDescription) {
+        registerDeliveryFirstnameDescription(ConditionKey.CK_LESS_THAN, filterRemoveEmptyString(deliveryFirstnameDescription));
+    }
+            
+    /**
+     * Set the value of deliveryFirstnameDescription using greaterEqual. { &gt;= }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param deliveryFirstnameDescription The value of deliveryFirstnameDescription as greaterEqual.
+     */
+    public void setDeliveryFirstnameDescription_GreaterEqual(String deliveryFirstnameDescription) {
+        registerDeliveryFirstnameDescription(ConditionKey.CK_GREATER_EQUAL, filterRemoveEmptyString(deliveryFirstnameDescription));
+    }
+            
+    /**
+     * Set the value of deliveryFirstnameDescription using lessEqual. { &lt;= }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param deliveryFirstnameDescription The value of deliveryFirstnameDescription as lessEqual.
+     */
+    public void setDeliveryFirstnameDescription_LessEqual(String deliveryFirstnameDescription) {
+        registerDeliveryFirstnameDescription(ConditionKey.CK_LESS_EQUAL, filterRemoveEmptyString(deliveryFirstnameDescription));
+    }
+            
+    /**
+     * Set the value of deliveryFirstnameDescription using prefixSearch. { like 'xxx%' }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param deliveryFirstnameDescription The value of deliveryFirstnameDescription as prefixSearch.
+     */
+    public void setDeliveryFirstnameDescription_PrefixSearch(String deliveryFirstnameDescription) {
+        registerDeliveryFirstnameDescription(ConditionKey.CK_PREFIX_SEARCH, filterRemoveEmptyString(deliveryFirstnameDescription));
+    }
+            
+    /**
+     * Set the value of deliveryFirstnameDescription 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 deliveryFirstnameDescription The value of deliveryFirstnameDescription as likeSearch.
+     * @param likeSearchOption The option of like-search. (NotNull)
+     */
+    public void setDeliveryFirstnameDescription_LikeSearch(String deliveryFirstnameDescription, jp.sf.pal.pompei.allcommon.cbean.coption.LikeSearchOption likeSearchOption) {
+        registerLikeSearchQuery(ConditionKey.CK_LIKE_SEARCH, filterRemoveEmptyString(deliveryFirstnameDescription), getCValueDeliveryFirstnameDescription(), COL_DELIVERY_FIRSTNAME_DESCRIPTION, J_DeliveryFirstnameDescription, UJ_deliveryFirstnameDescription, likeSearchOption);
+    }
+            
+    /**
+     * Set the value of deliveryFirstnameDescription using inScope. { in ('a', 'b') }
+     * If the element in the list is null or empty-string, the condition-element is ignored.
+     * 
+     * @param deliveryFirstnameDescriptionList The value of deliveryFirstnameDescription as inScope.
+     */
+    public void setDeliveryFirstnameDescription_InScope(java.util.List<String> deliveryFirstnameDescriptionList) {
+        registerDeliveryFirstnameDescription(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyStringFromList(deliveryFirstnameDescriptionList));
+    }
+
+    /**
+     * Set the value of deliveryFirstnameDescription using inScope. { in ('a', 'b') }
+     * If the element in the list is null or empty-string, the condition-element is ignored.
+     * 
+     * @param deliveryFirstnameDescription The value of deliveryFirstnameDescription as inScope.
+     * @param inScopeOption The option of in-scope. (NotNull)
+     */
+    public void setDeliveryFirstnameDescription_InScope(String deliveryFirstnameDescription, jp.sf.pal.pompei.allcommon.cbean.coption.InScopeOption inScopeOption) {
+        registerInScopeQuery(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyString(deliveryFirstnameDescription), getCValueDeliveryFirstnameDescription(), COL_DELIVERY_FIRSTNAME_DESCRIPTION, J_DeliveryFirstnameDescription, UJ_deliveryFirstnameDescription, inScopeOption);
+    }
+            
+    /**
+     * Set the value of deliveryFirstnameDescription using notInScope. { not in ('a', 'b') }
+     * If the element in the list is null or empty-string, the condition-element is ignored.
+     * 
+     * @param deliveryFirstnameDescriptionList The value of deliveryFirstnameDescription as notInScope.
+     */
+    public void setDeliveryFirstnameDescription_NotInScope(java.util.List<String> deliveryFirstnameDescriptionList) {
+        registerDeliveryFirstnameDescription(ConditionKey.CK_NOT_IN_SCOPE, filterRemoveEmptyStringFromList(deliveryFirstnameDescriptionList));
+    }
+                                                
+    /**
+     * Set the value of deliveryFirstnameDescription using isNull. { is null }
+     */
+    public void setDeliveryFirstnameDescription_IsNull() {
+        registerDeliveryFirstnameDescription(ConditionKey.CK_IS_NULL, DUMMY_OBJECT);
+    }
+
+    /**
+     * Set the value of deliveryFirstnameDescription using isNotNull. { is not null }
+     */
+    public void setDeliveryFirstnameDescription_IsNotNull() {
+        registerDeliveryFirstnameDescription(ConditionKey.CK_IS_NOT_NULL, DUMMY_OBJECT);
+    }
+        
+    /**
+     * Register condition of deliveryFirstnameDescription.
+     * 
+     * @param key Condition key. (NotNull)
+     * @param value The value of deliveryFirstnameDescription. (Nullable)
+     */
+    protected void registerDeliveryFirstnameDescription(ConditionKey key, Object value) {
+        registerQuery(key, value, getCValueDeliveryFirstnameDescription(), COL_DELIVERY_FIRSTNAME_DESCRIPTION, J_DeliveryFirstnameDescription, UJ_deliveryFirstnameDescription);
+    }
+
+    /**
+     * Register inline condition of deliveryFirstnameDescription.
+     * 
+     * @param key Condition key. (NotNull)
+     * @param value The value of deliveryFirstnameDescription. (Nullable)
+     */
+    protected void registerInlineDeliveryFirstnameDescription(ConditionKey key, Object value) {
+        registerInlineQuery(key, value, getCValueDeliveryFirstnameDescription(), COL_DELIVERY_FIRSTNAME_DESCRIPTION, J_DeliveryFirstnameDescription, UJ_deliveryFirstnameDescription);
+    }
+
+    abstract protected ConditionValue getCValueDeliveryFirstnameDescription();
+      
+    /** Column db name of deliveryLastDescription. */
+    protected static final String COL_DELIVERY_LAST_DESCRIPTION = "DELIVERY_LAST_DESCRIPTION";
+
+    /** Column java name of deliveryLastDescription. */
+    protected static final String J_DeliveryLastDescription = "DeliveryLastDescription";
+
+    /** Column uncapitalised java name of deliveryLastDescription. */
+    protected static final String UJ_deliveryLastDescription = "deliveryLastDescription";
+    
+    /**
+     * Set the value of deliveryLastDescription using equal. { = }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param deliveryLastDescription The value of deliveryLastDescription as equal.
+     */
+    public void setDeliveryLastDescription_Equal(String deliveryLastDescription) {
+        registerDeliveryLastDescription(ConditionKey.CK_EQUAL, filterRemoveEmptyString(deliveryLastDescription));
+    }
+                  
+    /**
+     * Set the value of deliveryLastDescription using notEqual. { != }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param deliveryLastDescription The value of deliveryLastDescription as notEqual.
+     */
+    public void setDeliveryLastDescription_NotEqual(String deliveryLastDescription) {
+        registerDeliveryLastDescription(ConditionKey.CK_NOT_EQUAL, filterRemoveEmptyString(deliveryLastDescription));
+    }
+            
+    /**
+     * Set the value of deliveryLastDescription using greaterThan. { &gt; }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param deliveryLastDescription The value of deliveryLastDescription as greaterThan.
+     */
+    public void setDeliveryLastDescription_GreaterThan(String deliveryLastDescription) {
+        registerDeliveryLastDescription(ConditionKey.CK_GREATER_THAN, filterRemoveEmptyString(deliveryLastDescription));
+    }
+            
+    /**
+     * Set the value of deliveryLastDescription using lessThan. { &lt; }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param deliveryLastDescription The value of deliveryLastDescription as lessThan.
+     */
+    public void setDeliveryLastDescription_LessThan(String deliveryLastDescription) {
+        registerDeliveryLastDescription(ConditionKey.CK_LESS_THAN, filterRemoveEmptyString(deliveryLastDescription));
+    }
+            
+    /**
+     * Set the value of deliveryLastDescription using greaterEqual. { &gt;= }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param deliveryLastDescription The value of deliveryLastDescription as greaterEqual.
+     */
+    public void setDeliveryLastDescription_GreaterEqual(String deliveryLastDescription) {
+        registerDeliveryLastDescription(ConditionKey.CK_GREATER_EQUAL, filterRemoveEmptyString(deliveryLastDescription));
+    }
+            
+    /**
+     * Set the value of deliveryLastDescription using lessEqual. { &lt;= }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param deliveryLastDescription The value of deliveryLastDescription as lessEqual.
+     */
+    public void setDeliveryLastDescription_LessEqual(String deliveryLastDescription) {
+        registerDeliveryLastDescription(ConditionKey.CK_LESS_EQUAL, filterRemoveEmptyString(deliveryLastDescription));
+    }
+            
+    /**
+     * Set the value of deliveryLastDescription using prefixSearch. { like 'xxx%' }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param deliveryLastDescription The value of deliveryLastDescription as prefixSearch.
+     */
+    public void setDeliveryLastDescription_PrefixSearch(String deliveryLastDescription) {
+        registerDeliveryLastDescription(ConditionKey.CK_PREFIX_SEARCH, filterRemoveEmptyString(deliveryLastDescription));
+    }
+            
+    /**
+     * Set the value of deliveryLastDescription 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 deliveryLastDescription The value of deliveryLastDescription as likeSearch.
+     * @param likeSearchOption The option of like-search. (NotNull)
+     */
+    public void setDeliveryLastDescription_LikeSearch(String deliveryLastDescription, jp.sf.pal.pompei.allcommon.cbean.coption.LikeSearchOption likeSearchOption) {
+        registerLikeSearchQuery(ConditionKey.CK_LIKE_SEARCH, filterRemoveEmptyString(deliveryLastDescription), getCValueDeliveryLastDescription(), COL_DELIVERY_LAST_DESCRIPTION, J_DeliveryLastDescription, UJ_deliveryLastDescription, likeSearchOption);
+    }
+            
+    /**
+     * Set the value of deliveryLastDescription using inScope. { in ('a', 'b') }
+     * If the element in the list is null or empty-string, the condition-element is ignored.
+     * 
+     * @param deliveryLastDescriptionList The value of deliveryLastDescription as inScope.
+     */
+    public void setDeliveryLastDescription_InScope(java.util.List<String> deliveryLastDescriptionList) {
+        registerDeliveryLastDescription(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyStringFromList(deliveryLastDescriptionList));
+    }
+
+    /**
+     * Set the value of deliveryLastDescription using inScope. { in ('a', 'b') }
+     * If the element in the list is null or empty-string, the condition-element is ignored.
+     * 
+     * @param deliveryLastDescription The value of deliveryLastDescription as inScope.
+     * @param inScopeOption The option of in-scope. (NotNull)
+     */
+    public void setDeliveryLastDescription_InScope(String deliveryLastDescription, jp.sf.pal.pompei.allcommon.cbean.coption.InScopeOption inScopeOption) {
+        registerInScopeQuery(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyString(deliveryLastDescription), getCValueDeliveryLastDescription(), COL_DELIVERY_LAST_DESCRIPTION, J_DeliveryLastDescription, UJ_deliveryLastDescription, inScopeOption);
+    }
+            
+    /**
+     * Set the value of deliveryLastDescription using notInScope. { not in ('a', 'b') }
+     * If the element in the list is null or empty-string, the condition-element is ignored.
+     * 
+     * @param deliveryLastDescriptionList The value of deliveryLastDescription as notInScope.
+     */
+    public void setDeliveryLastDescription_NotInScope(java.util.List<String> deliveryLastDescriptionList) {
+        registerDeliveryLastDescription(ConditionKey.CK_NOT_IN_SCOPE, filterRemoveEmptyStringFromList(deliveryLastDescriptionList));
+    }
+                                                
+    /**
+     * Set the value of deliveryLastDescription using isNull. { is null }
+     */
+    public void setDeliveryLastDescription_IsNull() {
+        registerDeliveryLastDescription(ConditionKey.CK_IS_NULL, DUMMY_OBJECT);
+    }
+
+    /**
+     * Set the value of deliveryLastDescription using isNotNull. { is not null }
+     */
+    public void setDeliveryLastDescription_IsNotNull() {
+        registerDeliveryLastDescription(ConditionKey.CK_IS_NOT_NULL, DUMMY_OBJECT);
+    }
+        
+    /**
+     * Register condition of deliveryLastDescription.
+     * 
+     * @param key Condition key. (NotNull)
+     * @param value The value of deliveryLastDescription. (Nullable)
+     */
+    protected void registerDeliveryLastDescription(ConditionKey key, Object value) {
+        registerQuery(key, value, getCValueDeliveryLastDescription(), COL_DELIVERY_LAST_DESCRIPTION, J_DeliveryLastDescription, UJ_deliveryLastDescription);
+    }
+
+    /**
+     * Register inline condition of deliveryLastDescription.
+     * 
+     * @param key Condition key. (NotNull)
+     * @param value The value of deliveryLastDescription. (Nullable)
+     */
+    protected void registerInlineDeliveryLastDescription(ConditionKey key, Object value) {
+        registerInlineQuery(key, value, getCValueDeliveryLastDescription(), COL_DELIVERY_LAST_DESCRIPTION, J_DeliveryLastDescription, UJ_deliveryLastDescription);
+    }
+
+    abstract protected ConditionValue getCValueDeliveryLastDescription();
+      
     /** Column db name of deliveryStreetAddress. */
     protected static final String COL_DELIVERY_STREET_ADDRESS = "DELIVERY_STREET_ADDRESS";
 
@@ -5189,6 +5821,322 @@
 
     abstract protected ConditionValue getCValueBillingLastname();
       
+    /** Column db name of billingFirstnameDescription. */
+    protected static final String COL_BILLING_FIRSTNAME_DESCRIPTION = "BILLING_FIRSTNAME_DESCRIPTION";
+
+    /** Column java name of billingFirstnameDescription. */
+    protected static final String J_BillingFirstnameDescription = "BillingFirstnameDescription";
+
+    /** Column uncapitalised java name of billingFirstnameDescription. */
+    protected static final String UJ_billingFirstnameDescription = "billingFirstnameDescription";
+    
+    /**
+     * Set the value of billingFirstnameDescription using equal. { = }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param billingFirstnameDescription The value of billingFirstnameDescription as equal.
+     */
+    public void setBillingFirstnameDescription_Equal(String billingFirstnameDescription) {
+        registerBillingFirstnameDescription(ConditionKey.CK_EQUAL, filterRemoveEmptyString(billingFirstnameDescription));
+    }
+                  
+    /**
+     * Set the value of billingFirstnameDescription using notEqual. { != }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param billingFirstnameDescription The value of billingFirstnameDescription as notEqual.
+     */
+    public void setBillingFirstnameDescription_NotEqual(String billingFirstnameDescription) {
+        registerBillingFirstnameDescription(ConditionKey.CK_NOT_EQUAL, filterRemoveEmptyString(billingFirstnameDescription));
+    }
+            
+    /**
+     * Set the value of billingFirstnameDescription using greaterThan. { &gt; }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param billingFirstnameDescription The value of billingFirstnameDescription as greaterThan.
+     */
+    public void setBillingFirstnameDescription_GreaterThan(String billingFirstnameDescription) {
+        registerBillingFirstnameDescription(ConditionKey.CK_GREATER_THAN, filterRemoveEmptyString(billingFirstnameDescription));
+    }
+            
+    /**
+     * Set the value of billingFirstnameDescription using lessThan. { &lt; }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param billingFirstnameDescription The value of billingFirstnameDescription as lessThan.
+     */
+    public void setBillingFirstnameDescription_LessThan(String billingFirstnameDescription) {
+        registerBillingFirstnameDescription(ConditionKey.CK_LESS_THAN, filterRemoveEmptyString(billingFirstnameDescription));
+    }
+            
+    /**
+     * Set the value of billingFirstnameDescription using greaterEqual. { &gt;= }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param billingFirstnameDescription The value of billingFirstnameDescription as greaterEqual.
+     */
+    public void setBillingFirstnameDescription_GreaterEqual(String billingFirstnameDescription) {
+        registerBillingFirstnameDescription(ConditionKey.CK_GREATER_EQUAL, filterRemoveEmptyString(billingFirstnameDescription));
+    }
+            
+    /**
+     * Set the value of billingFirstnameDescription using lessEqual. { &lt;= }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param billingFirstnameDescription The value of billingFirstnameDescription as lessEqual.
+     */
+    public void setBillingFirstnameDescription_LessEqual(String billingFirstnameDescription) {
+        registerBillingFirstnameDescription(ConditionKey.CK_LESS_EQUAL, filterRemoveEmptyString(billingFirstnameDescription));
+    }
+            
+    /**
+     * Set the value of billingFirstnameDescription using prefixSearch. { like 'xxx%' }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param billingFirstnameDescription The value of billingFirstnameDescription as prefixSearch.
+     */
+    public void setBillingFirstnameDescription_PrefixSearch(String billingFirstnameDescription) {
+        registerBillingFirstnameDescription(ConditionKey.CK_PREFIX_SEARCH, filterRemoveEmptyString(billingFirstnameDescription));
+    }
+            
+    /**
+     * Set the value of billingFirstnameDescription 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 billingFirstnameDescription The value of billingFirstnameDescription as likeSearch.
+     * @param likeSearchOption The option of like-search. (NotNull)
+     */
+    public void setBillingFirstnameDescription_LikeSearch(String billingFirstnameDescription, jp.sf.pal.pompei.allcommon.cbean.coption.LikeSearchOption likeSearchOption) {
+        registerLikeSearchQuery(ConditionKey.CK_LIKE_SEARCH, filterRemoveEmptyString(billingFirstnameDescription), getCValueBillingFirstnameDescription(), COL_BILLING_FIRSTNAME_DESCRIPTION, J_BillingFirstnameDescription, UJ_billingFirstnameDescription, likeSearchOption);
+    }
+            
+    /**
+     * Set the value of billingFirstnameDescription using inScope. { in ('a', 'b') }
+     * If the element in the list is null or empty-string, the condition-element is ignored.
+     * 
+     * @param billingFirstnameDescriptionList The value of billingFirstnameDescription as inScope.
+     */
+    public void setBillingFirstnameDescription_InScope(java.util.List<String> billingFirstnameDescriptionList) {
+        registerBillingFirstnameDescription(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyStringFromList(billingFirstnameDescriptionList));
+    }
+
+    /**
+     * Set the value of billingFirstnameDescription using inScope. { in ('a', 'b') }
+     * If the element in the list is null or empty-string, the condition-element is ignored.
+     * 
+     * @param billingFirstnameDescription The value of billingFirstnameDescription as inScope.
+     * @param inScopeOption The option of in-scope. (NotNull)
+     */
+    public void setBillingFirstnameDescription_InScope(String billingFirstnameDescription, jp.sf.pal.pompei.allcommon.cbean.coption.InScopeOption inScopeOption) {
+        registerInScopeQuery(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyString(billingFirstnameDescription), getCValueBillingFirstnameDescription(), COL_BILLING_FIRSTNAME_DESCRIPTION, J_BillingFirstnameDescription, UJ_billingFirstnameDescription, inScopeOption);
+    }
+            
+    /**
+     * Set the value of billingFirstnameDescription using notInScope. { not in ('a', 'b') }
+     * If the element in the list is null or empty-string, the condition-element is ignored.
+     * 
+     * @param billingFirstnameDescriptionList The value of billingFirstnameDescription as notInScope.
+     */
+    public void setBillingFirstnameDescription_NotInScope(java.util.List<String> billingFirstnameDescriptionList) {
+        registerBillingFirstnameDescription(ConditionKey.CK_NOT_IN_SCOPE, filterRemoveEmptyStringFromList(billingFirstnameDescriptionList));
+    }
+                                                
+    /**
+     * Set the value of billingFirstnameDescription using isNull. { is null }
+     */
+    public void setBillingFirstnameDescription_IsNull() {
+        registerBillingFirstnameDescription(ConditionKey.CK_IS_NULL, DUMMY_OBJECT);
+    }
+
+    /**
+     * Set the value of billingFirstnameDescription using isNotNull. { is not null }
+     */
+    public void setBillingFirstnameDescription_IsNotNull() {
+        registerBillingFirstnameDescription(ConditionKey.CK_IS_NOT_NULL, DUMMY_OBJECT);
+    }
+        
+    /**
+     * Register condition of billingFirstnameDescription.
+     * 
+     * @param key Condition key. (NotNull)
+     * @param value The value of billingFirstnameDescription. (Nullable)
+     */
+    protected void registerBillingFirstnameDescription(ConditionKey key, Object value) {
+        registerQuery(key, value, getCValueBillingFirstnameDescription(), COL_BILLING_FIRSTNAME_DESCRIPTION, J_BillingFirstnameDescription, UJ_billingFirstnameDescription);
+    }
+
+    /**
+     * Register inline condition of billingFirstnameDescription.
+     * 
+     * @param key Condition key. (NotNull)
+     * @param value The value of billingFirstnameDescription. (Nullable)
+     */
+    protected void registerInlineBillingFirstnameDescription(ConditionKey key, Object value) {
+        registerInlineQuery(key, value, getCValueBillingFirstnameDescription(), COL_BILLING_FIRSTNAME_DESCRIPTION, J_BillingFirstnameDescription, UJ_billingFirstnameDescription);
+    }
+
+    abstract protected ConditionValue getCValueBillingFirstnameDescription();
+      
+    /** Column db name of billingLastnameDescription. */
+    protected static final String COL_BILLING_LASTNAME_DESCRIPTION = "BILLING_LASTNAME_DESCRIPTION";
+
+    /** Column java name of billingLastnameDescription. */
+    protected static final String J_BillingLastnameDescription = "BillingLastnameDescription";
+
+    /** Column uncapitalised java name of billingLastnameDescription. */
+    protected static final String UJ_billingLastnameDescription = "billingLastnameDescription";
+    
+    /**
+     * Set the value of billingLastnameDescription using equal. { = }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param billingLastnameDescription The value of billingLastnameDescription as equal.
+     */
+    public void setBillingLastnameDescription_Equal(String billingLastnameDescription) {
+        registerBillingLastnameDescription(ConditionKey.CK_EQUAL, filterRemoveEmptyString(billingLastnameDescription));
+    }
+                  
+    /**
+     * Set the value of billingLastnameDescription using notEqual. { != }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param billingLastnameDescription The value of billingLastnameDescription as notEqual.
+     */
+    public void setBillingLastnameDescription_NotEqual(String billingLastnameDescription) {
+        registerBillingLastnameDescription(ConditionKey.CK_NOT_EQUAL, filterRemoveEmptyString(billingLastnameDescription));
+    }
+            
+    /**
+     * Set the value of billingLastnameDescription using greaterThan. { &gt; }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param billingLastnameDescription The value of billingLastnameDescription as greaterThan.
+     */
+    public void setBillingLastnameDescription_GreaterThan(String billingLastnameDescription) {
+        registerBillingLastnameDescription(ConditionKey.CK_GREATER_THAN, filterRemoveEmptyString(billingLastnameDescription));
+    }
+            
+    /**
+     * Set the value of billingLastnameDescription using lessThan. { &lt; }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param billingLastnameDescription The value of billingLastnameDescription as lessThan.
+     */
+    public void setBillingLastnameDescription_LessThan(String billingLastnameDescription) {
+        registerBillingLastnameDescription(ConditionKey.CK_LESS_THAN, filterRemoveEmptyString(billingLastnameDescription));
+    }
+            
+    /**
+     * Set the value of billingLastnameDescription using greaterEqual. { &gt;= }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param billingLastnameDescription The value of billingLastnameDescription as greaterEqual.
+     */
+    public void setBillingLastnameDescription_GreaterEqual(String billingLastnameDescription) {
+        registerBillingLastnameDescription(ConditionKey.CK_GREATER_EQUAL, filterRemoveEmptyString(billingLastnameDescription));
+    }
+            
+    /**
+     * Set the value of billingLastnameDescription using lessEqual. { &lt;= }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param billingLastnameDescription The value of billingLastnameDescription as lessEqual.
+     */
+    public void setBillingLastnameDescription_LessEqual(String billingLastnameDescription) {
+        registerBillingLastnameDescription(ConditionKey.CK_LESS_EQUAL, filterRemoveEmptyString(billingLastnameDescription));
+    }
+            
+    /**
+     * Set the value of billingLastnameDescription using prefixSearch. { like 'xxx%' }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param billingLastnameDescription The value of billingLastnameDescription as prefixSearch.
+     */
+    public void setBillingLastnameDescription_PrefixSearch(String billingLastnameDescription) {
+        registerBillingLastnameDescription(ConditionKey.CK_PREFIX_SEARCH, filterRemoveEmptyString(billingLastnameDescription));
+    }
+            
+    /**
+     * Set the value of billingLastnameDescription 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 billingLastnameDescription The value of billingLastnameDescription as likeSearch.
+     * @param likeSearchOption The option of like-search. (NotNull)
+     */
+    public void setBillingLastnameDescription_LikeSearch(String billingLastnameDescription, jp.sf.pal.pompei.allcommon.cbean.coption.LikeSearchOption likeSearchOption) {
+        registerLikeSearchQuery(ConditionKey.CK_LIKE_SEARCH, filterRemoveEmptyString(billingLastnameDescription), getCValueBillingLastnameDescription(), COL_BILLING_LASTNAME_DESCRIPTION, J_BillingLastnameDescription, UJ_billingLastnameDescription, likeSearchOption);
+    }
+            
+    /**
+     * Set the value of billingLastnameDescription using inScope. { in ('a', 'b') }
+     * If the element in the list is null or empty-string, the condition-element is ignored.
+     * 
+     * @param billingLastnameDescriptionList The value of billingLastnameDescription as inScope.
+     */
+    public void setBillingLastnameDescription_InScope(java.util.List<String> billingLastnameDescriptionList) {
+        registerBillingLastnameDescription(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyStringFromList(billingLastnameDescriptionList));
+    }
+
+    /**
+     * Set the value of billingLastnameDescription using inScope. { in ('a', 'b') }
+     * If the element in the list is null or empty-string, the condition-element is ignored.
+     * 
+     * @param billingLastnameDescription The value of billingLastnameDescription as inScope.
+     * @param inScopeOption The option of in-scope. (NotNull)
+     */
+    public void setBillingLastnameDescription_InScope(String billingLastnameDescription, jp.sf.pal.pompei.allcommon.cbean.coption.InScopeOption inScopeOption) {
+        registerInScopeQuery(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyString(billingLastnameDescription), getCValueBillingLastnameDescription(), COL_BILLING_LASTNAME_DESCRIPTION, J_BillingLastnameDescription, UJ_billingLastnameDescription, inScopeOption);
+    }
+            
+    /**
+     * Set the value of billingLastnameDescription using notInScope. { not in ('a', 'b') }
+     * If the element in the list is null or empty-string, the condition-element is ignored.
+     * 
+     * @param billingLastnameDescriptionList The value of billingLastnameDescription as notInScope.
+     */
+    public void setBillingLastnameDescription_NotInScope(java.util.List<String> billingLastnameDescriptionList) {
+        registerBillingLastnameDescription(ConditionKey.CK_NOT_IN_SCOPE, filterRemoveEmptyStringFromList(billingLastnameDescriptionList));
+    }
+                                                
+    /**
+     * Set the value of billingLastnameDescription using isNull. { is null }
+     */
+    public void setBillingLastnameDescription_IsNull() {
+        registerBillingLastnameDescription(ConditionKey.CK_IS_NULL, DUMMY_OBJECT);
+    }
+
+    /**
+     * Set the value of billingLastnameDescription using isNotNull. { is not null }
+     */
+    public void setBillingLastnameDescription_IsNotNull() {
+        registerBillingLastnameDescription(ConditionKey.CK_IS_NOT_NULL, DUMMY_OBJECT);
+    }
+        
+    /**
+     * Register condition of billingLastnameDescription.
+     * 
+     * @param key Condition key. (NotNull)
+     * @param value The value of billingLastnameDescription. (Nullable)
+     */
+    protected void registerBillingLastnameDescription(ConditionKey key, Object value) {
+        registerQuery(key, value, getCValueBillingLastnameDescription(), COL_BILLING_LASTNAME_DESCRIPTION, J_BillingLastnameDescription, UJ_billingLastnameDescription);
+    }
+
+    /**
+     * Register inline condition of billingLastnameDescription.
+     * 
+     * @param key Condition key. (NotNull)
+     * @param value The value of billingLastnameDescription. (Nullable)
+     */
+    protected void registerInlineBillingLastnameDescription(ConditionKey key, Object value) {
+        registerInlineQuery(key, value, getCValueBillingLastnameDescription(), COL_BILLING_LASTNAME_DESCRIPTION, J_BillingLastnameDescription, UJ_billingLastnameDescription);
+    }
+
+    abstract protected ConditionValue getCValueBillingLastnameDescription();
+      
     /** Column db name of billingStreetAddress. */
     protected static final String COL_BILLING_STREET_ADDRESS = "BILLING_STREET_ADDRESS";
 

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-30 13:20:43 UTC (rev 598)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsOrderProductCQ.java	2007-10-01 13:00:14 UTC (rev 599)
@@ -399,6 +399,164 @@
 
     abstract protected ConditionValue getCValueProductId();
       
+    /** Column db name of code. */
+    protected static final String COL_CODE = "CODE";
+
+    /** Column java name of code. */
+    protected static final String J_Code = "Code";
+
+    /** Column uncapitalised java name of code. */
+    protected static final String UJ_code = "code";
+    
+    /**
+     * Set the value of code using equal. { = }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param code The value of code as equal.
+     */
+    public void setCode_Equal(String code) {
+        registerCode(ConditionKey.CK_EQUAL, filterRemoveEmptyString(code));
+    }
+                  
+    /**
+     * Set the value of code using notEqual. { != }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param code The value of code as notEqual.
+     */
+    public void setCode_NotEqual(String code) {
+        registerCode(ConditionKey.CK_NOT_EQUAL, filterRemoveEmptyString(code));
+    }
+            
+    /**
+     * Set the value of code using greaterThan. { &gt; }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param code The value of code as greaterThan.
+     */
+    public void setCode_GreaterThan(String code) {
+        registerCode(ConditionKey.CK_GREATER_THAN, filterRemoveEmptyString(code));
+    }
+            
+    /**
+     * Set the value of code using lessThan. { &lt; }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param code The value of code as lessThan.
+     */
+    public void setCode_LessThan(String code) {
+        registerCode(ConditionKey.CK_LESS_THAN, filterRemoveEmptyString(code));
+    }
+            
+    /**
+     * Set the value of code using greaterEqual. { &gt;= }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param code The value of code as greaterEqual.
+     */
+    public void setCode_GreaterEqual(String code) {
+        registerCode(ConditionKey.CK_GREATER_EQUAL, filterRemoveEmptyString(code));
+    }
+            
+    /**
+     * Set the value of code using lessEqual. { &lt;= }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param code The value of code as lessEqual.
+     */
+    public void setCode_LessEqual(String code) {
+        registerCode(ConditionKey.CK_LESS_EQUAL, filterRemoveEmptyString(code));
+    }
+            
+    /**
+     * Set the value of code using prefixSearch. { like 'xxx%' }
+     * If the value is null or empty-string, this condition is ignored.
+     * 
+     * @param code The value of code as prefixSearch.
+     */
+    public void setCode_PrefixSearch(String code) {
+        registerCode(ConditionKey.CK_PREFIX_SEARCH, filterRemoveEmptyString(code));
+    }
+            
+    /**
+     * Set the value of code 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 code The value of code as likeSearch.
+     * @param likeSearchOption The option of like-search. (NotNull)
+     */
+    public void setCode_LikeSearch(String code, jp.sf.pal.pompei.allcommon.cbean.coption.LikeSearchOption likeSearchOption) {
+        registerLikeSearchQuery(ConditionKey.CK_LIKE_SEARCH, filterRemoveEmptyString(code), getCValueCode(), COL_CODE, J_Code, UJ_code, likeSearchOption);
+    }
+            
+    /**
+     * Set the value of code using inScope. { in ('a', 'b') }
+     * If the element in the list is null or empty-string, the condition-element is ignored.
+     * 
+     * @param codeList The value of code as inScope.
+     */
+    public void setCode_InScope(java.util.List<String> codeList) {
+        registerCode(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyStringFromList(codeList));
+    }
+
+    /**
+     * Set the value of code using inScope. { in ('a', 'b') }
+     * If the element in the list is null or empty-string, the condition-element is ignored.
+     * 
+     * @param code The value of code as inScope.
+     * @param inScopeOption The option of in-scope. (NotNull)
+     */
+    public void setCode_InScope(String code, jp.sf.pal.pompei.allcommon.cbean.coption.InScopeOption inScopeOption) {
+        registerInScopeQuery(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyString(code), getCValueCode(), COL_CODE, J_Code, UJ_code, inScopeOption);
+    }
+            
+    /**
+     * Set the value of code using notInScope. { not in ('a', 'b') }
+     * If the element in the list is null or empty-string, the condition-element is ignored.
+     * 
+     * @param codeList The value of code as notInScope.
+     */
+    public void setCode_NotInScope(java.util.List<String> codeList) {
+        registerCode(ConditionKey.CK_NOT_IN_SCOPE, filterRemoveEmptyStringFromList(codeList));
+    }
+                                                
+    /**
+     * Set the value of code using isNull. { is null }
+     */
+    public void setCode_IsNull() {
+        registerCode(ConditionKey.CK_IS_NULL, DUMMY_OBJECT);
+    }
+
+    /**
+     * Set the value of code using isNotNull. { is not null }
+     */
+    public void setCode_IsNotNull() {
+        registerCode(ConditionKey.CK_IS_NOT_NULL, DUMMY_OBJECT);
+    }
+        
+    /**
+     * Register condition of code.
+     * 
+     * @param key Condition key. (NotNull)
+     * @param value The value of code. (Nullable)
+     */
+    protected void registerCode(ConditionKey key, Object value) {
+        registerQuery(key, value, getCValueCode(), COL_CODE, J_Code, UJ_code);
+    }
+
+    /**
+     * Register inline condition of code.
+     * 
+     * @param key Condition key. (NotNull)
+     * @param value The value of code. (Nullable)
+     */
+    protected void registerInlineCode(ConditionKey key, Object value) {
+        registerInlineQuery(key, value, getCValueCode(), COL_CODE, J_Code, UJ_code);
+    }
+
+    abstract protected ConditionValue getCValueCode();
+      
     /** Column db name of model. */
     protected static final String COL_MODEL = "MODEL";
 

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsAddressBookCQ.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsAddressBookCQ.java	2007-09-30 13:20:43 UTC (rev 598)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsAddressBookCQ.java	2007-10-01 13:00:14 UTC (rev 599)
@@ -163,6 +163,42 @@
     }
   
     /**
+     * Include select-column of firstnameDescription as mine.
+     * Alias name is java-name of this column.
+     * Be careful to whether your table have the same column.
+     */
+    public void includeAsMine_FirstnameDescription() {
+        registerIncludedSelectColumn("FirstnameDescription", getRealColumnName("FIRSTNAME_DESCRIPTION"));
+    }
+
+    /**
+     * Include select-column of firstnameDescription as mine.
+     * 
+     * @param aliasName Alias name. {select columnName as aliasName from ...} This should not contain comma. (NotNull)
+     */
+    public void includeAsMine_FirstnameDescription(String aliasName) {
+        registerIncludedSelectColumn(aliasName, getRealColumnName("FIRSTNAME_DESCRIPTION"));
+    }
+  
+    /**
+     * Include select-column of lastnameDescription as mine.
+     * Alias name is java-name of this column.
+     * Be careful to whether your table have the same column.
+     */
+    public void includeAsMine_LastnameDescription() {
+        registerIncludedSelectColumn("LastnameDescription", getRealColumnName("LASTNAME_DESCRIPTION"));
+    }
+
+    /**
+     * Include select-column of lastnameDescription as mine.
+     * 
+     * @param aliasName Alias name. {select columnName as aliasName from ...} This should not contain comma. (NotNull)
+     */
+    public void includeAsMine_LastnameDescription(String aliasName) {
+        registerIncludedSelectColumn(aliasName, getRealColumnName("LASTNAME_DESCRIPTION"));
+    }
+  
+    /**
      * Include select-column of streetAddress as mine.
      * Alias name is java-name of this column.
      * Be careful to whether your table have the same column.
@@ -654,6 +690,90 @@
     }
       
     // /- - - - - - - - - - - - - - - - - - - - - - -
+    //   Column = [FIRSTNAME_DESCRIPTION]
+    // - - - - - - - - -/
+
+    /** The attribute of firstnameDescription. */
+    protected ConditionValue _firstnameDescription;
+
+    /**
+     * Get the value of firstnameDescription.
+     * 
+     * @return The value of firstnameDescription.
+     */
+    public ConditionValue getFirstnameDescription() {
+        if (_firstnameDescription == null) {
+            _firstnameDescription = new ConditionValue();
+        }
+        return _firstnameDescription;
+    }
+
+    protected ConditionValue getCValueFirstnameDescription() {
+        return getFirstnameDescription();
+    }
+
+                                                      
+    /**
+     * Add order-by of firstnameDescription as ASC.
+     * 
+     * @return this. (NotNull)
+     */
+    public BsAddressBookCQ addOrderBy_FirstnameDescription_Asc() {
+        getSqlClause().registerOrderBy(getRealColumnName(COL_FIRSTNAME_DESCRIPTION), null, true);return this;
+    }
+
+    /**
+     * Add order-by of firstnameDescription as DESC.
+     * 
+     * @return this. (NotNull)
+     */
+    public BsAddressBookCQ addOrderBy_FirstnameDescription_Desc() {
+        getSqlClause().registerOrderBy(getRealColumnName(COL_FIRSTNAME_DESCRIPTION), null, false);return this;
+    }
+      
+    // /- - - - - - - - - - - - - - - - - - - - - - -
+    //   Column = [LASTNAME_DESCRIPTION]
+    // - - - - - - - - -/
+
+    /** The attribute of lastnameDescription. */
+    protected ConditionValue _lastnameDescription;
+
+    /**
+     * Get the value of lastnameDescription.
+     * 
+     * @return The value of lastnameDescription.
+     */
+    public ConditionValue getLastnameDescription() {
+        if (_lastnameDescription == null) {
+            _lastnameDescription = new ConditionValue();
+        }
+        return _lastnameDescription;
+    }
+
+    protected ConditionValue getCValueLastnameDescription() {
+        return getLastnameDescription();
+    }
+
+                                                      
+    /**
+     * Add order-by of lastnameDescription as ASC.
+     * 
+     * @return this. (NotNull)
+     */
+    public BsAddressBookCQ addOrderBy_LastnameDescription_Asc() {
+        getSqlClause().registerOrderBy(getRealColumnName(COL_LASTNAME_DESCRIPTION), null, true);return this;
+    }
+
+    /**
+     * Add order-by of lastnameDescription as DESC.
+     * 
+     * @return this. (NotNull)
+     */
+    public BsAddressBookCQ addOrderBy_LastnameDescription_Desc() {
+        getSqlClause().registerOrderBy(getRealColumnName(COL_LASTNAME_DESCRIPTION), null, false);return this;
+    }
+      
+    // /- - - - - - - - - - - - - - - - - - - - - - -
     //   Column = [STREET_ADDRESS]
     // - - - - - - - - -/
 

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsCustomerCQ.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsCustomerCQ.java	2007-09-30 13:20:43 UTC (rev 598)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsCustomerCQ.java	2007-10-01 13:00:14 UTC (rev 599)
@@ -145,6 +145,42 @@
     }
   
     /**
+     * Include select-column of firstnameDescription as mine.
+     * Alias name is java-name of this column.
+     * Be careful to whether your table have the same column.
+     */
+    public void includeAsMine_FirstnameDescription() {
+        registerIncludedSelectColumn("FirstnameDescription", getRealColumnName("FIRSTNAME_DESCRIPTION"));
+    }
+
+    /**
+     * Include select-column of firstnameDescription as mine.
+     * 
+     * @param aliasName Alias name. {select columnName as aliasName from ...} This should not contain comma. (NotNull)
+     */
+    public void includeAsMine_FirstnameDescription(String aliasName) {
+        registerIncludedSelectColumn(aliasName, getRealColumnName("FIRSTNAME_DESCRIPTION"));
+    }
+  
+    /**
+     * Include select-column of lastnameDescription as mine.
+     * Alias name is java-name of this column.
+     * Be careful to whether your table have the same column.
+     */
+    public void includeAsMine_LastnameDescription() {
+        registerIncludedSelectColumn("LastnameDescription", getRealColumnName("LASTNAME_DESCRIPTION"));
+    }
+
+    /**
+     * Include select-column of lastnameDescription as mine.
+     * 
+     * @param aliasName Alias name. {select columnName as aliasName from ...} This should not contain comma. (NotNull)
+     */
+    public void includeAsMine_LastnameDescription(String aliasName) {
+        registerIncludedSelectColumn(aliasName, getRealColumnName("LASTNAME_DESCRIPTION"));
+    }
+  
+    /**
      * Include select-column of nickname as mine.
      * Alias name is java-name of this column.
      * Be careful to whether your table have the same column.
@@ -644,6 +680,90 @@
     }
       
     // /- - - - - - - - - - - - - - - - - - - - - - -
+    //   Column = [FIRSTNAME_DESCRIPTION]
+    // - - - - - - - - -/
+
+    /** The attribute of firstnameDescription. */
+    protected ConditionValue _firstnameDescription;
+
+    /**
+     * Get the value of firstnameDescription.
+     * 
+     * @return The value of firstnameDescription.
+     */
+    public ConditionValue getFirstnameDescription() {
+        if (_firstnameDescription == null) {
+            _firstnameDescription = new ConditionValue();
+        }
+        return _firstnameDescription;
+    }
+
+    protected ConditionValue getCValueFirstnameDescription() {
+        return getFirstnameDescription();
+    }
+
+                                                      
+    /**
+     * Add order-by of firstnameDescription as ASC.
+     * 
+     * @return this. (NotNull)
+     */
+    public BsCustomerCQ addOrderBy_FirstnameDescription_Asc() {
+        getSqlClause().registerOrderBy(getRealColumnName(COL_FIRSTNAME_DESCRIPTION), null, true);return this;
+    }
+
+    /**
+     * Add order-by of firstnameDescription as DESC.
+     * 
+     * @return this. (NotNull)
+     */
+    public BsCustomerCQ addOrderBy_FirstnameDescription_Desc() {
+        getSqlClause().registerOrderBy(getRealColumnName(COL_FIRSTNAME_DESCRIPTION), null, false);return this;
+    }
+      
+    // /- - - - - - - - - - - - - - - - - - - - - - -
+    //   Column = [LASTNAME_DESCRIPTION]
+    // - - - - - - - - -/
+
+    /** The attribute of lastnameDescription. */
+    protected ConditionValue _lastnameDescription;
+
+    /**
+     * Get the value of lastnameDescription.
+     * 
+     * @return The value of lastnameDescription.
+     */
+    public ConditionValue getLastnameDescription() {
+        if (_lastnameDescription == null) {
+            _lastnameDescription = new ConditionValue();
+        }
+        return _lastnameDescription;
+    }
+
+    protected ConditionValue getCValueLastnameDescription() {
+        return getLastnameDescription();
+    }
+
+                                                      
+    /**
+     * Add order-by of lastnameDescription as ASC.
+     * 
+     * @return this. (NotNull)
+     */
+    public BsCustomerCQ addOrderBy_LastnameDescription_Asc() {
+        getSqlClause().registerOrderBy(getRealColumnName(COL_LASTNAME_DESCRIPTION), null, true);return this;
+    }
+
+    /**
+     * Add order-by of lastnameDescription as DESC.
+     * 
+     * @return this. (NotNull)
+     */
+    public BsCustomerCQ addOrderBy_LastnameDescription_Desc() {
+        getSqlClause().registerOrderBy(getRealColumnName(COL_LASTNAME_DESCRIPTION), null, false);return this;
+    }
+      
+    // /- - - - - - - - - - - - - - - - - - - - - - -
     //   Column = [NICKNAME]
     // - - - - - - - - -/
 

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-30 13:20:43 UTC (rev 598)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsOrderFormCQ.java	2007-10-01 13:00:14 UTC (rev 599)
@@ -163,6 +163,42 @@
     }
   
     /**
+     * Include select-column of customerFirstnameDescription as mine.
+     * Alias name is java-name of this column.
+     * Be careful to whether your table have the same column.
+     */
+    public void includeAsMine_CustomerFirstnameDescription() {
+        registerIncludedSelectColumn("CustomerFirstnameDescription", getRealColumnName("CUSTOMER_FIRSTNAME_DESCRIPTION"));
+    }
+
+    /**
+     * Include select-column of customerFirstnameDescription as mine.
+     * 
+     * @param aliasName Alias name. {select columnName as aliasName from ...} This should not contain comma. (NotNull)
+     */
+    public void includeAsMine_CustomerFirstnameDescription(String aliasName) {
+        registerIncludedSelectColumn(aliasName, getRealColumnName("CUSTOMER_FIRSTNAME_DESCRIPTION"));
+    }
+  
+    /**
+     * Include select-column of customerLastnameDescription as mine.
+     * Alias name is java-name of this column.
+     * Be careful to whether your table have the same column.
+     */
+    public void includeAsMine_CustomerLastnameDescription() {
+        registerIncludedSelectColumn("CustomerLastnameDescription", getRealColumnName("CUSTOMER_LASTNAME_DESCRIPTION"));
+    }
+
+    /**
+     * Include select-column of customerLastnameDescription as mine.
+     * 
+     * @param aliasName Alias name. {select columnName as aliasName from ...} This should not contain comma. (NotNull)
+     */
+    public void includeAsMine_CustomerLastnameDescription(String aliasName) {
+        registerIncludedSelectColumn(aliasName, getRealColumnName("CUSTOMER_LASTNAME_DESCRIPTION"));
+    }
+  
+    /**
      * Include select-column of customerDayOfBirth as mine.
      * Alias name is java-name of this column.
      * Be careful to whether your table have the same column.
@@ -451,6 +487,42 @@
     }
   
     /**
+     * Include select-column of deliveryFirstnameDescription as mine.
+     * Alias name is java-name of this column.
+     * Be careful to whether your table have the same column.
+     */
+    public void includeAsMine_DeliveryFirstnameDescription() {
+        registerIncludedSelectColumn("DeliveryFirstnameDescription", getRealColumnName("DELIVERY_FIRSTNAME_DESCRIPTION"));
+    }
+
+    /**
+     * Include select-column of deliveryFirstnameDescription as mine.
+     * 
+     * @param aliasName Alias name. {select columnName as aliasName from ...} This should not contain comma. (NotNull)
+     */
+    public void includeAsMine_DeliveryFirstnameDescription(String aliasName) {
+        registerIncludedSelectColumn(aliasName, getRealColumnName("DELIVERY_FIRSTNAME_DESCRIPTION"));
+    }
+  
+    /**
+     * Include select-column of deliveryLastDescription as mine.
+     * Alias name is java-name of this column.
+     * Be careful to whether your table have the same column.
+     */
+    public void includeAsMine_DeliveryLastDescription() {
+        registerIncludedSelectColumn("DeliveryLastDescription", getRealColumnName("DELIVERY_LAST_DESCRIPTION"));
+    }
+
+    /**
+     * Include select-column of deliveryLastDescription as mine.
+     * 
+     * @param aliasName Alias name. {select columnName as aliasName from ...} This should not contain comma. (NotNull)
+     */
+    public void includeAsMine_DeliveryLastDescription(String aliasName) {
+        registerIncludedSelectColumn(aliasName, getRealColumnName("DELIVERY_LAST_DESCRIPTION"));
+    }
+  
+    /**
      * Include select-column of deliveryStreetAddress as mine.
      * Alias name is java-name of this column.
      * Be careful to whether your table have the same column.
@@ -667,6 +739,42 @@
     }
   
     /**
+     * Include select-column of billingFirstnameDescription as mine.
+     * Alias name is java-name of this column.
+     * Be careful to whether your table have the same column.
+     */
+    public void includeAsMine_BillingFirstnameDescription() {
+        registerIncludedSelectColumn("BillingFirstnameDescription", getRealColumnName("BILLING_FIRSTNAME_DESCRIPTION"));
+    }
+
+    /**
+     * Include select-column of billingFirstnameDescription as mine.
+     * 
+     * @param aliasName Alias name. {select columnName as aliasName from ...} This should not contain comma. (NotNull)
+     */
+    public void includeAsMine_BillingFirstnameDescription(String aliasName) {
+        registerIncludedSelectColumn(aliasName, getRealColumnName("BILLING_FIRSTNAME_DESCRIPTION"));
+    }
+  
+    /**
+     * Include select-column of billingLastnameDescription as mine.
+     * Alias name is java-name of this column.
+     * Be careful to whether your table have the same column.
+     */
+    public void includeAsMine_BillingLastnameDescription() {
+        registerIncludedSelectColumn("BillingLastnameDescription", getRealColumnName("BILLING_LASTNAME_DESCRIPTION"));
+    }
+
+    /**
+     * Include select-column of billingLastnameDescription as mine.
+     * 
+     * @param aliasName Alias name. {select columnName as aliasName from ...} This should not contain comma. (NotNull)
+     */
+    public void includeAsMine_BillingLastnameDescription(String aliasName) {
+        registerIncludedSelectColumn(aliasName, getRealColumnName("BILLING_LASTNAME_DESCRIPTION"));
+    }
+  
+    /**
      * Include select-column of billingStreetAddress as mine.
      * Alias name is java-name of this column.
      * Be careful to whether your table have the same column.
@@ -1516,6 +1624,90 @@
     }
       
     // /- - - - - - - - - - - - - - - - - - - - - - -
+    //   Column = [CUSTOMER_FIRSTNAME_DESCRIPTION]
+    // - - - - - - - - -/
+
+    /** The attribute of customerFirstnameDescription. */
+    protected ConditionValue _customerFirstnameDescription;
+
+    /**
+     * Get the value of customerFirstnameDescription.
+     * 
+     * @return The value of customerFirstnameDescription.
+     */
+    public ConditionValue getCustomerFirstnameDescription() {
+        if (_customerFirstnameDescription == null) {
+            _customerFirstnameDescription = new ConditionValue();
+        }
+        return _customerFirstnameDescription;
+    }
+
+    protected ConditionValue getCValueCustomerFirstnameDescription() {
+        return getCustomerFirstnameDescription();
+    }
+
+                                                      
+    /**
+     * Add order-by of customerFirstnameDescription as ASC.
+     * 
+     * @return this. (NotNull)
+     */
+    public BsOrderFormCQ addOrderBy_CustomerFirstnameDescription_Asc() {
+        getSqlClause().registerOrderBy(getRealColumnName(COL_CUSTOMER_FIRSTNAME_DESCRIPTION), null, true);return this;
+    }
+
+    /**
+     * Add order-by of customerFirstnameDescription as DESC.
+     * 
+     * @return this. (NotNull)
+     */
+    public BsOrderFormCQ addOrderBy_CustomerFirstnameDescription_Desc() {
+        getSqlClause().registerOrderBy(getRealColumnName(COL_CUSTOMER_FIRSTNAME_DESCRIPTION), null, false);return this;
+    }
+      
+    // /- - - - - - - - - - - - - - - - - - - - - - -
+    //   Column = [CUSTOMER_LASTNAME_DESCRIPTION]
+    // - - - - - - - - -/
+
+    /** The attribute of customerLastnameDescription. */
+    protected ConditionValue _customerLastnameDescription;
+
+    /**
+     * Get the value of customerLastnameDescription.
+     * 
+     * @return The value of customerLastnameDescription.
+     */
+    public ConditionValue getCustomerLastnameDescription() {
+        if (_customerLastnameDescription == null) {
+            _customerLastnameDescription = new ConditionValue();
+        }
+        return _customerLastnameDescription;
+    }
+
+    protected ConditionValue getCValueCustomerLastnameDescription() {
+        return getCustomerLastnameDescription();
+    }
+
+                                                      
+    /**
+     * Add order-by of customerLastnameDescription as ASC.
+     * 
+     * @return this. (NotNull)
+     */
+    public BsOrderFormCQ addOrderBy_CustomerLastnameDescription_Asc() {
+        getSqlClause().registerOrderBy(getRealColumnName(COL_CUSTOMER_LASTNAME_DESCRIPTION), null, true);return this;
+    }
+
+    /**
+     * Add order-by of customerLastnameDescription as DESC.
+     * 
+     * @return this. (NotNull)
+     */
+    public BsOrderFormCQ addOrderBy_CustomerLastnameDescription_Desc() {
+        getSqlClause().registerOrderBy(getRealColumnName(COL_CUSTOMER_LASTNAME_DESCRIPTION), null, false);return this;
+    }
+      
+    // /- - - - - - - - - - - - - - - - - - - - - - -
     //   Column = [CUSTOMER_DAY_OF_BIRTH]
     // - - - - - - - - -/
 
@@ -2188,6 +2380,90 @@
     }
       
     // /- - - - - - - - - - - - - - - - - - - - - - -
+    //   Column = [DELIVERY_FIRSTNAME_DESCRIPTION]
+    // - - - - - - - - -/
+
+    /** The attribute of deliveryFirstnameDescription. */
+    protected ConditionValue _deliveryFirstnameDescription;
+
+    /**
+     * Get the value of deliveryFirstnameDescription.
+     * 
+     * @return The value of deliveryFirstnameDescription.
+     */
+    public ConditionValue getDeliveryFirstnameDescription() {
+        if (_deliveryFirstnameDescription == null) {
+            _deliveryFirstnameDescription = new ConditionValue();
+        }
+        return _deliveryFirstnameDescription;
+    }
+
+    protected ConditionValue getCValueDeliveryFirstnameDescription() {
+        return getDeliveryFirstnameDescription();
+    }
+
+                                                      
+    /**
+     * Add order-by of deliveryFirstnameDescription as ASC.
+     * 
+     * @return this. (NotNull)
+     */
+    public BsOrderFormCQ addOrderBy_DeliveryFirstnameDescription_Asc() {
+        getSqlClause().registerOrderBy(getRealColumnName(COL_DELIVERY_FIRSTNAME_DESCRIPTION), null, true);return this;
+    }
+
+    /**
+     * Add order-by of deliveryFirstnameDescription as DESC.
+     * 
+     * @return this. (NotNull)
+     */
+    public BsOrderFormCQ addOrderBy_DeliveryFirstnameDescription_Desc() {
+        getSqlClause().registerOrderBy(getRealColumnName(COL_DELIVERY_FIRSTNAME_DESCRIPTION), null, false);return this;
+    }
+      
+    // /- - - - - - - - - - - - - - - - - - - - - - -
+    //   Column = [DELIVERY_LAST_DESCRIPTION]
+    // - - - - - - - - -/
+
+    /** The attribute of deliveryLastDescription. */
+    protected ConditionValue _deliveryLastDescription;
+
+    /**
+     * Get the value of deliveryLastDescription.
+     * 
+     * @return The value of deliveryLastDescription.
+     */
+    public ConditionValue getDeliveryLastDescription() {
+        if (_deliveryLastDescription == null) {
+            _deliveryLastDescription = new ConditionValue();
+        }
+        return _deliveryLastDescription;
+    }
+
+    protected ConditionValue getCValueDeliveryLastDescription() {
+        return getDeliveryLastDescription();
+    }
+
+                                                      
+    /**
+     * Add order-by of deliveryLastDescription as ASC.
+     * 
+     * @return this. (NotNull)
+     */
+    public BsOrderFormCQ addOrderBy_DeliveryLastDescription_Asc() {
+        getSqlClause().registerOrderBy(getRealColumnName(COL_DELIVERY_LAST_DESCRIPTION), null, true);return this;
+    }
+
+    /**
+     * Add order-by of deliveryLastDescription as DESC.
+     * 
+     * @return this. (NotNull)
+     */
+    public BsOrderFormCQ addOrderBy_DeliveryLastDescription_Desc() {
+        getSqlClause().registerOrderBy(getRealColumnName(COL_DELIVERY_LAST_DESCRIPTION), null, false);return this;
+    }
+      
+    // /- - - - - - - - - - - - - - - - - - - - - - -
     //   Column = [DELIVERY_STREET_ADDRESS]
     // - - - - - - - - -/
 
@@ -2692,6 +2968,90 @@
     }
       
     // /- - - - - - - - - - - - - - - - - - - - - - -
+    //   Column = [BILLING_FIRSTNAME_DESCRIPTION]
+    // - - - - - - - - -/
+
+    /** The attribute of billingFirstnameDescription. */
+    protected ConditionValue _billingFirstnameDescription;
+
+    /**
+     * Get the value of billingFirstnameDescription.
+     * 
+     * @return The value of billingFirstnameDescription.
+     */
+    public ConditionValue getBillingFirstnameDescription() {
+        if (_billingFirstnameDescription == null) {
+            _billingFirstnameDescription = new ConditionValue();
+        }
+        return _billingFirstnameDescription;
+    }
+
+    protected ConditionValue getCValueBillingFirstnameDescription() {
+        return getBillingFirstnameDescription();
+    }
+
+                                                      
+    /**
+     * Add order-by of billingFirstnameDescription as ASC.
+     * 
+     * @return this. (NotNull)
+     */
+    public BsOrderFormCQ addOrderBy_BillingFirstnameDescription_Asc() {
+        getSqlClause().registerOrderBy(getRealColumnName(COL_BILLING_FIRSTNAME_DESCRIPTION), null, true);return this;
+    }
+
+    /**
+     * Add order-by of billingFirstnameDescription as DESC.
+     * 
+     * @return this. (NotNull)
+     */
+    public BsOrderFormCQ addOrderBy_BillingFirstnameDescription_Desc() {
+        getSqlClause().registerOrderBy(getRealColumnName(COL_BILLING_FIRSTNAME_DESCRIPTION), null, false);return this;
+    }
+      
+    // /- - - - - - - - - - - - - - - - - - - - - - -
+    //   Column = [BILLING_LASTNAME_DESCRIPTION]
+    // - - - - - - - - -/
+
+    /** The attribute of billingLastnameDescription. */
+    protected ConditionValue _billingLastnameDescription;
+
+    /**
+     * Get the value of billingLastnameDescription.
+     * 
+     * @return The value of billingLastnameDescription.
+     */
+    public ConditionValue getBillingLastnameDescription() {
+        if (_billingLastnameDescription == null) {
+            _billingLastnameDescription = new ConditionValue();
+        }
+        return _billingLastnameDescription;
+    }
+
+    protected ConditionValue getCValueBillingLastnameDescription() {
+        return getBillingLastnameDescription();
+    }
+
+                                                      
+    /**
+     * Add order-by of billingLastnameDescription as ASC.
+     * 
+     * @return this. (NotNull)
+     */
+    public BsOrderFormCQ addOrderBy_BillingLastnameDescription_Asc() {
+        getSqlClause().registerOrderBy(getRealColumnName(COL_BILLING_LASTNAME_DESCRIPTION), null, true);return this;
+    }
+
+    /**
+     * Add order-by of billingLastnameDescription as DESC.
+     * 
+     * @return this. (NotNull)
+     */
+    public BsOrderFormCQ addOrderBy_BillingLastnameDescription_Desc() {
+        getSqlClause().registerOrderBy(getRealColumnName(COL_BILLING_LASTNAME_DESCRIPTION), null, false);return this;
+    }
+      
+    // /- - - - - - - - - - - - - - - - - - - - - - -
     //   Column = [BILLING_STREET_ADDRESS]
     // - - - - - - - - -/
 

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-30 13:20:43 UTC (rev 598)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsOrderProductCQ.java	2007-10-01 13:00:14 UTC (rev 599)
@@ -109,6 +109,24 @@
     }
   
     /**
+     * Include select-column of code as mine.
+     * Alias name is java-name of this column.
+     * Be careful to whether your table have the same column.
+     */
+    public void includeAsMine_Code() {
+        registerIncludedSelectColumn("Code", getRealColumnName("CODE"));
+    }
+
+    /**
+     * Include select-column of code as mine.
+     * 
+     * @param aliasName Alias name. {select columnName as aliasName from ...} This should not contain comma. (NotNull)
+     */
+    public void includeAsMine_Code(String aliasName) {
+        registerIncludedSelectColumn(aliasName, getRealColumnName("CODE"));
+    }
+  
+    /**
      * Include select-column of model as mine.
      * Alias name is java-name of this column.
      * Be careful to whether your table have the same column.
@@ -364,6 +382,48 @@
     }
       
     // /- - - - - - - - - - - - - - - - - - - - - - -
+    //   Column = [CODE]
+    // - - - - - - - - -/
+
+    /** The attribute of code. */
+    protected ConditionValue _code;
+
+    /**
+     * Get the value of code.
+     * 
+     * @return The value of code.
+     */
+    public ConditionValue getCode() {
+        if (_code == null) {
+            _code = new ConditionValue();
+        }
+        return _code;
+    }
+
+    protected ConditionValue getCValueCode() {
+        return getCode();
+    }
+
+                                                      
+    /**
+     * Add order-by of code as ASC.
+     * 
+     * @return this. (NotNull)
+     */
+    public BsOrderProductCQ addOrderBy_Code_Asc() {
+        getSqlClause().registerOrderBy(getRealColumnName(COL_CODE), null, true);return this;
+    }
+
+    /**
+     * Add order-by of code as DESC.
+     * 
+     * @return this. (NotNull)
+     */
+    public BsOrderProductCQ addOrderBy_Code_Desc() {
+        getSqlClause().registerOrderBy(getRealColumnName(COL_CODE), null, false);return this;
+    }
+      
+    // /- - - - - - - - - - - - - - - - - - - - - - -
     //   Column = [MODEL]
     // - - - - - - - - -/
 

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/AddressBookCIQ.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/AddressBookCIQ.java	2007-09-30 13:20:43 UTC (rev 598)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/AddressBookCIQ.java	2007-10-01 13:00:14 UTC (rev 599)
@@ -129,6 +129,22 @@
 
                                                         
     // /- - - - - - - - - - - - - - - - - - - - - - -
+    //   Column = [FIRSTNAME_DESCRIPTION]
+    // - - - - - - - - -/
+    protected ConditionValue getCValueFirstnameDescription() {
+        return _myCQ.getFirstnameDescription();
+    }
+
+                                                            
+    // /- - - - - - - - - - - - - - - - - - - - - - -
+    //   Column = [LASTNAME_DESCRIPTION]
+    // - - - - - - - - -/
+    protected ConditionValue getCValueLastnameDescription() {
+        return _myCQ.getLastnameDescription();
+    }
+
+                                                            
+    // /- - - - - - - - - - - - - - - - - - - - - - -
     //   Column = [STREET_ADDRESS]
     // - - - - - - - - -/
     protected ConditionValue getCValueStreetAddress() {

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/CustomerCIQ.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/CustomerCIQ.java	2007-09-30 13:20:43 UTC (rev 598)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/CustomerCIQ.java	2007-10-01 13:00:14 UTC (rev 599)
@@ -171,6 +171,22 @@
 
                                                         
     // /- - - - - - - - - - - - - - - - - - - - - - -
+    //   Column = [FIRSTNAME_DESCRIPTION]
+    // - - - - - - - - -/
+    protected ConditionValue getCValueFirstnameDescription() {
+        return _myCQ.getFirstnameDescription();
+    }
+
+                                                            
+    // /- - - - - - - - - - - - - - - - - - - - - - -
+    //   Column = [LASTNAME_DESCRIPTION]
+    // - - - - - - - - -/
+    protected ConditionValue getCValueLastnameDescription() {
+        return _myCQ.getLastnameDescription();
+    }
+
+                                                            
+    // /- - - - - - - - - - - - - - - - - - - - - - -
     //   Column = [NICKNAME]
     // - - - - - - - - -/
     protected ConditionValue getCValueNickname() {

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-30 13:20:43 UTC (rev 598)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/OrderFormCIQ.java	2007-10-01 13:00:14 UTC (rev 599)
@@ -174,6 +174,22 @@
 
                                                         
     // /- - - - - - - - - - - - - - - - - - - - - - -
+    //   Column = [CUSTOMER_FIRSTNAME_DESCRIPTION]
+    // - - - - - - - - -/
+    protected ConditionValue getCValueCustomerFirstnameDescription() {
+        return _myCQ.getCustomerFirstnameDescription();
+    }
+
+                                                            
+    // /- - - - - - - - - - - - - - - - - - - - - - -
+    //   Column = [CUSTOMER_LASTNAME_DESCRIPTION]
+    // - - - - - - - - -/
+    protected ConditionValue getCValueCustomerLastnameDescription() {
+        return _myCQ.getCustomerLastnameDescription();
+    }
+
+                                                            
+    // /- - - - - - - - - - - - - - - - - - - - - - -
     //   Column = [CUSTOMER_DAY_OF_BIRTH]
     // - - - - - - - - -/
     protected ConditionValue getCValueCustomerDayOfBirth() {
@@ -302,6 +318,22 @@
 
                                                         
     // /- - - - - - - - - - - - - - - - - - - - - - -
+    //   Column = [DELIVERY_FIRSTNAME_DESCRIPTION]
+    // - - - - - - - - -/
+    protected ConditionValue getCValueDeliveryFirstnameDescription() {
+        return _myCQ.getDeliveryFirstnameDescription();
+    }
+
+                                                            
+    // /- - - - - - - - - - - - - - - - - - - - - - -
+    //   Column = [DELIVERY_LAST_DESCRIPTION]
+    // - - - - - - - - -/
+    protected ConditionValue getCValueDeliveryLastDescription() {
+        return _myCQ.getDeliveryLastDescription();
+    }
+
+                                                            
+    // /- - - - - - - - - - - - - - - - - - - - - - -
     //   Column = [DELIVERY_STREET_ADDRESS]
     // - - - - - - - - -/
     protected ConditionValue getCValueDeliveryStreetAddress() {
@@ -398,6 +430,22 @@
 
                                                         
     // /- - - - - - - - - - - - - - - - - - - - - - -
+    //   Column = [BILLING_FIRSTNAME_DESCRIPTION]
+    // - - - - - - - - -/
+    protected ConditionValue getCValueBillingFirstnameDescription() {
+        return _myCQ.getBillingFirstnameDescription();
+    }
+
+                                                            
+    // /- - - - - - - - - - - - - - - - - - - - - - -
+    //   Column = [BILLING_LASTNAME_DESCRIPTION]
+    // - - - - - - - - -/
+    protected ConditionValue getCValueBillingLastnameDescription() {
+        return _myCQ.getBillingLastnameDescription();
+    }
+
+                                                            
+    // /- - - - - - - - - - - - - - - - - - - - - - -
     //   Column = [BILLING_STREET_ADDRESS]
     // - - - - - - - - -/
     protected ConditionValue getCValueBillingStreetAddress() {

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-30 13:20:43 UTC (rev 598)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/OrderProductCIQ.java	2007-10-01 13:00:14 UTC (rev 599)
@@ -109,6 +109,14 @@
     }
                                                 
     // /- - - - - - - - - - - - - - - - - - - - - - -
+    //   Column = [CODE]
+    // - - - - - - - - -/
+    protected ConditionValue getCValueCode() {
+        return _myCQ.getCode();
+    }
+
+                                                            
+    // /- - - - - - - - - - - - - - - - - - - - - - -
     //   Column = [MODEL]
     // - - - - - - - - -/
     protected ConditionValue getCValueModel() {

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/CustomerDxo.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/CustomerDxo.java	2007-09-30 13:20:43 UTC (rev 598)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/CustomerDxo.java	2007-10-01 13:00:14 UTC (rev 599)
@@ -7,33 +7,12 @@
 import jp.sf.pal.pompei.exentity.AddressBook;
 import jp.sf.pal.pompei.exentity.Customer;
 import jp.sf.pal.pompei.web.admin.customer.AbstractCustomerEditPage;
-import jp.sf.pal.pompei.web.admin.customer.CustomerConfirmPage;
 import jp.sf.pal.pompei.web.user.checkout.CheckoutConfirmPage;
 import jp.sf.pal.pompei.web.user.checkout.UserAddressSelectPage;
 import jp.sf.pal.pompei.web.user.checkout.UserInfoEditPage;
 
-import org.seasar.extension.dxo.annotation.ConversionRule;
-
 public interface CustomerDxo extends Serializable {
 
-    Customer convert(AbstractCustomerEditPage memberEditPage);
-
-    AddressBook convertAddress(AbstractCustomerEditPage memberEditPage);
-
-    Customer convert(CustomerConfirmPage memberConfirmPage);
-
-    AddressBook convertAddress(CustomerConfirmPage memberConfirmPage);
-
-    //TODO
-    @ConversionRule("customerId : customerId" + ",lastName : lLastname"
-            + ",firstName : customerFirstname"
-            + ",entryCity : addressBook.entryCity"
-            + ",entryState : addressBook.entryState"
-            + ",entryCompany : addressBook.entryCompany")
-    List<Map<String, Object>> convertMap(List memberItems);
-
-    //TODO above methods might not be needed..
-
     public void convert(AbstractCustomerEditPage memberConfirmPage,
             AddressBook book);
 

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserInfoEditAction.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserInfoEditAction.java	2007-09-30 13:20:43 UTC (rev 598)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserInfoEditAction.java	2007-10-01 13:00:14 UTC (rev 599)
@@ -3,11 +3,15 @@
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.sql.Timestamp;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 import javax.faces.context.FacesContext;
 
+import jp.sf.pal.common.util.DateUtil;
 import jp.sf.pal.common.util.FacesMessageUtil;
 import jp.sf.pal.pompei.PompeiConstants;
 import jp.sf.pal.pompei.dxo.CustomerDxo;
@@ -44,24 +48,72 @@
     }
 
     public Class<?> prerender() {
+        //TODO to initialize
+        // state items
+        List<Map<String, String>> stateItems = new ArrayList<Map<String, String>>();
+        String states = getUserInfoEditPage().getLabelHelper().getLabelValue(
+                "state.items");
+        String[] stateArray = states.split(",");
+        for (String state : stateArray) {
+            Map<String, String> map = new HashMap<String, String>();
+            map.put("label", state);
+            map.put("value", state);
+            stateItems.add(map);
+        }
+        getUserInfoEditPage().setStateItems(stateItems);
+        // dayOfBirth
+        Date now = new Date();
+        List<Map<String, String>> yearOfDayOfBirthItems = new ArrayList<Map<String, String>>();
+        int year = DateUtil.getYear(now) + 1900;
+        for (int i = 0; i < 100; i++) {
+            Map<String, String> map = new HashMap<String, String>();
+            map.put("label", Integer.toString(year - i));
+            map.put("value", Integer.toString(year - i));
+            yearOfDayOfBirthItems.add(map);
+        }
+        getUserInfoEditPage().setYearOfDayOfBirthItems(yearOfDayOfBirthItems);
+        getUserInfoEditPage().setYearOfDayOfBirth(new Integer(year));
+
+        List<Map<String, String>> monthOfDayOfBirthItems = new ArrayList<Map<String, String>>();
+        for (int i = 1; i < 13; i++) {
+            Map<String, String> map = new HashMap<String, String>();
+            map.put("label", Integer.toString(i));
+            map.put("value", Integer.toString(i));
+            monthOfDayOfBirthItems.add(map);
+        }
+        getUserInfoEditPage().setMonthOfDayOfBirthItems(monthOfDayOfBirthItems);
+        getUserInfoEditPage().setMonthOfDayOfBirth(
+                new Integer(DateUtil.getMonth(now) + 1));
+
+        List<Map<String, String>> dateOfDayOfBirthItems = new ArrayList<Map<String, String>>();
+        for (int i = 1; i < 32; i++) {
+            Map<String, String> map = new HashMap<String, String>();
+            map.put("label", Integer.toString(i));
+            map.put("value", Integer.toString(i));
+            dateOfDayOfBirthItems.add(map);
+        }
+        getUserInfoEditPage().setDateOfDayOfBirthItems(dateOfDayOfBirthItems);
+        getUserInfoEditPage().setDateOfDayOfBirth(
+                new Integer(DateUtil.getDate(now)));
+
         // check login
         String remoteUser = FacesContext.getCurrentInstance()
                 .getExternalContext().getRemoteUser();
         if (remoteUser == null) {
-            getUserInfoEditPage().setIsLogin(false);
-            getUserInfoEditPage().setIsUser(false);
+            getUserInfoEditPage().setLogin(false);
+            getUserInfoEditPage().setUser(false);
             return null;
         }
-        getUserInfoEditPage().setIsLogin(true);
+        getUserInfoEditPage().setLogin(true);
         getUserInfoEditPage().setPortalId(remoteUser);
 
         Customer customer = getCustomerService().getCustomerByPortalId(
                 remoteUser);
         if (customer == null) {
-            getUserInfoEditPage().setIsUser(false);
+            getUserInfoEditPage().setUser(false);
             return null;
         }
-        getUserInfoEditPage().setIsUser(true);
+        getUserInfoEditPage().setUser(true);
 
         getCustomerDxo().convert(customer, getUserInfoEditPage());
         // set default address
@@ -71,34 +123,126 @@
             getCustomerDxo().convert(defaultAddressBook, getUserInfoEditPage());
         }
 
+        if (getUserInfoEditPage().isEdit()) {
+            postprocessingForRender();
+        }
+
         // render FacesMessages
         FacesMessageUtil.renderMessages();
         return null;
     }
 
-    public Class<?> doRegister() {
-        Date now = new Date();
-        Customer customer = new Customer();
-        customer.setDateAdded(new Timestamp(now.getTime()));
-        customer.setLastModified(new Timestamp(now.getTime()));
-        AddressBook addressBook = new AddressBook();
-        getCustomerDxo().convert(getUserInfoEditPage(), customer);
-        getCustomerDxo().convert(getUserInfoEditPage(), addressBook);
+    private void postprocessingForRender() {
+        // day of birth
+        if (getUserInfoEditPage().getDayOfBirth() != null) {
+            Date b = getUserInfoEditPage().getDayOfBirth();
+            getUserInfoEditPage().setYearOfDayOfBirth(
+                    DateUtil.getYear(b) + 1900);
+            getUserInfoEditPage()
+                    .setMonthOfDayOfBirth(DateUtil.getMonth(b) + 1);
+            getUserInfoEditPage().setDateOfDayOfBirth(DateUtil.getDate(b));
+        }
 
-        //TODO zone and check if it's null
-        Zone zones = getCustomerService().getZone(new BigDecimal(130));
-        addressBook.setZoneId(zones.getZoneId());
-        //TODO countries and check if it's null
-        addressBook.setCountryId(zones.getCountry().getCountryId());
-        //TODO select language
-        addressBook.setLanguageId(getLanguageService().getDefaultLanguage()
-                .getLanguageId());
-        // set default address
-        addressBook.setDefaultAddress(PompeiConstants.TRUE_BIGDECIMAL);
+        // postcode
+        if (getUserInfoEditPage().getPostcode() != null) {
+            String[] postcode = getUserInfoEditPage().getPostcode().split("-");
+            if (postcode.length == 2) {
+                getUserInfoEditPage().setPrimaryPostcode(postcode[0]);
+                getUserInfoEditPage().setSecondaryPostcode(postcode[1]);
+            }
+        }
 
-        getCustomerService().addCustomer(customer, addressBook);
+        // email Confirmation
+        getUserInfoEditPage().setEmailAddressConfirm(
+                getUserInfoEditPage().getEmailAddress());
+    }
 
-        FacesMessageUtil.addInfoMessage("added.customer");
+    private void preprocessingForUpdate() {
+        // day of birth
+        getUserInfoEditPage().setDayOfBirth(
+                DateUtil.get(
+                        getUserInfoEditPage().getYearOfDayOfBirth() - 1900,
+                        getUserInfoEditPage().getMonthOfDayOfBirth() - 1,
+                        getUserInfoEditPage().getDateOfDayOfBirth()));
+
+        // postcode
+        getUserInfoEditPage().setPostcode(
+                getUserInfoEditPage().getPrimaryPostcode() + "-"
+                        + getUserInfoEditPage().getSecondaryPostcode());
+    }
+
+    public Class<?> doUpdate() {
+        // check email
+        if (!getUserInfoEditPage().getEmailAddress().equals(
+                getUserInfoEditPage().getEmailAddressConfirm())) {
+            FacesMessageUtil.addWarnMessage("email.address.does.not.match");
+            return null;
+        }
+
+        preprocessingForUpdate();
+        if (PompeiConstants.UPDATE_MODE.equals(getUserInfoEditPage().getMode())) {
+            // update
+            // check login
+            String remoteUser = FacesContext.getCurrentInstance()
+                    .getExternalContext().getRemoteUser();
+            if (remoteUser == null) {
+                //TODO needs message?
+                return null;
+            }
+
+            Customer customer = getCustomerService().getCustomerByPortalId(
+                    remoteUser);
+            if (customer == null) {
+                FacesMessageUtil
+                        .addErrorMessage("could.not.find.customer.in.userinfoedit");
+                return null;
+            }
+
+            AddressBook defaultAddressBook = getCustomerService()
+                    .getDefaultAddressBook(customer.getCustomerId());
+            if (defaultAddressBook == null) {
+                FacesMessageUtil
+                        .addErrorMessage("could.not.find.default.address.book.in.userinfoedit");
+                return null;
+            }
+
+            Date now = new Date();
+            customer.setLastModified(new Timestamp(now.getTime()));
+
+            // do not put customerId and addressBookId on user's userInfoEdit.html
+            getCustomerDxo().convert(getUserInfoEditPage(), customer);
+            getCustomerDxo().convert(getUserInfoEditPage(), defaultAddressBook);
+
+            getCustomerService().updateCustomer(customer, defaultAddressBook);
+
+            getUserInfoEditPage().setMode(null);
+            FacesMessageUtil.addInfoMessage("updated.customer");
+        } else {
+            // new
+            Date now = new Date();
+            Customer customer = new Customer();
+            customer.setDateAdded(new Timestamp(now.getTime()));
+            customer.setLastModified(new Timestamp(now.getTime()));
+            AddressBook addressBook = new AddressBook();
+            getCustomerDxo().convert(getUserInfoEditPage(), customer);
+            getCustomerDxo().convert(getUserInfoEditPage(), addressBook);
+
+            //TODO zone and check if it's null
+            Zone zones = getCustomerService().getZone(new BigDecimal(130));
+            addressBook.setZoneId(zones.getZoneId());
+            //TODO countries and check if it's null
+            addressBook.setCountryId(zones.getCountry().getCountryId());
+            //TODO select language
+            addressBook.setLanguageId(getLanguageService().getDefaultLanguage()
+                    .getLanguageId());
+            // set default address
+            addressBook.setDefaultAddress(PompeiConstants.TRUE_BIGDECIMAL);
+
+            getCustomerService().addCustomer(customer, addressBook);
+
+            FacesMessageUtil.addInfoMessage("added.customer");
+        }
+
         return UserInfoEditPage.class;
     }
 
@@ -122,10 +266,15 @@
     }
 
     public Class<?> doModify() {
-        //TODO modify info
-        return null;
+        getUserInfoEditPage().setMode(PompeiConstants.UPDATE_MODE);
+        return UserInfoEditPage.class;
     }
 
+    public Class<?> doCancel() {
+        getUserInfoEditPage().setMode(null);
+        return UserInfoEditPage.class;
+    }
+
     /**
      * @return userInfoEditPage
      */

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserInfoEditPage.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserInfoEditPage.java	2007-09-30 13:20:43 UTC (rev 598)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserInfoEditPage.java	2007-10-01 13:00:14 UTC (rev 599)
@@ -3,8 +3,13 @@
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
+import jp.sf.pal.pompei.PompeiConstants;
+
 import org.seasar.teeda.extension.annotation.convert.DateTimeConverter;
+import org.seasar.teeda.extension.annotation.validator.Required;
 import org.seasar.teeda.extension.util.LabelHelper;
 
 public class UserInfoEditPage implements Serializable {
@@ -20,18 +25,32 @@
 
     private String cellphone;
 
+    @Required
     private String emailAddress;
 
+    @Required
+    private String emailAddressConfirm;
+
     private String fax;
 
+    @Required
     private String firstname;
 
+    @Required
+    private String firstnameDescription;
+
+    @Required
     private String gender;
 
+    @Required
     private String lastname;
 
+    @Required
+    private String lastnameDescription;
+
     private String telephone;
 
+    @Required
     private String city;
 
     private String company;
@@ -40,8 +59,18 @@
 
     private String postcode;
 
+    @Required
+    private String primaryPostcode;
+
+    @Required
+    private String secondaryPostcode;
+
+    private List<Map<String, String>> stateItems;
+
+    @Required
     private String state;
 
+    @Required
     private String streetAddress;
 
     private String portalId;
@@ -51,10 +80,27 @@
     @DateTimeConverter(pattern = "yyyy/MM/dd")
     private Date dayOfBirth;
 
-    private boolean isUser;
+    @Required
+    private Integer yearOfDayOfBirth;
 
-    private boolean isLogin;
+    private List<Map<String, String>> yearOfDayOfBirthItems;
 
+    @Required
+    private Integer monthOfDayOfBirth;
+
+    private List<Map<String, String>> monthOfDayOfBirthItems;
+
+    @Required
+    private Integer dateOfDayOfBirth;
+
+    private List<Map<String, String>> dateOfDayOfBirthItems;
+
+    private boolean user;
+
+    private boolean login;
+
+    private String mode;
+
     /**
      * @return labelHelper
      */
@@ -216,11 +262,11 @@
     }
 
     public boolean isUser() {
-        return isUser;
+        return user;
     }
 
-    public void setIsUser(boolean flag) {
-        isUser = flag;
+    public void setUser(boolean flag) {
+        user = flag;
     }
 
     public String getEntryFax() {
@@ -244,11 +290,11 @@
     }
 
     public boolean isLogin() {
-        return isLogin;
+        return login;
     }
 
-    public void setIsLogin(boolean flag) {
-        isLogin = flag;
+    public void setLogin(boolean flag) {
+        login = flag;
     }
 
     public String getGenderString() {
@@ -268,4 +314,199 @@
     public void setDayOfBirth(Date dayOfBirth) {
         this.dayOfBirth = dayOfBirth;
     }
+
+    /**
+     * @return stateItems
+     */
+    public List<Map<String, String>> getStateItems() {
+        return stateItems;
+    }
+
+    /**
+     * @param stateItems 設定する stateItems
+     */
+    public void setStateItems(List<Map<String, String>> stateItems) {
+        this.stateItems = stateItems;
+    }
+
+    /**
+     * @return firstnameDescription
+     */
+    public String getFirstnameDescription() {
+        return firstnameDescription;
+    }
+
+    /**
+     * @param firstnameDescription 設定する firstnameDescription
+     */
+    public void setFirstnameDescription(String firstnameDescription) {
+        this.firstnameDescription = firstnameDescription;
+    }
+
+    /**
+     * @return lastnameDescription
+     */
+    public String getLastnameDescription() {
+        return lastnameDescription;
+    }
+
+    /**
+     * @param lastnameDescription 設定する lastnameDescription
+     */
+    public void setLastnameDescription(String lastnameDescription) {
+        this.lastnameDescription = lastnameDescription;
+    }
+
+    /**
+     * @return emailAddressConfirm
+     */
+    public String getEmailAddressConfirm() {
+        return emailAddressConfirm;
+    }
+
+    /**
+     * @param emailAddressConfirm 設定する emailAddressConfirm
+     */
+    public void setEmailAddressConfirm(String emailAddressConfirm) {
+        this.emailAddressConfirm = emailAddressConfirm;
+    }
+
+    /**
+     * @return primaryPostcode
+     */
+    public String getPrimaryPostcode() {
+        return primaryPostcode;
+    }
+
+    /**
+     * @param primaryPostcode 設定する primaryPostcode
+     */
+    public void setPrimaryPostcode(String primaryPostcode) {
+        this.primaryPostcode = primaryPostcode;
+    }
+
+    /**
+     * @return secondaryPostcode
+     */
+    public String getSecondaryPostcode() {
+        return secondaryPostcode;
+    }
+
+    /**
+     * @param secondaryPostcode 設定する secondaryPostcode
+     */
+    public void setSecondaryPostcode(String secondaryPostcode) {
+        this.secondaryPostcode = secondaryPostcode;
+    }
+
+    /**
+     * @return yearOfDayOfBirth
+     */
+    public Integer getYearOfDayOfBirth() {
+        return yearOfDayOfBirth;
+    }
+
+    /**
+     * @param yearOfDayOfBirth 設定する yearOfDayOfBirth
+     */
+    public void setYearOfDayOfBirth(Integer yearOfDayOfBirth) {
+        this.yearOfDayOfBirth = yearOfDayOfBirth;
+    }
+
+    /**
+     * @return yearOfDayOfBirthItems
+     */
+    public List<Map<String, String>> getYearOfDayOfBirthItems() {
+        return yearOfDayOfBirthItems;
+    }
+
+    /**
+     * @param yearOfDayOfBirthItems 設定する yearOfDayOfBirthItems
+     */
+    public void setYearOfDayOfBirthItems(
+            List<Map<String, String>> yearOfDayOfBirthItems) {
+        this.yearOfDayOfBirthItems = yearOfDayOfBirthItems;
+    }
+
+    /**
+     * @return monthOfDayOfBirth
+     */
+    public Integer getMonthOfDayOfBirth() {
+        return monthOfDayOfBirth;
+    }
+
+    /**
+     * @param monthOfDayOfBirth 設定する monthOfDayOfBirth
+     */
+    public void setMonthOfDayOfBirth(Integer monthOfDayOfBirth) {
+        this.monthOfDayOfBirth = monthOfDayOfBirth;
+    }
+
+    /**
+     * @return monthOfDayOfBirthItems
+     */
+    public List<Map<String, String>> getMonthOfDayOfBirthItems() {
+        return monthOfDayOfBirthItems;
+    }
+
+    /**
+     * @param monthOfDayOfBirthItems 設定する monthOfDayOfBirthItems
+     */
+    public void setMonthOfDayOfBirthItems(
+            List<Map<String, String>> monthOfDayOfBirthItems) {
+        this.monthOfDayOfBirthItems = monthOfDayOfBirthItems;
+    }
+
+    /**
+     * @return dateOfDayOfBirth
+     */
+    public Integer getDateOfDayOfBirth() {
+        return dateOfDayOfBirth;
+    }
+
+    /**
+     * @param dateOfDayOfBirth 設定する dateOfDayOfBirth
+     */
+    public void setDateOfDayOfBirth(Integer dateOfDayOfBirth) {
+        this.dateOfDayOfBirth = dateOfDayOfBirth;
+    }
+
+    /**
+     * @return dateOfDayOfBirthItems
+     */
+    public List<Map<String, String>> getDateOfDayOfBirthItems() {
+        return dateOfDayOfBirthItems;
+    }
+
+    /**
+     * @param dateOfDayOfBirthItems 設定する dateOfDayOfBirthItems
+     */
+    public void setDateOfDayOfBirthItems(
+            List<Map<String, String>> dateOfDayOfBirthItems) {
+        this.dateOfDayOfBirthItems = dateOfDayOfBirthItems;
+    }
+
+    public boolean isEdit() {
+        if (!isUser()) {
+            return true;
+        }
+        if (isUser() && PompeiConstants.UPDATE_MODE.equals(mode)) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * @return mode
+     */
+    public String getMode() {
+        return mode;
+    }
+
+    /**
+     * @param mode 設定する mode
+     */
+    public void setMode(String mode) {
+        this.mode = mode;
+    }
 }

Modified: pompei/portlets/pompei-core/trunk/src/main/resources/appMessages.properties
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/resources/appMessages.properties	2007-09-30 13:20:43 UTC (rev 598)
+++ pompei/portlets/pompei-core/trunk/src/main/resources/appMessages.properties	2007-10-01 13:00:14 UTC (rev 599)
@@ -113,7 +113,11 @@
 
 # UserInfoEditAction.java
 added.customer=\u4f1a\u54e1\u60c5\u5831\u3092\u767b\u9332\u3057\u307e\u3057\u305f\u3002
+updated.customer=\u4f1a\u54e1\u60c5\u5831\u3092\u66f4\u65b0\u3057\u307e\u3057\u305f\u3002
 could.not.find.customer.id.in.userinfoedit=\u6307\u5b9a\u3055\u308c\u305f\u4f1a\u54e1\u60c5\u5831\u304c\u6b63\u3057\u304f\u3042\u308a\u307e\u305b\u3093\u3002\u5165\u529b\u3057\u305f\u5024\u3092\u78ba\u8a8d\u3057\u3066\u3001\u518d\u5ea6\u8a66\u3057\u3066\u304f\u3060\u3055\u3044\u3002
+could.not.find.customer.in.userinfoedit=\u6307\u5b9a\u3055\u308c\u305f\u4f1a\u54e1\u60c5\u5831\u304c\u6b63\u3057\u304f\u3042\u308a\u307e\u305b\u3093\u3002\u5165\u529b\u3057\u305f\u5024\u3092\u78ba\u8a8d\u3057\u3066\u3001\u518d\u5ea6\u8a66\u3057\u3066\u304f\u3060\u3055\u3044\u3002
+could.not.find.default.address.book.in.userinfoedit=\u6307\u5b9a\u3055\u308c\u305f\u4f1a\u54e1\u60c5\u5831\u304c\u6b63\u3057\u304f\u3042\u308a\u307e\u305b\u3093\u3002\u5165\u529b\u3057\u305f\u5024\u3092\u78ba\u8a8d\u3057\u3066\u3001\u518d\u5ea6\u8a66\u3057\u3066\u304f\u3060\u3055\u3044\u3002
+email.address.does.not.match=\u78ba\u8a8d\u7528\u306b\u5165\u529b\u3055\u308c\u305f\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u3068\u4e00\u81f4\u3057\u307e\u305b\u3093\u3002\u518d\u5ea6\u3001\u5165\u529b\u3057\u305f\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u3092\u3054\u78ba\u8a8d\u304f\u3060\u3055\u3044\u3002
 
 # ProductDetailsAction.java
 could.not.find.product.in.productdetail=\u5bfe\u8c61\u306e\u5546\u54c1\u60c5\u5831\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002

Modified: pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/admin/order/label.properties
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/admin/order/label.properties	2007-09-30 13:20:43 UTC (rev 598)
+++ pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/admin/order/label.properties	2007-10-01 13:00:14 UTC (rev 599)
@@ -3,4 +3,5 @@
 orderConfirm.title=\u6ce8\u6587\u7ba1\u7406\u3000\u78ba\u8a8d\u753b\u9762
 
 M=\u7537\u6027
-F=\u5973\u6027
\ No newline at end of file
+F=\u5973\u6027
+state.items=\u5317\u6d77\u9053,\u9752\u68ee\u770c,\u5ca9\u624b\u770c,\u5bae\u57ce\u770c,\u79cb\u7530\u770c,\u5c71\u5f62\u770c,\u798f\u5cf6\u770c,\u8328\u57ce\u770c,\u6803\u6728\u770c,\u7fa4\u99ac\u770c,\u57fc\u7389\u770c,\u5343\u8449\u770c,\u6771\u4eac\u90fd,\u795e\u5948\u5ddd\u770c,\u65b0\u6f5f\u770c,\u5bcc\u5c71\u770c,\u77f3\u5ddd\u770c,\u798f\u4e95\u770c,\u5c71\u68a8\u770c,\u9577\u91ce\u770c,\u5c90\u961c\u770c,\u9759\u5ca1\u770c,\u611b\u77e5\u770c,\u4e09\u91cd\u770c,\u6ecb\u8cc0\u770c,\u4eac\u90fd\u5e9c,\u5927\u962a\u5e9c,\u5175\u5eab\u770c,\u5948\u826f\u770c,\u548c\u6b4c\u5c71\u770c,\u9ce5\u53d6\u770c,\u5cf6\u6839\u770c,\u5ca1\u5c71\u770c,\u5e83\u5cf6\u770c,\u5c71\u53e3\u770c,\u5fb3\u5cf6\u770c,\u9999\u5ddd\u770c,\u611b\u5a9b\u770c,\u9ad8\u77e5\u770c,\u798f\u5ca1\u770c,\u4f50\u8cc0\u770c,\u9577\u5d0e\u770c,\u718a\u672c\u770c,\u5927\u5206\u770c,\u5bae\u5d0e\u770c,\u9e7f\u5150\u5cf6\u770c,\u6c96\u7e04\u770c,

Modified: pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/checkout/label.properties
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/checkout/label.properties	2007-09-30 13:20:43 UTC (rev 598)
+++ pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/checkout/label.properties	2007-10-01 13:00:14 UTC (rev 599)
@@ -3,4 +3,6 @@
 
 COD=\u4ee3\u91d1\u5f15\u63db\u3048
 BANK=\u9280\u884c\u632f\u8fbc\u307f
-CREDITCARD=\u30af\u30ec\u30b8\u30c3\u30c8\u30ab\u30fc\u30c9
\ No newline at end of file
+CREDITCARD=\u30af\u30ec\u30b8\u30c3\u30c8\u30ab\u30fc\u30c9
+
+state.items=\u5317\u6d77\u9053,\u9752\u68ee\u770c,\u5ca9\u624b\u770c,\u5bae\u57ce\u770c,\u79cb\u7530\u770c,\u5c71\u5f62\u770c,\u798f\u5cf6\u770c,\u8328\u57ce\u770c,\u6803\u6728\u770c,\u7fa4\u99ac\u770c,\u57fc\u7389\u770c,\u5343\u8449\u770c,\u6771\u4eac\u90fd,\u795e\u5948\u5ddd\u770c,\u65b0\u6f5f\u770c,\u5bcc\u5c71\u770c,\u77f3\u5ddd\u770c,\u798f\u4e95\u770c,\u5c71\u68a8\u770c,\u9577\u91ce\u770c,\u5c90\u961c\u770c,\u9759\u5ca1\u770c,\u611b\u77e5\u770c,\u4e09\u91cd\u770c,\u6ecb\u8cc0\u770c,\u4eac\u90fd\u5e9c,\u5927\u962a\u5e9c,\u5175\u5eab\u770c,\u5948\u826f\u770c,\u548c\u6b4c\u5c71\u770c,\u9ce5\u53d6\u770c,\u5cf6\u6839\u770c,\u5ca1\u5c71\u770c,\u5e83\u5cf6\u770c,\u5c71\u53e3\u770c,\u5fb3\u5cf6\u770c,\u9999\u5ddd\u770c,\u611b\u5a9b\u770c,\u9ad8\u77e5\u770c,\u798f\u5ca1\u770c,\u4f50\u8cc0\u770c,\u9577\u5d0e\u770c,\u718a\u672c\u770c,\u5927\u5206\u770c,\u5bae\u5d0e\u770c,\u9e7f\u5150\u5cf6\u770c,\u6c96\u7e04\u770c,

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-30 13:20:43 UTC (rev 598)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/db/create_table.sql	2007-10-01 13:00:14 UTC (rev 599)
@@ -2,8 +2,10 @@
        CUSTOMER_ID BIGINT NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 100, INCREMENT BY 1)
      , PORTAL_ID VARCHAR(255) NOT NULL
      , GENDER CHAR(1) NOT NULL
-     , FIRSTNAME VARCHAR(32) NOT NULL
-     , LASTNAME VARCHAR(32) NOT NULL
+     , FIRSTNAME VARCHAR(40) NOT NULL
+     , LASTNAME VARCHAR(40) NOT NULL
+     , FIRSTNAME_DESCRIPTION VARCHAR(40)
+     , LASTNAME_DESCRIPTION VARCHAR(40)
      , NICKNAME VARCHAR(64)
      , DAY_OF_BIRTH DATE NOT NULL DEFAULT '0000-00-00 00:00:00'
      , EMAIL_ADDRESS VARCHAR(128) NOT NULL
@@ -129,8 +131,10 @@
      , 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) NOT NULL
+     , CUSTOMER_FIRSTNAME VARCHAR(40) NOT NULL
+     , CUSTOMER_LASTNAME VARCHAR(40) NOT NULL
+     , CUSTOMER_FIRSTNAME_DESCRIPTION VARCHAR(40)
+     , CUSTOMER_LASTNAME_DESCRIPTION VARCHAR(40)
      , CUSTOMER_DAY_OF_BIRTH DATE NOT NULL
      , CUSTOMER_EMAIL_ADDRESS VARCHAR(128) NOT NULL
      , CUSTOMER_COMPANY VARCHAR(128)
@@ -145,8 +149,10 @@
      , CUSTOMER_LOCALE_NAME VARCHAR(16) NOT NULL
      , DELIVERY_COMPANY VARCHAR(128)
      , DELIVERY_DEPARTMENT VARCHAR(64)
-     , DELIVERY_FIRSTNAME VARCHAR(32) NOT NULL
-     , DELIVERY_LASTNAME VARCHAR(32) NOT NULL
+     , DELIVERY_FIRSTNAME VARCHAR(40) NOT NULL
+     , DELIVERY_LASTNAME VARCHAR(40) NOT NULL
+     , DELIVERY_FIRSTNAME_DESCRIPTION VARCHAR(40)
+     , DELIVERY_LAST_DESCRIPTION VARCHAR(40)
      , DELIVERY_STREET_ADDRESS VARCHAR(255) NOT NULL
      , DELIVERY_SUBURB VARCHAR(32)
      , DELIVERY_CITY VARCHAR(64) NOT NULL
@@ -157,8 +163,10 @@
      , DELIVERY_LOCALE_NAME VARCHAR(16) NOT NULL
      , BILLING_COMPANY VARCHAR(128)
      , BILLING_DEPARTMENT VARCHAR(64)
-     , BILLING_FIRSTNAME VARCHAR(32) NOT NULL
-     , BILLING_LASTNAME VARCHAR(32) NOT NULL
+     , BILLING_FIRSTNAME VARCHAR(40) NOT NULL
+     , BILLING_LASTNAME VARCHAR(40) NOT NULL
+     , BILLING_FIRSTNAME_DESCRIPTION VARCHAR(40)
+     , BILLING_LASTNAME_DESCRIPTION VARCHAR(40)
      , BILLING_STREET_ADDRESS VARCHAR(255) NOT NULL
      , BILLING_SUBURB VARCHAR(32)
      , BILLING_CITY VARCHAR(64) NOT NULL
@@ -293,6 +301,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
+     , CODE VARCHAR(64)
      , MODEL VARCHAR(64)
      , PRICE DECIMAL(15, 4) NOT NULL
      , FINAL_PRICE DECIMAL(15,4) NOT NULL
@@ -490,8 +499,10 @@
      , CUSTOMER_ID BIGINT NOT NULL
      , COMPANY VARCHAR(128)
      , DEPARTMENT VARCHAR(64)
-     , FIRSTNAME VARCHAR(32) NOT NULL
-     , LASTNAME VARCHAR(32) NOT NULL
+     , FIRSTNAME VARCHAR(40) NOT NULL
+     , LASTNAME VARCHAR(40) NOT NULL
+     , FIRSTNAME_DESCRIPTION VARCHAR(40)
+     , LASTNAME_DESCRIPTION VARCHAR(40)
      , STREET_ADDRESS VARCHAR(255) NOT NULL
      , SUBURB VARCHAR(32)
      , CITY VARCHAR(64) NOT NULL

Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/userInfoEdit.html
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/userInfoEdit.html	2007-09-30 13:20:43 UTC (rev 598)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/userInfoEdit.html	2007-10-01 13:00:14 UTC (rev 599)
@@ -18,154 +18,213 @@
         </span>
       </div>
       <div id="isLogin">
-      <div id="isNotUser">
+      <div id="isEdit">
         <div class="portlet-section-header">ユーザー情報登録</div>
         <table>
           <tbody>
             <tr>
-              <th>
-                <label>氏名(姓):</label>
+              <th align="left">
+                <label>名字:</label><font color="#009900">[必須]</font>
               </th>
               <td>
-                <input id="lastname" type="text" class="portlet-form-input-field" />
+                <input id="lastname" type="text" class="portlet-form-input-field" size="20"/>
               </td>
             </tr>
             <tr>
-              <th>
-                <label>氏名(名):</label>
+              <th align="left">
+                <label>名前:</label><font color="#009900">[必須]</font>
               </th>
               <td>
-                <input id="firstname" type="text" class="portlet-form-input-field" />
+                <input id="firstname" type="text" class="portlet-form-input-field" size="20"/>
               </td>
             </tr>
             <tr>
-              <th>
-                <label>性別:</label>
+              <th align="left">
+                <label>名字 (フリガナ):</label><font color="#009900">[必須]</font>
               </th>
               <td>
+                <input id="lastnameDescription" type="text" class="portlet-form-input-field" size="20"/>
+              </td>
+            </tr>
+            <tr>
+              <th align="left">
+                <label>名前 (フリガナ):</label><font color="#009900">[必須]</font>
+              </th>
+              <td>
+                <input id="firstnameDescription" type="text" class="portlet-form-input-field" size="20"/>
+              </td>
+            </tr>
+            <tr>
+              <th align="left">
+                <label>性別:</label><font color="#009900">[必須]</font>
+              </th>
+              <td>
                 <span id="gender">
-                  <input type="radio" name="gender" value="M" class="portlet-form-field-label" />男性
-                  <input type="radio" name="gender" value="F" class="portlet-form-field-label" />女性
+                  <label><input type="radio" name="gender" value="M" class="portlet-form-field-label" />男性</label>
+                  <label><input type="radio" name="gender" value="F" class="portlet-form-field-label" />女性</label>
                 </span>
               </td>
             </tr>
 <!-- TODO: customers_dob -->
             <tr>
-              <th>
-                <label>メールアドレス:</label>
+              <th align="left">
+                <label>メールアドレス:</label><font color="#009900">[必須]</font>
               </th>
               <td>
-                <input id="emailAddress" type="text" class="portlet-form-input-field" />
+                <input id="emailAddress" type="text" class="portlet-form-input-field" size="30"/>
               </td>
             </tr>
             <tr>
-              <th>
-                <label>生年月日:</label>
+              <th align="left">
+                <label>メールアドレス(確認):</label><font color="#009900">[必須]</font>
               </th>
               <td>
-                <input id="dayOfBirth" type="text" class="portlet-form-input-field" />
+                <input id="emailAddressConfirm" type="text" class="portlet-form-input-field" size="30"/>
               </td>
             </tr>
             <tr>
-              <th>
+              <th align="left">
+                <label>誕生日:</label><font color="#009900">[必須]</font>
+              </th>
+              <td>
+                <select id="yearOfDayOfBirth" class="portlet-form-input-field">
+                  <option>2000</option>
+                </select>
+                /
+                <select id="monthOfDayOfBirth" class="portlet-form-input-field">
+                  <option>1</option>
+                </select>
+                /
+                <select id="dateOfDayOfBirth" class="portlet-form-input-field">
+                  <option>1</option>
+                </select>
+                <!-- input id="dayOfBirth" type="text" class="portlet-form-input-field" /-->
+              </td>
+            </tr>
+            <tr>
+              <th align="left">
                 <label>電話番号:</label>
               </th>
               <td>
-                <input id="telephone" type="text" class="portlet-form-input-field" />
+                <input id="telephone" type="text" class="portlet-form-input-field" size="13"/>
               </td>
             </tr>
             <tr>
-              <th>
+              <th align="left">
                 <label>FAX:</label>
               </th>
               <td>
-                <input id="fax" type="text" class="portlet-form-input-field" />
+                <input id="fax" type="text" class="portlet-form-input-field" size="13"/>
               </td>
             </tr>
             <tr>
-              <th>
+              <th align="left">
                 <label>携帯電話番号:</label>
               </th>
               <td>
-                <input id="cellphone" type="text" class="portlet-form-input-field" />
+                <input id="cellphone" type="text" class="portlet-form-input-field" size="13"/>
               </td>
             </tr>
             <tr>
-              <th>
-                <label>郵便番号:</label>
+              <th align="left">
+                <label>郵便番号:</label><font color="#009900">[必須]</font>
               </th>
               <td>
-                <input id="postcode" type="text" class="portlet-form-input-field" />
+                <input id="primaryPostcode" type="text" class="portlet-form-input-field" size="3"/>
+                -
+                <input id="secondaryPostcode" type="text" class="portlet-form-input-field" size="4"/>
+                <!-- input id="postcode" type="text" class="portlet-form-input-field" / -->
               </td>
             </tr>
             <tr>
-              <th>
-                <label>都道府県:</label>
+              <th align="left">
+                <label>都道府県:</label><font color="#009900">[必須]</font>
               </th>
               <td>
-                <input id="state" type="text" class="portlet-form-input-field" />
+                <select id="state">
+                  <option value="bbb">hoge</option>
+                </select>
               </td>
             </tr>
             <tr>
-              <th>
-                <label>郡市区 (島、国):</label>
+              <th align="left">
+                <label>郡市区 (島、国):</label><font color="#009900">[必須]</font>
               </th>
               <td>
-                <input id="city" type="text" class="portlet-form-input-field" />
+                <input id="city" type="text" class="portlet-form-input-field" size="20"/>
               </td>
             </tr>
             <tr>
-              <th>
-                <label>それ以降の住所:</label>
+              <th align="left">
+                <label>それ以降の住所:</label><font color="#009900">[必須]</font>
               </th>
               <td>
-                <input id="streetAddress" type="text" class="portlet-form-input-field" />
+                <input id="streetAddress" type="text" class="portlet-form-input-field" size="40"/>
               </td>
             </tr>
             <tr>
-              <th>
+              <th align="left">
                 <label>会社名・団体名:</label>
               </th>
               <td>
-                <input id="company" type="text" class="portlet-form-input-field" />
+                <input id="company" type="text" class="portlet-form-input-field" size="20"/>
               </td>
             </tr>
             <tr>
-              <th>
+              <th align="left">
                 <label>部署名・役職:</label>
               </th>
               <td>
-                <input id="department" type="text" class="portlet-form-input-field" />
+                <input id="department" type="text" class="portlet-form-input-field" size="20"/>
               </td>
             </tr>
 <!-- TODO: entry_country_id -->
           </tbody>
         </table>
 <!-- Term of Licence -->
-        <input id="doRegister" type="button" value="登録" onclick="location.href='./userInfoEdit.html'" />
+        <input id="doUpdate" type="button" value="登録" onclick="location.href='./userInfoEdit.html'" />
+        <div id="isUser" style="display: inline;">
+          <a id="goUserInfoEdit" href="./userInfoEdit.html?fixed_mode=none">キャンセル</a>
+        </div>
       </div>
-      <div id="isUser">
+      <div id="isNotEdit">
         <div class="portlet-section-header">ユーザー情報の確認</div>
         <table>
           <tbody>
             <tr>
-              <th>
-                <label>氏名(姓):</label>
+              <th align="left">
+                <label>名字:</label>
               </th>
               <td>
                 <span id="lastname-display">VALUE</span>
               </td>
             </tr>
             <tr>
-              <th>
-                <label>氏名(名):</label>
+              <th align="left">
+                <label>名前:</label>
               </th>
               <td>
                 <span id="firstname-display">VALUE</span>
               </td>
             </tr>
             <tr>
-              <th>
+              <th align="left">
+                <label>名字 (フリガナ):</label>
+              </th>
+              <td>
+                <span id="lastnameDescription-display">VALUE</span>
+              </td>
+            </tr>
+            <tr>
+              <th align="left">
+                <label>名前 (フリガナ):</label>
+              </th>
+              <td>
+                <span id="firstnameDescription-display">VALUE</span>
+              </td>
+            </tr>
+            <tr>
+              <th align="left">
                 <label>性別:</label>
               </th>
               <td>
@@ -173,7 +232,7 @@
               </td>
             </tr>
             <tr>
-              <th>
+              <th align="left">
                 <label>メールアドレス:</label>
               </th>
               <td>
@@ -181,15 +240,15 @@
               </td>
             </tr>
             <tr>
-              <th>
-                <label>生年月日:</label>
+              <th align="left">
+                <label>誕生日:</label>
               </th>
               <td>
                 <span id="dayOfBirth-display">VALUE</span>
               </td>
             </tr>
             <tr>
-              <th>
+              <th align="left">
                 <label>電話番号:</label>
               </th>
               <td>
@@ -197,7 +256,7 @@
               </td>
             </tr>
             <tr>
-              <th>
+              <th align="left">
                 <label>FAX:</label>
               </th>
               <td>
@@ -205,7 +264,7 @@
               </td>
             </tr>
             <tr>
-              <th>
+              <th align="left">
                 <label>携帯電話番号:</label>
               </th>
               <td>
@@ -213,7 +272,7 @@
               </td>
             </tr>
             <tr>
-              <th>
+              <th align="left">
                 <label>郵便番号:</label>
               </th>
               <td>
@@ -221,7 +280,7 @@
               </td>
             </tr>
             <tr>
-              <th>
+              <th align="left">
                 <label>都道府県:</label>
               </th>
               <td>
@@ -229,7 +288,7 @@
               </td>
             </tr>
             <tr>
-              <th>
+              <th align="left">
                 <label>郡市区 (島、国):</label>
               </th>
               <td>
@@ -237,7 +296,7 @@
               </td>
             </tr>
             <tr>
-              <th>
+              <th align="left">
                 <label>それ以降の住所:</label>
               </th>
               <td>
@@ -245,7 +304,7 @@
               </td>
             </tr>
             <tr>
-              <th>
+              <th align="left">
                 <label>会社名・団体名:</label>
               </th>
               <td>
@@ -253,7 +312,7 @@
               </td>
             </tr>
             <tr>
-              <th>
+              <th align="left">
                 <label>部署名・役職:</label>
               </th>
               <td>
@@ -265,7 +324,7 @@
         </table>
 <!-- Term of Licence -->
         <input id="customerId-hidden" type="hidden"/>
-        <input id="doModify" type="button" value="登録情報の修正(TBD)" onclick="location.href='./userInfoEdit.html'" />
+        <input id="doModify" type="button" value="登録情報の修正" onclick="location.href='./userInfoEdit.html'" />
         <input id="doNext" type="button" value="次へ" onclick="location.href='./userAddressSelect.html'" />
       </div>
       </div>


pal-cvs メーリングリストの案内
Back to archive index