Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Qual: Remove end php tag.

Browse Source
This commit is contained in:
Laurent Destailleur 2014-07-08 01:02:30 +02:00
parent 3c81c99656
commit 90a5f6c7ef
38 changed files with 75 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/admin/commande.php
View File

@ -534,4 +534,3 @@ print '<br>';
llxFooter();
$db->close();
?>

1
htdocs/admin/menus/other.php
View File

@ -143,4 +143,3 @@ print '</table>';
llxFooter();
$db->close();
?>

7
htdocs/admin/stock.php
View File

@ -77,7 +77,7 @@ if($action)
if($action == 'STOCK_USE_VIRTUAL_STOCK') {
$res = dolibarr_set_const($db, "STOCK_USE_VIRTUAL_STOCK", GETPOST('STOCK_USE_VIRTUAL_STOCK','alpha'),'chaine',0,'',$conf->entity);
}
if($action == 'STOCK_MUST_BE_ENOUGH_FOR_INVOICE') {
$res = dolibarr_set_const($db, "STOCK_MUST_BE_ENOUGH_FOR_INVOICE", GETPOST('STOCK_MUST_BE_ENOUGH_FOR_INVOICE','alpha'),'chaine',0,'',$conf->entity);
}
@ -329,7 +329,6 @@ if ($virtualdiffersfromphysical)
print '</table>';
}
$db->close();
llxFooter();
?>
$db->close();

7
htdocs/admin/system/database.php
View File

@ -81,7 +81,7 @@ else
print '<td width="300">'.$langs->trans("Parameters").'</td>';
print '<td>'.$langs->trans("Value").'</td>';
print '</tr>'."\n";
// arraytest is an array of test to do
$arraytest=array();
if (preg_match('/mysql/i',$db->type))
@ -91,7 +91,7 @@ else
'collation_database'=>array('var'=>'dolibarr_main_db_collation','valifempty'=>'utf8_general_ci')
);
}
$listtouse=array();
if ($listname == 'listofvars') $listtouse=$listofvars;
if ($listname == 'listofstatus') $listtouse=$listofstatus;
@ -124,4 +124,5 @@ else
}
llxFooter();
?>
$db->close();

2
htdocs/admin/system/dbtable.php
View File

@ -129,5 +129,5 @@ else
}
llxFooter();
$db->close();
?>

1
htdocs/admin/system/dolibarr.php
View File

@ -379,4 +379,3 @@ print '</table>';
llxFooter();
$db->close();
?>

1
htdocs/admin/system/index.php
View File

@ -119,4 +119,3 @@ llxFooter();
$db->close();
?>

1
htdocs/admin/tools/eaccelerator.php
View File

@ -350,4 +350,3 @@ print "<br><br>";
llxFooter();
$db->close();
?>

2
htdocs/admin/tools/purge.php
View File

@ -165,5 +165,5 @@ if (preg_match('/^confirm/i',$choice))
llxFooter();
$db->close();
?>

2
htdocs/admin/tools/update.php
View File

@ -173,5 +173,5 @@ if (! empty($result['return']))
}
llxFooter();
$db->close();
?>

1
htdocs/admin/translation.php
View File

@ -69,4 +69,3 @@ print $langs->trans("SeeAlso").': <a href="'.$urlwikitranslatordoc.'" target="_b
llxFooter();
$db->close();
?>

1
htdocs/admin/workflow.php
View File

@ -146,4 +146,3 @@ print '</table>';
llxFooter();
$db->close();
?>

1
htdocs/cashdesk/affIndex.php
View File

@ -76,4 +76,3 @@ include_once 'affPied.php';
print '</div></div></div>'."\n";
print '</body></html>'."\n";
?>

2
htdocs/cashdesk/facturation.php
View File

@ -191,5 +191,3 @@ $obj_facturation->paiementLe('RESET');
// Affichage des templates
require ('tpl/facturation1.tpl.php');
?>

1
htdocs/cashdesk/include/keypad.php
View File

@ -50,4 +50,3 @@ function genkeypad($keypadname, $formname)
$sz.='</div>';
return $sz;
}
?>

2
htdocs/categories/viewcat.php
View File

