From f7763073ba768759210aaabc58d275df559b9b84 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 28 Apr 2010 15:54:19 +0000 Subject: [PATCH] Work on odt modules --- .../modules/facture/terre/terre.modules.php | 166 ------------------ htdocs/includes/modules/modFacture.class.php | 2 +- htdocs/includes/modules/modSociete.class.php | 2 +- htdocs/theme/eldy/eldy.css.php | 4 +- 4 files changed, 4 insertions(+), 170 deletions(-) delete mode 100644 htdocs/includes/modules/facture/terre/terre.modules.php diff --git a/htdocs/includes/modules/facture/terre/terre.modules.php b/htdocs/includes/modules/facture/terre/terre.modules.php deleted file mode 100644 index 15a9e855a96..00000000000 --- a/htdocs/includes/modules/facture/terre/terre.modules.php +++ /dev/null @@ -1,166 +0,0 @@ - - * Copyright (C) 2005-2009 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 - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * or see http://www.gnu.org/ - */ - -/** - * \file htdocs/includes/modules/facture/terre/terre.modules.php - * \ingroup facture - * \brief File containing class for numbering module Terre - * \version $Id$ - */ -require_once(DOL_DOCUMENT_ROOT ."/includes/modules/facture/modules_facture.php"); - -/** \class mod_facture_terre - * \brief Classe du modele de numerotation de reference de facture Terre - */ -class mod_facture_terre extends ModeleNumRefFactures -{ - var $version='dolibarr'; // 'development', 'experimental', 'dolibarr' - var $prefixinvoice='FA'; - var $prefixcreditnote='AV'; - var $error=''; - - /** \brief Renvoi la description du modele de numerotation - * \return string Texte descripif - */ - function info() - { - global $langs; - - $langs->load("bills"); - - return $langs->trans('TerreNumRefModelDesc1',$this->prefixinvoice,$this->prefixcreditnote); - } - - /** \brief Renvoi un exemple de numerotation - * \return string Example - */ - function getExample() - { - return $this->prefixinvoice."0501-0001"; - } - - /** \brief Test si les numeros deja en vigueur dans la base ne provoquent pas de - * de conflits qui empechera cette num�rotation de fonctionner. - * \return boolean false si conflit, true si ok - */ - function canBeActivated() - { - global $langs,$conf; - - $langs->load("bills"); - - // Check invoice num - $fayymm=''; - - $sql = "SELECT MAX(facnumber)"; - $sql.= " FROM ".MAIN_DB_PREFIX."facture"; - $sql.= " WHERE facnumber like '".$this->prefixinvoice."%'"; - $sql.= " AND entity = ".$conf->entity; - - $resql=$db->query($sql); - if ($resql) - { - $row = $db->fetch_row($resql); - if ($row) $fayymm = substr($row[0],0,6); - } - if ($fayymm && ! preg_match('/'.$this->prefixinvoice.'[0-9][0-9][0-9][0-9]/i',$fayymm)) - { - $this->error=$langs->trans('TerreNumRefModelError'); - return false; - } - - // Check credit note num - $fayymm=''; - - $sql = "SELECT MAX(facnumber)"; - $sql.= " FROM ".MAIN_DB_PREFIX."facture"; - $sql.= " WHERE facnumber like '".$this->prefixcreditnote."%'"; - $sql.= " AND entity = ".$conf->entity; - - $resql=$db->query($sql); - if ($resql) - { - $row = $db->fetch_row($resql); - if ($row) $fayymm = substr($row[0],0,6); - } - if ($fayymm && ! preg_match('/'.$this->prefixcreditnote.'[0-9][0-9][0-9][0-9]/i',$fayymm)) - { - $this->error=$langs->trans('TerreNumRefModelError'); - return false; - } - - return true; - } - - /** \brief Renvoi prochaine valeur attribuee - * \param objsoc Objet societe - * \param facture Objet facture - * \return string Valeur - */ - function getNextValue($objsoc,$facture) - { - global $db,$conf; - - if ($facture->type == 2) $prefix=$this->prefixcreditnote; - else $prefix=$this->prefixinvoice; - - // D'abord on recupere la valeur max (reponse immediate car champ ind�x�) - $posindice=8; - - $sql = "SELECT MAX(SUBSTRING(facnumber,".$posindice.")) as max"; - $sql.= " FROM ".MAIN_DB_PREFIX."facture"; - $sql.= " WHERE facnumber like '".$prefix."%'"; - $sql.= " AND entity = ".$conf->entity; - - $resql=$db->query($sql); - dol_syslog("mod_facture_terre::getNextValue sql=".$sql); - if ($resql) - { - $obj = $db->fetch_object($resql); - if ($obj) $max = intval($obj->max); - else $max=0; - } - else - { - dol_syslog("mod_facture_terre::getNextValue sql=".$sql, LOG_ERR); - return -1; - } - - $date=$facture->date; // This is invoice date (not creation date) - $yymm = strftime("%y%m",$date); - $num = sprintf("%04s",$max+1); - - dol_syslog("mod_facture_terre::getNextValue return ".$prefix.$yymm."-".$num); - return $prefix.$yymm."-".$num; - } - - /** \brief Return next free value - * \param objsoc Object third party - * \param objforref Object for number to search - * \return string Next free value - */ - function getNumRef($objsoc,$objforref) - { - return $this->getNextValue($objsoc,$objforref); - } - -} - -?> diff --git a/htdocs/includes/modules/modFacture.class.php b/htdocs/includes/modules/modFacture.class.php index 627cbb3f3a6..6877a04c074 100644 --- a/htdocs/includes/modules/modFacture.class.php +++ b/htdocs/includes/modules/modFacture.class.php @@ -219,7 +219,7 @@ class modFacture extends DolibarrModules require_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php'); $dirodt=DOL_DATA_ROOT.'/odttemplates/invoices'; create_exdir($dirodt); - dol_copy(DOL_DOCUMENT_ROOT.'/install/odttemplates/invoices/template_invoices.odt',$dirodt,0,0); + dol_copy(DOL_DOCUMENT_ROOT.'/install/odttemplates/invoices/template_invoice.odt',$dirodt.'/template_invoice.odt',0,0); $sql = array( "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->const[0][2]."' AND entity = ".$conf->entity, diff --git a/htdocs/includes/modules/modSociete.class.php b/htdocs/includes/modules/modSociete.class.php index 279d794d0ca..242c90d5315 100644 --- a/htdocs/includes/modules/modSociete.class.php +++ b/htdocs/includes/modules/modSociete.class.php @@ -279,7 +279,7 @@ class modSociete extends DolibarrModules require_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php'); $dirodt=DOL_DATA_ROOT.'/odttemplates/thirdparties'; create_exdir($dirodt); - dol_copy(DOL_DOCUMENT_ROOT.'/install/odttemplates/thirdparties/template_thirdparty.odt',$dirodt,0,0); + dol_copy(DOL_DOCUMENT_ROOT.'/install/odttemplates/thirdparties/template_thirdparty.odt',$dirodt.'/template_thirdparty.odt',0,0); $sql = array(); diff --git a/htdocs/theme/eldy/eldy.css.php b/htdocs/theme/eldy/eldy.css.php index 613f37f7921..dccf2417491 100644 --- a/htdocs/theme/eldy/eldy.css.php +++ b/htdocs/theme/eldy/eldy.css.php @@ -191,8 +191,8 @@ div.tmenu { font-weight: normal; height: px; /* background: #b3c5cc; */ - background-image: url(); -/* background-image: url();*/ +/* background-image: url();*/ + background-image: url(); /* background-position: center bottom; */ color: #000000; text-decoration: none;