Skip to content

Commit

Permalink
Checkstyle
Browse files Browse the repository at this point in the history
  • Loading branch information
@eldy
eldy committed Mar 26, 2012
1 parent 66c2d24 commit 52f4f72
Show file tree
Hide file tree
Showing 10 changed files with 50 additions and 38 deletions.
15 changes: 12 additions & 3 deletions htdocs/admin/mails.php
View file
Expand Up @@ -212,9 +212,18 @@

require_once(DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php");
$mailfile = new CMailFile(
$subject, $sendto, $email_from, $body,
$filepath, $mimetype, $filename,
$sendtocc, $sendtoccc, $deliveryreceipt, $msgishtml, $errors_to
$subject,
$sendto,
$email_from,
$body,
$filepath,
$mimetype,
$filename,
$sendtocc,
$sendtoccc,
$deliveryreceipt,
$msgishtml,
$errors_to
);

$result=$mailfile->sendfile();
Expand Down
4 changes: 2 additions & 2 deletions htdocs/cashdesk/affContenu.php
View file
Expand Up @@ -47,8 +47,8 @@

require ('tpl/liste_articles.tpl.php');

$obj_facturation->prix_total_ht($lst_total_ht);
$obj_facturation->prix_total_ttc($lst_total_ttc);
$obj_facturation->prixTotalHt($lst_total_ht);
$obj_facturation->prixTotalTtc($lst_total_ttc);

print '</div>';

Expand Down
12 changes: 6 additions & 6 deletions htdocs/cashdesk/class/Facturation.class.php
View file
Expand Up @@ -253,9 +253,9 @@ private function razPers()
$this->montantRendu('RESET');
$this->paiementLe('RESET');

$this->prix_total_ht('RESET');
$this->montant_tva('RESET');
$this->prix_total_ttc('RESET');
$this->prixTotalHt('RESET');
$this->montantTva('RESET');
$this->prixTotalTtc('RESET');

}