@ -519,5 +519,5 @@ if($object->type == 4)
llxFooter();
$db->close();
?>

7
htdocs/comm/action/class/actioncomm.class.php
View File

@ -229,7 +229,7 @@ class ActionComm extends CommonObject
{
// Call trigger
$result=$this->call_trigger('ACTION_CREATE',$user);
if ($result < 0) { $error++; }
if ($result < 0) { $error++; }
// End call triggers
}
@ -387,7 +387,7 @@ class ActionComm extends CommonObject
{
// Call trigger
$result=$this->call_trigger('ACTION_DELETE',$user);
if ($result < 0) { $error++; }
if ($result < 0) { $error++; }
// End call triggers
}
@ -492,7 +492,7 @@ class ActionComm extends CommonObject
{
// Call trigger
$result=$this->call_trigger('ACTION_MODIFY',$user);
if ($result < 0) { $error++; }
if ($result < 0) { $error++; }
// End call triggers
}
@ -1054,4 +1054,3 @@ class ActionComm extends CommonObject
}
?>

10
htdocs/comm/fiche.php
View File

@ -309,7 +309,7 @@ if ($id > 0)
print yn($object->localtax2_assuj);
print '</td></tr>';
}
// TVA Intra
print '<tr><td class="nowrap">'.$langs->trans('VATIntra').'</td><td colspan="3">';
@ -819,11 +819,11 @@ if ($id > 0)
/*
* Barre d'actions
*/
$parameters = array();
$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been
print '<div class="tabsAction">';
if (! empty($conf->propal->enabled) && $user->rights->propal->creer)
@ -930,5 +930,5 @@ dol_htmloutput_mesg('',$mesgs);
// End of page
llxFooter();
$db->close();
?>

8
htdocs/commande/customer.php
View File

@ -156,7 +156,7 @@ if ($resql)
print "<tr ".$bc[$var].">";
print '<td>';
$result='';
$lien=$lienfin='';
$lien = '<a href="'.dol_buildpath('/commande/orderstoinvoice.php',1).'?socid='.$obj->rowid.'">';
@ -164,7 +164,7 @@ if ($resql)
$name=$obj->nom;
$result.=($lien.img_object($langs->trans("ShowCompany").': '.$name,'company').$lienfin);
$result.=$lien.(dol_trunc($name,$maxlen)).$lienfin;
print $result;
print '</td>';
print '<td>'.$obj->town.'&nbsp;</td>';
@ -185,7 +185,7 @@ else
dol_print_error($db);
}
llxFooter();
$db->close();
llxFooter();
?>

1
htdocs/compta/facture/apercu.php
View File

@ -420,4 +420,3 @@ elseif (file_exists($fileimagebis))
$db->close();
llxFooter();
?>

67
htdocs/compta/localtax/quadri_detail.php
View File

