|
@@ -678,7 +678,7 @@ discard block |
|
|
block discarded – undo |
|
678
|
678
|
|
|
679
|
679
|
if ($setfields) { |
|
680
|
680
|
$sql = " UPDATE ".MAIN_DB_PREFIX."accounting_bookkeeping"; |
|
681
|
|
- $sql .= " SET ".$setfields; // $setfields is already a sanitized SQL string |
|
|
681
|
+ $sql .= " SET ".$setfields; // $setfields is already a sanitized SQL string |
|
682
|
682
|
$sql .= " WHERE rowid = ".((int) $movement->id); |
|
683
|
683
|
|
|
684
|
684
|
$result = $db->query($sql); |
|
@@ -718,7 +718,7 @@ discard block |
|
|
block discarded – undo |
|
718
|
718
|
// Ajout directives pour resoudre bug IE |
|
719
|
719
|
header('Cache-Control: Public, must-revalidate'); |
|
720
|
720
|
header('Pragma: public'); |
|
721
|
|
- header('Content-Length: ' . dol_filesize($downloadFilePath)); |
|
|
721
|
+ header('Content-Length: '.dol_filesize($downloadFilePath)); |
|
722
|
722
|
|
|
723
|
723
|
readfileLowMemory($downloadFilePath); |
|
724
|
724
|
} else { |
|
@@ -791,7 +791,7 @@ discard block |
|
|
block discarded – undo |
|
791
|
791
|
$form_question['formatexport'] = array( |
|
792
|
792
|
'name' => 'formatexport', |
|
793
|
793
|
'type' => 'select', |
|
794
|
|
- 'label' => $langs->trans('Modelcsv'), // TODO Use Selectmodelcsv and show a select combo |
|
|
794
|
+ 'label' => $langs->trans('Modelcsv'), // TODO Use Selectmodelcsv and show a select combo |
|
795
|
795
|
'values' => $listofformat, |
|
796
|
796
|
'default' => $formatexportset, |
|
797
|
797
|
'morecss' => 'minwidth200 maxwidth200' |
|
@@ -1317,7 +1317,7 @@ discard block |
|
|
block discarded – undo |
|
1317
|
1317
|
|
|
1318
|
1318
|
$labeltoshow = ''; |
|
1319
|
1319
|
$labeltoshowalt = ''; |
|
1320
|
|
- if (($objectstatic instanceof CommonObject) && in_array($line->doc_type, array('customer_invoice', 'supplier_invoice', 'expense_report'))) { |
|
|
1320
|
+ if (($objectstatic instanceof CommonObject) && in_array($line->doc_type, array('customer_invoice', 'supplier_invoice', 'expense_report'))) { |
|
1321
|
1321
|
if ($objectstatic->id > 0) { |
|
1322
|
1322
|
$labeltoshow .= $objectstatic->getNomUrl(1, '', 0, 0, '', 0, -1, 1); |
|
1323
|
1323
|
$labeltoshow .= $documentlink; |
|
@@ -1329,8 +1329,8 @@ discard block |
|
|
block discarded – undo |
|
1329
|
1329
|
$labeltoshow .= $objectstatic->getNomUrl(1); |
|
1330
|
1330
|
$labeltoshowalt .= $objectstatic->ref; |
|
1331
|
1331
|
$bank_ref = strstr($line->doc_ref, '-'); |
|
1332
|
|
- $labeltoshow .= " " . $bank_ref; |
|
1333
|
|
- $labeltoshowalt .= " " . $bank_ref; |
|
|
1332
|
+ $labeltoshow .= " ".$bank_ref; |
|
|
1333
|
+ $labeltoshowalt .= " ".$bank_ref; |
|
1334
|
1334
|
} else { |
|
1335
|
1335
|
$labeltoshow .= $line->doc_ref; |
|
1336
|
1336
|
$labeltoshowalt .= $line->doc_ref; |