[Phpgroupware-cvs] property/setup default_records.inc.php, 1.8 setup.inc.php, 1.10 tables_current.inc.php, 1.19

[sigurdne]

Update of property/setup

Modified Files:
     Branch: MAIN
            default_records.inc.php lines: +28 -17
            setup.inc.php lines: +5 -5
            tables_current.inc.php lines: +30 -4

Log Message:
no message

====================================================
Index: property/setup/default_records.inc.php
diff -u property/setup/default_records.inc.php:1.7 
property/setup/default_records.inc.php:1.8
--- property/setup/default_records.inc.php:1.7  Thu Jan 27 11:30:37 2005
+++ property/setup/default_records.inc.php      Sat Jan 29 13:23:25 2005
@@ -36,7 +36,8 @@
 #fm_meter_category
 #

-$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_meter_category (id, 
descr) VALUES ('1', 'Power meter')");
+//$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_meter_category (id, 
descr) VALUES ('1', 'Power meter')");
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_config (config_app, 
config_name, config_value) VALUES ('property','meter_table', 'fm_entity_1_1')");

 #
 #fm_district
@@ -204,10 +205,11 @@
 $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_acl_location (id, descr) 
VALUES ('.invoice', 'Invoice')");
 $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_acl_location (id, descr) 
VALUES ('.document', 'Documents')");
 $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_acl_location (id, descr) 
VALUES ('.drawing', 'Drawing')");
-$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_acl_location (id, descr) 
VALUES ('.meter', 'Meter')");
+//$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_acl_location (id, 
descr) VALUES ('.meter', 'Meter')");
 $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_acl_location (id, descr, 
allow_grant) VALUES ('.entity.1', 'Equipment', 1)");
-$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_acl_location (id, descr, 
allow_grant) VALUES ('.entity.1.1', 'Elevator', 1)");
-$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_acl_location (id, descr, 
allow_grant) VALUES ('.entity.1.2', 'Fire alarm central', 1)");
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_acl_location (id, descr, 
allow_grant) VALUES ('.entity.1.1', 'Meter', 1)");
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_acl_location (id, descr, 
allow_grant) VALUES ('.entity.1.2', 'Elevator', 1)");
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_acl_location (id, descr, 
allow_grant) VALUES ('.entity.1.3', 'Fire alarm central', 1)");
 $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_acl_location (id, descr, 
allow_grant) VALUES ('.entity.2', 'Report', 1)");
 $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_acl_location (id, descr, 
allow_grant) VALUES ('.entity.2.1', 'Report type 1', 1)");
 $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_acl_location (id, descr, 
allow_grant) VALUES ('.entity.2.2', 'Report type 2', 1)");
@@ -336,8 +338,9 @@
 # Dumping data for table fm_entity_category
 #

-$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity_category 
(entity_id, id, name, descr, prefix, lookup_tenant, tracking, location_level) 
VALUES (1, 1, 'Elevator', 'Elevator', 'E', NULL, NULL, 3)");
-$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity_category 
(entity_id, id, name, descr, prefix, lookup_tenant, tracking, location_level) 
VALUES (1, 2, 'Fire alarm central', 'Fire alarm central', 'F', NULL, NULL, 3)");
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity_category 
(entity_id, id, name, descr, prefix, lookup_tenant, tracking, location_level) 
VALUES (1, 1, 'Meter', 'Meter', NULL, NULL, NULL, 3)");
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity_category 
(entity_id, id, name, descr, prefix, lookup_tenant, tracking, location_level) 
VALUES (1, 2, 'Elevator', 'Elevator', 'E', NULL, NULL, 3)");
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity_category 
(entity_id, id, name, descr, prefix, lookup_tenant, tracking, location_level) 
VALUES (1, 3, 'Fire alarm central', 'Fire alarm central', 'F', NULL, NULL, 3)");
 $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity_category 
(entity_id, id, name, descr, prefix, lookup_tenant, tracking, location_level) 
VALUES (2, 1, 'Report type 1', 'Report type 1', 'RA', 1, 1, 4)");
 $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity_category 
(entity_id, id, name, descr, prefix, lookup_tenant, tracking, location_level) 
VALUES (2, 2, 'Report type 2', 'Report type 2', 'RB', 1, 1, 4)");