@ -315,7 +315,7 @@ else
if ($modetax == 0) $span+=2;
//print '<tr><td colspan="'.($span+1).'">'..')</td></tr>';
if($conf->global->$calc ==0 || $conf->global->$calc == 2){
// Customers invoices
print '<tr class="liste_titre">';
@ -329,20 +329,20 @@ else
print '<td align="right">'.$langs->trans("BI").'</td>';
print '<td align="right">'.$vatcust.'</td>';
print '</tr>';
$LT=0;
$sameLT=false;
foreach(array_keys($x_coll) as $rate)
{
$subtot_coll_total_ht = 0;
$subtot_coll_vat = 0;
if (is_array($x_both[$rate]['coll']['detail']))
{
// VAT Rate
$var=true;
if($rate!=0){
print "<tr>";
//print '<td class="tax_rate">'.$langs->trans("Rate").': '.vatrate($rate).'%</td><td colspan="'.$span.'"></td>';
@ -359,13 +359,13 @@ else
// was not saved.
if (! empty($fields['ddate_start'])) $type=1;
if (! empty($fields['ddate_end'])) $type=1;
$var=!$var;
print '<tr '.$bc[$var].'>';
// Ref
print '<td class="nowrap" align="left">'.$fields['link'].'</td>';
// Description
print '<td align="left">';
if ($fields['pid'])
@ -387,12 +387,12 @@ else
else $fields['descr']=$langs->transnoentitiesnoconv($reg[1]);
}
print $text.' '.dol_trunc(dol_string_nohtmltag($fields['descr']),16);
// Show range
print_date_range($fields['ddate_start'],$fields['ddate_end']);
}
print '</td>';
// Total HT
if ($modetax == 0)
{
@ -406,7 +406,7 @@ else
}
print '</td>';
}
// Payment
$ratiopaymentinvoice=1;
if ($modetax == 0)
@ -429,14 +429,14 @@ else
}
print '</td>';
}
// Total collected
print '<td class="nowrap" align="right">';
$temp_ht=$fields['totalht'];
if ($type == 1) $temp_ht=$fields['totalht']*$ratiopaymentinvoice;
print price(price2num($temp_ht,'MT'));
print '</td>';
// Localtax
print '<td class="nowrap" align="right">';
$temp_vat= $local==1?$fields['localtax1']:$fields['localtax2'];
@ -444,7 +444,7 @@ else
//print price($fields['vat']);
print '</td>';
print '</tr>';
$subtot_coll_total_ht += $temp_ht;
$subtot_coll_vat += $temp_vat;
$x_coll_sum += $temp_vat;
@ -466,7 +466,7 @@ else
print '</tr>';
}
}
if (count($x_coll) == 0) // Show a total ine if nothing shown
{
print '<tr class="liste_total">';
@ -481,13 +481,13 @@ else
print '<td class="nowrap" align="right">'.price(price2num(0,'MT')).'</td>';
print '</tr>';
}
// Blank line
print '<tr><td colspan="'.($span+1).'">&nbsp;</td></tr>';
print '</table>';
$diff=$x_coll_sum;
}
if($conf->global->$calc ==0 || $conf->global->$calc == 1){
echo '<table class="noborder" width="100%">';
//print table headers for this quadri - expenses now
@ -503,12 +503,12 @@ else
print '<td align="right">'.$langs->trans("BI").'</td>';
print '<td align="right">'.$vatsup.'</td>';
print '</tr>'."\n";
foreach(array_keys($x_paye) as $rate)
{
$subtot_paye_total_ht = 0;
$subtot_paye_vat = 0;
if(is_array($x_both[$rate]['paye']['detail']))
{
$var=true;
@ -526,13 +526,13 @@ else
// was not saved.
if (! empty($fields['ddate_start'])) $type=1;
if (! empty($fields['ddate_end'])) $type=1;
$var=!$var;
print '<tr '.$bc[$var].'>';
// Ref
print '<td class="nowrap" align="left">'.$fields['link'].'</td>';
// Description
print '<td align="left">';
if ($fields['pid'])
@ -548,12 +548,12 @@ else
if ($type) $text = img_object($langs->trans('Service'),'service');
else $text = img_object($langs->trans('Product'),'product');
print $text.' '.dol_trunc(dol_string_nohtmltag($fields['descr']),16);
// Show range
print_date_range($fields['ddate_start'],$fields['ddate_end']);
}
print '</td>';
// Total HT
if ($modetax == 0)
{
@ -567,7 +567,7 @@ else
}
print '</td>';
}
// Payment
$ratiopaymentinvoice=1;
if ($modetax == 0)
@ -590,22 +590,22 @@ else
}
print '</td>';
}
// VAT paid
print '<td class="nowrap" align="right">';
$temp_ht=$fields['totalht'];
if ($type == 1) $temp_ht=$fields['totalht']*$ratiopaymentinvoice;
print price(price2num($temp_ht,'MT'));
print '</td>';
// Localtax
print '<td class="nowrap" align="right">';
$temp_vat= $local==1?$fields['localtax1']:$fields['localtax2'];
print price(price2num($temp_vat,'MT'));
print price(price2num($temp_vat,'MT'));
//print price($fields['vat']);
print '</td>';
print '</tr>';
$subtot_paye_total_ht += $temp_ht;
$subtot_paye_vat += $temp_vat;
$x_paye_sum += $temp_vat;
@ -627,7 +627,7 @@ else
print '</tr>';
}
}
if (count($x_paye) == 0) // Show a total ine if nothing shown
{
print '<tr class="liste_total">';
@ -642,11 +642,11 @@ else
print '<td class="nowrap" align="right">'.price(price2num(0,'MT')).'</td>';
print '</tr>';
}
print '</table>';
$diff=$x_paye_sum;
}
if($conf->global->$calc ==0){$diff=$x_coll_sum - $x_paye_sum;}
echo '<table class="noborder" width="100%">';
// Total to pay
@ -659,11 +659,10 @@ else
print "</tr>\n";
echo '</table>';
$i++;
}
$db->close();
llxFooter();
?>