Expand Down Expand Up @@ -588,7 +588,7 @@ public function paiementLe( $aPaiementLe=null )
* @param int $aTotalHt Total amount
* @return int Total amount
*/
public function prix_total_ht( $aTotalHt=null )
public function prixTotalHt( $aTotalHt=null )
{
if ( !$aTotalHt ) {

Expand All @@ -611,7 +611,7 @@ public function prix_total_ht( $aTotalHt=null )
* @param int $aMontantTva Amount vat
* @return int Amount vat
*/
public function montant_tva( $aMontantTva=null )
public function montantTva( $aMontantTva=null )
{
if ( !$aMontantTva ) {

Expand All @@ -635,7 +635,7 @@ public function montant_tva( $aMontantTva=null )
* @param int $aTotalTtc Amount ttc
* @return int Amount ttc
*/
public function prix_total_ttc( $aTotalTtc=null )
public function prixTotalTtc( $aTotalTtc=null )
{
if ( !$aTotalTtc )
{
Expand Down
2 changes: 1 addition & 1 deletion htdocs/cashdesk/tpl/facturation1.tpl.php
View file
Expand Up @@ -169,7 +169,7 @@
<tr><th class="label1"><?php echo $langs->trans("TotalTicket"); ?></th><th class="label1"><?php echo $langs->trans("Received"); ?></th><th class="label1"><?php echo $langs->trans("Change"); ?></th></tr>
<tr>
<!-- Affichage du montant du -->
<td><input class="texte2_off" type="text" name="txtDu" value="<?php echo price2num($obj_facturation->prix_total_ttc(), 'MT'); ?>" disabled="disabled" /></td>
<td><input class="texte2_off" type="text" name="txtDu" value="<?php echo price2num($obj_facturation->prixTotalTtc(), 'MT'); ?>" disabled="disabled" /></td>
<!-- Choix du montant encaisse -->
<td><input class="texte2" type="text" name="txtEncaisse" value="" onkeyup="javascript: verifDifference();" onfocus="javascript: this.select();" /></td>
<!-- Affichage du montant rendu -->
Expand Down
2 changes: 1 addition & 1 deletion htdocs/cashdesk/tpl/liste_articles.tpl.php
View file
Expand Up @@ -68,7 +68,7 @@
}

$obj_facturation->calculTotaux();
$total_ttc = $obj_facturation->prix_total_ttc();
$total_ttc = $obj_facturation->prixTotalTtc();
echo ('<p class="cadre_prix_total">'.$langs->trans("Total").' : '.price2num($total_ttc, 'MT').' '.$conf->currency.'<br></p>'."\n");

?></div>
Expand Down
6 changes: 3 additions & 3 deletions htdocs/cashdesk/tpl/ticket.tpl.php
View file
Expand Up @@ -138,9 +138,9 @@

<table class="totaux">
<?php
echo '<tr><th nowrap="nowrap">'.$langs->trans("TotalHT").'</th><td nowrap="nowrap">'.price2num($obj_facturation->prix_total_ht(),'MT')." ".$conf->currency."</td></tr>\n";
echo '<tr><th nowrap="nowrap">'.$langs->trans("TotalVAT").'</th><td nowrap="nowrap">'.price2num($obj_facturation->montant_tva(),'MT')." ".$conf->currency."</td></tr>\n";
echo '<tr><th nowrap="nowrap">'.$langs->trans("TotalTTC").'</th><td nowrap="nowrap">'.price2num($obj_facturation->prix_total_ttc(),'MT')." ".$conf->currency."</td></tr>\n";
echo '<tr><th nowrap="nowrap">'.$langs->trans("TotalHT").'</th><td nowrap="nowrap">'.price2num($obj_facturation->prixTotalHt(),'MT')." ".$conf->currency."</td></tr>\n";
echo '<tr><th nowrap="nowrap">'.$langs->trans("TotalVAT").'</th><td nowrap="nowrap">'.price2num($obj_facturation->montantTva(),'MT')." ".$conf->currency."</td></tr>\n";
echo '<tr><th nowrap="nowrap">'.$langs->trans("TotalTTC").'</th><td nowrap="nowrap">'.price2num($obj_facturation->prixTotalTtc(),'MT')." ".$conf->currency."</td></tr>\n";
?>
</table>

Expand Down
8 changes: 4 additions & 4 deletions htdocs/cashdesk/tpl/validation1.tpl.php
View file
Expand Up @@ -26,12 +26,12 @@
<table class="table_resume">

<tr><td class="resume_label"><?php echo $langs->trans("Invoice"); ?></td><td><?php echo $obj_facturation->numInvoice(); ?></td></tr>
<tr><td class="resume_label"><?php echo $langs->trans("TotalHT"); ?></td><td><?php echo price2num($obj_facturation->prix_total_ht(),'MT').' '.$conf->currency; ?></td></tr>
<tr><td class="resume_label"><?php echo $langs->trans("TotalHT"); ?></td><td><?php echo price2num($obj_facturation->prixTotalHt(),'MT').' '.$conf->currency; ?></td></tr>
<?php
// Affichage de la tva par taux
if ( $obj_facturation->montant_tva() ) {
if ( $obj_facturation->montantTva() ) {

echo ('<tr><td class="resume_label">'.$langs->trans("VAT").'</td><td>'.price2num($obj_facturation->montant_tva(),'MT').' '.$conf->currency.'</td></tr>');
echo ('<tr><td class="resume_label">'.$langs->trans("VAT").'</td><td>'.price2num($obj_facturation->montantTva(),'MT').' '.$conf->currency.'</td></tr>');

}
else
Expand All @@ -41,7 +41,7 @@

}
?>
<tr><td class="resume_label"><?php echo $langs->trans("TotalTTC"); ?> </td><td><?php echo price2num($obj_facturation->prix_total_ttc(),'MT').' '.$conf->currency; ?></td></tr>
<tr><td class="resume_label"><?php echo $langs->trans("TotalTTC"); ?> </td><td><?php echo price2num($obj_facturation->prixTotalTtc(),'MT').' '.$conf->currency; ?></td></tr>
<tr><td class="resume_label"><?php echo $langs->trans("PaymentMode"); ?> </td><td>
<?php
switch ($obj_facturation->getSetPaymentMode())
Expand Down
14 changes: 7 additions & 7 deletions htdocs/cashdesk/validation_verif.php
View file
Expand Up @@ -57,7 +57,7 @@
// Si paiement autre qu'en especes, montant encaisse = prix total
$mode_reglement = $obj_facturation->getSetPaymentMode();
if ( $mode_reglement != 'ESP' ) {
$montant = $obj_facturation->prix_total_ttc();
$montant = $obj_facturation->prixTotalTtc();
} else {
$montant = $_POST['txtEncaisse'];
}
Expand All @@ -66,7 +66,7 @@
$obj_facturation->montantEncaisse($montant);

//Determination de la somme rendue
$total = $obj_facturation->prix_total_ttc();
$total = $obj_facturation->prixTotalTtc();
$encaisse = $obj_facturation->montantEncaisse();

$obj_facturation->montantRendu($encaisse - $total);
Expand Down Expand Up @@ -198,9 +198,9 @@
$invoice->date_creation=$now;
$invoice->date=$now;
$invoice->date_lim_reglement=0;
$invoice->total_ht=$obj_facturation->prix_total_ht();
$invoice->total_tva=$obj_facturation->montant_tva();
$invoice->total_ttc=$obj_facturation->prix_total_ttc();
$invoice->total_ht=$obj_facturation->prixTotalHt();
$invoice->total_tva=$obj_facturation->montantTva();
$invoice->total_ttc=$obj_facturation->prixTotalTtc();
$invoice->note=$note;
$invoice->cond_reglement_id=$cond_reglement_id;
$invoice->mode_reglement_id=$mode_reglement_id;
Expand Down Expand Up @@ -234,7 +234,7 @@
$payment=new Paiement($db);
$payment->datepaye=$now;
$payment->bank_account=$conf_fkaccount;
$payment->amounts[$invoice->id]=$obj_facturation->prix_total_ttc();
$payment->amounts[$invoice->id]=$obj_facturation->prixTotalTtc();
$payment->note=$langs->trans("Payment").' '.$langs->trans("Invoice").' '.$obj_facturation->numInvoice();
$payment->paiementid=$invoice->mode_reglement_id;
$payment->num_paiement='';
Expand All @@ -254,7 +254,7 @@

if (! $error)
{
if ($invoice->total_ttc == $obj_facturation->prix_total_ttc()
if ($invoice->total_ttc == $obj_facturation->prixTotalTtc()
&& $obj_facturation->getSetPaymentMode() != 'DIFF')
{
// We set status to payed
Expand Down
18 changes: 9 additions & 9 deletions htdocs/core/modules/facture/modules_facture.php
View file
Expand Up @@ -147,15 +147,15 @@ function getVersion()
/**
* Create a document onto disk according to template module.
*
* @param DoliDB $db Database handler
* @param Object $object Object invoice
* @param string $modele Force template to use ('' to not force)
* @param Translate $outputlangs objet lang a utiliser pour traduction
* @param int $hidedetails Hide details of lines
* @param int $hidedesc Hide description
* @param int $hideref Hide ref
* @param HookManager $hookmanager Hook manager instance
* @return int <0 if KO, >0 if OK
* @param DoliDB $db Database handler
* @param Object $object Object invoice
* @param string $modele Force template to use ('' to not force)
* @param Translate $outputlangs objet lang a utiliser pour traduction
* @param int $hidedetails Hide details of lines
* @param int $hidedesc Hide description
* @param int $hideref Hide ref
* @param HookManager $hookmanager Hook manager instance
* @return int <0 if KO, >0 if OK
*/
function facture_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0, $hookmanager=false)
{
Expand Down
7 changes: 5 additions & 2 deletions htdocs/core/modules/fichinter/modules_fichinter.php
View file
Expand Up @@ -30,8 +30,7 @@


/**
* \class ModelePDFFicheinter
* \brief Classe mere des modeles de fiche intervention
* Parent class to manage intervention document templates
*/
abstract class ModelePDFFicheinter extends CommonDocGenerator
{
Expand Down Expand Up @@ -149,6 +148,10 @@ function getVersion()
* @param Object $object Object fichinter
* @param string $modele force le modele a utiliser ('' par defaut)
* @param Translate $outputlangs objet lang a utiliser pour traduction
* @param int $hidedetails Hide details of lines
* @param int $hidedesc Hide description
* @param int $hideref Hide ref
* @param HookManager $hookmanager Hook manager instance
* @return int 0 if KO, 1 if OK
*/
function fichinter_create($db, $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0, $hookmanager=false)
Expand Down

0 comments on commit 52f4f72

Please sign in to comment.