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

Merge branch '3.7' into bug-iban-whitespaces-37

Browse Source 
# Conflicts:
#	ChangeLog
This commit is contained in:
Marcos García de La Fuente 2015-09-03 12:02:23 +02:00
commit 0955432de3
32 changed files with 70 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -21,6 +21,7 @@ FIX: Not showing task extrafields when creating from left menu
FIX [ bug #3288 ] Tasks box is not properly drawn FIX [ bug #3288 ] Tasks box is not properly drawn
FIX [ bug #3211 ] Outstading bill amount of a client showed wrong amounts FIX [ bug #3211 ] Outstading bill amount of a client showed wrong amounts
FIX [ bug #3321 ] Users with certain permissions were shown a "forbidden access" page even if they had the rights FIX [ bug #3321 ] Users with certain permissions were shown a "forbidden access" page even if they had the rights
FIX [ bug #3426 ] Unable to create an invoice from a contract with extrafields
FIX [ bug #3432 ] Spaces should be removed from IBAN when formatting it FIX [ bug #3432 ] Spaces should be removed from IBAN when formatting it
NEW: Created new ContratLigne::insert function NEW: Created new ContratLigne::insert function

2
htdocs/commande/orderstoinvoice.php
View File

@ -505,7 +505,7 @@ if ($action == 'create' && !$error)
//Mode liste //Mode liste
if (($action != 'create' && $action != 'add') || !$error) if (($action != 'create' && $action != 'add') && !$error)
{ {
llxHeader(); llxHeader();
?> ?>

11
htdocs/compta/facture/impayees.php
View File

@ -129,10 +129,12 @@ if ($action == 'presend' && GETPOST('sendmail'))
'__CHECK_READ__' => '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag='.$obj2->tag.'&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'" width="1" height="1" style="width:1px;height:1px" border="0"/>', '__CHECK_READ__' => '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag='.$obj2->tag.'&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'" width="1" height="1" style="width:1px;height:1px" border="0"/>',
//'__LASTNAME__' => $obj2->lastname, //'__LASTNAME__' => $obj2->lastname,
//'__FIRSTNAME__' => $obj2->firstname, //'__FIRSTNAME__' => $obj2->firstname,
'__REF__' => $object->ref, '__FACREF__' => $object->ref, // For backward compatibility
'__REF__' => $object->ref,
'__REFCLIENT__' => $object->thirdparty->name '__REFCLIENT__' => $object->thirdparty->name
); );
$subject=make_substitutions($subject, $substitutionarray);
$message=make_substitutions($message, $substitutionarray); $message=make_substitutions($message, $substitutionarray);
$actiontypecode='AC_FAC'; $actiontypecode='AC_FAC';
@ -160,7 +162,7 @@ if ($action == 'presend' && GETPOST('sendmail'))
} }
else else
{ {
//$result=$mailfile->sendfile(); $result=$mailfile->sendfile();
if ($result) if ($result)
{ {
$resultmasssend.=$langs->trans('MailSuccessfulySent',$mailfile->getValidAddress($from,2),$mailfile->getValidAddress($sendto,2)); // Must not contain " $resultmasssend.=$langs->trans('MailSuccessfulySent',$mailfile->getValidAddress($from,2),$mailfile->getValidAddress($sendto,2)); // Must not contain "
@ -215,7 +217,6 @@ if ($action == 'presend' && GETPOST('sendmail'))
$langs->load("other"); $langs->load("other");
$resultmasssend.='<div class="error">'.$langs->trans('ErrorCantReadFile',$file).'</div>'; $resultmasssend.='<div class="error">'.$langs->trans('ErrorCantReadFile',$file).'</div>';
dol_syslog('Failed to read file: '.$file); dol_syslog('Failed to read file: '.$file);
break ;
} }
} }
} }
@ -469,8 +470,8 @@ if ($resql)
else $titre.=' ('.$langs->trans("All").')'; else $titre.=' ('.$langs->trans("All").')';
$link=''; $link='';
if (empty($option)) $link='<a href="'.$_SERVER["PHP_SELF"].'?option=late">'.$langs->trans("ShowUnpaidLateOnly").'</a>'; if (empty($option)) $link='<a href="'.$_SERVER["PHP_SELF"].'?option=late'.$param.'">'.$langs->trans("ShowUnpaidLateOnly").'</a>';
elseif ($option == 'late') $link='<a href="'.$_SERVER["PHP_SELF"].'">'.$langs->trans("ShowUnpaidAll").'</a>'; elseif ($option == 'late') $link='<a href="'.$_SERVER["PHP_SELF"].($param?'?'.preg_replace('/&?(amps;)?option=late/','',$param):'').'">'.$langs->trans("ShowUnpaidAll").'</a>';
print_fiche_titre($titre,$link); print_fiche_titre($titre,$link);
//print_barre_liste($titre,$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',0); // We don't want pagination on this page //print_barre_liste($titre,$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',0); // We don't want pagination on this page

13
htdocs/compta/index.php
View File

@ -1,7 +1,8 @@
<?php <?php
/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2013 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2013 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com> * Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2015 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -574,7 +575,7 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
$chargestatic->lib=$obj->libelle; $chargestatic->lib=$obj->libelle;
$chargestatic->paye=$obj->paye; $chargestatic->paye=$obj->paye;
print '<td>'.$chargestatic->getNomUrl(1).'</td>'; print '<td>'.$chargestatic->getNomUrl(1).'</td>';
print '<td align="center">'.dol_print_date($obj->date_ech,'day').'</td>'; print '<td align="center">'.dol_print_date($db->jdate($obj->date_ech),'day').'</td>';
print '<td align="right">'.price($obj->amount).'</td>'; print '<td align="right">'.price($obj->amount).'</td>';
print '<td align="right">'.price($obj->sumpaid).'</td>'; print '<td align="right">'.price($obj->sumpaid).'</td>';
print '<td align="center">'.$chargestatic->getLibStatut(3).'</td>'; print '<td align="center">'.$chargestatic->getLibStatut(3).'</td>';
@ -915,8 +916,8 @@ if ($resql)
$obj = $db->fetch_object($resql); $obj = $db->fetch_object($resql);
$var=!$var; $var=!$var;
print "<tr ".$bc[$var]."><td>".dol_print_date($obj->da,"day")."</td>"; print "<tr ".$bc[$var]."><td>".dol_print_date($db->jdate($obj->da),"day")."</td>";
print "<td><a href=\"action/card.php\">$obj->libelle $obj->label</a></td></tr>"; print "<td><a href=\"action/card.php\">".$obj->libelle." ".$obj->label."</a></td></tr>";
$i++; $i++;
} }
$db->free($resql); $db->free($resql);