1
htdocs/core/boxes/box_factures.php
View File

@ -158,4 +158,3 @@ class box_factures extends ModeleBoxes
}
}
?>

18
htdocs/core/boxes/box_project.php
View File

@ -57,16 +57,16 @@ class box_project extends ModeleBoxes
function loadBox($max=5)
{
global $conf, $user, $langs, $db;
$this->max=$max;
$totalMnt = 0;
$totalnb = 0;
$totalnbTask=0;
include_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/project.lib.php");
$projectstatic=new Project($db);
$textHead = $langs->trans("Projet");
@ -75,7 +75,7 @@ class box_project extends ModeleBoxes
// list the summary of the orders
if ($user->rights->projet->lire)
{
$sql = "SELECT p.rowid, p.ref, p.title, p.fk_statut ";
$sql.= " FROM (".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."projet as p";
$sql.= ")";
@ -97,7 +97,7 @@ class box_project extends ModeleBoxes
$objp = $db->fetch_object($result);
$projectstatic->fetch($objp->rowid);
$this->info_box_contents[$i][1] = array('td' => 'align="left"',
'text' =>$projectstatic->getNomUrl(1)
);
@ -105,7 +105,7 @@ class box_project extends ModeleBoxes
$this->info_box_contents[$i][2] = array('td' => 'align="left"',
'text' => $objp->title
);
$sql ="SELECT count(*) as nb, sum(progress) as totprogress";
$sql.=" FROM ".MAIN_DB_PREFIX."projet_task as pt, ".MAIN_DB_PREFIX."projet as p";
$sql.=" WHERE pt.fk_projet = p.rowid";
@ -137,8 +137,8 @@ class box_project extends ModeleBoxes
$this->info_box_contents[$i][0] = array('tr' => 'class="liste_total"', 'td' => 'colspan=2 align="left" ', 'text' => $langs->trans("Total")."&nbsp;".$textHead);
$this->info_box_contents[$i][1] = array('td' => 'align="right" ', 'text' => number_format($num, 0, ',', ' ')."&nbsp;".$langs->trans("Projects"));
$this->info_box_contents[$i][2] = array('td' => 'align="right" ', 'text' => number_format($totalnbTask, 0, ',', ' ')."&nbsp;".$langs->trans("Tasks"));
$this->info_box_contents[$i][4] = array('td' => 'colspan=2', 'text' => "");
$this->info_box_contents[$i][4] = array('td' => 'colspan=2', 'text' => "");
}
/**
@ -153,4 +153,4 @@ class box_project extends ModeleBoxes
parent::showBox($this->info_box_head, $this->info_box_contents);
}
}
?>

19
htdocs/core/boxes/box_task.php
View File

@ -51,7 +51,7 @@ class box_task extends ModeleBoxes
$langs->load("projects");
$this->boxlabel="Tasks";
}
/**
* Load data for box to show them later
*
@ -61,23 +61,23 @@ class box_task extends ModeleBoxes
function loadBox($max=5)
{
global $conf, $user, $langs, $db;
$this->max=$max;
$totalMnt = 0;
$totalnb = 0;
$totalDuree=0;
include_once(DOL_DOCUMENT_ROOT."/projet/class/task.class.php");
$taskstatic=new Task($db);
$textHead = $langs->trans("Tasks")."&nbsp;".date("Y");
$this->info_box_head = array('text' => $textHead, 'limit'=> dol_strlen($textHead));
// list the summary of the orders
if ($user->rights->projet->lire)
{
$sql = "SELECT pt.fk_statut, count(pt.rowid) as nb, sum(ptt.task_duration) as durationtot, sum(pt.planned_workload) as plannedtot";
$sql.= " FROM ".MAIN_DB_PREFIX."projet_task as pt, ".MAIN_DB_PREFIX."projet_task_time as ptt";
$sql.= " WHERE DATE_FORMAT(pt.datec,'%Y') = ".date("Y")." ";
@ -110,7 +110,7 @@ class box_task extends ModeleBoxes
$totalplannedtot += $objp->plannedtot;
$this->info_box_contents[$i][4] = array('td' => 'align="right"', 'text' => ConvertSecondToTime($objp->durationtot,'all',25200,5));
$totaldurationtot += $objp->durationtot;
$this->info_box_contents[$i][5] = array('td' => 'align="right" width="18"', 'text' => $taskstatic->LibStatut($objp->fk_statut,3));
$i++;
@ -124,8 +124,8 @@ class box_task extends ModeleBoxes
$this->info_box_contents[$i][1] = array('td' => 'align="right" ', 'text' => number_format($totalnb, 0, ',', ' ')."&nbsp;".$langs->trans("Tasks"));
$this->info_box_contents[$i][2] = array('td' => 'align="right" ', 'text' => ConvertSecondToTime($totalplannedtot,'all',25200,5));
$this->info_box_contents[$i][3] = array('td' => 'align="right" ', 'text' => ConvertSecondToTime($totaldurationtot,'all',25200,5));
$this->info_box_contents[$i][4] = array('td' => 'colspan=2', 'text' => "");
$this->info_box_contents[$i][4] = array('td' => 'colspan=2', 'text' => "");
}
/**
@ -140,4 +140,3 @@ class box_task extends ModeleBoxes
parent::showBox($this->info_box_head, $this->info_box_contents);
}
}
?>

1
htdocs/core/class/dolprintipp.class.php
View File

@ -201,4 +201,3 @@ class dolprintIPP
return $ipp->printer_attributes;
}
}
?>

2
htdocs/core/lib/holiday.lib.php
View File

@ -49,5 +49,3 @@ function holiday_prepare_head($object)
return $head;
}
?>

2
htdocs/core/lib/product.lib.php
View File

@ -357,5 +357,3 @@ function measuring_units_string($unit,$measuring_style='')
return $measuring_units[$unit];
}
?>

4
htdocs/core/lib/trip.lib.php
View File

@ -54,10 +54,8 @@ function trip_prepare_head($object)
$head[$h][1] = $langs->trans("Info");
$head[$h][2] = 'info';
$h++;
complete_head_from_modules($conf,$langs,$object,$head,$h,'trip','remove');
return $head;
}
?>

1
htdocs/core/lib/usergroups.lib.php
View File

@ -342,4 +342,3 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
print '</table>';
}
?>

2
htdocs/core/login/functions_empty.php
View File

@ -39,5 +39,3 @@ function check_user_password_empty($usertotest,$passwordtotest,$entitytotest)
return $login;
}
?>

2
htdocs/core/login/functions_forceuser.php
View File

@ -47,5 +47,3 @@ function check_user_password_forceuser($usertotest,$passwordtotest,$entitytotest
return $login;
}
?>

2
htdocs/core/login/functions_http.php
View File

@ -44,5 +44,3 @@ function check_user_password_http($usertotest,$passwordtotest,$entitytotest)
return $login;
}
?>

2
htdocs/core/login/functions_ldap.php
View File

@ -227,5 +227,3 @@ function check_user_password_ldap($usertotest,$passwordtotest,$entitytotest)
return $login;
}
?>

2
htdocs/core/login/functions_openid.php
View File

@ -112,5 +112,3 @@ function check_user_password_openid($usertotest,$passwordtotest,$entitytotest)
return $login;
}
?>

1
htdocs/core/menus/standard/auguria.lib.php
View File

@ -431,4 +431,3 @@ function dol_auguria_showmenu($type_user, &$menuentry, &$listofmodulesforexterna
return 1;
}
?>

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

@ -254,4 +254,3 @@ function propale_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0,
}
}
?>

1
htdocs/fichinter/document.php
View File

@ -134,4 +134,3 @@ else
llxFooter();
$db->close();
?>

1
htdocs/holiday/define_holiday.php
View File

@ -190,4 +190,3 @@ dol_fiche_end();
llxFooter();
$db->close();
?>