diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php index 5dff8710940b095b789551ef0df047b089d98462..5aca37bd243192a0539d85c09b57fc45b327727b 100644 --- a/htdocs/compta/paiement.php +++ b/htdocs/compta/paiement.php @@ -311,7 +311,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie // Payment mode print '<tr><td><span class="fieldrequired">'.$langs->trans('PaymentMode').'</span></td><td>'; - $html->select_types_paiements(GETPOST('paiementcode'),'paiementcode','',2); + $html->select_types_paiements((GETPOST('paiementcode')?GETPOST('paiementcode'):$facture->mode_reglement_code),'paiementcode','',2); print "</td>\n"; print '<td rowspan="'.$rowspan.'" valign="top">'; print '<textarea name="comment" wrap="soft" cols="60" rows="'.ROWS_4.'">'.(empty($_POST['comment'])?'':$_POST['comment']).'</textarea></td>'; diff --git a/htdocs/paypal/ajaxtransaction.php b/htdocs/paypal/ajaxtransaction.php index f97e01efb6673fcefc3775f777d324c537330fcb..4eed07e977f3d0979b61e4dcab15d0e8c3344cdd 100644 --- a/htdocs/paypal/ajaxtransaction.php +++ b/htdocs/paypal/ajaxtransaction.php @@ -160,9 +160,11 @@ if (isset($_GET['action']) && ! empty($_GET['action']) && isset($_GET['transacti $object->socid=$soc->id; $object->fetch_thirdparty(); - $object->date = dol_now(); - $object->ref_int = $_SESSION[$_GET['transaction_id']]['TRANSACTIONID']; - $shipamount = ($_SESSION[$_GET['transaction_id']]['SHIPPINGAMT']?$_SESSION[$_GET['transaction_id']]['SHIPPINGAMT']:$_SESSION[$_GET['transaction_id']]['SHIPAMOUNT']); + $object->date = dol_now(); + $object->mode_reglement_id = 6; // Credit card by default + $object->cond_reglement_id = 1; + $object->ref_int = $_SESSION[$_GET['transaction_id']]['TRANSACTIONID']; + $shipamount = ($_SESSION[$_GET['transaction_id']]['SHIPPINGAMT']?$_SESSION[$_GET['transaction_id']]['SHIPPINGAMT']:$_SESSION[$_GET['transaction_id']]['SHIPAMOUNT']); $object_id = $object->create($user); if ($object_id > 0)