diff --git a/classes/Address.php b/classes/Address.php index f3568265b..6e0fe679e 100644 --- a/classes/Address.php +++ b/classes/Address.php @@ -116,7 +116,7 @@ class AddressCore extends ObjectModel 'id_country' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'required' => true), 'id_state' => array('type' => self::TYPE_INT, 'validate' => 'isNullOrUnsignedId'), 'alias' => array('type' => self::TYPE_STRING, 'validate' => 'isGenericName', 'required' => true, 'size' => 32), - 'company' => array('type' => self::TYPE_STRING, 'validate' => 'isGenericName', 'size' => 32), + 'company' => array('type' => self::TYPE_STRING, 'validate' => 'isGenericName', 'size' => 64), 'lastname' => array('type' => self::TYPE_STRING, 'validate' => 'isName', 'required' => true, 'size' => 32), 'firstname' => array('type' => self::TYPE_STRING, 'validate' => 'isName', 'required' => true, 'size' => 32), 'vat_number' => array('type' => self::TYPE_STRING, 'validate' => 'isGenericName'), diff --git a/install-dev/data/db_structure.sql b/install-dev/data/db_structure.sql index f018924df..203a487d4 100644 --- a/install-dev/data/db_structure.sql +++ b/install-dev/data/db_structure.sql @@ -25,7 +25,7 @@ CREATE TABLE `PREFIX_address` ( `id_supplier` int(10) unsigned NOT NULL default '0', `id_warehouse` int(10) unsigned NOT NULL default '0', `alias` varchar(32) NOT NULL, - `company` varchar(32) default NULL, + `company` varchar(64) default NULL, `lastname` varchar(32) NOT NULL, `firstname` varchar(32) NOT NULL, `address1` varchar(128) NOT NULL, diff --git a/install-dev/install_version.php b/install-dev/install_version.php index 81fb7f039..6253d186f 100644 --- a/install-dev/install_version.php +++ b/install-dev/install_version.php @@ -25,4 +25,4 @@ * International Registered Trademark & Property of PrestaShop SA */ -define('_PS_INSTALL_VERSION_', '1.5.1.0'); +define('_PS_INSTALL_VERSION_', '1.5.2.0'); diff --git a/install-dev/upgrade/sql/1.5.2.0.sql b/install-dev/upgrade/sql/1.5.2.0.sql new file mode 100644 index 000000000..addcd02fb --- /dev/null +++ b/install-dev/upgrade/sql/1.5.2.0.sql @@ -0,0 +1,3 @@ +SET NAMES 'utf8'; + +ALTER TABLE `PREFIX_address` CHANGE `company` `company` VARCHAR(32) NULL; \ No newline at end of file