2
htdocs/compta/resultat/clientfourn.php
View File

@ -304,7 +304,7 @@ if ($modecompta == 'CREANCES-DETTES')
} }
else else
{ {
$sql = "SELECT s.nom, s.rowid as socid, sum(pf.amount) as amount_ttc"; $sql = "SELECT s.nom as name, s.rowid as socid, sum(pf.amount) as amount_ttc";
$sql.= " FROM ".MAIN_DB_PREFIX."paiementfourn as p"; $sql.= " FROM ".MAIN_DB_PREFIX."paiementfourn as p";
$sql.= ", ".MAIN_DB_PREFIX."paiementfourn_facturefourn as pf"; $sql.= ", ".MAIN_DB_PREFIX."paiementfourn_facturefourn as pf";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."facture_fourn as f"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."facture_fourn as f";

4
htdocs/compta/salaries/index.php
View File

@ -168,7 +168,7 @@ if ($result)
// Type // Type
print '<td>'.$langs->trans("PaymentTypeShort".$obj->payment_code).' '.$obj->num_payment.'</td>'; print '<td>'.$langs->trans("PaymentTypeShort".$obj->payment_code).' '.$obj->num_payment.'</td>';
// Amount // Amount
print "<td align=\"right\">".price($obj->amount,0,$outputlangs,1,-1,-1,$conf->currency)."</td>"; print "<td align=\"right\">".price($obj->amount)."</td>";
print "<td>&nbsp;</td>"; print "<td>&nbsp;</td>";
print "</tr>\n"; print "</tr>\n";
@ -177,7 +177,7 @@ if ($result)
$i++; $i++;
} }
print '<tr class="liste_total"><td colspan="5" class="liste_total">'.$langs->trans("Total").'</td>'; print '<tr class="liste_total"><td colspan="5" class="liste_total">'.$langs->trans("Total").'</td>';
print '<td class="liste_total" align="right">'.price($total,0,$outputlangs,1,-1,-1,$conf->currency)."</td>"; print '<td class="liste_total" align="right">'.price($total)."</td>";
print "<td>&nbsp;</td></tr>"; print "<td>&nbsp;</td></tr>";
print "</table>"; print "</table>";

