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-01-05 12:24:11 +01:00
parent e340aa3622
commit aadfca4bbd
2 changed files with 61 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -169,7 +169,8 @@ class Facturation
/** /**
* Remove a product from panel * Remove a product from panel
* *
* @param aArticle Id of line into cart to remove * @param int $aArticle Id of line into cart to remove
* @return void
*/ */
public function supprArticle($aArticle) public function supprArticle($aArticle)
{ {
@ -241,6 +242,8 @@ class Facturation
/** /**
* Reinitialisation des attributs persistants * Reinitialisation des attributs persistants
*
* @return void
*/ */
public function raz_pers() public function raz_pers()
{ {
@ -261,34 +264,37 @@ class Facturation
/** /**
* Getter for id * Getter for id
* @param aId *
* @return id * @param int $aId Id
* @return id
*/ */
public function id($aId=null) public function id($aId=null)
{ {
if ( !$aId ) if ( !$aId )
{ {
return $this->id; return $this->id;
} else if ( $aId == 'RESET' ) }
else if ( $aId == 'RESET' )
{ {
$this->id = NULL; $this->id = NULL;
} else }
else
{ {
$this->id = $aId; $this->id = $aId;
} }
} }
/** /**
* Getter for ref * Getter for ref
* @param $aRef *
* @param string $aRef Ref
* @return string Ref
*/ */
public function ref($aRef=null) public function ref($aRef=null)
{ {
@ -310,10 +316,11 @@ class Facturation
/** /**
* Getter for qte * Getter for qte
* @param $aQte *
* @return * @param int $aQte Qty
* @return int Qty
*/ */
public function qte ( $aQte=null ) public function qte( $aQte=null )
{ {
if ( !$aQte ) if ( !$aQte )
{ {
@ -334,8 +341,8 @@ class Facturation
/** /**
* Getter for stock * Getter for stock
* *
* @param aStock * @param string $aStock Stock
* @return * @return string Stock
*/ */
public function stock($aStock=null) public function stock($aStock=null)
{ {
@ -358,8 +365,8 @@ class Facturation
/** /**
* Getter for remise_percent * Getter for remise_percent
* *
* @param aRemisePercent * @param string $aRemisePercent Discount
* @return * @return string Discount
*/ */
public function remise_percent($aRemisePercent=null) public function remise_percent($aRemisePercent=null)
{ {
@ -382,8 +389,8 @@ class Facturation
/** /**
* Getter for montant_remise * Getter for montant_remise
* *
* @param aMontantRemise * @param int $aMontantRemise Amount
* @return * @return string Amount
*/ */
public function montant_remise($aMontantRemise=null) public function montant_remise($aMontantRemise=null)
{ {
@ -407,8 +414,8 @@ class Facturation
/** /**
* Getter for prix * Getter for prix
* *
* @param aPrix * @param int $aPrix Price
* @return * @return string Stock
*/ */
public function prix ( $aPrix=null ) public function prix ( $aPrix=null )
{ {
@ -432,8 +439,8 @@ class Facturation
/** /**
* Getter for tva * Getter for tva
* *
* @param aTva * @param int $aTva Vat
* @return * @return int Vat
*/ */
public function tva ( $aTva=null ) public function tva ( $aTva=null )
{ {
@ -455,10 +462,12 @@ class Facturation
} }
/** /**
* Get num invoice
* *
* @param $aNumFacture * @param string $aNumFacture Invoice ref
* @return string Invoice ref
*/ */
public function num_facture ( $aNumFacture=null ) public function num_facture( $aNumFacture=null )
{ {
if ( !$aNumFacture ) { if ( !$aNumFacture ) {
@ -477,10 +486,12 @@ class Facturation
} }
/** /**
* Get payment mode
* *
* @param unknown_type $aModeReglement * @param int $aModeReglement Payment mode
* @return int Payment mode
*/ */
public function mode_reglement ( $aModeReglement=null ) public function mode_reglement( $aModeReglement=null )
{ {
if ( !$aModeReglement ) { if ( !$aModeReglement ) {
@ -500,10 +511,12 @@ class Facturation
} }
/** /**
* Get amount
* *
* @param $aMontantEncaisse * @param int $aMontantEncaisse Amount
* @return int Amount
*/ */
public function montant_encaisse ( $aMontantEncaisse=null ) public function montant_encaisse( $aMontantEncaisse=null )
{ {
if ( !$aMontantEncaisse ) { if ( !$aMontantEncaisse ) {
@ -523,10 +536,12 @@ class Facturation
} }
/** /**
* Get amount
* *
* @param $aMontantRendu * @param int $aMontantRendu Amount
* @return int Amount
*/ */
public function montant_rendu ( $aMontantRendu=null ) public function montant_rendu( $aMontantRendu=null )
{ {
if ( !$aMontantRendu ) { if ( !$aMontantRendu ) {
@ -545,12 +560,13 @@ class Facturation
} }
/** /**
* Get payment date
* *
* @param $aPaiementLe * @param date $aPaiementLe Date
* @return date Date
*/ */
public function paiement_le ( $aPaiementLe=null ) public function paiement_le( $aPaiementLe=null )
{ {
if ( !$aPaiementLe ) { if ( !$aPaiementLe ) {
return $this->paiement_le; return $this->paiement_le;
@ -564,16 +580,16 @@ class Facturation
$this->paiement_le = $aPaiementLe; $this->paiement_le = $aPaiementLe;
} }
} }
/** /**
* Get totla HT
* *
* @param $aTotalHt * @param int $aTotalHt Total amount
* @return int Total amount
*/ */
public function prix_total_ht ( $aTotalHt=null ) public function prix_total_ht( $aTotalHt=null )
{ {
if ( !$aTotalHt ) { if ( !$aTotalHt ) {
return $this->prix_total_ht; return $this->prix_total_ht;
@ -587,16 +603,16 @@ class Facturation
$this->prix_total_ht = $aTotalHt; $this->prix_total_ht = $aTotalHt;
} }
} }
/** /**
* Get amount vat
* *
* @param $aMontantTva * @param int $aMontantTva Amount vat
* @return int Amount vat
*/ */
public function montant_tva ( $aMontantTva=null ) public function montant_tva( $aMontantTva=null )
{ {
if ( !$aMontantTva ) { if ( !$aMontantTva ) {
return $this->montant_tva; return $this->montant_tva;
@ -614,12 +630,13 @@ class Facturation
} }
/** /**
* Get total TTC
* *
* @param $aTotalTtc * @param int $aTotalTtc Amount ttc
* @return int Amount ttc
*/ */
public function prix_total_ttc ( $aTotalTtc=null ) public function prix_total_ttc( $aTotalTtc=null )
{ {
if ( !$aTotalTtc ) if ( !$aTotalTtc )
{ {
return $this->prix_total_ttc; return $this->prix_total_ttc;

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

@ -167,7 +167,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<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->prix_total_ttc(), '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 -->