| trans("PaymentMode"); ?> |
getSetPaymentMode())
diff --git a/htdocs/cashdesk/validation_verif.php b/htdocs/cashdesk/validation_verif.php
index 5bf7bdab68b..f3772d617fa 100644
--- a/htdocs/cashdesk/validation_verif.php
+++ b/htdocs/cashdesk/validation_verif.php
@@ -57,7 +57,7 @@ switch ($action)
// 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'];
}
@@ -66,7 +66,7 @@ switch ($action)
$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);
@@ -198,9 +198,9 @@ switch ($action)
$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;
@@ -234,7 +234,7 @@ switch ($action)
$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='';
@@ -254,7 +254,7 @@ switch ($action)
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
diff --git a/htdocs/core/modules/facture/modules_facture.php b/htdocs/core/modules/facture/modules_facture.php
index 43b0dae3c33..973a8461799 100644
--- a/htdocs/core/modules/facture/modules_facture.php
+++ b/htdocs/core/modules/facture/modules_facture.php
@@ -147,15 +147,15 @@ abstract class ModeleNumRefFactures
/**
* 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)
{
diff --git a/htdocs/core/modules/fichinter/modules_fichinter.php b/htdocs/core/modules/fichinter/modules_fichinter.php
index c14c4878821..de1a1c79ee2 100644
--- a/htdocs/core/modules/fichinter/modules_fichinter.php
+++ b/htdocs/core/modules/fichinter/modules_fichinter.php
@@ -30,8 +30,7 @@ require_once(DOL_DOCUMENT_ROOT."/core/class/commondocgenerator.class.php");
/**
- * \class ModelePDFFicheinter
- * \brief Classe mere des modeles de fiche intervention
+ * Parent class to manage intervention document templates
*/
abstract class ModelePDFFicheinter extends CommonDocGenerator
{
@@ -149,6 +148,10 @@ abstract class ModeleNumRefFicheinter
* @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)
|