6
htdocs/contact/class/contact.class.php
View File

@ -499,9 +499,10 @@ class Contact extends CommonObject
*/ */
function fetch($id, $user=0, $ref_ext='') function fetch($id, $user=0, $ref_ext='')
{ {
dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
global $langs; global $langs;
dol_syslog(get_class($this)."::fetch id=".$id, LOG_DEBUG);
$langs->load("companies"); $langs->load("companies");
$sql = "SELECT c.rowid, c.fk_soc, c.ref_ext, c.civility as civility_id, c.lastname, c.firstname,"; $sql = "SELECT c.rowid, c.fk_soc, c.ref_ext, c.civility as civility_id, c.lastname, c.firstname,";
@ -524,7 +525,6 @@ class Contact extends CommonObject
if ($id) $sql.= " WHERE c.rowid = ". $id; if ($id) $sql.= " WHERE c.rowid = ". $id;
elseif ($ref_ext) $sql .= " WHERE c.ref_ext = '".$this->db->escape($ref_ext)."'"; elseif ($ref_ext) $sql .= " WHERE c.ref_ext = '".$this->db->escape($ref_ext)."'";
dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
$resql=$this->db->query($sql); $resql=$this->db->query($sql);
if ($resql) if ($resql)
{ {
@ -565,7 +565,7 @@ class Contact extends CommonObject
$this->email = $obj->email; $this->email = $obj->email;
$this->jabberid = $obj->jabberid; $this->jabberid = $obj->jabberid;
$this->skype = $obj->skype; $this->skype = $obj->skype;
$this->priv = $obj->priv; $this->priv = $obj->priv;
$this->mail = $obj->email; $this->mail = $obj->email;

1
htdocs/core/boxes/box_prospect.php
View File

@ -136,7 +136,6 @@ class box_prospect extends ModeleBoxes
} }
} }
else { else {
dol_syslog("box_prospect::loadBox not allowed de read this box content",LOG_ERR);
$this->info_box_contents[0][0] = array('td' => 'align="left"', $this->info_box_contents[0][0] = array('td' => 'align="left"',
'text' => $langs->trans("ReadPermissionNotAllowed")); 'text' => $langs->trans("ReadPermissionNotAllowed"));
} }

11
htdocs/core/class/commonobject.class.php
View File

