lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New: early development of multi-company module

Browse Source
This commit is contained in:
Regis Houssin 2009-04-30 10:31:01 +00:00
parent b9265c2c36
commit faf854169c
2 changed files with 80 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/includes/modules/commande/mod_commande_marbre.php
View File

@ -95,7 +95,7 @@ class mod_commande_marbre extends ModeleNumRefCommandes
*/ */
function getNextValue($objsoc,$commande) function getNextValue($objsoc,$commande)
{ {
global $db; global $db,$conf;
// D'abord on recupere la valeur max (reponse immediate car champ indexe) // D'abord on recupere la valeur max (reponse immediate car champ indexe)
$posindice=8; $posindice=8;

136
htdocs/includes/modules/facture/terre/terre.modules.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2005-2008 Laurent Destailleur <eldy@users.sourceforge.net> /* Copyright (C) 2005-2008 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -43,9 +43,9 @@ class mod_facture_terre extends ModeleNumRefFactures
*/ */
function info() function info()
{ {
global $langs; global $langs;
$langs->load("bills"); $langs->load("bills");
return $langs->trans('TerreNumRefModelDesc1',$this->prefixinvoice,$this->prefixcreditnote); return $langs->trans('TerreNumRefModelDesc1',$this->prefixinvoice,$this->prefixcreditnote);
} }
@ -55,7 +55,7 @@ class mod_facture_terre extends ModeleNumRefFactures
*/ */
function getExample() function getExample()
{ {
return $this->prefixinvoice."0501-0001"; return $this->prefixinvoice."0501-0001";
} }
/** \brief Test si les numéros déjà en vigueur dans la base ne provoquent pas de /** \brief Test si les numéros déjà en vigueur dans la base ne provoquent pas de
@ -64,47 +64,51 @@ class mod_facture_terre extends ModeleNumRefFactures
*/ */
function canBeActivated() function canBeActivated()
{ {
global $langs; global $langs,$conf;
$langs->load("bills"); $langs->load("bills");
// Check invoice num // Check invoice num
$fayymm=''; $fayymm='';
$sql = "SELECT MAX(facnumber)"; $sql = "SELECT MAX(facnumber)";
$sql.= " FROM ".MAIN_DB_PREFIX."facture"; $sql.= " FROM ".MAIN_DB_PREFIX."facture";
$sql.= " WHERE facnumber like '".$this->prefixinvoice."%'"; $sql.= " WHERE facnumber like '".$this->prefixinvoice."%'";
$resql=$db->query($sql); $sql.= " AND entity = ".$conf->entity;
if ($resql)
{
$row = $db->fetch_row($resql);
if ($row) $fayymm = substr($row[0],0,6);
}
if ($fayymm && ! eregi($this->prefixinvoice.'[0-9][0-9][0-9][0-9]',$fayymm))
{
$this->error=$langs->trans('TerreNumRefModelError');
return false;
}
// Check credit note num $resql=$db->query($sql);
$fayymm=''; if ($resql)
{
$row = $db->fetch_row($resql);
if ($row) $fayymm = substr($row[0],0,6);
}
if ($fayymm && ! eregi($this->prefixinvoice.'[0-9][0-9][0-9][0-9]',$fayymm))
{
$this->error=$langs->trans('TerreNumRefModelError');
return false;
}
$sql = "SELECT MAX(facnumber)"; // Check credit note num
$sql.= " FROM ".MAIN_DB_PREFIX."facture"; $fayymm='';
$sql.= " WHERE facnumber like '".$this->prefixcreditnote."%'";
$resql=$db->query($sql);
if ($resql)
{
$row = $db->fetch_row($resql);
if ($row) $fayymm = substr($row[0],0,6);
}
if ($fayymm && ! eregi($this->prefixcreditnote.'[0-9][0-9][0-9][0-9]',$fayymm))
{
$this->error=$langs->trans('TerreNumRefModelError');
return false;
}
return true; $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 && ! eregi($this->prefixcreditnote.'[0-9][0-9][0-9][0-9]',$fayymm))
{
$this->error=$langs->trans('TerreNumRefModelError');
return false;
}
return true;
} }
/** \brief Renvoi prochaine valeur attribuée /** \brief Renvoi prochaine valeur attribuée
@ -114,37 +118,39 @@ class mod_facture_terre extends ModeleNumRefFactures
*/ */
function getNextValue($objsoc,$facture) function getNextValue($objsoc,$facture)
{ {
global $db; global $db,$conf;
if ($facture->type == 2) $prefix=$this->prefixcreditnote; if ($facture->type == 2) $prefix=$this->prefixcreditnote;
else $prefix=$this->prefixinvoice; else $prefix=$this->prefixinvoice;
// D'abord on récupère la valeur max (réponse immédiate car champ indéxé) // D'abord on récupère la valeur max (réponse immédiate car champ indéxé)
$posindice=8; $posindice=8;
$sql = "SELECT MAX(0+SUBSTRING(facnumber,".$posindice.")) as max";
$sql.= " FROM ".MAIN_DB_PREFIX."facture";
$sql.= " WHERE facnumber like '".$prefix."%'";
$resql=$db->query($sql); $sql = "SELECT MAX(0+SUBSTRING(facnumber,".$posindice.")) as max";
if ($resql) $sql.= " FROM ".MAIN_DB_PREFIX."facture";
{ $sql.= " WHERE facnumber like '".$prefix."%'";
$obj = $db->fetch_object($resql); $sql.= " AND entity = ".$conf->entity;
if ($obj) $max = $obj->max;
else $max=0;
}
else
{
dol_syslog("mod_facture_terre::getNextValue sql=".$sql);
return -1;
}
//$date=time(); $resql=$db->query($sql);
$date=$facture->date; if ($resql)
$yymm = strftime("%y%m",$date); {
$num = sprintf("%04s",$max+1); $obj = $db->fetch_object($resql);
if ($obj) $max = $obj->max;
else $max=0;
}
else
{
dol_syslog("mod_facture_terre::getNextValue sql=".$sql);
return -1;
}
dol_syslog("mod_facture_terre::getNextValue return ".$prefix.$yymm."-".$num); //$date=time();
return $prefix.$yymm."-".$num; $date=$facture->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 /** \brief Return next free value