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

Qual: Enhance codesniffer setup

Browse Source
This commit is contained in:
Laurent Destailleur 2012-07-22 14:08:05 +02:00
parent c41c5bf797
commit 0d6baa4288
3 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dev/codesniffer/ruleset.xml
View File

@ -75,8 +75,13 @@
<rule ref="Generic.Functions.FunctionCallArgumentSpacing.NoSpaceAfterComma"> <rule ref="Generic.Functions.FunctionCallArgumentSpacing.NoSpaceAfterComma">
<severity>0</severity> <severity>0</severity>
</rule> </rule>
<rule <rule ref="Generic.Functions.FunctionCallArgumentSpacing.NoSpaceBeforeEquals">
ref="Generic.Functions.FunctionCallArgumentSpacing.TooMuchSpaceAfterComma"> <severity>0</severity>
</rule>
<rule ref="Generic.Functions.FunctionCallArgumentSpacing.NoSpaceAfterEquals">
<severity>0</severity>
</rule>
<rule ref="Generic.Functions.FunctionCallArgumentSpacing.TooMuchSpaceAfterComma">
<severity>0</severity> <severity>0</severity>
</rule> </rule>

4
htdocs/adherents/fiche.php
View File

@ -938,7 +938,7 @@ if ($action == 'edit')
$morphys["phy"] = $langs->trans("Physical"); $morphys["phy"] = $langs->trans("Physical");
$morphys["mor"] = $langs->trans("Morale"); $morphys["mor"] = $langs->trans("Morale");
print '<tr><td><span class="fieldrequired">'.$langs->trans("Nature").'</span></td><td>'; print '<tr><td><span class="fieldrequired">'.$langs->trans("Nature").'</span></td><td>';
print $form->selectarray("morphy", $morphys, isset($_POST["morphy"])?$_POST["morphy"]:$object->morphy); print $form->selectarray("morphy", $morphys, isset($_POST["morphy"])?$_POST["morphy"]:$object->morphy);
print "</td>"; print "</td>";
// Photo // Photo
print '<td align="center" valign="middle" width="25%" rowspan="'.$rowspan.'">'; print '<td align="center" valign="middle" width="25%" rowspan="'.$rowspan.'">';
@ -958,7 +958,7 @@ if ($action == 'edit')
print '<tr><td><span class="fieldrequired">'.$langs->trans("Type").'</span></td><td>'; print '<tr><td><span class="fieldrequired">'.$langs->trans("Type").'</span></td><td>';
if ($user->rights->adherent->creer) if ($user->rights->adherent->creer)
{ {
print $form->selectarray("typeid", $adht->liste_array(), (isset($_POST["typeid"])?$_POST["typeid"]:$object->typeid)); print $form->selectarray("typeid", $adht->liste_array(), (isset($_POST["typeid"])?$_POST["typeid"]:$object->typeid));
} }
else else
{ {

14
htdocs/margin/productMargins.php
View File

@ -54,9 +54,9 @@ $pageprev = $page - 1;
$pagenext = $page + 1; $pagenext = $page + 1;
if (!empty($_POST['startdatemonth'])) if (!empty($_POST['startdatemonth']))
$startdate = date('Y-m-d', dol_mktime(12, 0, 0, $_POST['startdatemonth'], $_POST['startdateday'], $_POST['startdateyear'])); $startdate = date('Y-m-d', dol_mktime(12, 0, 0, $_POST['startdatemonth'], $_POST['startdateday'], $_POST['startdateyear']));
if (!empty($_POST['enddatemonth'])) if (!empty($_POST['enddatemonth']))
$enddate = date('Y-m-d', dol_mktime(12, 0, 0, $_POST['enddatemonth'], $_POST['enddateday'], $_POST['enddateyear'])); $enddate = date('Y-m-d', dol_mktime(12, 0, 0, $_POST['enddatemonth'], $_POST['enddateday'], $_POST['enddateyear']));
/* /*
* View * View
@ -76,7 +76,7 @@ print_fiche_titre($text);
// Show tabs // Show tabs
$head=marges_prepare_head($user); $head=marges_prepare_head($user);
$titre=$langs->trans("Margins"); $titre=$langs->trans("Margins");
$picto='marges@marges'; $picto='marges';
dol_fiche_head($head, 'productMargins', $titre, 0, $picto); dol_fiche_head($head, 'productMargins', $titre, 0, $picto);
print '<form method="post" name="sel">'; print '<form method="post" name="sel">';
@ -89,7 +89,7 @@ if ($id > 0) {
print '<tr><td width="20%">'.$langs->trans('ChooseProduct/Service').'</td>'; print '<tr><td width="20%">'.$langs->trans('ChooseProduct/Service').'</td>';
print '<td colspan="4">'; print '<td colspan="4">';
print $form->select_produits($selected=$id,$htmlname='id',$filtertype='',$limit=20,$price_level=0,$status=1,$finished=2,$selected_input_value='',$hidelabel=1); print $form->select_produits($selected=$id, $htmlname='id', $filtertype='', $limit=20, $price_level=0, $status=1, $finished=2, $selected_input_value='', $hidelabel=1);
print '</td></tr>'; print '</td></tr>';
print '<tr><td width="20%">'.$langs->trans('AllProducts').'</td>'; print '<tr><td width="20%">'.$langs->trans('AllProducts').'</td>';
@ -101,7 +101,7 @@ if ($id > 0) {
else { else {
print '<tr><td width="20%">'.$langs->trans('ChooseProduct/Service').'</td>'; print '<tr><td width="20%">'.$langs->trans('ChooseProduct/Service').'</td>';
print '<td colspan="4">'; print '<td colspan="4">';
print $form->select_produits($selected='',$htmlname='id',$filtertype='',$limit=20,$price_level=0,$status=1,$finished=2,$selected_input_value='',$hidelabel=1); print $form->select_produits($selected='', $htmlname='id', $filtertype='', $limit=20, $price_level=0, $status=1, $finished=2, $selected_input_value='', $hidelabel=1);
print '</td></tr>'; print '</td></tr>';
if (! $sortorder) $sortorder="ASC"; if (! $sortorder) $sortorder="ASC";
if (! $sortfield) $sortfield="p.ref"; if (! $sortfield) $sortfield="p.ref";
@ -206,8 +206,8 @@ if ($result)
{ {
$objp = $db->fetch_object($result); $objp = $db->fetch_object($result);
$marginRate = ($objp->buying_price != 0)?(100 * round($objp->marge / $objp->buying_price ,5)):'' ; $marginRate = ($objp->buying_price != 0)?(100 * round($objp->marge / $objp->buying_price, 5)):'' ;
$markRate = ($objp->selling_price != 0)?(100 * round($objp->marge / $objp->selling_price ,5)):'' ; $markRate = ($objp->selling_price != 0)?(100 * round($objp->marge / $objp->selling_price, 5)):'' ;
$var=!$var; $var=!$var;