@ -1837,7 +1837,7 @@ abstract class CommonObject
* @return void * @return void
* @see add_object_linked, updateObjectLinked, deleteObjectLinked * @see add_object_linked, updateObjectLinked, deleteObjectLinked
*/ */
function fetchObjectLinked($sourceid='',$sourcetype='',$targetid='',$targettype='',$clause='OR') function fetchObjectLinked($sourceid=null,$sourcetype='',$targetid=null,$targettype='',$clause='OR')
{ {
global $conf; global $conf;
@ -1865,11 +1865,11 @@ abstract class CommonObject
$sourcetype = (! empty($sourcetype) ? $sourcetype : $this->element); $sourcetype = (! empty($sourcetype) ? $sourcetype : $this->element);
$targettype = (! empty($targettype) ? $targettype : $this->element); $targettype = (! empty($targettype) ? $targettype : $this->element);
if (empty($sourceid) && empty($targetid)) /*if (empty($sourceid) && empty($targetid))
{ {
dol_syslog('Bad usage of function. No source nor target id defined (nor as parameter nor as object id)', LOG_ERROR); dol_syslog('Bad usage of function. No source nor target id defined (nor as parameter nor as object id)', LOG_ERROR);
return -1; return -1;
} }*/
// Links beetween objects are stored in this table // Links beetween objects are stored in this table
$sql = 'SELECT fk_source, sourcetype, fk_target, targettype'; $sql = 'SELECT fk_source, sourcetype, fk_target, targettype';
@ -3375,6 +3375,11 @@ abstract class CommonObject
{ {
if (empty($rowid)) $rowid=$this->id; if (empty($rowid)) $rowid=$this->id;
//To avoid SQL errors. Probably not the better solution though
if (!$this->table_element) {
return 0;
}
if (! is_array($optionsArray)) if (! is_array($optionsArray))
{ {
// optionsArray not already loaded, so we load it // optionsArray not already loaded, so we load it

25
htdocs/core/lib/geturl.lib.php
View File

@ -24,12 +24,12 @@
/** /**
* Function get content from an URL (use proxy if proxy defined) * Function get content from an URL (use proxy if proxy defined)
* *
* @param string $url URL to call. * @param string $url URL to call.
* @param string $postorget 'POST', 'GET', 'HEAD' * @param string $postorget 'POST', 'GET', 'HEAD', 'PUTALREADYFORMATED'
* @param string $param Parameters of URL (x=value1&y=value2) * @param string $param Parameters of URL (x=value1&y=value2) or may be a formated content with PUTALREADYFORMATED
* @param string $followlocation 1=Follow location, 0=Do not follow * @param string $followlocation 1=Follow location, 0=Do not follow
* @param array $addheaders Array of string to add into header. Example: ('Accept: application/xrds+xml', ....) * @param array $addheaders Array of string to add into header. Example: ('Accept: application/xrds+xml', ....)
* @return array Returns an associative array containing the response from the server array('content'=>response,'curl_error_no'=>errno,'curl_error_msg'=>errmsg...) * @return array Returns an associative array containing the response from the server array('content'=>response,'curl_error_no'=>errno,'curl_error_msg'=>errmsg...)
*/ */
function getURLContent($url,$postorget='GET',$param='',$followlocation=1,$addheaders=array()) function getURLContent($url,$postorget='GET',$param='',$followlocation=1,$addheaders=array())
{ {
@ -74,10 +74,19 @@ function getURLContent($url,$postorget='GET',$param='',$followlocation=1,$addhea
else if ($postorget == 'PUT') else if ($postorget == 'PUT')
{ {
curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'PUT'); // HTTP request is 'PUT' curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'PUT'); // HTTP request is 'PUT'
if ( ! is_array($param) ) if (! is_array($param)) parse_str($param, $array_param);
parse_str($param, $array_param); else
{
dol_syslog("parameter param must be a string", LOG_WARNING);
$array_param=$param;
}
curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($array_param)); // Setting param x=a&y=z as PUT fields curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($array_param)); // Setting param x=a&y=z as PUT fields
} }
else if ($postorget == 'PUTALREADYFORMATED')
{
curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'PUT'); // HTTP request is 'PUT'
curl_setopt($ch, CURLOPT_POSTFIELDS, $param); // param = content of post, like a xml string
}
else if ($postorget == 'HEAD') else if ($postorget == 'HEAD')
{ {
curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'HEAD'); // HTTP request is 'HEAD' curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'HEAD'); // HTTP request is 'HEAD'

33
htdocs/core/lib/pdf.lib.php
View File

@ -1586,55 +1586,52 @@ function pdf_getLinkedObjects($object,$outputlangs)
if ($objecttype == 'propal') if ($objecttype == 'propal')
{ {
$outputlangs->load('propal'); $outputlangs->load('propal');
$num=count($objects);
for ($i=0;$i<$num;$i++) foreach($objects as $elementobject)
{ {
$linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefProposal"); $linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefProposal");
$linkedobjects[$objecttype]['ref_value'] = $outputlangs->transnoentities($objects[$i]->ref); $linkedobjects[$objecttype]['ref_value'] = $outputlangs->transnoentities($elementobject->ref);
$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("DatePropal"); $linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("DatePropal");
$linkedobjects[$objecttype]['date_value'] = dol_print_date($objects[$i]->date,'day','',$outputlangs); $linkedobjects[$objecttype]['date_value'] = dol_print_date($elementobject->date,'day','',$outputlangs);
} }
} }
else if ($objecttype == 'commande') else if ($objecttype == 'commande')
{ {
$outputlangs->load('orders'); $outputlangs->load('orders');
$num=count($objects); foreach($objects as $elementobject)
for ($i=0;$i<$num;$i++)
{ {
$linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefOrder"); $linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefOrder");
$linkedobjects[$objecttype]['ref_value'] = $outputlangs->transnoentities($objects[$i]->ref) . ($objects[$i]->ref_client ? ' ('.$objects[$i]->ref_client.')' : ''); $linkedobjects[$objecttype]['ref_value'] = $outputlangs->transnoentities($elementobject->ref) . ($elementobject->ref_client ? ' ('.$elementobject->ref_client.')' : '');
$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("OrderDate"); $linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("OrderDate");
$linkedobjects[$objecttype]['date_value'] = dol_print_date($objects[$i]->date,'day','',$outputlangs); $linkedobjects[$objecttype]['date_value'] = dol_print_date($elementobject->date,'day','',$outputlangs);
} }
} }
else if ($objecttype == 'contrat') else if ($objecttype == 'contrat')
{ {
$outputlangs->load('contracts'); $outputlangs->load('contracts');
$num=count($objects); foreach($objects as $elementobject)
for ($i=0;$i<$num;$i++)
{ {
$linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefContract"); $linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefContract");
$linkedobjects[$objecttype]['ref_value'] = $outputlangs->transnoentities($objects[$i]->ref); $linkedobjects[$objecttype]['ref_value'] = $outputlangs->transnoentities($elementobject->ref);
$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("DateContract"); $linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("DateContract");
$linkedobjects[$objecttype]['date_value'] = dol_print_date($objects[$i]->date_contrat,'day','',$outputlangs); $linkedobjects[$objecttype]['date_value'] = dol_print_date($elementobject->date_contrat,'day','',$outputlangs);
} }
} }
else if ($objecttype == 'shipping') else if ($objecttype == 'shipping')
{ {
$outputlangs->load('orders'); $outputlangs->load('orders');
$outputlangs->load('sendings'); $outputlangs->load('sendings');
$num=count($objects); foreach($objects as $elementobject)
for ($i=0;$i<$num;$i++)
{ {
$objects[$i]->fetchObjectLinked(); $elementobject->fetchObjectLinked();
$order = $objects[$i]->linkedObjects['commande'][0]; $order = $elementobject->linkedObjects['commande'][0];
$linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefOrder") . ' / ' . $outputlangs->transnoentities("RefSending"); $linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefOrder") . ' / ' . $outputlangs->transnoentities("RefSending");
$linkedobjects[$objecttype]['ref_value'] = $outputlangs->transnoentities($order->ref) . ($order->ref_client ? ' ('.$order->ref_client.')' : ''); $linkedobjects[$objecttype]['ref_value'] = $outputlangs->transnoentities($order->ref) . ($order->ref_client ? ' ('.$order->ref_client.')' : '');
$linkedobjects[$objecttype]['ref_value'].= ' / ' . $outputlangs->transnoentities($objects[$i]->ref); $linkedobjects[$objecttype]['ref_value'].= ' / ' . $outputlangs->transnoentities($elementobject->ref);
$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("OrderDate") . ' / ' . $outputlangs->transnoentities("DateSending"); $linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("OrderDate") . ' / ' . $outputlangs->transnoentities("DateSending");
$linkedobjects[$objecttype]['date_value'] = dol_print_date($order->date,'day','',$outputlangs); $linkedobjects[$objecttype]['date_value'] = dol_print_date($order->date,'day','',$outputlangs);
$linkedobjects[$objecttype]['date_value'].= ' / ' . dol_print_date($objects[$i]->date_delivery,'day','',$outputlangs); $linkedobjects[$objecttype]['date_value'].= ' / ' . dol_print_date($elementobject->date_delivery,'day','',$outputlangs);
} }
} }
} }

8
htdocs/core/modules/syslog/mod_syslog_chromephp.php
View File

@ -51,7 +51,9 @@ class mod_syslog_chromephp extends LogHandler implements LogHandlerInterface
global $conf; global $conf;
try try
{ {
if (empty($conf->global->SYSLOG_CHROMEPHP_INCLUDEPATH)) $conf->global->SYSLOG_CHROMEPHP_INCLUDEPATH='/usr/share/php'; if (empty($conf->global->SYSLOG_CHROMEPHP_INCLUDEPATH)) {
$conf->global->SYSLOG_CHROMEPHP_INCLUDEPATH=DOL_DOCUMENT_ROOT . '/includes/chromephp/';
}
set_include_path($conf->global->SYSLOG_CHROMEPHP_INCLUDEPATH); set_include_path($conf->global->SYSLOG_CHROMEPHP_INCLUDEPATH);
//print 'rrrrr'.get_include_path(); //print 'rrrrr'.get_include_path();
@ -86,9 +88,9 @@ class mod_syslog_chromephp extends LogHandler implements LogHandlerInterface
array( array(
'name' => $langs->trans('IncludePath','SYSLOG_CHROMEPHP_INCLUDEPATH'), 'name' => $langs->trans('IncludePath','SYSLOG_CHROMEPHP_INCLUDEPATH'),
'constant' => 'SYSLOG_CHROMEPHP_INCLUDEPATH', 'constant' => 'SYSLOG_CHROMEPHP_INCLUDEPATH',
'default' => '/usr/share/php', 'default' => DOL_DOCUMENT_ROOT . '/includes/chromephp/',
'attr' => 'size="60"', 'attr' => 'size="60"',
'example' => DOL_DOCUMENT_ROOT.'/includes/chromephp' 'example' =>'/usr/share/php'
) )
); );
} }

