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

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

Browse Source 
Conflicts:
	htdocs/langs/en_US/main.lang
This commit is contained in:
Laurent Destailleur 2019-10-22 15:25:31 +02:00
commit 6079a4d159
4 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/bookmarks/bookmarks.lib.php
View File

@ -72,6 +72,7 @@ function printBookmarksList($aDb, $aLangs)
$ret.= '<!-- form with POST method by default, will be replaced with GET for external link by js -->'."\n"; $ret.= '<!-- form with POST method by default, will be replaced with GET for external link by js -->'."\n";
$ret.= '<form id="actionbookmark" name="actionbookmark" method="POST" action="">'; $ret.= '<form id="actionbookmark" name="actionbookmark" method="POST" action="">';
$ret.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
$ret.= '<select name="bookmark" id="boxbookmark" class="flat boxcombo vmenusearchselectcombo" alt="Bookmarks">'; $ret.= '<select name="bookmark" id="boxbookmark" class="flat boxcombo vmenusearchselectcombo" alt="Bookmarks">';
$ret.= '<option hidden value="listbookmarks" class="optiongrey" selected rel="'.DOL_URL_ROOT.'/bookmarks/list.php">'.$langs->trans('Bookmarks').'</option>'; $ret.= '<option hidden value="listbookmarks" class="optiongrey" selected rel="'.DOL_URL_ROOT.'/bookmarks/list.php">'.$langs->trans('Bookmarks').'</option>';
$ret.= '<option value="listbookmark" class="optionblue" rel="'.dol_escape_htmltag(DOL_URL_ROOT.'/bookmarks/list.php').'" '; $ret.= '<option value="listbookmark" class="optionblue" rel="'.dol_escape_htmltag(DOL_URL_ROOT.'/bookmarks/list.php').'" ';

1
htdocs/langs/en_US/main.lang
View File

@ -473,6 +473,7 @@ Category=Tag/category
By=By By=By
From=From From=From
to=to to=to
To=to
and=and and=and
or=or or=or
Other=Other Other=Other

1
htdocs/langs/fr_FR/main.lang
View File

@ -475,6 +475,7 @@ Category=Tag/catégorie
By=Par By=Par
From=Du From=Du
to=au to=au
To=à
and=et and=et
or=ou or=ou
Other=Autre Other=Autre

3
htdocs/product/stock/replenish.php
View File

@ -140,7 +140,6 @@ if ($action == 'order' && isset($_POST['valid']))
if ($qty) if ($qty)
{ {
//might need some value checks //might need some value checks
$obj = $db->fetch_object($resql);
$line = new CommandeFournisseurLigne($db); $line = new CommandeFournisseurLigne($db);
$line->qty = $qty; $line->qty = $qty;
$line->fk_product = $idprod; $line->fk_product = $idprod;
@ -179,7 +178,7 @@ if ($action == 'order' && isset($_POST['valid']))
$error=$db->lasterror(); $error=$db->lasterror();
dol_print_error($db); dol_print_error($db);
} }
$db->free($resql);
unset($_POST['fourn' . $i]); unset($_POST['fourn' . $i]);
} }
unset($_POST[$i]); unset($_POST[$i]);