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

Merge pull request #17514 from frederic34/patch-3

Browse Source 
phpcs
This commit is contained in:
Laurent Destailleur 2021-05-07 12:01:47 +02:00 committed by GitHub
commit 44f81ef242
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/admin/mails_templates.php
View File

@ -11,7 +11,7 @@
* Copyright (C) 2011-2016 Alexandre Spangaro <aspangaro@open-dsi.fr> * Copyright (C) 2011-2016 Alexandre Spangaro <aspangaro@open-dsi.fr>
* Copyright (C) 2015 Ferran Marcet <fmarcet@2byte.es> * Copyright (C) 2015 Ferran Marcet <fmarcet@2byte.es>
* Copyright (C) 2016 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr> * Copyright (C) 2016 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
* Copyright (C) 2018-2020 Frédéric France <frederic.france@netlogic.fr> * Copyright (C) 2018-2021 Frédéric France <frederic.france@netlogic.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by

3
htdocs/compta/bank/class/account.class.php
View File

@ -1693,8 +1693,7 @@ class Account extends CommonObject
{ {
$sql = "UPDATE ".MAIN_DB_PREFIX."bank_url SET url_id = ".((int) $dest_id)." WHERE url_id = ".((int) $origin_id)." AND type='company'"; $sql = "UPDATE ".MAIN_DB_PREFIX."bank_url SET url_id = ".((int) $dest_id)." WHERE url_id = ".((int) $origin_id)." AND type='company'";
if (!$db->query($sql)) if (!$db->query($sql)) {
{
//if ($ignoreerrors) return true; // TODO Not enough. If there is A-B on kept thirdarty and B-C on old one, we must get A-B-C after merge. Not A-B. //if ($ignoreerrors) return true; // TODO Not enough. If there is A-B on kept thirdarty and B-C on old one, we must get A-B-C after merge. Not A-B.
//$this->errors = $db->lasterror(); //$this->errors = $db->lasterror();
return false; return false;

5
htdocs/partnership/class/partnership.class.php
View File

@ -119,6 +119,10 @@ class Partnership extends CommonObject
public $date_partnership_end; public $date_partnership_end;
public $count_last_url_check_error; public $count_last_url_check_error;
public $last_check_backlink; public $last_check_backlink;
/**
* @var string reason_decline_or_cancel
*/
public $reason_decline_or_cancel; public $reason_decline_or_cancel;
// END MODULEBUILDER PROPERTIES // END MODULEBUILDER PROPERTIES
@ -849,6 +853,7 @@ class Partnership extends CommonObject
* Set refused status * Set refused status
* *
* @param User $user Object user that modify * @param User $user Object user that modify
* @param string $reasondeclinenote Reason decline
* @param int $notrigger 1=Does not execute triggers, 0=Execute triggers * @param int $notrigger 1=Does not execute triggers, 0=Execute triggers
* @return int <0 if KO, 0=Nothing done, >0 if OK * @return int <0 if KO, 0=Nothing done, >0 if OK
*/ */