Permalink
Browse files

Merge branch 'release'

  • Loading branch information...
2 parents 5cfd0c6 + 992449c commit d571f91e74281003136be5dcc08c207351de85df @vAugagneur vAugagneur committed Dec 28, 2012
View
@@ -1,53 +1,58 @@
-CONTRIBUTORS
-============
+ - (d)oekia
+ - Caleydon Media
+ - Damien Metzger
+ - DamienMetzger
+ - Damon Skelhorn
+ - David Gasperoni
+ - François Gaillard
+ - Gabriel Schwardy
+ - Ha!*!*y
+ - Jonathan Danse
+ - Krystian Podemski
+ - Milow
+ - PrestaEdit
+ - Rémi Gaillard
+ - Sarah Lorenzini
+ - Vincent Augagneur
+ - Xavier POITAU
+ - aFolletete
+ - aKorczak
+ - aNiassy
+ - adonis karavokyros
+ - bLeveque
+ - bMancone
+ - bumbu
+ - cmouleyre
+ - dMetzger
+ - dSevere
+ - fBrignoli
+ - fSerny
+ - gBrunier
+ - gCharmes
+ - gPoulain
+ - hAitmansour
+ - ivancasasempere
+ - jBreux
+ - jObregon
+ - jessylenne
+ - jmCollin
+ - lBrieu
+ - lCherifi
+ - lLefevre
+ - mBertholino
+ - mDeflotte
+ - mMarinetti
+ - montes
+ - nPellicari
+ - oleacorner
+ - rGaillard
+ - rMalie
+ - rMontagne
+ - sLorenzini
+ - sThiebaut
+ - tDidierjean
+ - vAugagneur
+ - vChabot
+ - vKham
+ - vSchoener
-- Caleydon Media
-- DamienMetzger
-- Damon Skelhorn
-- doekia
-- François Gaillard
-- Gabriel Schwardy
-- Jonathan Danse
-- Krystian Podemski
-- PrestaEdit
-- Rémi Gaillard
-- Sarah Lorenzini
-- Vincent Augagneur
-- Xavier POITAU
-- aFolletete
-- aKorczak
-- aNiassy
-- adonis karavokyros
-- bLeveque
-- bMancone
-- bumbu
-- cmouleyre
-- dMetzger
-- dSevere
-- fBrignoli
-- fSerny
-- gBrunier
-- gCharmes
-- gPoulain
-- hAitmansour
-- jBreux
-- jObregon
-- jessylenne
-- jmCollin
-- lBrieu
-- lCherifi
-- lLefevre
-- mBertholino
-- mDeflotte
-- mMarinetti
-- nPellicari
-- oleacorner
-- rGaillard
-- rMalie
-- rMontagne
-- sLorenzini
-- sThiebaut
-- tDidierjean
-- vChabot
-- vKham
-- vSchoener
View

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -21,8 +21,8 @@ needs please refer to http://www.prestashop.com for more information.
@license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
International Registered Trademark & Property of PrestaShop SA
-NAME: Prestashop 1.5.2.0
-VERSION: 1.5.2.0
+NAME: Prestashop 1.5.3.0
+VERSION: 1.5.3.0
VORBEREITUNG
===========
View
@@ -21,8 +21,8 @@ needs please refer to http://www.prestashop.com for more information.
@license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
International Registered Trademark & Property of PrestaShop SA
-NAME: Prestashop 1.5.2.0
-VERSION: 1.5.2.0
+NAME: Prestashop 1.5.3.0
+VERSION: 1.5.3.0
PREPARATION
===========
View
@@ -21,8 +21,8 @@ needs please refer to http://www.prestashop.com for more information.
@license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
International Registered Trademark & Property of PrestaShop SA
-NAME: Prestashop 1.5.2.0
-VERSION: 1.5.2.0
+NAME: Prestashop 1.5.3.0
+VERSION: 1.5.3.0
PREPARACI�N
===========
View
@@ -21,8 +21,8 @@ needs please refer to http://www.prestashop.com for more information.
@license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
International Registered Trademark & Property of PrestaShop SA
-NAME: Prestashop 1.5.2.0
-VERSION: 1.5.2.0
+NAME: Prestashop 1.5.3.0
+VERSION: 1.5.3.0
PREPARATION
===========
View
@@ -21,8 +21,8 @@ needs please refer to http://www.prestashop.com for more information.
@license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
International Registered Trademark & Property of PrestaShop SA
-NAME: Prestashop 1.5.2.0
-VERSION: 1.5.2.0
+NAME: Prestashop 1.5.3.0
+VERSION: 1.5.3.0
PREPARAZIONE
===========
@@ -24,4 +24,4 @@
* International Registered Trademark & Property of PrestaShop SA
*/
-define('_PS_INSTALL_VERSION_', '1.5.2.0');
+define('_PS_INSTALL_VERSION_', '1.5.3.0');
@@ -28,12 +28,15 @@ function generic_add_missing_column($table, $column_to_add)
{
$column_exist = Db::getInstance()->executeS('SHOW FIELDS FROM `'._DB_PREFIX_.$table.'`');
$column_formated = array();
-
- foreach($column_exist as $c)
- $column_formated[] = $c['Field'] ;
$res = true;
- foreach($column_to_add as $name => $details)
- if (!in_array($name, $column_formated))
- $res &= Db::getInstance()->execute('ALTER TABLE `'._DB_PREFIX_.$table.'` ADD COLUMN `'.$name.'` '.$details);
+ if ($column_exist)
+ {
+ foreach($column_exist as $c)
+ $column_formated[] = $c['Field'] ;
+
+ foreach($column_to_add as $name => $details)
+ if (!in_array($name, $column_formated))
+ $res &= Db::getInstance()->execute('ALTER TABLE `'._DB_PREFIX_.$table.'` ADD COLUMN `'.$name.'` '.$details);
+ }
return $res;
}
@@ -0,0 +1,41 @@
+<?php
+/*
+* 2007-2012 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License (OSL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/osl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+* @author PrestaShop SA <contact@prestashop.com>
+* @copyright 2007-2012 PrestaShop SA
+* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+* International Registered Trademark & Property of PrestaShop SA
+*/
+
+function outstanding_allow_amount1530()
+{
+ $column_exist = Db::getInstance()->executeS('SHOW FIELDS FROM `'._DB_PREFIX_.'address`');
+ $column_formated = array();
+ $res = true;
+ if ($column_exist)
+ {
+ foreach($column_exist as $c)
+ $column_formated[] = $c['Field'] ;
+
+ if (in_array('outstanding_allow_amount' , $column_formated))
+ Db::getInstance()->execute('ALTER TABLE `'._DB_PREFIX_.'address` CHANGE `outstanding_allow_amount` `outstanding_allow_amount` DECIMAL(20, 6) NOT NULL DEFAULT 0.000000');
+ }
+ return $res;
+}
@@ -1,6 +1,6 @@
SET NAMES 'utf8';
-ALTER TABLE `PREFIX_address` CHANGE `outstanding_allow_amount` `outstanding_allow_amount` DECIMAL(20, 6) NOT NULL DEFAULT '0.000000';
+/* PHP:outstanding_allow_amount1530(); */;
/* PHP:blocknewsletter1530(); */;

0 comments on commit d571f91

Please sign in to comment.