diff --git a/ChangeLog b/ChangeLog index 80eabc9a8fe..5e80d99f106 100644 --- a/ChangeLog +++ b/ChangeLog @@ -79,6 +79,7 @@ For users: - Fix: [Bug #958] LocalTax2 for Spain fails on Suppliers - Fix: [ bug #972 ] Auto completion contact field do not take account the min caract number before search - Fix: [ bug #971 ] html.form.class.php select_contact with autocomplete do not exclude id from exclude array +- Fix: Expedition creation, can retreive product from other expedition For translators: - Update language files. diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php index 888dd6c5eb0..90b1b89d1a5 100644 --- a/htdocs/expedition/class/expedition.class.php +++ b/htdocs/expedition/class/expedition.class.php @@ -224,6 +224,7 @@ class Expedition extends CommonObject $sql.= ", ".(!empty($this->model_pdf)?"'".$this->db->escape($this->model_pdf)."'":"null"); $sql.= ")"; + dol_syslog(get_class($this)."::create sql=".$sql, LOG_DEBUG); $resql=$this->db->query($sql); if ($resql) { @@ -323,6 +324,7 @@ class Expedition extends CommonObject $sql.= ", ".$qty; $sql.= ")"; + dol_syslog(get_class($this)."::create_line sql=".$sql, LOG_DEBUG); if (! $this->db->query($sql)) { $error++; diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php index d761480a74f..a5ec2e016c6 100644 --- a/htdocs/expedition/fiche.php +++ b/htdocs/expedition/fiche.php @@ -87,6 +87,8 @@ if ($id > 0 || ! empty($ref)) if ($action == 'add') { $error=0; + + $object = new Expedition($db); $db->begin(); diff --git a/htdocs/fourn/facture/index.php b/htdocs/fourn/facture/index.php index 8e9d8debab9..b15695aa653 100644 --- a/htdocs/fourn/facture/index.php +++ b/htdocs/fourn/facture/index.php @@ -195,7 +195,7 @@ if ($resql) print '