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

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2018-10-06 12:48:40 +02:00
commit dc0489cdcf
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/compta/facture/class/facture.class.php
View File

@ -1213,7 +1213,7 @@ class Facture extends CommonInvoice
if (! empty($this->total_tva)) if (! empty($this->total_tva))
$label.= '<br><b>' . $langs->trans('VAT') . ':</b> ' . price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency); $label.= '<br><b>' . $langs->trans('VAT') . ':</b> ' . price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency);
if (! empty($this->total_localtax1) && $this->total_localtax1 != 0) // We keep test != 0 because $this->total_localtax1 can be '0.00000000' if (! empty($this->total_localtax1) && $this->total_localtax1 != 0) // We keep test != 0 because $this->total_localtax1 can be '0.00000000'
$label.= '<br><b>eee' . $langs->trans('LT1') . ':</b> ' . price($this->total_localtax1, 0, $langs, 0, -1, -1, $conf->currency); $label.= '<br><b>' . $langs->trans('LT1') . ':</b> ' . price($this->total_localtax1, 0, $langs, 0, -1, -1, $conf->currency);
if (! empty($this->total_localtax2) && $this->total_localtax2 != 0) if (! empty($this->total_localtax2) && $this->total_localtax2 != 0)
$label.= '<br><b>' . $langs->trans('LT2') . ':</b> ' . price($this->total_localtax2, 0, $langs, 0, -1, -1, $conf->currency); $label.= '<br><b>' . $langs->trans('LT2') . ':</b> ' . price($this->total_localtax2, 0, $langs, 0, -1, -1, $conf->currency);
if (! empty($this->total_ttc)) if (! empty($this->total_ttc))

2
htdocs/core/class/notify.class.php
View File

@ -742,6 +742,4 @@ class Notify
if (! $error) return $num; if (! $error) return $num;
else return -1 * $error; else return -1 * $error;
} }
} }

6
htdocs/core/class/utils.class.php
View File

@ -410,13 +410,13 @@ class Utils
if ($compression == 'gz' or $compression == 'bz') if ($compression == 'gz' or $compression == 'bz')
{ {
$this->backup_tables($outputfiletemp); $this->backupTables($outputfiletemp);
dol_compress_file($outputfiletemp, $outputfile, $compression); dol_compress_file($outputfiletemp, $outputfile, $compression);
unlink($outputfiletemp); unlink($outputfiletemp);
} }
else else
{ {
$this->backup_tables($outputfile); $this->backupTables($outputfile);
} }
$this->output = ""; $this->output = "";
@ -836,7 +836,7 @@ class Utils
* @param string $tables Table name or '*' for all * @param string $tables Table name or '*' for all
* @return int <0 if KO, >0 if OK * @return int <0 if KO, >0 if OK
*/ */
function backup_tables($outputfile, $tables='*') function backupTables($outputfile, $tables='*')
{ {
global $db, $langs; global $db, $langs;
global $errormsg; global $errormsg;