|
@@ -39,11 +39,11 @@ include_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountancyexport.class.php';
|
|
|
$accountancyexport = new AccountancyExport($db);
|
|
|
|
|
|
// Specific filename for FEC model export into the general ledger
|
|
|
-if ($accountancyexport->getFormatCode($formatexportset) == ($accountancyexport::$EXPORT_TYPE_FEC || $accountancyexport::$EXPORT_TYPE_FEC2)
|
|
|
+if (($accountancyexport->getFormatCode($formatexportset) == 'fec' || $accountancyexport->getFormatCode($formatexportset) == 'fec2')
|
|
|
&& $type_export == "general_ledger") {
|
|
|
// FEC format is defined here: https://www.legifrance.gouv.fr/affichCodeArticle.do?idArticle=LEGIARTI000027804775&cidTexte=LEGITEXT000006069583&dateTexte=20130802&oldAction=rechCodeArticle
|
|
|
if (empty($search_date_end)) {
|
|
|
- // TODO Get the max date into bookeeping table
|
|
|
+ // TODO Get the max date into bookkeeping table
|
|
|
$search_date_end = dol_now();
|
|
|
}
|
|
|
$datetouseforfilename = $search_date_end;
|
|
@@ -60,7 +60,7 @@ if ($accountancyexport->getFormatCode($formatexportset) == ($accountancyexport::
|
|
|
$endaccountingperiod = dol_print_date(dol_get_last_day($tmparray['year'], $tmparray['mon']), 'dayxcard');
|
|
|
|
|
|
$completefilename = $siren."FEC".$endaccountingperiod.".txt";
|
|
|
-} elseif ($accountancyexport->getFormatCode($formatexportset) == $accountancyexport::$EXPORT_TYPE_CIEL && $type_export == "general_ledger" && !empty($conf->global->ACCOUNTING_EXPORT_XIMPORT_FORCE_FILENAME)) {
|
|
|
+} elseif ($accountancyexport->getFormatCode($formatexportset) == 'ciel' && $type_export == "general_ledger" && !empty($conf->global->ACCOUNTING_EXPORT_XIMPORT_FORCE_FILENAME)) {
|
|
|
$completefilename = "XIMPORT.TXT";
|
|
|
} else {
|
|
|
$completefilename = ($code ? $code."_" : "").($prefix ? $prefix."_" : "").$filename.($nodateexport ? "" : $date_export).".".$format;
|