@@ -345,19 +348,23 @@
 #
 # Dumping data for table fm_entity_attribute
 #
-
 $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity_attribute 
(entity_id, cat_id, id, column_name, input_text, statustext, datatype, list, 
attrib_sort, size, precision_, scale, default_value, nullable) VALUES (1, 1, 1, 
'status', 'Status', 'Status', 'LB', NULL, 1, NULL, NULL, NULL, NULL, 'True')");
-$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity_attribute 
(entity_id, cat_id, id, column_name, input_text, statustext, datatype, list, 
attrib_sort, size, precision_, scale, default_value, nullable) VALUES (1, 1, 2, 
'attribute1', 'Attribute 1', 'Attribute 1 statustext', 'V', NULL, 2, NULL, 12, 
NULL, NULL, 'True')");
-$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity_attribute 
(entity_id, cat_id, id, column_name, input_text, statustext, datatype, list, 
attrib_sort, size, precision_, scale, default_value, nullable) VALUES (1, 1, 3, 
'attribute2', 'Attribute 2', 'Attribute 2 status text', 'D', NULL, 3, NULL, 
NULL, NULL, NULL, 'True')");
-$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity_attribute 
(entity_id, cat_id, id, column_name, input_text, statustext, datatype, list, 
attrib_sort, size, precision_, scale, default_value, nullable) VALUES (1, 1, 4, 
'attribute3', 'Attribute 3', 'Attribute 3 status text', 'R', NULL, 4, NULL, 
NULL, NULL, NULL, 'True')");
-$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity_attribute 
(entity_id, cat_id, id, column_name, input_text, statustext, datatype, list, 
attrib_sort, size, precision_, scale, default_value, nullable) VALUES (1, 1, 5, 
'attribute4', 'Attribute 4', 'Attribute 4 statustext', 'CH', NULL, 5, NULL, 
NULL, NULL, NULL, 'True')");
-$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity_attribute 
(entity_id, cat_id, id, column_name, input_text, statustext, datatype, list, 
attrib_sort, size, precision_, scale, default_value, nullable) VALUES (1, 1, 6, 
'attribute5', 'Attribute 5', 'Attribute 5 statustext', 'AB', NULL, 6, NULL, 
NULL, NULL, NULL, 'True')");
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity_attribute 
(entity_id, cat_id, id, column_name, input_text, statustext, datatype, list, 
attrib_sort, size, precision_, scale, default_value, nullable) VALUES (1, 1, 2, 
'category', 'Category', 'Category statustext', 'LB', NULL, 2, NULL, NULL, NULL, 
NULL, 'True')");
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity_attribute 
(entity_id, cat_id, id, column_name, input_text, statustext, datatype, list, 
attrib_sort, size, precision_, scale, default_value, nullable) VALUES (1, 1, 3, 
'name', 'Name', 'Name status text', 'V', NULL, 3, NULL, 12, NULL, NULL, 
'True')");
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity_attribute 
(entity_id, cat_id, id, column_name, input_text, statustext, datatype, list, 
attrib_sort, size, precision_, scale, default_value, nullable) VALUES (1, 1, 4, 
'remark', 'Remark', 'Remark status text', 'T', NULL, 4, NULL, NULL, NULL, NULL, 
'True')");
+
 $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity_attribute 
(entity_id, cat_id, id, column_name, input_text, statustext, datatype, list, 
attrib_sort, size, precision_, scale, default_value, nullable) VALUES (1, 2, 1, 
'status', 'Status', 'Status', 'LB', NULL, 1, NULL, NULL, NULL, NULL, 'True')");
 $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity_attribute 
(entity_id, cat_id, id, column_name, input_text, statustext, datatype, list, 
attrib_sort, size, precision_, scale, default_value, nullable) VALUES (1, 2, 2, 
'attribute1', 'Attribute 1', 'Attribute 1 statustext', 'V', NULL, 2, NULL, 12, 
NULL, NULL, 'True')");
 $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity_attribute 
(entity_id, cat_id, id, column_name, input_text, statustext, datatype, list, 
attrib_sort, size, precision_, scale, default_value, nullable) VALUES (1, 2, 3, 
'attribute2', 'Attribute 2', 'Attribute 2 status text', 'D', NULL, 3, NULL, 
NULL, NULL, NULL, 'True')");
 $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity_attribute 
