Changeset 22218 for branches/version-2_12-dev/html

Timestamp:

2013/01/09 12:42:43 (11 years ago)

Author:

kim

Message:

#1730 r22197 を r22215 で差し戻したものを、逆マージ。

Location:

branches/version-2_12-dev/html/install/sql

Files:

• create_table_mysql.sql (modified) (3 diffs)
• create_table_pgsql.sql (modified) (3 diffs)

branches/version-2_12-dev/html/install/sql/create_table_mysql.sql

@@ -553 +553 @@
     birth_point numeric NOT NULL DEFAULT 0,
     tax numeric,
+    order_tax_rate numeric,
+    order_tax_rule smallint,
     total numeric,
     payment_total numeric,
@@ -610 +612 @@
     birth_point numeric NOT NULL DEFAULT 0,
     tax numeric,
+    order_tax_rate numeric,
+    order_tax_rule smallint,
     total numeric,
     payment_total numeric,
@@ -714 +718 @@
     quantity numeric,
     point_rate numeric NOT NULL DEFAULT 0,
+    tax_rate numeric,
+    tax_rule smallint,
     PRIMARY KEY (order_detail_id)
 );

branches/version-2_12-dev/html/install/sql/create_table_pgsql.sql

@@ -553 +553 @@
     birth_point numeric NOT NULL DEFAULT 0,
     tax numeric,
+    order_tax_rate numeric,
+    order_tax_rule smallint,
     total numeric,
     payment_total numeric,
@@ -610 +612 @@
     birth_point numeric NOT NULL DEFAULT 0,
     tax numeric,
+    order_tax_rate numeric,
+    order_tax_rule smallint,
     total numeric,
     payment_total numeric,
@@ -714 +718 @@
     quantity numeric,
     point_rate numeric NOT NULL DEFAULT 0,
+    tax_rate numeric,
+    tax_rule smallint,
     PRIMARY KEY (order_detail_id)
 );