diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index cc34443a622..90c37aaaa6f 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -79,12 +79,12 @@ $result = restrictedArea($user, 'propal', $id); $object = new Propal($db); -// Load object // Load object if ($id > 0 || ! empty($ref)) { $ret=$object->fetch($id, $ref); - $ret=$object->fetch_thirdparty(); + if ($ret > 0) $ret=$object->fetch_thirdparty(); + if ($ret < 0) dol_print_error('',$object->error); } // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array diff --git a/htdocs/install/mysql/migration/3.3.0-3.4.0.sql b/htdocs/install/mysql/migration/3.3.0-3.4.0.sql index 1c17efb697c..a58eb45f1ba 100755 --- a/htdocs/install/mysql/migration/3.3.0-3.4.0.sql +++ b/htdocs/install/mysql/migration/3.3.0-3.4.0.sql @@ -39,3 +39,9 @@ alter table llx_contratdet add column buy_price_ht double(24,8) DEFAULT 0 after -- serialised array, to store value of select list choices for example alter table llx_extrafields add column param text DEFAULT '' after pos; + + +alter table llx_propal CHANGE COLUMN fk_adresse_livraison fk_delivery_address integer; +alter table llx_commande CHANGE COLUMN fk_adresse_livraison fk_delivery_address integer; +alter table llx_don CHANGE COLUMN adresse address text; +