|
@@ -5,7 +5,7 @@
|
|
|
* Copyright (C) 2014 Marcos García <marcosgdf@gmail.com>
|
|
|
* Copyright (C) 2014 Juanjo Menent <jmenent@2byte.es>
|
|
|
* Copyright (C) 2015 Jean-François Ferry <jfefe@aternatik.fr>
|
|
|
- * Copyright (C) 2017 Frédéric France <frederic.france@netlogic.fr>
|
|
|
+ * Copyright (C) 2017-2018 Frédéric France <frederic.france@netlogic.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
|
|
@@ -50,11 +50,11 @@ $main_option = array (
|
|
|
|
|
|
$configuration = AccountancyExport::getTypeConfig();
|
|
|
|
|
|
-$listparam = $configuration[param];
|
|
|
+$listparam = $configuration['param'];
|
|
|
|
|
|
-$listformat = $configuration[format];
|
|
|
+$listformat = $configuration['format'];
|
|
|
|
|
|
-$listcr = $configuration[cr];
|
|
|
+$listcr = $configuration['cr'];
|
|
|
|
|
|
|
|
|
$model_option = array (
|
|
@@ -117,7 +117,7 @@ if ($action == 'update') {
|
|
|
if (! $error) {
|
|
|
// reload
|
|
|
$configuration = AccountancyExport::getTypeConfig();
|
|
|
- $listparam = $configuration[param];
|
|
|
+ $listparam = $configuration['param'];
|
|
|
setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
|
|
|
} else {
|
|
|
setEventMessages($langs->trans("Error"), null, 'errors');
|
|
@@ -142,27 +142,27 @@ print ' {'."\n";
|
|
|
foreach ($listparam as $key => $param) {
|
|
|
print ' if (jQuery("#ACCOUNTING_EXPORT_MODELCSV").val()=="'.$key.'")'."\n";
|
|
|
print ' {'."\n";
|
|
|
- print ' //console.log("'.$param[label].'");'."\n";
|
|
|
- if (empty($param[ACCOUNTING_EXPORT_FORMAT])) {
|
|
|
+ print ' //console.log("'.$param['label'].'");'."\n";
|
|
|
+ if (empty($param['ACCOUNTING_EXPORT_FORMAT'])) {
|
|
|
print ' jQuery("#ACCOUNTING_EXPORT_FORMAT").val("'.$conf->global->ACCOUNTING_EXPORT_FORMAT.'");'."\n";
|
|
|
print ' jQuery("#ACCOUNTING_EXPORT_FORMAT").prop("disabled", true);'."\n";
|
|
|
} else {
|
|
|
- print ' jQuery("#ACCOUNTING_EXPORT_FORMAT").val("'.$param[ACCOUNTING_EXPORT_FORMAT].'");'."\n";
|
|
|
+ print ' jQuery("#ACCOUNTING_EXPORT_FORMAT").val("'.$param['ACCOUNTING_EXPORT_FORMAT'].'");'."\n";
|
|
|
print ' jQuery("#ACCOUNTING_EXPORT_FORMAT").removeAttr("disabled");'."\n";
|
|
|
}
|
|
|
- if (empty($param[ACCOUNTING_EXPORT_SEPARATORCSV])) {
|
|
|
+ if (empty($param['ACCOUNTING_EXPORT_SEPARATORCSV'])) {
|
|
|
print ' jQuery("#ACCOUNTING_EXPORT_SEPARATORCSV").val("");'."\n";
|
|
|
print ' jQuery("#ACCOUNTING_EXPORT_SEPARATORCSV").prop("disabled", true);'."\n";
|
|
|
} else {
|
|
|
print ' jQuery("#ACCOUNTING_EXPORT_SEPARATORCSV").val("'.$conf->global->ACCOUNTING_EXPORT_SEPARATORCSV.'");'."\n";
|
|
|
print ' jQuery("#ACCOUNTING_EXPORT_SEPARATORCSV").removeAttr("disabled");'."\n";
|
|
|
}
|
|
|
- if (empty($param[ACCOUNTING_EXPORT_ENDLINE])) {
|
|
|
+ if (empty($param['ACCOUNTING_EXPORT_ENDLINE'])) {
|
|
|
print ' jQuery("#ACCOUNTING_EXPORT_ENDLINE").prop("disabled", true);'."\n";
|
|
|
} else {
|
|
|
print ' jQuery("#ACCOUNTING_EXPORT_ENDLINE").removeAttr("disabled");'."\n";
|
|
|
}
|
|
|
- if (empty($param[ACCOUNTING_EXPORT_DATE])) {
|
|
|
+ if (empty($param['ACCOUNTING_EXPORT_DATE'])) {
|
|
|
print ' jQuery("#ACCOUNTING_EXPORT_DATE").val("");'."\n";
|
|
|
print ' jQuery("#ACCOUNTING_EXPORT_DATE").prop("disabled", true);'."\n";
|
|
|
} else {
|
|
@@ -257,15 +257,15 @@ if ($num2) {
|
|
|
print '<tr class="oddeven value">';
|
|
|
|
|
|
// Param
|
|
|
- $label = $key[label];
|
|
|
+ $label = $key['label'];
|
|
|
print '<td width="50%">' . $langs->trans($label) . '</td>';
|
|
|
|
|
|
// Value
|
|
|
print '<td>';
|
|
|
- if (is_array($key[param])) {
|
|
|
- print $form->selectarray($label, $key[param], $conf->global->$label, 0);
|
|
|
+ if (is_array($key['param'])) {
|
|
|
+ print $form->selectarray($label, $key['param'], $conf->global->$label, 0);
|
|
|
} else {
|
|
|
- print '<input type="text" size="20" id="'. $label .'" name="' . $key[label] . '" value="' . $conf->global->$label . '">';
|
|
|
+ print '<input type="text" size="20" id="'. $label .'" name="' . $key['label'] . '" value="' . $conf->global->$label . '">';
|
|
|
}
|
|
|
|
|
|
print '</td></tr>';
|