[pull] develop from Dolibarr:develop

htdocs/compta/bank/class/account.class.php

@@ -895,7 +895,7 @@ public function create(User $user, $notrigger = 0)
  */
  public function update(User $user, $notrigger = 0)
  {
- global $langs, $conf;
+ global $langs;
 
  $error = 0;
 
@@ -1443,7 +1443,7 @@ public function loadStateBoard($filteraccountid = 0)
  */
  public function countAccountToReconcile()
  {
- global $db, $conf, $user;
+ global $user;
 
  //Protection against external users
  if ($user->socid) {
@@ -1459,6 +1459,7 @@ public function countAccountToReconcile()
  if (!getDolGlobalString('BANK_CAN_RECONCILIATE_CASHACCOUNT')) {
  $sql .= " AND ba.courant != " . Account::TYPE_CASH;
  }
+
  $resql = $this->db->query($sql);
  if ($resql) {
  $obj = $this->db->fetch_object($resql);

htdocs/compta/paiement.php

@@ -361,8 +361,8 @@
  }
 
  // Invoice with Paypal transaction
- // TODO add hook here
- if (isModEnabled('paypalplus') && $conf->global->PAYPAL_ENABLE_TRANSACTION_MANAGEMENT && !empty($facture->ref_ext)) {
+ // @TODO add hook here
+ if (isModEnabled('paypalplus') && getDolGlobalString('PAYPAL_ENABLE_TRANSACTION_MANAGEMENT') && !empty($facture->ref_ext)) {
  if (getDolGlobalString('PAYPAL_BANK_ACCOUNT')) {
  $accountid = getDolGlobalString('PAYPAL_BANK_ACCOUNT');
  }
@@ -883,7 +883,7 @@ function callForResult(imgId)
  }
 
  print '<br><div class="center">';
- print '<input type="checkbox" checked name="closepaidinvoices"> '.$checkboxlabel;
+ print '<input type="checkbox" checked name="closepaidinvoices" id="closepaidinvoices"><label for="closepaidinvoices"> '.$checkboxlabel.'</label>';
  /*if (isModEnabled('prelevement')) {
  $langs->load("withdrawals");
  if (!empty($conf->global->WITHDRAW_DISABLE_AUTOCREATE_ONPAYMENTS)) print '<br>'.$langs->trans("IfInvoiceNeedOnWithdrawPaymentWontBeClosed");

htdocs/compta/paiement/class/paiement.class.php

@@ -128,7 +128,7 @@ class Paiement extends CommonObject
  public $author;
 
  /**
- * @var int ID of mode of payment. Is saved into fields fk_paiement on llx_paiement = id of llx_c_paiement
+ * @var int ID of mode of payment. Is saved into fields fk_paiement on llx_paiement = id of llx_c_paiement. Can get value from code using ...
  */
  public $paiementid;
 

htdocs/public/stripe/ipn.php

@@ -431,7 +431,20 @@
  // Not yet supported, so error
  $error++;
  }
+
+ // Get ID of payment PRE
  $paiement->paiementcode = $paymentTypeCode;
+ $sql = "SELECT id FROM ".MAIN_DB_PREFIX."c_paiement";
+ $sql .= " WHERE code = '".$db->escape($paymentTypeCode)."'";
+ $sql .= " AND entity IN (".getEntity('c_paiement').")";
+ $resql = $db->query($sql);
+ if ($resql) {
+ $obj = $db->fetch_object($resql);
+ $paiement->paiementid = $obj->id;
+ } else {
+ $error++;
+ }
+
  $paiement->num_payment = '';
  $paiement->note_public = '';
  $paiement->note_private = 'StripeSepa payment ' . dol_print_date($now, 'standard') . ' using servicestatus ' . $servicestatus . ($ipaddress ? ' from ip ' . $ipaddress : '') . ' - Transaction ID = ' . $TRANSACTIONID;
@@ -453,7 +466,7 @@
  $db->begin();
 
  if (!$error && !$ispaymentdone) {
- dol_syslog('* Record payment for invoice id ' . $invoice_id . '. It includes closing of invoice and regenerating document');
+ dol_syslog('* Record payment type PRE for invoice id ' . $invoice_id . '. It includes closing of invoice and regenerating document.');
 
  // This include closing invoices to 'paid' (and trigger including unsuspending) and regenerating document
  $paiement_id = $paiement->create($user, 1);