lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Laurent Destailleur 2021-06-17 21:31:00 +02:00
commit 98a0959b64
2 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
htdocs/comm/mailing/class/mailing.class.php
View File

@ -427,8 +427,12 @@ class Mailing extends CommonObject
* @param int $rowid id du mailing a supprimer * @param int $rowid id du mailing a supprimer
* @return int 1 en cas de succes * @return int 1 en cas de succes
*/ */
public function delete($rowid) public function delete($rowid, $notrigger = 0)
{ {
global $user;
$this->db->begin();
$sql = "DELETE FROM ".MAIN_DB_PREFIX."mailing"; $sql = "DELETE FROM ".MAIN_DB_PREFIX."mailing";
$sql .= " WHERE rowid = ".$rowid; $sql .= " WHERE rowid = ".$rowid;
@ -436,13 +440,31 @@ class Mailing extends CommonObject
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if ($resql) if ($resql)
{ {
return $this->delete_targets(); $res = $this->delete_targets();
if(empty($res)){
$this->db->rollback();
$this->error = $this->db->lasterror();
return -1;
}
} }
else else
{ {
$this->db->rollback();
$this->error = $this->db->lasterror(); $this->error = $this->db->lasterror();
return -1; return -1;
} }
if(!$notrigger){
$result = $this->call_trigger('MAILING_DELETE', $user);
if ($result < 0)
{
$this->db->rollback();
return -1;
}
}
$this->db->commit();
return 1;
} }
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

7
htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
View File

@ -362,11 +362,12 @@ class pdf_espadon extends ModelePdfExpedition
{ {
$tab_top = 88 + $height_incoterms; $tab_top = 88 + $height_incoterms;
$tab_top_alt = $tab_top; $tab_top_alt = $tab_top;
$pdf->SetFont('', 'B', $default_font_size - 2); $pdf->SetFont('', 'B', $default_font_size - 2);
$pdf->writeHTMLCell(60, 4, $this->posxdesc - 1, $tab_top - 1, $outputlangs->transnoentities("TrackingNumber")." : ".$object->tracking_number, 0, 1, false, true, 'L'); if(!empty($object->tracking_number)) {
$pdf->writeHTMLCell(60, 4, $this->posxdesc - 1, $tab_top - 1, $outputlangs->transnoentities("TrackingNumber")." : ".$object->tracking_number, 0, 1, false, true, 'L');
}
$tab_top_alt = $pdf->GetY(); if(!empty($object->tracking_number)) $tab_top_alt = $pdf->GetY();
//$tab_top_alt += 1; //$tab_top_alt += 1;
// Tracking number // Tracking number