diff --git a/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php b/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
index 8c2adbe08f8..4c7ad5c71db 100644
--- a/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
+++ b/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
@@ -456,8 +456,8 @@ class FormAdvTargetEmailing extends Form
* selectAdvtargetemailingTemplate
*
* @param string $htmlname control name
- * @param number $selected defaut selected
- * @param number $showempty empty lines
+ * @param integer $selected defaut selected
+ * @param integer $showempty empty lines
*
* @return string HTML combo
*/
diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php
index f962a9e82ae..18a60a3429d 100644
--- a/htdocs/contrat/index.php
+++ b/htdocs/contrat/index.php
@@ -273,7 +273,7 @@ if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire)
}
else
{
- print '
| '.$langs->trans("NoContracts").' |
';
+ print '| '.$langs->trans("NoContracts").' |
';
}
print "
";
$db->free($resql);
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index c65fcb1bdc5..74cd27bc460 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -5250,7 +5250,7 @@ class Form
*
* @param CommonObject $object Object we want to show links to
* @param array $restrictlinksto Restrict links to some elements, for exemple array('order') or array('supplier_order')
- * @return int <0 if KO, >0 if OK
+ * @return string <0 if KO, >0 if OK
*/
function showLinkToObjectBlock($object, $restrictlinksto=array())
{
@@ -5468,7 +5468,7 @@ class Form
* @param int $option 0 return yes/no, 1 return 1/0
* @param bool $disabled true or false
* @param int $useempty 1=Add empty line
- * @return mixed See option
+ * @return string See option
*/
function selectyesno($htmlname,$value='',$option=0,$disabled=false,$useempty='')
{
@@ -5810,7 +5810,7 @@ class Form
* @param string $include Array list of groups id to include
* @param int $enableonly Array list of groups id to be enabled. All other must be disabled
* @param int $force_entity 0 or Id of environment to force
- * @return void
+ * @return string
* @see select_dolusers
*/
function select_dolgroups($selected='', $htmlname='groupid', $show_empty=0, $exclude='', $disabled=0, $include='', $enableonly='', $force_entity=0)
diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index b481a7e1f60..96bf0da9bfa 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -325,3 +325,6 @@ ProductVolume=Volume for 1 product
WeightUnits=Weight unit
VolumeUnits=Volume unit
SizeUnits=Size unit
+DeleteProductBuyPrice=Delete buying price
+ConfirmDeleteProductBuyPrice=Are you sure you want to delete this buying price?
+
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index ce6815911e1..6a76055d3fc 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -115,7 +115,7 @@ if (empty($reshook))
}
}
- if ($action == 'remove_pf')
+ if ($action == 'confirm_remove_pf')
{
if ($rowid) // id of product supplier price to remove
{
@@ -285,6 +285,12 @@ if ($id > 0 || $ref)
if ($result)
{
+ if ($action == 'ask_remove_pf') {
+ $form = new Form($db);
+ $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $id . '&rowid=' . $rowid, $langs->trans('DeleteProductBuyPrice'), $langs->trans('ConfirmDeleteProductBuyPrice'), 'confirm_remove_pf', '', 0, 1);
+ echo $formconfirm;
+ }
+
if ($action <> 'edit' && $action <> 're-edit')
{
$head=product_prepare_head($object);
@@ -680,7 +686,7 @@ if ($id > 0 || $ref)
if ($user->rights->produit->creer || $user->rights->service->creer)
{
print ''.img_edit()."";
- print ''.img_picto($langs->trans("Remove"),'disable.png').'';
+ print ''.img_picto($langs->trans("Remove"),'disable.png').'';
}
print '';
diff --git a/htdocs/societe/class/api_thirdparty.class.php b/htdocs/societe/class/api_thirdparty.class.php
index 9c65d08ac43..507d95639e6 100644
--- a/htdocs/societe/class/api_thirdparty.class.php
+++ b/htdocs/societe/class/api_thirdparty.class.php
@@ -370,7 +370,7 @@ class ThirdpartyApi extends DolibarrApi
* Delete thirdparty
*
* @param int $id Thirparty ID
- * @return type
+ * @return integer
*
* @url DELETE thirdparty/{id}
* @url DELETE customer/{id}