Skip to content
Permalink
Browse files

Merge branch 'develop' into PSR2MethodsFunctionCallSignatureSpaceBefo…

…reOpenBracket
  • Loading branch information...
eldy committed Feb 24, 2019
2 parents 894123f + 14b9a06 commit 6b46a927f105359fca6391ae37d063798dea7b61
Showing with 2,244 additions and 2,073 deletions.
  1. +3 −5 htdocs/accountancy/class/accountancycategory.class.php
  2. +3 −3 htdocs/admin/agenda_extsites.php
  3. +17 −17 htdocs/admin/agenda_other.php
  4. +4 −4 htdocs/admin/agenda_reminder.php
  5. +16 −16 htdocs/admin/bank.php
  6. +11 −11 htdocs/admin/barcode.php
  7. +8 −8 htdocs/admin/boxes.php
  8. +5 −5 htdocs/admin/chequereceipts.php
  9. +20 −20 htdocs/admin/commande.php
  10. +5 −5 htdocs/admin/const.php
  11. +14 −14 htdocs/admin/contract.php
  12. +3 −3 htdocs/admin/defaultvalues.php
  13. +1 −1 htdocs/admin/dict.php
  14. +4 −4 htdocs/admin/ecm.php
  15. +4 −4 htdocs/admin/emailcollector_list.php
  16. +1 −1 htdocs/compta/bank/categ.php
  17. +5 −5 htdocs/compta/bank/graph.php
  18. +14 −14 htdocs/compta/bank/list.php
  19. +10 −10 htdocs/compta/bank/releve.php
  20. +10 −10 htdocs/compta/bank/various_payment/list.php
  21. +6 −4 htdocs/compta/facture/class/api_invoices.class.php
  22. +2 −2 htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php
  23. +2 −2 htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php
  24. +1 −1 htdocs/contact/card.php
  25. +12 −15 htdocs/contact/consumption.php
  26. +22 −7 htdocs/contact/list.php
  27. +2 −2 htdocs/contact/perso.php
  28. +7 −7 htdocs/core/boxes/box_graph_orders_supplier_permonth.php
  29. +1 −1 htdocs/core/class/dolgraph.class.php
  30. +129 −72 htdocs/core/class/extrafields.class.php
  31. +11 −5 htdocs/core/class/html.formfile.class.php
  32. +1 −1 htdocs/core/lib/ajax.lib.php
  33. +34 −23 htdocs/core/lib/company.lib.php
  34. +18 −16 htdocs/core/lib/functions2.lib.php
  35. +2 −4 htdocs/core/modules/bank/doc/pdf_ban.modules.php
  36. +1 −2 htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
  37. +3 −3 htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
  38. +3 −3 htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
  39. +2 −2 htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
  40. +2 −2 htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
  41. +2 −2 htdocs/core/modules/facture/doc/pdf_crabe.modules.php
  42. +1 −1 htdocs/core/modules/facture/doc/pdf_sponge.modules.php
  43. +2 −2 htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
  44. +2 −2 htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
  45. +6 −4 htdocs/core/modules/printing/printgcp.modules.php
  46. +2 −2 htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
  47. +2 −2 htdocs/core/modules/product/doc/pdf_standard.modules.php
  48. +2 −2 htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
  49. +2 −2 htdocs/core/modules/project/doc/pdf_baleine.modules.php
  50. +13 −15 htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
  51. +2 −2 htdocs/core/modules/propale/doc/pdf_azur.modules.php
  52. +8 −5 htdocs/core/modules/propale/doc/pdf_cyan.modules.php
  53. +52 −49 htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php
  54. +1 −1 htdocs/core/modules/reception/modules_reception.php
  55. +1 −1 htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
  56. +5 −5 htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
  57. +2 −2 htdocs/core/modules/stock/doc/pdf_standard.modules.php
  58. +3 −4 htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php
  59. +2 −2 htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
  60. +2 −2 htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
  61. +2 −2 htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
  62. +2 −2 htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
  63. +2 −2 htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
  64. +6 −7 htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
  65. +4 −4 htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
  66. +1 −1 htdocs/core/tpl/advtarget.tpl.php
  67. +1 −1 htdocs/core/tpl/bloc_comment.tpl.php
  68. +2 −2 htdocs/core/tpl/contacts.tpl.php
  69. +1 −1 htdocs/core/tpl/extrafields_list_print_fields.tpl.php
  70. +6 −6 htdocs/core/tpl/extrafields_list_search_param.tpl.php
  71. +1 −1 htdocs/core/tpl/extrafields_view.tpl.php
  72. +1 −1 htdocs/core/tpl/filemanager.tpl.php
  73. +1 −1 htdocs/core/tpl/objectline_edit.tpl.php
  74. +5 −5 htdocs/core/tpl/originproductline.tpl.php
  75. +1 −1 htdocs/core/tpl/passwordforgotten.tpl.php
  76. +1 −1 htdocs/core/tpl/resource_add.tpl.php
  77. +10 −10 htdocs/core/tpl/resource_view.tpl.php
  78. +40 −43 htdocs/datapolicy/admin/setup.php
  79. +46 −46 htdocs/datapolicy/class/actions_datapolicy.class.php
  80. +173 −173 htdocs/datapolicy/class/datapolicy.class.php
  81. +7 −7 htdocs/datapolicy/class/datapolicycron.class.php
  82. +18 −18 htdocs/datapolicy/lib/datapolicy.lib.php
  83. +7 −6 htdocs/datapolicy/mailing.php
  84. +6 −6 htdocs/datapolicy/public/index.php
  85. +48 −64 htdocs/don/class/api_donations.class.php
  86. +1 −1 htdocs/filefunc.inc.php
  87. +14 −10 htdocs/fourn/class/fournisseur.facture.class.php
  88. +3 −3 htdocs/product/card.php
  89. +23 −22 htdocs/product/fournisseurs.php
  90. +36 −35 htdocs/product/index.php
  91. +90 −48 htdocs/product/list.php
  92. +2 −2 htdocs/product/popuprop.php
  93. +105 −105 htdocs/product/price.php
  94. +21 −21 htdocs/product/reassort.php
  95. +23 −23 htdocs/product/reassortlot.php
  96. +25 −17 htdocs/product/stock/card.php
  97. +3 −3 htdocs/product/stock/index.php
  98. +16 −16 htdocs/product/stock/list.php
  99. +11 −13 htdocs/product/stock/massstockmove.php
  100. +52 −47 htdocs/product/stock/movement_card.php
  101. +80 −44 htdocs/product/stock/movement_list.php
  102. +45 −44 htdocs/product/stock/product.php
  103. +30 −23 htdocs/product/stock/productlot_list.php
  104. +20 −19 htdocs/product/stock/replenish.php
  105. +16 −24 htdocs/product/stock/replenishorders.php
  106. +10 −10 htdocs/product/stock/valo.php
  107. +27 −27 htdocs/projet/activity/index.php
  108. +8 −8 htdocs/projet/activity/perday.php
  109. +36 −36 htdocs/projet/admin/project.php
  110. +2 −2 htdocs/projet/card.php
  111. +1 −1 htdocs/projet/comment.php
  112. +1 −1 htdocs/projet/contact.php
  113. +33 −33 htdocs/projet/element.php
  114. +1 −1 htdocs/projet/ganttview.php
  115. +5 −5 htdocs/projet/graph_opportunities.inc.php
  116. +4 −4 htdocs/projet/index.php
  117. +25 −25 htdocs/projet/list.php
  118. +17 −17 htdocs/projet/stats/index.php
  119. +16 −16 htdocs/projet/tasks.php
  120. +1 −1 htdocs/projet/tasks/comment.php
  121. +6 −6 htdocs/projet/tasks/contact.php
  122. +1 −1 htdocs/projet/tasks/document.php
  123. +19 −19 htdocs/projet/tasks/list.php
  124. +1 −1 htdocs/projet/tasks/note.php
  125. +2 −2 htdocs/projet/tasks/task.php
  126. +19 −19 htdocs/projet/tasks/time.php
  127. +27 −27 htdocs/reception/card.php
  128. +2 −2 htdocs/reception/index.php
  129. +29 −29 htdocs/reception/list.php
  130. +17 −17 htdocs/reception/stats/index.php
  131. +2 −2 htdocs/reception/stats/month.php
  132. +9 −9 htdocs/reception/tpl/linkedobjectblock.tpl.php
  133. +8 −7 htdocs/resource/class/html.formresource.class.php
  134. +5 −5 htdocs/resource/list.php
  135. +39 −39 htdocs/societe/admin/societe.php
  136. +1 −1 htdocs/societe/canvas/company/tpl/card_create.tpl.php
  137. +2 −2 htdocs/societe/canvas/company/tpl/card_edit.tpl.php
  138. +4 −4 htdocs/societe/canvas/company/tpl/card_view.tpl.php
  139. +1 −1 htdocs/societe/canvas/individual/tpl/card_create.tpl.php
  140. +2 −2 htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
  141. +3 −3 htdocs/societe/canvas/individual/tpl/card_view.tpl.php
  142. +3 −3 htdocs/societe/card.php
  143. +7 −5 htdocs/societe/class/api_contacts.class.php
  144. +26 −26 htdocs/societe/consumption.php
  145. +10 −10 htdocs/societe/index.php
  146. +37 −37 htdocs/societe/list.php
  147. +5 −5 htdocs/societe/notify/card.php
  148. +13 −13 htdocs/societe/paymentmodes.php
  149. +31 −31 htdocs/societe/price.php
  150. +3 −3 htdocs/societe/societecontact.php
  151. +3 −3 htdocs/societe/website.php
  152. +10 −10 htdocs/stripe/charge.php
  153. +4 −4 htdocs/stripe/class/actions_stripe.class.php
  154. +31 −31 htdocs/stripe/payment.php
  155. +11 −11 htdocs/stripe/payout.php
  156. +17 −16 htdocs/stripe/transaction.php
  157. +8 −8 htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php
  158. +7 −7 htdocs/supplier_proposal/admin/supplier_proposaldet_extrafields.php
  159. +10 −10 htdocs/supplier_proposal/card.php
  160. +10 −10 htdocs/supplier_proposal/index.php
  161. +39 −39 htdocs/supplier_proposal/list.php
  162. +9 −9 htdocs/supplier_proposal/tpl/linkedobjectblock.tpl.php
  163. +2 −2 htdocs/takepos/admin/orderprinters.php
  164. +5 −5 htdocs/ticket/card.php
  165. +4 −4 htdocs/ticket/list.php
  166. +6 −6 htdocs/ticket/stats/index.php
  167. +6 −6 htdocs/ticket/tpl/linkedobjectblock.tpl.php
  168. +2 −2 htdocs/variants/combinations.php
