Commit 1b787559ffa8fb86d9fdf7f80a812feeb6fac771

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

Renamed file fiche.php into card.php & liste.php into list.php

accountingex/admin/account.php
... ... @@ -141,7 +141,7 @@ if ($result) {
141 141  
142 142 print '<br/>';
143 143  
144   - print '<a class="butAction" href="./fiche.php?action=create">' . $langs->trans("Addanaccount") . '</a>';
  144 + print '<a class="butAction" href="./card.php?action=create">' . $langs->trans("Addanaccount") . '</a>';
145 145 print '<a class="butAction" href="./importaccounts.php">' . $langs->trans("ImportAccount") . '</a>';
146 146 print '<br/><br/>';
147 147  
... ... @@ -175,7 +175,7 @@ if ($result) {
175 175  
176 176 $var = ! $var;
177 177 print '<tr ' . $bc[$var] . '>';
178   - print '<td><a href="./fiche.php?id=' . $obj->rowid . '">' . $obj->account_number . '</td>';
  178 + print '<td><a href="./card.php?id=' . $obj->rowid . '">' . $obj->account_number . '</td>';
179 179 print '<td>' . $obj->label . '</td>';
180 180 print '<td>' . $obj->account_parent . '</td>';
181 181 print '<td>' . $obj->pcg_type . '</td>';
... ... @@ -194,10 +194,10 @@ if ($result) {
194 194  
195 195 print '<td>';
196 196 if ($user->rights->accountingex->admin) {
197   - print '<a href="./fiche.php?action=update&id=' . $obj->rowid . '">';
  197 + print '<a href="./card.php?action=update&id=' . $obj->rowid . '">';
198 198 print img_edit();
199 199 print '</a>&nbsp;';
200   - print '<a href="./fiche.php?action=delete&id=' . $obj->rowid . '">';
  200 + print '<a href="./card.php?action=delete&id=' . $obj->rowid . '">';
201 201 print img_delete();
202 202 print '</a>';
203 203 }
... ...
accountingex/admin/fiche.php renamed to accountingex/admin/card.php
... ... @@ -18,7 +18,7 @@
18 18 */
19 19  
20 20 /**
21   - * \file accountancyex/admin/fiche.php
  21 + * \file accountancyex/admin/card.php
22 22 * \ingroup Accounting Expert
23 23 * \brief Card accounting account
24 24 */
... ... @@ -95,7 +95,7 @@ elseif ($action == &#39;edit&#39;)
95 95  
96 96 $sql = 'SELECT pcg_version FROM ' . MAIN_DB_PREFIX . 'accounting_system WHERE rowid=' . $conf->global->CHARTOFACCOUNTS;
97 97  
98   - dol_syslog('accountingex/admin/fiche.php:: $sql=' . $sql);
  98 + dol_syslog('accountingex/admin/card.php:: $sql=' . $sql);
99 99 $result2 = $db->query($sql);
100 100 $obj = $db->fetch_object($result2);
101 101  
... ...
accountingex/admin/importaccounts.php
... ... @@ -21,7 +21,7 @@
21 21 */
22 22  
23 23 /**
24   - * \file htdocs/compta/accountingex/liste.php
  24 + * \file htdocs/compta/accountingex/list.php
25 25 * \ingroup compta
26 26 * \brief Page IMPORT COMPTE COMPTABLE
27 27 */
... ...
accountingex/bookkeeping/fiche.php renamed to accountingex/bookkeeping/card.php
... ... @@ -18,7 +18,7 @@
18 18 */
19 19  
20 20 /**
21   - * \file accountingex/bookkeeping/fiche.php
  21 + * \file accountingex/bookkeeping/card.php
22 22 * \ingroup Accounting Expert
23 23 * \brief Page to show account
24 24 */
... ... @@ -337,10 +337,10 @@ if ($action == &#39;create&#39;) {
337 337  
338 338 print '<td>';
339 339 if ($user->rights->accoutingex->access) {
340   - print '<a href="./fiche.php?action=update&id=' . $line->id . '&piece_num=' . $line->piece_num . '">';
  340 + print '<a href="./card.php?action=update&id=' . $line->id . '&piece_num=' . $line->piece_num . '">';
341 341 print img_edit();
342 342 print '</a>&nbsp;';
343   - print '<a href="./fiche.php?action=delete&id=' . $line->id . '&piece_num=' . $line->piece_num . '">';
  343 + print '<a href="./card.php?action=delete&id=' . $line->id . '&piece_num=' . $line->piece_num . '">';
344 344 print img_delete();
345 345 print '</a>';
346 346 }
... ...
accountingex/bookkeeping/liste.php renamed to accountingex/bookkeeping/list.php
... ... @@ -20,7 +20,7 @@
20 20 */
21 21  
22 22 /**
23   - * \file accountingex/bookkeeping/liste.php
  23 + * \file accountingex/bookkeeping/list.php
24 24 * \ingroup Accounting Expert
25 25 * \brief List operation of book keeping
26 26 */
... ... @@ -65,7 +65,7 @@ if ($action == &#39;delbookkeeping&#39;) {
65 65 if (! empty($import_key)) {
66 66 $object = new BookKeeping($db);
67 67 $result = $object->delete_by_importkey($import_key);
68   - Header("Location: liste.php");
  68 + Header("Location: list.php");
69 69 if ($result < 0) {
70 70 setEventMessage($object->errors, 'errors');
71 71 }
... ... @@ -132,13 +132,13 @@ else {
132 132  
133 133 $sql .= " ORDER BY $sortfield $sortorder " . $db->plimit($conf->liste_limit + 1, $offset);
134 134  
135   - dol_syslog('accountingex/bookkeeping/liste.php:: $sql=' . $sql);
  135 + dol_syslog('accountingex/bookkeeping/list.php:: $sql=' . $sql);
136 136 $resql = $db->query($sql);
137 137 if ($resql) {
138 138 $num = $db->num_rows($resql);
139 139 $i = 0;
140 140  
141   - print_barre_liste($langs->trans("Bookkeeping"), $page, "liste.php", "", $sortfield, $sortorder, '', $num);
  141 + print_barre_liste($langs->trans("Bookkeeping"), $page, "list.php", "", $sortfield, $sortorder, '', $num);
142 142  
143 143 print '<form name="add" action="' . $_SERVER["PHP_SELF"] . '" method="POST">';
144 144 print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
... ... @@ -150,7 +150,7 @@ else {
150 150  
151 151 print '</form>';
152 152  
153   - print '<a href="./fiche.php?action=create" class="butAction">'.$langs->trans("NewMovCompta").'</a>';
  153 + print '<a href="./card.php?action=create" class="butAction">'.$langs->trans("NewMovCompta").'</a>';
154 154  
155 155 print '<form name="add" action="' . $_SERVER["PHP_SELF"] . '" method="POST">';
156 156 print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
... ... @@ -175,7 +175,7 @@ else {
175 175 print "</tr>\n";
176 176  
177 177 print '<tr class="liste_titre">';
178   - print '<form action="liste.php" method="GET">';
  178 + print '<form action="list.php" method="GET">';
179 179 print '<td><input type="text" name="search_doc_type" value="' . $_GET["search_doc_type"] . '"></td>';
180 180 print '<td>&nbsp;</td>';
181 181 print '<td><input type="text" name="search_doc_ref" value="' . $_GET["search_doc_ref"] . '"></td>';
... ... @@ -212,7 +212,7 @@ else {
212 212 print '<td align="right">' . price($obj->montant) . '</td>';
213 213 print '<td>' . $obj->sens . '</td>';
214 214 print '<td>' . $obj->code_journal . '</td>';
215   - print '<td><a href="./fiche.php?piece_num=' . $obj->piece_num . '">' . img_edit() . '</a></td>';
  215 + print '<td><a href="./card.php?piece_num=' . $obj->piece_num . '">' . img_edit() . '</a></td>';
216 216 print "</tr>\n";
217 217 $i ++;
218 218 }
... ...
accountingex/bookkeeping/listebyyear.php
... ... @@ -122,7 +122,7 @@ if ($resql) {
122 122 print '<td align="right">' . price($obj->montant) . '</td>';
123 123 print '<td>' . $obj->sens . '</td>';
124 124 print '<td>' . $obj->code_journal . '</td>';
125   - print '<td><a href="./fiche.php?action=update&id=' . $obj->rowid . '">' . img_edit() . '</a></td>';
  125 + print '<td><a href="./card.php?action=update&id=' . $obj->rowid . '">' . img_edit() . '</a></td>';
126 126 print "</tr>\n";
127 127  
128 128 $i ++;
... ...
accountingex/core/lib/account.lib.php
... ... @@ -78,7 +78,7 @@ function account_prepare_head($object) {
78 78 $h = 0;
79 79 $head = array ();
80 80  
81   - $head[$h][0] = dol_buildpath('/accountingex/admin/fiche.php', 1) . '?id=' . $object->id;
  81 + $head[$h][0] = dol_buildpath('/accountingex/admin/card.php', 1) . '?id=' . $object->id;
82 82 $head[$h][1] = $langs->trans("Card");
83 83 $head[$h][2] = 'card';
84 84 $h ++;
... ...
accountingex/core/modules/modAccountingExpert.class.php
... ... @@ -273,7 +273,7 @@ class modAccountingExpert extends DolibarrModules {
273 273 'titre' => 'ToDispatch',
274 274 'leftmenu' => 'ToDispatchCustomer',
275 275 'mainmenu' => 'accounting',
276   - 'url' => '/accountingex/customer/liste.php',
  276 + 'url' => '/accountingex/customer/list.php',
277 277 'langs' => 'accountingex@accountingex',
278 278 'position' => 102,
279 279 'enabled' => 1,
... ... @@ -321,7 +321,7 @@ class modAccountingExpert extends DolibarrModules {
321 321 'titre' => 'ToDispatch',
322 322 'leftmenu' => 'ToDispatchSupplier',
323 323 'mainmenu' => 'accounting',
324   - 'url' => '/accountingex/supplier/liste.php',
  324 + 'url' => '/accountingex/supplier/list.php',
325 325 'langs' => 'accountingex@accountingex',
326 326 'position' => 111,
327 327 'enabled' => '$conf->fournisseur->enabled',
... ... @@ -433,7 +433,7 @@ class modAccountingExpert extends DolibarrModules {
433 433 'titre' => 'Bookkeeping',
434 434 'leftmenu' => 'Bookkeeping',
435 435 'mainmenu' => 'accounting',
436   - 'url' => '/accountingex/bookkeeping/liste.php',
  436 + 'url' => '/accountingex/bookkeeping/list.php',
437 437 'langs' => 'accountingex@accountingex',
438 438 'position' => 300,
439 439 'enabled' => 1,
... ...
accountingex/customer/fiche.php renamed to accountingex/customer/card.php
... ... @@ -18,7 +18,7 @@
18 18 */
19 19  
20 20 /**
21   - * \file accountingex/customer/fiche.php
  21 + * \file accountingex/customer/card.php
22 22 * \ingroup Accounting Expert
23 23 * \brief Page fiche ventilation
24 24 */
... ... @@ -61,7 +61,7 @@ if ($action == &#39;ventil&#39; &amp;&amp; $user-&gt;rights-&gt;accountingex-&gt;access) {
61 61 $sql .= " SET fk_code_ventilation = " . $codeventil;
62 62 $sql .= " WHERE rowid = " . $id;
63 63  
64   - dol_syslog("/accountingex/customer/fiche.php sql=" . $sql, LOG_DEBUG);
  64 + dol_syslog("/accountingex/customer/card.php sql=" . $sql, LOG_DEBUG);
65 65 $resql = $db->query($sql);
66 66 if (! $resql) {
67 67 setEventMessage($db->lasterror(), 'errors');
... ... @@ -95,7 +95,7 @@ if (! empty($id)) {
95 95 $sql .= " AND f.entity = '" . $conf->entity . "'";
96 96 }
97 97  
98   - dol_syslog("/accountingex/customer/fiche.php sql=" . $sql, LOG_DEBUG);
  98 + dol_syslog("/accountingex/customer/card.php sql=" . $sql, LOG_DEBUG);
99 99 $result = $db->query($sql);
100 100  
101 101 if ($result) {
... ...
accountingex/customer/lignes.php
... ... @@ -213,7 +213,7 @@ if ($result) {
213 213 print '<td align="left">' . price($objp->total_ht) . '</td>';
214 214 print '<td align="left">' . $codeCompta . '</td>';
215 215 print '<td>' . $objp->rowid . '</td>';
216   - print '<td><a href="./fiche.php?id=' . $objp->rowid . '">';
  216 + print '<td><a href="./card.php?id=' . $objp->rowid . '">';
217 217 print img_edit();
218 218 print '</a></td>';
219 219  
... ...
accountingex/customer/liste.php renamed to accountingex/customer/list.php
... ... @@ -19,7 +19,7 @@
19 19 */
20 20  
21 21 /**
22   - * \file accountingex/customer/liste.php
  22 + * \file accountingex/customer/list.php
23 23 * \ingroup Accounting Expert
24 24 * \brief Page de ventilation des lignes de facture clients
25 25 */
... ... @@ -98,7 +98,7 @@ if ($action == &#39;ventil&#39;) {
98 98 $sql .= " SET fk_code_ventilation = " . $monCompte;
99 99 $sql .= " WHERE rowid = " . $monId;
100 100  
101   - dol_syslog("/accountingex/customer/liste.php sql=" . $sql, LOG_DEBUG);
  101 + dol_syslog("/accountingex/customer/list.php sql=" . $sql, LOG_DEBUG);
102 102 if ($db->query($sql)) {
103 103 print '<div><font color="green">' . $langs->trans("Lineofinvoice") . ' ' . $monId . ' ' . $langs->trans("VentilatedinAccount") . ' : ' . $monCompte . '</font></div>';
104 104 } else {
... ... @@ -176,14 +176,14 @@ if ($conf-&gt;global-&gt;ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO &gt; 0) {
176 176 }
177 177 $sql .= $db->plimit($limit + 1, $offset);
178 178  
179   -dol_syslog("/accountingex/customer/liste.php sql=" . $sql, LOG_DEBUG);
  179 +dol_syslog("/accountingex/customer/list.php sql=" . $sql, LOG_DEBUG);
180 180 $result = $db->query($sql);
181 181 if ($result) {
182 182 $num_lignes = $db->num_rows($result);
183 183 $i = 0;
184 184  
185 185 // TODO : print_barre_liste always use $conf->liste_limit and do not care about custom limit in list...
186   - print_barre_liste($langs->trans("InvoiceLines"), $page, "liste.php", "", $sortfield, $sortorder, '', $num_lignes);
  186 + print_barre_liste($langs->trans("InvoiceLines"), $page, "list.php", "", $sortfield, $sortorder, '', $num_lignes);
187 187  
188 188 print '<br><b>' . $langs->trans("DescVentilTodoCustomer") . '</b></br>';
189 189  
... ... @@ -276,10 +276,11 @@ if ($result) {
276 276 print '</tr>';
277 277 $i ++;
278 278 }
279   -
280   - print '<tr><td colspan="8">&nbsp;</td></tr><tr><td colspan="8" align="center"><input type="submit" class="butAction" value="' . $langs->trans("Ventilate") . '"></td></tr>';
281   -
  279 +
282 280 print '</table>';
  281 + print '<br>';
  282 + print '<div><center><input type="submit" class="butAction" value="' . $langs->trans("Ventilate") . '"></center></div>';
  283 +
283 284 print '</form>';
284 285 } else {
285 286 print $db->error();
... ...
accountingex/supplier/fiche.php renamed to accountingex/supplier/card.php
... ... @@ -20,7 +20,7 @@
20 20 *
21 21 */
22 22 /**
23   - * \file accountingex/supplier/fiche.php
  23 + * \file accountingex/supplier/card.php
24 24 * \ingroup Accountign Expert
25 25 * \brief Page fiche ventilation
26 26 */
... ...
accountingex/supplier/lignes.php
... ... @@ -213,7 +213,7 @@ if ($result) {
213 213 print '<td align="left">' . price($objp->total_ht) . '</td>';
214 214 print '<td align="left">' . $codeCompta . '</td>';
215 215 print '<td>' . $objp->rowid . '</td>';
216   - print '<td><a href="./fiche.php?id=' . $objp->rowid . '">';
  216 + print '<td><a href="./card.php?id=' . $objp->rowid . '">';
217 217 print img_edit();
218 218 print '</a></td>';
219 219  
... ...
accountingex/supplier/liste.php renamed to accountingex/supplier/list.php
... ... @@ -19,7 +19,7 @@
19 19 */
20 20  
21 21 /**
22   - * \file accountingex/supplier/liste.php
  22 + * \file accountingex/supplier/list.php
23 23 * \ingroup Accounting Expert
24 24 * \brief Page de ventilation des lignes de facture
25 25 */
... ... @@ -101,7 +101,7 @@ if ($action == &#39;ventil&#39;) {
101 101 $sql .= " SET fk_code_ventilation = " . $monCompte;
102 102 $sql .= " WHERE rowid = " . $monId;
103 103  
104   - dol_syslog('accountingex/supplier/liste.php:: sql=' . $sql, LOG_DEBUG);
  104 + dol_syslog('accountingex/supplier/list.php:: sql=' . $sql, LOG_DEBUG);
105 105 if ($db->query($sql)) {
106 106 print '<div><font color="green">' . $langs->trans("Lineofinvoice") . ' ' . $monId . ' ' . $langs->trans("VentilatedinAccount") . ' : ' . $monCompte . '</font></div>';
107 107 } else {
... ... @@ -186,18 +186,18 @@ if ($conf-&gt;global-&gt;ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO &gt; 0) {
186 186 }
187 187 $sql .= $db->plimit($limit + 1, $offset);
188 188  
189   -dol_syslog('accountingext/supplier/liste.php:: $sql=' . $sql, LOG_DEBUG);
  189 +dol_syslog('accountingext/supplier/list.php:: $sql=' . $sql, LOG_DEBUG);
190 190 $result = $db->query($sql);
191 191 if ($result) {
192 192 $num_lignes = $db->num_rows($result);
193 193 $i = 0;
194 194  
195 195 // TODO : print_barre_liste always use $conf->liste_limit and do not care about custom limit in list...
196   - print_barre_liste($langs->trans("InvoiceLines"), $page, "liste.php", "", $sortfield, $sortorder, '', $num_lignes);
  196 + print_barre_liste($langs->trans("InvoiceLines"), $page, "list.php", "", $sortfield, $sortorder, '', $num_lignes);
197 197  
198 198 print '<td align="left"><br><b>' . $langs->trans("DescVentilTodoSupplier") . '</b></br></td>';
199 199  
200   - print '<form action="liste.php" method="post">' . "\n";
  200 + print '<form action="list.php" method="post">' . "\n";
201 201 print '<input type="hidden" name="action" value="ventil">';
202 202  
203 203 print '<table class="noborder" width="100%">';
... ... @@ -279,9 +279,9 @@ if ($result) {
279 279 print '&nbsp;';
280 280 print '</td>';
281 281  
282   - // print '<td><a href="'.DOL_URL_ROOT.'/fourn/facture/fiche.php?facid='.$objp->facid.'">'.$objp->ref.'</a></td>';
  282 + // print '<td><a href="'.DOL_URL_ROOT.'/fourn/facture/card.php?facid='.$objp->facid.'">'.$objp->ref.'</a></td>';
283 283  
284   - // print '<td><a href="'.DOL_URL_ROOT.'/fourn/facture/fiche.php?facid='.$objp->facid.'">'.$objp->ref_supplier.'</a></td>';
  284 + // print '<td><a href="'.DOL_URL_ROOT.'/fourn/facture/card.php?facid='.$objp->facid.'">'.$objp->ref_supplier.'</a></td>';
285 285  
286 286 print '<td>' . dol_trunc($objp->product_label, 24) . '</td>';
287 287  
... ... @@ -311,9 +311,10 @@ if ($result) {
311 311 $i ++;
312 312 }
313 313  
314   - print '<tr><td colspan="8">&nbsp;</td></tr><tr><td colspan="8" align="center"><input type="submit" class="butAction" value="' . $langs->trans("Ventiler") . '"></td></tr>';
315   -
316   - print "</table>";
  314 +
  315 + print '</table>';
  316 + print '<br>';
  317 + print '<div><center><input type="submit" class="butAction" value="' . $langs->trans("Ventilate") . '"></center></div>';
317 318  
318 319 print '</form>';
319 320 } else {
... ...