Skip to content
Snippets Groups Projects
Commit f8fbc192 authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

Try to rename function to test if warning is removed

parent 45482bd8
No related branches found
No related tags found
No related merge requests found
......@@ -248,7 +248,7 @@ class Facturation
public function raz_pers()
{
$this->num_facture('RESET');
$this->mode_reglement('RESET');
$this->getPaymentMode('RESET');
$this->montant_encaisse('RESET');
$this->montant_rendu('RESET');
$this->paiement_le('RESET');
......
......@@ -151,7 +151,7 @@ $tab_tva = $ret;
// Reinitialisation du mode de paiement, en cas de retour aux achats apres validation
$obj_facturation->mode_reglement('RESET');
$obj_facturation->getPaymentMode('RESET');
$obj_facturation->montant_encaisse('RESET');
$obj_facturation->montant_rendu('RESET');
$obj_facturation->paiement_le('RESET');
......
......@@ -40,7 +40,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<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("PaymentMode"); ?> </td><td>
<?php
switch ($obj_facturation->mode_reglement())
switch ($obj_facturation->getPaymentMode())
{
case 'ESP':
echo $langs->trans("Cash");
......@@ -75,7 +75,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<?php
// Affichage des infos en fonction du mode de paiement
if ( $obj_facturation->mode_reglement() == 'DIF' ) {
if ( $obj_facturation->getPaymentMode() == 'DIF' ) {
echo ('<tr><td class="resume_label">'.$langs->trans("DateEcheance").'</td><td>'.$obj_facturation->paiement_le().'</td></tr>');
......
......@@ -51,10 +51,10 @@ switch ($action)
$obj_facturation->num_facture($num);
$obj_facturation->mode_reglement($_POST['hdnChoix']);
$obj_facturation->getPaymentMode($_POST['hdnChoix']);
// Si paiement autre qu'en especes, montant encaisse = prix total
$mode_reglement = $obj_facturation->mode_reglement();
$mode_reglement = $obj_facturation->getPaymentMode();
if ( $mode_reglement != 'ESP' ) {
$montant = $obj_facturation->prix_total_ttc();
} else {
......@@ -103,7 +103,7 @@ switch ($action)
exit;
}
switch ( $obj_facturation->mode_reglement() )
switch ( $obj_facturation->getPaymentMode() )
{
case 'DIF':
$mode_reglement_id = 0;
......@@ -131,7 +131,7 @@ switch ($action)
if (empty($mode_reglement_id)) $mode_reglement_id=0; // If mode_reglement_id not found
if (empty($cond_reglement_id)) $cond_reglement_id=0; // If cond_reglement_id not found
$note .= $_POST['txtaNotes'];
dol_syslog("obj_facturation->mode_reglement()=".$obj_facturation->mode_reglement()." mode_reglement_id=".$mode_reglement_id." cond_reglement_id=".$cond_reglement_id);
dol_syslog("obj_facturation->getPaymentMode()=".$obj_facturation->getPaymentMode()." mode_reglement_id=".$mode_reglement_id." cond_reglement_id=".$cond_reglement_id);
$error=0;
......@@ -145,7 +145,7 @@ switch ($action)
$thirdpartyid = $_SESSION['CASHDESK_ID_THIRDPARTY'];
$societe = new Societe($db);
$societe->fetch($thirdpartyid);
$invoice=new Facture($db);
// Get content of cart
......@@ -206,7 +206,7 @@ switch ($action)
//print "c=".$invoice->cond_reglement_id." m=".$invoice->mode_reglement_id; exit;
// Si paiement differe ...
if ( $obj_facturation->mode_reglement() == 'DIF' )
if ( $obj_facturation->getPaymentMode() == 'DIF' )
{
$resultcreate=$invoice->create($user,0,dol_stringtotime($obj_facturation->paiement_le()));
if ($resultcreate > 0)
......@@ -254,7 +254,7 @@ switch ($action)
if (! $error)
{
if ($invoice->total_ttc == $obj_facturation->prix_total_ttc()
&& $obj_facturation->mode_reglement() != 'DIFF')
&& $obj_facturation->getPaymentMode() != 'DIFF')
{
// We set status to payed
$result=$invoice->set_paid($user);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment