Commit 0e520bb09bde01f4ac9f49b799626fd0573a5424

Authored by aspangaro
1 parent 73244670
Exists in 3.5 and in 1 other branch 3.6

Fix :: Select Model export & bank journal

accountingex/admin/export.php
... ... @@ -35,7 +35,7 @@ if (! $res && file_exists("../../../main.inc.php"))
35 35 if (! $res)
36 36 die("Include of main fails");
37 37  
38   - // Class
  38 +// Class
39 39 dol_include_once("/core/lib/admin.lib.php");
40 40 dol_include_once("/accountingex/core/lib/account.lib.php");
41 41  
... ... @@ -103,7 +103,7 @@ $head = admin_account_prepare_head(null);
103 103  
104 104 dol_fiche_head($head, 'export', $langs->trans("Configuration"), 0, 'cron');
105 105  
106   -print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post">';
  106 +print '<form action="' . $_SERVER["PHP_SELF"] . '" method="POST">';
107 107 print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
108 108 print '<input type="hidden" name="action" value="update">';
109 109  
... ... @@ -117,20 +117,24 @@ print &#39;&lt;/tr&gt;&#39;;
117 117 $var = ! $var;
118 118  
119 119 print '<tr ' . $bc[$var] . '>';
120   -print "<td>" . $langs->trans("Selectmodelcsv") . "</td>";
121   -print "<td>";
122   -print '<select class="flat" name="modelcsv" id="modelcsv">';
123   -print '<option value="0"';
124   -if ($conf->global->ACCOUNTINGEX_MODELCSV == 0) {
125   - print ' selected="selected"';
  120 +print "<td width='50%'>" . $langs->trans("Selectmodelcsv") . "</td>";
  121 +if (! $conf->use_javascript_ajax)
  122 +{
  123 + print '<td class="nowrap">';
  124 + print $langs->trans("NotAvailableWhenAjaxDisabled");
  125 + print "</td>";
126 126 }
127   -print '>' . $langs->trans("Modelcsv_normal") . '</option>';
128   -print '<option value="1"';
129   -if ($conf->global->ACCOUNTINGEX_MODELCSV == 1) {
130   - print ' selected="selected"';
  127 +else
  128 +{
  129 + print '<td>';
  130 + $listmodelcsv=array(
  131 + '1'=>$langs->trans("Modelcsv_normal"),
  132 + '2'=>$langs->trans("Modelcsv_CEGID"),
  133 + );
  134 + print $form->selectarray("modelcsv",$listmodelcsv,$conf->global->ACCOUNTINGEX_MODELCSV,0);
  135 + print '</td>';
131 136 }
132   -print '>' . $langs->trans("Modelcsv_CEGID") . '</option>';
133   -print "</select>";
  137 +
134 138 print "</td></tr>";
135 139 print "</table>";
136 140  
... ... @@ -159,7 +163,7 @@ foreach ( $list as $key ) {
159 163  
160 164 // Param
161 165 $label = $langs->trans($key);
162   - print '<td>' . $label . '</td>';
  166 + print '<td width="50%">' . $label . '</td>';
163 167  
164 168 // Value
165 169 print '<td>';
... ...
accountingex/admin/journaux.php
... ... @@ -20,9 +20,9 @@
20 20 */
21 21  
22 22 /**
23   - * \file htdocs/accountingex/admin/journaux.php
24   - * \ingroup Accounting Expert
25   - * \brief Setup page to configure accounting expert module
  23 + * \file htdocs/accountingex/admin/journaux.php
  24 + * \ingroup Accounting Expert
  25 + * \brief Setup page to configure accounting expert module
26 26 */
27 27  
28 28 // Dolibarr environment
... ... @@ -36,7 +36,7 @@ if (! $res &amp;&amp; file_exists(&quot;../../../main.inc.php&quot;))
36 36 if (! $res)
37 37 die("Include of main fails");
38 38  
39   - // Class
  39 +// Class
40 40 dol_include_once("/core/lib/admin.lib.php");
41 41 dol_include_once("/accountingex/core/lib/account.lib.php");
42 42  
... ... @@ -55,6 +55,7 @@ $list = array (
55 55 'ACCOUNTINGEX_SELL_JOURNAL',
56 56 'ACCOUNTINGEX_PURCHASE_JOURNAL',
57 57 'ACCOUNTINGEX_SOCIAL_JOURNAL',
  58 + 'ACCOUNTINGEX_BANK_JOURNAL',
58 59 'ACCOUNTINGEX_CASH_JOURNAL',
59 60 'ACCOUNTINGEX_MISCELLANEOUS_JOURNAL'
60 61 );
... ...
accountingex/core/modules/modAccountingExpert.class.php
... ... @@ -46,7 +46,7 @@ class modAccountingExpert extends DolibarrModules {
46 46 $this->description = "Advanced manage of accounting";
47 47  
48 48 // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
49   - $this->version = '3.5.x beta 20140511';
  49 + $this->version = '3.5.x beta 20140728';
50 50 $this->revision = '2.0.0';
51 51  
52 52 $this->const_name = 'MAIN_MODULE_' . strtoupper($this->name);
... ... @@ -123,7 +123,7 @@ class modAccountingExpert extends DolibarrModules {
123 123 "ACCOUNTINGEX_BANK_JOURNAL",
124 124 "chaine",
125 125 "BQ"
126   - ); // Deprecated Move into llx_bank_account
  126 + );
127 127 $this->const[9] = array (
128 128 "ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH",
129 129 "chaine",
... ... @@ -137,7 +137,7 @@ class modAccountingExpert extends DolibarrModules {
137 137 $this->const[11] = array (
138 138 "ACCOUNTINGEX_MODELCSV",
139 139 "chaine",
140   - "0"
  140 + "1"
141 141 );
142 142 $this->const[12] = array (
143 143 "ACCOUNTINGEX_LENGTH_GACCOUNT",
... ...