diff --git a/COPYRIGHT b/COPYRIGHT
index bc0a07aa66c..7cc66cff017 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -22,7 +22,7 @@ PHPExcel 1.7.6 LGPL 2.1 Yes Read/Write XLS files, read ODS files
TCPDF 5.9.098 LGPL 3.0 Yes PDF generation
JS libraries:
-jQuery 1.6.4 GPL and MIT Licence Yes JS library
+jQuery 1.7.1 GPL and MIT Licence Yes JS library
jQuery UI 1.8.16 GPL and MIT Licence Yes JS library plugin UI
jQuery Colorpicker 1.1 MIT Licence Yes JS library for color picker for a defined list of colors
jQuery DataTable 1.8.1 BSD Yes JS library for tables output
diff --git a/htdocs/admin/tools/eaccelerator.php b/htdocs/admin/tools/eaccelerator.php
index aa3bbcefc65..e684fe43c54 100644
--- a/htdocs/admin/tools/eaccelerator.php
+++ b/htdocs/admin/tools/eaccelerator.php
@@ -85,7 +85,7 @@ function compare($x, $y)
/**
* Compare revisions
- *
+ *
* @param array $x Parts of version 1
* @param array $y Parts of version 2
* @return int 1 if 1<2, 0 if 1=2, -1 if 1>2
@@ -104,7 +104,7 @@ function revcompare($x, $y)
/**
* Output table
- *
+ *
* @param array $list Array of records
* @return void
*/
@@ -179,7 +179,7 @@ function create_script_table($list)
/**
* Output table
- *
+ *
* @param array $list Array of records
* @return void
*/
@@ -346,11 +346,9 @@ if (function_exists('eaccelerator_get'))
}
print "
";
-print "
| ';
-print 'Eaccelerator is created by the eAccelerator team, http://eaccelerator.net '; -print " |
| ';
if ($mesg) { print $mesg; }
else {
- print ' \n"; print ' '; @@ -183,7 +164,8 @@ if ($year) print ' |
| '.$langs->trans("Ref").' | '; - print $form->showrefnav($facture,'facid','',1,'rowid','ref',$morehtmlref); - print ' | '; - print "|||
| '.$langs->trans("Ref").' | '; + print $form->showrefnav($object,'facid','',1,'rowid','ref',$morehtmlref); + print ' | '; + print "|||
| '.$langs->trans("RefSupplier").' | '.$facture->ref_supplier.' | '; - print "|||
| '.$langs->trans("RefSupplier").' | '.$object->ref_supplier.' | '; + print "|||
| '.$langs->trans('Supplier').' | '.$facture->thirdparty->getNomUrl(1).' | |||
| '.$langs->trans('Supplier').' | '.$object->thirdparty->getNomUrl(1).' | |||
| '.$langs->trans('NbOfAttachedFiles').' | '.count($filearray).' | |||
| '.$langs->trans('Type').' | '; + print $object->getLibType(); + if ($object->type == 1) + { + $facreplaced=new FactureFournisseur($db); + $facreplaced->fetch($object->fk_facture_source); + print ' ('.$langs->transnoentities("ReplaceInvoice",$facreplaced->getNomUrl(1)).')'; + } + if ($object->type == 2) + { + $facusing=new FactureFournisseur($db); + $facusing->fetch($object->fk_facture_source); + print ' ('.$langs->transnoentities("CorrectInvoice",$facusing->getNomUrl(1)).')'; + } - print ' | |||
| '.$langs->trans('TotalSizeOfAttachedFiles').' | '.$totalsize.' '.$langs->trans('bytes').' | |||