diff --git a/htdocs/compta/sociales/charges.php b/htdocs/compta/sociales/charges.php index 4d638e23cf7..7be1360287c 100644 --- a/htdocs/compta/sociales/charges.php +++ b/htdocs/compta/sociales/charges.php @@ -19,7 +19,7 @@ /** * \file htdocs/compta/sociales/charges.php * \ingroup tax - * \brief Social contribution car page + * \brief Social contribution card page */ require '../../main.inc.php'; @@ -387,7 +387,7 @@ if ($id > 0) { $num = $db->num_rows($resql); $i = 0; $total = 0; - echo ''; + print '
'; print ''; print ''; print ''; @@ -488,7 +488,7 @@ if ($id > 0) /* - * Boutons actions + * Actions buttons */ if ($action != 'edit') { @@ -500,7 +500,7 @@ if ($id > 0) print "id&action=edit\">".$langs->trans("Modify").""; } - // Emettre paiement + // Emit payment if ($object->paye == 0 && ((price2num($object->amount) < 0 && price2num($resteapayer, 'MT') < 0) || (price2num($object->amount) > 0 && price2num($resteapayer, 'MT') > 0)) && $user->rights->tax->charges->creer) { print "id&action=create\">".$langs->trans("DoPayment").""; diff --git a/htdocs/don/card.php b/htdocs/don/card.php index 75e30da80a3..330a1d8958d 100644 --- a/htdocs/don/card.php +++ b/htdocs/don/card.php @@ -595,8 +595,8 @@ if (! empty($id) && $action != 'edit') print "'; print '\n"; - $labeltype=$langs->trans("PaymentType".$object->type_code)!=("PaymentType".$object->type_code)?$langs->trans("PaymentType".$object->type_code):$object->paiement_type; - print "\n"; + $labeltype=$langs->trans("PaymentType".$objp->type_code)!=("PaymentType".$objp->type_code)?$langs->trans("PaymentType".$objp->type_code):$objp->paiement_type; + print "\n"; print '\n"; print ""; $totalpaid += $objp->amount; diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php index fa7bc6dffd8..acdc476950d 100644 --- a/htdocs/don/class/don.class.php +++ b/htdocs/don/class/don.class.php @@ -55,8 +55,8 @@ class Don extends CommonObject var $email; var $public; var $fk_projet; - var $modepaiement; - var $modepaiementid; + var $fk_typepayment; + var $num_payment; var $note_private; var $note_public; var $statut; diff --git a/htdocs/don/class/paymentdonation.class.php b/htdocs/don/class/paymentdonation.class.php index 27784446e4b..1e6d8e00930 100644 --- a/htdocs/don/class/paymentdonation.class.php +++ b/htdocs/don/class/paymentdonation.class.php @@ -90,8 +90,8 @@ class PaymentDonation extends CommonObject // Clean parameters if (isset($this->fk_donation)) $this->fk_donation=trim($this->fk_donation); if (isset($this->amount)) $this->amount=trim($this->amount); - if (isset($this->typepayment)) $this->typepayment=trim($this->typepayment); - if (isset($this->num_payment)) $this->num_payment=trim($this->num_payment); + if (isset($this->fk_typepayment)) $this->fk_typepayment=trim($this->fk_typepayment); + if (isset($this->num_payment)) $this->num_payment=trim($this->num_payment); if (isset($this->note)) $this->note=trim($this->note); if (isset($this->fk_bank)) $this->fk_bank=trim($this->fk_bank); if (isset($this->fk_user_creat)) $this->fk_user_creat=trim($this->fk_user_creat);
'.$langs->trans("RefPayment").''.$langs->trans("Date").'
"; print ''.img_object($langs->trans("Payment"),"payment").' '.$objp->rowid.''.dol_print_date($db->jdate($objp->dp),'day')."".$labeltype.' '.$object->num_paiement."".$labeltype.' '.$objp->num_payment."'.price($objp->amount)." ".$langs->trans("Currency".$conf->currency)."