diff --git a/ChangeLog b/ChangeLog index efab71f873f..bd541ad76f7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,7 @@ For users: - New: Can add a field errors-to in emailing. - New: Can use inline images in emails. - New: Add predefined invoices (can be use for repeated invoices). +- New: Add a confirmation when cloning products. - Fix: Customer code was not correct on PDF it if contains special characters. - Fix: Can update price even with "NPR" VAT rates. diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index afa4507858c..88098d0b325 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -112,6 +112,7 @@ ConfirmClone=Choose data you want to clone : NoCloneOptionsSpecified=No data to clone defined. CopyOf=Copy of Show=Show +ShowCardHere=Show card Search=Search Valid=Valid Approve=Approve diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang index e787b4e38da..b19c0161c41 100644 --- a/htdocs/langs/fr_FR/main.lang +++ b/htdocs/langs/fr_FR/main.lang @@ -112,6 +112,7 @@ ConfirmClone=Veuillez choisir votre option de clonage : NoCloneOptionsSpecified=Aucun option de clonage n'a été spécifiée. CopyOf=Copie de Show=Voir +ShowCardHere=Voir la fiche ici Search=Rechercher Valid=Valider Approve=Approuver diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php index e58a8a597e2..7cc49d0b52e 100644 --- a/htdocs/product/fiche.php +++ b/htdocs/product/fiche.php @@ -260,7 +260,9 @@ if ($_POST["action"] == 'confirm_clone' && $_POST['confirm'] == 'yes' && $user-> $_error = 1; $_GET["action"] = ""; - $mesg='
'.$langs->trans("ErrorProductAlreadyExists",$product->ref).'
'; + $mesg='
'.$langs->trans("ErrorProductAlreadyExists",$product->ref); + $mesg.=' '.$langs->trans("ShowCardHere").'.'; + $mesg.='
'; //dol_print_error($product->db); } else