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

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

Browse Source
This commit is contained in:
Laurent Destailleur
2020-06-15 16:10:27 +02:00
parent 7b64e8643f 40e16672e3
commit b7d835eceb
7 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/accountancy/customer/card.php
View File

@@ -34,8 +34,8 @@ $action = GETPOST('action', 'alpha');
$cancel = GETPOST('cancel', 'alpha'); $cancel = GETPOST('cancel', 'alpha');
$backtopage = GETPOST('backtopage', 'alpha'); $backtopage = GETPOST('backtopage', 'alpha');
$codeventil = GETPOST('codeventil'); $codeventil = GETPOST('codeventil', 'int');
$id = GETPOST('id'); $id = GETPOST('id', 'int');
// Security check // Security check
if ($user->socid > 0) if ($user->socid > 0)

4
htdocs/accountancy/expensereport/card.php
View File

@@ -38,8 +38,8 @@ $action = GETPOST('action', 'alpha');
$cancel = GETPOST('cancel', 'alpha'); $cancel = GETPOST('cancel', 'alpha');
$backtopage = GETPOST('backtopage', 'alpha'); $backtopage = GETPOST('backtopage', 'alpha');
$codeventil = GETPOST('codeventil'); $codeventil = GETPOST('codeventil', 'int');
$id = GETPOST('id'); $id = GETPOST('id', 'int');
// Security check // Security check
if ($user->socid > 0) if ($user->socid > 0)

4
htdocs/accountancy/supplier/card.php
View File

@@ -38,8 +38,8 @@ $action = GETPOST('action', 'alpha');
$cancel = GETPOST('cancel', 'alpha'); $cancel = GETPOST('cancel', 'alpha');
$backtopage = GETPOST('backtopage', 'alpha'); $backtopage = GETPOST('backtopage', 'alpha');
$codeventil = GETPOST('codeventil'); $codeventil = GETPOST('codeventil', 'int');
$id = GETPOST('id'); $id = GETPOST('id', 'int');
// Security check // Security check
if ($user->socid > 0) if ($user->socid > 0)

2
htdocs/comm/mailing/info.php
View File

@@ -27,7 +27,7 @@ require_once DOL_DOCUMENT_ROOT.'/comm/mailing/class/mailing.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/emailing.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/emailing.lib.php';
$id = GETPOST('id'); $id = GETPOST('id', 'int');
// Load translation files required by the page // Load translation files required by the page
$langs->load("mails"); $langs->load("mails");

2
htdocs/compta/paiement/info.php
View File

@@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
// Load translation files required by the page // Load translation files required by the page
$langs->loadLangs(array('bills', 'companies')); $langs->loadLangs(array('bills', 'companies'));
$id = GETPOST('id'); $id = GETPOST('id', 'int');
$ref = GETPOST('ref', 'alpha'); $ref = GETPOST('ref', 'alpha');
$action = GETPOST('action', 'alpha'); $action = GETPOST('action', 'alpha');
$confirm = GETPOST('confirm', 'alpha'); $confirm = GETPOST('confirm', 'alpha');

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

@@ -8421,8 +8421,12 @@ abstract class CommonObject
if ($result < 0) { if ($result < 0) {
$error++; $error++;
$this->errors[] = $this->error; $this->errors[] = $this->error;
} else {
if (get_class($this) == 'Contact') { // TODO special code because delete() for contact has not been standardized like other delete.
$result = $this->delete();
} else { } else {
$result = $this->delete($user); $result = $this->delete($user);
}
if ($result < 0) { if ($result < 0) {
$error++; $error++;
$this->errors[] = $this->error; $this->errors[] = $this->error;

2
htdocs/variants/ajax/get_attribute_values.php
View File

@@ -28,7 +28,7 @@ require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductAttributeValue.class.php'
header('Content-Type: application/json'); header('Content-Type: application/json');
$id = GETPOST('id'); $id = GETPOST('id', 'int');
if (!$id) { if (!$id) {
print json_encode(array( print json_encode(array(