BIN
htdocs/includes/tcpdf/fonts/dejavusanscondensed.ctg.z Executable file
View File

Binary file not shown.

BIN
htdocs/includes/tcpdf/fonts/dejavusanscondensed.z Executable file
View File

Binary file not shown.

BIN
htdocs/includes/tcpdf/fonts/dejavusanscondensedb.ctg.z Executable file
View File

Binary file not shown.

BIN
htdocs/includes/tcpdf/fonts/dejavusanscondensedb.z Executable file
View File

Binary file not shown.

BIN
htdocs/includes/tcpdf/fonts/dejavusanscondensedbi.ctg.z Executable file
View File

Binary file not shown.

BIN
htdocs/includes/tcpdf/fonts/dejavusanscondensedbi.z Executable file
View File

Binary file not shown.

BIN
htdocs/includes/tcpdf/fonts/dejavusanscondensedi.ctg.z Executable file
View File

Binary file not shown.

BIN
htdocs/includes/tcpdf/fonts/dejavusanscondensedi.z Executable file
View File

Binary file not shown.

BIN
htdocs/includes/tcpdf/fonts/dejavusansextralight.ctg.z Executable file
View File

Binary file not shown.

BIN
htdocs/includes/tcpdf/fonts/dejavusansextralight.z Executable file
View File

