diff --git a/ChangeLog b/ChangeLog index 3bae74a477a..46951fd1344 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,6 +22,7 @@ For users: - New: Can export into Excel 2007 format. - New: Add hidden option CASHDESK_FORCE_STOCK_ON_BILL - New: Can search on part of barcode into POS module. +- Fix: Can use POS module with several concurrent users. For developers: - New: Add webservice to get or create a product, service. diff --git a/htdocs/compta/deplacement/class/deplacement.class.php b/htdocs/compta/deplacement/class/deplacement.class.php index f7182869870..fb4c34b86e5 100644 --- a/htdocs/compta/deplacement/class/deplacement.class.php +++ b/htdocs/compta/deplacement/class/deplacement.class.php @@ -172,6 +172,7 @@ class Deplacement extends CommonObject $sql .= " , dated = '".$this->db->idate($this->date)."'"; $sql .= " , type = '".$this->type."'"; $sql .= " , fk_user = ".$this->fk_user; + $sql .= " , fk_user_modif = ".$user->id; $sql .= " , fk_soc = ".($this->socid > 0?$this->socid:'null'); $sql .= " , note = ".($this->note?"'".$this->db->escape($this->note)."'":"null"); $sql .= " , note_public = ".($this->note_public?"'".$this->db->escape($this->note_public)."'":"null"); @@ -355,6 +356,49 @@ class Deplacement extends CommonObject return $ret; } + + /* + * \brief Information sur l'objet + * \param id id du deplacement dont il faut afficher les infos + */ + function info($id) + { + $sql = 'SELECT c.rowid, c.datec, c.fk_user_author, c.fk_user_modif,'; + $sql.= ' c.tms'; + $sql.= ' FROM '.MAIN_DB_PREFIX.'deplacement as c'; + $sql.= ' WHERE c.rowid = '.$id; + + dol_syslog(get_class($this).'::info sql='.$sql); + $result = $this->db->query($sql); + + if ($result) + { + if ($this->db->num_rows($result)) + { + $obj = $this->db->fetch_object($result); + $this->id = $obj->rowid; + if ($obj->fk_user_author) + { + $cuser = new User($this->db); + $cuser->fetch($obj->fk_user_author); + $this->user_creation = $cuser; + } + if ($obj->fk_user_modif) + { + $muser = new User($this->db); + $muser->fetch($obj->fk_user_modif); + $this->user_modification = $muser; + } + $this->date_creation = $this->db->jdate($obj->datec); + $this->date_modification = $this->db->jdate($obj->tms); + } + $this->db->free($result); + } + else + { + dol_print_error($this->db); + } + } } diff --git a/htdocs/install/mysql/migration/3.1.0-3.2.0.sql b/htdocs/install/mysql/migration/3.1.0-3.2.0.sql index 653a2203341..60bf0d26d74 100755 --- a/htdocs/install/mysql/migration/3.1.0-3.2.0.sql +++ b/htdocs/install/mysql/migration/3.1.0-3.2.0.sql @@ -65,3 +65,5 @@ ALTER TABLE llx_product_fournisseur_price ADD CONSTRAINT fk_product_fournisseur_ ALTER TABLE llx_product_fournisseur_price DROP FOREIGN KEY fk_product_fournisseur_price_fk_product_fournisseur; +DROP TABLE IF EXISTS llx_pos_tmp; +