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

Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0

Browse Source
This commit is contained in:
Laurent Destailleur
2022-09-21 01:21:11 +02:00
parent 1f2ad8efbf 4e15fdd715
commit cb7db080cd
5 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/compta/prelevement/class/bonprelevement.class.php
View File

@@ -454,9 +454,6 @@ class BonPrelevement extends CommonObject
dol_syslog(get_class($this)."::set_infocredit AddPaymentToBank Error ".$this->error); dol_syslog(get_class($this)."::set_infocredit AddPaymentToBank Error ".$this->error);
} }
} }
//var_dump($paiement->amounts);
//var_dump($thirdpartyid);
//var_dump($cursoramounts);
} }
// Update withdrawal line // Update withdrawal line
@@ -2208,7 +2205,8 @@ class BonPrelevement extends CommonObject
$XML_SEPA_INFO .= ' </CdtrSchmeId>'.$CrLf;*/ $XML_SEPA_INFO .= ' </CdtrSchmeId>'.$CrLf;*/
} }
} else { } else {
fputs($this->file, 'INCORRECT EMETTEUR '.$XML_SEPA_INFO.$CrLf); fputs($this->file, 'INCORRECT EMETTEUR '.$this->raison_sociale.$CrLf);
$XML_SEPA_INFO = '';
} }
return $XML_SEPA_INFO; return $XML_SEPA_INFO;
} }

2
htdocs/core/class/commonobject.class.php
View File

@@ -3725,7 +3725,7 @@ abstract class CommonObject
$this->db->free($resql); $this->db->free($resql);
// Now update global field total_ht, total_ttc, total_tva, total_localtax1, total_localtax2, multicurrency_total_* // Now update global fields total_ht, total_ttc, total_tva, total_localtax1, total_localtax2, multicurrency_total_*
$fieldht = 'total_ht'; $fieldht = 'total_ht';
$fieldtva = 'tva'; $fieldtva = 'tva';
$fieldlocaltax1 = 'localtax1'; $fieldlocaltax1 = 'localtax1';

4
htdocs/core/lib/files.lib.php
View File

@@ -2977,9 +2977,9 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
// Wrapping for import module // Wrapping for import module
$accessallowed = $user->rights->import->run; $accessallowed = $user->rights->import->run;
$original_file = $conf->import->dir_temp.'/'.$original_file; $original_file = $conf->import->dir_temp.'/'.$original_file;
} elseif ($modulepart == 'recruitment' && !empty($conf->recruitment->dir_temp)) { } elseif ($modulepart == 'recruitment' && !empty($conf->recruitment->dir_output)) {
// Wrapping for recruitment module // Wrapping for recruitment module
$accessallowed = $user->rights->$modulepart->recruitmentjobposition->read; $accessallowed = $user->rights->recruitment->recruitmentjobposition->read;
$original_file = $conf->recruitment->dir_output.'/'.$original_file; $original_file = $conf->recruitment->dir_output.'/'.$original_file;
} elseif ($modulepart == 'editor' && !empty($conf->fckeditor->dir_output)) { } elseif ($modulepart == 'editor' && !empty($conf->fckeditor->dir_output)) {
// Wrapping for wysiwyg editor // Wrapping for wysiwyg editor

2
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
View File

@@ -1187,7 +1187,7 @@ class pdf_crabe extends ModelePDFFactures
require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
global $langs; global $langs;
$langs->loadLangs(array('payment', 'paybox')); $langs->loadLangs(array('payment', 'paybox', 'stripe'));
$servicename = $langs->transnoentities('Online'); $servicename = $langs->transnoentities('Online');
$paiement_url = getOnlinePaymentUrl('', 'invoice', $object->ref, '', '', ''); $paiement_url = getOnlinePaymentUrl('', 'invoice', $object->ref, '', '', '');
$linktopay = $langs->trans("ToOfferALinkForOnlinePayment", $servicename).' <a href="'.$paiement_url.'">'.$outputlangs->transnoentities("ClickHere").'</a>'; $linktopay = $langs->trans("ToOfferALinkForOnlinePayment", $servicename).' <a href="'.$paiement_url.'">'.$outputlangs->transnoentities("ClickHere").'</a>';

1
htdocs/user/class/user.class.php
View File

@@ -742,6 +742,7 @@ class User extends CommonObject
// If module is abc@module, we check permission user->rights->module->abc->permlevel1 // If module is abc@module, we check permission user->rights->module->abc->permlevel1
$tmp = explode('@', $rightsPath, 2); $tmp = explode('@', $rightsPath, 2);
if (! empty($tmp[1])) { if (! empty($tmp[1])) {
if (strpos($module, '@') !== false) $module = $tmp[1];
$rightsPath = $tmp[1]; $rightsPath = $tmp[1];
$permlevel2 = $permlevel1; $permlevel2 = $permlevel1;
$permlevel1 = $tmp[0]; $permlevel1 = $tmp[0];