From 7911cf02d19e8311d781f4f225085ef499e2a1f6 Mon Sep 17 00:00:00 2001 From: vAugagneur Date: Mon, 5 Nov 2012 15:32:06 +0000 Subject: [PATCH] [-] FO : fixed bug #PSCFV-5236 - 2 issues with Customer::outstanding_allow_amount --- classes/Customer.php | 2 +- install-dev/data/db_structure.sql | 2 +- install-dev/upgrade/sql/1.5.2.1.sql | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/classes/Customer.php b/classes/Customer.php index d53924267..14d0e6ed1 100644 --- a/classes/Customer.php +++ b/classes/Customer.php @@ -171,7 +171,7 @@ class CustomerCore extends ObjectModel 'company' => array('type' => self::TYPE_STRING, 'validate' => 'isGenericName'), 'siret' => array('type' => self::TYPE_STRING, 'validate' => 'isSiret'), 'ape' => array('type' => self::TYPE_STRING, 'validate' => 'isApe'), - 'outstanding_allow_amount' => array('type' => self::TYPE_INT, 'validate' => 'isFloat', 'copy_post' => false), + 'outstanding_allow_amount' => array('type' => self::TYPE_FLOAT, 'validate' => 'isFloat', 'copy_post' => false), 'show_public_prices' => array('type' => self::TYPE_BOOL, 'validate' => 'isBool', 'copy_post' => false), 'id_risk' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedInt', 'copy_post' => false), 'max_payment_days' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedInt', 'copy_post' => false), diff --git a/install-dev/data/db_structure.sql b/install-dev/data/db_structure.sql index 203a487d4..d07b63842 100644 --- a/install-dev/data/db_structure.sql +++ b/install-dev/data/db_structure.sql @@ -551,7 +551,7 @@ CREATE TABLE `PREFIX_customer` ( `newsletter_date_add` datetime default NULL, `optin` tinyint(1) unsigned NOT NULL default '0', `website` varchar(128), - `outstanding_allow_amount` DECIMAL( 10,6 ) NOT NULL default '0.00', + `outstanding_allow_amount` DECIMAL( 20,6 ) NOT NULL default '0.00', `show_public_prices` tinyint(1) unsigned NOT NULL default '0', `max_payment_days` int(10) unsigned NOT NULL default '60', `secure_key` varchar(32) NOT NULL default '-1', diff --git a/install-dev/upgrade/sql/1.5.2.1.sql b/install-dev/upgrade/sql/1.5.2.1.sql index 74bcff51a..83d45dc16 100644 --- a/install-dev/upgrade/sql/1.5.2.1.sql +++ b/install-dev/upgrade/sql/1.5.2.1.sql @@ -1,4 +1,7 @@ SET NAMES 'utf8'; +ALTER TABLE `PREFIX_address` CHANGE `outstanding_allow_amount` `outstanding_allow_amount` DECIMAL(20, 6) NOT NULL DEFAULT '0.000000'; + /* PHP:blocknewsletter1530(); */; -/* PHP:block_category_1521(); */; + +/* PHP:block_category_1521(); */; \ No newline at end of file