WIP Admin

2019-05-20 13:33:54 +02:00 · 2019-05-20 13:33:54 +02:00 · a239e0e81f
commit a239e0e81f
parent 16093231c6
7 changed files with 145 additions and 108 deletions
--- a/build/rpm/dolibarr_fedora.spec
+++ b/build/rpm/dolibarr_fedora.spec
@ -194,6 +194,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/imports
 %_datadir/dolibarr/htdocs/includes
 %_datadir/dolibarr/htdocs/install
+%_datadir/dolibarr/htdocs/intracommreport
 %_datadir/dolibarr/htdocs/langs/HOWTO-Translation.txt
 %_datadir/dolibarr/htdocs/livraison
 %_datadir/dolibarr/htdocs/loan
--- a/build/rpm/dolibarr_generic.spec
+++ b/build/rpm/dolibarr_generic.spec
@ -274,6 +274,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/imports
 %_datadir/dolibarr/htdocs/includes
 %_datadir/dolibarr/htdocs/install
+%_datadir/dolibarr/htdocs/intracommreport
 %_datadir/dolibarr/htdocs/langs/HOWTO-Translation.txt
 %_datadir/dolibarr/htdocs/livraison
 %_datadir/dolibarr/htdocs/loan
--- a/build/rpm/dolibarr_mandriva.spec
+++ b/build/rpm/dolibarr_mandriva.spec
@ -191,6 +191,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/imports
 %_datadir/dolibarr/htdocs/includes
 %_datadir/dolibarr/htdocs/install
+%_datadir/dolibarr/htdocs/intracommreport
 %_datadir/dolibarr/htdocs/langs/HOWTO-Translation.txt
 %_datadir/dolibarr/htdocs/livraison
 %_datadir/dolibarr/htdocs/loan
--- a/build/rpm/dolibarr_opensuse.spec
+++ b/build/rpm/dolibarr_opensuse.spec
@ -202,6 +202,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/imports
 %_datadir/dolibarr/htdocs/includes
 %_datadir/dolibarr/htdocs/install
+%_datadir/dolibarr/htdocs/intracommreport
 %_datadir/dolibarr/htdocs/langs/HOWTO-Translation.txt
 %_datadir/dolibarr/htdocs/livraison
 %_datadir/dolibarr/htdocs/loan
--- a/htdocs/core/modules/modIntracommreport.class.php
+++ b/htdocs/core/modules/modIntracommreport.class.php
@ -59,7 +59,7 @@ class modIntracommreport extends DolibarrModules
        $this->dirs = array('/intracommreport/temp');

        // Config pages
-        $this->config_page_url = array("intracommreport.php");
+        $this->config_page_url = array("intracommreport.php@intracommreport");

 		// Dependencies
 		$this->depends = array("modFacture","modTax");  // List of modules id that must be enabled if this module is enabled
@ -201,46 +201,4 @@ class modIntracommreport extends DolibarrModules
 		$r=1;

 	}
-
-	/**
-	 *		Function called when module is enabled.
-	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-	 *		It also creates data directories
-	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-	 */
-	function init($options='')
-	{
-		global $db;
-		
-		$sql = array();
-		
-		define('INC_FROM_DOLIBARR',true);
-
-		dol_include_once('/intracommreport/config.php');
-		dol_include_once('/intracommreport/script/create-maj-base.php');
-
-		$result=$this->_load_tables('/intracommreport/sql/');
-		
-		$TModesTransport = array(
-							'options'=>array(
-								1=>'Transport maritime (y compris camions ou wagons sur bateau)'
-								,2=>'Transport par chemin de fer (y compris camions sur wagon)'
-								,3=>'Transport par route'
-								,4=>'Transport par air'
-								,5=>'Envois postaux'
-								,7=>'Installations de transport fixe (oléoduc)'
-								,8=>'Transport par navigation intérieure'
-								,9=>'Propulsion propre'
-								)
-							);
-		
-		$e = new ExtraFields($db);
-		$e->addExtraField('mode_transport', 'Mode de transport', 'select', '', '', 'facture', 0, 0, '', $TModesTransport);
-		$e->addExtraField('mode_transport', 'Mode de transport', 'select', '', '', 'facture_fourn', 0, 0, '', $TModesTransport);
-		
-		return $this->_init($sql, $options);
-	}
-
 }
