lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #16236 from grandoc/new_branch_09_02_2021

Browse Source 
standardisation, internationalisation
This commit is contained in:
Laurent Destailleur 2021-02-10 01:28:16 +01:00 committed by GitHub
commit e84834d219
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
28 changed files with 96 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/core/modules/cheque/modules_chequereceipts.php
View File

@ -142,14 +142,14 @@ abstract class ModeleChequeReceipts extends CommonDocGenerator
global $conf;
$type = 'chequereceipt';
$liste = array();
$list = array();
include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
$liste = getListOfModels($db, $type, $maxfilenamelength);
$list = getListOfModels($db, $type, $maxfilenamelength);
// TODO Remove this to use getListOfModels only
$liste = array('blochet'=>'blochet');
$list = array('blochet'=>'blochet');
return $liste;
return $list;
}
}

6
htdocs/core/modules/contract/modules_contract.php
View File

@ -57,12 +57,12 @@ abstract class ModelePDFContract extends CommonDocGenerator
global $conf;
$type = 'contract';
$liste = array();
$list = array();
include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
$liste = getListOfModels($db, $type, $maxfilenamelength);
$list = getListOfModels($db, $type, $maxfilenamelength);
return $liste;
return $list;
}
}

6
htdocs/core/modules/delivery/modules_delivery.php
View File

@ -55,12 +55,12 @@ abstract class ModelePDFDeliveryOrder extends CommonDocGenerator
global $conf;
$type = 'delivery';
$liste = array();
$list = array();
include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
$liste = getListOfModels($db, $type, $maxfilenamelength);
$list = getListOfModels($db, $type, $maxfilenamelength);
return $liste;
return $list;
}
}

6
htdocs/core/modules/dons/modules_don.php
View File

@ -53,12 +53,12 @@ abstract class ModeleDon extends CommonDocGenerator
global $conf;
$type = 'donation';
$liste = array();
$list = array();
include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
$liste = getListOfModels($db, $type, $maxfilenamelength);
$list = getListOfModels($db, $type, $maxfilenamelength);
return $liste;
return $list;
}
}

6
htdocs/core/modules/facture/modules_facture.php
View File

@ -60,12 +60,12 @@ abstract class ModelePDFFactures extends CommonDocGenerator
global $conf;
$type = 'invoice';
$liste = array();
$list = array();
include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
$liste = getListOfModels($db, $type, $maxfilenamelength);
$list = getListOfModels($db, $type, $maxfilenamelength);
return $liste;
return $list;
}
}

6
htdocs/core/modules/member/modules_cards.php
View File

@ -54,12 +54,12 @@ class ModelePDFCards
global $conf;
$type = 'member';
$liste = array();
$list = array();
include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
$liste = getListOfModels($db, $type, $maxfilenamelength);
$list = getListOfModels($db, $type, $maxfilenamelength);
return $liste;
return $list;
}
}

6
htdocs/core/modules/movement/modules_movement.php
View File

@ -50,11 +50,11 @@ abstract class ModelePDFMovement extends CommonDocGenerator
global $conf;
$type = 'movement';
$liste = array();
$list = array();
include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
$liste = getListOfModels($db, $type, $maxfilenamelength);
$list = getListOfModels($db, $type, $maxfilenamelength);
return $liste;
return $list;
}
}

6
htdocs/core/modules/printsheet/modules_labels.php
View File

@ -54,12 +54,12 @@ class ModelePDFLabels
global $conf;
$type = 'members_labels';
$liste = array();
$list = array();
include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
$liste = getListOfModels($db, $type, $maxfilenamelength);
$list = getListOfModels($db, $type, $maxfilenamelength);
return $liste;
return $list;
}
}

12
htdocs/core/modules/product/modules_product.class.php
View File

