Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

fixing error introduced in a previous commit

Browse Source
This commit is contained in:
Dorian Vabre
2021-04-23 10:32:28 +02:00
parent 4589813d3f
commit b441c600bb
5 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/compta/paiement.php
View File

@@ -253,7 +253,7 @@ if (empty($reshook)) {
if (!$error) {
// Create payment and update this->multicurrency_amounts if this->amounts filled or
// this->amounts if this->multicurrency_amounts filled.
$paiement_id = $paiement->create($user, 1, $thirdparty); // This include closing invoices and regenerating documents
$paiement_id = $paiement->create($user, (GETPOST('closepaidinvoices') == 'on' ? 1 : 0), $thirdparty); // This include closing invoices and regenerating documents
if ($paiement_id < 0) {
setEventMessages($paiement->error, $paiement->errors, 'errors');
$error++;

1
htdocs/core/class/CMailFile.class.php
View File

@@ -584,6 +584,7 @@ class CMailFile
if ($reshook < 0) {
$this->error = "Error in hook maildao sendMail ".$reshook;
dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
return $reshook;
}
if ($reshook == 1) { // Hook replace standard code

1
htdocs/eventorganization/class/conferenceorboothattendee.class.php
View File

@@ -438,7 +438,6 @@ class ConferenceOrBoothAttendee extends CommonObject
}
$resql = $this->db->query($sql);
if ($resql) {
$num = $this->db->num_rows($resql);
$i = 0;

4
htdocs/public/payment/newpayment.php
View File

@@ -157,7 +157,6 @@ foreach ($_POST as $key => $val) {
}
// Define $urlwithroot
//$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
//$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
@@ -207,6 +206,8 @@ if (!empty($entity)) {
$urlok = preg_replace('/&$/', '', $urlok); // Remove last &
$urlko = preg_replace('/&$/', '', $urlko); // Remove last &
// Make special controls
if ((empty($paymentmethod) || $paymentmethod == 'paypal') && !empty($conf->paypal->enabled)) {
@@ -264,7 +265,6 @@ if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
} else {
$token = $conf->global->PAYMENT_SECURITY_TOKEN;
}
if ($SECUREKEY != $token) {
if (empty($conf->global->PAYMENT_SECURITY_ACCEPT_ANY_TOKEN)) {
$valid = false; // PAYMENT_SECURITY_ACCEPT_ANY_TOKEN is for backward compatibility

2
htdocs/public/payment/paymentok.php
View File

@@ -109,6 +109,7 @@ $invoiceref = GETPOST('invoice');
$suffix = GETPOST("suffix", 'aZ09');
$membertypeid = GETPOST("membertypeid", 'int');
// Detect $paymentmethod
$paymentmethod = '';
$reg = array();
@@ -151,6 +152,7 @@ $object = new stdClass(); // For triggers
$error = 0;
/*
* Actions
*/