Binary file not shown.

BIN
htdocs/includes/tcpdf/fonts/dejavusansmono.ctg.z Executable file
View File

Binary file not shown.

BIN
htdocs/includes/tcpdf/fonts/dejavusansmono.z Executable file
View File

Binary file not shown.

BIN
htdocs/includes/tcpdf/fonts/dejavusansmonob.ctg.z Executable file
View File

Binary file not shown.

BIN
htdocs/includes/tcpdf/fonts/dejavusansmonob.z Executable file
View File

Binary file not shown.

BIN
htdocs/includes/tcpdf/fonts/dejavusansmonobi.ctg.z Executable file
View File

Binary file not shown.

BIN
htdocs/includes/tcpdf/fonts/dejavusansmonobi.z Executable file
View File

Binary file not shown.

BIN
htdocs/includes/tcpdf/fonts/dejavusansmonoi.ctg.z Executable file
View File

Binary file not shown.

BIN
htdocs/includes/tcpdf/fonts/dejavusansmonoi.z Executable file
View File

Binary file not shown.

4
htdocs/margin/customerMargins.php
View File

@ -50,9 +50,9 @@ $pagenext = $page + 1;
$startdate=$enddate=''; $startdate=$enddate='';
if (!empty($_POST['startdatemonth'])) if (!empty($_POST['startdatemonth']))
$startdate = dol_mktime(12, 0, 0, $_POST['startdatemonth'], $_POST['startdateday'], $_POST['startdateyear']); $startdate = dol_mktime(0, 0, 0, $_POST['startdatemonth'], $_POST['startdateday'], $_POST['startdateyear']);
if (!empty($_POST['enddatemonth'])) if (!empty($_POST['enddatemonth']))
$enddate = dol_mktime(12, 0, 0, $_POST['enddatemonth'], $_POST['enddateday'], $_POST['enddateyear']); $enddate = dol_mktime(23, 59, 59, $_POST['enddatemonth'], $_POST['enddateday'], $_POST['enddateyear']);
/* /*
* View * View

4
htdocs/margin/productMargins.php
View File

@ -72,9 +72,9 @@ $pagenext = $page + 1;
$startdate=$enddate=''; $startdate=$enddate='';
if (!empty($_POST['startdatemonth'])) if (!empty($_POST['startdatemonth']))
$startdate = dol_mktime(12, 0, 0, $_POST['startdatemonth'], $_POST['startdateday'], $_POST['startdateyear']); $startdate = dol_mktime(0, 0, 0, $_POST['startdatemonth'], $_POST['startdateday'], $_POST['startdateyear']);
if (!empty($_POST['enddatemonth'])) if (!empty($_POST['enddatemonth']))
$enddate = dol_mktime(12, 0, 0, $_POST['enddatemonth'], $_POST['enddateday'], $_POST['enddateyear']); $enddate = dol_mktime(23, 59, 59, $_POST['enddatemonth'], $_POST['enddateday'], $_POST['enddateyear']);
/* /*