@@ -1,7 +1,7 @@
<?php
/* Copyright (C) 2016 Jamal Elbaz <jamelbaz@gmail.pro>
* Copyright (C) 2016-2017 Alexandre Spangaro <aspangaro@open-dsi.fr>
* Copyright (C) 2018 Frédéric France <frederic.france@netlogic.fr>
* Copyright (C) 2018-2019 Frédéric France <frederic.france@netlogic.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -661,13 +661,11 @@ public function deleteCptCat($cpt_id)
/**
* Function to know all category from accounting account
*
* @return array Result in table
* @return array|integer Result in table (array), -1 if KO
*/
public function getCatsCpts()
{
global $mysoc,$conf;
$sql = "";
global $mysoc, $conf;
if (empty($mysoc->country_id)) {
dol_print_error('', 'Call to select_accounting_account with mysoc country not yet defined');
@@ -151,14 +151,14 @@
print "<tr class=\"liste_titre\">";
print '<td>'.$langs->trans("Parameter")."</td>";
print '<td align="center">'.$langs->trans("Value")."</td>";
print '<td class="center">'.$langs->trans("Value")."</td>";
print "</tr>";
// Show external agenda
print '<tr class="oddeven">';
print "<td>".$langs->trans("ExtSitesEnableThisTool")."</td>";
print '<td align="center">';
print '<td class="center">';
if ($conf->use_javascript_ajax)
{
print ajax_constantonoff('AGENDA_DISABLE_EXT', array('enabled'=>array(0=>'.hideifnotset')), null, 1);
@@ -181,7 +181,7 @@
print '<tr class="oddeven">';
print "<td>".$langs->trans("ExtSitesNbOfAgenda")."</td>";
print '<td align="center">';
print '<td class="center">';
print '<input class="flat hideifnotset" type="text" size="2" id="AGENDA_EXT_NB" name="AGENDA_EXT_NB" value="'.$conf->global->AGENDA_EXT_NB.'">';
print "</td>";
print "</tr>";
@@ -225,10 +225,10 @@
print '<tr class="liste_titre">'."\n";
print '<td width="100">'.$langs->trans("Name").'</td>'."\n";
print '<td>'.$langs->trans("Description").'</td>'."\n";
print '<td align="center" width="60">'.$langs->trans("Status").'</td>'."\n";
print '<td align="center" width="60">'.$langs->trans("Default").'</td>'."\n";
print '<td align="center" width="40">'.$langs->trans("ShortInfo").'</td>';
print '<td align="center" width="40">'.$langs->trans("Preview").'</td>';
print '<td class="center" width="60">'.$langs->trans("Status").'</td>'."\n";
print '<td class="center" width="60">'.$langs->trans("Default").'</td>'."\n";
print '<td class="center" width="40">'.$langs->trans("ShortInfo").'</td>';
print '<td class="center" width="40">'.$langs->trans("Preview").'</td>';
print '</tr>'."\n";
clearstatcache();
@@ -269,7 +269,7 @@
if (in_array($name, $def))
{
print '<td align="center">'."\n";
print '<td class="center">'."\n";
if ($conf->global->ACTION_EVENT_ADDON_PDF != "$name")
{
print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=action">';
@@ -284,13 +284,13 @@
}
else
{
print '<td align="center">'."\n";
print '<td class="center">'."\n";
print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmodel&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=action">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
print "</td>";
}
// Default
print '<td align="center">';
print '<td class="center">';
if ($conf->global->ACTION_EVENT_ADDON_PDF == "$name")
{
print img_picto($langs->trans("Default"), 'on');
@@ -307,10 +307,10 @@
$htmltooltip.='<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
$htmltooltip.='<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
$htmltooltip.='<br>'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1);
print '<td align="center">';
print '<td class="center">';
print $form->textwithpicto('', $htmltooltip, 1, 0);
print '</td>';
print '<td align="center">';
print '<td class="center">';
print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&amp;module='.$name.'">'.img_object($langs->trans("Preview"), 'order').'</a>';
print '</td>';
@@ -330,15 +330,15 @@
print '<table class="noborder allwidth">'."\n";
print '<tr class="liste_titre">'."\n";
print '<td>'.$langs->trans("Parameters").'</td>'."\n";
print '<td align="center">&nbsp;</td>'."\n";
print '<td class="center">&nbsp;</td>'."\n";
print '<td class="right">'.$langs->trans("Value").'</td>'."\n";
print '</tr>'."\n";
// Manual or automatic
print '<tr class="oddeven">'."\n";
print '<td>'.$langs->trans("AGENDA_USE_EVENT_TYPE").'</td>'."\n";
print '<td align="center">&nbsp;</td>'."\n";
print '<td class="center">&nbsp;</td>'."\n";
print '<td class="right">'."\n";
//print ajax_constantonoff('AGENDA_USE_EVENT_TYPE'); Do not use ajax here, we need to reload page to change other combo list
if (empty($conf->global->AGENDA_USE_EVENT_TYPE))
@@ -355,7 +355,7 @@
print '<tr class="oddeven">'."\n";
$htmltext=$langs->trans("ThisValueCanOverwrittenOnUserLevel", $langs->transnoentitiesnoconv("UserGUISetup"));
print '<td>'.$form->textwithpicto($langs->trans("AGENDA_DEFAULT_VIEW"), $htmltext).'</td>'."\n";
print '<td align="center">&nbsp;</td>'."\n";
print '<td class="center">&nbsp;</td>'."\n";
print '<td class="right">'."\n";
$tmplist=array(''=>'&nbsp;', 'show_list'=>$langs->trans("ViewList"), 'show_month'=>$langs->trans("ViewCal"), 'show_week'=>$langs->trans("ViewWeek"), 'show_day'=>$langs->trans("ViewDay"), 'show_peruser'=>$langs->trans("ViewPerUser"));
print $form->selectarray('AGENDA_DEFAULT_VIEW', $tmplist, $conf->global->AGENDA_DEFAULT_VIEW);
@@ -367,25 +367,25 @@
print '<!-- AGENDA_USE_EVENT_TYPE_DEFAULT -->';
print '<tr class="oddeven">'."\n";
print '<td>'.$langs->trans("AGENDA_USE_EVENT_TYPE_DEFAULT").'</td>'."\n";
print '<td align="center">&nbsp;</td>'."\n";
print '<td class="right" class="nowrap">'."\n";
print '<td class="center">&nbsp;</td>'."\n";
print '<td class="right nowrap">'."\n";
$formactions->select_type_actions($conf->global->AGENDA_USE_EVENT_TYPE_DEFAULT, "AGENDA_USE_EVENT_TYPE_DEFAULT", 'systemauto', 0, 1);
print '</td></tr>'."\n";
}
// AGENDA_DEFAULT_FILTER_TYPE
print '<tr class="oddeven">'."\n";
print '<td>'.$langs->trans("AGENDA_DEFAULT_FILTER_TYPE").'</td>'."\n";
print '<td align="center">&nbsp;</td>'."\n";
print '<td class="right" class="nowrap">'."\n";
print '<td class="center">&nbsp;</td>'."\n";
print '<td class="right nowrap">'."\n";
$formactions->select_type_actions($conf->global->AGENDA_DEFAULT_FILTER_TYPE, "AGENDA_DEFAULT_FILTER_TYPE", '', (empty($conf->global->AGENDA_USE_EVENT_TYPE) ? 1 : -1), 1);
print '</td></tr>'."\n";
// AGENDA_DEFAULT_FILTER_STATUS
// TODO Remove to use the default generic feature
print '<tr class="oddeven">'."\n";
print '<td>'.$langs->trans("AGENDA_DEFAULT_FILTER_STATUS").'</td>'."\n";
print '<td align="center">&nbsp;</td>'."\n";
print '<td class="center">&nbsp;</td>'."\n";
print '<td class="right">'."\n";
$formactions->form_select_status_action('agenda', $conf->global->AGENDA_DEFAULT_FILTER_STATUS, 1, 'AGENDA_DEFAULT_FILTER_STATUS', 1, 2, 'minwidth100');
print '</td></tr>'."\n";
@@ -185,7 +185,7 @@
print '<table class="noborder allwidth">'."\n";
print '<tr class="liste_titre">'."\n";
print '<td>'.$langs->trans("Parameters").'</td>'."\n";
print '<td align="center">&nbsp;</td>'."\n";
print '<td class="center">&nbsp;</td>'."\n";
print '<td class="right">'.$langs->trans("Value").'</td>'."\n";
print '</tr>'."\n";
@@ -195,7 +195,7 @@
{
print '<tr class="oddeven">'."\n";
print '<td>'.$langs->trans('AGENDA_REMINDER_EMAIL', $langs->transnoentities("Module2300Name")).'</td>'."\n";
print '<td align="center">&nbsp;</td>'."\n";
print '<td class="center">&nbsp;</td>'."\n";
print '<td class="right">'."\n";
if (empty($conf->global->AGENDA_REMINDER_EMAIL)) {
@@ -212,7 +212,7 @@
{
print '<tr class="oddeven">'."\n";
print '<td>'.$langs->trans('AGENDA_REMINDER_BROWSER').'</td>'."\n";
print '<td align="center">&nbsp;</td>'."\n";
print '<td class="center">&nbsp;</td>'."\n";
print '<td class="right">'."\n";
if (empty($conf->global->AGENDA_REMINDER_BROWSER)) {
@@ -224,7 +224,7 @@
print '<tr class="oddeven">'."\n";
print '<td>'.$langs->trans('AGENDA_REMINDER_BROWSER_SOUND').'</td>'."\n";
print '<td align="center">&nbsp;</td>'."\n";
print '<td class="center">&nbsp;</td>'."\n";
print '<td class="right">'."\n";
if (empty($conf->global->AGENDA_REMINDER_BROWSER_SOUND)) {
@@ -183,8 +183,8 @@
print '<td width="140">' . $langs->trans("Name") . '</td>';
print '<td>' . $langs->trans("Description") . '</td>';
print '<td>' . $langs->trans("Example") . '</td>';
print '<td align="center">' . $langs->trans("Status") . '</td>';
print '<td align="center" width="60">&nbsp;</td>';
print '<td class="center">' . $langs->trans("Status") . '</td>';
print '<td class="center" width="60">&nbsp;</td>';
print "</tr>\n";
$bankorder[0][0] = $langs->trans("BankOrderGlobal");
@@ -213,12 +213,12 @@
print "</td>\n";
if ($conf->global->BANK_SHOW_ORDER_OPTION == $i) {
print '<td align="center">';
print '<td class="center">';
print img_picto($langs->trans("Activated"), 'on');
print '</td>';
}
else {
print '<td align="center"><a href="' . $_SERVER['PHP_SELF'] . '?action=setbankorder&amp;value=' . $i . '">';
print '<td class="center"><a href="' . $_SERVER['PHP_SELF'] . '?action=setbankorder&amp;value=' . $i . '">';
print img_picto($langs->trans("Disabled"), 'off');
print '</a></td>';
}
@@ -263,10 +263,10 @@
print "<tr class=\"liste_titre\">\n";
print '<td>' . $langs->trans("Name") . '</td>';
print '<td>' . $langs->trans("Description") . '</td>';
print '<td align="center" width="60">' . $langs->trans("Status") . "</td>\n";
print '<td align="center" width="60">' . $langs->trans("Default") . "</td>\n";
print '<td align="center" width="38">' . $langs->trans("ShortInfo") . '</td>';
print '<td align="center" width="38">' . $langs->trans("Preview") . '</td>';
print '<td class="center" width="60">' . $langs->trans("Status") . "</td>\n";
print '<td class="center" width="60">' . $langs->trans("Default") . "</td>\n";
print '<td class="center" width="38">' . $langs->trans("ShortInfo") . '</td>';
print '<td class="center" width="38">' . $langs->trans("Preview") . '</td>';
print "</tr>\n";
clearstatcache();
@@ -315,22 +315,22 @@
// Active
if (in_array($name, $def)) {
print '<td align="center">' . "\n";
print '<td class="center">' . "\n";
print '<a href="' . $_SERVER["PHP_SELF"] . '?action=del&value=' . $name . '">';
print img_picto($langs->trans("Enabled"),
'switch_on');
print '</a>';
print '</td>';
}
else {
print '<td align="center">' . "\n";
print '<td class="center">' . "\n";
print '<a href="' . $_SERVER["PHP_SELF"] . '?action=set&value=' . $name . '&amp;scan_dir=' . $module->scandir . '&amp;label=' . urlencode($module->name) . '">' . img_picto($langs->trans("Disabled"),
'switch_off') . '</a>';
print "</td>";
}
// Default
print '<td align="center">';
print '<td class="center">';
if ($conf->global->BANKADDON_PDF == $name) {
print img_picto($langs->trans("Default"),
'on');
@@ -358,13 +358,13 @@
// $htmltooltip.='<br>'.$langs->trans("CreditNote").': '.yn($module->option_credit_note,1,1);
//$htmltooltip .= '<br>' . $langs->trans("WatermarkOnDraftOrders") . ': ' . yn($module->option_draft_watermark, 1, 1);
print '<td align="center">';
print '<td class="center">';
print $form->textwithpicto('', $htmltooltip, 1,
0);
print '</td>';
// Preview
print '<td align="center">';
print '<td class="center">';
if ($module->type == 'pdf') {
print '<a href="' . $_SERVER["PHP_SELF"] . '?action=specimen&module=' . $name . '">' . img_object($langs->trans("Preview"),
'bill') . '</a>';
@@ -404,7 +404,7 @@
print "<tr class=\"liste_titre\">\n";
print '<td>' . $langs->trans("Name") . '</td>';
print '<td>' . $langs->trans("Description") . '</td>';
print '<td align="center" width="60">' . $langs->trans("Status") . "</td>\n";
print '<td class="center" width="60">' . $langs->trans("Status") . "</td>\n";
print "</tr>\n";
print '<tr class="oddeven"><td width="100">';
@@ -414,15 +414,15 @@
print '</td>';
// Active
if ($conf->global->BANK_REPORT_LAST_NUM_RELEVE) {
print '<td align="center">' . "\n";
print '<td class="center">' . "\n";
print '<a href="' . $_SERVER["PHP_SELF"] . '?action=unsetreportlastnumreleve">';
print img_picto($langs->trans("Enabled"), 'switch_on');
print '</a>';
print '</td>';
}
else
{
print '<td align="center">' . "\n";
print '<td class="center">' . "\n";
print '<a href="' . $_SERVER["PHP_SELF"] . '?action=setreportlastnumreleve">' . img_picto($langs->trans("Disabled"),
'switch_off') . '</a>';
print "</td>";
@@ -199,8 +199,8 @@
print '<tr class="liste_titre">';
print '<td>'.$langs->trans("Name").'</td>';
print '<td>'.$langs->trans("Description").'</td>';
print '<td width="200" align="center">'.$langs->trans("Example").'</td>';
print '<td align="center" width="60">'.$langs->trans("CodeBarGenerator").'</td>';
print '<td width="200" class="center">'.$langs->trans("Example").'</td>';
print '<td class="center" width="60">'.$langs->trans("CodeBarGenerator").'</td>';
print "</tr>\n";
$sql = "SELECT rowid, code as encoding, libelle, coder, example";
@@ -229,7 +229,7 @@
print '</td>';
// Show example
print '<td align="center">';
print '<td class="center">';
if ($obj->coder && $obj->coder != -1)
{
$result=0;
@@ -277,7 +277,7 @@
}
print '</td>';
print '<td align="center">';
print '<td class="center">';
print $formbarcode->setBarcodeEncoder($obj->coder, $barcodelist, $obj->rowid, 'form'.$i);
print "</td></tr>\n";
@@ -307,7 +307,7 @@
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<td>'.$langs->trans("Parameter").'</td>';
print '<td width="60" align="center">'.$langs->trans("Value").'</td>';
print '<td width="60" class="center">'.$langs->trans("Value").'</td>';
print '<td>&nbsp;</td>';
print '</tr>';
@@ -317,7 +317,7 @@
print '<tr class="oddeven">';
print '<td>'.$langs->trans("GenbarcodeLocation").'</td>';
print '<td width="60" align="center">';
print '<td width="60" class="center">';
print '<input type="text" size="40" name="GENBARCODE_LOCATION" value="'.$conf->global->GENBARCODE_LOCATION.'">';
if (! empty($conf->global->GENBARCODE_LOCATION) && ! @file_exists($conf->global->GENBARCODE_LOCATION))
{
@@ -369,8 +369,8 @@
print '<td width="140">'.$langs->trans("Name").'</td>';
print '<td>'.$langs->trans("Description").'</td>';
print '<td>'.$langs->trans("Example").'</td>';
print '<td align="center" width="80">'.$langs->trans("Status").'</td>';
print '<td align="center" width="60">'.$langs->trans("ShortInfo").'</td>';
print '<td class="center" width="80">'.$langs->trans("Status").'</td>';
print '<td class="center" width="60">'.$langs->trans("ShortInfo").'</td>';
print "</tr>\n";
$dirbarcodenum=array_merge(array('/core/modules/barcode/'), $conf->modules_parts['barcode']);
@@ -406,17 +406,17 @@
if ($conf->global->BARCODE_PRODUCT_ADDON_NUM == "$file")
{
print '<td align="center"><a href="'.$_SERVER['PHP_SELF'].'?action=setbarcodeproductoff&amp;value='.$file.'">';
print '<td class="center"><a href="'.$_SERVER['PHP_SELF'].'?action=setbarcodeproductoff&amp;value='.$file.'">';
print img_picto($langs->trans("Activated"), 'switch_on');
print '</a></td>';
}
else
{
print '<td align="center"><a href="'.$_SERVER['PHP_SELF'].'?action=setbarcodeproducton&amp;value='.$file.'">';
print '<td class="center"><a href="'.$_SERVER['PHP_SELF'].'?action=setbarcodeproducton&amp;value='.$file.'">';
print img_picto($langs->trans("Disabled"), 'switch_off');
print '</a></td>';
}
print '<td align="center">';
print '<td class="center">';
$s=$modBarCode->getToolTip($langs, null, -1);
print $form->textwithpicto('', $s, 1);
print '</td>';

0 comments on commit 6b46a92

Please sign in to comment.
You can’t perform that action at this time.