--- a/htdocs/intracommreport/admin/intracommreport.php
+++ b/htdocs/intracommreport/admin/intracommreport.php
@ -32,16 +32,54 @@ $langs->loadLangs(array("admin","intracommreport"));

 if (! $user->admin) accessforbidden();

-$action=__get('action','');
+$action = GETPOST('action', 'aZ09');

-if($action=='save') {
-	
-	foreach($_REQUEST['TParamProDeb'] as $name=>$param) {
-		
-		dolibarr_set_const($db, $name, $param);
+// Parameters ACCOUNTING_* and others
+$list_DEB = array (
+    'INTRACOMMREPORT_NUM_AGREMENT',
+);

-	}
-	
+$list_DES = array (
+    'INTRACOMMREPORT_NUM_DECLARATION',
+);
+
+if ($action == 'update') {
+    $error = 0;
+
+    if (! $error)
+    {
+        foreach ($list_DEB as $constname)
+        {
+            $constvalue = GETPOST($constname, 'alpha');
+
+            if (! dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) {
+                $error++;
+            }
+        }
+
+        foreach ($list_DES as $constname)
+        {
+            $constvalue = GETPOST($constname, 'alpha');
+
+            if (! dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) {
+                $error++;
+            }
+        }
+
+        dolibarr_set_const($db, "INTRACOMMREPORT_TYPE_ACTEUR", GETPOST("INTRACOMMREPORT_TYPE_ACTEUR", 'alpha'), 'chaine', 0, '', $conf->entity);
+        dolibarr_set_const($db, "INTRACOMMREPORT_ROLE_ACTEUR", GETPOST("INTRACOMMREPORT_ROLE_ACTEUR", 'alpha'), 'chaine', 0, '', $conf->entity);
+        dolibarr_set_const($db, "INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION", GETPOST("INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION", 'alpha'), 'chaine', 0, '', $conf->entity);
+        dolibarr_set_const($db, "INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION", GETPOST("INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION", 'alpha'), 'chaine', 0, '', $conf->entity);
+        dolibarr_set_const($db, "INTRACOMMREPORT_CATEG_FRAISDEPORT", GETPOST("INTRACOMMREPORT_CATEG_FRAISDEPORT", 'alpha'), 'chaine', 0, '', $conf->entity);
+
+        if ($error) {
+            setEventMessages($langs->trans("Error"), null, 'errors');
+        }
+    }
+
+    if (! $error) {
+        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+    }
 }

 /*
@ -51,7 +89,7 @@ if($action=='save') {
 $form=new Form($db);
 $formother=new FormOther($db);

-llxHeader('', $langs->trans(IntracommReportSetup));
+llxHeader('', $langs->trans("IntracommReportSetup"));

 $linkback = '<a href="' . DOL_URL_ROOT . '/admin/modules.php?restore_lastsearch_values=1">' . $langs->trans("BackToModuleList") . '</a>';
 print load_fiche_titre($langs->trans("IntracommReportSetup"), $linkback, 'title_setup');
@ -60,9 +98,9 @@ $head = intracommReportAdminPrepareHead();

 dol_fiche_head($head, 'general', $langs->trans("IntracommReport"), 0, "intracommreport");

-print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<input type="hidden" name="action" value="save">';
+print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post">';
+print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
+print '<input type="hidden" name="action" value="update">';

 print '<td>'.$langs->trans("Parameters").' (DEB)</td>'."\n";
 print '<table class="noborder" width="100%">';
@ -71,76 +109,85 @@ print '<td>'.$langs->trans("Description").'</td>';
 print '<td>'.$langs->trans("Value").'</td>';
 print '</tr>';

-print '<tr class="oddeven">';
-print '<td>'.$langs->trans("INTRACOMMREPORT_NUM_AGREMENT").'</td>';
-print '<td class="center" width="20">&nbsp;</td>';
-print '<td class="right" width="300">';
-print $atmForm->texte('','TParamProDeb[INTRACOMMREPORT_NUM_AGREMENT]',$conf->global->INTRACOMMREPORT_NUM_AGREMENT,30,255);
-print '</td></tr>';
+foreach ($list_DEB as $key)
+{
+    print '<tr class="oddeven value">';
+
+    // Param
+    $label = $langs->trans($key);
+    print '<td>'.$label.'</td>';
+    // Value
+    print '<td class="left">';
+    print '<input type="text" class="maxwidth100" id="' . $key . '" name="' . $key . '" value="' . $conf->global->$key . '">';
+    print '</td>';
+
+    print '</tr>';
+}

 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("INTRACOMMREPORT_TYPE_ACTEUR").'</td>';
-print '<td class="center" width="20">&nbsp;</td>';
-print '<td class="right" width="300">';
-print $atmForm->combo('','TParamProDeb[INTRACOMMREPORT_TYPE_ACTEUR]', array(''=>'', 'PSI'=>'Déclarant pour son compte', 'TDP'=>'Tiers déclarant'), $conf->global->INTRACOMMREPORT_TYPE_ACTEUR);
-print '</td></tr>';
+$arraychoices=array(''=>$langs->trans("None"), 'PSI'=>'Déclarant pour son compte', 'TDP'=>'Tiers déclarant');
+print '<td>';
+print $form->selectarray('INTRACOMMREPORT_TYPE_ACTEUR', $arraychoices, $conf->global->INTRACOMMREPORT_TYPE_ACTEUR, 0);
+print '</td>';
+print "</tr>\n";

 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("INTRACOMMREPORT_ROLE_ACTEUR").'</td>';
-print '<td class="center" width="20">&nbsp;</td>';
-print '<td class="right" width="300">';
-print $atmForm->combo('','TParamProDeb[INTRACOMMREPORT_ROLE_ACTEUR]', array(''=>'', 'sender'=>'Emetteur', 'PSI'=>'Déclarant'), $conf->global->INTRACOMMREPORT_ROLE_ACTEUR);
-print '</td></tr>';
+$arraychoices=array(''=>$langs->trans("None"), 'sender'=>'Emetteur', 'PSI'=>'Déclarant');
+print '<td>';
+print $form->selectarray('INTRACOMMREPORT_ROLE_ACTEUR', $arraychoices, $conf->global->INTRACOMMREPORT_ROLE_ACTEUR, 0);
+print '</td>';
+print "</tr>\n";

 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION").'</td>';
-print '<td class="center" width="20">&nbsp;</td>';
-print '<td class="right" width="300">';
-print $atmForm->combo('','TParamProDeb[INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION]', array(0=>'', 1=>'Seuil de 460 000 €', 2=>'En dessous de 460 000 €'), $conf->global->INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION);
-print '</td></tr>';
+$arraychoices=array(1=>'Seuil de 460 000 €', 2=>'En dessous de 460 000 €');
+print '<td>';
+print $form->selectarray('INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION', $arraychoices, $conf->global->INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION, 0);
+print '</td>';
+print "</tr>\n";

 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION").'</td>';
-print '<td class="center" width="20">&nbsp;</td>';
-print '<td class="right" width="300">';
-print $atmForm->combo('','TParamProDeb[INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION]', array(0=>'', 3=>'Seuil de 460 000 €', 4=>'En dessous de 460 000 €'), $conf->global->INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION);
-print '</td></tr>';
+$arraychoices=array(3=>'Seuil de 460 000 €', 4=>'En dessous de 460 000 €');
+print '<td>';
+print $form->selectarray('INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION', $arraychoices, $conf->global->INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION, 0);
+print '</td>';
+print "</tr>\n";

 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("INTRACOMMREPORT_CATEG_FRAISDEPORT").'</td>';
-print '<td class="center" width="20">&nbsp;</td>';
-print '<td class="right" width="300">';
-print $formother->select_categories(0, $conf->global->INTRACOMMREPORT_CATEG_FRAISDEPORT, 'TParamProDeb[INTRACOMMREPORT_CATEG_FRAISDEPORT]');
-print '</td></tr>';
+$arraychoices=array(3=>'Seuil de 460 000 €', 4=>'En dessous de 460 000 €');
+print '<td>';
+print $formother->select_categories(0, $conf->global->INTRACOMMREPORT_CATEG_FRAISDEPORT, 'INTRACOMMREPORT_CATEG_FRAISDEPORT');
+print '</td>';
+print "</tr>\n";

 print '</table>';

-print '<div class="tabsAction">';
-print '<div class="inline-block divButAction">';
-print '<input type="submit" name="bt_save" class="butAction" value="'.$langs->trans('Save').'" />';
-print '</div>';
-print '</div>';
-
-print '</form>';
-	
-print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<input type="hidden" name="action" value="save">';
-
+print '<td>'.$langs->trans("Parameters").' (DES)</td>'."\n";
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
-print '<td>'.$langs->trans("Parameters").' (DES)</td>'."\n";
-print '<td class="center" width="20">&nbsp;</td>';
-print '<td class="center" width="100">'.$langs->trans("Value").'</td>'."\n";
+print '<td>'.$langs->trans("Description").'</td>';
+print '<td>'.$langs->trans("Value").'</td>';
 print '</tr>';

-print '<tr class="oddeven">';
-print '<td>'.$langs->trans("EXPORT_PRO_DES_NUM_DECLARATION").'</td>';
-print '<td class="center" width="20">&nbsp;</td>';
-print '<td class="right" width="300">';
-print $atmForm->texte('','TParamProDeb[EXPORT_PRO_DES_NUM_DECLARATION]',$conf->global->EXPORT_PRO_DES_NUM_DECLARATION,30,255);
-print '</td></tr>';
-	
+foreach ($list_DES as $key)
+{
+    print '<tr class="oddeven value">';
+
+    // Param
+    $label = $langs->trans($key);
+    print '<td>'.$label.'</td>';
+    // Value
+    print '<td class="left">';
+    print '<input type="text" class="maxwidth100" id="' . $key . '" name="' . $key . '" value="' . $conf->global->$key . '">';
+    print '</td>';
+
+    print '</tr>';
+}
+
 print '</table>';

 print '<div class="tabsAction">';
--- a/htdocs/langs/en_US/intracommreport.lang
+++ b/htdocs/langs/en_US/intracommreport.lang
@ -1,7 +1,35 @@
-Module104994Name = intracommreport
-Module104994Desc = intracommreport Descripion
+Module68000Name = Intracomm report
+Module68000Desc = Intracomm report management (Support for French DEB/DES format)
+IntracommReportSetup = Intracommreport module setup
+IntracommReportAbout = About intracommreport

-ATMAbout = This module has been developed by <a href="http://www.atm-consulting.fr" target="_blank">ATM Consulting</a><br>You can find the documentation on our <a href="http://wiki.atm-consulting.fr/index.php/Accueil" target="_blank">wiki</a><br><br>For any question or feedback, contact us on <a href="mailto:support@atm-consulting.fr">support@atm-consulting.fr</a><br><br>For any commercial question, contact us on <a href="mailto:contact@atm-consulting.fr">contact@atm-consulting.fr</a> or at +33 9 77 19 50 70<br><br>Find our other modules on <a href="http://www.dolistore.com/search.php?orderby=position&orderway=desc&search_query=atm&submit_search=Rechercher" target="_blank">Dolistore</a>
+#Conf
+INTRACOMMREPORT_NUM_AGREMENT=Numéro d'agrément (délivré par le CISD de rattachement)
+INTRACOMMREPORT_TYPE_ACTEUR=Type d'acteur
+INTRACOMMREPORT_ROLE_ACTEUR=Rôle joué par l'acteur
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'oligation sur les introductions
+INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Niveau d'obligation sur les expéditions
+INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégorie de services de type "Frais de port"

-intracommreportSetup = intracommreport module setup
-intracommreportAbout = About intracommreport
+INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
+
+#Menu
+exportprodebDouane=Export Pro-Douane
+exportprodebDEB=Export DEB
+exportprodebNew=Nouvelle déclaration
+exportprodebList=Liste des déclarations
+exportprodebDES=Export DES
+exportprodesNew=Nouvelle déclaration
+exportprodesList=Liste des déclarations
+
+#page d'export
+exportprodebTitle=Export d'un fichier XML au format ProDouane - DEB
+exportprodesTitle=Export d'un fichier XML au format ProDouane - DES
+
+#Liste
+exportprodebListdeb=Liste des déclarations générées (DEB)
+exportprodebListdes=Liste des déclarations générées (DES)
+exportprodebNumber=Numéro déclaration
+exportprodebPeriod=Période d'analyse
+exportprodebTypeDeclaration=Type de déclaration
+exportprodebDownload=Télécharger fichier XML