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

Merge remote-tracking branch 'origin/3.6' into 3.7

Browse Source 
Conflicts:
	htdocs/compta/index.php
This commit is contained in:
Laurent Destailleur 2015-09-03 10:44:40 +02:00
commit d64a87d980
22 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
htdocs/compta/index.php
View File

@ -1,7 +1,8 @@
<?php
/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2013 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2013 Laurent Destailleur <eldy@users.sourceforge.net>
* 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
* 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->paye=$obj->paye;
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->sumpaid).'</td>';
print '<td align="center">'.$chargestatic->getLibStatut(3).'</td>';
@ -915,8 +916,8 @@ if ($resql)
$obj = $db->fetch_object($resql);
$var=!$var;
print "<tr ".$bc[$var]."><td>".dol_print_date($obj->da,"day")."</td>";
print "<td><a href=\"action/card.php\">$obj->libelle $obj->label</a></td></tr>";
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>";
$i++;
}
$db->free($resql);

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

@ -136,7 +136,6 @@ class box_prospect extends ModeleBoxes
}
}
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"',
'text' => $langs->trans("ReadPermissionNotAllowed"));
}

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='';
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']))
$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

4
htdocs/margin/productMargins.php
View File

@ -72,9 +72,9 @@ $pagenext = $page + 1;
$startdate=$enddate='';
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']))
$enddate = dol_mktime(12, 0, 0, $_POST['enddatemonth'], $_POST['enddateday'], $_POST['enddateyear']);
$enddate = dol_mktime(23, 59, 59, $_POST['enddatemonth'], $_POST['enddateday'], $_POST['enddateyear']);
/*