@@ -415,7 +415,7 @@ |
||
| 415 | 415 | if (!empty($conf->banque->enabled)) { |
| 416 | 416 | print '<tr><td>'; |
| 417 | 417 | print $form->editfieldkey('BankAccount', 'selectaccountid', '', $object, 0, 'string', '', 1).'</td><td>'; |
| 418 | - print img_picto('', 'bank_account', 'class="pictofixedwidth"').$form->select_comptes($accountid, "accountid", 0, '', 2, '', 0, '', 1); // Affiche liste des comptes courant |
|
| 418 | + print img_picto('', 'bank_account', 'class="pictofixedwidth"').$form->select_comptes($accountid, "accountid", 0, '', 2, '', 0, '', 1); // Affiche liste des comptes courant |
|
| 419 | 419 | print '</td></tr>'; |
| 420 | 420 | } |
| 421 | 421 | |
@@ -1804,7 +1804,7 @@ discard block |
||
| 1804 | 1804 | if (isset($object->table_element)) { |
| 1805 | 1805 | $ecmfile->src_object_type = $object->table_element; |
| 1806 | 1806 | } else { |
| 1807 | - dol_syslog('Error: object ' . get_class($object) . ' has no table_element attribute.'); |
|
| 1807 | + dol_syslog('Error: object '.get_class($object).' has no table_element attribute.'); |
|
| 1808 | 1808 | return -1; |
| 1809 | 1809 | } |
| 1810 | 1810 | if (isset($object->src_object_description)) $ecmfile->description = $object->src_object_description; |
@@ -2004,9 +2004,9 @@ discard block |
||
| 2004 | 2004 | // Skip directories (they would be added automatically) |
| 2005 | 2005 | if (!$file->isDir()) { |
| 2006 | 2006 | // Get real and relative path for current file |
| 2007 | - $filePath = $file->getPath(); // the full path with filename using the $inputdir root. |
|
| 2007 | + $filePath = $file->getPath(); // the full path with filename using the $inputdir root. |
|
| 2008 | 2008 | $fileName = $file->getFilename(); |
| 2009 | - $fileFullRealPath = $file->getRealPath(); // the full path with name and transformed to use real path directory. |
|
| 2009 | + $fileFullRealPath = $file->getRealPath(); // the full path with name and transformed to use real path directory. |
|
| 2010 | 2010 | |
| 2011 | 2011 | //$relativePath = substr($fileFullRealPath, strlen($rootPath) + 1); |
| 2012 | 2012 | $relativePath = substr(($filePath ? $filePath.'/' : '').$fileName, strlen($rootPath) + 1); |
@@ -2212,9 +2212,9 @@ discard block |
||
| 2212 | 2212 | // Skip directories (they would be added automatically) |
| 2213 | 2213 | if (!$file->isDir()) { |
| 2214 | 2214 | // Get real and relative path for current file |
| 2215 | - $filePath = $file->getPath(); // the full path with filename using the $inputdir root. |
|
| 2215 | + $filePath = $file->getPath(); // the full path with filename using the $inputdir root. |
|
| 2216 | 2216 | $fileName = $file->getFilename(); |
| 2217 | - $fileFullRealPath = $file->getRealPath(); // the full path with name and transformed to use real path directory. |
|
| 2217 | + $fileFullRealPath = $file->getRealPath(); // the full path with name and transformed to use real path directory. |
|
| 2218 | 2218 | |
| 2219 | 2219 | //$relativePath = ($rootdirinzip ? $rootdirinzip.'/' : '').substr($fileFullRealPath, strlen($inputdir) + 1); |
| 2220 | 2220 | $relativePath = ($rootdirinzip ? $rootdirinzip.'/' : '').substr(($filePath ? $filePath.'/' : '').$fileName, strlen($inputdir) + 1); |