@ -53,11 +53,11 @@ abstract class ModelePDFProduct extends CommonDocGenerator
global $conf;
$type = 'product';
$liste = array();
$list = array();
include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
$liste = getListOfModels($db, $type, $maxfilenamelength);
return $liste;
$list = getListOfModels($db, $type, $maxfilenamelength);
return $list;
}
}
@ -163,7 +163,7 @@ abstract class ModeleProductCode
public static function liste_modeles($db, $maxfilenamelength = 0)
{
// phpcs:enable
$liste = array();
$list = array();
$sql = "";
$resql = $db->query($sql);
@ -172,13 +172,13 @@ abstract class ModeleProductCode
$i = 0;
while ($i < $num) {
$row = $db->fetch_row($resql);
$liste[$row[0]] = $row[1];
$list[$row[0]] = $row[1];
$i++;
}
} else {
return -1;
}
return $liste;
return $list;
}
/**

6
htdocs/core/modules/project/modules_project.php
View File

@ -106,12 +106,12 @@ abstract class ModelePDFProjects extends CommonDocGenerator
global $conf;
$type = 'project';
$liste = array();
$list = array();
include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
$liste = getListOfModels($db, $type, $maxfilenamelength);
$list = getListOfModels($db, $type, $maxfilenamelength);
return $liste;
return $list;
}
}

6
htdocs/core/modules/project/task/modules_task.php
View File

@ -52,12 +52,12 @@ abstract class ModelePDFTask extends CommonDocGenerator
global $conf;
$type = 'project_task';
$liste = array();
$list = array();
include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
$liste = getListOfModels($db, $type, $maxfilenamelength);
$list = getListOfModels($db, $type, $maxfilenamelength);
return $liste;
return $list;
}
}

8
htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
View File

@ -183,24 +183,24 @@ class doc_generic_proposal_odt extends ModelePDFPropales
if ($conf->global->MAIN_PROPAL_CHOOSE_ODT_DOCUMENT > 0)
{
// Model for creation
$liste = ModelePDFPropales::liste_modeles($this->db);
$list = ModelePDFPropales::liste_modeles($this->db);
$texte .= '<table width="50%;">';
$texte .= '<tr>';
$texte .= '<td width="60%;">'.$langs->trans("DefaultModelPropalCreate").'</td>';
$texte .= '<td colspan="">';
$texte .= $form->selectarray('value2', $liste, $conf->global->PROPALE_ADDON_PDF_ODT_DEFAULT);
$texte .= $form->selectarray('value2', $list, $conf->global->PROPALE_ADDON_PDF_ODT_DEFAULT);
$texte .= "</td></tr>";
$texte .= '<tr>';
$texte .= '<td width="60%;">'.$langs->trans("DefaultModelPropalToBill").'</td>';
$texte .= '<td colspan="">';
$texte .= $form->selectarray('value3', $liste, $conf->global->PROPALE_ADDON_PDF_ODT_TOBILL);
$texte .= $form->selectarray('value3', $list, $conf->global->PROPALE_ADDON_PDF_ODT_TOBILL);
$texte .= "</td></tr>";
$texte .= '<tr>';
$texte .= '<td width="60%;">'.$langs->trans("DefaultModelPropalClosed").'</td>';
$texte .= '<td colspan="">';
$texte .= $form->selectarray('value4', $liste, $conf->global->PROPALE_ADDON_PDF_ODT_CLOSED);
$texte .= $form->selectarray('value4', $list, $conf->global->PROPALE_ADDON_PDF_ODT_CLOSED);
$texte .= "</td></tr>";
$texte .= '</table>';
}

6
htdocs/core/modules/propale/modules_propale.php
View File

@ -56,12 +56,12 @@ abstract class ModelePDFPropales extends CommonDocGenerator
global $conf;
$type = 'propal';
$liste = array();
$list = array();
include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
$liste = getListOfModels($db, $type, $maxfilenamelength);
$list = getListOfModels($db, $type, $maxfilenamelength);
return $liste;
return $list;
}
}

6
htdocs/core/modules/reception/modules_reception.php
View File

@ -46,12 +46,12 @@ abstract class ModelePdfReception extends CommonDocGenerator
global $conf;
$type = 'reception';
$liste = array();
$list = array();
include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
$liste = getListOfModels($db, $type, $maxfilenamelength);
$list = getListOfModels($db, $type, $maxfilenamelength);
return $liste;
return $list;
}
}

12
htdocs/core/modules/societe/modules_societe.class.php
View File

@ -51,12 +51,12 @@ abstract class ModeleThirdPartyDoc extends CommonDocGenerator
global $conf;
$type = 'company';
$liste = array();
$list = array();
include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
$liste = getListOfModels($db, $type, $maxfilenamelength);
$list = getListOfModels($db, $type, $maxfilenamelength);
return $liste;
return $list;
}
}
@ -168,7 +168,7 @@ abstract class ModeleThirdPartyCode
public static function liste_modeles($db, $maxfilenamelength = 0)
{
// phpcs:enable
$liste = array();
$list = array();
$sql = "";
$resql = $db->query($sql);
@ -177,13 +177,13 @@ abstract class ModeleThirdPartyCode
$i = 0;
while ($i < $num) {
$row = $db->fetch_row($resql);
$liste[$row[0]] = $row[1];
$list[$row[0]] = $row[1];
$i++;
}
} else {
return -1;
}
return $liste;
return $list;
}
/**

6
htdocs/core/modules/stock/modules_stock.php
View File

@ -43,11 +43,11 @@ abstract class ModelePDFStock extends CommonDocGenerator
global $conf;
$type = 'stock';
$liste = array();
$list = array();
include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
$liste = getListOfModels($db, $type, $maxfilenamelength);
$list = getListOfModels($db, $type, $maxfilenamelength);
return $liste;
return $list;
}
}

6
htdocs/core/modules/supplier_order/modules_commandefournisseur.php
View File

@ -57,12 +57,12 @@ abstract class ModelePDFSuppliersOrders extends CommonDocGenerator
global $conf;
$type = 'order_supplier';
$liste = array();
$list = array();
include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
$liste = getListOfModels($db, $type, $maxfilenamelength);
$list = getListOfModels($db, $type, $maxfilenamelength);
return $liste;
return $list;
}
}

6
htdocs/core/modules/supplier_payment/modules_supplier_payment.php
View File

@ -42,12 +42,12 @@ abstract class ModelePDFSuppliersPayments extends CommonDocGenerator
global $conf;
$type = 'supplier_payment';
$liste = array();
$list = array();
include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
$liste = getListOfModels($db, $type, $maxfilenamelength);
$list = getListOfModels($db, $type, $maxfilenamelength);
return $liste;
return $list;
}
}

8
htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
View File

@ -184,24 +184,24 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
if ($conf->global->MAIN_SUPPLIER_PROPOSAL_CHOOSE_ODT_DOCUMENT > 0)
{
// Model for creation
$liste = ModelePDFSupplierProposal::liste_modeles($this->db);
$list = ModelePDFSupplierProposal::liste_modeles($this->db);
$texte .= '<table width="50%;">';
$texte .= '<tr>';
$texte .= '<td width="60%;">'.$langs->trans("DefaultModelSupplierProposalCreate").'</td>';
$texte .= '<td colspan="">';
$texte .= $form->selectarray('value2', $liste, $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_DEFAULT);
$texte .= $form->selectarray('value2', $list, $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_DEFAULT);
$texte .= "</td></tr>";
$texte .= '<tr>';
$texte .= '<td width="60%;">'.$langs->trans("DefaultModelSupplierProposalToBill").'</td>';
$texte .= '<td colspan="">';
$texte .= $form->selectarray('value3', $liste, $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_TOBILL);
$texte .= $form->selectarray('value3', $list, $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_TOBILL);
$texte .= "</td></tr>";
$texte .= '<tr>';
$texte .= '<td width="60%;">'.$langs->trans("DefaultModelSupplierProposalClosed").'</td>';
$texte .= '<td colspan="">';
$texte .= $form->selectarray('value4', $liste, $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_CLOSED);
$texte .= $form->selectarray('value4', $list, $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_CLOSED);
$texte .= "</td></tr>";
$texte .= '</table>';
}

6
htdocs/core/modules/supplier_proposal/modules_supplier_proposal.php
View File

@ -56,12 +56,12 @@ abstract class ModelePDFSupplierProposal extends CommonDocGenerator
global $conf;
$type = 'supplier_proposal';
$liste = array();
$list = array();
include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
$liste = getListOfModels($db, $type, $maxfilenamelength);
$list = getListOfModels($db, $type, $maxfilenamelength);
return $liste;
return $list;
}
}

8
htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
View File

@ -166,24 +166,24 @@ class doc_generic_user_odt extends ModelePDFUser
if ($conf->global->MAIN_PROPAL_CHOOSE_ODT_DOCUMENT > 0)
{
// Model for creation
$liste = ModelePDFUser::liste_modeles($this->db);
$list = ModelePDFUser::liste_modeles($this->db);
$texte .= '<table width="50%;">';
$texte .= '<tr>';
$texte .= '<td width="60%;">'.$langs->trans("DefaultModelPropalCreate").'</td>';
$texte .= '<td colspan="">';
$texte .= $form->selectarray('value2', $liste, $conf->global->USER_ADDON_PDF_ODT_DEFAULT);
$texte .= $form->selectarray('value2', $list, $conf->global->USER_ADDON_PDF_ODT_DEFAULT);
$texte .= "</td></tr>";
$texte .= '<tr>';
$texte .= '<td width="60%;">'.$langs->trans("DefaultModelPropalToBill").'</td>';
$texte .= '<td colspan="">';
$texte .= $form->selectarray('value3', $liste, $conf->global->USER_ADDON_PDF_ODT_TOBILL);
$texte .= $form->selectarray('value3', $list, $conf->global->USER_ADDON_PDF_ODT_TOBILL);
$texte .= "</td></tr>";
$texte .= '<tr>';
$texte .= '<td width="60%;">'.$langs->trans("DefaultModelPropalClosed").'</td>';
$texte .= '<td colspan="">';
$texte .= $form->selectarray('value4', $liste, $conf->global->USER_ADDON_PDF_ODT_CLOSED);
$texte .= $form->selectarray('value4', $list, $conf->global->USER_ADDON_PDF_ODT_CLOSED);
$texte .= "</td></tr>";
$texte .= '</table>';
}

6
htdocs/core/modules/user/modules_user.class.php
View File

@ -58,10 +58,10 @@ abstract class ModelePDFUser extends CommonDocGenerator
global $conf;
$type = 'user';
$liste = array();
$list = array();
include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
$liste = getListOfModels($db, $type, $maxfilenamelength);
return $liste;
$list = getListOfModels($db, $type, $maxfilenamelength);
return $list;
}
}

8
htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
View File

@ -169,24 +169,24 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
if ($conf->global->MAIN_PROPAL_CHOOSE_ODT_DOCUMENT > 0)
{
// Model for creation
$liste = ModelePDFUserGroup::liste_modeles($this->db);
$list = ModelePDFUserGroup::liste_modeles($this->db);
$texte .= '<table width="50%;">';
$texte .= '<tr>';
$texte .= '<td width="60%;">'.$langs->trans("DefaultModelPropalCreate").'</td>';
$texte .= '<td colspan="">';
$texte .= $form->selectarray('value2', $liste, $conf->global->USERGROUP_ADDON_PDF_ODT_DEFAULT);
$texte .= $form->selectarray('value2', $list, $conf->global->USERGROUP_ADDON_PDF_ODT_DEFAULT);
$texte .= "</td></tr>";
$texte .= '<tr>';
$texte .= '<td width="60%;">'.$langs->trans("DefaultModelPropalToBill").'</td>';
$texte .= '<td colspan="">';
$texte .= $form->selectarray('value3', $liste, $conf->global->USERGROUP_ADDON_PDF_ODT_TOBILL);
$texte .= $form->selectarray('value3', $list, $conf->global->USERGROUP_ADDON_PDF_ODT_TOBILL);
$texte .= "</td></tr>";
$texte .= '<tr>';
$texte .= '<td width="60%;">'.$langs->trans("DefaultModelPropalClosed").'</td>';
$texte .= '<td colspan="">';
$texte .= $form->selectarray('value4', $liste, $conf->global->USERGROUP_ADDON_PDF_ODT_CLOSED);
$texte .= $form->selectarray('value4', $list, $conf->global->USERGROUP_ADDON_PDF_ODT_CLOSED);
$texte .= "</td></tr>";
$texte .= '</table>';
}

6
htdocs/expedition/card.php
View File

@ -1013,12 +1013,12 @@ if ($action == 'create')
// Document model
include_once DOL_DOCUMENT_ROOT.'/core/modules/expedition/modules_expedition.php';
$liste = ModelePdfExpedition::liste_modeles($db);
if (count($liste) > 1)
$list = ModelePdfExpedition::liste_modeles($db);
if (count($list) > 1)
{
print "<tr><td>".$langs->trans("DefaultModel")."</td>";
print '<td colspan="3">';
print $form->selectarray('model', $liste, $conf->global->EXPEDITION_ADDON_PDF);
print $form->selectarray('model', $list, $conf->global->EXPEDITION_ADDON_PDF);
print "</td></tr>\n";
}

12
htdocs/imports/import.php
View File

@ -502,8 +502,8 @@ if ($step == 2 && $datatoimport)
print '<tr class="liste_titre"><td colspan="6">';
print $langs->trans("FileMustHaveOneOfFollowingFormat");
print '</td></tr>';
$liste = $objmodelimport->liste_modeles($db);
foreach ($liste as $key)
$list = $objmodelimport->liste_modeles($db);
foreach ($list as $key)
{
print '<tr class="oddeven">';
print '<td width="16">'.img_picto_common($key, $objmodelimport->getPictoForKey($key)).'</td>';
@ -533,7 +533,7 @@ if ($step == 3 && $datatoimport)
if ($separator) $param .= '&separator='.urlencode($separator);
if ($enclosure) $param .= '&enclosure='.urlencode($enclosure);
$liste = $objmodelimport->liste_modeles($db);
$list = $objmodelimport->liste_modeles($db);
llxHeader('', $langs->trans("NewImport"), 'EN:Module_Imports_En|FR:Module_Imports|ES:M&oacute;dulo_Importaciones');
@ -731,7 +731,7 @@ if ($step == 3 && $datatoimport)
if ($step == 4 && $datatoimport)
{
$model = $format;
$liste = $objmodelimport->liste_modeles($db);
$list = $objmodelimport->liste_modeles($db);
// Create classe to use for import
$dir = DOL_DOCUMENT_ROOT."/core/modules/import/";
@ -1264,7 +1264,7 @@ if ($step == 5 && $datatoimport)
}
$model = $format;
$liste = $objmodelimport->liste_modeles($db);
$list = $objmodelimport->liste_modeles($db);
// Create classe to use for import
$dir = DOL_DOCUMENT_ROOT."/core/modules/import/";
@ -1703,7 +1703,7 @@ if ($step == 6 && $datatoimport)
}
$model = $format;
$liste = $objmodelimport->liste_modeles($db);
$list = $objmodelimport->liste_modeles($db);
$importid = GETPOST("importid", 'alphanohtml');

4
htdocs/imports/index.php
View File

@ -68,9 +68,9 @@ print '</tr>';
include_once DOL_DOCUMENT_ROOT.'/core/modules/import/modules_import.php';
$model = new ModeleImports();
$liste = $model->liste_modeles($db);
$list = $model->liste_modeles($db);
foreach ($liste as $key)
foreach ($list as $key)
{
print '<tr class="oddeven">';
print '<td width="16">'.img_picto_common($model->getDriverLabelForKey($key), $model->getPictoForKey($key)).'</td>';

6
htdocs/reception/card.php
View File

@ -860,13 +860,13 @@ if ($action == 'create')
// Document model
include_once DOL_DOCUMENT_ROOT.'/core/modules/reception/modules_reception.php';
$liste = ModelePdfReception::liste_modeles($db);
$list = ModelePdfReception::liste_modeles($db);
if (count($liste) > 1)
if (count($list) > 1)
{
print "<tr><td>".$langs->trans("DefaultModel")."</td>";
print '<td colspan="3">';
print $form->selectarray('model', $liste, $conf->global->RECEPTION_ADDON_PDF);
print $form->selectarray('model', $list, $conf->global->RECEPTION_ADDON_PDF);
print "</td></tr>\n";
}

4
htdocs/supplier_proposal/card.php
View File

@ -1216,9 +1216,9 @@ if ($action == 'create')
print '<tr>';
print '<td>'.$langs->trans("DefaultModel").'</td>';
print '<td colspan="2">';
$liste = ModelePDFSupplierProposal::liste_modeles($db);
$list = ModelePDFSupplierProposal::liste_modeles($db);
$preselected = ($conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_DEFAULT ? $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_DEFAULT : $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF);
print $form->selectarray('model', $liste, $preselected, 0, 0, 0, '', 0, 0, 0, '', '', 1);
print $form->selectarray('model', $list, $preselected, 0, 0, 0, '', 0, 0, 0, '', '', 1);
print "</td></tr>";
// Project