';
print "";
print "";
print "".$langs->trans("Year")." $y ";
-print "".$langs->transcountry("LT2Customer",$mysoc->country_code)." ";
-print "".$langs->transcountry("LT2Supplier",$mysoc->country_code)." ";
+if($CalcLT==0)
+{
+ print "".$langs->transcountry($LTCustomer,$mysoc->country_code)." ";
+ print "".$langs->transcountry($LTSupplier,$mysoc->country_code)." ";
+}
+if($CalcLT==1)
+{
+ print "".$langs->transcountry($LTSupplier,$mysoc->country_code)." ".$langs->transcountry($LTCustomer,$mysoc->country_code)." ".$langs->trans("TotalToPay")." ";
print " \n";
print " \n";
@@ -160,24 +190,59 @@ for ($m = 1 ; $m < 13 ; $m++ )
$var=!$var;
print "";
print ''.dol_print_date(dol_mktime(0,0,0,$m,1,$y),"%b %Y").' ';
-
- $x_coll = 0;
- foreach($coll_listsell as $vatrate=>$val)
+ if($CalcLT==0)
{
- $x_coll+=$val['localtax2'];
- }
- $subtotalcoll = $subtotalcoll + $x_coll;
- print "".price($x_coll)." ";
+ $x_coll = 0;
+ foreach($coll_listsell as $vatrate=>$val)
+ {
+ $x_coll+=$val[$localTaxType==1?'localtax1':'localtax2'];
+ }
+ $subtotalcoll = $subtotalcoll + $x_coll;
+ print "".price($x_coll)." ";
- $x_paye = 0;
- foreach($coll_listbuy as $vatrate=>$val)
+ $x_paye = 0;
+ foreach($coll_listbuy as $vatrate=>$val)
+ {
+ $x_paye+=$val[$localTaxType==1?'localtax1':'localtax2'];
+ }
+ $subtotalpaye = $subtotalpaye + $x_paye;
+ print "".price($x_paye)." ";
+ }
+ elseif($CalcLT==1)
{
- $x_paye+=$val['localtax2'];
+ $x_paye = 0;
+ foreach($coll_listbuy as $vatrate=>$val)
+ {
+ $x_paye+=$val[$localTaxType==1?'localtax1':'localtax2'];
+ }
+ $subtotalpaye = $subtotalpaye + $x_paye;
+ print "".price($x_paye)." ".price($x_paye)." ";
-
- $diff = $x_coll - $x_paye;
+ elseif($CalcLT==2)
+ {
+ $x_coll = 0;
+ foreach($coll_listsell as $vatrate=>$val)
+ {
+ $x_coll+=$val[$localTaxType==1?'localtax1':'localtax2'];
+ }
+ $subtotalcoll = $subtotalcoll + $x_coll;
+ print "".price($x_coll)." \n";
$i++;
- if ($i > 2) {
+ if ($i > 2)
+ {
print '';
print ''.$langs->trans("SubTotal").': ';
- print ''.price($subtotalcoll).' ';
- print ''.price($subtotalpaye).' ';
- print ''.price($subtotal).' ';
+ if($CalcLT==0)
+ {
+ print ''.price($subtotalcoll).' ';
+ print ''.price($subtotalpaye).' ';
+ print ''.price($subtotal).' ';
+ }
+ elseif($CalcLT==1)
+ {
+ print ''.price($subtotalpaye).' '.price($subtotal).' ';
+ }
+ elseif($CalcLT==2)
+ {
+ print ''.price($subtotalcoll).' '.price($subtotal).' ';
+ }
print ' ';
$i = 0;
$subtotalcoll=0; $subtotalpaye=0; $subtotal=0;
@@ -214,6 +293,7 @@ $sql.= " FROM ".MAIN_DB_PREFIX."localtax as f";
$sql.= " WHERE f.entity = ".$conf->entity;
$sql.= " AND f.datev >= '".$db->idate(dol_get_first_day($y,1,false))."'";
$sql.= " AND f.datev <= '".$db->idate(dol_get_last_day($y,12,false))."'";
+$sql.= " AND localtaxtype=".$localTaxType;
$sql.= " GROUP BY dm ASC";
pt($db, $sql,$langs->trans("Year")." $y");
diff --git a/htdocs/compta/localtax/quadri_detail.php b/htdocs/compta/localtax/quadri_detail.php
new file mode 100644
index 00000000000..5989159dcd8
--- /dev/null
+++ b/htdocs/compta/localtax/quadri_detail.php
@@ -0,0 +1,669 @@
+
+ * Copyright (C) 2004 Eric Seigne
+ * Copyright (C) 2004-2013 Laurent Destailleur
+ * Copyright (C) 2006-2007 Yannick Warnier
+ * Copyright (C) 2014 Rosana Romero
+ *
+ * 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 3 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, see ".img_previous()." ".img_next()." ":"");
+ //if ($conf->global->MAIN_MODULE_COMPTABILITE || $conf->global->MAIN_MODULE_ACCOUNTING) $description.='".img_previous()." ".img_next()." ":"");
+ if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $description.=' '.$langs->trans("DepositsAreNotIncluded");
+ else $description.=' '.$langs->trans("DepositsAreIncluded");
+ //if ($conf->global->MAIN_MODULE_COMPTABILITE || $conf->global->MAIN_MODULE_ACCOUNTING) $description.='';
+
+if (! is_array($x_coll) || ! is_array($x_paye))
+{
+ $langs->load("errors");
+ if ($x_coll == -1)
+ print ''.$langs->trans("ErrorNoAccountancyModuleLoaded").' '.$langs->trans("FeatureNotYetAvailable").' '.$langs->trans("Error").' '..') ';
+ print ''.$elementcust.' ';
+ print ''.$productcust.' ';
+ if ($modetax == 0)
+ {
+ print ''.$amountcust.' ';
+ print ''.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").') ';
+ }
+ print ''.$langs->trans("BI").' ';
+ print ''.$vatcust.' ';
+ print ' ';
+
+
+ $LT=0;
+ $sameLT=false;
+ foreach(array_keys($x_coll) as $rate)
+ {
+ $subtot_coll_total_ht = 0;
+ $subtot_coll_vat = 0;
+
+ if (is_array($x_both[$rate]['coll']['detail']))
+ {
+ // VAT Rate
+ $var=true;
+
+ if($rate!=0){
+ print "";
+ //print ''.$langs->trans("Rate").': '.vatrate($rate).'% '.$langs->trans("Rate").': '.vatrate($rate).'% '."\n";
+ }
+ foreach($x_both[$rate]['coll']['detail'] as $index => $fields)
+ {
+ if(($local==1 && $fields['localtax1']!=0) || ($local==2 && $fields['localtax2']!=0)){
+ // Define type
+ $type=($fields['dtype']?$fields['dtype']:$fields['ptype']);
+ // Try to enhance type detection using date_start and date_end for free lines where type
+ // was not saved.
+ if (! empty($fields['ddate_start'])) $type=1;
+ if (! empty($fields['ddate_end'])) $type=1;
+
+ $var=!$var;
+ print '';
+
+ // Ref
+ print ''.$fields['link'].' ';
+
+ // Description
+ print '';
+ if ($fields['pid'])
+ {
+ $product_static->id=$fields['pid'];
+ $product_static->ref=$fields['pref'];
+ $product_static->type=$fields['ptype'];
+ print $product_static->getNomUrl(1);
+ if (dol_string_nohtmltag($fields['descr'])) print ' - '.dol_trunc(dol_string_nohtmltag($fields['descr']),16);
+ }
+ else
+ {
+ if ($type) $text = img_object($langs->trans('Service'),'service');
+ else $text = img_object($langs->trans('Product'),'product');
+ if (preg_match('/^\((.*)\)$/',$fields['descr'],$reg))
+ {
+ if ($reg[1]=='DEPOSIT') $fields['descr']=$langs->transnoentitiesnoconv('Deposit');
+ elseif ($reg[1]=='CREDIT_NOTE') $fields['descr']=$langs->transnoentitiesnoconv('CreditNote');
+ else $fields['descr']=$langs->transnoentitiesnoconv($reg[1]);
+ }
+ print $text.' '.dol_trunc(dol_string_nohtmltag($fields['descr']),16);
+
+ // Show range
+ print_date_range($fields['ddate_start'],$fields['ddate_end']);
+ }
+ print ' ';
+
+ // Total HT
+ if ($modetax == 0)
+ {
+ print '';
+ print price($fields['totalht']);
+ if (price2num($fields['ftotal_ttc']))
+ {
+ //print $fields['dtotal_ttc']."/".$fields['ftotal_ttc']." - ";
+ $ratiolineinvoice=($fields['dtotal_ttc']/$fields['ftotal_ttc']);
+ //print ' ('.round($ratiolineinvoice*100,2).'%)';
+ }
+ print ' ';
+ }
+
+ // Payment
+ $ratiopaymentinvoice=1;
+ if ($modetax == 0)
+ {
+ if (isset($fields['payment_amount']) && $fields['ftotal_ttc']) $ratiopaymentinvoice=($fields['payment_amount']/$fields['ftotal_ttc']);
+ print '';
+ //print $fields['totalht']."-".$fields['payment_amount']."-".$fields['ftotal_ttc'];
+ if ($fields['payment_amount'] && $fields['ftotal_ttc'])
+ {
+ $payment_static->id=$fields['payment_id'];
+ print $payment_static->getNomUrl(2);
+ }
+ if ($type == 0)
+ {
+ print $langs->trans("NotUsedForGoods");
+ }
+ else {
+ print $fields['payment_amount'];
+ if (isset($fields['payment_amount'])) print ' ('.round($ratiopaymentinvoice*100,2).'%)';
+ }
+ print ' ';
+ }
+
+ // Total collected
+ print '';
+ $temp_ht=$fields['totalht'];
+ if ($type == 1) $temp_ht=$fields['totalht']*$ratiopaymentinvoice;
+ print price(price2num($temp_ht,'MT'));
+ print ' ';
+
+ // Localtax
+ print '';
+ $temp_vat= $local==1?$fields['localtax1']:$fields['localtax2'];
+ print price(price2num($temp_vat,'MT'));
+ //print price($fields['vat']);
+ print ' ';
+ print ' ';
+
+ $subtot_coll_total_ht += $temp_ht;
+ $subtot_coll_vat += $temp_vat;
+ $x_coll_sum += $temp_vat;
+ }
+ }
+ }
+ if($rate!=0){
+ // Total customers for this vat rate
+ print '';
+ print ''.$langs->trans("Total").': ';
+ if ($modetax == 0)
+ {
+ print ' ';
+ print ' ';
+ }
+ print ''.price(price2num($subtot_coll_total_ht,'MT')).' ';
+ print ''.price(price2num($subtot_coll_vat,'MT')).' ';
+ print ' ';
+ }
+ }
+
+ if (count($x_coll) == 0) // Show a total ine if nothing shown
+ {
+ print '';
+ print ' ';
+ print ''.$langs->trans("Total").': ';
+ if ($modetax == 0)
+ {
+ print ' ';
+ print ' ';
+ }
+ print ''.price(price2num(0,'MT')).' ';
+ print ''.price(price2num(0,'MT')).' ';
+ print ' ';
+ }
+
+ // Blank line
+ print '
';
+ $diff=$x_coll_sum;
+ }
+
+ if($conf->global->$calc ==0 || $conf->global->$calc == 1){
+ echo '';
+ //print table headers for this quadri - expenses now
+ //imprime les en-tete de tables pour ce quadri - maintenant les d�penses
+ print '';
+ print ''.$elementsup.' ';
+ print ''.$productsup.' ';
+ if ($modetax == 0)
+ {
+ print ''.$amountsup.' ';
+ print ''.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").') ';
+ }
+ print ''.$langs->trans("BI").' ';
+ print ''.$vatsup.' ';
+ print ' '."\n";
+
+ foreach(array_keys($x_paye) as $rate)
+ {
+ $subtot_paye_total_ht = 0;
+ $subtot_paye_vat = 0;
+
+ if(is_array($x_both[$rate]['paye']['detail']))
+ {
+ $var=true;
+ if($rate!=0){
+ print "";
+ print ''.$langs->trans("Rate").': '.vatrate($rate).'% '."\n";
+ }
+ foreach($x_both[$rate]['paye']['detail'] as $index=>$fields)
+ {
+ if(($local==1 && $fields['localtax1']!=0) || ($local==2 && $fields['localtax2']!=0)){
+ // Define type
+ $type=($fields['dtype']?$fields['dtype']:$fields['ptype']);
+ // Try to enhance type detection using date_start and date_end for free lines where type
+ // was not saved.
+ if (! empty($fields['ddate_start'])) $type=1;
+ if (! empty($fields['ddate_end'])) $type=1;
+
+ $var=!$var;
+ print '';
+
+ // Ref
+ print ''.$fields['link'].' ';
+
+ // Description
+ print '';
+ if ($fields['pid'])
+ {
+ $product_static->id=$fields['pid'];
+ $product_static->ref=$fields['pref'];
+ $product_static->type=$fields['ptype'];
+ print $product_static->getNomUrl(1);
+ if (dol_string_nohtmltag($fields['descr'])) print ' - '.dol_trunc(dol_string_nohtmltag($fields['descr']),16);
+ }
+ else
+ {
+ if ($type) $text = img_object($langs->trans('Service'),'service');
+ else $text = img_object($langs->trans('Product'),'product');
+ print $text.' '.dol_trunc(dol_string_nohtmltag($fields['descr']),16);
+
+ // Show range
+ print_date_range($fields['ddate_start'],$fields['ddate_end']);
+ }
+ print ' ';
+
+ // Total HT
+ if ($modetax == 0)
+ {
+ print '';
+ print price($fields['totalht']);
+ if (price2num($fields['ftotal_ttc']))
+ {
+ //print $fields['dtotal_ttc']."/".$fields['ftotal_ttc']." - ";
+ $ratiolineinvoice=($fields['dtotal_ttc']/$fields['ftotal_ttc']);
+ //print ' ('.round($ratiolineinvoice*100,2).'%)';
+ }
+ print ' ';
+ }
+
+ // Payment
+ $ratiopaymentinvoice=1;
+ if ($modetax == 0)
+ {
+ if (isset($fields['payment_amount']) && $fields['ftotal_ttc']) $ratiopaymentinvoice=($fields['payment_amount']/$fields['ftotal_ttc']);
+ print '';
+ if ($fields['payment_amount'] && $fields['ftotal_ttc'])
+ {
+ $paymentfourn_static->id=$fields['payment_id'];
+ print $paymentfourn_static->getNomUrl(2);
+ }
+ if ($type == 0)
+ {
+ print $langs->trans("NotUsedForGoods");
+ }
+ else
+ {
+ print $fields['payment_amount'];
+ if (isset($fields['payment_amount'])) print ' ('.round($ratiopaymentinvoice*100,2).'%)';
+ }
+ print ' ';
+ }
+
+ // VAT paid
+ print '';
+ $temp_ht=$fields['totalht'];
+ if ($type == 1) $temp_ht=$fields['totalht']*$ratiopaymentinvoice;
+ print price(price2num($temp_ht,'MT'));
+ print ' ';
+
+ // Localtax
+ print '';
+ $temp_vat= $local==1?$fields['localtax1']:$fields['localtax2'];
+ print price(price2num($temp_vat,'MT'));
+ //print price($fields['vat']);
+ print ' ';
+ print ' ';
+
+ $subtot_paye_total_ht += $temp_ht;
+ $subtot_paye_vat += $temp_vat;
+ $x_paye_sum += $temp_vat;
+ }
+ }
+ }
+ if($rate!=0){
+ // Total suppliers for this vat rate
+ print '';
+ print ' ';
+ print ''.$langs->trans("Total").': ';
+ if ($modetax == 0)
+ {
+ print ' ';
+ print ' ';
+ }
+ print ''.price(price2num($subtot_paye_total_ht,'MT')).' ';
+ print ''.price(price2num($subtot_paye_vat,'MT')).' ';
+ print ' ';
+ }
+ }
+
+ if (count($x_paye) == 0) // Show a total ine if nothing shown
+ {
+ print '';
+ print ' ';
+ print ''.$langs->trans("Total").': ';
+ if ($modetax == 0)
+ {
+ print ' ';
+ print ' ';
+ }
+ print ''.price(price2num(0,'MT')).' ';
+ print ''.price(price2num(0,'MT')).' ';
+ print ' ';
+ }
+
+ print '
';
+ $diff=$x_paye_sum;
+ }
+
+ if($conf->global->$calc ==0){$diff=$x_coll_sum - $x_paye_sum;}
+ echo '';
+ // Total to pay
+ print '';
+ //$diff = $local==1?$x_coll_sum:$x_paye_sum;
+ print '';
+ print ''.$langs->trans("TotalToPay").($q?', '.$langs->trans("Quadri").' '.$q:'').' ';
+ print ''.price(price2num($diff,'MT'))." \n";
+
+ echo '
';
+
+ $i++;
+}
+
+$db->close();
+
+llxFooter();
+?>
diff --git a/htdocs/compta/localtax/reglement.php b/htdocs/compta/localtax/reglement.php
index 00199dba36f..6d8c1bc7a9c 100644
--- a/htdocs/compta/localtax/reglement.php
+++ b/htdocs/compta/localtax/reglement.php
@@ -1,5 +1,5 @@
+/* Copyright (C) 2011-2014 Juanjo Menent
*
* 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
@@ -31,6 +31,7 @@ $langs->load("compta");
$socid = isset($_GET["socid"])?$_GET["socid"]:'';
if ($user->societe_id) $socid=$user->societe_id;
$result = restrictedArea($user, 'tax', '', '', 'charges');
+$ltt=$_REQUEST["localTaxType"];
/*
* View
@@ -40,11 +41,11 @@ llxHeader();
$localtax_static = new Localtax($db);
-print_fiche_titre($langs->transcountry("LT2Payments",$mysoc->country_code));
+print_fiche_titre($langs->transcountry($ltt==2?"LT2Payments":"LT1Payments",$mysoc->country_code));
$sql = "SELECT rowid, amount, label, f.datev as dm";
$sql.= " FROM ".MAIN_DB_PREFIX."localtax as f ";
-$sql.= " WHERE f.entity = ".$conf->entity;
+$sql.= " WHERE f.entity = ".$conf->entity." AND localtaxtype=".$ltt;
$sql.= " ORDER BY dm DESC";
$result = $db->query($sql);
diff --git a/htdocs/compta/paiement/cheque/class/remisecheque.class.php b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
index 917c88e0743..39b8f209247 100644
--- a/htdocs/compta/paiement/cheque/class/remisecheque.class.php
+++ b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
@@ -73,7 +73,7 @@ class RemiseCheque extends CommonObject
if ($id) $sql.= " AND bc.rowid = ".$id;
if ($ref) $sql.= " AND bc.number = '".$this->db->escape($ref)."'";
- dol_syslog("RemiseCheque::fetch sql=".$sql, LOG_DEBUG);
+ dol_syslog("RemiseCheque::fetch", LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql)
{
@@ -155,7 +155,7 @@ class RemiseCheque extends CommonObject
$sql.= ", ''";
$sql.= ")";
- dol_syslog("RemiseCheque::Create sql=".$sql, LOG_DEBUG);
+ dol_syslog("RemiseCheque::Create", LOG_DEBUG);
$resql = $this->db->query($sql);
if ( $resql )
{
@@ -172,7 +172,7 @@ class RemiseCheque extends CommonObject
$sql.= " SET number='(PROV".$this->id.")'";
$sql.= " WHERE rowid='".$this->id."';";
- dol_syslog("RemiseCheque::Create sql=".$sql, LOG_DEBUG);
+ dol_syslog("RemiseCheque::Create", LOG_DEBUG);
$resql = $this->db->query($sql);
if (! $resql)
{
@@ -192,7 +192,7 @@ class RemiseCheque extends CommonObject
$sql.= " AND b.fk_account='".$account_id."'";
if ($limit) $sql.= $this->db->plimit($limit);
- dol_syslog("RemiseCheque::Create sql=".$sql, LOG_DEBUG);
+ dol_syslog("RemiseCheque::Create", LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql)
{
@@ -225,7 +225,7 @@ class RemiseCheque extends CommonObject
$sql.= " SET fk_bordereau = ".$this->id;
$sql.= " WHERE rowid = ".$lineid;
- dol_syslog("RemiseCheque::Create sql=".$sql, LOG_DEBUG);
+ dol_syslog("RemiseCheque::Create", LOG_DEBUG);
$resql = $this->db->query($sql);
if (!$resql)
{
@@ -250,7 +250,6 @@ class RemiseCheque extends CommonObject
$this->errno = -1;
$this->error=$this->db->lasterror();
$this->errno=$this->db->lasterrno();
- dol_syslog("RemiseCheque::Create Error ".$this->error, LOG_ERR);
}
if (! $this->errno && ! empty($conf->global->MAIN_DISABLEDRAFTSTATUS))
@@ -351,7 +350,7 @@ class RemiseCheque extends CommonObject
$sql.= " AND entity = ".$conf->entity;
$sql.= " AND statut = 0";
- dol_syslog("RemiseCheque::Validate sql=".$sql, LOG_DEBUG);
+ dol_syslog("RemiseCheque::Validate", LOG_DEBUG);
$resql = $this->db->query($sql);
if ( $resql )
{
@@ -410,7 +409,7 @@ class RemiseCheque extends CommonObject
$sql.= " WHERE entity = ".$conf->entity;
$sql.= " AND number not like '(%'";
- dol_syslog("Remisecheque::getNextNumber sql=".$sql);
+ dol_syslog("Remisecheque::getNextNumber", LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql)
{
@@ -510,7 +509,7 @@ class RemiseCheque extends CommonObject
$sql.= " AND bc.entity = ".$conf->entity;
$sql.= " ORDER BY b.dateo ASC, b.rowid ASC";
- dol_syslog("RemiseCheque::generatePdf sql=".$sql, LOG_DEBUG);
+ dol_syslog("RemiseCheque::generatePdf", LOG_DEBUG);
$result = $this->db->query($sql);
if ($result)
{
@@ -705,7 +704,7 @@ class RemiseCheque extends CommonObject
$sql.= " SET date_bordereau = ".($date ? $this->db->idate($date) : 'null');
$sql.= " WHERE rowid = ".$this->id;
- dol_syslog("RemiseCheque::set_date sql=$sql",LOG_DEBUG);
+ dol_syslog("RemiseCheque::set_date", LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
@@ -715,7 +714,6 @@ class RemiseCheque extends CommonObject
else
{
$this->error=$this->db->error();
- dol_syslog("RemiseCheque::set_date ".$this->error,LOG_ERR);
return -1;
}
}
@@ -740,7 +738,7 @@ class RemiseCheque extends CommonObject
$sql.= " SET number = '".$number."'" ;
$sql.= " WHERE rowid = ".$this->id;
- dol_syslog("RemiseCheque::set_number sql=$sql",LOG_DEBUG);
+ dol_syslog("RemiseCheque::set_number", LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
@@ -750,7 +748,6 @@ class RemiseCheque extends CommonObject
else
{
$this->error=$this->db->error();
- dol_syslog("RemiseCheque::set_number ".$this->error,LOG_ERR);
return -1;
}
}
diff --git a/htdocs/compta/paiement/cheque/fiche.php b/htdocs/compta/paiement/cheque/fiche.php
index fe396976f10..a2bf8a7bede 100644
--- a/htdocs/compta/paiement/cheque/fiche.php
+++ b/htdocs/compta/paiement/cheque/fiche.php
@@ -609,7 +609,6 @@ else
$sql.= " AND b.fk_bordereau = ".$object->id;
$sql.= " ORDER BY $sortfield $sortorder";
- dol_syslog("sql=".$sql);
$resql = $db->query($sql);
if ($resql)
{
diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php
index 1d077f933da..842050c61bc 100644
--- a/htdocs/compta/paiement/class/paiement.class.php
+++ b/htdocs/compta/paiement/class/paiement.class.php
@@ -81,7 +81,7 @@ class Paiement extends CommonObject
$sql.= ' WHERE p.fk_paiement = c.id';
$sql.= ' AND p.rowid = '.$id;
- dol_syslog(get_class($this)."::fetch sql=".$sql);
+ dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
$result = $this->db->query($sql);
if ($result)
@@ -161,7 +161,7 @@ class Paiement extends CommonObject
$sql = "INSERT INTO ".MAIN_DB_PREFIX."paiement (entity, datec, datep, amount, fk_paiement, num_paiement, note, fk_user_creat)";
$sql.= " VALUES (".$conf->entity.", '".$this->db->idate($now)."', '".$this->db->idate($this->datepaye)."', '".$totalamount."', ".$this->paiementid.", '".$this->num_paiement."', '".$this->db->escape($this->note)."', ".$user->id.")";
- dol_syslog(get_class($this)."::Create insert paiement sql=".$sql);
+ dol_syslog(get_class($this)."::Create insert paiement", LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql)
{
@@ -177,7 +177,7 @@ class Paiement extends CommonObject
$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'paiement_facture (fk_facture, fk_paiement, amount)';
$sql .= ' VALUES ('.$facid.', '. $this->id.', \''.$amount.'\')';
- dol_syslog(get_class($this).'::Create Amount line '.$key.' insert paiement_facture sql='.$sql);
+ dol_syslog(get_class($this).'::Create Amount line '.$key.' insert paiement_facture', LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
@@ -235,7 +235,6 @@ class Paiement extends CommonObject
else
{
$this->error=$this->db->lasterror();
- dol_syslog(get_class($this).'::Create insert paiement_facture error='.$this->error, LOG_ERR);
$error++;
}
}
@@ -256,7 +255,6 @@ class Paiement extends CommonObject
else
{
$this->error=$this->db->lasterror();
- dol_syslog(get_class($this).'::Create insert paiement error='.$this->error, LOG_ERR);
$error++;
}
@@ -559,7 +557,7 @@ class Paiement extends CommonObject
$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element.' set fk_bank = '.$id_bank;
$sql.= ' WHERE rowid = '.$this->id;
- dol_syslog(get_class($this).'::update_fk_bank sql='.$sql);
+ dol_syslog(get_class($this).'::update_fk_bank', LOG_DEBUG);
$result = $this->db->query($sql);
if ($result)
{
@@ -587,7 +585,7 @@ class Paiement extends CommonObject
$sql.= " SET datep = '".$this->db->idate($date)."'";
$sql.= " WHERE rowid = ".$this->id;
- dol_syslog(get_class($this)."::update_date sql=".$sql);
+ dol_syslog(get_class($this)."::update_date", LOG_DEBUG);
$result = $this->db->query($sql);
if ($result)
{
@@ -598,7 +596,6 @@ class Paiement extends CommonObject
else
{
$this->error='Error -1 '.$this->db->error();
- dol_syslog(get_class($this)."::update_date ".$this->error, LOG_ERR);
return -2;
}
}
@@ -619,7 +616,7 @@ class Paiement extends CommonObject
$sql.= " SET num_paiement = '".$this->db->escape($num)."'";
$sql.= " WHERE rowid = ".$this->id;
- dol_syslog(get_class($this)."::update_num sql=".$sql);
+ dol_syslog(get_class($this)."::update_num", LOG_DEBUG);
$result = $this->db->query($sql);
if ($result)
{
@@ -629,7 +626,6 @@ class Paiement extends CommonObject
else
{
$this->error='Error -1 '.$this->db->error();
- dol_syslog(get_class($this)."::update_num ".$this->error, LOG_ERR);
return -2;
}
}
@@ -645,7 +641,7 @@ class Paiement extends CommonObject
{
$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element.' SET statut = 1 WHERE rowid = '.$this->id;
- dol_syslog(get_class($this).'::valide sql='.$sql);
+ dol_syslog(get_class($this).'::valide', LOG_DEBUG);
$result = $this->db->query($sql);
if ($result)
{
@@ -669,7 +665,7 @@ class Paiement extends CommonObject
$sql.= ' FROM '.MAIN_DB_PREFIX.'paiement as p';
$sql.= ' WHERE p.rowid = '.$id;
- dol_syslog(get_class($this).'::info sql='.$sql);
+ dol_syslog(get_class($this).'::info', LOG_DEBUG);
$result = $this->db->query($sql);
if ($result)
@@ -732,7 +728,7 @@ class Paiement extends CommonObject
else
{
$this->error=$this->db->error();
- dol_syslog(get_class($this).'::getBillsArray Error '.$this->error.' - sql='.$sql);
+ dol_syslog(get_class($this).'::getBillsArray Error '.$this->error.' -', LOG_DEBUG);
return -1;
}
}
diff --git a/htdocs/compta/payment_sc/fiche.php b/htdocs/compta/payment_sc/fiche.php
index 3a010bcae37..5c6562b6fc0 100644
--- a/htdocs/compta/payment_sc/fiche.php
+++ b/htdocs/compta/payment_sc/fiche.php
@@ -211,7 +211,7 @@ $sql.= ' WHERE pf.fk_charge = f.rowid AND f.fk_type = pc.id';
$sql.= ' AND f.entity = '.$conf->entity;
$sql.= ' AND pf.rowid = '.$paiement->id;
-dol_syslog("compta/payment_sc/fiche.php sql=".$sql);
+dol_syslog("compta/payment_sc/fiche.php", LOG_DEBUG);
$resql=$db->query($sql);
if ($resql)
{
diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index bcdef07aede..60b056babf4 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -279,7 +279,7 @@ class BonPrelevement extends CommonObject
$sql.= " WHERE p.rowid = ".$rowid;
$sql.= " AND p.entity = ".$conf->entity;
- dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
$result=$this->db->query($sql);
if ($result)
{
@@ -314,7 +314,6 @@ class BonPrelevement extends CommonObject
}
else
{
- dol_syslog(get_class($this)."::Fetch Erreur sql=".$sql, LOG_ERR);
return -2;
}
}
@@ -557,8 +556,6 @@ class BonPrelevement extends CommonObject
}
else
{
- dol_syslog(get_class($this)."::set_infotrans Erreur 1", LOG_ERR);
- dol_syslog($this->db->error());
$error++;
}
@@ -705,6 +702,7 @@ class BonPrelevement extends CommonObject
//if ($banque) $sql.= " AND sr.code_banque = '".$conf->global->PRELEVEMENT_CODE_BANQUE."'";
//if ($agence) $sql.= " AND sr.code_guichet = '".$conf->global->PRELEVEMENT_CODE_GUICHET."'";
+ dol_syslog(get_class($this)."::SommeAPrelever");
$resql = $this->db->query($sql);
if ( $resql )
@@ -718,7 +716,6 @@ class BonPrelevement extends CommonObject
else
{
$this->error=get_class($this)."::SommeAPrelever Erreur -1 sql=".$this->db->error();
- dol_syslog($this->error, LOG_ERR);
return -1;
}
}
@@ -779,7 +776,7 @@ class BonPrelevement extends CommonObject
//if ($banque) $sql.= " AND sr.code_banque = '".$conf->global->PRELEVEMENT_CODE_BANQUE."'";
//if ($agence) $sql.= " AND sr.code_guichet = '".$conf->global->PRELEVEMENT_CODE_GUICHET."'";
- dol_syslog(get_class($this)."::Create sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::Create", LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql)
{
@@ -896,7 +893,7 @@ class BonPrelevement extends CommonObject
$sql.= " WHERE ref LIKE '".$ref."%'";
$sql.= " AND entity = ".$conf->entity;
- dol_syslog(get_class($this)."::Create sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::Create", LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql)
@@ -922,7 +919,7 @@ class BonPrelevement extends CommonObject
$sql.= ", '".$this->db->idate($now)."'";
$sql.= ")";
- dol_syslog(get_class($this)."::Create sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::Create", LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql)
@@ -983,7 +980,7 @@ class BonPrelevement extends CommonObject
$sql.= ", fk_prelevement_bons = ".$prev_id;
$sql.= " WHERE rowid = ".$fac[1];
- dol_syslog(get_class($this)."::Create sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::Create", LOG_DEBUG);
$resql=$this->db->query($sql);
if (! $resql)
{
@@ -1040,7 +1037,7 @@ class BonPrelevement extends CommonObject
$sql.= " WHERE rowid = ".$prev_id;
$sql.= " AND entity = ".$conf->entity;
- dol_syslog(get_class($this)."::Create sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::Create", LOG_DEBUG);
$resql=$this->db->query($sql);
if (! $resql)
{
diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php
index d68aa528122..5dcd09814ad 100644
--- a/htdocs/compta/resultat/clientfourn.php
+++ b/htdocs/compta/resultat/clientfourn.php
@@ -190,7 +190,7 @@ if ($socid) $sql.= " AND f.fk_soc = ".$socid;
$sql.= " GROUP BY s.nom, s.rowid";
$sql.= " ORDER BY s.nom, s.rowid";
-dol_syslog("get customer invoices sql=".$sql);
+dol_syslog("get customer invoices", LOG_DEBUG);
$result = $db->query($sql);
if ($result) {
$num = $db->num_rows($result);
@@ -235,7 +235,7 @@ if ($modecompta != 'CREANCES-DETTES')
$sql.= " GROUP BY nom, idp";
$sql.= " ORDER BY nom";
- dol_syslog("get old customer payments not linked to invoices sql=".$sql);
+ dol_syslog("get old customer payments not linked to invoices", LOG_DEBUG);
$result = $db->query($sql);
if ($result) {
$num = $db->num_rows($result);
@@ -320,7 +320,7 @@ print ''.$langs->trans("SuppliersInvoices").'
* Copyright (C) 2006 Andre Cianfarani
* Copyright (C) 2008 Raphael Bertrand
- * Copyright (C) 2010-2013 Juanjo Menent
+ * Copyright (C) 2010-2014 Juanjo Menent
* Copyright (C) 2013 Christophe Battarel
* Copyright (C) 2013 Florian Henry
*
@@ -154,16 +154,14 @@ class Contrat extends CommonObject
$sql.= " commentaire = '".$this->db->escape($comment)."'";
$sql.= " WHERE rowid = ".$line_id . " AND (statut = 0 OR statut = 3 OR statut = 5)";
- dol_syslog(get_class($this)."::active_line sql=".$sql);
+ dol_syslog(get_class($this)."::active_line", LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql)
{
- // Appel des triggers
- include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
- $interface=new Interfaces($this->db);
- $result=$interface->run_triggers('CONTRACT_SERVICE_ACTIVATE',$this,$user,$langs,$conf);
- if ($result < 0) { $error++; $this->errors=$interface->errors; }
- // Fin appel triggers
+ // Call trigger
+ $result=$this->call_trigger('CONTRACT_SERVICE_ACTIVATE',$user);
+ if ($result < 0) { $error++; $this->db->rollback(); return -1; }
+ // End call triggers
$this->db->commit();
return 1;
@@ -171,7 +169,6 @@ class Contrat extends CommonObject
else
{
$this->error=$this->db->lasterror();
- dol_syslog(get_class($this)."::active_line error ".$this->error, LOG_ERR);
$this->db->rollback();
return -1;
}
@@ -206,12 +203,10 @@ class Contrat extends CommonObject
$resql = $this->db->query($sql);
if ($resql)
{
- // Appel des triggers
- include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
- $interface=new Interfaces($this->db);
- $result=$interface->run_triggers('CONTRACT_SERVICE_CLOSE',$this,$user,$langs,$conf);
- if ($result < 0) { $error++; $this->errors=$interface->errors; }
- // Fin appel triggers
+ // Call trigger
+ $result=$this->call_trigger('CONTRACT_SERVICE_CLOSE',$user);
+ if ($result < 0) { $error++; $this->db->rollback(); return -1; }
+ // End call triggers
$this->db->commit();
return 1;
@@ -219,7 +214,6 @@ class Contrat extends CommonObject
else
{
$this->error=$this->db->lasterror();
- dol_syslog(get_class($this)."::close_line error ".$this->error, LOG_ERR);
$this->db->rollback();
return -1;
}
@@ -315,13 +309,13 @@ class Contrat extends CommonObject
//$sql.= ", fk_user_valid = ".$user->id.", date_valid = '".$this->db->idate($now)."'";
$sql .= " WHERE rowid = ".$this->id . " AND statut = 0";
- dol_syslog(get_class($this)."::validate sql=".$sql);
+ dol_syslog(get_class($this)."::validate", LOG_DEBUG);
$resql = $this->db->query($sql);
if (! $resql)
{
- dol_syslog(get_class($this)."::validate Echec update - 10 - sql=".$sql, LOG_ERR);
dol_print_error($this->db);
$error++;
+ $this->error=$this->db->lasterror();
}
if (! $error)
@@ -365,12 +359,10 @@ class Contrat extends CommonObject
// Trigger calls
if (! $error)
{
- // Appel des triggers
- include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
- $interface=new Interfaces($this->db);
- $result=$interface->run_triggers('CONTRACT_VALIDATE',$this,$user,$langs,$conf);
- if ($result < 0) { $error++; $this->errors=$interface->errors; }
- // Fin appel triggers
+ // Call trigger
+ $result=$this->call_trigger('CONTRACT_VALIDATE',$user);
+ if ($result < 0) { $error++; }
+ // End call triggers
}
}
else
@@ -386,7 +378,6 @@ class Contrat extends CommonObject
else
{
$this->db->rollback();
- $this->error=$this->db->lasterror();
return -1;
}
@@ -416,7 +407,7 @@ class Contrat extends CommonObject
}
else $sql.= " WHERE rowid=".$id;
- dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql)
{
@@ -505,7 +496,7 @@ class Contrat extends CommonObject
$sql.= " WHERE d.fk_contrat = ".$this->id ." AND d.fk_product = p.rowid";
$sql.= " ORDER by d.rowid ASC";
- dol_syslog(get_class($this)."::fetch_lines sql=".$sql);
+ dol_syslog(get_class($this)."::fetch_lines", LOG_DEBUG);
$result = $this->db->query($sql);
if ($result)
{
@@ -756,12 +747,10 @@ class Contrat extends CommonObject
if (! $error)
{
- // Appel des triggers
- include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
- $interface=new Interfaces($this->db);
- $result=$interface->run_triggers('CONTRACT_CREATE',$this,$user,$langs,$conf);
- if ($result < 0) { $error++; $this->errors=$interface->errors; }
- // Fin appel triggers
+ // Call trigger
+ $result=$this->call_trigger('CONTRACT_CREATE',$user);
+ if ($result < 0) { $error++; }
+ // End call triggers
if (! $error)
{
@@ -776,7 +765,6 @@ class Contrat extends CommonObject
}
else
{
- $this->error=$interface->error;
dol_syslog(get_class($this)."::create - 30 - ".$this->error, LOG_ERR);
$this->db->rollback();
@@ -794,8 +782,7 @@ class Contrat extends CommonObject
}
else
{
- $this->error=$langs->trans("UnknownError: ".$this->db->error()." - sql=".$sql);
- dol_syslog(get_class($this)."::create - 10 - ".$this->error, LOG_ERR);
+ $this->error=$langs->trans("UnknownError: ".$this->db->error()." -", LOG_DEBUG);
$this->db->rollback();
return -1;
@@ -840,7 +827,7 @@ class Contrat extends CommonObject
$sql.= " FROM ".MAIN_DB_PREFIX."contratdet_log as cdl, ".MAIN_DB_PREFIX."contratdet as cd";
$sql.= " WHERE cdl.fk_contratdet=cd.rowid AND cd.fk_contrat=".$this->id;
- dol_syslog(get_class($this)."::delete contratdet_log sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::delete contratdet_log", LOG_DEBUG);
$resql=$this->db->query($sql);
if (! $resql)
{
@@ -861,7 +848,7 @@ class Contrat extends CommonObject
$sql= "DELETE FROM ".MAIN_DB_PREFIX."contratdet_log ";
$sql.= " WHERE ".MAIN_DB_PREFIX."contratdet_log.rowid IN (".implode(",",$tab_resql).")";
- dol_syslog(get_class($this)."::delete contratdet_log sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::delete contratdet_log", LOG_DEBUG);
$resql=$this->db->query($sql);
if (! $resql)
{
@@ -877,7 +864,7 @@ class Contrat extends CommonObject
$sql = "DELETE FROM ".MAIN_DB_PREFIX."contratdet";
$sql.= " WHERE fk_contrat=".$this->id;
- dol_syslog(get_class($this)."::delete contratdet sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::delete contratdet", LOG_DEBUG);
$resql=$this->db->query($sql);
if (! $resql)
{
@@ -892,7 +879,7 @@ class Contrat extends CommonObject
$sql = "DELETE FROM ".MAIN_DB_PREFIX."contrat";
$sql.= " WHERE rowid=".$this->id;
- dol_syslog(get_class($this)."::delete contrat sql=".$sql);
+ dol_syslog(get_class($this)."::delete contrat", LOG_DEBUG);
$resql=$this->db->query($sql);
if (! $resql)
{
@@ -903,14 +890,10 @@ class Contrat extends CommonObject
if (! $error)
{
- // Appel des triggers
- include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
- $interface=new Interfaces($this->db);
- $result=$interface->run_triggers('CONTRACT_DELETE',$this,$user,$langs,$conf);
- if ($result < 0) {
- $error++; $this->errors=$interface->errors;
- }
- // Fin appel triggers
+ // Call trigger
+ $result=$this->call_trigger('CONTRACT_DELETE',$user);
+ if ($result < 0) { $error++; }
+ // End call triggers
}
if (! $error)
@@ -939,8 +922,7 @@ class Contrat extends CommonObject
}
else
{
- $this->error=$this->db->error();
- dol_syslog(get_class($this)."::delete ERROR ".$this->error, LOG_ERR);
+ $this->error=$this->db->lasterror();
$this->db->rollback();
return -1;
}
@@ -1008,7 +990,7 @@ class Contrat extends CommonObject
// TRES IMPORTANT: C'est au moment de l'insertion ligne qu'on doit stocker
// la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva.
- $localtaxes_type=getLocalTaxesFromRate($txtva,0,$mysoc);
+ $localtaxes_type=getLocalTaxesFromRate($txtva, 0, $this->societe, $mysoc);
$tabprice=calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, 1,'', $localtaxes_type);
$total_ht = $tabprice[0];
@@ -1067,7 +1049,7 @@ class Contrat extends CommonObject
if ($date_end > 0) { $sql.= ",'".$this->db->idate($date_end)."'"; }
$sql.= ")";
- dol_syslog(get_class($this)."::addline sql=".$sql);
+ dol_syslog(get_class($this)."::addline", LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
@@ -1080,7 +1062,6 @@ class Contrat extends CommonObject
}
else
{
- dol_syslog("Error sql=$sql, error=".$this->error,LOG_ERR);
$this->db->rollback();
return -1;
}
@@ -1089,7 +1070,6 @@ class Contrat extends CommonObject
{
$this->db->rollback();
$this->error=$this->db->error()." sql=".$sql;
- dol_syslog(get_class($this)."::addline ".$this->error,LOG_ERR);
return -1;
}
}
@@ -1156,7 +1136,7 @@ class Contrat extends CommonObject
// TRES IMPORTANT: C'est au moment de l'insertion ligne qu'on doit stocker
// la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva.
- $localtaxes_type=getLocalTaxesFromRate($tvatx,0,$mysoc);
+ $localtaxes_type=getLocalTaxesFromRate($tvatx, 0, $this->societe, $mysoc);
$tabprice=calcul_price_total($qty, $pu, $remise_percent, $tvatx, $localtaxtx1, $txlocaltaxtx2, 0, $price_base_type, $info_bits, 1, '', $localtaxes_type);
$total_ht = $tabprice[0];
@@ -1214,7 +1194,7 @@ class Contrat extends CommonObject
else { $sql.=",date_cloture=null"; }
$sql .= " WHERE rowid = ".$rowid;
- dol_syslog(get_class($this)."::updateline sql=".$sql);
+ dol_syslog(get_class($this)."::updateline", LOG_DEBUG);
$result = $this->db->query($sql);
if ($result)
{
@@ -1255,25 +1235,27 @@ class Contrat extends CommonObject
if ($this->statut >= 0)
{
+
+ $this->db->begin();
+
$sql = "DELETE FROM ".MAIN_DB_PREFIX."contratdet";
$sql.= " WHERE rowid=".$idline;
- dol_syslog(get_class($this)."::delete sql=".$sql);
+ dol_syslog(get_class($this)."::delete", LOG_DEBUG);
$resql = $this->db->query($sql);
if (! $resql)
{
$this->error="Error ".$this->db->lasterror();
- dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
+ $this->db->rollback();
return -1;
}
- // Appel des triggers
- include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
- $interface=new Interfaces($this->db);
- $result=$interface->run_triggers('LINECONTRACT_DELETE',$this,$user,$langs,$conf);
- if ($result < 0) { $error++; $this->errors=$interface->errors; }
- // Fin appel triggers
+ // Call trigger
+ $result=$this->call_trigger('LINECONTRACT_DELETE',$user);
+ if ($result < 0) { $error++; $this->db->rollback(); return -1; }
+ // End call triggers
+ $this->db->commit();
return 1;
}
else
@@ -1468,7 +1450,7 @@ class Contrat extends CommonObject
$sql.= " WHERE fk_contrat =".$this->id;
if ($statut >= 0) $sql.= " AND statut = '$statut'";
- dol_syslog(get_class($this)."::array_detail() sql=".$sql,LOG_DEBUG);
+ dol_syslog(get_class($this)."::array_detail()", LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
@@ -1504,7 +1486,7 @@ class Contrat extends CommonObject
$sql.= " WHERE fk_soc =".$this->socid;
if ($option == 'others') $sql.= " AND c.rowid != ".$this->id;
- dol_syslog(get_class($this)."::getOtherContracts() sql=".$sql,LOG_DEBUG);
+ dol_syslog(get_class($this)."::getOtherContracts()", LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
@@ -1944,7 +1926,7 @@ class ContratLigne
if ($id) $sql.= " WHERE t.rowid = ".$id;
if ($ref) $sql.= " WHERE t.rowid = '".$ref."'";
- dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
@@ -1997,7 +1979,6 @@ class ContratLigne
else
{
$this->error="Error ".$this->db->lasterror();
- dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
return -1;
}
}
@@ -2064,6 +2045,8 @@ class ContratLigne
$this->pa_ht = $this->subprice * (1 - $this->remise_percent / 100);
}
+ $this->db->begin();
+
// Update request
$sql = "UPDATE ".MAIN_DB_PREFIX."contratdet SET";
$sql.= " fk_contrat='".$this->fk_contrat."',";
@@ -2099,7 +2082,7 @@ class ContratLigne
$sql.= " commentaire='".$this->db->escape($this->commentaire)."'";
$sql.= " WHERE rowid=".$this->id;
- dol_syslog(get_class($this)."::update sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::update", LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql)
{
@@ -2110,20 +2093,19 @@ class ContratLigne
else
{
$this->error="Error ".$this->db->lasterror();
- dol_syslog(get_class($this)."::update ".$this->error, LOG_ERR);
+ $this->db->rollback();
return -1;
}
if (! $notrigger)
{
- // Appel des triggers
- include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
- $interface=new Interfaces($this->db);
- $result=$interface->run_triggers('LINECONTRACT_UPDATE',$this,$user,$langs,$conf);
- if ($result < 0) { $error++; $this->errors=$interface->errors; }
- // Fin appel triggers
+ // Call trigger
+ $result=$this->call_trigger('LINECONTRACT_UPDATE',$user);
+ if ($result < 0) { $error++; $this->db->rollback(); return -1; }
+ // End call triggers
}
+ $this->db->commit();
return 1;
}
@@ -2147,7 +2129,7 @@ class ContratLigne
$sql.= ",total_ttc=".price2num($this->total_ttc,'MT')."";
$sql.= " WHERE rowid = ".$this->rowid;
- dol_syslog(get_class($this)."::update_total sql=".$sql);
+ dol_syslog(get_class($this)."::update_total", LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
@@ -2158,7 +2140,6 @@ class ContratLigne
else
{
$this->error=$this->db->error();
- dol_syslog(get_class($this)."::update_total Error ".$this->error, LOG_ERR);
$this->db->rollback();
return -2;
}
@@ -2180,7 +2161,7 @@ class ContratLigne
if (! $sql) return -1;
//print $sql;
- dol_syslog(get_class($this)."::get_element_list sql=" . $sql);
+ dol_syslog(get_class($this)."::get_element_list", LOG_DEBUG);
$result = $this->db->query($sql);
if ($result)
{
diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php
index 772b0e1ecdc..680ea9c201f 100644
--- a/htdocs/contrat/index.php
+++ b/htdocs/contrat/index.php
@@ -312,7 +312,7 @@ $sql.= " GROUP BY c.rowid, c.ref, c.datec, c.tms, c.statut, s.nom, s.rowid";
$sql.= " ORDER BY c.tms DESC";
$sql.= " LIMIT ".$max;
-dol_syslog("contrat/index.php sql=".$sql, LOG_DEBUG);
+dol_syslog("contrat/index.php", LOG_DEBUG);
$result=$db->query($sql);
if ($result)
{
diff --git a/htdocs/contrat/services.php b/htdocs/contrat/services.php
index 382dcad5e93..2f656d14211 100644
--- a/htdocs/contrat/services.php
+++ b/htdocs/contrat/services.php
@@ -113,7 +113,7 @@ $sql .= $db->order($sortfield,$sortorder);
$sql .= $db->plimit($limit + 1, $offset);
//print $sql;
-dol_syslog("contrat/services.php sql=".$sql);
+dol_syslog("contrat/services.php", LOG_DEBUG);
$resql=$db->query($sql);
if ($resql)
{
diff --git a/htdocs/core/boxes/box_actions.php b/htdocs/core/boxes/box_actions.php
index ff63927b526..9dcfc76016a 100644
--- a/htdocs/core/boxes/box_actions.php
+++ b/htdocs/core/boxes/box_actions.php
@@ -77,7 +77,7 @@ class box_actions extends ModeleBoxes
$sql.= " ORDER BY a.datec DESC";
$sql.= $db->plimit($max, 0);
- dol_syslog("Box_actions::loadBox sql=".$sql, LOG_DEBUG);
+ dol_syslog("Box_actions::loadBox", LOG_DEBUG);
$result = $db->query($sql);
if ($result)
{
diff --git a/htdocs/core/boxes/box_clients.php b/htdocs/core/boxes/box_clients.php
index b2ad0a6b718..12145294d64 100644
--- a/htdocs/core/boxes/box_clients.php
+++ b/htdocs/core/boxes/box_clients.php
@@ -73,7 +73,7 @@ class box_clients extends ModeleBoxes
$sql.= " ORDER BY s.tms DESC";
$sql.= $db->plimit($max, 0);
- dol_syslog(get_class($this)."::loadBox sql=".$sql,LOG_DEBUG);
+ dol_syslog(get_class($this)."::loadBox", LOG_DEBUG);
$result = $db->query($sql);
if ($result)
{
diff --git a/htdocs/core/boxes/box_comptes.php b/htdocs/core/boxes/box_comptes.php
index 8fdc4aff39e..c66326b27fb 100644
--- a/htdocs/core/boxes/box_comptes.php
+++ b/htdocs/core/boxes/box_comptes.php
@@ -90,7 +90,7 @@ class box_comptes extends ModeleBoxes
$sql.= " ORDER BY label";
$sql.= $db->plimit($max, 0);
- dol_syslog(get_class($this)."::loadBox sql=".$sql);
+ dol_syslog(get_class($this)."::loadBox", LOG_DEBUG);
$result = $db->query($sql);
if ($result)
{
diff --git a/htdocs/core/boxes/box_ficheinter.php b/htdocs/core/boxes/box_ficheinter.php
index 3413548c1fd..32038c61928 100644
--- a/htdocs/core/boxes/box_ficheinter.php
+++ b/htdocs/core/boxes/box_ficheinter.php
@@ -79,7 +79,7 @@ class box_ficheinter extends ModeleBoxes
$sql.= " ORDER BY f.tms DESC";
$sql.= $db->plimit($max, 0);
- dol_syslog(get_class($this).'::loadBox sql='.$sql,LOG_DEBUG);
+ dol_syslog(get_class($this).'::loadBox', LOG_DEBUG);
$resql = $db->query($sql);
if ($resql)
{
diff --git a/htdocs/core/boxes/box_prospect.php b/htdocs/core/boxes/box_prospect.php
index 9c7a666bc4a..c0234f97dc3 100644
--- a/htdocs/core/boxes/box_prospect.php
+++ b/htdocs/core/boxes/box_prospect.php
@@ -73,7 +73,7 @@ class box_prospect extends ModeleBoxes
$sql.= " ORDER BY s.tms DESC";
$sql.= $db->plimit($max, 0);
- dol_syslog(get_class($this)."::loadBox sql=".$sql,LOG_DEBUG);
+ dol_syslog(get_class($this)."::loadBox", LOG_DEBUG);
$resql = $db->query($sql);
if ($resql)
{
diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php
index 6d657f0c36c..fdc4a35a585 100644
--- a/htdocs/core/class/commoninvoice.class.php
+++ b/htdocs/core/class/commoninvoice.class.php
@@ -47,7 +47,7 @@ abstract class CommonInvoice extends CommonObject
$sql.= ' FROM '.MAIN_DB_PREFIX.$table;
$sql.= ' WHERE '.$field.' = '.$this->id;
- dol_syslog(get_class($this)."::getSommePaiement sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::getSommePaiement", LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
@@ -308,7 +308,7 @@ abstract class CommonInvoice extends CommonObject
if (is_numeric($cond_reglement)) $sqltemp.= " WHERE c.rowid=".$cond_reglement;
else $sqltemp.= " WHERE c.code='".$this->db->escape($cond_reglement)."'";
- dol_syslog(get_class($this).'::calculate_date_lim_reglement sql='.$sqltemp);
+ dol_syslog(get_class($this).'::calculate_date_lim_reglement', LOG_DEBUG);
$resqltemp=$this->db->query($sqltemp);
if ($resqltemp)
{
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index b027d0b0528..0a5a1e1ee90 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -78,7 +78,7 @@ abstract class CommonObject
return -1;
}
- dol_syslog(get_class()."::isExistingObject sql=".$sql);
+ dol_syslog(get_class()."::isExistingObject", LOG_DEBUG);
$resql = $db->query($sql);
if ($resql)
{
@@ -213,7 +213,7 @@ abstract class CommonObject
$sql.= "'".$this->db->idate($datecreate)."'";
$sql.= ", 4, '". $id_type_contact . "' ";
$sql.= ")";
- dol_syslog(get_class($this)."::add_contact sql=".$sql);
+ dol_syslog(get_class($this)."::add_contact", LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
@@ -238,7 +238,6 @@ abstract class CommonObject
else
{
$this->error=$this->db->error();
- dol_syslog($this->error,LOG_ERR);
return -1;
}
}
@@ -261,7 +260,6 @@ abstract class CommonObject
if ($this->add_contact($contact['id'], $contact['fk_c_type_contact'], $contact['source']) < 0)
{
$this->error=$this->db->lasterror();
- dol_syslog(get_class($this)."::copy_contact error=".$this->error, LOG_ERR);
return -1;
}
}
@@ -314,7 +312,7 @@ abstract class CommonObject
$sql = "DELETE FROM ".MAIN_DB_PREFIX."element_contact";
$sql.= " WHERE rowid =".$rowid;
- dol_syslog(get_class($this)."::delete_contact sql=".$sql);
+ dol_syslog(get_class($this)."::delete_contact", LOG_DEBUG);
if ($this->db->query($sql))
{
if (! $notrigger)
@@ -330,7 +328,6 @@ abstract class CommonObject
{
$this->error=$this->db->lasterror();
$this->db->rollback();
- dol_syslog(get_class($this)."::delete_contact error=".$this->error, LOG_ERR);
return -1;
}
}
@@ -355,7 +352,7 @@ abstract class CommonObject
$sql.= " WHERE element_id =".$this->id;
$sql.= " AND fk_c_type_contact IN (".$listId.")";
- dol_syslog(get_class($this)."::delete_linked_contact sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::delete_linked_contact", LOG_DEBUG);
if ($this->db->query($sql))
{
return 1;
@@ -363,7 +360,6 @@ abstract class CommonObject
else
{
$this->error=$this->db->lasterror();
- dol_syslog(get_class($this)."::delete_linked_contact error=".$this->error, LOG_ERR);
return -1;
}
}
@@ -400,7 +396,7 @@ abstract class CommonObject
if ($statut >= 0) $sql.= " AND ec.statut = '".$statut."'";
$sql.=" ORDER BY t.lastname ASC";
- dol_syslog(get_class($this)."::liste_contact sql=".$sql);
+ dol_syslog(get_class($this)."::liste_contact", LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
@@ -455,7 +451,7 @@ abstract class CommonObject
$sql.= " AND ec.fk_c_type_contact=tc.rowid";
$sql.= " AND tc.element = '".$this->element."'";
- dol_syslog(get_class($this)."::swapContactStatus sql=".$sql);
+ dol_syslog(get_class($this)."::swapContactStatus", LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
@@ -557,7 +553,7 @@ abstract class CommonObject
$sql.= " AND tc.active = 1";
if ($status) $sql.= " AND ec.statut = ".$status;
- dol_syslog(get_class($this)."::getIdContact sql=".$sql);
+ dol_syslog(get_class($this)."::getIdContact", LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
@@ -570,7 +566,6 @@ abstract class CommonObject
else
{
$this->error=$this->db->error();
- dol_syslog(get_class($this)."::getIdContact ".$this->error, LOG_ERR);
return null;
}
@@ -647,7 +642,7 @@ abstract class CommonObject
$sql = "SELECT rowid, code, libelle as label, coder";
$sql.= " FROM ".MAIN_DB_PREFIX."c_barcode_type";
$sql.= " WHERE rowid = ".$idtype;
- dol_syslog(get_class($this).'::fetch_barcode sql='.$sql);
+ dol_syslog(get_class($this).'::fetch_barcode', LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql)
{
@@ -733,7 +728,7 @@ abstract class CommonObject
$sql.= " WHERE ".$field." = '".$key."'";
$sql.= " AND entity = ".$conf->entity;
- dol_syslog(get_class($this).'::fetchObjectFrom sql='.$sql);
+ dol_syslog(get_class($this).'::fetchObjectFrom', LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql)
{
@@ -759,7 +754,7 @@ abstract class CommonObject
$sql = "SELECT ".$field." FROM ".MAIN_DB_PREFIX.$table;
$sql.= " WHERE rowid = ".$id;
- dol_syslog(get_class($this).'::getValueFrom sql='.$sql);
+ dol_syslog(get_class($this).'::getValueFrom', LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql)
{
@@ -799,7 +794,7 @@ abstract class CommonObject
if (is_object($user)) $sql.=", fk_user_modif = ".$user->id;
$sql.= " WHERE ".$id_field." = ".$id;
- dol_syslog(get_class($this)."::".__FUNCTION__." sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::".__FUNCTION__."", LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql)
{
@@ -925,7 +920,7 @@ abstract class CommonObject
else $sql.= ' SET fk_projet = NULL';
$sql.= ' WHERE rowid = '.$this->id;
- dol_syslog(get_class($this)."::setProject sql=".$sql);
+ dol_syslog(get_class($this)."::setProject", LOG_DEBUG);
if ($this->db->query($sql))
{
$this->fk_project = $projectid;
@@ -1069,7 +1064,7 @@ abstract class CommonObject
// if ($this->element == 'facture') $sql.= " AND fk_statut < 2";
// if ($this->element == 'propal') $sql.= " AND fk_statut = 0";
- dol_syslog(get_class($this)."::setDocModel sql=".$sql);
+ dol_syslog(get_class($this)."::setDocModel", LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
@@ -1113,7 +1108,7 @@ abstract class CommonObject
if (! $renum) $sql.= ' AND rang = 0';
if ($renum) $sql.= ' AND rang <> 0';
- dol_syslog(get_class($this)."::line_order sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::line_order", LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql)
{
@@ -1133,7 +1128,7 @@ abstract class CommonObject
if ($fk_parent_line) $sql.= ' AND fk_parent_line IS NULL';
$sql.= ' ORDER BY rang ASC, rowid '.$rowidorder;
- dol_syslog(get_class($this)."::line_order search all parent lines sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::line_order search all parent lines", LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql)
{
@@ -1185,7 +1180,7 @@ abstract class CommonObject
$sql.= ' AND fk_parent_line = '.$id;
$sql.= ' ORDER BY rang ASC';
- dol_syslog(get_class($this)."::getChildrenOfLine search children lines for line ".$id." sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::getChildrenOfLine search children lines for line ".$id."", LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql)
{
@@ -1253,7 +1248,7 @@ abstract class CommonObject
$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET rang = '.$rang;
$sql.= ' WHERE rowid = '.$rowid;
- dol_syslog(get_class($this)."::updateRangOfLine sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::updateRangOfLine", LOG_DEBUG);
if (! $this->db->query($sql))
{
dol_print_error($this->db);
@@ -1347,7 +1342,7 @@ abstract class CommonObject
$sql = 'SELECT rang FROM '.MAIN_DB_PREFIX.$this->table_element_line;
$sql.= ' WHERE rowid ='.$rowid;
- dol_syslog(get_class($this)."::getRangOfLine sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::getRangOfLine", LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql)
{
@@ -1390,7 +1385,7 @@ abstract class CommonObject
$sql.= ' WHERE '.$this->fk_element.' = '.$this->id;
$sql.= ' AND fk_parent_line = '.$fk_parent_line;
- dol_syslog(get_class($this)."::line_max sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::line_max", LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql)
{
@@ -1411,7 +1406,7 @@ abstract class CommonObject
$sql = 'SELECT max(rang) FROM '.MAIN_DB_PREFIX.$this->table_element_line;
$sql.= ' WHERE '.$this->fk_element.' = '.$this->id;
- dol_syslog(get_class($this)."::line_max sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::line_max", LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql)
{
@@ -1439,7 +1434,7 @@ abstract class CommonObject
$sql.= " SET ref_ext = '".$this->db->escape($ref_ext)."'";
$sql.= " WHERE ".(isset($this->table_rowid)?$this->table_rowid:'rowid')." = ". $this->id;
- dol_syslog(get_class($this)."::update_ref_ext sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::update_ref_ext", LOG_DEBUG);
if ($this->db->query($sql))
{
$this->ref_ext = $ref_ext;
@@ -1448,7 +1443,6 @@ abstract class CommonObject
else
{
$this->error=$this->db->error();
- dol_syslog(get_class($this)."::update_ref_ext error=".$this->error, LOG_ERR);
return -1;
}
}
@@ -1477,7 +1471,7 @@ abstract class CommonObject
$sql.= " SET note".$suffix." = ".(!empty($note)?("'".$this->db->escape($note)."'"):"NULL");
$sql.= " WHERE rowid =". $this->id;
- dol_syslog(get_class($this)."::update_note sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::update_note", LOG_DEBUG);
if ($this->db->query($sql))
{
if ($suffix == '_public') $this->note_public = $note;
@@ -1488,7 +1482,6 @@ abstract class CommonObject
else
{
$this->error=$this->db->lasterror();
- dol_syslog(get_class($this)."::update_note error=".$this->error, LOG_ERR);
return -1;
}
}
@@ -1552,7 +1545,7 @@ abstract class CommonObject
}
$sql.= ' ORDER by rowid'; // We want to be sure to always use same order of line to not change lines differently when option MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND is used
- dol_syslog(get_class($this)."::update_price sql=".$sql);
+ dol_syslog(get_class($this)."::update_price", LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql)
{
@@ -1652,13 +1645,12 @@ abstract class CommonObject
$sql .= ' WHERE rowid = '.$this->id;
//print "xx".$sql;
- dol_syslog(get_class($this)."::update_price sql=".$sql);
+ dol_syslog(get_class($this)."::update_price", LOG_DEBUG);
$resql=$this->db->query($sql);
if (! $resql)
{
$error++;
$this->error=$this->db->error();
- dol_syslog(get_class($this)."::update_price error=".$this->error,LOG_ERR);
}
}
@@ -1704,7 +1696,7 @@ abstract class CommonObject
$sql.= ", '".$this->element."'";
$sql.= ")";
- dol_syslog(get_class($this)."::add_object_linked sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::add_object_linked", LOG_DEBUG);
if ($this->db->query($sql))
{
$this->db->commit();
@@ -1781,7 +1773,7 @@ abstract class CommonObject
$sql .= ' ORDER BY sourcetype';
//print $sql;
- dol_syslog(get_class($this)."::fetchObjectLink sql=".$sql);
+ dol_syslog(get_class($this)."::fetchObjectLink", LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql)
{
@@ -1906,7 +1898,7 @@ abstract class CommonObject
$sql.= " AND sourcetype = '".$this->element."'";
}
- dol_syslog(get_class($this)."::updateObjectLinked sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::updateObjectLinked", LOG_DEBUG);
if ($this->db->query($sql))
{
return 1;
@@ -1914,7 +1906,6 @@ abstract class CommonObject
else
{
$this->error=$this->db->lasterror();
- dol_syslog(get_class($this)."::updateObjectLinked error=".$this->error, LOG_ERR);
return -1;
}
}
@@ -1960,7 +1951,7 @@ abstract class CommonObject
$sql.= " (fk_target = ".$this->id." AND targettype = '".$this->element."')";
}
- dol_syslog(get_class($this)."::deleteObjectLinked sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::deleteObjectLinked", LOG_DEBUG);
if ($this->db->query($sql))
{
return 1;
@@ -1968,7 +1959,6 @@ abstract class CommonObject
else
{
$this->error=$this->db->lasterror();
- dol_syslog(get_class($this)."::deleteObjectLinked error=".$this->error, LOG_ERR);
return -1;
}
}
@@ -1995,7 +1985,7 @@ abstract class CommonObject
$sql.= " SET ".$fieldstatus." = ".$status;
$sql.= " WHERE rowid=".$elementId;
- dol_syslog(get_class($this)."::setStatut sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::setStatut", LOG_DEBUG);
if ($this->db->query($sql))
{
$this->db->commit();
@@ -2005,7 +1995,6 @@ abstract class CommonObject
else
{
$this->error=$this->db->lasterror();
- dol_syslog(get_class($this)."::setStatut ".$this->error, LOG_ERR);
$this->db->rollback();
return -1;
}
@@ -2104,7 +2093,7 @@ abstract class CommonObject
$sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element."_extrafields";
$sql.= " WHERE fk_object = ".$rowid;
- dol_syslog(get_class($this)."::fetch_optionals sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::fetch_optionals", LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
@@ -2152,12 +2141,11 @@ abstract class CommonObject
$this->db->begin();
$sql_del = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element."_extrafields WHERE fk_object = ".$this->id;
- dol_syslog(get_class($this)."::deleteExtraFields delete sql=".$sql_del);
+ dol_syslog(get_class($this)."::deleteExtraFields delete", LOG_DEBUG);
$resql=$this->db->query($sql_del);
if (! $resql)
{
$this->error=$this->db->lasterror();
- dol_syslog(get_class($this)."::deleteExtraFields ".$this->error,LOG_ERR);
$this->db->rollback();
return -1;
}
@@ -2223,7 +2211,7 @@ abstract class CommonObject
$this->db->begin();
$sql_del = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element."_extrafields WHERE fk_object = ".$this->id;
- dol_syslog(get_class($this)."::insertExtraFields delete sql=".$sql_del);
+ dol_syslog(get_class($this)."::insertExtraFields delete", LOG_DEBUG);
$this->db->query($sql_del);
$sql = "INSERT INTO ".MAIN_DB_PREFIX.$this->table_element."_extrafields (fk_object";
foreach($this->array_options as $key => $value)
@@ -2252,12 +2240,11 @@ abstract class CommonObject
}
$sql.=")";
- dol_syslog(get_class($this)."::insertExtraFields insert sql=".$sql);
+ dol_syslog(get_class($this)."::insertExtraFields insert", LOG_DEBUG);
$resql = $this->db->query($sql);
if (! $resql)
{
$this->error=$this->db->lasterror();
- dol_syslog(get_class($this)."::update ".$this->error,LOG_ERR);
$this->db->rollback();
return -1;
}
@@ -2430,7 +2417,6 @@ abstract class CommonObject
else
{
$this->error=$this->db->lasterror();
- dol_syslog(get_class($this)."::delete error -1 ".$this->error, LOG_ERR);
return -1;
}
}
@@ -2479,7 +2465,7 @@ abstract class CommonObject
$sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element."det";
$sql.= " WHERE ".$this->fk_element." = ".$this->id;
- dol_syslog(get_class($this).'::getTotalDiscount sql='.$sql);
+ dol_syslog(get_class($this).'::getTotalDiscount', LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql)
{
@@ -2500,7 +2486,6 @@ abstract class CommonObject
$i++;
}
}
- else dol_syslog(get_class($this).'::getTotalDiscount '.$this->db->lasterror(), LOG_ERR);
//print $total_discount; exit;
return price2num($total_discount);
@@ -2521,12 +2506,11 @@ abstract class CommonObject
$sql.= " SET extraparams = ".(! empty($extraparams) ? "'".$this->db->escape($extraparams)."'" : "null");
$sql.= " WHERE rowid = ".$this->id;
- dol_syslog(get_class($this)."::setExtraParameters sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::setExtraParameters", LOG_DEBUG);
$resql = $this->db->query($sql);
if (! $resql)
{
$this->error=$this->db->lasterror();
- dol_syslog(get_class($this)."::setExtraParameters ".$this->error, LOG_ERR);
$this->db->rollback();
return -1;
}
@@ -3327,7 +3311,7 @@ abstract class CommonObject
$sql.= ", '".$mandatory."'";
$sql.= ")";
- dol_syslog(get_class($this)."::add_element_resource sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::add_element_resource", LOG_DEBUG);
if ($this->db->query($sql))
{
$this->db->commit();
@@ -3359,7 +3343,7 @@ abstract class CommonObject
$sql = "DELETE FROM ".MAIN_DB_PREFIX."element_resources";
$sql.= " WHERE rowid =".$rowid;
- dol_syslog(get_class($this)."::delete_resource sql=".$sql);
+ dol_syslog(get_class($this)."::delete_resource", LOG_DEBUG);
if ($this->db->query($sql))
{
if (! $notrigger)
@@ -3374,7 +3358,6 @@ abstract class CommonObject
{
$this->error=$this->db->lasterror();
$this->db->rollback();
- dol_syslog(get_class($this)."::delete_resource error=".$this->error, LOG_ERR);
return -1;
}
}
diff --git a/htdocs/core/class/cpays.class.php b/htdocs/core/class/cpays.class.php
index e6db8e4b2e9..e75f8a75a1a 100644
--- a/htdocs/core/class/cpays.class.php
+++ b/htdocs/core/class/cpays.class.php
@@ -97,7 +97,7 @@ class Cpays // extends CommonObject
$this->db->begin();
- dol_syslog(get_class($this)."::create sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::create", LOG_DEBUG);
$resql=$this->db->query($sql);
if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
@@ -158,7 +158,7 @@ class Cpays // extends CommonObject
if ($id) $sql.= " WHERE t.rowid = ".$id;
elseif ($code) $sql.= " WHERE t.code = '".$this->db->escape($code)."'";
- dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
@@ -179,7 +179,6 @@ class Cpays // extends CommonObject
else
{
$this->error="Error ".$this->db->lasterror();
- dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
return -1;
}
}
@@ -217,7 +216,7 @@ class Cpays // extends CommonObject
$this->db->begin();
- dol_syslog(get_class($this)."::update sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::update", LOG_DEBUG);
$resql = $this->db->query($sql);
if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
@@ -273,7 +272,7 @@ class Cpays // extends CommonObject
$this->db->begin();
- dol_syslog(get_class($this)."::delete sql=".$sql);
+ dol_syslog(get_class($this)."::delete", LOG_DEBUG);
$resql = $this->db->query($sql);
if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
diff --git a/htdocs/core/class/ctypent.class.php b/htdocs/core/class/ctypent.class.php
index 33070f83412..dd039b71015 100644
--- a/htdocs/core/class/ctypent.class.php
+++ b/htdocs/core/class/ctypent.class.php
@@ -102,7 +102,7 @@ class Ctypent // extends CommonObject
$this->db->begin();
- dol_syslog(get_class($this)."::create sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::create", LOG_DEBUG);
$resql=$this->db->query($sql);
if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
@@ -163,7 +163,7 @@ class Ctypent // extends CommonObject
if ($id) $sql.= " WHERE t.id = ".$id;
elseif ($code) $sql.= " WHERE t.code = '".$this->db->escape($code)."'";
- dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
@@ -184,7 +184,6 @@ class Ctypent // extends CommonObject
else
{
$this->error="Error ".$this->db->lasterror();
- dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
return -1;
}
}
@@ -222,7 +221,7 @@ class Ctypent // extends CommonObject
$this->db->begin();
- dol_syslog(get_class($this)."::update sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::update", LOG_DEBUG);
$resql = $this->db->query($sql);
if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
@@ -278,7 +277,7 @@ class Ctypent // extends CommonObject
$this->db->begin();
- dol_syslog(get_class($this)."::delete sql=".$sql);
+ dol_syslog(get_class($this)."::delete", LOG_DEBUG);
$resql = $this->db->query($sql);
if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
diff --git a/htdocs/core/class/discount.class.php b/htdocs/core/class/discount.class.php
index 23ce9f97f6d..f0291c9d567 100644
--- a/htdocs/core/class/discount.class.php
+++ b/htdocs/core/class/discount.class.php
@@ -85,7 +85,7 @@ class DiscountAbsolute
if ($rowid) $sql.= " sr.rowid=".$rowid;
if ($fk_facture_source) $sql.= " sr.fk_facture_source=".$fk_facture_source;
- dol_syslog(get_class($this)."::fetch sql=".$sql);
+ dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql)
{
@@ -159,7 +159,7 @@ class DiscountAbsolute
$sql.= " ".($this->fk_facture_source?"'".$this->fk_facture_source."'":"null");
$sql.= ")";
- dol_syslog(get_class($this)."::create sql=".$sql);
+ dol_syslog(get_class($this)."::create", LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
@@ -169,7 +169,6 @@ class DiscountAbsolute
else
{
$this->error=$this->db->lasterror().' - sql='.$sql;
- dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
return -1;
}
}
@@ -195,7 +194,7 @@ class DiscountAbsolute
$sql.=" AND fk_facture_source = ".$this->fk_facture_source;
//$sql.=" AND rowid != ".$this->id;
- dol_syslog(get_class($this)."::delete Check if we can remove discount sql=".$sql);
+ dol_syslog(get_class($this)."::delete Check if we can remove discount", LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
@@ -222,7 +221,7 @@ class DiscountAbsolute
$sql.= " AND (fk_facture_line IS NULL"; // Not used as absolute simple discount
$sql.= " AND fk_facture IS NULL)"; // Not used as credit note and not used as deposit
- dol_syslog(get_class($this)."::delete Delete discount sql=".$sql);
+ dol_syslog(get_class($this)."::delete Delete discount", LOG_DEBUG);
$result=$this->db->query($sql);
if ($result)
{
@@ -233,7 +232,7 @@ class DiscountAbsolute
$sql.=" set paye=0, fk_statut=1";
$sql.=" WHERE (type = 2 or type = 3) AND rowid=".$this->fk_facture_source;
- dol_syslog(get_class($this)."::delete Update credit note or deposit invoice statut sql=".$sql);
+ dol_syslog(get_class($this)."::delete Update credit note or deposit invoice statut", LOG_DEBUG);
$result=$this->db->query($sql);
if ($result)
{
@@ -291,7 +290,7 @@ class DiscountAbsolute
if ($rowidinvoice) $sql.=" SET fk_facture = ".$rowidinvoice;
$sql.=" WHERE rowid = ".$this->id;
- dol_syslog(get_class($this)."::link_to_invoice sql=".$sql,LOG_DEBUG);
+ dol_syslog(get_class($this)."::link_to_invoice", LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql)
{
@@ -302,7 +301,6 @@ class DiscountAbsolute
else
{
$this->error=$this->db->error();
- dol_syslog(get_class($this)."::link_to_invoice ".$this->error,LOG_ERR);
return -3;
}
}
@@ -320,7 +318,7 @@ class DiscountAbsolute
$sql.=" SET fk_facture_line = NULL, fk_facture = NULL";
$sql.=" WHERE rowid = ".$this->id;
- dol_syslog(get_class($this)."::unlink_invoice sql=".$sql,LOG_DEBUG);
+ dol_syslog(get_class($this)."::unlink_invoice", LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql)
{
@@ -329,7 +327,6 @@ class DiscountAbsolute
else
{
$this->error=$this->db->error();
- dol_syslog(get_class($this)."::unlink_invoice ".$this->error,LOG_ERR);
return -3;
}
}
@@ -355,7 +352,7 @@ class DiscountAbsolute
if ($filter) $sql.=' AND ('.$filter.')';
if ($maxvalue) $sql.=' AND rc.amount_ttc <= '.price2num($maxvalue);
- dol_syslog(get_class($this)."::getAvailableDiscounts sql=".$sql,LOG_DEBUG);
+ dol_syslog(get_class($this)."::getAvailableDiscounts", LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
@@ -384,7 +381,7 @@ class DiscountAbsolute
$sql.= ' WHERE rc.fk_facture_source=f.rowid AND rc.fk_facture = '.$invoice->id;
$sql.= ' AND f.type = 2';
- dol_syslog(get_class($this)."::getSumCreditNotesUsed sql=".$sql,LOG_DEBUG);
+ dol_syslog(get_class($this)."::getSumCreditNotesUsed", LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
@@ -410,7 +407,7 @@ class DiscountAbsolute
$sql.= ' WHERE rc.fk_facture_source=f.rowid AND rc.fk_facture = '.$invoice->id;
$sql.= ' AND f.type = 3';
- dol_syslog(get_class($this)."::getSumDepositsUsed sql=".$sql,LOG_DEBUG);
+ dol_syslog(get_class($this)."::getSumDepositsUsed", LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
diff --git a/htdocs/core/class/events.class.php b/htdocs/core/class/events.class.php
index b344a0c4059..ba4dcfb94f6 100644
--- a/htdocs/core/class/events.class.php
+++ b/htdocs/core/class/events.class.php
@@ -132,7 +132,7 @@ class Events // extends CommonObject
$sql.= " '".$this->db->escape($this->description)."'";
$sql.= ")";
- dol_syslog(get_class($this)."::create sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::create", LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
@@ -142,7 +142,6 @@ class Events // extends CommonObject
else
{
$this->error="Error ".$this->db->lasterror();
- dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
return -1;
}
}
@@ -174,12 +173,11 @@ class Events // extends CommonObject
$sql.= " description='".$this->db->escape($this->description)."'";
$sql.= " WHERE rowid=".$this->id;
- dol_syslog(get_class($this)."::update sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::update", LOG_DEBUG);
$resql = $this->db->query($sql);
if (! $resql)
{
$this->error="Error ".$this->db->lasterror();
- dol_syslog(get_class($this)."::update ".$this->error, LOG_ERR);
return -1;
}
return 1;
@@ -209,7 +207,7 @@ class Events // extends CommonObject
$sql.= " FROM ".MAIN_DB_PREFIX."events as t";
$sql.= " WHERE t.rowid = ".$id;
- dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
@@ -233,7 +231,6 @@ class Events // extends CommonObject
else
{
$this->error="Error ".$this->db->lasterror();
- dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
return -1;
}
}
@@ -252,12 +249,11 @@ class Events // extends CommonObject
$sql = "DELETE FROM ".MAIN_DB_PREFIX."events";
$sql.= " WHERE rowid=".$this->id;
- dol_syslog(get_class($this)."::delete sql=".$sql);
+ dol_syslog(get_class($this)."::delete", LOG_DEBUG);
$resql = $this->db->query($sql);
if (! $resql)
{
$this->error="Error ".$this->db->lasterror();
- dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
return -1;
}
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index df302f0ffad..e7363c39a43 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -255,7 +255,7 @@ class ExtraFields
$sql.= " '".$params."'";
$sql.=')';
- dol_syslog(get_class($this)."::create_label sql=".$sql);
+ dol_syslog(get_class($this)."::create_label", LOG_DEBUG);
if ($this->db->query($sql))
{
return 1;
@@ -286,7 +286,6 @@ class ExtraFields
if ($result < 0)
{
$this->error=$this->db->lasterror();
- dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
}
$result=$this->delete_label($attrname,$elementtype);
@@ -318,7 +317,7 @@ class ExtraFields
$sql.= " AND entity IN (0,".$conf->entity.')';
$sql.= " AND elementtype = '".$elementtype."'";
- dol_syslog(get_class($this)."::delete_label sql=".$sql);
+ dol_syslog(get_class($this)."::delete_label", LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
@@ -399,7 +398,7 @@ class ExtraFields
{
$sql="ALTER TABLE ".MAIN_DB_PREFIX.$table." DROP INDEX uk_".$table."_".$attrname;
}
- dol_syslog(get_class($this).'::update sql='.$sql);
+ dol_syslog(get_class($this).'::update', LOG_DEBUG);
$resql=$this->db->query($sql,1,'dml');
return 1;
}
@@ -454,7 +453,7 @@ class ExtraFields
$sql_del.= " WHERE name = '".$attrname."'";
$sql_del.= " AND entity = ".$conf->entity;
$sql_del.= " AND elementtype = '".$elementtype."'";
- dol_syslog(get_class($this)."::update_label sql=".$sql_del);
+ dol_syslog(get_class($this)."::update_label", LOG_DEBUG);
$resql1=$this->db->query($sql_del);
$sql = "INSERT INTO ".MAIN_DB_PREFIX."extrafields(";
@@ -480,7 +479,7 @@ class ExtraFields
$sql.= " '".$pos."',";
$sql.= " '".$param."'";
$sql.= ")";
- dol_syslog(get_class($this)."::update_label sql=".$sql);
+ dol_syslog(get_class($this)."::update_label", LOG_DEBUG);
$resql2=$this->db->query($sql);
if ($resql1 && $resql2)
@@ -537,7 +536,7 @@ class ExtraFields
if ($elementtype) $sql.= " AND elementtype = '".$elementtype."'";
$sql.= " ORDER BY pos";
- dol_syslog(get_class($this)."::fetch_name_optionals_label sql=".$sql);
+ dol_syslog(get_class($this)."::fetch_name_optionals_label", LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
@@ -754,7 +753,7 @@ class ExtraFields
$sql.=preg_replace('/^ AND /','',$sqlwhere);
//print $sql;
- dol_syslog(get_class($this).'::showInputField type=sellist sql='.$sql);
+ dol_syslog(get_class($this).'::showInputField type=sellist', LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql)
{
@@ -964,7 +963,7 @@ class ExtraFields
$sql.= " WHERE ".$selectkey."='".$this->db->escape($value)."'";
//$sql.= ' AND entity = '.$conf->entity;
- dol_syslog(get_class($this).':showOutputField:$type=sellist sql='.$sql);
+ dol_syslog(get_class($this).':showOutputField:$type=sellist', LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql)
{
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index bff13cf2781..1e7f0bb8246 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -486,7 +486,7 @@ class Form
$sql.= " WHERE active = 1";
//$sql.= " ORDER BY code ASC";
- dol_syslog(get_class($this)."::select_country sql=".$sql);
+ dol_syslog(get_class($this)."::select_country", LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
@@ -604,7 +604,7 @@ class Form
$sql.= " FROM ".MAIN_DB_PREFIX."c_type_fees as c";
$sql.= " ORDER BY lower(c.libelle) ASC";
- dol_syslog(get_class($this).'::load_cache_types_fees sql='.$sql, LOG_DEBUG);
+ dol_syslog(get_class($this).'::load_cache_types_fees', LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
@@ -795,7 +795,7 @@ class Form
$sql.=$this->db->order("nom","ASC");
if ($limit > 0) $sql.=$this->db->plimit($limit);
- dol_syslog(get_class($this)."::select_thirdparty_list sql=".$sql);
+ dol_syslog(get_class($this)."::select_thirdparty_list", LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
@@ -889,7 +889,7 @@ class Form
if ($filter) $sql.= " AND ".$filter;
$sql.= " ORDER BY re.description ASC";
- dol_syslog(get_class($this)."::select_remises sql=".$sql);
+ dol_syslog(get_class($this)."::select_remises", LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
@@ -995,7 +995,7 @@ class Form
if (! empty($conf->global->CONTACT_HIDE_INACTIVE_IN_COMBOBOX)) $sql.= " AND sp.statut<>0 ";
$sql.= " ORDER BY sp.lastname ASC";
- dol_syslog(get_class($this)."::select_contacts sql=".$sql);
+ dol_syslog(get_class($this)."::select_contacts", LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
@@ -1163,7 +1163,7 @@ class Form
if (! empty($conf->global->USER_HIDE_INACTIVE_IN_COMBOBOX)) $sql.= " AND u.statut<>0 ";
$sql.= " ORDER BY u.lastname ASC";
- dol_syslog(get_class($this)."::select_dolusers sql=".$sql);
+ dol_syslog(get_class($this)."::select_dolusers", LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
@@ -1413,7 +1413,7 @@ class Form
$sql.= $db->plimit($limit);
// Build output string
- dol_syslog(get_class($this)."::select_produits_list search product sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::select_produits_list search product", LOG_DEBUG);
$result=$this->db->query($sql);
if ($result)
{
@@ -1436,7 +1436,7 @@ class Form
$sql.= " WHERE fk_product_price=".$objp->price_rowid;
$sql.= " ORDER BY quantity ASC";
- dol_syslog(get_class($this)."::select_produits_list search price by qty sql=".$sql);
+ dol_syslog(get_class($this)."::select_produits_list search price by qty", LOG_DEBUG);
$result2 = $this->db->query($sql);
if ($result2)
{
@@ -1555,7 +1555,7 @@ class Form
$sql.= " ORDER BY date_price";
$sql.= " DESC LIMIT 1";
- dol_syslog(get_class($this).'::constructProductListOption search price for level '.$price_level.' sql='.$sql);
+ dol_syslog(get_class($this).'::constructProductListOption search price for level '.$price_level.'', LOG_DEBUG);
$result2 = $this->db->query($sql);
if ($result2)
{
@@ -1776,7 +1776,7 @@ class Form
// Build output string
- dol_syslog(get_class($this)."::select_produits_fournisseurs_list sql=".$sql,LOG_DEBUG);
+ dol_syslog(get_class($this)."::select_produits_fournisseurs_list", LOG_DEBUG);
$result=$this->db->query($sql);
if ($result)
{
@@ -1922,7 +1922,7 @@ class Form
$sql.= " AND p.rowid = ".$productid;
$sql.= " ORDER BY s.nom, pfp.ref_fourn DESC";
- dol_syslog(get_class($this)."::select_product_fourn_price sql=".$sql,LOG_DEBUG);
+ dol_syslog(get_class($this)."::select_product_fourn_price", LOG_DEBUG);
$result=$this->db->query($sql);
if ($result)
@@ -2006,7 +2006,7 @@ class Form
$sql .= " WHERE a.fk_soc = ".$socid;
$sql .= " ORDER BY a.label ASC";
- dol_syslog(get_class($this)."::select_address sql=".$sql);
+ dol_syslog(get_class($this)."::select_address", LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
@@ -2056,7 +2056,7 @@ class Form
$sql.= " FROM ".MAIN_DB_PREFIX.'c_payment_term';
$sql.= " WHERE active=1";
$sql.= " ORDER BY sortorder";
- dol_syslog(get_class($this).'::load_cache_conditions_paiements sql='.$sql,LOG_DEBUG);
+ dol_syslog(get_class($this).'::load_cache_conditions_paiements', LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql)
{
@@ -2095,7 +2095,7 @@ class Form
$sql.= " FROM ".MAIN_DB_PREFIX.'c_availability';
$sql.= " WHERE active=1";
$sql.= " ORDER BY rowid";
- dol_syslog(get_class($this).'::load_cache_availability sql='.$sql,LOG_DEBUG);
+ dol_syslog(get_class($this).'::load_cache_availability', LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql)
{
@@ -2168,7 +2168,7 @@ class Form
$sql.= " FROM ".MAIN_DB_PREFIX.'c_input_reason';
$sql.= " WHERE active=1";
$sql.= " ORDER BY rowid";
- dol_syslog(get_class($this)."::loadCacheInputReason sql=".$sql,LOG_DEBUG);
+ dol_syslog(get_class($this)."::loadCacheInputReason", LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql)
{
@@ -2249,7 +2249,7 @@ class Form
$sql.= " FROM ".MAIN_DB_PREFIX."c_paiement";
$sql.= " WHERE active > 0";
$sql.= " ORDER BY id";
- dol_syslog(get_class($this)."::load_cache_types_paiements sql=".$sql,LOG_DEBUG);
+ dol_syslog(get_class($this)."::load_cache_types_paiements", LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql)
{
@@ -2438,7 +2438,7 @@ class Form
if ($filtre) $sql.=" AND ".$filtre;
$sql.= " ORDER BY label";
- dol_syslog(get_class($this)."::select_comptes sql=".$sql);
+ dol_syslog(get_class($this)."::select_comptes", LOG_DEBUG);
$result = $this->db->query($sql);
if ($result)
{
@@ -4231,7 +4231,7 @@ class Form
if (is_array($include) && $includeGroups) $sql.= " AND ug.rowid IN ('".$includeGroups."')";
$sql.= " ORDER BY ug.nom ASC";
- dol_syslog(get_class($this)."::select_dolgroups sql=".$sql);
+ dol_syslog(get_class($this)."::select_dolgroups", LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php
index 1634998d023..d71c26af29c 100644
--- a/htdocs/core/class/html.formcompany.class.php
+++ b/htdocs/core/class/html.formcompany.class.php
@@ -66,7 +66,7 @@ class FormCompany
$sql.= " WHERE active = 1";
if ($filter) $sql.=" ".$filter;
$sql.= " ORDER by id";
- dol_syslog(get_class($this).'::typent_array sql='.$sql,LOG_DEBUG);
+ dol_syslog(get_class($this).'::typent_array', LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
@@ -105,7 +105,7 @@ class FormCompany
$sql.= " WHERE active = 1";
if ($filter) $sql.=" ".$filter;
$sql .= " ORDER BY id ASC";
- dol_syslog(get_class($this).'::effectif_array sql='.$sql,LOG_DEBUG);
+ dol_syslog(get_class($this).'::effectif_array', LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
@@ -230,7 +230,7 @@ class FormCompany
if ($country_codeid && ! is_numeric($country_codeid)) $sql .= " AND p.code = '".$country_codeid."'";
$sql .= " ORDER BY p.code, d.code_departement";
- dol_syslog(get_class($this)."::select_departement sql=".$sql);
+ dol_syslog(get_class($this)."::select_departement", LOG_DEBUG);
$result=$this->db->query($sql);
if ($result)
{
@@ -307,7 +307,7 @@ class FormCompany
$sql.= " WHERE r.fk_pays=p.rowid AND r.active = 1 and p.active = 1";
$sql.= " ORDER BY p.code, p.libelle ASC";
- dol_syslog(get_class($this)."::select_region sql=".$sql);
+ dol_syslog(get_class($this)."::select_region", LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
@@ -370,7 +370,7 @@ class FormCompany
$sql = "SELECT rowid, code, civilite as civility_label, active FROM ".MAIN_DB_PREFIX."c_civilite";
$sql.= " WHERE active = 1";
- dol_syslog("Form::select_civility sql=".$sql);
+ dol_syslog("Form::select_civility", LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
@@ -448,7 +448,7 @@ class FormCompany
if ($filter) $sql .= " ".$filter;
$sql .= " ORDER BY p.code";
- dol_syslog(get_class($this)."::select_juridicalstatus sql=".$sql);
+ dol_syslog(get_class($this)."::select_juridicalstatus", LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
@@ -776,32 +776,37 @@ class FormCompany
return $out;
}
-
+
/**
- * Return a select with localtax values for thirds
- *
- * @param int $local LocalTax
- * @param int $selected Preselected value
- * @param varchar $htmlname HTML select name
+ * Return a HTML select with localtax values for thirdparties
+ *
+ * @param int $local LocalTax
+ * @param int $selected Preselected value
+ * @param varchar $htmlname HTML select name
+ * @return void
*/
function select_localtax($local, $selected, $htmlname)
{
$tax=get_localtax_by_third($local);
-
+
$num = $this->db->num_rows($tax);
$i = 0;
if ($num)
{
$valors=explode(":", $tax);
-
- if(count($valors)>1)
+
+ if (count($valors) > 1)
{
//montar select
print '';
- while($i <= (count($valors))-1){
- if ($selected == $valors[$i]){
+ while ($i <= (count($valors))-1)
+ {
+ if ($selected == $valors[$i])
+ {
print '';
- }else{
+ }
+ else
+ {
print ' ';
}
print $valors[$i];
@@ -809,7 +814,6 @@ class FormCompany
$i++;
}
print' ';
-
}
}
}
diff --git a/htdocs/core/class/html.formcontract.class.php b/htdocs/core/class/html.formcontract.class.php
index cfc5be29b92..e0d550b4205 100644
--- a/htdocs/core/class/html.formcontract.class.php
+++ b/htdocs/core/class/html.formcontract.class.php
@@ -67,7 +67,7 @@ class FormContract
if ($socid == 0) $sql.= " AND (c.fk_soc = 0 OR c.fk_soc IS NULL)";
else $sql.= " AND c.fk_soc = ".$socid;
- dol_syslog(get_class($this)."::select_contract sql=".$sql);
+ dol_syslog(get_class($this)."::select_contract", LOG_DEBUG);
$resql=$db->query($sql);
if ($resql)
{
diff --git a/htdocs/core/class/html.formorder.class.php b/htdocs/core/class/html.formorder.class.php
index 6bc626b13f3..5ea5b33c1f4 100644
--- a/htdocs/core/class/html.formorder.class.php
+++ b/htdocs/core/class/html.formorder.class.php
@@ -116,7 +116,7 @@ class FormOrder
$sql.= " FROM ".MAIN_DB_PREFIX."c_input_method";
$sql.= " WHERE active = 1";
- dol_syslog(get_class($this)."::selectInputMethod sql=".$sql);
+ dol_syslog(get_class($this)."::selectInputMethod", LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index b6065909ade..f51cf060af8 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -169,7 +169,7 @@ class FormOther
$sql.= " WHERE e.active = 1 AND e.fk_pays = p.rowid";
$sql.= " ORDER BY pays, e.organization ASC, e.code ASC";
- dol_syslog(get_class($this).'::select_ecotaxes sql='.$sql);
+ dol_syslog(get_class($this).'::select_ecotaxes', LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
@@ -227,7 +227,7 @@ class FormOther
$sql.= " WHERE r.active = 1 AND r.fk_pays = p.rowid";
$sql.= " AND p.code = '".$country_code."'";
- dol_syslog(get_class($this).'::select_revenue_stamp sql='.$sql);
+ dol_syslog(get_class($this).'::select_revenue_stamp', LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
@@ -1122,7 +1122,7 @@ class FormOther
$sql.= " FROM ".MAIN_DB_PREFIX.$dictionarytable;
$sql.= " ORDER BY ".$labelfield;
- dol_syslog(get_class($this)."::select_dictionary sql=".$sql);
+ dol_syslog(get_class($this)."::select_dictionary", LOG_DEBUG);
$result = $this->db->query($sql);
if ($result)
{
diff --git a/htdocs/core/class/html.formprojet.class.php b/htdocs/core/class/html.formprojet.class.php
index 3d493b6571d..a86702fffbe 100644
--- a/htdocs/core/class/html.formprojet.class.php
+++ b/htdocs/core/class/html.formprojet.class.php
@@ -80,7 +80,7 @@ class FormProjets
if ($socid > 0) $sql.= " AND (p.fk_soc=".$socid." OR p.fk_soc IS NULL)";
$sql.= " ORDER BY p.ref ASC";
- dol_syslog(get_class($this)."::select_projects sql=".$sql,LOG_DEBUG);
+ dol_syslog(get_class($this)."::select_projects", LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
@@ -200,7 +200,7 @@ class FormProjets
$sql.= ' AND entity='.getEntity('project');
$sql.= " ORDER BY ref DESC";
- dol_syslog(get_class($this).'::select_element sql='.$sql,LOG_DEBUG);
+ dol_syslog(get_class($this).'::select_element', LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
diff --git a/htdocs/core/class/html.formpropal.class.php b/htdocs/core/class/html.formpropal.class.php
index fcbe46ab51b..df0f2d644dd 100644
--- a/htdocs/core/class/html.formpropal.class.php
+++ b/htdocs/core/class/html.formpropal.class.php
@@ -56,7 +56,7 @@ class FormPropal
$sql = "SELECT id, code, label, active FROM ".MAIN_DB_PREFIX."c_propalst";
$sql .= " WHERE active = 1";
- dol_syslog(get_class($this)."::selectProposalStatus sql=".$sql);
+ dol_syslog(get_class($this)."::selectProposalStatus", LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
diff --git a/htdocs/core/class/html.formsocialcontrib.class.php b/htdocs/core/class/html.formsocialcontrib.class.php
index f84f14c1446..b3c5a4c7d9c 100644
--- a/htdocs/core/class/html.formsocialcontrib.class.php
+++ b/htdocs/core/class/html.formsocialcontrib.class.php
@@ -79,7 +79,7 @@ class FormSocialContrib
$sql.= " ORDER BY c.libelle ASC";
}
- dol_syslog("Form::select_type_socialcontrib sql=".$sql, LOG_DEBUG);
+ dol_syslog("Form::select_type_socialcontrib", LOG_DEBUG);
$resql=$db->query($sql);
if ($resql)
{
diff --git a/htdocs/core/class/infobox.class.php b/htdocs/core/class/infobox.class.php
index c01d2d1f0f5..41380593375 100644
--- a/htdocs/core/class/infobox.class.php
+++ b/htdocs/core/class/infobox.class.php
@@ -73,7 +73,7 @@ class InfoBox
}
}
- dol_syslog(get_class()."::listBoxes get default box list for mode=".$mode." userid=".(is_object($user)?$user->id:'')." sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class()."::listBoxes get default box list for mode=".$mode." userid=".(is_object($user)?$user->id:'')."", LOG_DEBUG);
$resql = $db->query($sql);
if ($resql)
{
@@ -163,7 +163,6 @@ class InfoBox
{
//dol_print_error($db);
$error=$db->lasterror();
- dol_syslog(get_class()."::listBoxes Error ".$error, LOG_ERR);
}
return $boxes;
@@ -212,7 +211,7 @@ class InfoBox
$sql.= " AND fk_user = ".$userid;
$sql.= " AND position = ".$zone;
- dol_syslog(get_class()."::saveboxorder sql=".$sql);
+ dol_syslog(get_class()."::saveboxorder", LOG_DEBUG);
$result = $db->query($sql);
if ($result)
{
@@ -243,7 +242,7 @@ class InfoBox
$sql.= " ".$conf->entity;
$sql.= ")";
- dol_syslog(get_class()."::saveboxorder sql=".$sql);
+ dol_syslog(get_class()."::saveboxorder", LOG_DEBUG);
$result = $db->query($sql);
if ($result < 0)
{
diff --git a/htdocs/core/class/link.class.php b/htdocs/core/class/link.class.php
index 08d520d519e..4316d56f4fe 100644
--- a/htdocs/core/class/link.class.php
+++ b/htdocs/core/class/link.class.php
@@ -93,7 +93,7 @@ class Link extends CommonObject
$sql .= ", '" . $this->objecttype . "'";
$sql .= ", " . $this->objectid . ")";
- dol_syslog(get_class($this)."::create sql=".$sql);
+ dol_syslog(get_class($this)."::create", LOG_DEBUG);
$result = $this->db->query($sql);
if ($result) {
$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . "links");
@@ -136,7 +136,6 @@ class Link extends CommonObject
else
{
$this->error=$this->db->lasterror();
- dol_syslog(get_class($this)."::Create fails insert sql=".$sql, LOG_ERR);
$result=-2;
}
$this->db->rollback();
@@ -223,7 +222,6 @@ class Link extends CommonObject
else
{
$this->error = $langs->trans("Error sql = " . $sql);
- dol_syslog(get_class($this) . "::Update fails update = " . $this->error, LOG_ERR);
$result = -2;
}
$this->db->rollback();
@@ -256,7 +254,7 @@ class Link extends CommonObject
$sql .= " ORDER BY " . $sortfield . " " . $sortorder;
}
- dol_syslog(get_class($this)."::fetchAll sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::fetchAll", LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql)
{
@@ -281,7 +279,6 @@ class Link extends CommonObject
return 0;
}
} else {
- dol_syslog(get_class($this) . "::FetchAll fails sql=" . $sql, LOG_ERR);
return -1;
}
}
@@ -305,7 +302,7 @@ class Link extends CommonObject
$sql .= " WHERE rowid = " . $rowid;
if($conf->entity != 0) $sql .= " AND entity = " . $conf->entity;
- dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql)
{
@@ -326,7 +323,6 @@ class Link extends CommonObject
}
} else {
$this->error=$this->db->lasterror();
- dol_syslog($this->error, LOG_ERR);
return -1;
}
}
@@ -349,12 +345,11 @@ class Link extends CommonObject
$sql = "DELETE FROM " . MAIN_DB_PREFIX . "links";
$sql.= " WHERE rowid = " . $this->id;
- dol_syslog(get_class($this)."::delete sql=" . $sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::delete", LOG_DEBUG);
if (! $this->db->query($sql))
{
$error++;
$this->error = $this->db->lasterror();
- dol_syslog(get_class($this)."::delete error -4 " . $this->error, LOG_ERR);
}
diff --git a/htdocs/core/class/menubase.class.php b/htdocs/core/class/menubase.class.php
index 966b9ac7f77..aa43c545c8d 100644
--- a/htdocs/core/class/menubase.class.php
+++ b/htdocs/core/class/menubase.class.php
@@ -162,7 +162,7 @@ class Menubase
$sql.= " '".$this->user."'";
$sql.= ")";
- dol_syslog(get_class($this)."::create sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::create", LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
@@ -174,7 +174,6 @@ class Menubase
else
{
$this->error="Error ".$this->db->lasterror();
- dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
return -1;
}
}
@@ -232,12 +231,11 @@ class Menubase
$sql.= " usertype='".$this->user."'";
$sql.= " WHERE rowid=".$this->id;
- dol_syslog(get_class($this)."::update sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::update", LOG_DEBUG);
$resql = $this->db->query($sql);
if (! $resql)
{
$this->error="Error ".$this->db->lasterror();
- dol_syslog(get_class($this)."::update ".$this->error, LOG_ERR);
return -1;
}
@@ -277,7 +275,7 @@ class Menubase
$sql.= " FROM ".MAIN_DB_PREFIX."menu as t";
$sql.= " WHERE t.rowid = ".$id;
- dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
@@ -311,7 +309,6 @@ class Menubase
else
{
$this->error="Error ".$this->db->lasterror();
- dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
return -1;
}
}
@@ -330,12 +327,11 @@ class Menubase
$sql = "DELETE FROM ".MAIN_DB_PREFIX."menu";
$sql.= " WHERE rowid=".$this->id;
- dol_syslog(get_class($this)."::delete sql=".$sql);
+ dol_syslog(get_class($this)."::delete", LOG_DEBUG);
$resql = $this->db->query($sql);
if (! $resql)
{
$this->error="Error ".$this->db->lasterror();
- dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
return -1;
}
@@ -516,7 +512,7 @@ class Menubase
//$tmp1=dol_microtime_float();
//print '>>> 1 0
+// Copyright (C) 2011-2014 Laurent Destailleur
// Copyright (C) 2011-2012 Regis Houssin
//
// This program is free software; you can redistribute it and/or modify
@@ -18,7 +18,8 @@
//
// \file htdocs/core/js/dst.js
-// \brief File that include javascript functions for detect user tz, dst_observed, dst_first, dst_second
+// \brief File that include javascript functions for detect user tz, tz_string, dst_observed, dst_first, dst_second,
+// screenwidth and screenheight
//
$(document).ready(function () {
@@ -39,22 +40,22 @@ $(document).ready(function () {
dst = "1"; // daylight savings time is observed
}
var now=new Date();
- var tz=now.toTimeString().match(/\(.*\)/);
+ var tz=now.toTimeString().match(/\(.*\)/); // now.toTimeString may return "12:39:59 GMT+0200 (CEST)"
//alert('date=' + now + ' string=' + now.toTimeString());
var dst_first=DisplayDstSwitchDates('first');
var dst_second=DisplayDstSwitchDates('second');
//alert(dst);
- $('#tz').val(std_time_offset); // returns TZ
- // tz is null with IE
+ $('#tz').val(std_time_offset); // returns TZ
+ // tz is null with IE
if (tz != null) {
$('#tz_string').val(tz[0].replace('(','').replace(')','')); // returns TZ string
}
- $('#dst_observed').val(dst); // returns if DST is observed on summer
- $('#dst_first').val(dst_first); // returns DST first switch in year
- $('#dst_second').val(dst_second); // returns DST second switch in year
+ $('#dst_observed').val(dst); // returns if DST is observed on summer
+ $('#dst_first').val(dst_first); // returns DST first switch in year
+ $('#dst_second').val(dst_second); // returns DST second switch in year
// Detect and save screen resolution
- $('#screenwidth').val($(window).width()); // returns width of browser viewport
- $('#screenheight').val($(window).height()); // returns width of browser viewport
+ $('#screenwidth').val($(window).width()); // returns width of browser viewport
+ $('#screenheight').val($(window).height()); // returns width of browser viewport
});
function DisplayDstSwitchDates(firstsecond)
diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index 19441e507aa..cb338ff53f1 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -215,7 +215,6 @@ function run_sql($sqlfile,$silent=1,$entity='',$usesavepoint=1,$handler='',$oker
}
else
{
- dol_syslog('Admin.lib::run_sql Failed to get max rowid for '.$table.' '.$db->lasterror().' sql='.$sqlgetrowid, LOG_ERR);
if (! $silent) print '';
if (! $silent) print ''.$langs->trans("Failed to get max rowid for ".$table)."
";
if (! $silent) print ''.$langs->trans("Request").' '.($i+1)." sql='".dol_htmlentities($newsql,ENT_NOQUOTES)."'
- * Copyright (C) 2012-2013 Juanjo Menent
+ * Copyright (C) 2012-2014 Juanjo Menent
* Copyright (C) 2013 Cédric Salvador
*
* This program is free software; you can redistribute it and/or modify
@@ -835,15 +835,24 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
global $mysoc;
//Local Taxes
- if($mysoc->country_code=='ES' && (isset($mysoc->localtax2_assuj) && $mysoc->localtax2_assuj=="1"))
+ //Local Taxes 1
+ if($mysoc->useLocalTax(1) && (isset($mysoc->localtax1_assuj) && $mysoc->localtax1_assuj=="1"))
{
- if (empty($leftmenu) || preg_match('/^tax_vat/i',$leftmenu)) $newmenu->add("/compta/localtax/index.php?leftmenu=tax_vat&mainmenu=accountancy",$langs->transcountry("LT2",$mysoc->country_code),1,$user->rights->tax->charges->lire);
- if (empty($leftmenu) || preg_match('/^tax_vat/i',$leftmenu)) $newmenu->add("/compta/localtax/fiche.php?leftmenu=tax_vat&action=create",$langs->trans("NewPayment"),2,$user->rights->tax->charges->creer);
- if (empty($leftmenu) || preg_match('/^tax_vat/i',$leftmenu)) $newmenu->add("/compta/localtax/reglement.php?leftmenu=tax_vat",$langs->trans("Payments"),2,$user->rights->tax->charges->lire);
- if (empty($leftmenu) || preg_match('/^tax_vat/i',$leftmenu)) $newmenu->add("/compta/localtax/clients.php?leftmenu=tax_vat", $langs->trans("ReportByCustomers"), 2, $user->rights->tax->charges->lire);
- //if (empty($leftmenu) || preg_match('/^tax/i',$leftmenu)) $newmenu->add("/compta/localtax/quadri_detail.php?leftmenu=tax_vat", $langs->trans("ReportByQuarter"), 2, $user->rights->tax->charges->lire);
+ $newmenu->add("/compta/localtax/index.php?leftmenu=tax_vat&mainmenu=accountancy&localTaxType=1",$langs->transcountry("LT1",$mysoc->country_code),1,$user->rights->tax->charges->lire);
+ if (empty($leftmenu) || preg_match('/^tax/i',$leftmenu)) $newmenu->add("/compta/localtax/fiche.php?leftmenu=tax_vat&action=create&localTaxType=1",$langs->trans("NewPayment"),2,$user->rights->tax->charges->creer);
+ if (empty($leftmenu) || preg_match('/^tax/i',$leftmenu)) $newmenu->add("/compta/localtax/reglement.php?leftmenu=tax_vat&localTaxType=1",$langs->trans("Payments"),2,$user->rights->tax->charges->lire);
+ if (empty($leftmenu) || preg_match('/^tax/i',$leftmenu)) $newmenu->add("/compta/localtax/clients.php?leftmenu=tax_vat&localTaxType=1", $langs->trans("ReportByCustomers"), 2, $user->rights->tax->charges->lire);
+ if (empty($leftmenu) || preg_match('/^tax/i',$leftmenu)) $newmenu->add("/compta/localtax/quadri_detail.php?leftmenu=tax_vat&localTaxType=1", $langs->trans("ReportByQuarter"), 2, $user->rights->tax->charges->lire);
+ }
+ //Local Taxes 2
+ if($mysoc->useLocalTax(2) && (isset($mysoc->localtax2_assuj) && $mysoc->localtax2_assuj=="1"))
+ {
+ $newmenu->add("/compta/localtax/index.php?leftmenu=tax_vat&mainmenu=accountancy&localTaxType=2",$langs->transcountry("LT2",$mysoc->country_code),1,$user->rights->tax->charges->lire);
+ if (empty($leftmenu) || preg_match('/^tax/i',$leftmenu)) $newmenu->add("/compta/localtax/fiche.php?leftmenu=tax_vat&action=create&localTaxType=2",$langs->trans("NewPayment"),2,$user->rights->tax->charges->creer);
+ if (empty($leftmenu) || preg_match('/^tax/i',$leftmenu)) $newmenu->add("/compta/localtax/reglement.php?leftmenu=tax_vat&localTaxType=2",$langs->trans("Payments"),2,$user->rights->tax->charges->lire);
+ if (empty($leftmenu) || preg_match('/^tax/i',$leftmenu)) $newmenu->add("/compta/localtax/clients.php?leftmenu=tax_vat&localTaxType=2", $langs->trans("ReportByCustomers"), 2, $user->rights->tax->charges->lire);
+ if (empty($leftmenu) || preg_match('/^tax/i',$leftmenu)) $newmenu->add("/compta/localtax/quadri_detail.php?leftmenu=tax_vat&localTaxType=2", $langs->trans("ReportByQuarter"), 2, $user->rights->tax->charges->lire);
}
-
}
}
}
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index e25f4d0c715..1cbf5f08009 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -113,14 +113,13 @@ abstract class DolibarrModules
// Add current entity id
$sql=str_replace('__ENTITY__', $conf->entity, $sql);
- dol_syslog(get_class($this)."::_init ignoreerror=".$ignoreerror." sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::_init ignoreerror=".$ignoreerror."", LOG_DEBUG);
$result=$this->db->query($sql, $ignoreerror);
if (! $result)
{
if (! $ignoreerror)
{
$this->error=$this->db->lasterror();
- dol_syslog(get_class($this)."::_init Error ".$this->error, LOG_ERR);
$err++;
}
else
@@ -188,12 +187,11 @@ abstract class DolibarrModules
{
if (! $err)
{
- dol_syslog(get_class($this)."::_remove sql=".$array_sql[$i], LOG_DEBUG);
+ dol_syslog(get_class($this)."::_remove", LOG_DEBUG);
$result=$this->db->query($array_sql[$i]);
if (! $result)
{
$this->error=$this->db->error();
- dol_syslog(get_class($this)."::_remove Error ".$this->error, LOG_ERR);
$err++;
}
}
@@ -373,7 +371,7 @@ abstract class DolibarrModules
$sql.= " WHERE ".$this->db->decrypt('name')." = '".$this->const_name."'";
$sql.= " AND entity IN (0, ".$entity.")";
- dol_syslog(get_class($this)."::_active sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::_active", LOG_DEBUG);
$resql=$this->db->query($sql);
if (! $resql) $err++;
@@ -382,7 +380,7 @@ abstract class DolibarrModules
$sql.= ",".$this->db->encrypt('1',1);
$sql.= ",0,".$entity.")";
- dol_syslog(get_class($this)."::_active sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::_active", LOG_DEBUG);
$resql=$this->db->query($sql);
if (! $resql) $err++;
@@ -408,7 +406,7 @@ abstract class DolibarrModules
$sql.= " WHERE ".$this->db->decrypt('name')." = '".$this->const_name."'";
$sql.= " AND entity IN (0, ".$entity.")";
- dol_syslog(get_class($this)."::_unactive sql=".$sql);
+ dol_syslog(get_class($this)."::_unactive", LOG_DEBUG);
$this->db->query($sql);
return $err;
@@ -540,7 +538,7 @@ abstract class DolibarrModules
$sql.= " AND entity = ".$conf->entity;
if ($note) $sql.=" AND note ='".$this->db->escape($note)."'";
- dol_syslog(get_class($this)."::insert_boxes sql=".$sql);
+ dol_syslog(get_class($this)."::insert_boxes", LOG_DEBUG);
$result=$this->db->query($sql);
if ($result)
{
@@ -557,7 +555,7 @@ abstract class DolibarrModules
$sql.= $note?"'".$this->db->escape($note)."'":"null";
$sql.= ")";
- dol_syslog(get_class($this)."::insert_boxes sql=".$sql);
+ dol_syslog(get_class($this)."::insert_boxes", LOG_DEBUG);
$resql=$this->db->query($sql);
if (! $resql) $err++;
@@ -575,7 +573,7 @@ abstract class DolibarrModules
$sql = "INSERT INTO ".MAIN_DB_PREFIX."boxes (box_id,position,box_order,fk_user,entity)";
$sql.= " VALUES (".$lastid.", ".$key2.", '0', 0, ".$conf->entity.")";
- dol_syslog(get_class($this)."::insert_boxes onto page ".$key2."=".$val2." sql=".$sql);
+ dol_syslog(get_class($this)."::insert_boxes onto page ".$key2."=".$val2."", LOG_DEBUG);
$resql=$this->db->query($sql);
if (! $resql) $err++;
}
@@ -588,7 +586,6 @@ abstract class DolibarrModules
else
{
$this->error=$this->db->lasterror();
- dol_syslog(get_class($this)."::insert_boxes ".$this->error, LOG_ERR);
$this->db->rollback();
}
}
@@ -597,7 +594,6 @@ abstract class DolibarrModules
else
{
$this->error=$this->db->lasterror();
- dol_syslog(get_class($this)."::insert_boxes ".$this->error, LOG_ERR);
$err++;
}
}
@@ -634,12 +630,11 @@ abstract class DolibarrModules
$sql.= " AND ".MAIN_DB_PREFIX."boxes_def.file = '".$this->db->escape($file)."'";
$sql.= " AND ".MAIN_DB_PREFIX."boxes.entity = ".$conf->entity;
- dol_syslog(get_class($this)."::delete_boxes sql=".$sql);
+ dol_syslog(get_class($this)."::delete_boxes", LOG_DEBUG);
$resql=$this->db->query($sql);
if (! $resql)
{
$this->error=$this->db->lasterror();
- dol_syslog(get_class($this)."::delete_boxes ".$this->error, LOG_ERR);
$err++;
}
@@ -647,12 +642,11 @@ abstract class DolibarrModules
$sql.= " WHERE file = '".$this->db->escape($file)."'";
$sql.= " AND entity = ".$conf->entity;
- dol_syslog(get_class($this)."::delete_boxes sql=".$sql);
+ dol_syslog(get_class($this)."::delete_boxes", LOG_DEBUG);
$resql=$this->db->query($sql);
if (! $resql)
{
$this->error=$this->db->lasterror();
- dol_syslog(get_class($this)."::delete_boxes ".$this->error, LOG_ERR);
$err++;
}
}
@@ -676,11 +670,10 @@ abstract class DolibarrModules
$sql.= " WHERE ".$this->db->decrypt('name')." like '".$this->const_name."_TABS_%'";
$sql.= " AND entity = ".$conf->entity;
- dol_syslog(get_class($this)."::delete_tabs sql=".$sql);
+ dol_syslog(get_class($this)."::delete_tabs", LOG_DEBUG);
if (! $this->db->query($sql))
{
$this->error=$this->db->lasterror();
- dol_syslog(get_class($this)."::delete_tabs ".$this->error, LOG_ERR);
$err++;
}
@@ -722,7 +715,7 @@ abstract class DolibarrModules
$sql.= ", ".$conf->entity;
$sql.= ")";
- dol_syslog(get_class($this)."::insert_tabs sql=".$sql);
+ dol_syslog(get_class($this)."::insert_tabs", LOG_DEBUG);
$resql=$this->db->query($sql);
/* Allow duplicate key
if (! $resql)
@@ -784,10 +777,9 @@ abstract class DolibarrModules
$sql.= ")";
- dol_syslog(get_class($this)."::insert_const sql=".$sql);
+ dol_syslog(get_class($this)."::insert_const", LOG_DEBUG);
if (! $this->db->query($sql) )
{
- dol_syslog(get_class($this)."::insert_const ".$this->db->lasterror(), LOG_ERR);
$err++;
}
}
@@ -826,11 +818,10 @@ abstract class DolibarrModules
$sql = "DELETE FROM ".MAIN_DB_PREFIX."const";
$sql.= " WHERE ".$this->db->decrypt('name')." = '".$name."'";
$sql.= " AND entity in (0, ".$conf->entity.")";
- dol_syslog(get_class($this)."::delete_const sql=".$sql);
+ dol_syslog(get_class($this)."::delete_const", LOG_DEBUG);
if (! $this->db->query($sql))
{
$this->error=$this->db->lasterror();
- dol_syslog(get_class($this)."::delete_const ".$this->error, LOG_ERR);
$err++;
}
}
@@ -859,7 +850,7 @@ abstract class DolibarrModules
$sql_del.= " WHERE ".$this->db->decrypt('name')." = '".$this->const_name."'";
$sql_del.= " AND entity IN (0,".$entity.")";
- dol_syslog(get_class($this)."::insert_permissions sql=".$sql_del);
+ dol_syslog(get_class($this)."::insert_permissions", LOG_DEBUG);
$resql=$this->db->query($sql_del);
if ($resql)
{
@@ -904,14 +895,13 @@ abstract class DolibarrModules
$sql .= "(".$r_id.",".$entity.",'".$this->db->escape($r_desc)."','".$r_modul."','".$r_type."',".$r_def.")";
}
- dol_syslog(get_class($this)."::insert_permissions sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::insert_permissions", LOG_DEBUG);
$resqlinsert=$this->db->query($sql,1);
if (! $resqlinsert)
{
if ($this->db->errno() != "DB_ERROR_RECORD_ALREADY_EXISTS")
{
$this->error=$this->db->lasterror();
- dol_syslog(get_class($this)."::insert_permissions errno = ".$this->db->errno()." error ".$this->error, LOG_ERR);
$err++;
break;
}
@@ -927,7 +917,7 @@ abstract class DolibarrModules
require DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
}
$sql="SELECT rowid FROM ".MAIN_DB_PREFIX."user WHERE admin = 1";
- dol_syslog(get_class($this)."::insert_permissions Search all admin users sql=".$sql);
+ dol_syslog(get_class($this)."::insert_permissions Search all admin users", LOG_DEBUG);
$resqlseladmin=$this->db->query($sql,1);
if ($resqlseladmin)
{
@@ -960,7 +950,6 @@ abstract class DolibarrModules
else
{
$this->error=$this->db->lasterror();
- dol_syslog(get_class($this)."::insert_permissions ".$this->error, LOG_ERR);
$err++;
}
@@ -982,11 +971,10 @@ abstract class DolibarrModules
$sql = "DELETE FROM ".MAIN_DB_PREFIX."rights_def";
$sql.= " WHERE module = '".$this->rights_class."'";
$sql.= " AND entity = ".$conf->entity;
- dol_syslog(get_class($this)."::delete_permissions sql=".$sql);
+ dol_syslog(get_class($this)."::delete_permissions", LOG_DEBUG);
if (! $this->db->query($sql))
{
$this->error=$this->db->lasterror();
- dol_syslog(get_class($this)."::delete_permissions ".$this->error, LOG_ERR);
$err++;
}
@@ -1113,12 +1101,11 @@ abstract class DolibarrModules
$sql.= " WHERE module = '".$this->db->escape($this->rights_class)."'";
$sql.= " AND entity = ".$conf->entity;
- dol_syslog(get_class($this)."::delete_menus sql=".$sql);
+ dol_syslog(get_class($this)."::delete_menus", LOG_DEBUG);
$resql=$this->db->query($sql);
if (! $resql)
{
$this->error=$this->db->lasterror();
- dol_syslog(get_class($this)."::delete_menus ".$this->error, LOG_ERR);
$err++;
}
@@ -1201,7 +1188,7 @@ abstract class DolibarrModules
$sql.= " WHERE ".$this->db->decrypt('name')." = '".$name."'";
$sql.= " AND entity = ".$conf->entity;
- dol_syslog(get_class($this)."::insert_dirs sql=".$sql);
+ dol_syslog(get_class($this)."::insert_dirs", LOG_DEBUG);
$result=$this->db->query($sql);
if ($result)
{
@@ -1212,14 +1199,13 @@ abstract class DolibarrModules
$sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name,type,value,note,visible,entity)";
$sql.= " VALUES (".$this->db->encrypt($name,1).",'chaine',".$this->db->encrypt($dir,1).",'Directory for module ".$this->name."','0',".$conf->entity.")";
- dol_syslog(get_class($this)."::insert_dirs sql=".$sql);
+ dol_syslog(get_class($this)."::insert_dirs", LOG_DEBUG);
$resql=$this->db->query($sql);
}
}
else
{
$this->error=$this->db->lasterror();
- dol_syslog(get_class($this)."::insert_dirs ".$this->error, LOG_ERR);
$err++;
}
@@ -1242,11 +1228,10 @@ abstract class DolibarrModules
$sql.= " WHERE ".$this->db->decrypt('name')." LIKE '".$this->const_name."_DIR_%'";
$sql.= " AND entity = ".$conf->entity;
- dol_syslog(get_class($this)."::delete_dirs sql=".$sql);
+ dol_syslog(get_class($this)."::delete_dirs", LOG_DEBUG);
if (! $this->db->query($sql))
{
$this->error=$this->db->lasterror();
- dol_syslog(get_class($this)."::delete_dirs ".$this->error, LOG_ERR);
$err++;
}
@@ -1319,7 +1304,7 @@ abstract class DolibarrModules
$sql.= ", ".$entity;
$sql.= ")";
- dol_syslog(get_class($this)."::insert_const_".$key." sql=".$sql);
+ dol_syslog(get_class($this)."::insert_const_".$key."", LOG_DEBUG);
$resql=$this->db->query($sql,1);
if (! $resql)
{
@@ -1327,7 +1312,6 @@ abstract class DolibarrModules
{
$error++;
$this->error=$this->db->lasterror();
- dol_syslog(get_class($this)."::insert_const_".$key." ".$this->error, LOG_ERR);
}
else
{
@@ -1362,11 +1346,10 @@ abstract class DolibarrModules
$sql.= " WHERE ".$this->db->decrypt('name')." LIKE '".$this->const_name."_".strtoupper($key)."'";
$sql.= " AND entity = ".$entity;
- dol_syslog(get_class($this)."::delete_const_".$key." sql=".$sql);
+ dol_syslog(get_class($this)."::delete_const_".$key."", LOG_DEBUG);
if (! $this->db->query($sql))
{
$this->error=$this->db->lasterror();
- dol_syslog(get_class($this)."::delete_const_".$key." ".$this->error, LOG_ERR);
$err++;
}
}
diff --git a/htdocs/core/modules/action/rapport.pdf.php b/htdocs/core/modules/action/rapport.pdf.php
index b864205f2c9..7b539f92494 100644
--- a/htdocs/core/modules/action/rapport.pdf.php
+++ b/htdocs/core/modules/action/rapport.pdf.php
@@ -186,7 +186,7 @@ class CommActionRapport
$sql.= " AND '".$this->db->idate(dol_get_last_day($this->year,$this->month,false))."'";
$sql.= " ORDER BY a.datep DESC";
- dol_syslog(get_class($this)."::_page sql=".$sql);
+ dol_syslog(get_class($this)."::_page", LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
index 68266f2cef9..712dd0b765c 100644
--- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
@@ -403,7 +403,7 @@ class pdf_einstein extends ModelePDFCommandes
if ((! isset($localtax1_type) || $localtax1_type=='' || ! isset($localtax2_type) || $localtax2_type=='') // if tax type not defined
&& (! empty($localtax1_rate) || ! empty($localtax2_rate))) // and there is local tax
{
- $localtaxtmp_array=getLocalTaxesFromRate($vatrate,0,$mysoc);
+ $localtaxtmp_array=getLocalTaxesFromRate($vatrate,0,$object->thirdparty,$mysoc);
$localtax1_type = $localtaxtmp_array[0];
$localtax2_type = $localtaxtmp_array[2];
}
diff --git a/htdocs/core/modules/commande/doc/pdf_proforma.modules.php b/htdocs/core/modules/commande/doc/pdf_proforma.modules.php
index eb599c2a214..408fd543c93 100644
--- a/htdocs/core/modules/commande/doc/pdf_proforma.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_proforma.modules.php
@@ -402,7 +402,7 @@ class pdf_proforma extends ModelePDFCommandes
if ((! isset($localtax1_type) || $localtax1_type=='' || ! isset($localtax2_type) || $localtax2_type=='') // if tax type not defined
&& (! empty($localtax1_rate) || ! empty($localtax2_rate))) // and there is local tax
{
- $localtaxtmp_array=getLocalTaxesFromRate($vatrate,0,$mysoc);
+ $localtaxtmp_array=getLocalTaxesFromRate($vatrate,0, $object->thirdparty,$mysoc);
$localtax1_type = $localtaxtmp_array[0];
$localtax2_type = $localtaxtmp_array[2];
}
diff --git a/htdocs/core/modules/commande/mod_commande_marbre.php b/htdocs/core/modules/commande/mod_commande_marbre.php
index 8075099cdd6..92c8f55581c 100644
--- a/htdocs/core/modules/commande/mod_commande_marbre.php
+++ b/htdocs/core/modules/commande/mod_commande_marbre.php
@@ -119,7 +119,7 @@ class mod_commande_marbre extends ModeleNumRefCommandes
}
else
{
- dol_syslog("mod_commande_marbre::getNextValue sql=".$sql);
+ dol_syslog("mod_commande_marbre::getNextValue", LOG_DEBUG);
return -1;
}
diff --git a/htdocs/core/modules/contract/mod_contract_serpis.php b/htdocs/core/modules/contract/mod_contract_serpis.php
index a07f3261133..61ca01ae419 100644
--- a/htdocs/core/modules/contract/mod_contract_serpis.php
+++ b/htdocs/core/modules/contract/mod_contract_serpis.php
@@ -116,7 +116,7 @@ class mod_contract_serpis extends ModelNumRefContracts
}
else
{
- dol_syslog("mod_contract_serpis::getNextValue sql=".$sql);
+ dol_syslog("mod_contract_serpis::getNextValue", LOG_DEBUG);
return -1;
}
diff --git a/htdocs/core/modules/expedition/mod_expedition_safor.php b/htdocs/core/modules/expedition/mod_expedition_safor.php
index ba779658051..581657c6547 100644
--- a/htdocs/core/modules/expedition/mod_expedition_safor.php
+++ b/htdocs/core/modules/expedition/mod_expedition_safor.php
@@ -116,7 +116,7 @@ class mod_expedition_safor extends ModelNumRefExpedition
}
else
{
- dol_syslog("mod_expedition_safor::getNextValue sql=".$sql);
+ dol_syslog("mod_expedition_safor::getNextValue", LOG_DEBUG);
return -1;
}
diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index 9186e51b954..d07bd93825c 100644
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -2,7 +2,7 @@
/* Copyright (C) 2004-2014 Laurent Destailleur
* Copyright (C) 2005-2012 Regis Houssin
* Copyright (C) 2008 Raphael Bertrand
- * Copyright (C) 2010-2013 Juanjo Menent
+ * Copyright (C) 2010-2014 Juanjo Menent
* Copyright (C) 2012 Christophe Battarel
*
* This program is free software; you can redistribute it and/or modify
@@ -404,7 +404,7 @@ class pdf_crabe extends ModelePDFFactures
if ((! isset($localtax1_type) || $localtax1_type=='' || ! isset($localtax2_type) || $localtax2_type=='') // if tax type not defined
&& (! empty($localtax1_rate) || ! empty($localtax2_rate))) // and there is local tax
{
- $localtaxtmp_array=getLocalTaxesFromRate($vatrate,0,$mysoc);
+ $localtaxtmp_array=getLocalTaxesFromRate($vatrate,0, $object->thirdparty, $mysoc);
$localtax1_type = $localtaxtmp_array[0];
$localtax2_type = $localtaxtmp_array[2];
}
@@ -624,7 +624,6 @@ class pdf_crabe extends ModelePDFFactures
else
{
$this->error=$this->db->lasterror();
- dol_syslog($this->db,$this->error, LOG_ERR);
return -1;
}
@@ -663,7 +662,6 @@ class pdf_crabe extends ModelePDFFactures
else
{
$this->error=$this->db->lasterror();
- dol_syslog($this->db,$this->error, LOG_ERR);
return -1;
}
diff --git a/htdocs/core/modules/facture/mod_facture_mars.php b/htdocs/core/modules/facture/mod_facture_mars.php
index f1a46913e25..25c6d2cd2ad 100644
--- a/htdocs/core/modules/facture/mod_facture_mars.php
+++ b/htdocs/core/modules/facture/mod_facture_mars.php
@@ -144,7 +144,7 @@ class mod_facture_mars extends ModeleNumRefFactures
$sql.= " AND entity = ".$conf->entity;
$resql=$db->query($sql);
- dol_syslog(get_class($this)."::getNextValue sql=".$sql);
+ dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
if ($resql)
{
$obj = $db->fetch_object($resql);
@@ -153,7 +153,6 @@ class mod_facture_mars extends ModeleNumRefFactures
}
else
{
- dol_syslog(get_class($this)."::getNextValue sql=".$sql, LOG_ERR);
return -1;
}
@@ -168,7 +167,7 @@ class mod_facture_mars extends ModeleNumRefFactures
$sql.= " WHERE facnumber LIKE '".$prefix."____-".$num."'";
$sql.= " AND entity = ".$conf->entity;
- dol_syslog(get_class($this)."::getNextValue sql=".$sql);
+ dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
$resql=$db->query($sql);
if ($resql)
{
diff --git a/htdocs/core/modules/facture/mod_facture_terre.php b/htdocs/core/modules/facture/mod_facture_terre.php
index 9a8b5feaed7..dc06c6202ec 100644
--- a/htdocs/core/modules/facture/mod_facture_terre.php
+++ b/htdocs/core/modules/facture/mod_facture_terre.php
@@ -160,7 +160,7 @@ class mod_facture_terre extends ModeleNumRefFactures
$sql.= " AND entity = ".$conf->entity;
$resql=$db->query($sql);
- dol_syslog(get_class($this)."::getNextValue sql=".$sql);
+ dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
if ($resql)
{
$obj = $db->fetch_object($resql);
@@ -169,7 +169,6 @@ class mod_facture_terre extends ModeleNumRefFactures
}
else
{
- dol_syslog(get_class($this)."::getNextValue sql=".$sql, LOG_ERR);
return -1;
}
@@ -184,7 +183,7 @@ class mod_facture_terre extends ModeleNumRefFactures
$sql.= " WHERE facnumber LIKE '".$prefix."____-".$num."'";
$sql.= " AND entity = ".$conf->entity;
- dol_syslog(get_class($this)."::getNextValue sql=".$sql);
+ dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
$resql=$db->query($sql);
if ($resql)
{
diff --git a/htdocs/core/modules/import/import_csv.modules.php b/htdocs/core/modules/import/import_csv.modules.php
index e83f812e8c4..cd3d82576ff 100644
--- a/htdocs/core/modules/import/import_csv.modules.php
+++ b/htdocs/core/modules/import/import_csv.modules.php
@@ -621,7 +621,7 @@ class ImportCsv extends ModeleImports
}
if (! empty($objimport->array_import_tables_creator[0][$alias])) $sql.=', '.$user->id;
$sql.=')';
- dol_syslog("import_csv.modules sql=".$sql);
+ dol_syslog("import_csv.modules", LOG_DEBUG);
//print '> '.join(',',$arrayrecord);
//print 'sql='.$sql;
diff --git a/htdocs/core/modules/livraison/mod_livraison_jade.php b/htdocs/core/modules/livraison/mod_livraison_jade.php
index 77ca85f8e6c..3480bb6d609 100644
--- a/htdocs/core/modules/livraison/mod_livraison_jade.php
+++ b/htdocs/core/modules/livraison/mod_livraison_jade.php
@@ -118,7 +118,7 @@ class mod_livraison_jade extends ModeleNumRefDeliveryOrder
$sql.= " AND entity = ".$conf->entity;
$resql=$db->query($sql);
- dol_syslog("mod_livraison_jade::getNextValue sql=".$sql);
+ dol_syslog("mod_livraison_jade::getNextValue", LOG_DEBUG);
if ($resql)
{
$obj = $db->fetch_object($resql);
@@ -127,7 +127,6 @@ class mod_livraison_jade extends ModeleNumRefDeliveryOrder
}
else
{
- dol_syslog("mod_livraison_jade::getNextValue sql=".$sql, LOG_ERR);
return -1;
}
diff --git a/htdocs/core/modules/mailings/contacts3.modules.php b/htdocs/core/modules/mailings/contacts3.modules.php
index 4c6480b8812..2cf5a708056 100644
--- a/htdocs/core/modules/mailings/contacts3.modules.php
+++ b/htdocs/core/modules/mailings/contacts3.modules.php
@@ -92,7 +92,6 @@ class mailing_contacts3 extends MailingTargets
if ($filtersarray[0] <> 'all') $sql.= " AND c.label = '".$this->db->escape($filtersarray[0])."'";
$sql.= " ORDER BY sp.lastname, sp.firstname";
- dol_syslog("sql=".$sql);
$resql = $this->db->query($sql);
if ($resql)
{
diff --git a/htdocs/core/modules/mailings/contacts4.modules.php b/htdocs/core/modules/mailings/contacts4.modules.php
index acf4a316660..eb14b3995f4 100644
--- a/htdocs/core/modules/mailings/contacts4.modules.php
+++ b/htdocs/core/modules/mailings/contacts4.modules.php
@@ -89,7 +89,7 @@ class mailing_contacts4 extends MailingTargets
if ($filtersarray[0] <> 'all') $sql.= " AND c.label = '".$this->db->escape($filtersarray[0])."'";
$sql.= " ORDER BY sp.lastname, sp.firstname";
- dol_syslog(get_class($this).':: add_to_target sql='.$sql,LOG_DEBUG);
+ dol_syslog(get_class($this).':: add_to_target',LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql)
{
@@ -115,7 +115,6 @@ class mailing_contacts4 extends MailingTargets
}
}else {
$this->error=$this->db->lasterrno();
- dol_syslog(get_class($this)."Error sql=".$sql." ".$this->error, LOG_ERR);
return -1;
}
@@ -215,7 +214,7 @@ class mailing_contacts4 extends MailingTargets
$resql = $this->db->query($sql);
- dol_syslog(get_class($this).':: formFilter sql='.$sql,LOG_DEBUG);
+ dol_syslog(get_class($this).':: formFilter',LOG_DEBUG);
if ($resql) {
$s='';
$s.='';
@@ -236,7 +235,6 @@ class mailing_contacts4 extends MailingTargets
}
else {
$this->error=$this->db->lasterrno();
- dol_syslog("Error sql=".$sql." ".$this->error, LOG_ERR);
return -1;
}
diff --git a/htdocs/core/modules/mailings/fraise.modules.php b/htdocs/core/modules/mailings/fraise.modules.php
index 0e79a1f6e91..a9df6300f80 100644
--- a/htdocs/core/modules/mailings/fraise.modules.php
+++ b/htdocs/core/modules/mailings/fraise.modules.php
@@ -180,7 +180,7 @@ class mailing_fraise extends MailingTargets
//print $sql;
// Add targets into table
- dol_syslog(get_class($this)."::add_to_target sql=".$sql);
+ dol_syslog(get_class($this)."::add_to_target", LOG_DEBUG);
$result=$this->db->query($sql);
if ($result)
{
diff --git a/htdocs/core/modules/project/mod_project_simple.php b/htdocs/core/modules/project/mod_project_simple.php
index da1c914f484..17ae9f29ddf 100644
--- a/htdocs/core/modules/project/mod_project_simple.php
+++ b/htdocs/core/modules/project/mod_project_simple.php
@@ -122,7 +122,7 @@ class mod_project_simple extends ModeleNumRefProjects
}
else
{
- dol_syslog("mod_project_simple::getNextValue sql=".$sql);
+ dol_syslog("mod_project_simple::getNextValue", LOG_DEBUG);
return -1;
}
diff --git a/htdocs/core/modules/project/task/mod_task_simple.php b/htdocs/core/modules/project/task/mod_task_simple.php
index afc17d663c0..eb8928d3b8f 100644
--- a/htdocs/core/modules/project/task/mod_task_simple.php
+++ b/htdocs/core/modules/project/task/mod_task_simple.php
@@ -122,7 +122,7 @@ class mod_task_simple extends ModeleNumRefTask
}
else
{
- dol_syslog("mod_task_simple::getNextValue sql=".$sql);
+ dol_syslog("mod_task_simple::getNextValue", LOG_DEBUG);
return -1;
}
diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index fe952fb9903..4ac15330b42 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -2,7 +2,7 @@
/* Copyright (C) 2004-2014 Laurent Destailleur
* Copyright (C) 2005-2012 Regis Houssin
* Copyright (C) 2008 Raphael Bertrand
- * Copyright (C) 2010-2013 Juanjo Menent
+ * Copyright (C) 2010-2014 Juanjo Menent
* Copyright (C) 2012 Christophe Battarel
*
* This program is free software; you can redistribute it and/or modify
@@ -458,7 +458,7 @@ class pdf_azur extends ModelePDFPropales
if ((! isset($localtax1_type) || $localtax1_type=='' || ! isset($localtax2_type) || $localtax2_type=='') // if tax type not defined
&& (! empty($localtax1_rate) || ! empty($localtax2_rate))) // and there is local tax
{
- $localtaxtmp_array=getLocalTaxesFromRate($vatrate,0,$mysoc);
+ $localtaxtmp_array=getLocalTaxesFromRate($vatrate,0,$object->thirdparty,$mysoc);
$localtax1_type = $localtaxtmp_array[0];
$localtax2_type = $localtaxtmp_array[2];
}
diff --git a/htdocs/core/modules/propale/mod_propale_marbre.php b/htdocs/core/modules/propale/mod_propale_marbre.php
index aa2959691e6..ff38bc5f9cb 100644
--- a/htdocs/core/modules/propale/mod_propale_marbre.php
+++ b/htdocs/core/modules/propale/mod_propale_marbre.php
@@ -124,7 +124,7 @@ class mod_propale_marbre extends ModeleNumRefPropales
}
else
{
- dol_syslog("mod_propale_marbre::getNextValue sql=".$sql);
+ dol_syslog("mod_propale_marbre::getNextValue", LOG_DEBUG);
return -1;
}
diff --git a/htdocs/core/modules/rapport/pdf_paiement.class.php b/htdocs/core/modules/rapport/pdf_paiement.class.php
index d0defd260dd..78e8998f7d6 100644
--- a/htdocs/core/modules/rapport/pdf_paiement.class.php
+++ b/htdocs/core/modules/rapport/pdf_paiement.class.php
@@ -156,7 +156,7 @@ class pdf_paiement
if (! empty($socid)) $sql .= " AND s.rowid = ".$socid;
$sql.= " ORDER BY p.datep ASC, pf.fk_paiement ASC";
- dol_syslog(get_class($this)."::write_file sql=".$sql);
+ dol_syslog(get_class($this)."::write_file", LOG_DEBUG);
$result = $this->db->query($sql);
if ($result)
{
diff --git a/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php b/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
index fbf3cc5c6b0..8eb0c33d11f 100644
--- a/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
+++ b/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
@@ -302,7 +302,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as p";
$sql .= " WHERE p.fk_soc = ".$object->id;
- dol_syslog('doc_generic_odt :: sql='.$sql,LOG_DEBUG);
+ dol_syslog('doc_generic_odt ::', LOG_DEBUG);
$result = $this->db->query($sql);
$num = $this->db->num_rows($result);
diff --git a/htdocs/core/modules/societe/mod_codeclient_monkey.php b/htdocs/core/modules/societe/mod_codeclient_monkey.php
index 8b31e581e26..f85de6b47d3 100644
--- a/htdocs/core/modules/societe/mod_codeclient_monkey.php
+++ b/htdocs/core/modules/societe/mod_codeclient_monkey.php
@@ -124,6 +124,8 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
$sql.= " WHERE ".$field." LIKE '".$prefix."____-%'";
$sql.= " AND entity IN (".getEntity('societe', 1).")";
+ dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
+
$resql=$db->query($sql);
if ($resql)
{
@@ -133,7 +135,6 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
}
else
{
- dol_syslog(get_class($this)."::getNextValue sql=".$sql, LOG_ERR);
return -1;
}
@@ -225,7 +226,7 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
$sql.= " AND entity IN (".getEntity('societe', 1).")";
if ($soc->id > 0) $sql.= " AND rowid <> ".$soc->id;
- dol_syslog(get_class($this)."::verif_dispo sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::verif_dispo", LOG_DEBUG);
$resql=$db->query($sql);
if ($resql)
{
diff --git a/htdocs/core/modules/societe/mod_codecompta_aquarium.php b/htdocs/core/modules/societe/mod_codecompta_aquarium.php
index a191c727ebf..57d8f0c20a6 100644
--- a/htdocs/core/modules/societe/mod_codecompta_aquarium.php
+++ b/htdocs/core/modules/societe/mod_codecompta_aquarium.php
@@ -178,7 +178,6 @@ class mod_codecompta_aquarium extends ModeleAccountancyCode
else
{
$this->error=$db->error()." sql=".$sql;
- dol_syslog("mod_codecompta_aquarium::verif error".$this->error, LOG_ERR);
return -1; // Erreur
}
}
diff --git a/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php b/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php
index 049c312e1ef..ea0456bc3ff 100644
--- a/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php
+++ b/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php
@@ -118,7 +118,7 @@ class mod_facture_fournisseur_cactus extends ModeleNumRefSuppliersInvoices
$sql.= " AND entity = ".$conf->entity;
$resql=$db->query($sql);
- dol_syslog(get_class($this)."::getNextValue sql=".$sql);
+ dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
if ($resql)
{
$obj = $db->fetch_object($resql);
@@ -127,7 +127,6 @@ class mod_facture_fournisseur_cactus extends ModeleNumRefSuppliersInvoices
}
else
{
- dol_syslog(get_class($this)."::getNextValue sql=".$sql, LOG_ERR);
return -1;
}
@@ -142,7 +141,7 @@ class mod_facture_fournisseur_cactus extends ModeleNumRefSuppliersInvoices
$sql.= " WHERE ref LIKE '".$prefix."____-".$num."'";
$sql.= " AND entity = ".$conf->entity;
- dol_syslog(get_class($this)."::getNextValue sql=".$sql);
+ dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
$resql=$db->query($sql);
if ($resql)
{
diff --git a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
index ead49d7de98..848778275eb 100644
--- a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
+++ b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
@@ -861,7 +861,6 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
else
{
$this->error=$this->db->lasterror();
- dol_syslog($this->db,$this->error, LOG_ERR);
return -1;
}
diff --git a/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
index f15cab9cb6b..d601167c26d 100644
--- a/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
+++ b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
@@ -2,7 +2,7 @@
/* Copyright (C) 2004-2014 Laurent Destailleur
* Copyright (C) 2005-2011 Regis Houssin
* Copyright (C) 2007 Franky Van Liedekerke
- * Copyright (C) 2010-2013 Juanjo Menent
+ * Copyright (C) 2010-2014 Juanjo Menent
*
* 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
@@ -393,7 +393,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
if ((! isset($localtax1_type) || $localtax1_type=='' || ! isset($localtax2_type) || $localtax2_type=='') // if tax type not defined
&& (! empty($localtax1_rate) || ! empty($localtax2_rate))) // and there is local tax
{
- $localtaxtmp_array=getLocalTaxesFromRate($vatrate,0,$mysoc);
+ $localtaxtmp_array=getLocalTaxesFromRate($vatrate,0,$mysoc,$object->thirdparty);
$localtax1_type = $localtaxtmp_array[0];
$localtax2_type = $localtaxtmp_array[2];
}
@@ -698,7 +698,11 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
//{
//Local tax 1
- foreach( $this->localtax1 as $tvakey => $tvaval )
+ foreach( $this->localtax1 as $localtax_type => $localtax_rate )
+ {
+ if (in_array((string) $localtax_type, array('2','4','6'))) continue;
+
+ foreach( $localtax_rate as $tvakey => $tvaval )
{
if ($tvakey != 0) // On affiche pas taux 0
{
@@ -718,15 +722,19 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
- $pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', 1);
+ $pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
}
}
- //}
+ }
//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
//{
//Local tax 2
- foreach( $this->localtax2 as $tvakey => $tvaval )
+ foreach( $this->localtax2 as $localtax_type => $localtax_rate )
+ {
+ if (in_array((string) $localtax_type, array('2','4','6'))) continue;
+
+ foreach( $localtax_rate as $tvakey => $tvaval )
{
if ($tvakey != 0) // On affiche pas taux 0
{
@@ -749,7 +757,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', 1);
}
}
- //}
+ }
}
// Total TTC
diff --git a/htdocs/core/triggers/interface_50_modNotification_Notification.class.php b/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
index c035acac207..aff6e526b93 100644
--- a/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
+++ b/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
@@ -238,7 +238,7 @@ class InterfaceNotification
$sql = "SELECT rowid, code, label, description, elementtype";
$sql.= " FROM ".MAIN_DB_PREFIX."c_action_trigger";
$sql.= $this->db->order("elementtype, code");
- dol_syslog("Get list of notifications sql=".$sql);
+ dol_syslog("Get list of notifications", LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
diff --git a/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN b/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
index f0f96961b86..62b758739c7 100644
--- a/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
+++ b/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
@@ -119,6 +119,8 @@ class InterfaceDemo
}
elseif ($action == 'USER_CREATE')
{
+ $object->error=$action;
+ return -1;
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
}
elseif ($action == 'USER_CREATE_FROM_CONTACT')
@@ -154,6 +156,20 @@ class InterfaceDemo
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
}
+ // Action
+ elseif ($action == 'ACTION_MODIFY')
+ {
+ dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+ }
+ elseif ($action == 'ACTION_CREATE')
+ {
+ dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+ }
+ elseif ($action == 'ACTION_DELETE')
+ {
+ dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+ }
+
// Groups
elseif ($action == 'GROUP_CREATE')
{
@@ -487,6 +503,22 @@ class InterfaceDemo
{
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
}
+
+ //Donation
+ elseif ($action == 'DON_CREATE')
+ {
+ dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+ }
+ elseif ($action == 'DON_UPDATE')
+ {
+ dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+ }
+ elseif ($action == 'DON_DELETE')
+ {
+ dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+ }
+
+
// Interventions
elseif ($action == 'FICHINTER_CREATE')
diff --git a/htdocs/cron/class/cronjob.class.php b/htdocs/cron/class/cronjob.class.php
index f1fc788a198..23313d27f13 100644
--- a/htdocs/cron/class/cronjob.class.php
+++ b/htdocs/cron/class/cronjob.class.php
@@ -224,7 +224,7 @@ class Cronjob extends CommonObject
$this->db->begin();
- dol_syslog(get_class($this)."::create sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::create", LOG_DEBUG);
$resql=$this->db->query($sql);
if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
@@ -309,7 +309,7 @@ class Cronjob extends CommonObject
$sql.= " FROM ".MAIN_DB_PREFIX."cronjob as t";
$sql.= " WHERE t.rowid = ".$id;
- dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
@@ -356,7 +356,6 @@ class Cronjob extends CommonObject
else
{
$this->error="Error ".$this->db->lasterror();
- dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
return -1;
}
}
@@ -429,7 +428,7 @@ class Cronjob extends CommonObject
$sql.= " WHERE ".implode(' AND ',$sqlwhere);
}
- dol_syslog(get_class($this)."::fetch_all sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::fetch_all", LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
@@ -490,7 +489,6 @@ class Cronjob extends CommonObject
else
{
$this->error="Error ".$this->db->lasterror();
- dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
return -1;
}
}
@@ -609,7 +607,7 @@ class Cronjob extends CommonObject
$this->db->begin();
- dol_syslog(get_class($this)."::update sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::update", LOG_DEBUG);
$resql = $this->db->query($sql);
if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
@@ -683,7 +681,7 @@ class Cronjob extends CommonObject
$sql = "DELETE FROM ".MAIN_DB_PREFIX."cronjob";
$sql.= " WHERE rowid=".$this->id;
- dol_syslog(get_class($this)."::delete sql=".$sql);
+ dol_syslog(get_class($this)."::delete", LOG_DEBUG);
$resql = $this->db->query($sql);
if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
}
@@ -816,7 +814,7 @@ class Cronjob extends CommonObject
$sql.= " FROM ".MAIN_DB_PREFIX."cronjob as f";
$sql.= " WHERE f.rowid = ".$this->id;
- dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
@@ -836,7 +834,6 @@ class Cronjob extends CommonObject
else
{
$this->error="Error ".$this->db->lasterror();
- dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
return -1;
}
}
diff --git a/htdocs/ecm/class/ecmdirectory.class.php b/htdocs/ecm/class/ecmdirectory.class.php
index ea29d822102..87f3bcd59ba 100644
--- a/htdocs/ecm/class/ecmdirectory.class.php
+++ b/htdocs/ecm/class/ecmdirectory.class.php
@@ -142,7 +142,7 @@ class EcmDirectory // extends CommonObject
$sql.= " '".$this->fk_user_c."'";
$sql.= ")";
- dol_syslog(get_class($this)."::create sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::create", LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
@@ -173,7 +173,6 @@ class EcmDirectory // extends CommonObject
else
{
$this->error="Error ".$this->db->lasterror();
- dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
$this->db->rollback();
return -1;
}
@@ -210,13 +209,12 @@ class EcmDirectory // extends CommonObject
$sql.= " description='".$this->db->escape($this->description)."'";
$sql.= " WHERE rowid=".$this->id;
- dol_syslog(get_class($this)."::update sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::update", LOG_DEBUG);
$resql = $this->db->query($sql);
if (! $resql)
{
$error++;
$this->error="Error ".$this->db->lasterror();
- dol_syslog("EcmDirectories::update ".$this->error, LOG_ERR);
}
if (! $error && ! $notrigger)
@@ -257,12 +255,11 @@ class EcmDirectory // extends CommonObject
$sql.= " cachenbofdoc = cachenbofdoc ".$sign." 1";
$sql.= " WHERE rowid = ".$this->id;
- dol_syslog(get_class($this)."::changeNbOfFiles sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::changeNbOfFiles", LOG_DEBUG);
$resql = $this->db->query($sql);
if (! $resql)
{
$this->error="Error ".$this->db->lasterror();
- dol_syslog(get_class($this)."::changeNbOfFiles ".$this->error, LOG_ERR);
return -1;
}
@@ -291,7 +288,7 @@ class EcmDirectory // extends CommonObject
$sql.= " FROM ".MAIN_DB_PREFIX."ecm_directories as t";
$sql.= " WHERE t.rowid = ".$id;
- dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
@@ -318,7 +315,6 @@ class EcmDirectory // extends CommonObject
else
{
$this->error="Error ".$this->db->lasterror();
- dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
return -1;
}
}
@@ -348,13 +344,12 @@ class EcmDirectory // extends CommonObject
$sql = "DELETE FROM ".MAIN_DB_PREFIX."ecm_directories";
$sql.= " WHERE rowid=".$this->id;
- dol_syslog(get_class($this)."::delete sql=".$sql);
+ dol_syslog(get_class($this)."::delete", LOG_DEBUG);
$resql = $this->db->query($sql);
if (! $resql)
{
$this->db->rollback();
$this->error="Error ".$this->db->lasterror();
- dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
return -2;
}
@@ -499,7 +494,7 @@ class EcmDirectory // extends CommonObject
$sql.= " WHERE fk_parent != 0";
$sql.= " AND entity = ".$conf->entity;
- dol_syslog(get_class($this)."::load_motherof sql=".$sql);
+ dol_syslog(get_class($this)."::load_motherof", LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql)
{
@@ -563,7 +558,7 @@ class EcmDirectory // extends CommonObject
$sql.= " AND c.entity = ".$conf->entity;
$sql.= " ORDER BY c.label, c.rowid";
- dol_syslog(get_class($this)."::get_full_arbo sql=".$sql);
+ dol_syslog(get_class($this)."::get_full_arbo", LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql)
{
@@ -688,7 +683,7 @@ class EcmDirectory // extends CommonObject
$sql.= " WHERE entity = ".$conf->entity;
}
- dol_syslog(get_class($this)."::refreshcachenboffile sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::refreshcachenboffile", LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql)
{
@@ -698,7 +693,6 @@ class EcmDirectory // extends CommonObject
else
{
$this->error="Error ".$this->db->lasterror();
- dol_syslog(get_class($this)."::refreshcachenboffile ".$this->error, LOG_ERR);
return -1;
}
}
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index c0c647698e8..5b50a18368e 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -227,7 +227,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);
+ dol_syslog(get_class($this)."::create", LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
@@ -237,7 +237,7 @@ class Expedition extends CommonObject
$sql.= " SET ref = '(PROV".$this->id.")'";
$sql.= " WHERE rowid = ".$this->id;
- dol_syslog(get_class($this)."::create sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::create", LOG_DEBUG);
if ($this->db->query($sql))
{
// Insertion des lignes
@@ -348,7 +348,7 @@ class Expedition extends CommonObject
$sql.= ", ".$qty;
$sql.= ")";
- dol_syslog(get_class($this)."::create_line sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::create_line", LOG_DEBUG);
if (! $this->db->query($sql))
{
$error++;
@@ -413,7 +413,7 @@ class Expedition extends CommonObject
if ($ref_ext) $sql.= " AND e.ref_ext='".$this->db->escape($ref_ext)."'";
if ($ref_int) $sql.= " AND e.ref_int='".$this->db->escape($ref_int)."'";
- dol_syslog(get_class($this)."::fetch sql=".$sql);
+ dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
$result = $this->db->query($sql);
if ($result)
{
@@ -487,14 +487,13 @@ class Expedition extends CommonObject
}
else
{
- dol_syslog(get_class($this).'::Fetch Error -2');
+ dol_syslog(get_class($this).'::Fetch Error -2', LOG_ERR);
$this->error='Delivery with id '.$id.' not found sql='.$sql;
return -2;
}
}
else
{
- dol_syslog(get_class($this).'::Fetch Error -1');
$this->error=$this->db->error();
return -1;
}
@@ -559,11 +558,10 @@ class Expedition extends CommonObject
$sql.= ", fk_user_valid = ".$user->id;
$sql.= " WHERE rowid = ".$this->id;
- dol_syslog(get_class($this)."::valid update expedition sql=".$sql);
+ dol_syslog(get_class($this)."::valid update expedition", LOG_DEBUG);
$resql=$this->db->query($sql);
if (! $resql)
{
- dol_syslog(get_class($this)."::valid Echec update - 10 - sql=".$sql, LOG_ERR);
$this->error=$this->db->lasterror();
$error++;
}
@@ -583,7 +581,7 @@ class Expedition extends CommonObject
$sql.= " WHERE ed.fk_expedition = ".$this->id;
$sql.= " AND cd.rowid = ed.fk_origin_line";
- dol_syslog(get_class($this)."::valid select details sql=".$sql);
+ dol_syslog(get_class($this)."::valid select details", LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
@@ -616,7 +614,6 @@ class Expedition extends CommonObject
{
$this->db->rollback();
$this->error=$this->db->error();
- dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
return -2;
}
}
@@ -862,7 +859,7 @@ class Expedition extends CommonObject
$this->db->begin();
- dol_syslog(get_class($this)."::update sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::update", LOG_DEBUG);
$resql = $this->db->query($sql);
if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
@@ -938,7 +935,7 @@ class Expedition extends CommonObject
$sql.= " WHERE ed.fk_expedition = ".$this->id;
$sql.= " AND cd.rowid = ed.fk_origin_line";
- dol_syslog(get_class($this)."::delete select details sql=".$sql);
+ dol_syslog(get_class($this)."::delete select details", LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
@@ -1078,7 +1075,7 @@ class Expedition extends CommonObject
$sql.= " WHERE ed.fk_expedition = ".$this->id;
$sql.= " AND ed.fk_origin_line = cd.rowid";
- dol_syslog(get_class($this)."::fetch_lines sql=".$sql);
+ dol_syslog(get_class($this)."::fetch_lines", LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql)
{
@@ -1160,7 +1157,6 @@ class Expedition extends CommonObject
else
{
$this->error=$this->db->error();
- dol_syslog(get_class($this).'::fetch_lines: Error '.$this->error, LOG_ERR);
return -3;
}
}
@@ -1344,7 +1340,7 @@ class Expedition extends CommonObject
$sql.= " SET date_delivery = ".($date_livraison ? "'".$this->db->idate($date_livraison)."'" : 'null');
$sql.= " WHERE rowid = ".$this->id;
- dol_syslog(get_class($this)."::set_date_livraison sql=".$sql,LOG_DEBUG);
+ dol_syslog(get_class($this)."::set_date_livraison", LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
@@ -1354,7 +1350,6 @@ class Expedition extends CommonObject
else
{
$this->error=$this->db->error();
- dol_syslog(get_class($this)."::set_date_livraison ".$this->error,LOG_ERR);
return -1;
}
}
diff --git a/htdocs/expedition/class/expeditionbatch.class.php b/htdocs/expedition/class/expeditionbatch.class.php
index 7bbd99706bd..62d23aaa7ff 100644
--- a/htdocs/expedition/class/expeditionbatch.class.php
+++ b/htdocs/expedition/class/expeditionbatch.class.php
@@ -69,7 +69,7 @@ class ExpeditionLigneBatch extends CommonObject
$sql.= MAIN_DB_PREFIX."product_stock as e on t.fk_product_stock=e.rowid ";
$sql.= " WHERE t.rowid = ".(int) $id_stockdluo;
- dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
@@ -91,7 +91,6 @@ class ExpeditionLigneBatch extends CommonObject
else
{
$this->error="Error ".$this->db->lasterror();
- dol_syslog(__METHOD__ .$this->error, LOG_ERR);
return -1;
}
}
@@ -123,7 +122,7 @@ class ExpeditionLigneBatch extends CommonObject
$sql.= " ".(! isset($this->fk_origin_stock)?'NULL':$this->fk_origin_stock);
$sql.= ")";
- dol_syslog(__METHOD__ ." sql=".$sql, LOG_DEBUG);
+ dol_syslog(__METHOD__ ."", LOG_DEBUG);
$resql=$this->db->query($sql);
if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
@@ -157,7 +156,7 @@ class ExpeditionLigneBatch extends CommonObject
$sql="DELETE FROM ".MAIN_DB_PREFIX.self::$_table_element;
$sql.=" WHERE fk_expeditiondet in (SELECT rowid FROM ".MAIN_DB_PREFIX."expeditiondet WHERE fk_expedition=".$id_expedition.")";
- dol_syslog(__METHOD__ ." sql=".$sql, LOG_DEBUG);
+ dol_syslog(__METHOD__ ."", LOG_DEBUG);
if ( $db->query($sql) )
{
return 1;
@@ -185,7 +184,7 @@ class ExpeditionLigneBatch extends CommonObject
$sql.= " FROM ".MAIN_DB_PREFIX.self::$_table_element;
$sql.= " WHERE fk_expeditiondet=".(int) $id_line_expdet;
- dol_syslog(__METHOD__ ." sql=".$sql, LOG_DEBUG);
+ dol_syslog(__METHOD__ ."", LOG_DEBUG);
$resql=$db->query($sql);
if ($resql)
{
diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php
index fce9c3bf6a5..d44a7d5f4a4 100644
--- a/htdocs/expedition/shipment.php
+++ b/htdocs/expedition/shipment.php
@@ -363,7 +363,7 @@ if ($id > 0 || ! empty($ref))
$sql.= " ORDER BY cd.rang, cd.rowid";
//print $sql;
- dol_syslog("shipment.php sql=".$sql, LOG_DEBUG);
+ dol_syslog("shipment.php", LOG_DEBUG);
$resql = $db->query($sql);
if ($resql)
{
diff --git a/htdocs/exports/class/export.class.php b/htdocs/exports/class/export.class.php
index fda062952d1..d332592da6d 100644
--- a/htdocs/exports/class/export.class.php
+++ b/htdocs/exports/class/export.class.php
@@ -519,7 +519,7 @@ class Export
// Run the sql
$this->sqlusedforexport=$sql;
- dol_syslog(get_class($this)."::".__FUNCTION__." sql=".$sql);
+ dol_syslog(get_class($this)."::".__FUNCTION__."", LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql)
{
@@ -592,7 +592,6 @@ class Export
else
{
$this->error=$this->db->error()." - sql=".$sql;
- dol_syslog("Export::build_file Error: ".$this->error, LOG_ERR);
return -1;
}
}
@@ -628,7 +627,7 @@ class Export
$sql.= (! empty($filter)?"'".$filter."'":"null");
$sql.= ")";
- dol_syslog("Export::create sql=".$sql, LOG_DEBUG);
+ dol_syslog("Export::create", LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
@@ -639,7 +638,6 @@ class Export
{
$this->error=$this->db->lasterror();
$this->errno=$this->db->lasterrno();
- dol_syslog("Export::create error ".$this->error, LOG_ERR);
$this->db->rollback();
return -1;
}
@@ -657,7 +655,7 @@ class Export
$sql.= ' FROM '.MAIN_DB_PREFIX.'export_model as em';
$sql.= ' WHERE em.rowid = '.$id;
- dol_syslog("Export::fetch sql=".$sql, LOG_DEBUG);
+ dol_syslog("Export::fetch", LOG_DEBUG);
$result = $this->db->query($sql);
if ($result)
{
@@ -706,7 +704,7 @@ class Export
$this->db->begin();
- dol_syslog(get_class($this)."::delete sql=".$sql);
+ dol_syslog(get_class($this)."::delete", LOG_DEBUG);
$resql = $this->db->query($sql);
if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index d7bb50682fe..7a792dbc4ad 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -151,7 +151,7 @@ class Fichinter extends CommonObject
$sql.= ", ".($this->note_public?"'".$this->db->escape($this->note_public)."'":"null");
$sql.= ")";
- dol_syslog(get_class($this)."::create sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::create", LOG_DEBUG);
$result=$this->db->query($sql);
if ($result)
{
@@ -162,7 +162,7 @@ class Fichinter extends CommonObject
$this->ref='(PROV'.$this->id.')';
$sql = 'UPDATE '.MAIN_DB_PREFIX."fichinter SET ref='".$this->ref."' WHERE rowid=".$this->id;
- dol_syslog(get_class($this)."::create sql=".$sql);
+ dol_syslog(get_class($this)."::create", LOG_DEBUG);
$resql=$this->db->query($sql);
if (! $resql) $error++;
}
@@ -176,13 +176,10 @@ class Fichinter extends CommonObject
if (! $notrigger)
{
- // Appel des triggers
- include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
- $interface=new Interfaces($this->db);
- $result=$interface->run_triggers('FICHINTER_CREATE',$this,$user,$langs,$conf);
- if ($result < 0) {
- $error++; $this->errors=$interface->errors;
- }
+ // Call trigger
+ $result=$this->call_trigger('FICHINTER_CREATE',$user);
+ if ($result < 0) { $error++; }
+ // End call triggers
}
if (! $error)
@@ -201,7 +198,6 @@ class Fichinter extends CommonObject
else
{
$this->error=$this->db->error();
- dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
$this->db->rollback();
return -1;
}
@@ -234,20 +230,16 @@ class Fichinter extends CommonObject
$sql.= ", note_public = ".($this->note_public?"'".$this->db->escape($this->note_public)."'":"null");
$sql.= " WHERE rowid = ".$this->id;
- dol_syslog(get_class($this)."::update sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::update", LOG_DEBUG);
if ($this->db->query($sql))
{
if (! $notrigger)
{
- // Appel des triggers
- include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
- $interface=new Interfaces($this->db);
- $result=$interface->run_triggers('FICHINTER_MODIFY',$this,$user,$langs,$conf);
- if ($result < 0) {
- $error++; $this->errors=$interface->errors;
- }
- // Fin appel triggers
+ // Call trigger
+ $result=$this->call_trigger('FICHINTER_MODIFY',$user);
+ if ($result < 0) { $error++; $this->db->rollback(); return -1; }
+ // End call triggers
}
$this->db->commit();
@@ -256,7 +248,6 @@ class Fichinter extends CommonObject
else
{
$this->error=$this->db->error();
- dol_syslog(get_class($this)."::update error ".$this->error, LOG_ERR);
$this->db->rollback();
return -1;
}
@@ -280,7 +271,7 @@ class Fichinter extends CommonObject
if ($ref) $sql.= " WHERE f.ref='".$this->db->escape($ref)."'";
else $sql.= " WHERE f.rowid=".$rowid;
- dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
@@ -326,7 +317,6 @@ class Fichinter extends CommonObject
else
{
$this->error=$this->db->error();
- dol_syslog(get_class($this)."::fetch ".$this->error,LOG_ERR);
return -1;
}
}
@@ -350,7 +340,7 @@ class Fichinter extends CommonObject
$sql.= " WHERE rowid = ".$this->id;
$sql.= " AND entity = ".$conf->entity;
- dol_syslog("Fichinter::setDraft sql=".$sql);
+ dol_syslog("Fichinter::setDraft", LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
@@ -361,7 +351,6 @@ class Fichinter extends CommonObject
{
$this->db->rollback();
$this->error=$this->db->lasterror();
- dol_syslog("Fichinter::setDraft ".$this->error,LOG_ERR);
return -1;
}
}
@@ -405,11 +394,10 @@ class Fichinter extends CommonObject
$sql.= " AND entity = ".$conf->entity;
$sql.= " AND fk_statut = 0";
- dol_syslog(get_class($this)."::setValid sql=".$sql);
+ dol_syslog(get_class($this)."::setValid", LOG_DEBUG);
$resql=$this->db->query($sql);
if (! $resql)
{
- dol_syslog(get_class($this)."::setValid Echec update - 10 - sql=".$sql, LOG_ERR);
dol_print_error($this->db);
$error++;
}
@@ -454,14 +442,10 @@ class Fichinter extends CommonObject
if (! $error)
{
- // Appel des triggers
- include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
- $interface=new Interfaces($this->db);
- $result=$interface->run_triggers('FICHINTER_VALIDATE',$this,$user,$langs,$conf);
- if ($result < 0) {
- $error++; $this->errors=$interface->errors;
- }
- // Fin appel triggers
+ // Call trigger
+ $result=$this->call_trigger('FICHINTER_VALIDATE',$user);
+ if ($result < 0) { $error++; }
+ // End call triggers
}
if (! $error)
@@ -723,14 +707,14 @@ class Fichinter extends CommonObject
$sql = "DELETE FROM ".MAIN_DB_PREFIX."fichinterdet";
$sql.= " WHERE fk_fichinter = ".$this->id;
- dol_syslog("Fichinter::delete sql=".$sql);
+ dol_syslog("Fichinter::delete", LOG_DEBUG);
if ( $this->db->query($sql) )
{
$sql = "DELETE FROM ".MAIN_DB_PREFIX."fichinter";
$sql.= " WHERE rowid = ".$this->id;
$sql.= " AND entity = ".$conf->entity;
- dol_syslog("Fichinter::delete sql=".$sql);
+ dol_syslog("Fichinter::delete", LOG_DEBUG);
if ( $this->db->query($sql) )
{
@@ -762,14 +746,10 @@ class Fichinter extends CommonObject
if (! $notrigger)
{
- // Appel des triggers
- include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
- $interface=new Interfaces($this->db);
- $result=$interface->run_triggers('FICHINTER_DELETE',$this,$user,$langs,$conf);
- if ($result < 0) {
- $error++; $this->errors=$interface->errors;
- }
- // Fin appel triggers
+ // Call trigger
+ $result=$this->call_trigger('FICHINTER_DELETE',$user);
+ if ($result < 0) { $error++; $this->db->rollback(); return -1; }
+ // End call triggers
}
$this->db->commit();
@@ -875,7 +855,6 @@ class Fichinter extends CommonObject
$sql.= " WHERE rowid = ".$this->id;
$sql.= " AND entity = ".$conf->entity;
- dol_syslog("sql=".$sql);
if ($this->db->query($sql))
{
$this->fk_contrat = $contractid;
@@ -884,7 +863,6 @@ class Fichinter extends CommonObject
else
{
$this->error=$this->db->error();
- dol_syslog($this->error, LOG_ERR);
return -1;
}
}
@@ -926,7 +904,6 @@ class Fichinter extends CommonObject
else
{
$this->error=$this->db->error();
- dol_syslog("Error sql=$sql, error=".$this->error, LOG_ERR);
$this->db->rollback();
return -1;
}
@@ -983,7 +960,7 @@ class Fichinter extends CommonObject
$sql.= ' FROM '.MAIN_DB_PREFIX.'fichinterdet';
$sql.= ' WHERE fk_fichinter = '.$this->id;
- dol_syslog(get_class($this)."::fetch_lines sql=".$sql);
+ dol_syslog(get_class($this)."::fetch_lines", LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
@@ -1058,7 +1035,7 @@ class FichinterLigne
$sql.= ' FROM '.MAIN_DB_PREFIX.'fichinterdet as ft';
$sql.= ' WHERE ft.rowid = '.$rowid;
- dol_syslog("FichinterLigne::fetch sql=".$sql);
+ dol_syslog("FichinterLigne::fetch", LOG_DEBUG);
$result = $this->db->query($sql);
if ($result)
{
@@ -1076,7 +1053,6 @@ class FichinterLigne
else
{
$this->error=$this->db->error().' sql='.$sql;
- dol_print_error($this->db,$this->error, LOG_ERR);
return -1;
}
}
@@ -1126,7 +1102,7 @@ class FichinterLigne
$sql.= ' '.$rangToUse;
$sql.= ')';
- dol_syslog("FichinterLigne::insert sql=".$sql);
+ dol_syslog("FichinterLigne::insert", LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
@@ -1137,14 +1113,10 @@ class FichinterLigne
if (! $notrigger)
{
- // Appel des triggers
- include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
- $interface=new Interfaces($this->db);
- $resulttrigger=$interface->run_triggers('LINEFICHINTER_CREATE',$this,$user,$langs,$conf);
- if ($resulttrigger < 0) {
- $error++; $this->errors=$interface->errors;
- }
- // Fin appel triggers
+ // Call trigger
+ $result=$this->call_trigger('LINEFICHINTER_CREATE',$user);
+ if ($result < 0) { $error++; }
+ // End call triggers
}
}
@@ -1161,7 +1133,6 @@ class FichinterLigne
else
{
$this->error=$this->db->error()." sql=".$sql;
- dol_syslog("FichinterLigne::insert Error ".$this->error, LOG_ERR);
$this->db->rollback();
return -1;
}
@@ -1189,7 +1160,7 @@ class FichinterLigne
$sql.= ",rang='".$this->rang."'";
$sql.= " WHERE rowid = ".$this->rowid;
- dol_syslog("FichinterLigne::update sql=".$sql);
+ dol_syslog("FichinterLigne::update", LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
@@ -1199,14 +1170,10 @@ class FichinterLigne
if (! $notrigger)
{
- // Appel des triggers
- include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
- $interface=new Interfaces($this->db);
- $resulttrigger=$interface->run_triggers('LINEFICHINTER_UPDATE',$this,$user,$langs,$conf);
- if ($resulttrigger < 0) {
- $error++; $this->errors=$interface->errors;
- }
- // Fin appel triggers
+ // Call trigger
+ $result=$this->call_trigger('LINEFICHINTER_UPDATE',$user);
+ if ($result < 0) { $error++; }
+ // End call triggers
}
}
@@ -1218,7 +1185,6 @@ class FichinterLigne
else
{
$this->error=$this->db->lasterror();
- dol_syslog("FichinterLigne::update Error ".$this->error, LOG_ERR);
$this->db->rollback();
return -1;
}
@@ -1226,7 +1192,6 @@ class FichinterLigne
else
{
$this->error=$this->db->lasterror();
- dol_syslog("FichinterLigne::update Error ".$this->error, LOG_ERR);
$this->db->rollback();
return -1;
}
@@ -1247,7 +1212,7 @@ class FichinterLigne
$sql.= " FROM ".MAIN_DB_PREFIX."fichinterdet";
$sql.= " WHERE fk_fichinter=".$this->fk_fichinter;
- dol_syslog("FichinterLigne::update_total sql=".$sql);
+ dol_syslog("FichinterLigne::update_total", LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
@@ -1260,7 +1225,7 @@ class FichinterLigne
$sql.= " WHERE rowid = ".$this->fk_fichinter;
$sql.= " AND entity = ".$conf->entity;
- dol_syslog("FichinterLigne::update_total sql=".$sql);
+ dol_syslog("FichinterLigne::update_total", LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
@@ -1270,7 +1235,6 @@ class FichinterLigne
else
{
$this->error=$this->db->error();
- dol_syslog("FichinterLigne::update_total Error ".$this->error, LOG_ERR);
$this->db->rollback();
return -2;
}
@@ -1278,7 +1242,6 @@ class FichinterLigne
else
{
$this->error=$this->db->error();
- dol_syslog("FichinterLigne::update Error ".$this->error, LOG_ERR);
$this->db->rollback();
return -1;
}
@@ -1302,28 +1265,22 @@ class FichinterLigne
$sql = "DELETE FROM ".MAIN_DB_PREFIX."fichinterdet WHERE rowid = ".$this->rowid;
$resql = $this->db->query($sql);
- dol_syslog(get_class($this)."::deleteline sql=".$sql);
if ($resql)
{
$result = $this->update_total();
if ($result > 0)
{
- $this->db->commit();
-
if (! $notrigger)
{
- // Appel des triggers
- include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
- $interface=new Interfaces($this->db);
- $resulttrigger=$interface->run_triggers('LINEFICHINTER_DELETE',$this,$user,$langs,$conf);
- if ($resulttrigger < 0) {
- $error++; $this->errors=$interface->errors;
- }
- // Fin appel triggers
+ // Call trigger
+ $result=$this->call_trigger('LINEFICHINTER_DELETE',$user);
+ if ($result < 0) { $error++; $this->db->rollback(); return -1; }
+ // End call triggers
}
- return $result;
+ $this->db->commit();
+ return $result;
}
else
{
@@ -1334,7 +1291,6 @@ class FichinterLigne
else
{
$this->error=$this->db->error()." sql=".$sql;
- dol_syslog(get_class($this)."::deleteline Error ".$this->error, LOG_ERR);
$this->db->rollback();
return -1;
}
diff --git a/htdocs/fourn/ajax/getSupplierPrices.php b/htdocs/fourn/ajax/getSupplierPrices.php
index bbe3aeba4dc..fc891af53a3 100644
--- a/htdocs/fourn/ajax/getSupplierPrices.php
+++ b/htdocs/fourn/ajax/getSupplierPrices.php
@@ -58,7 +58,7 @@ if (! empty($idprod))
$sql.= " AND s.fournisseur = 1";
$sql.= " ORDER BY s.nom, pfp.ref_fourn DESC";
- dol_syslog("Ajax::getSupplierPrices sql=".$sql, LOG_DEBUG);
+ dol_syslog("Ajax::getSupplierPrices", LOG_DEBUG);
$result=$db->query($sql);
if ($result)
diff --git a/htdocs/fourn/class/fournisseur.class.php b/htdocs/fourn/class/fournisseur.class.php
index f557573fdfc..71942a27f97 100644
--- a/htdocs/fourn/class/fournisseur.class.php
+++ b/htdocs/fourn/class/fournisseur.class.php
@@ -157,7 +157,7 @@ class Fournisseur extends Societe
$sql.= " VALUES ";
$sql.= " ('".$this->db->escape($name)."',1,1)";
- dol_syslog("Fournisseur::CreateCategory sql=".$sql);
+ dol_syslog("Fournisseur::CreateCategory", LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql)
{
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index a70b71c7b5f..b65fe31ceec 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -3,7 +3,7 @@
* Copyright (C) 2004-2012 Laurent Destailleur
* Copyright (C) 2005-2012 Regis Houssin
* Copyright (C) 2007 Franky Van Liedekerke
- * Copyright (C) 2010-2013 Juanjo Menent
+ * Copyright (C) 2010-2014 Juanjo Menent
* Copyright (C) 2010-2013 Philippe Grand
* Copyright (C) 2012 Marcos GarcÃa
* Copyright (C) 2013 Florian Henry
@@ -138,14 +138,14 @@ class CommandeFournisseur extends CommonOrder
if ($ref) $sql.= " AND c.ref='".$ref."'";
else $sql.= " AND c.rowid=".$id;
- dol_syslog(get_class($this)."::fetch sql=".$sql,LOG_DEBUG);
+ dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql)
{
$obj = $this->db->fetch_object($resql);
if (! $obj)
{
- $this->error='Bill with id '.$id.' not found sql='.$sql;
+ $this->error='Bill with id '.$id.' not found';
dol_syslog(get_class($this).'::fetch '.$this->error);
return 0;
}
@@ -207,7 +207,7 @@ class CommandeFournisseur extends CommonOrder
$sql.= " ORDER BY l.rowid";
//print $sql;
- dol_syslog(get_class($this)."::fetch get lines sql=".$sql,LOG_DEBUG);
+ dol_syslog(get_class($this)."::fetch get lines", LOG_DEBUG);
$result = $this->db->query($sql);
if ($result)
{
@@ -259,14 +259,12 @@ class CommandeFournisseur extends CommonOrder
else
{
$this->error=$this->db->error()." sql=".$sql;
- dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
return -1;
}
}
else
{
$this->error=$this->db->error()." sql=".$sql;
- dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
return -1;
}
}
@@ -288,7 +286,7 @@ class CommandeFournisseur extends CommonOrder
$sql.= ($comment?"'".$this->db->escape($comment)."'":'null');
$sql.= ")";
- dol_syslog("FournisseurCommande::log sql=".$sql, LOG_DEBUG);
+ dol_syslog("FournisseurCommande::log", LOG_DEBUG);
if ( $this->db->query($sql) )
{
return 1;
@@ -296,7 +294,6 @@ class CommandeFournisseur extends CommonOrder
else
{
$this->error=$this->db->lasterror();
- dol_syslog(get_class($this)."::log ".$this->error, LOG_ERR);
return -1;
}
}
@@ -346,7 +343,6 @@ class CommandeFournisseur extends CommonOrder
$resql=$this->db->query($sql);
if (! $resql)
{
- dol_syslog(get_class($this)."::valid Echec update - 10 - sql=".$sql, LOG_ERR);
dol_print_error($this->db);
$error++;
}
@@ -410,8 +406,6 @@ class CommandeFournisseur extends CommonOrder
}
else
{
- $this->error=$this->db->lasterror();
- dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
$this->db->rollback();
return -1;
}
@@ -679,7 +673,6 @@ class CommandeFournisseur extends CommonOrder
{
$this->db->rollback();
$this->error=$this->db->lasterror();
- dol_syslog(get_class($this)."::approve Error ",$this->error, LOG_ERR);
return -1;
}
}
@@ -770,7 +763,7 @@ class CommandeFournisseur extends CommonOrder
$sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur SET fk_statut = ".$statut;
$sql .= " WHERE rowid = ".$this->id;
- dol_syslog(get_class($this)."::cancel sql=".$sql);
+ dol_syslog(get_class($this)."::cancel", LOG_DEBUG);
if ($this->db->query($sql))
{
$result = 0;
@@ -828,7 +821,7 @@ class CommandeFournisseur extends CommonOrder
$sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur SET fk_statut = 3, fk_input_method=".$methode.",date_commande=".$this->db->idate("$date");
$sql .= " WHERE rowid = ".$this->id;
- dol_syslog(get_class($this)."::commande sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::commande", LOG_DEBUG);
if ($this->db->query($sql))
{
$result = 1;
@@ -836,7 +829,6 @@ class CommandeFournisseur extends CommonOrder
}
else
{
- dol_syslog(get_class($this)."::cCommande Error -1", LOG_ERR);
$result = -1;
}
}
@@ -902,7 +894,7 @@ class CommandeFournisseur extends CommonOrder
$sql.= ", ".($this->cond_reglement_id > 0 ? $this->cond_reglement_id : 'null');
$sql.= ")";
- dol_syslog(get_class($this)."::create sql=".$sql);
+ dol_syslog(get_class($this)."::create", LOG_DEBUG);
if ($this->db->query($sql))
{
$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."commande_fournisseur");
@@ -941,7 +933,7 @@ class CommandeFournisseur extends CommonOrder
$sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur";
$sql.= " SET ref='(PROV".$this->id.")'";
$sql.= " WHERE rowid=".$this->id;
- dol_syslog(get_class($this)."::create sql=".$sql);
+ dol_syslog(get_class($this)."::create", LOG_DEBUG);
if ($this->db->query($sql))
{
// On logue creation pour historique
@@ -990,7 +982,6 @@ class CommandeFournisseur extends CommonOrder
else
{
$this->error=$this->db->error();
- dol_syslog(get_class($this)."::create: Failed -2 - ".$this->error, LOG_ERR);
$this->db->rollback();
return -2;
}
@@ -999,7 +990,6 @@ class CommandeFournisseur extends CommonOrder
else
{
$this->error=$this->db->error();
- dol_syslog(get_class($this)."::create: Failed -1 - ".$this->error, LOG_ERR);
$this->db->rollback();
return -1;
}
@@ -1178,7 +1168,7 @@ class CommandeFournisseur extends CommonOrder
// TRES IMPORTANT: C'est au moment de l'insertion ligne qu'on doit stocker
// la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva.
- $localtaxes_type=getLocalTaxesFromRate($txtva,0,$this->thirdparty);
+ $localtaxes_type=getLocalTaxesFromRate($txtva,0,$mysoc,$this->thirdparty);
$tabprice = calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $product_type, $this->thirdparty, $localtaxes_type);
$total_ht = $tabprice[0];
@@ -1217,7 +1207,7 @@ class CommandeFournisseur extends CommonOrder
$sql.= "'".price2num($total_ttc)."'";
$sql.= ")";
- dol_syslog(get_class($this)."::addline sql=".$sql);
+ dol_syslog(get_class($this)."::addline", LOG_DEBUG);
$resql=$this->db->query($sql);
//print $sql;
if ($resql)
@@ -1250,7 +1240,6 @@ class CommandeFournisseur extends CommonOrder
{
$this->error=$this->db->error();
$this->db->rollback();
- dol_syslog(get_class($this)."::addline ".$this->error, LOG_ERR);
return -1;
}
}
@@ -1294,7 +1283,7 @@ class CommandeFournisseur extends CommonOrder
$sql.= " (fk_commande,fk_product, qty, fk_entrepot, fk_user, datec) VALUES ";
$sql.= " ('".$this->id."','".$product."','".$qty."',".($entrepot>0?"'".$entrepot."'":"null").",'".$user->id."','".$this->db->idate($now)."')";
- dol_syslog(get_class($this)."::DispatchProduct sql=".$sql);
+ dol_syslog(get_class($this)."::DispatchProduct", LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql)
{
@@ -1434,14 +1423,14 @@ class CommandeFournisseur extends CommonOrder
$this->db->begin();
$sql = "DELETE FROM ".MAIN_DB_PREFIX."commande_fournisseurdet WHERE fk_commande =". $this->id ;
- dol_syslog(get_class($this)."::delete sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::delete", LOG_DEBUG);
if (! $this->db->query($sql) )
{
$error++;
}
$sql = "DELETE FROM ".MAIN_DB_PREFIX."commande_fournisseur WHERE rowid =".$this->id;
- dol_syslog(get_class($this)."::delete sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::delete", LOG_DEBUG);
if ($resql = $this->db->query($sql) )
{
if ($this->db->affected_rows($resql) < 1)
@@ -1585,7 +1574,7 @@ class CommandeFournisseur extends CommonOrder
$sql.= " WHERE rowid = ".$this->id;
$sql.= " AND fk_statut IN (3,4)"; // Process running or Partially received
- dol_syslog(get_class($this)."::Livraison sql=".$sql);
+ dol_syslog(get_class($this)."::Livraison", LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
@@ -1598,7 +1587,6 @@ class CommandeFournisseur extends CommonOrder
{
$this->db->rollback();
$this->error=$this->db->lasterror();
- dol_syslog(get_class($this)."::Livraison Error ".$this->error, LOG_ERR);
$result = -1;
}
}
@@ -1631,7 +1619,7 @@ class CommandeFournisseur extends CommonOrder
$sql.= " SET date_livraison = ".($date_livraison ? "'".$this->db->idate($date_livraison)."'" : 'null');
$sql.= " WHERE rowid = ".$this->id;
- dol_syslog(get_class($this)."::set_date_livraison sql=".$sql,LOG_DEBUG);
+ dol_syslog(get_class($this)."::set_date_livraison", LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
@@ -1641,7 +1629,6 @@ class CommandeFournisseur extends CommonOrder
else
{
$this->error=$this->db->error();
- dol_syslog(get_class($this)."::set_date_livraison ".$this->error,LOG_ERR);
return -1;
}
}
@@ -1711,7 +1698,7 @@ class CommandeFournisseur extends CommonOrder
$sql.= ' SET fk_statut='.$status;
$sql.= ' WHERE rowid = '.$this->id;
- dol_syslog(get_class($this)."::setStatus sql=".$sql);
+ dol_syslog(get_class($this)."::setStatus", LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql)
{
@@ -1755,6 +1742,7 @@ class CommandeFournisseur extends CommonOrder
*/
function updateline($rowid, $desc, $pu, $qty, $remise_percent, $txtva, $txlocaltax1=0, $txlocaltax2=0, $price_base_type='HT', $info_bits=0, $type=0, $notrigger=false)
{
+ global $mysoc;
dol_syslog(get_class($this)."::updateline $rowid, $desc, $pu, $qty, $remise_percent, $txtva, $price_base_type, $info_bits, $type");
include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
@@ -1787,7 +1775,7 @@ class CommandeFournisseur extends CommonOrder
// TRES IMPORTANT: C'est au moment de l'insertion ligne qu'on doit stocker
// la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva.
- $localtaxes_type=getLocalTaxesFromRate($txtva,0,$this->thirdparty);
+ $localtaxes_type=getLocalTaxesFromRate($txtva,0,$mysoc, $this->thirdparty);
$tabprice=calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $this->thirdparty, $localtaxes_type);
$total_ht = $tabprice[0];
@@ -1826,7 +1814,7 @@ class CommandeFournisseur extends CommonOrder
$sql.= ",product_type=".$type;
$sql.= " WHERE rowid = ".$rowid;
- dol_syslog(get_class($this)."::updateline sql=".$sql);
+ dol_syslog(get_class($this)."::updateline", LOG_DEBUG);
$result = $this->db->query($sql);
if ($result > 0)
{
@@ -1858,7 +1846,6 @@ class CommandeFournisseur extends CommonOrder
else
{
$this->error=$this->db->error();
- dol_syslog(get_class($this)."::updateline ".$this->error, LOG_ERR);
$this->db->rollback();
return -1;
}
@@ -2154,7 +2141,7 @@ class CommandeFournisseurLigne
$sql.= ",total_ttc='".price2num($this->total_ttc)."'";
$sql.= " WHERE rowid = ".$this->rowid;
- dol_syslog("CommandeFournisseurLigne.class.php::update_total sql=$sql");
+ dol_syslog("CommandeFournisseurLigne.class.php::update_total", LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
@@ -2165,7 +2152,6 @@ class CommandeFournisseurLigne
else
{
$this->error=$this->db->error();
- dol_syslog("CommandeFournisseurLigne.class.php::update_total Error ".$this->error, LOG_ERR);
$this->db->rollback();
return -2;
}
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 786d619665e..cb0a0abd17a 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -4,7 +4,7 @@
* Copyright (C) 2004 Christophe Combelles
* Copyright (C) 2005 Marc Barilley
* Copyright (C) 2005-2012 Regis Houssin
- * Copyright (C) 2010-2013 Juanjo Menent
+ * Copyright (C) 2010-2014 Juanjo Menent
* Copyright (C) 2013 Philippe Grand
* Copyright (C) 2013 Florian Henry
*
@@ -196,7 +196,7 @@ class FactureFournisseur extends CommonInvoice
$sql.= $this->date_echeance!=''?"'".$this->db->idate($this->date_echeance)."'":"null";
$sql.= ")";
- dol_syslog(get_class($this)."::create sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::create", LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
@@ -206,7 +206,7 @@ class FactureFournisseur extends CommonInvoice
$this->ref='(PROV'.$this->id.')';
$sql = 'UPDATE '.MAIN_DB_PREFIX."facture_fourn SET ref='".$this->ref."' WHERE rowid=".$this->id;
- dol_syslog(get_class($this)."::create sql=".$sql);
+ dol_syslog(get_class($this)."::create", LOG_DEBUG);
$resql=$this->db->query($sql);
if (! $resql) $error++;
@@ -226,7 +226,7 @@ class FactureFournisseur extends CommonInvoice
$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'facture_fourn_det (fk_facture_fourn)';
$sql .= ' VALUES ('.$this->id.');';
- dol_syslog(get_class($this)."::create sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::create", LOG_DEBUG);
$resql_insert=$this->db->query($sql);
if ($resql_insert)
{
@@ -350,7 +350,7 @@ class FactureFournisseur extends CommonInvoice
if ($id) $sql.= " WHERE t.rowid=".$id;
if ($ref) $sql.= " WHERE t.ref='".$this->db->escape($ref)."'";
- dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
@@ -414,14 +414,13 @@ class FactureFournisseur extends CommonInvoice
if ($result < 0)
{
$this->error=$this->db->error();
- dol_syslog(get_class($this).'::fetch Error '.$this->error, LOG_ERR);
return -3;
}
}
else
{
- $this->error='Bill with id '.$id.' not found sql='.$sql;
+ $this->error='Bill with id '.$id.' not found';
dol_syslog(get_class($this).'::fetch '.$this->error);
return 0;
}
@@ -432,7 +431,6 @@ class FactureFournisseur extends CommonInvoice
else
{
$this->error="Error ".$this->db->lasterror();
- dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
return -1;
}
}
@@ -453,7 +451,7 @@ class FactureFournisseur extends CommonInvoice
$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON f.fk_product = p.rowid';
$sql.= ' WHERE fk_facture_fourn='.$this->id;
- dol_syslog(get_class($this)."::fetch_lines sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::fetch_lines", LOG_DEBUG);
$resql_rows = $this->db->query($sql);
if ($resql_rows)
{
@@ -499,7 +497,6 @@ class FactureFournisseur extends CommonInvoice
else
{
$this->error=$this->db->error();
- dol_syslog(get_class($this).'::fetch_lines: Error '.$this->error,LOG_ERR);
return -3;
}
}
@@ -591,7 +588,7 @@ class FactureFournisseur extends CommonInvoice
$this->db->begin();
- dol_syslog(get_class($this)."::update sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::update", LOG_DEBUG);
$resql = $this->db->query($sql);
if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
@@ -647,12 +644,12 @@ class FactureFournisseur extends CommonInvoice
$this->db->begin();
$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'facture_fourn_det WHERE fk_facture_fourn = '.$rowid.';';
- dol_syslog(get_class($this)."::delete sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::delete", LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql)
{
$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'facture_fourn WHERE rowid = '.$rowid;
- dol_syslog(get_class($this)."::delete sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::delete", LOG_DEBUG);
$resql2 = $this->db->query($sql);
if (! $resql2) {
$error++;
@@ -742,7 +739,6 @@ class FactureFournisseur extends CommonInvoice
else
{
$this->error=$this->db->lasterror();
- dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
$this->db->rollback();
return -$error;
}
@@ -766,7 +762,7 @@ class FactureFournisseur extends CommonInvoice
$sql.= ' SET paye = 1, fk_statut=2';
$sql.= ' WHERE rowid = '.$this->id;
- dol_syslog("FactureFournisseur::set_paid sql=".$sql);
+ dol_syslog("FactureFournisseur::set_paid", LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql)
{
@@ -816,7 +812,7 @@ class FactureFournisseur extends CommonInvoice
$sql.= ' SET paye=0, fk_statut=1, close_code=null, close_note=null';
$sql.= ' WHERE rowid = '.$this->id;
- dol_syslog("FactureFournisseur::set_unpaid sql=".$sql);
+ dol_syslog("FactureFournisseur::set_unpaid", LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql)
{
@@ -894,7 +890,7 @@ class FactureFournisseur extends CommonInvoice
$sql.= " SET ref='".$num."', fk_statut = 1, fk_user_valid = ".$user->id;
$sql.= " WHERE rowid = ".$this->id;
- dol_syslog(get_class($this)."::validate sql=".$sql);
+ dol_syslog(get_class($this)."::validate", LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql)
{
@@ -1014,7 +1010,7 @@ class FactureFournisseur extends CommonInvoice
$sql.= " SET fk_statut = 0";
$sql.= " WHERE rowid = ".$this->id;
- dol_syslog(get_class($this)."::set_draft sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::set_draft", LOG_DEBUG);
$result=$this->db->query($sql);
if ($result)
{
@@ -1113,7 +1109,7 @@ class FactureFournisseur extends CommonInvoice
$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'facture_fourn_det (fk_facture_fourn)';
$sql.= ' VALUES ('.$this->id.')';
- dol_syslog(get_class($this)."::addline sql=".$sql);
+ dol_syslog(get_class($this)."::addline", LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql)
@@ -1180,6 +1176,7 @@ class FactureFournisseur extends CommonInvoice
*/
function updateline($id, $desc, $pu, $vatrate, $txlocaltax1=0, $txlocaltax2=0, $qty=1, $idproduct=0, $price_base_type='HT', $info_bits=0, $type=0, $remise_percent=0, $notrigger=false)
{
+ global $mysoc;
dol_syslog(get_class($this)."::updateline $id,$desc,$pu,$vatrate,$qty,$idproduct,$price_base_type,$info_bits,$type,$remise_percent", LOG_DEBUG);
include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
@@ -1204,7 +1201,7 @@ class FactureFournisseur extends CommonInvoice
// TRES IMPORTANT: C'est au moment de l'insertion ligne qu'on doit stocker
// la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva.
- $localtaxes_type=getLocalTaxesFromRate($vatrate,0,$this->thirdparty);
+ $localtaxes_type=getLocalTaxesFromRate($vatrate,0,$mysoc, $this->thirdparty);
$tabprice = calcul_price_total($qty, $pu, $remise_percent, $vatrate, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $this->thirdparty, $localtaxes_type);
$total_ht = $tabprice[0];
@@ -1252,7 +1249,7 @@ class FactureFournisseur extends CommonInvoice
$sql.= ", info_bits = ".$info_bits;
$sql.= " WHERE rowid = ".$id;
- dol_syslog(get_class($this)."::updateline sql=".$sql);
+ dol_syslog(get_class($this)."::updateline", LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
@@ -1286,7 +1283,6 @@ class FactureFournisseur extends CommonInvoice
{
$this->db->rollback();
$this->error=$this->db->lasterror();
- dol_syslog(get_class($this)."::updateline error=".$this->error, LOG_ERR);
return -1;
}
}
@@ -1326,13 +1322,12 @@ class FactureFournisseur extends CommonInvoice
// Supprime ligne
$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'facture_fourn_det ';
$sql.= ' WHERE rowid = '.$rowid;
- dol_syslog(get_class($this)."::delete sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::delete", LOG_DEBUG);
$resql = $this->db->query($sql);
if (! $resql)
{
$error++;
$this->error=$this->db->lasterror();
- dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
}
}
diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php
index b642926f802..a384f6ea219 100644
--- a/htdocs/fourn/class/fournisseur.product.class.php
+++ b/htdocs/fourn/class/fournisseur.product.class.php
@@ -83,12 +83,11 @@ class ProductFournisseur extends Product
$sql = "DELETE FROM ".MAIN_DB_PREFIX."product_fournisseur_price";
$sql.= " WHERE fk_product = ".$this->id." AND fk_soc = ".$id_fourn;
- dol_syslog(get_class($this)."::remove_fournisseur sql=".$sql);
+ dol_syslog(get_class($this)."::remove_fournisseur", LOG_DEBUG);
$resql2=$this->db->query($sql);
if (! $resql2)
{
$this->error=$this->db->lasterror();
- dol_syslog(get_class($this)."::remove_fournisseur ".$this->error, LOG_ERR);
$ok=0;
}
@@ -120,7 +119,7 @@ class ProductFournisseur extends Product
$sql = "DELETE FROM ".MAIN_DB_PREFIX."product_fournisseur_price";
$sql.= " WHERE rowid = ".$rowid;
- dol_syslog(get_class($this)."::remove_product_fournisseur_price sql=".$sql);
+ dol_syslog(get_class($this)."::remove_product_fournisseur_price", LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql)
{
@@ -130,7 +129,6 @@ class ProductFournisseur extends Product
else
{
$this->error=$this->db->lasterror();
- dol_syslog(get_class($this)."::remove_product_fournisseur_price ".$this->error,LOG_ERR);
$this->db->rollback();
return -1;
}
@@ -201,7 +199,7 @@ class ProductFournisseur extends Product
$sql.= " WHERE rowid = ".$this->product_fourn_price_id;
// TODO Add price_base_type and price_ttc
- dol_syslog(get_class($this).'::update_buyprice sql='.$sql);
+ dol_syslog(get_class($this).'::update_buyprice', LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql)
{
@@ -238,7 +236,7 @@ class ProductFournisseur extends Product
// Delete price for this quantity
$sql = "DELETE FROM ".MAIN_DB_PREFIX."product_fournisseur_price";
$sql.= " WHERE fk_soc = ".$fourn->id." AND ref_fourn = '".$this->db->escape($ref_fourn)."' AND quantity = ".$qty." AND entity = ".$conf->entity;
- dol_syslog(get_class($this).'::update_buyprice sql='.$sql);
+ dol_syslog(get_class($this).'::update_buyprice', LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
@@ -263,7 +261,7 @@ class ProductFournisseur extends Product
$sql.= $conf->entity;
$sql.=")";
- dol_syslog(get_class($this)."::update_buyprice sql=".$sql);
+ dol_syslog(get_class($this)."::update_buyprice", LOG_DEBUG);
if (! $this->db->query($sql))
{
$error++;
@@ -340,7 +338,7 @@ class ProductFournisseur extends Product
$sql.= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price as pfp";
$sql.= " WHERE pfp.rowid = ".$rowid;
- dol_syslog(get_class($this)."::fetch_product_fournisseur_price sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::fetch_product_fournisseur_price", LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql)
{
@@ -371,7 +369,6 @@ class ProductFournisseur extends Product
else
{
$this->error=$this->db->error();
- dol_syslog(get_class($this)."::fetch_product_fournisseur_price error=".$this->error, LOG_ERR);
return -1;
}
}
@@ -399,7 +396,7 @@ class ProductFournisseur extends Product
$sql.= " AND pfp.fk_product = ".$prodid;
if (empty($sortfield)) $sql.= " ORDER BY s.nom, pfp.quantity, pfp.price";
else $sql.= $this->db->order($sortfield,$sortorder);
- dol_syslog(get_class($this)."::list_product_fournisseur_price sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::list_product_fournisseur_price", LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql)
@@ -449,7 +446,6 @@ class ProductFournisseur extends Product
else
{
$this->error=$this->db->error();
- dol_syslog(get_class($this)."::list_product_fournisseur_price error=".$this->error, LOG_ERR);
return -1;
}
}
@@ -488,7 +484,7 @@ class ProductFournisseur extends Product
$sql.= " ORDER BY pfp.unitprice";
$sql.= $this->db->plimit(1);
- dol_syslog(get_class($this)."::find_min_price_product_fournisseur sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::find_min_price_product_fournisseur", LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql)
@@ -513,7 +509,6 @@ class ProductFournisseur extends Product
else
{
$this->error=$this->db->error();
- dol_syslog(get_class($this)."::find_min_price_product_fournisseur error=".$this->error, LOG_ERR);
return -1;
}
}
diff --git a/htdocs/fourn/class/paiementfourn.class.php b/htdocs/fourn/class/paiementfourn.class.php
index 627b2de0d84..6fff76e2ca0 100644
--- a/htdocs/fourn/class/paiementfourn.class.php
+++ b/htdocs/fourn/class/paiementfourn.class.php
@@ -149,7 +149,7 @@ class PaiementFourn extends Paiement
$sql.= " VALUES ('".$this->db->idate($now)."',";
$sql.= " '".$this->db->idate($this->datepaye)."', '".$this->total."', ".$this->paiementid.", '".$this->num_paiement."', '".$this->db->escape($this->note)."', ".$user->id.", 0)";
- dol_syslog("PaiementFourn::create sql=".$sql);
+ dol_syslog("PaiementFourn::create", LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql)
{
@@ -212,7 +212,6 @@ class PaiementFourn extends Paiement
else
{
$this->error=$this->db->lasterror();
- dol_syslog('PaiementFourn::Create Error '.$this->error, LOG_ERR);
$error++;
}
}
@@ -286,13 +285,11 @@ class PaiementFourn extends Paiement
// Efface la ligne de paiement (dans paiement_facture et paiement)
$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'paiementfourn_facturefourn';
$sql.= ' WHERE fk_paiementfourn = '.$this->id;
- dol_syslog("sql=".$sql);
$resql = $this->db->query($sql);
if ($resql)
{
$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'paiementfourn';
$sql.= ' WHERE rowid = '.$this->id;
- dol_syslog("sql=".$sql);
$result = $this->db->query($sql);
if (! $result)
{
@@ -384,7 +381,7 @@ class PaiementFourn extends Paiement
$sql.= ' WHERE pf.fk_facturefourn = f.rowid AND fk_paiementfourn = '.$this->id;
if ($filter) $sql.= ' AND '.$filter;
- dol_syslog(get_class($this).'::getBillsArray sql='.$sql,LOG_DEBUG);
+ dol_syslog(get_class($this).'::getBillsArray', LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql)
{
diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php
index 07d43231005..05e2fe8822f 100644
--- a/htdocs/fourn/commande/fiche.php
+++ b/htdocs/fourn/commande/fiche.php
@@ -3,7 +3,7 @@
* Copyright (C) 2004-2013 Laurent Destailleur
* Copyright (C) 2005 Eric Seigne
* Copyright (C) 2005-2012 Regis Houssin
- * Copyright (C) 2010-2013 Juanjo Menent
+ * Copyright (C) 2010-2014 Juanjo Menent
* Copyright (C) 2011 Philippe Grand
* Copyright (C) 2012 Marcos GarcÃa
* Copyright (C) 2013 Florian Henry
@@ -1288,17 +1288,9 @@ elseif (! empty($object->id))
if (! empty($conf->projet->enabled)) $nbrow++;
//Local taxes
- //TODO: Place into a function to control showing by country or study better option
- if ($mysoc->country_code=='ES')
- {
- if($mysoc->localtax1_assuj=="1") $nbrow++;
- if($object->thirdparty->localtax2_assuj=="1") $nbrow++;
- }
- else
- {
- if($mysoc->localtax1_assuj=="1") $nbrow++;
- if($mysoc->localtax2_assuj=="1") $nbrow++;
- }
+ if($mysoc->localtax1_assuj=="1") $nbrow++;
+ if($mysoc->localtax2_assuj=="1") $nbrow++;
+
print '';
$linkback = ''.$langs->trans("BackToList").' ';
@@ -1514,37 +1506,19 @@ elseif (! empty($object->id))
print ''.$langs->trans("Currency".$conf->currency).' ';
// Amount Local Taxes
- //TODO: Place into a function to control showing by country or study better option
- if ($mysoc->country_code=='ES')
+ if ($mysoc->localtax1_assuj=="1" || $object->total_localtax1 != 0) //Localtax1
{
- if ($mysoc->localtax1_assuj=="1") //Localtax1 RE
- {
- print ''.$langs->transcountry("AmountLT1",$mysoc->country_code).' ';
- print ''.price($object->total_localtax1).' ';
- print ''.$langs->trans("Currency".$conf->currency).' '.$langs->transcountry("AmountLT2",$mysoc->country_code).' ';
- print ''.price($object->total_localtax2).' ';
- print ''.$langs->trans("Currency".$conf->currency).' '.$langs->transcountry("AmountLT1",$mysoc->country_code).' ';
+ print ''.price($object->total_localtax1).' ';
+ print ''.$langs->trans("Currency".$conf->currency).' '.$langs->transcountry("AmountLT1",$mysoc->country_code).' ';
- print ''.price($object->total_localtax1).' ';
- print ''.$langs->trans("Currency".$conf->currency).' '.$langs->transcountry("AmountLT2",$mysoc->country_code).' ';
- print ''.price($object->total_localtax2).' ';
- print ''.$langs->trans("Currency".$conf->currency).' '.$langs->transcountry("AmountLT2",$mysoc->country_code).' ';
+ print ''.price($object->total_localtax2).' ';
+ print ''.$langs->trans("Currency".$conf->currency).' '.$langs->trans("AmountTTC").' '.price($object->total_ttc).' ';
print ''.$langs->trans("Currency".$conf->currency).'
';
@@ -1996,7 +1965,7 @@ elseif (! empty($object->id))
$newlang = $_REQUEST['lang_id'];
if ($conf->global->MAIN_MULTILANGS && empty($newlang))
$newlang = $object->client->default_lang;
-
+
// Build document if it not exists
if (! $file || ! is_readable($file))
{
diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php
index e929a6b548a..9cd11bd58bf 100644
--- a/htdocs/fourn/facture/fiche.php
+++ b/htdocs/fourn/facture/fiche.php
@@ -658,7 +658,7 @@ elseif ($action == 'addline' && $user->rights->fournisseur->facture->creer)
$price_base_type = 'HT';
//print $product_desc, $pu, $txtva, $qty, $fk_product=0, $remise_percent=0, $date_start='', $date_end='', $ventil=0, $info_bits='', $price_base_type='HT', $type=0
- $result=$object->addline($product_desc, $ht, $tva_tx, $localtax1tx, $localtax2tx, $qty, 0, $remise_percent, $datestart, $dateend, 0, $npr, $price_base_type, $type);
+ $result=$object->addline($product_desc, $ht, $tva_tx, $localtax1_tx, $localtax2_tx, $qty, 0, $remise_percent, $datestart, $dateend, 0, $npr, $price_base_type, $type);
}
else
{
@@ -666,7 +666,7 @@ elseif ($action == 'addline' && $user->rights->fournisseur->facture->creer)
$ht = $ttc / (1 + ($tva_tx / 100));
$price_base_type = 'HT';
//print $product_desc, $pu, $txtva, $qty, $fk_product=0, $remise_percent=0, $date_start='', $date_end='', $ventil=0, $info_bits='', $price_base_type='HT', $type=0
- $result=$object->addline($product_desc, $ht, $tva_tx,$localtax1tx, $localtax2tx, $qty, 0, $remise_percent, $datestart, $dateend, 0, $npr, $price_base_type, $type);
+ $result=$object->addline($product_desc, $ht, $tva_tx,$localtax1_tx, $localtax2_tx, $qty, 0, $remise_percent, $datestart, $dateend, 0, $npr, $price_base_type, $type);
}
}
@@ -1368,12 +1368,12 @@ if ($action == 'create')
print ''.$langs->trans('TotalVAT').' '.price($objectsrc->total_tva)." '.$langs->transcountry("AmountLT1",$mysoc->country_code).' '.price($objectsrc->total_localtax1)." '.$langs->transcountry("AmountLT2",$mysoc->country_code).' '.price($objectsrc->total_localtax2)." ';
$sql = 'SELECT p.datep as dp, p.num_paiement, p.rowid, p.fk_bank,';
@@ -1802,35 +1795,17 @@ else
// Amount Local Taxes
//TODO: Place into a function to control showing by country or study better option
- if ($mysoc->country_code=='ES')
+ if ($societe->localtax1_assuj=="1") //Localtax1
{
- if ($mysoc->localtax1_assuj=="1") //Localtax1 RE
- {
- print ' '.$langs->transcountry("AmountLT1",$societe->country_code).' ';
- print ''.price($object->total_localtax1,1,$langs,0,-1,-1,$conf->currency).' ';
- print ' '.$langs->transcountry("AmountLT2",$societe->country_code).' ';
- print ''.price($object->total_localtax2,1,$langs,0,-1,-1,$conf->currency).' ';
- print ' '.$langs->transcountry("AmountLT1",$societe->country_code).' ';
+ print ''.price($object->total_localtax1,1,$langs,0,-1,-1,$conf->currency).' ';
+ print ' '.$langs->transcountry("AmountLT1",$societe->country_code).' ';
- print ''.price($object->total_localtax1,1,$langs,0,-1,-1,$conf->currency).' ';
- print ' '.$langs->transcountry("AmountLT2",$societe->country_code).' ';
- print ''.price($object->total_localtax2,1,$langs,0,-1,-1,$conf->currency).' ';
- print ' '.$langs->transcountry("AmountLT2",$societe->country_code).' ';
+ print ''.price($object->total_localtax2,1,$langs,0,-1,-1,$conf->currency).' ';
+ print ' '.$langs->trans('AmountTTC').' '.price($object->total_ttc,1,$langs,0,-1,-1,$conf->currency).'
* Copyright (C) 2004-2011 Laurent Destailleur
* Copyright (C) 2005-2010 Regis Houssin
- * Copyright (C) 2010-2013 Juanjo Menent
+ * Copyright (C) 2010-2014 Juanjo Menent
*
* 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
@@ -166,38 +166,26 @@ if ($object->fetch($id))
print '';
// Local Taxes
- //TODO: Place into a function to control showing by country or study better option
- if($mysoc->country_code=='ES')
+ if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1")
{
- if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1")
- {
- print ''.$langs->trans('LocalTax1IsUsedES').' ';
- print yn($object->localtax1_assuj);
- print ' '.$langs->trans('LocalTax2IsUsedES').' ';
- print yn($object->localtax2_assuj);
- print ' '.$langs->trans("LocalTax1IsUsedES").' ';
- print yn($object->localtax1_assuj);
- print ' '.$langs->trans("LocalTax2IsUsedES").' ';
- print yn($object->localtax2_assuj);
- print ' '.$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code).' ';
- print yn($object->localtax2_assuj);
- print ' ';
- }
-
+ print ' '.$langs->trans('LocalTax1IsUsedES').' ';
+ print yn($object->localtax1_assuj);
+ print ' '.$langs->trans('LocalTax2IsUsedES').' ';
+ print yn($object->localtax2_assuj);
+ print ' '.$langs->trans("LocalTax1IsUsedES").' ';
+ print yn($object->localtax1_assuj);
+ print ' '.$langs->trans("LocalTax2IsUsedES").' ';
+ print yn($object->localtax2_assuj);
+ print ' '.$langs->trans('UpdateConfCPOK').'
';
diff --git a/htdocs/imports/class/import.class.php b/htdocs/imports/class/import.class.php
index b1fa3552d9a..e4acc733a85 100644
--- a/htdocs/imports/class/import.class.php
+++ b/htdocs/imports/class/import.class.php
@@ -233,7 +233,7 @@ class Import
$sql.= ')';
$sql.= " VALUES (".($user->id > 0 ? $user->id : 0).", '".$this->db->escape($this->model_name)."', '".$this->datatoimport."', '".$this->hexa."')";
- dol_syslog(get_class($this)."::create sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::create", LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
@@ -244,7 +244,6 @@ class Import
{
$this->error=$this->db->lasterror();
$this->errno=$this->db->lasterrno();
- dol_syslog(get_class($this)."::create error ".$this->error, LOG_ERR);
$this->db->rollback();
return -1;
}
@@ -262,7 +261,7 @@ class Import
$sql.= ' FROM '.MAIN_DB_PREFIX.'import_model as em';
$sql.= ' WHERE em.rowid = '.$id;
- dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
$result = $this->db->query($sql);
if ($result)
{
@@ -306,7 +305,7 @@ class Import
$this->db->begin();
- dol_syslog(get_class($this)."::delete sql=".$sql);
+ dol_syslog(get_class($this)."::delete", LOG_DEBUG);
$resql = $this->db->query($sql);
if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
diff --git a/htdocs/includes/adodbtime/adodb-time.inc.php b/htdocs/includes/adodbtime/adodb-time.inc.php
index 1ae50767c67..1be5f4cd607 100644
--- a/htdocs/includes/adodbtime/adodb-time.inc.php
+++ b/htdocs/includes/adodbtime/adodb-time.inc.php
@@ -4,33 +4,33 @@ ADOdb Date Library, part of the ADOdb abstraction library
Download: http://phplens.com/phpeverywhere/
PHP native date functions use integer timestamps for computations.
-Because of this, dates are restricted to the years 1901-2038 on Unix
-and 1970-2038 on Windows due to integer overflow for dates beyond
-those years. This library overcomes these limitations by replacing the
-native function's signed integers (normally 32-bits) with PHP floating
+Because of this, dates are restricted to the years 1901-2038 on Unix
+and 1970-2038 on Windows due to integer overflow for dates beyond
+those years. This library overcomes these limitations by replacing the
+native function's signed integers (normally 32-bits) with PHP floating
point numbers (normally 64-bits).
Dates from 100 A.D. to 3000 A.D. and later
have been tested. The minimum is 100 A.D. as <100 will invoke the
-2 => 4 digit year conversion. The maximum is billions of years in the
-future, but this is a theoretical limit as the computation of that year
+2 => 4 digit year conversion. The maximum is billions of years in the
+future, but this is a theoretical limit as the computation of that year
would take too long with the current implementation of adodb_mktime().
This library replaces native functions as follows:
-
+
getdate() with adodb_getdate()
- date() with adodb_date()
+ date() with adodb_date()
gmdate() with adodb_gmdate()
mktime() with adodb_mktime()
gmmktime() with adodb_gmmktime()
strftime() with adodb_strftime()
strftime() with adodb_gmstrftime()
-
+
The parameters are identical, except that adodb_date() accepts a subset
-of date()'s field formats. Mktime() will convert from local time to GMT,
-and date() will convert from GMT to local time, but daylight savings is
+of date()'s field formats. Mktime() will convert from local time to GMT,
+and date() will convert from GMT to local time, but daylight savings is
not handled currently.
This library is independant of the rest of ADOdb, and can be used
@@ -39,25 +39,25 @@ as standalone code.
PERFORMANCE
For high speed, this library uses the native date functions where
-possible, and only switches to PHP code when the dates fall outside
+possible, and only switches to PHP code when the dates fall outside
the 32-bit signed integer range.
GREGORIAN CORRECTION
-Pope Gregory shortened October of A.D. 1582 by ten days. Thursday,
-October 4, 1582 (Julian) was followed immediately by Friday, October 15,
-1582 (Gregorian).
+Pope Gregory shortened October of A.D. 1582 by ten days. Thursday,
+October 4, 1582 (Julian) was followed immediately by Friday, October 15,
+1582 (Gregorian).
Since 0.06, we handle this correctly, so:
-adodb_mktime(0,0,0,10,15,1582) - adodb_mktime(0,0,0,10,4,1582)
+adodb_mktime(0,0,0,10,15,1582) - adodb_mktime(0,0,0,10,4,1582)
== 24 * 3600 (1 day)
=============================================================================
COPYRIGHT
-(c) 2003-2005 John Lim and released under BSD-style license except for code by
+(c) 2003-2005 John Lim and released under BSD-style license except for code by
jackbbs, which includes adodb_mktime, adodb_get_gmt_diff, adodb_is_leap_year
and originally found at http://www.php.net/manual/en/function.mktime.php
@@ -77,10 +77,10 @@ FUNCTION DESCRIPTIONS
** FUNCTION adodb_getdate($date=false)
Returns an array containing date information, as getdate(), but supports
-dates greater than 1901 to 2038. The local date/time format is derived from a
-heuristic the first time adodb_getdate is called.
-
-
+dates greater than 1901 to 2038. The local date/time format is derived from a
+heuristic the first time adodb_getdate is called.
+
+
** FUNCTION adodb_date($fmt, $timestamp = false)
Convert a timestamp to a formatted local date. If $timestamp is not defined, the
@@ -90,45 +90,45 @@ outside the 1901 to 2038 range.
The format fields that adodb_date supports:
- a - "am" or "pm"
- A - "AM" or "PM"
- d - day of the month, 2 digits with leading zeros; i.e. "01" to "31"
- D - day of the week, textual, 3 letters; e.g. "Fri"
- F - month, textual, long; e.g. "January"
- g - hour, 12-hour format without leading zeros; i.e. "1" to "12"
- G - hour, 24-hour format without leading zeros; i.e. "0" to "23"
- h - hour, 12-hour format; i.e. "01" to "12"
- H - hour, 24-hour format; i.e. "00" to "23"
- i - minutes; i.e. "00" to "59"
- j - day of the month without leading zeros; i.e. "1" to "31"
- l (lowercase 'L') - day of the week, textual, long; e.g. "Friday"
- L - boolean for whether it is a leap year; i.e. "0" or "1"
- m - month; i.e. "01" to "12"
- M - month, textual, 3 letters; e.g. "Jan"
- n - month without leading zeros; i.e. "1" to "12"
- O - Difference to Greenwich time in hours; e.g. "+0200"
- Q - Quarter, as in 1, 2, 3, 4
- r - RFC 2822 formatted date; e.g. "Thu, 21 Dec 2000 16:01:07 +0200"
- s - seconds; i.e. "00" to "59"
- S - English ordinal suffix for the day of the month, 2 characters;
- i.e. "st", "nd", "rd" or "th"
+ a - "am" or "pm"
+ A - "AM" or "PM"
+ d - day of the month, 2 digits with leading zeros; i.e. "01" to "31"
+ D - day of the week, textual, 3 letters; e.g. "Fri"
+ F - month, textual, long; e.g. "January"
+ g - hour, 12-hour format without leading zeros; i.e. "1" to "12"
+ G - hour, 24-hour format without leading zeros; i.e. "0" to "23"
+ h - hour, 12-hour format; i.e. "01" to "12"
+ H - hour, 24-hour format; i.e. "00" to "23"
+ i - minutes; i.e. "00" to "59"
+ j - day of the month without leading zeros; i.e. "1" to "31"
+ l (lowercase 'L') - day of the week, textual, long; e.g. "Friday"
+ L - boolean for whether it is a leap year; i.e. "0" or "1"
+ m - month; i.e. "01" to "12"
+ M - month, textual, 3 letters; e.g. "Jan"
+ n - month without leading zeros; i.e. "1" to "12"
+ O - Difference to Greenwich time in hours; e.g. "+0200"
+ Q - Quarter, as in 1, 2, 3, 4
+ r - RFC 2822 formatted date; e.g. "Thu, 21 Dec 2000 16:01:07 +0200"
+ s - seconds; i.e. "00" to "59"
+ S - English ordinal suffix for the day of the month, 2 characters;
+ i.e. "st", "nd", "rd" or "th"
t - number of days in the given month; i.e. "28" to "31"
- T - Timezone setting of this machine; e.g. "EST" or "MDT"
- U - seconds since the Unix Epoch (January 1 1970 00:00:00 GMT)
- w - day of the week, numeric, i.e. "0" (Sunday) to "6" (Saturday)
- Y - year, 4 digits; e.g. "1999"
- y - year, 2 digits; e.g. "99"
- z - day of the year; i.e. "0" to "365"
- Z - timezone offset in seconds (i.e. "-43200" to "43200").
- The offset for timezones west of UTC is always negative,
- and for those east of UTC is always positive.
+ T - Timezone setting of this machine; e.g. "EST" or "MDT"
+ U - seconds since the Unix Epoch (January 1 1970 00:00:00 GMT)
+ w - day of the week, numeric, i.e. "0" (Sunday) to "6" (Saturday)
+ Y - year, 4 digits; e.g. "1999"
+ y - year, 2 digits; e.g. "99"
+ z - day of the year; i.e. "0" to "365"
+ Z - timezone offset in seconds (i.e. "-43200" to "43200").
+ The offset for timezones west of UTC is always negative,
+ and for those east of UTC is always positive.
Unsupported:
- B - Swatch Internet time
+ B - Swatch Internet time
I (capital i) - "1" if Daylight Savings Time, "0" otherwise.
- W - ISO-8601 week number of year, weeks starting on Monday
+ W - ISO-8601 week number of year, weeks starting on Monday
@@ -138,7 +138,7 @@ Same as adodb_date, but 2nd parameter accepts iso date, eg.
adodb_date2('d-M-Y H:i','2003-12-25 13:01:34');
-
+
** FUNCTION adodb_gmdate($fmt, $timestamp = false)
Convert a timestamp to a formatted GMT date. If $timestamp is not defined, the
@@ -163,7 +163,7 @@ Convert a timestamp to a formatted GMT date.
** FUNCTION adodb_strftime($fmt, $timestamp = false)
-Convert a timestamp to a formatted local date. Internally converts $fmt into
+Convert a timestamp to a formatted local date. Internally converts $fmt into
adodb_date format, then echo result.
For best results, you can define the local date format yourself. Define a global
@@ -171,56 +171,56 @@ variable $ADODB_DATE_LOCALE which is an array, 1st element is date format using
adodb_date syntax, and 2nd element is the time format, also in adodb_date syntax.
eg. $ADODB_DATE_LOCALE = array('d/m/Y','H:i:s');
-
+
Supported format codes:
- %a - abbreviated weekday name according to the current locale
- %A - full weekday name according to the current locale
- %b - abbreviated month name according to the current locale
- %B - full month name according to the current locale
- %c - preferred date and time representation for the current locale
- %d - day of the month as a decimal number (range 01 to 31)
- %D - same as %m/%d/%y
- %e - day of the month as a decimal number, a single digit is preceded by a space (range ' 1' to '31')
+ %a - abbreviated weekday name according to the current locale
+ %A - full weekday name according to the current locale
+ %b - abbreviated month name according to the current locale
+ %B - full month name according to the current locale
+ %c - preferred date and time representation for the current locale
+ %d - day of the month as a decimal number (range 01 to 31)
+ %D - same as %m/%d/%y
+ %e - day of the month as a decimal number, a single digit is preceded by a space (range ' 1' to '31')
%h - same as %b
- %H - hour as a decimal number using a 24-hour clock (range 00 to 23)
- %I - hour as a decimal number using a 12-hour clock (range 01 to 12)
- %m - month as a decimal number (range 01 to 12)
- %M - minute as a decimal number
- %n - newline character
- %p - either `am' or `pm' according to the given time value, or the corresponding strings for the current locale
- %r - time in a.m. and p.m. notation
- %R - time in 24 hour notation
- %S - second as a decimal number
- %t - tab character
- %T - current time, equal to %H:%M:%S
- %x - preferred date representation for the current locale without the time
- %X - preferred time representation for the current locale without the date
- %y - year as a decimal number without a century (range 00 to 99)
- %Y - year as a decimal number including the century
- %Z - time zone or name or abbreviation
- %% - a literal `%' character
-
+ %H - hour as a decimal number using a 24-hour clock (range 00 to 23)
+ %I - hour as a decimal number using a 12-hour clock (range 01 to 12)
+ %m - month as a decimal number (range 01 to 12)
+ %M - minute as a decimal number
+ %n - newline character
+ %p - either `am' or `pm' according to the given time value, or the corresponding strings for the current locale
+ %r - time in a.m. and p.m. notation
+ %R - time in 24 hour notation
+ %S - second as a decimal number
+ %t - tab character
+ %T - current time, equal to %H:%M:%S
+ %x - preferred date representation for the current locale without the time
+ %X - preferred time representation for the current locale without the date
+ %y - year as a decimal number without a century (range 00 to 99)
+ %Y - year as a decimal number including the century
+ %Z - time zone or name or abbreviation
+ %% - a literal `%' character
+
Unsupported codes:
- %C - century number (the year divided by 100 and truncated to an integer, range 00 to 99)
- %g - like %G, but without the century.
- %G - The 4-digit year corresponding to the ISO week number (see %V).
- This has the same format and value as %Y, except that if the ISO week number belongs
- to the previous or next year, that year is used instead.
- %j - day of the year as a decimal number (range 001 to 366)
- %u - weekday as a decimal number [1,7], with 1 representing Monday
- %U - week number of the current year as a decimal number, starting
- with the first Sunday as the first day of the first week
- %V - The ISO 8601:1988 week number of the current year as a decimal number,
- range 01 to 53, where week 1 is the first week that has at least 4 days in the
- current year, and with Monday as the first day of the week. (Use %G or %g for
- the year component that corresponds to the week number for the specified timestamp.)
- %w - day of the week as a decimal, Sunday being 0
- %W - week number of the current year as a decimal number, starting with the
- first Monday as the first day of the first week
+ %C - century number (the year divided by 100 and truncated to an integer, range 00 to 99)
+ %g - like %G, but without the century.
+ %G - The 4-digit year corresponding to the ISO week number (see %V).
+ This has the same format and value as %Y, except that if the ISO week number belongs
+ to the previous or next year, that year is used instead.
+ %j - day of the year as a decimal number (range 001 to 366)
+ %u - weekday as a decimal number [1,7], with 1 representing Monday
+ %U - week number of the current year as a decimal number, starting
+ with the first Sunday as the first day of the first week
+ %V - The ISO 8601:1988 week number of the current year as a decimal number,
+ range 01 to 53, where week 1 is the first week that has at least 4 days in the
+ current year, and with Monday as the first day of the week. (Use %G or %g for
+ the year component that corresponds to the week number for the specified timestamp.)
+ %w - day of the week as a decimal, Sunday being 0
+ %W - week number of the current year as a decimal number, starting with the
+ first Monday as the first day of the first week
=============================================================================
@@ -230,10 +230,10 @@ NOTES
Useful url for generating test timestamps:
http://www.4webhelp.net/us/timestamp.php
-Possible future optimizations include
+Possible future optimizations include
-a. Using an algorithm similar to Plauger's in "The Standard C Library"
-(page 428, xttotm.c _Ttotm() function). Plauger's algorithm will not
+a. Using an algorithm similar to Plauger's in "The Standard C Library"
+(page 428, xttotm.c _Ttotm() function). Plauger's algorithm will not
work outside 32-bit signed range, so i decided not to implement it.
b. Implement daylight savings, which looks awfully complicated, see
@@ -246,24 +246,24 @@ CHANGELOG
* Bug in 0.32 fix for hour handling. Fixed.
- 1 Feb 2008 0.32
-* Now adodb_mktime(0,0,0,12+$m,20,2040) works properly.
+* Now adodb_mktime(0,0,0,12+$m,20,2040) works properly.
- 10 Jan 2008 0.31
* Now adodb_mktime(0,0,0,24,1,2037) works correctly.
- 15 July 2007 0.30
-Added PHP 5.2.0 compatability fixes.
+Added PHP 5.2.0 compatability fixes.
* gmtime behaviour for 1970 has changed. We use the actual date if it is between 1970 to 2038 to get the
* timezone, otherwise we use the current year as the baseline to retrieve the timezone.
- * Also the timezone's in php 5.2.* support historical data better, eg. if timezone today was +8, but
+ * Also the timezone's in php 5.2.* support historical data better, eg. if timezone today was +8, but
in 1970 it was +7:30, then php 5.2 return +7:30, while this library will use +8.
- *
-
+ *
+
- 19 March 2006 0.24
Changed strftime() locale detection, because some locales prepend the day of week to the date when %c is used.
- 10 Feb 2006 0.23
-PHP5 compat: when we detect PHP5, the RFC2822 format for gmt 0000hrs is changed from -0000 to +0000.
+PHP5 compat: when we detect PHP5, the RFC2822 format for gmt 0000hrs is changed from -0000 to +0000.
In PHP4, we will still use -0000 for 100% compat with PHP4.
- 08 Sept 2005 0.22
@@ -277,7 +277,7 @@ Added support for negative months in adodb_mktime().
Added limited strftime/gmstrftime support. x10 improvement in performance of adodb_date().
- 21 Dec 2004 0.17
-In adodb_getdate(), the timestamp was accidentally converted to gmt when $is_gmt is false.
+In adodb_getdate(), the timestamp was accidentally converted to gmt when $is_gmt is false.
Also adodb_mktime(0,0,0) did not work properly. Both fixed thx Mauro.
- 17 Nov 2004 0.16
@@ -286,7 +286,7 @@ Removed intval typecast in adodb_mktime() for secs, allowing:
Suggested by Ryan.
- 18 July 2004 0.15
-All params in adodb_mktime were formerly compulsory. Now only the hour, min, secs is compulsory.
+All params in adodb_mktime were formerly compulsory. Now only the hour, min, secs is compulsory.
This brings it more in line with mktime (still not identical).
- 23 June 2004 0.14
@@ -304,21 +304,21 @@ function adodb_daylight_sv(&$arr, $is_gmt)
if ($m == 6 || $m == 7) $arr['hours'] += 1;
}
-This is only called by adodb_date() and not by adodb_mktime().
+This is only called by adodb_date() and not by adodb_mktime().
The format of $arr is
-Array (
- [seconds] => 0
- [minutes] => 0
- [hours] => 0
+Array (
+ [seconds] => 0
+ [minutes] => 0
+ [hours] => 0
[mday] => 1 # day of month, eg 1st day of the month
[mon] => 2 # month (eg. Feb)
- [year] => 2102
+ [year] => 2102
[yday] => 31 # days in current year
[leap] => # true if leap year
[ndays] => 28 # no of days in current month
- )
-
+ )
+
- 28 Apr 2004 0.13
Fixed adodb_date to properly support $is_gmt. Thx to Dimitar Angelov.
@@ -327,11 +327,11 @@ Fixed adodb_date to properly support $is_gmt. Thx to Dimitar Angelov.
Fixed month calculation error in adodb_date. 2102-June-01 appeared as 2102-May-32.
- 26 Oct 2003 0.11
-Because of daylight savings problems (some systems apply daylight savings to
+Because of daylight savings problems (some systems apply daylight savings to
January!!!), changed adodb_get_gmt_diff() to ignore daylight savings.
- 9 Aug 2003 0.10
-Fixed bug with dates after 2038.
+Fixed bug with dates after 2038.
See http://phplens.com/lens/lensforum/msgs.php?id=6980
- 1 July 2003 0.09
@@ -361,14 +361,14 @@ Day overflow for less than one month's days is supported.
- 28 Jan 2003 0.04
-Gregorian correction handled. In PHP5, we might throw an error if
+Gregorian correction handled. In PHP5, we might throw an error if
mktime uses invalid dates around 5-14 Oct 1582. Released with ADOdb 3.10.
Added limbo 5-14 Oct 1582 check, when we set to 15 Oct 1582.
- 27 Jan 2003 0.03
Fixed some more month problems due to gmt issues. Added constant ADODB_DATE_VERSION.
-Fixed calculation of days since start of year for <1970.
+Fixed calculation of days since start of year for <1970.
- 27 Jan 2003 0.02
@@ -391,13 +391,13 @@ define('ADODB_DATE_VERSION',0.33);
$ADODB_DATETIME_CLASS = (PHP_VERSION >= 5.2);
/*
- This code was originally for windows. But apparently this problem happens
+ This code was originally for windows. But apparently this problem happens
also with Linux, RH 7.3 and later!
-
+
glibc-2.2.5-34 and greater has been changed to return -1 for dates <
1970. This used to work. The problem exists with RedHat 7.3 and 8.0
echo (mktime(0, 0, 0, 1, 1, 1960)); // prints -1
-
+
References:
http://bugs.php.net/bug.php?id=20048&edit=2
http://lists.debian.org/debian-glibc/2002/debian-glibc-200205/msg00010.html
@@ -411,7 +411,7 @@ function adodb_date_test_date($y1,$m,$d=13)
$t = adodb_mktime($h,0,0,$m,$d,$y1);
$rez = adodb_date('Y-n-j H:i:s',$t);
if ($h == 0) $h = '00';
- else if ($h < 10) $h = '0'.$h;
+ else if ($h < 10) $h = '0'.$h;
if ("$y1-$m-$d $h:00:00" != $rez) {
print "$y1 error, expected=$y1-$m-$d $h:00:00, adodb=$rez Testing adodb_date and adodb_mktime. version=".ADODB_DATE_VERSION.' PHP='.PHP_VERSION." ";
@set_time_limit(0);
$fail = false;
-
+
// This flag disables calling of PHP native functions, so we can properly test the code
if (!defined('ADODB_TEST_DATES')) define('ADODB_TEST_DATES',1);
-
+
$t = time();
-
-
+
+
$fmt = 'Y-m-d H:i:s';
echo '';
echo 'adodb: ',adodb_date($fmt,$t),' ';
-
+
adodb_date_test_strftime('%Y %m %x %X');
adodb_date_test_strftime("%A %d %B %Y");
adodb_date_test_strftime("%H %M S");
-
+
$t = adodb_mktime(0,0,0);
if (!(adodb_date('Y-m-d') == date('Y-m-d'))) print 'Error in '.adodb_mktime(0,0,0).'Testing gregorian <=> julian conversion
";
$t = adodb_mktime(0,0,0,10,11,1492);
//http://www.holidayorigins.com/html/columbus_day.html - Friday check
if (!(adodb_date('D Y-m-d',$t) == 'Fri 1492-10-11')) print 'Error in Columbus landingError in gregorian correction = ".($diff/3600/24)." days Error ')."Error ')."
Testing overflow
";
-
+
$t = adodb_mktime(0,0,0,3,33,1965);
if (!(adodb_date('Y-m-d',$t) == '1965-04-02')) print 'Error in day overflow 1
";
if (adodb_year_digit_check(00) != 2000) print "Err 2-digit 2000
Testing date formating
";
-
+
$fmt = '\d\a\t\e T Y-m-d H:i:s a A d D F g G h H i j l L m M n O \R\F\C2822 r s t U w y Y z Z 2003';
$s1 = date($fmt,0);
$s2 = adodb_date($fmt,0);
@@ -538,12 +538,12 @@ function adodb_date_test()
break;
}
}
- print "Error date(): $ts
+ print "Error date(): $ts
\"$s1\" (date len=".strlen($s1).")
\"$s2\" (adodb_date len=".strlen($s2).") Testing random dates between 100 and 4000
";
adodb_date_test_date(100,1);
@@ -564,7 +564,7 @@ function adodb_date_test()
$y1 = 100+rand(0,1970-100);
$m = rand(1,12);
adodb_date_test_date($y1,$m);
-
+
$y1 = 3000-rand(0,3000-1970);
adodb_date_test_date($y1,$m);
}
@@ -575,7 +575,7 @@ function adodb_date_test()
$offset = 36000+rand(10000,60000);
$max = 365*$yrs*86400;
$lastyear = 0;
-
+
// we generate a timestamp, convert it to a date, and convert it back to a timestamp
// and check if the roundtrip broke the original timestamp value.
print "Testing $start to ".($start+$yrs).", or $max seconds, offset=$offset: ";
@@ -602,58 +602,58 @@ function adodb_date_test()
}
/**
- Returns day of week, 0 = Sunday,... 6=Saturday.
+ Returns day of week, 0 = Sunday,... 6=Saturday.
Algorithm from PEAR::Date_Calc
*/
function adodb_dow($year, $month, $day)
{
/*
-Pope Gregory removed 10 days - October 5 to October 14 - from the year 1582 and
-proclaimed that from that time onwards 3 days would be dropped from the calendar
+Pope Gregory removed 10 days - October 5 to October 14 - from the year 1582 and
+proclaimed that from that time onwards 3 days would be dropped from the calendar
every 400 years.
-Thursday, October 4, 1582 (Julian) was followed immediately by Friday, October 15, 1582 (Gregorian).
+Thursday, October 4, 1582 (Julian) was followed immediately by Friday, October 15, 1582 (Gregorian).
*/
if ($year <= 1582) {
- if ($year < 1582 ||
+ if ($year < 1582 ||
($year == 1582 && ($month < 10 || ($month == 10 && $day < 15)))) $greg_correction = 3;
else
$greg_correction = 0;
} else
$greg_correction = 0;
-
+
if($month > 2)
$month -= 2;
else {
$month += 10;
$year--;
}
-
+
$day = floor((13 * $month - 1) / 5) +
$day + ($year % 100) +
floor(($year % 100) / 4) +
floor(($year / 100) / 4) - 2 *
floor($year / 100) + 77 + $greg_correction;
-
+
return $day - 7 * floor($day / 7);
}
/**
- Checks for leap year, returns true if it is. No 2-digit year check. Also
+ Checks for leap year, returns true if it is. No 2-digit year check. Also
handles julian calendar correctly.
*/
-function _adodb_is_leap_year($year)
+function _adodb_is_leap_year($year)
{
if ($year % 4 != 0) return false;
-
+
if ($year % 400 == 0) {
return true;
// if gregorian calendar (>1582), century not-divisible by 400 is not leap
} else if ($year > 1582 && $year % 100 == 0 ) {
return false;
- }
-
+ }
+
return true;
}
@@ -661,7 +661,7 @@ function _adodb_is_leap_year($year)
/**
checks for leap year, returns true if it is. Has 2-digit year check
*/
-function adodb_is_leap_year($year)
+function adodb_is_leap_year($year)
{
return _adodb_is_leap_year(adodb_year_digit_check($year));
}
@@ -670,13 +670,13 @@ function adodb_is_leap_year($year)
Fix 2-digit years. Works for any century.
Assumes that if 2-digit is more than 30 years in future, then previous century.
*/
-function adodb_year_digit_check($y)
+function adodb_year_digit_check($y)
{
if ($y < 100) {
-
+
$yr = (integer) date("Y");
$century = (integer) ($yr /100);
-
+
if ($yr%100 > 50) {
$c1 = $century + 1;
$c0 = $century;
@@ -693,24 +693,24 @@ function adodb_year_digit_check($y)
return $y;
}
-function adodb_get_gmt_diff_ts($ts)
+function adodb_get_gmt_diff_ts($ts)
{
if (0 <= $ts && $ts <= 0x7FFFFFFF) { // check if number in 32-bit signed range) {
$arr = getdate($ts);
$y = $arr['year'];
$m = $arr['mon'];
$d = $arr['mday'];
- return adodb_get_gmt_diff($y,$m,$d);
+ return adodb_get_gmt_diff($y,$m,$d);
} else {
return adodb_get_gmt_diff(false,false,false);
}
-
+
}
/**
get local time zone offset from GMT. Does not handle historical timezones before 1970.
*/
-function adodb_get_gmt_diff($y,$m,$d)
+function adodb_get_gmt_diff($y,$m,$d)
{
static $TZ,$tzo;
global $ADODB_DATETIME_CLASS;
@@ -729,9 +729,9 @@ global $ADODB_DATETIME_CLASS;
} else {
if (isset($TZ)) return $TZ;
$y = date('Y');
- $TZ = mktime(0,0,0,12,2,$y,0) - gmmktime(0,0,0,12,2,$y,0);
+ $TZ = mktime(0,0,0,12,2,$y) - gmmktime(0,0,0,12,2,$y);
}
-
+
return $TZ;
}
@@ -757,7 +757,7 @@ function adodb_date_gentable($out=true)
for ($i=1970; $i >= 1600; $i-=10) {
$s = adodb_gmmktime(0,0,0,1,1,$i);
- echo "$i => $s,
* Copyright (C) 2005 Marc Barilley / Ocebo
* Copyright (C) 2005-2012 Regis Houssin
- * Copyright (C) 2013 Juanjo Menent
+ * Copyright (C) 2013-2014 Juanjo Menent
* Copyright (C) 2014 Marcos GarcÃa
*
* This program is free software; you can redistribute it and/or modify
@@ -393,7 +393,8 @@ else
array('from'=>'3.2.0', 'to'=>'3.3.0'),
array('from'=>'3.3.0', 'to'=>'3.4.0'),
array('from'=>'3.4.0', 'to'=>'3.5.0'),
- array('from'=>'3.5.0', 'to'=>'3.6.0')
+ array('from'=>'3.5.0', 'to'=>'3.6.0'),
+ array('from'=>'3.6.0', 'to'=>'3.7.0')
);
$count=0;
diff --git a/htdocs/install/mysql/migration/3.5.0-3.6.0.sql b/htdocs/install/mysql/migration/3.5.0-3.6.0.sql
index 3934401267b..d12f3cb0840 100644
--- a/htdocs/install/mysql/migration/3.5.0-3.6.0.sql
+++ b/htdocs/install/mysql/migration/3.5.0-3.6.0.sql
@@ -18,6 +18,15 @@
-- -- VMYSQL4.1 DELETE FROM llx_usergroup_user WHERE fk_usergroup NOT IN (SELECT rowid from llx_usergroup);
+
+
+
+ALTER TABLE llx_expedition MODIFY COLUMN height float;
+ALTER TABLE llx_expedition MODIFY COLUMN width float;
+ALTER TABLE llx_expedition MODIFY COLUMN size float;
+ALTER TABLE llx_expedition MODIFY COLUMN weight float;
+
+
ALTER TABLE llx_societe DROP COLUMN datea;
ALTER TABLE llx_holiday ADD COLUMN fk_user_create integer;
@@ -1200,4 +1209,5 @@ ALTER TABLE llx_c_type_resource ADD UNIQUE INDEX uk_c_type_resource_id (label, c
-- Fix: Missing instruction not correctly done into 3.5
-- VPGSQL8.2 ALTER TABLE llx_facture_fourn ALTER fk_mode_reglement DROP NOT NULL;
--- VPGSQL8.2 ALTER TABLE llx_facture_fourn ALTER fk_cond_reglement DROP NOT NULL;
\ No newline at end of file
+-- VPGSQL8.2 ALTER TABLE llx_facture_fourn ALTER fk_cond_reglement DROP NOT NULL;
+
diff --git a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql
index e1c5285f603..0c197623e8e 100644
--- a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql
+++ b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql
@@ -23,7 +23,7 @@ ALTER TABLE llx_c_paiement ADD COLUMN accountancy_code varchar(32) DEFAULT NULL
ALTER TABLE llx_accountingaccount add column entity integer DEFAULT 1 NOT NULL AFTER rowid;
ALTER TABLE llx_accountingaccount add column datec datetime NOT NULL AFTER entity;
-ALTER TABLE llx_accountingaccount add column tms timestamp DEFAULT NULL AFTER datec;
+ALTER TABLE llx_accountingaccount add column tms timestamp AFTER datec;
ALTER TABLE llx_accountingaccount add column fk_user_author integer DEFAULT NULL AFTER label;
ALTER TABLE llx_accountingaccount add column fk_user_modif integer DEFAULT NULL AFTER fk_user_author;
@@ -43,8 +43,8 @@ ALTER TABLE llx_c_revenuestamp MODIFY COLUMN accountancy_code_sell varchar(32);
ALTER TABLE llx_c_revenuestamp MODIFY COLUMN accountancy_code_buy varchar(32);
ALTER TABLE llx_c_tva MODIFY COLUMN accountancy_code_sell varchar(32);
ALTER TABLE llx_c_tva MODIFY COLUMN accountancy_code_buy varchar(32);
-ALTER TABLE llx_c_product MODIFY COLUMN accountancy_code_sell varchar(32);
-ALTER TABLE llx_c_product MODIFY COLUMN accountancy_code_buy varchar(32);
+ALTER TABLE llx_product MODIFY COLUMN accountancy_code_sell varchar(32);
+ALTER TABLE llx_product MODIFY COLUMN accountancy_code_buy varchar(32);
ALTER TABLE llx_user MODIFY COLUMN accountancy_code varchar(32);
@@ -52,6 +52,7 @@ ALTER TABLE llx_bank_account ADD COLUMN accountancy_journal varchar(3) DEFAULT N
ALTER TABLE llx_projet_task_time ADD COLUMN task_datehour datetime after task_date;
+
-- Localtaxes by thirds
ALTER TABLE llx_c_tva MODIFY COLUMN localtax1 varchar(10);
ALTER TABLE llx_c_tva MODIFY COLUMN localtax2 varchar(10);
@@ -59,6 +60,34 @@ ALTER TABLE llx_localtax ADD COLUMN localtaxtype tinyint(4) after entity;
ALTER TABLE llx_societe ADD COLUMN localtax1_value double(6,3) after localtax1_assuj;
ALTER TABLE llx_societe ADD COLUMN localtax2_value double(6,3) after localtax2_assuj;
+
+
+-- Added missing relations of llx_product
+-- fk_country
+ALTER TABLE llx_product CHANGE COLUMN fk_country fk_country INTEGER NULL DEFAULT NULL;
+UPDATE llx_product SET fk_country = NULL WHERE fk_country = 0;
+ALTER TABLE llx_product ADD INDEX idx_product_fk_country (fk_country);
+ALTER TABLE llx_product ADD CONSTRAINT fk_product_fk_country FOREIGN KEY (fk_country) REFERENCES llx_c_pays (rowid);
+-- fk_user_author
+ALTER TABLE llx_product CHANGE COLUMN fk_user_author fk_user_author INTEGER NULL DEFAULT NULL;
+ALTER TABLE llx_product ADD INDEX idx_product_fk_user_author (fk_user_author);
+-- fk_barcode_type
+ALTER TABLE llx_product CHANGE COLUMN fk_barcode_type fk_barcode_type INTEGER NULL DEFAULT NULL;
+UPDATE llx_product SET fk_barcode_type = NULL WHERE fk_barcode_type = 0;
+ALTER TABLE llx_product ADD INDEX idx_product_fk_barcode_type (fk_barcode_type);
+ALTER TABLE llx_product ADD CONSTRAINT fk_product_barcode_type FOREIGN KEY (fk_barcode_type) REFERENCES llx_c_barcode_type (rowid);
+
+
+-- Added missing relations of llx_product_price
+-- fk_user_author
+ALTER TABLE llx_product_price ADD INDEX idx_product_price_fk_user_author (fk_user_author);
+update llx_product_price set fk_user_author = null where fk_user_author = 0;
+ALTER TABLE llx_product_price ADD CONSTRAINT fk_product_price_user_author FOREIGN KEY (fk_user_author) REFERENCES llx_user (rowid);
+-- fk_user_author
+ALTER TABLE llx_product_price ADD INDEX idx_product_price_fk_product (fk_product);
+ALTER TABLE llx_product_price ADD CONSTRAINT fk_product_price_product FOREIGN KEY (fk_product) REFERENCES llx_product (rowid);
+
+
-- Fiscal years
create table llx_accounting_fiscalyear
(
diff --git a/htdocs/install/mysql/tables/llx_accountingaccount.sql b/htdocs/install/mysql/tables/llx_accountingaccount.sql
index a3fe0747238..f4e4d694471 100644
--- a/htdocs/install/mysql/tables/llx_accountingaccount.sql
+++ b/htdocs/install/mysql/tables/llx_accountingaccount.sql
@@ -1,5 +1,6 @@
-- ============================================================================
-- Copyright (C) 2004-2006 Laurent Destailleur
+-- Copyright (C) 2014 Juanjo Menent
--
-- 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
@@ -22,7 +23,7 @@ create table llx_accountingaccount
rowid integer AUTO_INCREMENT PRIMARY KEY,
entity integer DEFAULT 1 NOT NULL,
datec datetime,
- tms timestamp DEFAULT NULL,
+ tms timestamp,
fk_pcg_version varchar(12) NOT NULL,
pcg_type varchar(20) NOT NULL,
pcg_subtype varchar(20) NOT NULL,
diff --git a/htdocs/install/mysql/tables/llx_expedition.sql b/htdocs/install/mysql/tables/llx_expedition.sql
index 08ea9683281..0a152b13069 100644
--- a/htdocs/install/mysql/tables/llx_expedition.sql
+++ b/htdocs/install/mysql/tables/llx_expedition.sql
@@ -41,13 +41,13 @@ create table llx_expedition
fk_shipping_method integer,
tracking_number varchar(50),
fk_statut smallint DEFAULT 0,
-
- height integer, -- height
- width integer, -- with
+
+ height float, -- height
+ width float, -- with
size_units integer, -- unit of all sizes (height, width, depth)
- size integer, -- depth
+ size float, -- depth
weight_units integer, -- unit of weight
- weight integer, -- weight
+ weight float, -- weight
note_private text,
note_public text,
model_pdf varchar(255)
diff --git a/htdocs/install/mysql/tables/llx_product.key.sql b/htdocs/install/mysql/tables/llx_product.key.sql
index a2cb0e539f9..218bd40490e 100644
--- a/htdocs/install/mysql/tables/llx_product.key.sql
+++ b/htdocs/install/mysql/tables/llx_product.key.sql
@@ -2,6 +2,7 @@
-- Copyright (C) 2002-2004 Rodolphe Quiedeville
-- Copyright (C) 2004-2013 Laurent Destailleur
-- Copyright (C) 2005-2009 Regis Houssin
+-- Copyright (C) 2014 Marcos GarcÃa
--
-- 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
@@ -25,6 +26,11 @@ ALTER TABLE llx_product ADD INDEX idx_product_label (label);
ALTER TABLE llx_product ADD INDEX idx_product_barcode (barcode);
ALTER TABLE llx_product ADD INDEX idx_product_import_key (import_key);
ALTER TABLE llx_product ADD INDEX idx_product_seuil_stock_alerte (seuil_stock_alerte);
-
+ALTER TABLE llx_product ADD INDEX idx_product_fk_country (fk_country);
+ALTER TABLE llx_product ADD INDEX idx_product_fk_user_author (fk_user_author);
+ALTER TABLE llx_product ADD INDEX idx_product_fk_barcode_type (fk_barcode_type);
ALTER TABLE llx_product ADD UNIQUE INDEX uk_product_barcode (barcode, fk_barcode_type, entity);
+
+ALTER TABLE llx_product ADD CONSTRAINT fk_product_fk_country FOREIGN KEY (fk_country) REFERENCES llx_c_pays (rowid);
+ALTER TABLE llx_product ADD CONSTRAINT fk_product_barcode_type FOREIGN KEY (fk_barcode_type) REFERENCES llx_c_barcode_type (rowid);
diff --git a/htdocs/install/mysql/tables/llx_product.sql b/htdocs/install/mysql/tables/llx_product.sql
index 0ff94c19530..0ab9a24785c 100644
--- a/htdocs/install/mysql/tables/llx_product.sql
+++ b/htdocs/install/mysql/tables/llx_product.sql
@@ -4,6 +4,7 @@
-- Copyright (C) 2005-2010 Regis Houssin
-- Copyright (C) 2010 juanjo Menent
-- Copyright (C) 2013 Cédric Salvador
+-- Copyright (C) 2014 Marcos GarcÃa
--
-- 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
@@ -37,7 +38,7 @@ create table llx_product
description text,
note text,
customcode varchar(32), -- Optionnal custom code
- fk_country integer, -- Optionnal id of original country
+ fk_country integer DEFAULT NULL, -- Optionnal id of original country
price double(24,8) DEFAULT 0,
price_ttc double(24,8) DEFAULT 0,
price_min double(24,8) DEFAULT 0,
@@ -47,7 +48,7 @@ create table llx_product
recuperableonly integer NOT NULL DEFAULT '0', -- French NPR VAT
localtax1_tx double(6,3) DEFAULT 0, -- Spanish local VAT 1
localtax2_tx double(6,3) DEFAULT 0, -- Spanish local VAT 2
- fk_user_author integer,
+ fk_user_author integer DEFAULT NULL,
tosell tinyint DEFAULT 1, -- Product you sell
tobuy tinyint DEFAULT 1, -- Product you buy
tobatch tinyint DEFAULT 0 NOT NULL, -- Is it a product that need a batch or eat-by management
@@ -56,7 +57,7 @@ create table llx_product
seuil_stock_alerte integer DEFAULT 0,
url varchar(255),
barcode varchar(255) DEFAULT NULL,
- fk_barcode_type integer DEFAULT 0,
+ fk_barcode_type integer DEFAULT NULL,
accountancy_code_sell varchar(32), -- Selling accountancy code
accountancy_code_buy varchar(32), -- Buying accountancy code
partnumber varchar(32), -- Not used. Used by external modules.
diff --git a/htdocs/install/mysql/tables/llx_product_price.key.sql b/htdocs/install/mysql/tables/llx_product_price.key.sql
new file mode 100644
index 00000000000..b3018cea95b
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_product_price.key.sql
@@ -0,0 +1,23 @@
+-- ============================================================================
+-- Copyright (C) 2014 Marcos GarcÃa
+--
+-- 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 3 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, see '.$langs->trans('MigrationContractsEmptyDatesUpdate')." '.$langs->trans('MigrationContractsIncoherentCreationDateUpdate')." Taxes module setup to modify rules for calculation
+TaxModuleSetupToModifyRulesLT=Go to Company setup to modify rules for calculation
OptionMode=Option for accountancy
OptionModeTrue=Option Incomes-Expenses
OptionModeVirtual=Option Claims-Debts
@@ -11,6 +12,7 @@ OptionModeTrueDesc=In this context, the turnover is calculated over payments (da
OptionModeVirtualDesc=In this context, the turnover is calculated over invoices (date of validation). When these invoices are due, whether they have been paid or not, they are listed in the turnover output.
FeatureIsSupportedInInOutModeOnly=Feature only available in CREDITS-DEBTS accountancy mode (See Accountancy module configuration)
VATReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using rules defined by Tax module setup.
+LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using rules defined by Company setup.
Param=Setup
RemainingAmountPayment=Amount payment remaining :
AmountToBeCharged=Total amount to pay :
@@ -40,11 +42,15 @@ VATReceived=VAT received
VATToCollect=VAT purchases
VATSummary=VAT Balance
LT2SummaryES=IRPF Balance
+LT1SummaryES=RE Balance
VATPaid=VAT paid
SalaryPaid=Salary paid
LT2PaidES=IRPF Paid
+LT1PaidES=RE Paid
LT2CustomerES=IRPF sales
LT2SupplierES=IRPF purchases
+LT1CustomerES=RE sales
+LT1SupplierES=RE purchases
VATCollected=VAT collected
ToPay=To pay
ToGet=To get back
@@ -77,8 +83,11 @@ DateStartPeriod=Date start period
DateEndPeriod=Date end period
NewVATPayment=New VAT payment
newLT2PaymentES=New IRPF payment
+newLT1PaymentES=New RE payment
LT2PaymentES=IRPF Payment
LT2PaymentsES=IRPF Payments
+LT1PaymentES=RE Payment
+LT1PaymentsES=RE Payments
VATPayment=VAT Payment
VATPayments=VAT Payments
SocialContributionsPayments=Social contributions payments
@@ -114,6 +123,12 @@ CalcModeVATDebt=Mode %sVAT on commitment accounting%s .
CalcModeVATEngagement=Mode %sVAT on incomes-expenses%s .
CalcModeDebt=Mode %sClaims-Debts%s said Commitment accounting .
CalcModeEngagement=Mode %sIncomes-Expenses%s said cash accounting
+CalcModeLT1= Mode %sRE on customer invoices - suppliers invoices%s
+CalcModeLT1Debt=Modo %sRE on customer invoices%s
+CalcModeLT1Rec= Modo %sRE on suppliers invoices%s
+CalcModeLT2= Modo %sIRPF on customer invoices - suppliers invoices%s
+CalcModeLT2Debt=Modo %sIRPF on customer invoices%s
+CalcModeLT2Rec= Modo %sIRPF on suppliers invoices%s
AnnualSummaryDueDebtMode=Balance of income and expenses, annual summary
AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary
AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by third parties, mode %sClaims-Debts%s said Commitment accounting .
@@ -128,10 +143,15 @@ RulesCAIn=- It includes all the effective payments of invoices received from cli
DepositsAreNotIncluded=- Deposit invoices are nor included
DepositsAreIncluded=- Deposit invoices are included
LT2ReportByCustomersInInputOutputModeES=Report by third party IRPF
+LT1ReportByCustomersInInputOutputModeES=Report by third party RE
VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid
VATReportByCustomersInDueDebtMode=Report by the customer VAT collected and paid
VATReportByQuartersInInputOutputMode=Report by rate of the VAT collected and paid
+LT1ReportByQuartersInInputOutputMode=Report by RE rate
+LT2ReportByQuartersInInputOutputMode=Report by IRPF rate
VATReportByQuartersInDueDebtMode=Report by rate of the VAT collected and paid
+LT1ReportByQuartersInDueDebtMode=Report by RE rate
+LT2ReportByQuartersInDueDebtMode=Report by IRPF rate
SeeVATReportInInputOutputMode=See report %sVAT encasement%s for a standard calculation
SeeVATReportInDueDebtMode=See report %sVAT on flow%s for a calculation with an option on the flow
RulesVATInServices=- For services, the report includes the VAT regulations actually received or issued on the basis of the date of payment.
diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang
index 08992207628..7a08148c9ce 100644
--- a/htdocs/langs/en_US/stocks.lang
+++ b/htdocs/langs/en_US/stocks.lang
@@ -62,8 +62,8 @@ OrderStatusNotReadyToDispatch=Order has not yet or no more a status that allows
StockDiffPhysicTeoric=Reason for difference stock physical and theoretical
NoPredefinedProductToDispatch=No predefined products for this object. So no dispatching in stock is required.
DispatchVerb=Dispatch
-StockLimitShort=Limit
-StockLimit=Stock limit for alerts
+StockLimitShort=Limit for alert
+StockLimit=Stock limit for alert
PhysicalStock=Physical stock
RealStock=Real Stock
VirtualStock=Virtual stock
diff --git a/htdocs/langs/en_US/users.lang b/htdocs/langs/en_US/users.lang
index f5f0e3f89d5..a9d789b8c31 100644
--- a/htdocs/langs/en_US/users.lang
+++ b/htdocs/langs/en_US/users.lang
@@ -87,7 +87,7 @@ MyInformations=My data
ExportDataset_user_1=Dolibarr's users and properties
DomainUser=Domain user %s
Reactivate=Reactivate
-CreateInternalUserDesc=This form allows you to creat an user internal to your company/foundation. To creat an external user (customer, supplier, ...), use button 'Create Dolibarr user' from third party's contact card.
+CreateInternalUserDesc=This form allows you to create an user internal to your company/foundation. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
InternalExternalDesc=An internal user is a user that is part of your company/foundation.external user is a customer, supplier or other.';
+ if ($nbbyrow > 0)
+ {
+ if ($nbphoto == 1) $return.= '';
- if ($nbbyrow && ($nbphoto % $nbbyrow == 1)) $return.= '';
- if ($nbbyrow) $return.= '';
+ if ($nbphoto % $nbbyrow == 1) $return.= ' ';
+ $return.= '';
+ }
+ else if ($nbbyrow < 0) $return .= ' ';
- if ($nbbyrow && ($nbphoto % $nbbyrow == 0)) $return.= ' ';
-
+ if ($nbbyrow > 0)
+ {
+ $return.= '';
+ if (($nbphoto % $nbbyrow) == 0) $return.= '';
+ }
+ else if ($nbbyrow < 0) $return.='';
}
if ($size == 0) { // Format origine
@@ -3099,16 +3186,19 @@ class Product extends CommonObject
}
}
- if ($nbbyrow && $size==1)
+ if ($size==1)
{
- // Ferme tableau
- while ($nbphoto % $nbbyrow)
+ if ($nbbyrow > 0)
{
- $return.= ' ';
- $nbphoto++;
- }
+ // Ferme tableau
+ while ($nbphoto % $nbbyrow)
+ {
+ $return.= ' ';
+ $nbphoto++;
+ }
- if ($nbphoto) $return.= '
';
+ if ($nbphoto) $return.= '
';
+ }
}
closedir($handle);
diff --git a/htdocs/product/class/productbatch.class.php b/htdocs/product/class/productbatch.class.php
index 9c92431c563..c124f9648e3 100644
--- a/htdocs/product/class/productbatch.class.php
+++ b/htdocs/product/class/productbatch.class.php
@@ -97,7 +97,7 @@ class Productbatch extends CommonObject
$this->db->begin();
- dol_syslog(get_class($this)."::create sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::create", LOG_DEBUG);
$resql=$this->db->query($sql);
if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
if (! $error)
@@ -161,7 +161,7 @@ class Productbatch extends CommonObject
$sql.= " FROM ".MAIN_DB_PREFIX.self::$_table_element." as t";
$sql.= " WHERE t.rowid = ".$id;
- dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql)
{
@@ -185,7 +185,6 @@ class Productbatch extends CommonObject
else
{
$this->error = "Error ".$this->db->lasterror();
- dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
return -1;
}
}
@@ -217,7 +216,7 @@ class Productbatch extends CommonObject
$this->db->begin();
- dol_syslog(get_class($this)."::update sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::update", LOG_DEBUG);
$resql = $this->db->query($sql);
if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
if (! $error)
@@ -289,7 +288,7 @@ class Productbatch extends CommonObject
$sql = "DELETE FROM ".MAIN_DB_PREFIX.self::$_table_element."";
$sql.= " WHERE rowid=".$this->id;
- dol_syslog(get_class($this)."::delete sql=".$sql);
+ dol_syslog(get_class($this)."::delete", LOG_DEBUG);
$resql = $this->db->query($sql);
if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
}
@@ -431,7 +430,7 @@ class Productbatch extends CommonObject
if (! empty($where)) $sql.= " AND (".implode(" OR ",$where).")";
- dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
@@ -456,7 +455,6 @@ class Productbatch extends CommonObject
else
{
$this->error="Error ".$this->db->lasterror();
- dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
return -1;
}
}
@@ -487,7 +485,7 @@ class Productbatch extends CommonObject
$sql.= " WHERE fk_product_stock=".$fk_product_stock;
if ($with_qty) $sql.= " AND qty<>0";
- dol_syslog("productbatch::findAll sql=".$sql, LOG_DEBUG);
+ dol_syslog("productbatch::findAll", LOG_DEBUG);
$resql=$db->query($sql);
if ($resql)
{
@@ -517,7 +515,6 @@ class Productbatch extends CommonObject
else
{
$error="Error ".$db->lasterror();
- dol_syslog("productbatch::find_all ".$error, LOG_ERR);
return -1;
}
}
diff --git a/htdocs/product/class/productcustomerprice.class.php b/htdocs/product/class/productcustomerprice.class.php
index c0b99104aa5..4cc6e7feb49 100644
--- a/htdocs/product/class/productcustomerprice.class.php
+++ b/htdocs/product/class/productcustomerprice.class.php
@@ -182,7 +182,7 @@ class Productcustomerprice extends CommonObject
$this->db->begin();
- dol_syslog(get_class($this) . "::create sql=" . $sql, LOG_DEBUG);
+ dol_syslog(get_class($this) . "::create", LOG_DEBUG);
$resql = $this->db->query($sql);
if (! $resql) {
$error ++;
@@ -258,7 +258,7 @@ class Productcustomerprice extends CommonObject
$sql .= " FROM " . MAIN_DB_PREFIX . "product_customer_price as t";
$sql .= " WHERE t.rowid = " . $id;
- dol_syslog(get_class($this) . "::fetch sql=" . $sql, LOG_DEBUG);
+ dol_syslog(get_class($this) . "::fetch", LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql) {
if ($this->db->num_rows($resql)) {
@@ -288,7 +288,6 @@ class Productcustomerprice extends CommonObject
return 1;
} else {
$this->error = "Error " . $this->db->lasterror();
- dol_syslog(get_class($this) . "::fetch " . $this->error, LOG_ERR);
return - 1;
}
}
@@ -355,7 +354,7 @@ class Productcustomerprice extends CommonObject
$sql .= ' ' . $this->db->plimit($limit + 1, $offset);
}
- dol_syslog(get_class($this) . "::fetch_all sql=" . $sql, LOG_DEBUG);
+ dol_syslog(get_class($this) . "::fetch_all", LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql) {
@@ -394,7 +393,6 @@ class Productcustomerprice extends CommonObject
return $num;
} else {
$this->error = "Error " . $this->db->lasterror();
- dol_syslog(get_class($this) . "::fetch_all " . $this->error, LOG_ERR);
return - 1;
}
}
@@ -460,7 +458,7 @@ class Productcustomerprice extends CommonObject
$sql .= ' ' . $this->db->plimit($limit + 1, $offset);
}
- dol_syslog(get_class($this) . "::fetch_all_log sql=" . $sql, LOG_DEBUG);
+ dol_syslog(get_class($this) . "::fetch_all_log", LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql) {
@@ -499,7 +497,6 @@ class Productcustomerprice extends CommonObject
return $num;
} else {
$this->error = "Error " . $this->db->lasterror();
- dol_syslog(get_class($this) . "::fetch_all_log " . $this->error, LOG_ERR);
return - 1;
}
}
@@ -625,7 +622,7 @@ class Productcustomerprice extends CommonObject
$sql .= " WHERE t.rowid = " . $this->id;
$this->db->begin();
- dol_syslog(get_class($this) . "::update sql=" . $sql, LOG_DEBUG);
+ dol_syslog(get_class($this) . "::update", LOG_DEBUG);
$resql = $this->db->query($sql);
if (! $resql) {
$error ++;
@@ -654,7 +651,7 @@ class Productcustomerprice extends CommonObject
$sql .= " WHERE rowid=" . $this->id;
- dol_syslog(get_class($this) . "::update sql=" . $sql, LOG_DEBUG);
+ dol_syslog(get_class($this) . "::update", LOG_DEBUG);
$resql = $this->db->query($sql);
if (! $resql) {
$error ++;
@@ -713,7 +710,7 @@ class Productcustomerprice extends CommonObject
$sql .= " WHERE s.parent = " . $this->fk_soc;
$sql .= " AND s.entity IN (" . getEntity('societe', 1) . ")";
- dol_syslog(get_class($this) . "::setPriceOnAffiliateThirdparty sql=" . $sql, LOG_DEBUG);
+ dol_syslog(get_class($this) . "::setPriceOnAffiliateThirdparty", LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql) {
@@ -784,7 +781,6 @@ class Productcustomerprice extends CommonObject
}
} else {
$this->error = "Error " . $this->db->lasterror();
- dol_syslog(get_class($this) . "::setPriceOnAffiliateThirdparty " . $this->error, LOG_ERR);
return - 1;
}
}
@@ -821,7 +817,7 @@ class Productcustomerprice extends CommonObject
$sql = "DELETE FROM " . MAIN_DB_PREFIX . "product_customer_price";
$sql .= " WHERE rowid=" . $this->id;
- dol_syslog(get_class($this) . "::delete sql=" . $sql);
+ dol_syslog(get_class($this) . "::delete", LOG_DEBUG);
$resql = $this->db->query($sql);
if (! $resql) {
$error ++;
diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php
index deeae6784e6..9d71e9cdc4c 100644
--- a/htdocs/product/fiche.php
+++ b/htdocs/product/fiche.php
@@ -220,7 +220,7 @@ if (empty($reshook))
$object->barcode_type_code = $stdobject->barcode_type_code;
$object->barcode_type_coder = $stdobject->barcode_type_coder;
$object->barcode_type_label = $stdobject->barcode_type_label;
-
+
$object->description = dol_htmlcleanlastbr(GETPOST('desc'));
$object->url = GETPOST('url');
$object->note = dol_htmlcleanlastbr(GETPOST('note'));
@@ -334,7 +334,7 @@ if (empty($reshook))
$object->barcode_type_code = $stdobject->barcode_type_code;
$object->barcode_type_coder = $stdobject->barcode_type_coder;
$object->barcode_type_label = $stdobject->barcode_type_label;
-
+
$object->accountancy_code_sell = GETPOST('accountancy_code_sell');
$object->accountancy_code_buy = GETPOST('accountancy_code_buy');
@@ -1278,17 +1278,21 @@ else
if (empty($conf->global->PRODUCT_DISABLE_CUSTOM_INFO)) $nblignes+=2;
if ($object->isservice()) $nblignes++;
else $nblignes+=4;
-
+
// Photo
if ($showphoto || $showbarcode)
{
print '';
- if ($showphoto) print $object->show_photos($conf->product->multidir_output[$object->entity],1,1,0,0,0,80);
+ print '';
+ $maxvisiblephotos=(isset($conf->global->PRODUCT_MAX_VISIBLE_PHOTO)?$conf->global->PRODUCT_MAX_VISIBLE_PHOTO:5);
+ if ($conf->browser->phone) $maxvisiblephotos=1;
+ if ($showphoto) print $object->show_photos($conf->product->multidir_output[$object->entity],1,$maxvisiblephotos,0,0,0,80);
if ($showphoto && $showbarcode) print '
';
print ' ';
}
-
+
print '';
// Type
@@ -1300,7 +1304,7 @@ else
print $form->editfieldval("Type",'fk_product_type',$object->type,$object,$user->rights->produit->creer||$user->rights->service->creer,$typeformat);
print '';
}
-
+
if ($showbarcode)
{
// Barcode type
diff --git a/htdocs/product/liste.php b/htdocs/product/liste.php
index 40e99a2d2ee..8d82b5548a5 100644
--- a/htdocs/product/liste.php
+++ b/htdocs/product/liste.php
@@ -199,7 +199,7 @@ else
$sql.= $db->order($sortfield,$sortorder);
$sql.= $db->plimit($limit + 1, $offset);
- dol_syslog("product:list.php: sql=".$sql);
+ dol_syslog("product:list.php:", LOG_DEBUG);
$resql = $db->query($sql);
if ($resql)
{
diff --git a/htdocs/product/photos.php b/htdocs/product/photos.php
index 306ee51d210..09f03b15437 100644
--- a/htdocs/product/photos.php
+++ b/htdocs/product/photos.php
@@ -130,13 +130,17 @@ if ($object->id)
print "\n";
+ $permtoedit=0;
+ if ($user->rights->produit->creer && $object->type == 0) $permtoedit=1;
+ if ($user->rights->service->creer && $object->type == 1) $permtoedit=1;
+ if (empty($conf->global->MAIN_UPLOAD_DOC)) $permtoedit=0;
/* ************************************************************************** */
/* */
/* Barre d'action */
/* */
/* ************************************************************************** */
-
+/*
print "\n\n";
if ($action != 'ajout_photo' && ($user->rights->produit->creer || $user->rights->service->creer))
@@ -154,16 +158,17 @@ if ($object->id)
}
print "\n
\n";
-
+*/
/*
* Add a photo
*/
- if ($action == 'ajout_photo' && ($user->rights->produit->creer || $user->rights->service->creer) && ! empty($conf->global->MAIN_UPLOAD_DOC))
+ if ($permtoedit)
{
- // Affiche formulaire upload
+ // Show upload form
$formfile=new FormFile($db);
- $formfile->form_attach_new_file($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans("AddPhoto"), 1, 0, ($user->rights->produit->creer || $user->rights->service->creer), 50, $object, '', false, '', 0); // ajax=false for the moment. true may not work.
+ $formfile->form_attach_new_file($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans("AddPhoto"), 1, 0, $permtoedit, 50, $object, '', false, '', 0); // ajax=false for the moment. true may not work.
}
+ //else print $langs->trans("NoPermissionToAddOrEditPhoto").'';
print '';
print " ".$objp->code_client." \n";
print "";
print dol_print_date($db->jdate($objp->date_commande))." ";
+ print "".$objp->qty." \n";
print "".price($objp->total_ht)." \n";
print ''.$commandestatic->LibStatut($objp->statut,$objp->facture,5).' ';
print "\n";
diff --git a/htdocs/product/stats/commande_fournisseur.php b/htdocs/product/stats/commande_fournisseur.php
index 69845b4b264..22e3e2b30ba 100644
--- a/htdocs/product/stats/commande_fournisseur.php
+++ b/htdocs/product/stats/commande_fournisseur.php
@@ -111,7 +111,7 @@ if ($id > 0 || ! empty($ref))
$sql = "SELECT distinct s.nom, s.rowid as socid, s.code_client,";
$sql.= " c.rowid, c.total_ht as total_ht, c.ref,";
- $sql.= " c.date_commande, c.fk_statut as statut, c.rowid as commandeid";
+ $sql.= " c.date_commande, c.fk_statut as statut, c.rowid as commandeid, d.qty";
if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user ";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
$sql.= ", ".MAIN_DB_PREFIX."commande_fournisseur as c";
@@ -141,6 +141,7 @@ if ($id > 0 || ! empty($ref))
print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom","","&id=".$product->id,'',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("SupplierCode"),$_SERVER["PHP_SELF"],"s.code_client","","&id=".$product->id,'',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("OrderDate"),$_SERVER["PHP_SELF"],"c.date_commande","","&id=".$product->id,'align="center"',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("Qty"),$_SERVER["PHP_SELF"],"d.qty","","&id=".$product->id,'align="center"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("AmountHT"),$_SERVER["PHP_SELF"],"c.total_ht","","&id=".$product->id,'align="right"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"c.fk_statut","","&id=".$product->id,'align="right"',$sortfield,$sortorder);
print "\n";
@@ -165,6 +166,7 @@ if ($id > 0 || ! empty($ref))
print ''.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->nom,44).' ".$objp->code_client." \n";
print ''.dol_print_date($db->jdate($objp->date_commande))." ";
+ print "".$objp->qty." \n";
print ''.price($objp->total_ht)." \n";
print ''.$commandestatic->getLibStatut(4).' ';
print "\n";
diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php
index cac2bccc45b..dc65764defd 100644
--- a/htdocs/product/stats/facture.php
+++ b/htdocs/product/stats/facture.php
@@ -122,7 +122,7 @@ if ($id > 0 || ! empty($ref))
$sql = "SELECT distinct s.nom, s.rowid as socid, s.code_client,";
$sql.= " f.facnumber, f.total as total_ht,";
- $sql.= " f.datef, f.paye, f.fk_statut as statut, f.rowid as facid";
+ $sql.= " f.datef, f.paye, f.fk_statut as statut, f.rowid as facid, d.qty";
if (!$user->rights->societe->client->voir && !$socid) $sql.= ", sc.fk_soc, sc.fk_user ";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
$sql.= ", ".MAIN_DB_PREFIX."facture as f";
@@ -152,6 +152,7 @@ if ($id > 0 || ! empty($ref))
print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom","","&id=".$product->id,'',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("CustomerCode"),$_SERVER["PHP_SELF"],"s.code_client","","&id=".$product->id,'',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("DateInvoice"),$_SERVER["PHP_SELF"],"f.datef","","&id=".$product->id,'align="center"',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("Qty"),$_SERVER["PHP_SELF"],"d.qty","","&id=".$product->id,'align="center"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("AmountHT"),$_SERVER["PHP_SELF"],"f.total_ht","","&id=".$product->id,'align="right"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"f.paye,f.fk_statut","","&id=".$product->id,'align="right"',$sortfield,$sortorder);
print "\n";
@@ -174,6 +175,7 @@ if ($id > 0 || ! empty($ref))
print "".$objp->code_client." \n";
print "";
print dol_print_date($db->jdate($objp->datef),'day')." ";
+ print "".$objp->qty." \n";
print "".price($objp->total_ht)." \n";
print ''.$invoicestatic->LibStatut($objp->paye,$objp->statut,5).' ';
print "\n";
diff --git a/htdocs/product/stats/facture_fournisseur.php b/htdocs/product/stats/facture_fournisseur.php
index 2a06c30a496..4cbeaec7e76 100644
--- a/htdocs/product/stats/facture_fournisseur.php
+++ b/htdocs/product/stats/facture_fournisseur.php
@@ -123,7 +123,7 @@ if ($id > 0 || ! empty($ref))
$sql = "SELECT distinct s.nom, s.rowid as socid, s.code_client, f.ref, f.total_ht as total_ht,";
- $sql.= " f.datef, f.paye, f.fk_statut as statut, f.rowid as facid";
+ $sql.= " f.datef, f.paye, f.fk_statut as statut, f.rowid as facid, d.qty";
if (!$user->rights->societe->client->voir && !$socid) $sql.= ", sc.fk_soc, sc.fk_user ";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
$sql.= ", ".MAIN_DB_PREFIX."facture_fourn as f";
@@ -153,6 +153,7 @@ if ($id > 0 || ! empty($ref))
print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom","","&id=".$product->id,'',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("SupplierCode"),$_SERVER["PHP_SELF"],"s.code_client","","&id=".$product->id,'',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("DateInvoice"),$_SERVER["PHP_SELF"],"f.datef","","&id=".$product->id,'align="center"',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("Qty"),$_SERVER["PHP_SELF"],"d.qty","","&id=".$product->id,'align="center"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("AmountHT"),$_SERVER["PHP_SELF"],"f.total_ht","","&id=".$product->id,'align="right"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"f.paye,f.fk_statut","","&id=".$product->id,'align="right"',$sortfield,$sortorder);
print "\n";
@@ -175,6 +176,7 @@ if ($id > 0 || ! empty($ref))
print "".$objp->code_client." \n";
print "";
print dol_print_date($db->jdate($objp->datef))." ";
+ print "".$objp->qty." \n";
print "".price($objp->total_ht)." \n";
print ''.$supplierinvoicestatic->LibStatut($objp->paye,$objp->statut,5).' ';
print "\n";
diff --git a/htdocs/product/stats/propal.php b/htdocs/product/stats/propal.php
index a55673c62b0..e9a78f18b05 100644
--- a/htdocs/product/stats/propal.php
+++ b/htdocs/product/stats/propal.php
@@ -113,7 +113,7 @@ if ($id > 0 || ! empty($ref))
$sql = "SELECT DISTINCT s.nom, s.rowid as socid, p.rowid as propalid, p.ref, p.total_ht as amount,";
- $sql.= "p.datep, p.fk_statut as statut";
+ $sql.= "p.datep, p.fk_statut as statut, d.qty";
if (!$user->rights->societe->client->voir && !$socid) $sql.= ", sc.fk_soc, sc.fk_user ";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
$sql.= ",".MAIN_DB_PREFIX."propal as p";
@@ -141,6 +141,7 @@ if ($id > 0 || ! empty($ref))
print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"p.rowid","","&id=".$product->id,'',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom","","&id=".$product->id,'',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("DatePropal"),$_SERVER["PHP_SELF"],"p.datep","","&id=".$product->id,'align="center"',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("Qty"),$_SERVER["PHP_SELF"],"d.qty","","&id=".$product->id,'align="center"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("AmountHT"),$_SERVER["PHP_SELF"],"p.total","","&id=".$product->id,'align="right"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"p.fk_statut","","&id=".$product->id,'align="right"',$sortfield,$sortorder);
print "\n";
@@ -162,6 +163,7 @@ if ($id > 0 || ! empty($ref))
print ''.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->nom,44).' ';
print dol_print_date($db->jdate($objp->datep))." ";
+ print "".$objp->qty." \n";
print ''.price($objp->amount).' '."\n";
print ''.$propalstatic->LibStatut($objp->statut,5).' ';
print ''."\n";
diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php
index 61c88abcaa5..78d4cc55a4e 100644
--- a/htdocs/product/stock/class/entrepot.class.php
+++ b/htdocs/product/stock/class/entrepot.class.php
@@ -89,7 +89,7 @@ class Entrepot extends CommonObject
$sql = "INSERT INTO ".MAIN_DB_PREFIX."entrepot (entity, datec, fk_user_author, label)";
$sql .= " VALUES (".$conf->entity.",'".$this->db->idate($now)."',".$user->id.",'".$this->db->escape($this->libelle)."')";
- dol_syslog(get_class($this)."::create sql=".$sql);
+ dol_syslog(get_class($this)."::create", LOG_DEBUG);
$result=$this->db->query($sql);
if ($result)
{
@@ -158,7 +158,7 @@ class Entrepot extends CommonObject
$this->db->begin();
- dol_syslog(get_class($this)."::update sql=".$sql);
+ dol_syslog(get_class($this)."::update", LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
@@ -169,7 +169,6 @@ class Entrepot extends CommonObject
{
$this->db->rollback();
$this->error=$this->db->lasterror();
- dol_syslog(get_class($this)."::update ".$this->error, LOG_ERR);
return -1;
}
}
@@ -187,12 +186,12 @@ class Entrepot extends CommonObject
$sql = "DELETE FROM ".MAIN_DB_PREFIX."stock_mouvement";
$sql.= " WHERE fk_entrepot = " . $this->id;
- dol_syslog("Entrepot::delete sql=".$sql);
+ dol_syslog("Entrepot::delete", LOG_DEBUG);
$resql1=$this->db->query($sql);
$sql = "DELETE FROM ".MAIN_DB_PREFIX."product_stock";
$sql.= " WHERE fk_entrepot = " . $this->id;
- dol_syslog("Entrepot::delete sql=".$sql);
+ dol_syslog("Entrepot::delete", LOG_DEBUG);
$resql2=$this->db->query($sql);
if ($resql1 && $resql2)
@@ -200,13 +199,13 @@ class Entrepot extends CommonObject
$sql = "DELETE FROM ".MAIN_DB_PREFIX."entrepot";
$sql.= " WHERE rowid = " . $this->id;
- dol_syslog(get_class($this)."::delete sql=".$sql);
+ dol_syslog(get_class($this)."::delete", LOG_DEBUG);
$resql1=$this->db->query($sql);
// Update denormalized fields because we change content of produt_stock
$sql = "UPDATE ".MAIN_DB_PREFIX."product p SET p.stock= (SELECT SUM(ps.reel) FROM ".MAIN_DB_PREFIX."product_stock ps WHERE ps.fk_product = p.rowid)";
- dol_syslog(get_class($this)."::delete sql=".$sql);
+ dol_syslog(get_class($this)."::delete", LOG_DEBUG);
$resql2=$this->db->query($sql);
if ($resql1 && $resql2)
@@ -218,7 +217,6 @@ class Entrepot extends CommonObject
{
$this->db->rollback();
$this->error=$this->db->lasterror();
- dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
return -1;
}
}
@@ -226,7 +224,6 @@ class Entrepot extends CommonObject
{
$this->db->rollback();
$this->error=$this->db->lasterror();
- dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
return -1;
}
@@ -258,7 +255,7 @@ class Entrepot extends CommonObject
if ($ref) $sql.= " AND label = '".$this->db->escape($ref)."'";
}
- dol_syslog(get_class($this)."::fetch sql=".$sql);
+ dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
$result = $this->db->query($sql);
if ($result)
{
@@ -309,7 +306,7 @@ class Entrepot extends CommonObject
$sql.= " FROM ".MAIN_DB_PREFIX."entrepot as e";
$sql.= " WHERE e.rowid = ".$id;
- dol_syslog(get_class($this)."::info sql=".$sql);
+ dol_syslog(get_class($this)."::info", LOG_DEBUG);
$result=$this->db->query($sql);
if ($result)
{
diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php
index 2d4a8971f1b..747a737f389 100644
--- a/htdocs/product/stock/class/mouvementstock.class.php
+++ b/htdocs/product/stock/class/mouvementstock.class.php
@@ -112,7 +112,7 @@ class MouvementStock
$sql.= " '".$origintype."'";
$sql.= ")";
- dol_syslog(get_class($this)."::_create sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::_create", LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql)
{
@@ -121,7 +121,6 @@ class MouvementStock
else
{
$this->error=$this->db->lasterror();
- dol_syslog(get_class($this)."::_create ".$this->error, LOG_ERR);
$error = -1;
}
@@ -138,7 +137,7 @@ class MouvementStock
$sql = "SELECT rowid, reel, pmp FROM ".MAIN_DB_PREFIX."product_stock";
$sql.= " WHERE fk_entrepot = ".$entrepot_id." AND fk_product = ".$fk_product;
- dol_syslog(get_class($this)."::_create sql=".$sql);
+ dol_syslog(get_class($this)."::_create", LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
@@ -155,7 +154,6 @@ class MouvementStock
else
{
$this->error=$this->db->lasterror();
- dol_syslog(get_class($this)."::_create echec update ".$this->error, LOG_ERR);
$error = -2;
}
}
@@ -203,12 +201,11 @@ class MouvementStock
$sql.= " (".$newpmpwarehouse.", ".$qty.", ".$entrepot_id.", ".$fk_product.")";
}
- dol_syslog(get_class($this)."::_create sql=".$sql);
+ dol_syslog(get_class($this)."::_create", LOG_DEBUG);
$resql=$this->db->query($sql);
if (! $resql)
{
$this->error=$this->db->lasterror();
- dol_syslog(get_class($this)."::_create ".$this->error, LOG_ERR);
$error = -3;
} else if(empty($fk_product_stock)){
$fk_product_stock = $this->db->last_insert_id(MAIN_DB_PREFIX."product_stock");
@@ -230,12 +227,11 @@ class MouvementStock
// May be this request is better:
// UPDATE llx_product p SET p.stock= (SELECT SUM(ps.reel) FROM llx_product_stock ps WHERE ps.fk_product = p.rowid);
- dol_syslog(get_class($this)."::_create sql=".$sql);
+ dol_syslog(get_class($this)."::_create", LOG_DEBUG);
$resql=$this->db->query($sql);
if (! $resql)
{
$this->error=$this->db->lasterror();
- dol_syslog(get_class($this)."::_create ".$this->error, LOG_ERR);
$error = -4;
}
}
@@ -298,7 +294,7 @@ class MouvementStock
$sql.= " FROM ".MAIN_DB_PREFIX."product_association";
$sql.= " WHERE fk_product_pere = ".$idProduct;
- dol_syslog(get_class($this)."::_createSubProduct sql=".$sql, LOG_DEBUG);
+ dol_syslog(get_class($this)."::_createSubProduct", LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
@@ -313,7 +309,6 @@ class MouvementStock
}
else
{
- dol_syslog(get_class($this)."::_createSubProduct ".$this->error, LOG_ERR);
$error = -2;
}
@@ -412,7 +407,7 @@ class MouvementStock
$sql.= ' WHERE fk_product = '.$productidselected;
$sql.= " AND datem < '".$this->db->idate($datebefore)."'";
- dol_syslog(get_class($this).__METHOD__.' sql='.$sql);
+ dol_syslog(get_class($this).__METHOD__.'', LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
diff --git a/htdocs/product/stock/fiche.php b/htdocs/product/stock/fiche.php
index 4a365e3e50b..ecc29a55927 100644
--- a/htdocs/product/stock/fiche.php
+++ b/htdocs/product/stock/fiche.php
@@ -390,7 +390,7 @@ else
$sql.= " AND ps.fk_entrepot = ".$object->id;
$sql.= $db->order($sortfield,$sortorder);
- dol_syslog('List products sql='.$sql);
+ dol_syslog('List products', LOG_DEBUG);
$resql = $db->query($sql);
if ($resql)
{
diff --git a/htdocs/product/stock/index.php b/htdocs/product/stock/index.php
index da52a5aac58..1309da95a2a 100644
--- a/htdocs/product/stock/index.php
+++ b/htdocs/product/stock/index.php
@@ -124,7 +124,7 @@ if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) $sql.= " AND p.fk_product_typ
$sql.= $db->order("datem","DESC");
$sql.= $db->plimit($max,0);
-dol_syslog("Index:list stock movements sql=".$sql, LOG_DEBUG);
+dol_syslog("Index:list stock movements", LOG_DEBUG);
$resql = $db->query($sql);
if ($resql)
{
diff --git a/htdocs/product/stock/lib/replenishment.lib.php b/htdocs/product/stock/lib/replenishment.lib.php
index e155418226a..50a0d85e25c 100644
--- a/htdocs/product/stock/lib/replenishment.lib.php
+++ b/htdocs/product/stock/lib/replenishment.lib.php
@@ -122,7 +122,6 @@ function ordered($product_id)
{
$error = $db->lasterror();
dol_print_error($db);
- dol_syslog('replenish.php: ' . $error, LOG_ERR);
return $langs->trans('error');
}
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index 3f26d8c0980..338169a6154 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -321,23 +321,6 @@ if ($id > 0 || $ref)
// If stock if stock increment is done on real sending
if (! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT))
{
- $stock_commande_client=$stock_commande_fournisseur=0;
-
- if (! empty($conf->commande->enabled))
- {
- $result=$product->load_stats_commande(0,'1,2');
- if ($result < 0) dol_print_error($db,$product->error);
- $stock_commande_client=$product->stats_commande['qty'];
- }
- if (! empty($conf->fournisseur->enabled))
- {
- $result=$product->load_stats_commande_fournisseur(0,'3');
- if ($result < 0) dol_print_error($db,$product->error);
- $stock_commande_fournisseur=$product->stats_commande_fournisseur['qty'];
- }
-
- $product->stock_theorique=$product->stock_reel-($stock_commande_client+$stock_sending_client)+$stock_commande_fournisseur;
-
// Stock theorique
print ''.$langs->trans("VirtualStock").' ';
print "".$product->stock_theorique;
@@ -360,7 +343,7 @@ if ($id > 0 || $ref)
if (! empty($conf->commande->enabled))
{
if ($found) print '