(entity_id, cat_id, id, column_name, input_text, statustext, datatype, list, 
attrib_sort, size, precision_, scale, default_value, nullable) VALUES (1, 2, 4, 
'attribute3', 'Attribute 3', 'Attribute 3 status text', 'R', NULL, 4, NULL, 
NULL, NULL, NULL, 'True')");
 $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity_attribute 
(entity_id, cat_id, id, column_name, input_text, statustext, datatype, list, 
attrib_sort, size, precision_, scale, default_value, nullable) VALUES (1, 2, 5, 
'attribute4', 'Attribute 4', 'Attribute 4 statustext', 'CH', NULL, 5, NULL, 
NULL, NULL, NULL, 'True')");
 $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity_attribute 
(entity_id, cat_id, id, column_name, input_text, statustext, datatype, list, 
attrib_sort, size, precision_, scale, default_value, nullable) VALUES (1, 2, 6, 
'attribute5', 'Attribute 5', 'Attribute 5 statustext', 'AB', NULL, 6, NULL, 
NULL, NULL, NULL, 'True')");
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity_attribute 
(entity_id, cat_id, id, column_name, input_text, statustext, datatype, list, 
attrib_sort, size, precision_, scale, default_value, nullable) VALUES (1, 3, 1, 
'status', 'Status', 'Status', 'LB', NULL, 1, NULL, NULL, NULL, NULL, 'True')");
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity_attribute 
(entity_id, cat_id, id, column_name, input_text, statustext, datatype, list, 
attrib_sort, size, precision_, scale, default_value, nullable) VALUES (1, 3, 2, 
'attribute1', 'Attribute 1', 'Attribute 1 statustext', 'V', NULL, 2, NULL, 12, 
NULL, NULL, 'True')");
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity_attribute 
(entity_id, cat_id, id, column_name, input_text, statustext, datatype, list, 
attrib_sort, size, precision_, scale, default_value, nullable) VALUES (1, 3, 3, 
'attribute2', 'Attribute 2', 'Attribute 2 status text', 'D', NULL, 3, NULL, 
NULL, NULL, NULL, 'True')");
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity_attribute 
(entity_id, cat_id, id, column_name, input_text, statustext, datatype, list, 
attrib_sort, size, precision_, scale, default_value, nullable) VALUES (1, 3, 4, 
'attribute3', 'Attribute 3', 'Attribute 3 status text', 'R', NULL, 4, NULL, 
NULL, NULL, NULL, 'True')");
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity_attribute 
(entity_id, cat_id, id, column_name, input_text, statustext, datatype, list, 
attrib_sort, size, precision_, scale, default_value, nullable) VALUES (1, 3, 5, 
'attribute4', 'Attribute 4', 'Attribute 4 statustext', 'CH', NULL, 5, NULL, 
NULL, NULL, NULL, 'True')");
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity_attribute 
(entity_id, cat_id, id, column_name, input_text, statustext, datatype, list, 
attrib_sort, size, precision_, scale, default_value, nullable) VALUES (1, 3, 6, 
'attribute5', 'Attribute 5', 'Attribute 5 statustext', 'AB', NULL, 6, NULL, 
NULL, NULL, NULL, 'True')");
 $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity_attribute 
(entity_id, cat_id, id, column_name, input_text, statustext, datatype, list, 
attrib_sort, size, precision_, scale, default_value, nullable) VALUES (2, 1, 1, 
'status', 'Status', 'Status', 'LB', NULL, 1, NULL, NULL, NULL, NULL, 'True')");
 $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity_attribute 
(entity_id, cat_id, id, column_name, input_text, statustext, datatype, list, 
attrib_sort, size, precision_, scale, default_value, nullable) VALUES (2, 1, 2, 
'attribute1', 'Attribute 1', 'Attribute 1 statustext', 'V', NULL, 2, NULL, 12, 
NULL, NULL, 'True')");
 $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity_attribute 
