From c8c0f0f03821c9b08e15a9716f2f9e0ccfa498fc Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Fri, 29 May 2015 11:31:04 +0200 Subject: [PATCH] Fix: possibility to shared facnumber between entities --- htdocs/core/modules/facture/mod_facture_mars.php | 10 +++++----- htdocs/core/modules/facture/mod_facture_terre.php | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/htdocs/core/modules/facture/mod_facture_mars.php b/htdocs/core/modules/facture/mod_facture_mars.php index 25c6d2cd2ad..e477e086fe0 100644 --- a/htdocs/core/modules/facture/mod_facture_mars.php +++ b/htdocs/core/modules/facture/mod_facture_mars.php @@ -1,6 +1,6 @@ - * Copyright (C) 2005-2009 Regis Houssin + * Copyright (C) 2005-2015 Regis Houssin * Copyright (C) 2013 Juanjo Menent * * This program is free software; you can redistribute it and/or modify @@ -127,10 +127,10 @@ class mod_facture_mars extends ModeleNumRefFactures */ function getNextValue($objsoc,$facture,$mode='next') { - global $db,$conf; + global $db; $prefix=$this->prefixinvoice; - + if ($facture->type == 1) $prefix=$this->prefixreplacement; else if ($facture->type == 2) $prefix=$this->prefixcreditnote; else if ($facture->type == 3) $prefix=$this->prefixdeposit; @@ -141,7 +141,7 @@ class mod_facture_mars extends ModeleNumRefFactures $sql = "SELECT MAX(CAST(SUBSTRING(facnumber FROM ".$posindice.") AS SIGNED)) as max"; // This is standard SQL $sql.= " FROM ".MAIN_DB_PREFIX."facture"; $sql.= " WHERE facnumber LIKE '".$prefix."____-%'"; - $sql.= " AND entity = ".$conf->entity; + $sql.= " AND entity IN (".getEntity('facture', 1).")"; $resql=$db->query($sql); dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG); @@ -165,7 +165,7 @@ class mod_facture_mars extends ModeleNumRefFactures $sql = "SELECT facnumber as ref"; $sql.= " FROM ".MAIN_DB_PREFIX."facture"; $sql.= " WHERE facnumber LIKE '".$prefix."____-".$num."'"; - $sql.= " AND entity = ".$conf->entity; + $sql.= " AND entity IN (".getEntity('facture', 1).")"; dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG); $resql=$db->query($sql); diff --git a/htdocs/core/modules/facture/mod_facture_terre.php b/htdocs/core/modules/facture/mod_facture_terre.php index dc06c6202ec..31d8eac736b 100644 --- a/htdocs/core/modules/facture/mod_facture_terre.php +++ b/htdocs/core/modules/facture/mod_facture_terre.php @@ -1,6 +1,6 @@ - * Copyright (C) 2005-2009 Regis Houssin + * Copyright (C) 2005-2015 Regis Houssin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -111,7 +111,7 @@ class mod_facture_terre extends ModeleNumRefFactures $this->error=$langs->trans('ErrorNumRefModel',$max); return false; } - + // Check deposit num $fayymm=''; @@ -146,7 +146,7 @@ class mod_facture_terre extends ModeleNumRefFactures */ function getNextValue($objsoc,$facture,$mode='next') { - global $db,$conf; + global $db; if ($facture->type == 2) $prefix=$this->prefixcreditnote; else if ($facture->type == 3) $prefix=$this->prefixdeposit; @@ -157,7 +157,7 @@ class mod_facture_terre extends ModeleNumRefFactures $sql = "SELECT MAX(CAST(SUBSTRING(facnumber FROM ".$posindice.") AS SIGNED)) as max"; // This is standard SQL $sql.= " FROM ".MAIN_DB_PREFIX."facture"; $sql.= " WHERE facnumber LIKE '".$prefix."____-%'"; - $sql.= " AND entity = ".$conf->entity; + $sql.= " AND entity IN (".getEntity('facture', 1).")"; $resql=$db->query($sql); dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG); @@ -181,7 +181,7 @@ class mod_facture_terre extends ModeleNumRefFactures $sql = "SELECT facnumber as ref"; $sql.= " FROM ".MAIN_DB_PREFIX."facture"; $sql.= " WHERE facnumber LIKE '".$prefix."____-".$num."'"; - $sql.= " AND entity = ".$conf->entity; + $sql.= " AND entity IN (".getEntity('facture', 1).")"; dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG); $resql=$db->query($sql);