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

Checkstyle

Browse Source
This commit is contained in:
Laurent Destailleur 2012-03-26 22:39:43 +02:00
parent 66c2d24b9e
commit 52f4f72e6f
10 changed files with 50 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
htdocs/admin/mails.php
View File

@ -212,9 +212,18 @@ if (($action == 'send' || $action == 'sendhtml')
require_once(DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php");
$mailfile = new CMailFile( $mailfile = new CMailFile(
$subject, $sendto, $email_from, $body, $subject,
$filepath, $mimetype, $filename, $sendto,
$sendtocc, $sendtoccc, $deliveryreceipt, $msgishtml, $errors_to $email_from,
$body,
$filepath,
$mimetype,
$filename,
$sendtocc,
$sendtoccc,
$deliveryreceipt,
$msgishtml,
$errors_to
); );
$result=$mailfile->sendfile(); $result=$mailfile->sendfile();

4
htdocs/cashdesk/affContenu.php
View File

@ -47,8 +47,8 @@ print '<div class="liste_articles">';
require ('tpl/liste_articles.tpl.php'); require ('tpl/liste_articles.tpl.php');
$obj_facturation->prix_total_ht($lst_total_ht); $obj_facturation->prixTotalHt($lst_total_ht);
$obj_facturation->prix_total_ttc($lst_total_ttc); $obj_facturation->prixTotalTtc($lst_total_ttc);
print '</div>'; print '</div>';

12
htdocs/cashdesk/class/Facturation.class.php
View File

@ -253,9 +253,9 @@ class Facturation
$this->montantRendu('RESET'); $this->montantRendu('RESET');
$this->paiementLe('RESET'); $this->paiementLe('RESET');
$this->prix_total_ht('RESET'); $this->prixTotalHt('RESET');
$this->montant_tva('RESET'); $this->montantTva('RESET');
$this->prix_total_ttc('RESET'); $this->prixTotalTtc('RESET');
} }
@ -588,7 +588,7 @@ class Facturation
* @param int $aTotalHt Total amount * @param int $aTotalHt Total amount
* @return int Total amount * @return int Total amount
*/ */
public function prix_total_ht( $aTotalHt=null ) public function prixTotalHt( $aTotalHt=null )
{ {
if ( !$aTotalHt ) { if ( !$aTotalHt ) {
@ -611,7 +611,7 @@ class Facturation
* @param int $aMontantTva Amount vat * @param int $aMontantTva Amount vat
* @return int Amount vat * @return int Amount vat
*/ */
public function montant_tva( $aMontantTva=null ) public function montantTva( $aMontantTva=null )
{ {
if ( !$aMontantTva ) { if ( !$aMontantTva ) {
@ -635,7 +635,7 @@ class Facturation
* @param int $aTotalTtc Amount ttc * @param int $aTotalTtc Amount ttc
* @return int Amount ttc * @return int Amount ttc
*/ */
public function prix_total_ttc( $aTotalTtc=null ) public function prixTotalTtc( $aTotalTtc=null )
{ {
if ( !$aTotalTtc ) if ( !$aTotalTtc )
{ {

2
htdocs/cashdesk/tpl/facturation1.tpl.php
View File

@ -169,7 +169,7 @@ $langs->load("cashdesk");
<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><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> <tr>
<!-- Affichage du montant du --> <!-- 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 --> <!-- Choix du montant encaisse -->
<td><input class="texte2" type="text" name="txtEncaisse" value="" onkeyup="javascript: verifDifference();" onfocus="javascript: this.select();" /></td> <td><input class="texte2" type="text" name="txtEncaisse" value="" onkeyup="javascript: verifDifference();" onfocus="javascript: this.select();" /></td>
<!-- Affichage du montant rendu --> <!-- Affichage du montant rendu -->

2
htdocs/cashdesk/tpl/liste_articles.tpl.php
View File

@ -68,7 +68,7 @@ else
} }
$obj_facturation->calculTotaux(); $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"); echo ('<p class="cadre_prix_total">'.$langs->trans("Total").' : '.price2num($total_ttc, 'MT').' '.$conf->currency.'<br></p>'."\n");
?></div> ?></div>

6
htdocs/cashdesk/tpl/ticket.tpl.php
View File

@ -138,9 +138,9 @@ print $object->ref;
<table class="totaux"> <table class="totaux">
<?php <?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("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->montant_tva(),'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->prix_total_ttc(),'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> </table>

8
htdocs/cashdesk/tpl/validation1.tpl.php
View File

@ -26,12 +26,12 @@ $langs->load("main");
<table class="table_resume"> <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("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 <?php
// Affichage de la tva par taux // 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 else
@ -41,7 +41,7 @@ $langs->load("main");
} }
?> ?>
<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> <tr><td class="resume_label"><?php echo $langs->trans("PaymentMode"); ?> </td><td>
<?php <?php
switch ($obj_facturation->getSetPaymentMode()) switch ($obj_facturation->getSetPaymentMode())

14
htdocs/cashdesk/validation_verif.php
View File

@ -57,7 +57,7 @@ switch ($action)
// Si paiement autre qu'en especes, montant encaisse = prix total // Si paiement autre qu'en especes, montant encaisse = prix total
$mode_reglement = $obj_facturation->getSetPaymentMode(); $mode_reglement = $obj_facturation->getSetPaymentMode();
if ( $mode_reglement != 'ESP' ) { if ( $mode_reglement != 'ESP' ) {
$montant = $obj_facturation->prix_total_ttc(); $montant = $obj_facturation->prixTotalTtc();
} else { } else {
$montant = $_POST['txtEncaisse']; $montant = $_POST['txtEncaisse'];
} }
@ -66,7 +66,7 @@ switch ($action)
$obj_facturation->montantEncaisse($montant); $obj_facturation->montantEncaisse($montant);
//Determination de la somme rendue //Determination de la somme rendue
$total = $obj_facturation->prix_total_ttc(); $total = $obj_facturation->prixTotalTtc();
$encaisse = $obj_facturation->montantEncaisse(); $encaisse = $obj_facturation->montantEncaisse();
$obj_facturation->montantRendu($encaisse - $total); $obj_facturation->montantRendu($encaisse - $total);
@ -198,9 +198,9 @@ switch ($action)
$invoice->date_creation=$now; $invoice->date_creation=$now;
$invoice->date=$now; $invoice->date=$now;
$invoice->date_lim_reglement=0; $invoice->date_lim_reglement=0;
$invoice->total_ht=$obj_facturation->prix_total_ht(); $invoice->total_ht=$obj_facturation->prixTotalHt();
$invoice->total_tva=$obj_facturation->montant_tva(); $invoice->total_tva=$obj_facturation->montantTva();
$invoice->total_ttc=$obj_facturation->prix_total_ttc(); $invoice->total_ttc=$obj_facturation->prixTotalTtc();
$invoice->note=$note; $invoice->note=$note;
$invoice->cond_reglement_id=$cond_reglement_id; $invoice->cond_reglement_id=$cond_reglement_id;
$invoice->mode_reglement_id=$mode_reglement_id; $invoice->mode_reglement_id=$mode_reglement_id;
@ -234,7 +234,7 @@ switch ($action)
$payment=new Paiement($db); $payment=new Paiement($db);
$payment->datepaye=$now; $payment->datepaye=$now;
$payment->bank_account=$conf_fkaccount; $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->note=$langs->trans("Payment").' '.$langs->trans("Invoice").' '.$obj_facturation->numInvoice();
$payment->paiementid=$invoice->mode_reglement_id; $payment->paiementid=$invoice->mode_reglement_id;
$payment->num_paiement=''; $payment->num_paiement='';
@ -254,7 +254,7 @@ switch ($action)
if (! $error) if (! $error)
{ {
if ($invoice->total_ttc == $obj_facturation->prix_total_ttc() if ($invoice->total_ttc == $obj_facturation->prixTotalTtc()
&& $obj_facturation->getSetPaymentMode() != 'DIFF') && $obj_facturation->getSetPaymentMode() != 'DIFF')
{ {
// We set status to payed // We set status to payed

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

@ -147,15 +147,15 @@ abstract class ModeleNumRefFactures
/** /**
* Create a document onto disk according to template module. * Create a document onto disk according to template module.
* *
* @param DoliDB $db Database handler * @param DoliDB $db Database handler
* @param Object $object Object invoice * @param Object $object Object invoice
* @param string $modele Force template to use ('' to not force) * @param string $modele Force template to use ('' to not force)
* @param Translate $outputlangs objet lang a utiliser pour traduction * @param Translate $outputlangs objet lang a utiliser pour traduction
* @param int $hidedetails Hide details of lines * @param int $hidedetails Hide details of lines
* @param int $hidedesc Hide description * @param int $hidedesc Hide description
* @param int $hideref Hide ref * @param int $hideref Hide ref
* @param HookManager $hookmanager Hook manager instance * @param HookManager $hookmanager Hook manager instance
* @return int <0 if KO, >0 if OK * @return int <0 if KO, >0 if OK
*/ */
function facture_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0, $hookmanager=false) function facture_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0, $hookmanager=false)
{ {

7
htdocs/core/modules/fichinter/modules_fichinter.php
View File

@ -30,8 +30,7 @@ require_once(DOL_DOCUMENT_ROOT."/core/class/commondocgenerator.class.php");
/** /**
* \class ModelePDFFicheinter * Parent class to manage intervention document templates
* \brief Classe mere des modeles de fiche intervention
*/ */
abstract class ModelePDFFicheinter extends CommonDocGenerator abstract class ModelePDFFicheinter extends CommonDocGenerator
{ {
@ -149,6 +148,10 @@ abstract class ModeleNumRefFicheinter
* @param Object $object Object fichinter * @param Object $object Object fichinter
* @param string $modele force le modele a utiliser ('' par defaut) * @param string $modele force le modele a utiliser ('' par defaut)
* @param Translate $outputlangs objet lang a utiliser pour traduction * @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 * @return int 0 if KO, 1 if OK
*/ */
function fichinter_create($db, $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0, $hookmanager=false) function fichinter_create($db, $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0, $hookmanager=false)