Skip to content

Commit 46bf657

Browse files
committed
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2 parents b4dd5dd + 87fe2e6 commit 46bf657

File tree

8 files changed

+8
-8
lines changed

8 files changed

+8
-8
lines changed

htdocs/compta/facture/class/facture.class.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,7 @@ public function create(User $user, $notrigger = 0, $forceduedate = 0)
477477
$this->fk_project = GETPOST('projectid', 'int') > 0 ? ((int) GETPOST('projectid', 'int')) : $_facrec->fk_project;
478478
$this->note_public = GETPOST('note_public', 'none') ? GETPOST('note_public', 'none') : $_facrec->note_public;
479479
$this->note_private = GETPOST('note_private', 'none') ? GETPOST('note_private', 'none') : $_facrec->note_private;
480-
$this->modelpdf = GETPOST('model', 'alpha') ? GETPOST('model', 'apha') : $_facrec->modelpdf;
480+
$this->modelpdf = GETPOST('model', 'alpha') ? GETPOST('model', 'alpha') : $_facrec->modelpdf;
481481
$this->cond_reglement_id = GETPOST('cond_reglement_id', 'int') > 0 ? ((int) GETPOST('cond_reglement_id', 'int')) : $_facrec->cond_reglement_id;
482482
$this->mode_reglement_id = GETPOST('mode_reglement_id', 'int') > 0 ? ((int) GETPOST('mode_reglement_id', 'int')) : $_facrec->mode_reglement_id;
483483
$this->fk_account = GETPOST('fk_account') > 0 ? ((int) GETPOST('fk_account')) : $_facrec->fk_account;

htdocs/product/stats/commande.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
$pagenext = $page + 1;
6060
if (! $sortorder) $sortorder="DESC";
6161
if (! $sortfield) $sortfield="c.date_commande";
62-
$search_month = GETPOST('search_month', 'aplha');
62+
$search_month = GETPOST('search_month', 'alpha');
6363
$search_year = GETPOST('search_year', 'int');
6464

6565
if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter', 'alpha')) {

htdocs/product/stats/commande_fournisseur.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
$sortorder = "DESC";
6464
if (!$sortfield)
6565
$sortfield = "c.date_commande";
66-
$search_month = GETPOST('search_month', 'aplha');
66+
$search_month = GETPOST('search_month', 'alpha');
6767
$search_year = GETPOST('search_year', 'int');
6868

6969
if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter', 'alpha')) {

htdocs/product/stats/facture.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
if (! $sortorder) $sortorder="DESC";
6262
if (! $sortfield) $sortfield="f.datef";
6363

64-
$search_month = GETPOST('search_month', 'aplha');
64+
$search_month = GETPOST('search_month', 'alpha');
6565
$search_year = GETPOST('search_year', 'int');
6666

6767
if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter', 'alpha')) {

htdocs/product/stats/facture_fournisseur.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
$pagenext = $page + 1;
6161
if (!$sortorder) $sortorder = "DESC";
6262
if (!$sortfield) $sortfield = "f.datef";
63-
$search_month = GETPOST('search_month', 'aplha');
63+
$search_month = GETPOST('search_month', 'alpha');
6464
$search_year = GETPOST('search_year', 'int');
6565

6666
if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter', 'alpha')) {

htdocs/product/stats/propal.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
if (!$sortorder) $sortorder = "DESC";
6161
if (!$sortfield) $sortfield = "p.datep";
6262

63-
$search_month = GETPOST('search_month', 'aplha');
63+
$search_month = GETPOST('search_month', 'alpha');
6464
$search_year = GETPOST('search_year', 'int');
6565

6666
if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter', 'alpha')) {

htdocs/product/stats/supplier_proposal.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
if (!$sortorder) $sortorder = "DESC";
6161
if (!$sortfield) $sortfield = "p.date_valid";
6262

63-
$search_month = GETPOST('search_month', 'aplha');
63+
$search_month = GETPOST('search_month', 'alpha');
6464
$search_year = GETPOST('search_year', 'int');
6565

6666
if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter', 'alpha')) {

htdocs/ticket/card.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@
319319
}
320320

321321
// Assign to someone
322-
if ($action == "assign_user" && GETPOST('btn_assign_user', 'aplha') && $user->rights->ticket->write) {
322+
if ($action == "assign_user" && GETPOST('btn_assign_user', 'alpha') && $user->rights->ticket->write) {
323323
$object->fetch('', '', GETPOST("track_id", 'alpha'));
324324
$useroriginassign = $object->fk_user_assign;
325325
$usertoassign = GETPOST('fk_user_assign', 'int');

0 commit comments

Comments
 (0)