Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into 22.0
This commit is contained in:
commit
9c0b3d70cc
2 changed files with 3 additions and 3 deletions
|
|
@ -661,8 +661,8 @@ class Members extends DolibarrApi
|
|||
if (!DolibarrApiAccess::$user->hasRight('adherent', 'cotisation', 'creer')) {
|
||||
throw new RestException(403);
|
||||
}
|
||||
if (is_numeric($start_date) || !is_numeric($end_date) || !is_numeric($amount)) {
|
||||
throw new RestException(422, 'Malformed data');
|
||||
if (!is_numeric($start_date) || !is_numeric($end_date) || !is_numeric($amount)) {
|
||||
throw new RestException(422, 'Malformed data: subscription start or end date, or subscription amount, is not numeric');
|
||||
}
|
||||
|
||||
$member = new Adherent($this->db);
|
||||
|
|
|
|||
|
|
@ -108,7 +108,7 @@ class FormOrder extends Form
|
|||
$tmpsupplierorder = new Commande($this->db);
|
||||
|
||||
foreach ($statustohow as $value) {
|
||||
$tmpsupplierorder->statut = $value;
|
||||
$tmpsupplierorder->status = $value;
|
||||
$options[$value] = $tmpsupplierorder->getLibStatut($short);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue