diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php index 8499c5d0bf0..895162cadd2 100644 --- a/htdocs/core/menus/standard/eldy.lib.php +++ b/htdocs/core/menus/standard/eldy.lib.php @@ -1369,16 +1369,11 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM // Intracomm report if (! empty($conf->intracommreport->enabled)) { - $newmenu->add("/intracommreport/export.php?leftmenu=intracommreport", $langs->trans("MenuDeclaration"), 0, $user->rights->intracommreport->read, '', $mainmenu, 'intracommreport', 1); + $newmenu->add("/intracommreport/list.php?leftmenu=intracommreport", $langs->trans("MenuDeclaration"), 0, $user->rights->intracommreport->read, '', $mainmenu, 'intracommreport', 1); if ($usemenuhider || empty($leftmenu) || preg_match('/intracommreport/', $leftmenu)) { - // DEB - $newmenu->add("/intracommreport/export.php?leftmenu=intracommreport", $langs->trans("MenuDeclarationDEB"), 1, $user->rights->intracommreport->read, '', $mainmenu, 'intracommreportDEB', 1); - $newmenu->add("/intracommreport/export.php?leftmenu=intracommreportDEB", $langs->trans("MenuDeclarationDEBNew"), 2, $user->rights->intracommreport->write, '', $mainmenu, 'intracommreport', 1); - $newmenu->add("/intracommreport/export.php?action=list&leftmenu=intracommreportDEB", $langs->trans("MenuDeclarationDEBList"), 2, $user->rights->intracommreport->read, '', $mainmenu, 'intracommreport', 1); - // DES - $newmenu->add("/intracommreport/export.php?exporttype=des&leftmenu=intracommreport", $langs->trans("MenuDeclarationDES"), 1, $user->rights->intracommreport->read, '', $mainmenu, 'intracommreportDES', 1); - $newmenu->add("/intracommreport/export.php?exporttype=des&leftmenu=intracommreportDES", $langs->trans("MenuDeclarationDESNew"), 2, $user->rights->intracommreport->write, '', $mainmenu, 'intracommreport', 1); - $newmenu->add("/intracommreport/export.php?exporttype=des&action=list&leftmenu=intracommreportDES", $langs->trans("MenuDeclarationDESList"), 2, $user->rights->intracommreport->read, '', $mainmenu, 'intracommreport', 1); + // DEB / DES + $newmenu->add("/intracommreport/card.php?action=create&leftmenu=intracommreport", $langs->trans("MenuDeclarationNew"), 1, $user->rights->intracommreport->write, '', $mainmenu, 'intracommreport', 1); + $newmenu->add("/intracommreport/list.php?leftmenu=intracommreport", $langs->trans("MenuDeclarationList"), 1, $user->rights->intracommreport->read, '', $mainmenu, 'intracommreport', 1); } } diff --git a/htdocs/intracommreport/export.php b/htdocs/intracommreport/card.php similarity index 77% rename from htdocs/intracommreport/export.php rename to htdocs/intracommreport/card.php index 4a5e2fc073a..7a5914c3044 100644 --- a/htdocs/intracommreport/export.php +++ b/htdocs/intracommreport/card.php @@ -37,6 +37,58 @@ $year = GETPOST('year'); $month = GETPOST('month'); $type_declaration = GETPOST('type'); +// Mode creation +if ($action == 'create') +{ + $title = $langs->trans("IntracommReportDEBTitle"); + llxHeader("", $title); + print load_fiche_titre($langs->trans("IntracommReportDEBTitle")); + + print '
'; +} + +/* switch($action) { case 'generateXML': $obj = new TDebProdouane($PDOdb); @@ -55,59 +107,6 @@ switch($action) { break; } - - -function _print_form_deb() { - - global $langs, $form, $formother, $year, $month, $type, $type_declaration; - - $title = $langs->trans("IntracommReportDEBTitle"); - llxHeader("", $title); - print load_fiche_titre($langs->trans("IntracommReportDEBTitle")); - - dol_fiche_head(); - - print ''; - -} - function _print_form_des() { global $langs, $formother, $year, $month, $type_declaration; @@ -184,5 +183,6 @@ function _export_xml_des($type_declaration, $period_year, $period_month) { } else setEventMessage($obj->errors, 'warnings'); } +*/ llxFooter(); diff --git a/htdocs/langs/en_US/intracommreport.lang b/htdocs/langs/en_US/intracommreport.lang index eed5981f4b9..42c3f175c14 100644 --- a/htdocs/langs/en_US/intracommreport.lang +++ b/htdocs/langs/en_US/intracommreport.lang @@ -15,14 +15,14 @@ INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant #Menu MenuDeclaration=Export Pro-Douane -MenuDeclarationDEB=Export DEB -MenuDeclarationDEBNew=Nouvelle déclaration -MenuDeclarationDEBList=Liste des déclarations -MenuDeclarationDES=Export DES -MenuDeclarationDESNew=Nouvelle déclaration -MenuDeclarationDESList=Liste des déclarations +MenuDeclarationNew=Nouvelle déclaration +MenuDeclarationList=Liste -#page d'export +# View +AnalysisPeriod=Analysis period +TypeOfDeclaration=Type of declaration + +#Page d'export IntracommReportDEBTitle=Export d'un fichier XML au format ProDouane - DEB IntracommReportDESTitle=Export d'un fichier XML au format ProDouane - DES