(entity_id, cat_id, id, column_name, input_text, statustext, datatype, list, 
attrib_sort, size, precision_, scale, default_value, nullable) VALUES (2, 1, 3, 
'attribute2', 'Attribute 2', 'Attribute 2 status text', 'D', NULL, 3, NULL, 
NULL, NULL, NULL, 'True')");
@@ -377,16 +384,20 @@

 $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity_choice 
(entity_id, cat_id, attrib_id, id, value) VALUES (1, 1, 1, 1, 'status 1')");
 $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity_choice 
(entity_id, cat_id, attrib_id, id, value) VALUES (1, 1, 1, 2, 'status 2')");
-$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity_choice 
(entity_id, cat_id, attrib_id, id, value) VALUES (1, 1, 4, 1, 'choice 1')");
-$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity_choice 
(entity_id, cat_id, attrib_id, id, value) VALUES (1, 1, 4, 2, 'choice 2')");
-$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity_choice 
(entity_id, cat_id, attrib_id, id, value) VALUES (1, 1, 5, 1, 'choice 1')");
-$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity_choice 
(entity_id, cat_id, attrib_id, id, value) VALUES (1, 1, 5, 2, 'choice 2')");
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity_choice 
(entity_id, cat_id, attrib_id, id, value) VALUES (1, 1, 2, 1, 'Tenant power 
meter')");
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity_choice 
(entity_id, cat_id, attrib_id, id, value) VALUES (1, 1, 2, 2, 'Joint power 
meter')");
 $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity_choice 
(entity_id, cat_id, attrib_id, id, value) VALUES (1, 2, 1, 1, 'status 1')");
 $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity_choice 
(entity_id, cat_id, attrib_id, id, value) VALUES (1, 2, 1, 2, 'status 2')");
 $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity_choice 
(entity_id, cat_id, attrib_id, id, value) VALUES (1, 2, 4, 1, 'choice 1')");
 $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity_choice 
(entity_id, cat_id, attrib_id, id, value) VALUES (1, 2, 4, 2, 'choice 2')");
 $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity_choice 
(entity_id, cat_id, attrib_id, id, value) VALUES (1, 2, 5, 1, 'choice 1')");
 $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity_choice 
(entity_id, cat_id, attrib_id, id, value) VALUES (1, 2, 5, 2, 'choice 2')");
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity_choice 
(entity_id, cat_id, attrib_id, id, value) VALUES (1, 3, 1, 1, 'status 1')");
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity_choice 
(entity_id, cat_id, attrib_id, id, value) VALUES (1, 3, 1, 2, 'status 2')");
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity_choice 
(entity_id, cat_id, attrib_id, id, value) VALUES (1, 3, 4, 1, 'choice 1')");
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity_choice 
(entity_id, cat_id, attrib_id, id, value) VALUES (1, 3, 4, 2, 'choice 2')");
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity_choice 
(entity_id, cat_id, attrib_id, id, value) VALUES (1, 3, 5, 1, 'choice 1')");
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity_choice 
(entity_id, cat_id, attrib_id, id, value) VALUES (1, 3, 5, 2, 'choice 2')");
 $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity_choice 
(entity_id, cat_id, attrib_id, id, value) VALUES (2, 1, 1, 1, 'status 1')");
 $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity_choice 
(entity_id, cat_id, attrib_id, id, value) VALUES (2, 1, 1, 2, 'status 2')");
 $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity_choice 
(entity_id, cat_id, attrib_id, id, value) VALUES (2, 1, 4, 1, 'choice 1')");

====================================================
Index: property/setup/setup.inc.php
diff -u property/setup/setup.inc.php:1.9 property/setup/setup.inc.php:1.10
--- property/setup/setup.inc.php:1.9    Mon Jan 17 09:55:58 2005
+++ property/setup/setup.inc.php        Sat Jan 29 13:23:25 2005
@@ -23,11 +23,10 @@
        */

        $setup_info['property']['name']      = 'property';
+       $setup_info['property']['title']         = 'Property';
        $setup_info['property']['version']   = '0.9.17.500';
        $setup_info['property']['app_order'] = 8;
        $setup_info['property']['enable']    = 1;
-       $setup_info['property']['description'] = 'property';
-

        $setup_info['property']['author'][] = array
        (
@@ -107,8 +106,8 @@
                'fm_location_attrib',
                'fm_location_choice',
                'fm_location_config',
-               'fm_meter',
-               'fm_meter_category',
+//             'fm_meter',
+//             'fm_meter_category',
                'fm_building_part',
                'fm_drawing',
                'fm_drawing_status',
@@ -184,6 +183,7 @@
                'fm_entity_origin',
                'fm_entity_1_1',
                'fm_entity_1_2',
+               'fm_entity_1_3',
                'fm_entity_2_1',
                'fm_entity_2_2',
                'fm_custom',

====================================================
Index: property/setup/tables_current.inc.php
diff -u property/setup/tables_current.inc.php:1.18 
property/setup/tables_current.inc.php:1.19
--- property/setup/tables_current.inc.php:1.18  Fri Jan 14 08:50:50 2005
+++ property/setup/tables_current.inc.php       Sat Jan 29 13:23:25 2005
@@ -57,7 +57,7 @@
                        'ix' => array('location_code'),
                        'uc' => array()
                ),
-               'fm_meter' => array(
+/*             'fm_meter' => array(
                        'fd' => array(
                                'id' => array('type' => 'auto','precision' => 
'4','nullable' => False),
                                'num' => array('type' => 'varchar','precision' 
=> '20','nullable' => False),
@@ -91,7 +91,7 @@
                        'ix' => array(),
                        'uc' => array()
                ),
-               'fm_streetaddress' => array(
+*/             'fm_streetaddress' => array(
                        'fd' => array(
                                'id' => array('type' => 'int','precision' => 
'4','nullable' => False),
                                'descr' => array('type' => 
'varchar','precision' => '150','nullable' => False)
@@ -1655,6 +1655,32 @@
                'fm_entity_1_1' => array(
                        'fd' => array(
                                'id' => array('type' => 'auto','precision' => 
'4','nullable' => False),
+                               'num' => array('type' => 'varchar','precision' 
=> '20','nullable' => False),
+                               'p_num' => array('type' => 
'varchar','precision' => '15','nullable' => True),
+                               'p_entity_id' => array('type' => 
'int','precision' => '4','nullable' => True),
+                               'p_cat_id' => array('type' => 'int','precision' 
=> '4','nullable' => True),
+                               'location_code' => array('type' => 
'varchar','precision' => '20','nullable' => False),
+                               'loc1' => array('type' => 'varchar','precision' 
=> '4','nullable' => True),
+                               'loc2' => array('type' => 'varchar','precision' 
=> '4','nullable' => True),
+                               'loc3' => array('type' => 'varchar','precision' 
=> '4','nullable' => True),
+                               'loc4' => array('type' => 'varchar','precision' 
=> '4','nullable' => True),
+                               'address' => array('type' => 
'varchar','precision' => '150','nullable' => True),
+                               'entry_date' => array('type' => 
'int','precision' => '4','nullable' => True),
+                               'user_id' => array('type' => 'int','precision' 
=> '4','nullable' => True),
+                               'status' => array('type' => 'int','precision' 
=> '4','nullable' => True),
+                               'category' => array('type' => 'int','precision' 
=> '4','nullable' => False),
+                               'name' => array('type' => 'varchar','precision' 
=> '20','nullable' => False),
+                               'remark' => array('type' => 
'varchar','precision' => '255','nullable' => True)
+                       ),
+                       'pk' => array('id'),
+                       'fk' => array(),
+                       'ix' => array('location_code'),
+                       'uc' => array('num')
+               ),
+
+               'fm_entity_1_2' => array(
+                       'fd' => array(
+                               'id' => array('type' => 'auto','precision' => 
'4','nullable' => False),
                                'num' => array('type' => 'varchar','precision' 
=> '16','nullable' => False),
                                'p_num' => array('type' => 
'varchar','precision' => '15','nullable' => True),
                                'p_entity_id' => array('type' => 
'int','precision' => '4','nullable' => True),
@@ -1681,7 +1707,7 @@
                        'ix' => array('location_code'),
                        'uc' => array()
                ),
-               'fm_entity_1_2' => array(
+               'fm_entity_1_3' => array(
                        'fd' => array(
                                'id' => array('type' => 'auto','precision' => 
'4','nullable' => False),
                                'num' => array('type' => 'varchar','precision' 
=> '16','nullable' => False),