clean and update code
This commit is contained in:
parent
4c08e2ebf3
commit
ddbf5e59e1
@ -531,7 +531,6 @@ print "</tr>\n";
|
|||||||
$contractstatic=new Contrat($db);
|
$contractstatic=new Contrat($db);
|
||||||
$productstatic=new Product($db);
|
$productstatic=new Product($db);
|
||||||
|
|
||||||
$var=true;
|
|
||||||
$i=0;
|
$i=0;
|
||||||
$totalarray=array();
|
$totalarray=array();
|
||||||
while ($i < min($num,$limit))
|
while ($i < min($num,$limit))
|
||||||
|
|||||||
@ -249,7 +249,6 @@ if (GETPOST('action','aZ09') == 'create')
|
|||||||
print '<td align="center">'.$langs->trans("Amount").'</td>';
|
print '<td align="center">'.$langs->trans("Amount").'</td>';
|
||||||
print "</tr>\n";
|
print "</tr>\n";
|
||||||
|
|
||||||
$var=true;
|
|
||||||
$total=0;
|
$total=0;
|
||||||
$totalrecu=0;
|
$totalrecu=0;
|
||||||
|
|
||||||
@ -257,8 +256,6 @@ if (GETPOST('action','aZ09') == 'create')
|
|||||||
{
|
{
|
||||||
$objp = $don;
|
$objp = $don;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
print '<tr class="oddeven">';
|
print '<tr class="oddeven">';
|
||||||
|
|
||||||
print '<td align="right">'.price($objp->amount)."</td>";
|
print '<td align="right">'.price($objp->amount)."</td>";
|
||||||
@ -288,7 +285,7 @@ if (GETPOST('action','aZ09') == 'create')
|
|||||||
if ($i > 1)
|
if ($i > 1)
|
||||||
{
|
{
|
||||||
// Print total
|
// Print total
|
||||||
print "<tr ".$bc[!$var].">";
|
print '<tr class="oddeven">';
|
||||||
print '<td colspan="2" align="left">'.$langs->trans("Total").':</td>';
|
print '<td colspan="2" align="left">'.$langs->trans("Total").':</td>';
|
||||||
print "<td align=\"right\"><b>".price($total_ttc)."</b></td>";
|
print "<td align=\"right\"><b>".price($total_ttc)."</b></td>";
|
||||||
print "<td align=\"right\"><b>".price($totalrecu)."</b></td>";
|
print "<td align=\"right\"><b>".price($totalrecu)."</b></td>";
|
||||||
|
|||||||
@ -644,7 +644,6 @@ if ($resql)
|
|||||||
if ($num > 0)
|
if ($num > 0)
|
||||||
{
|
{
|
||||||
$i=0;
|
$i=0;
|
||||||
$var=true;
|
|
||||||
$totalarray=array();
|
$totalarray=array();
|
||||||
while ($i < min($num,$limit))
|
while ($i < min($num,$limit))
|
||||||
{
|
{
|
||||||
|
|||||||
@ -80,7 +80,6 @@ class Export
|
|||||||
|
|
||||||
dol_syslog(get_class($this)."::load_arrays user=".$user->id." filter=".$filter);
|
dol_syslog(get_class($this)."::load_arrays user=".$user->id." filter=".$filter);
|
||||||
|
|
||||||
$var=true;
|
|
||||||
$i=0;
|
$i=0;
|
||||||
|
|
||||||
// Define list of modules directories into modulesdir
|
// Define list of modules directories into modulesdir
|
||||||
@ -595,8 +594,6 @@ class Export
|
|||||||
// Genere ligne de titre
|
// Genere ligne de titre
|
||||||
$objmodel->write_title($this->array_export_fields[$indice],$array_selected,$outputlangs,$this->array_export_TypeFields[$indice]);
|
$objmodel->write_title($this->array_export_fields[$indice],$array_selected,$outputlangs,$this->array_export_TypeFields[$indice]);
|
||||||
|
|
||||||
$var=true;
|
|
||||||
|
|
||||||
while ($obj = $this->db->fetch_object($resql))
|
while ($obj = $this->db->fetch_object($resql))
|
||||||
{
|
{
|
||||||
// Process special operations
|
// Process special operations
|
||||||
|
|||||||
@ -585,12 +585,10 @@ if ($step == 2 && $datatoexport)
|
|||||||
// $this->array_export_entities[0]=$module->export_fields_entities[$r];
|
// $this->array_export_entities[0]=$module->export_fields_entities[$r];
|
||||||
// $this->array_export_alias[0]=$module->export_fields_alias[$r];
|
// $this->array_export_alias[0]=$module->export_fields_alias[$r];
|
||||||
|
|
||||||
$var=true;
|
|
||||||
$i = 0;
|
$i = 0;
|
||||||
|
|
||||||
foreach($fieldsarray as $code=>$label)
|
foreach($fieldsarray as $code=>$label)
|
||||||
{
|
{
|
||||||
|
|
||||||
print '<tr class="oddeven">';
|
print '<tr class="oddeven">';
|
||||||
|
|
||||||
$i++;
|
$i++;
|
||||||
@ -779,7 +777,6 @@ if ($step == 3 && $datatoexport)
|
|||||||
// Select request if all fields are selected
|
// Select request if all fields are selected
|
||||||
$sqlmaxforexport=$objexport->build_sql(0, array(), array());
|
$sqlmaxforexport=$objexport->build_sql(0, array(), array());
|
||||||
|
|
||||||
$var=true;
|
|
||||||
$i = 0;
|
$i = 0;
|
||||||
// on boucle sur les champs
|
// on boucle sur les champs
|
||||||
foreach($fieldsarray as $code => $label)
|
foreach($fieldsarray as $code => $label)
|
||||||
@ -977,7 +974,6 @@ if ($step == 4 && $datatoexport)
|
|||||||
//print '<td>'.$langs->trans("FieldsTitle").'</td>';
|
//print '<td>'.$langs->trans("FieldsTitle").'</td>';
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
|
|
||||||
$var=true;
|
|
||||||
foreach($array_selected as $code=>$value)
|
foreach($array_selected as $code=>$value)
|
||||||
{
|
{
|
||||||
print '<tr class="oddeven">';
|
print '<tr class="oddeven">';
|
||||||
@ -1074,7 +1070,7 @@ if ($step == 4 && $datatoexport)
|
|||||||
print '<td>'.$langs->trans("ExportModelName").'</td>';
|
print '<td>'.$langs->trans("ExportModelName").'</td>';
|
||||||
print '<td> </td>';
|
print '<td> </td>';
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
$var=false;
|
|
||||||
print '<tr class="oddeven">';
|
print '<tr class="oddeven">';
|
||||||
print '<td><input name="export_name" size="32" value=""></td><td align="right">';
|
print '<td><input name="export_name" size="32" value=""></td><td align="right">';
|
||||||
print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
|
print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
|
||||||
@ -1091,10 +1087,8 @@ if ($step == 4 && $datatoexport)
|
|||||||
{
|
{
|
||||||
$num = $db->num_rows($resql);
|
$num = $db->num_rows($resql);
|
||||||
$i = 0;
|
$i = 0;
|
||||||
$var=false;
|
|
||||||
while ($i < $num)
|
while ($i < $num)
|
||||||
{
|
{
|
||||||
|
|
||||||
$obj = $db->fetch_object($resql);
|
$obj = $db->fetch_object($resql);
|
||||||
print '<tr class="oddeven"><td>';
|
print '<tr class="oddeven"><td>';
|
||||||
print $obj->label;
|
print $obj->label;
|
||||||
@ -1229,8 +1223,7 @@ if ($step == 5 && $datatoexport)
|
|||||||
|
|
||||||
print $langs->trans("NowClickToGenerateToBuildExportFile").'<br>';
|
print $langs->trans("NowClickToGenerateToBuildExportFile").'<br>';
|
||||||
|
|
||||||
// Liste des formats d'exports disponibles
|
// List of available export formats
|
||||||
$var=true;
|
|
||||||
print '<table class="noborder" width="100%">';
|
print '<table class="noborder" width="100%">';
|
||||||
print '<tr class="liste_titre">';
|
print '<tr class="liste_titre">';
|
||||||
print '<td class="titlefield">'.$langs->trans("AvailableFormats").'</td>';
|
print '<td class="titlefield">'.$langs->trans("AvailableFormats").'</td>';
|
||||||
@ -1248,7 +1241,6 @@ if ($step == 5 && $datatoexport)
|
|||||||
unset($liste[$key]);
|
unset($liste[$key]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
print '<tr class="oddeven">';
|
print '<tr class="oddeven">';
|
||||||
print '<td width="16">'.img_picto_common($key,$objmodelexport->getPictoForKey($key)).' ';
|
print '<td width="16">'.img_picto_common($key,$objmodelexport->getPictoForKey($key)).' ';
|
||||||
$text=$objmodelexport->getDriverDescForKey($key);
|
$text=$objmodelexport->getDriverDescForKey($key);
|
||||||
|
|||||||
@ -60,7 +60,6 @@ print '<td>'.$langs->trans("Module").'</td>';
|
|||||||
print '<td>'.$langs->trans("ExportableDatas").'</td>';
|
print '<td>'.$langs->trans("ExportableDatas").'</td>';
|
||||||
//print '<td> </td>';
|
//print '<td> </td>';
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
$var=true;
|
|
||||||
if (count($export->array_export_code))
|
if (count($export->array_export_code))
|
||||||
{
|
{
|
||||||
foreach ($export->array_export_code as $key => $value)
|
foreach ($export->array_export_code as $key => $value)
|
||||||
@ -112,8 +111,7 @@ print '<br>';
|
|||||||
//print '</div><div class="fichehalfright"><div class="ficheaddleft">';
|
//print '</div><div class="fichehalfright"><div class="ficheaddleft">';
|
||||||
|
|
||||||
|
|
||||||
// List of available export format
|
// List of available export formats
|
||||||
$var=true;
|
|
||||||
print '<table class="noborder" width="100%">';
|
print '<table class="noborder" width="100%">';
|
||||||
print '<tr class="liste_titre">';
|
print '<tr class="liste_titre">';
|
||||||
print '<td colspan="2">'.$langs->trans("AvailableFormats").'</td>';
|
print '<td colspan="2">'.$langs->trans("AvailableFormats").'</td>';
|
||||||
@ -125,7 +123,6 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/export/modules_export.php';
|
|||||||
$model=new ModeleExports($db);
|
$model=new ModeleExports($db);
|
||||||
$liste=$model->liste_modeles($db); // This is not a static method for exports because method load non static properties
|
$liste=$model->liste_modeles($db); // This is not a static method for exports because method load non static properties
|
||||||
|
|
||||||
$var=true;
|
|
||||||
foreach($liste as $key => $val)
|
foreach($liste as $key => $val)
|
||||||
{
|
{
|
||||||
if (preg_match('/__\(Disabled\)__/',$liste[$key]))
|
if (preg_match('/__\(Disabled\)__/',$liste[$key]))
|
||||||
@ -133,7 +130,6 @@ foreach($liste as $key => $val)
|
|||||||
$liste[$key]=preg_replace('/__\(Disabled\)__/','('.$langs->transnoentitiesnoconv("Disabled").')',$liste[$key]);
|
$liste[$key]=preg_replace('/__\(Disabled\)__/','('.$langs->transnoentitiesnoconv("Disabled").')',$liste[$key]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
print '<tr class="oddeven">';
|
print '<tr class="oddeven">';
|
||||||
print '<td width="16">'.img_picto_common($model->getDriverLabelForKey($key),$model->getPictoForKey($key)).'</td>';
|
print '<td width="16">'.img_picto_common($model->getDriverLabelForKey($key),$model->getPictoForKey($key)).'</td>';
|
||||||
$text=$model->getDriverDescForKey($key);
|
$text=$model->getDriverDescForKey($key);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user