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

Add the choice to delete the product linked

Browse Source
This commit is contained in:
Cédric 2019-11-23 18:03:46 +01:00 committed by GitHub
parent d647479794
commit 83de0fa7c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/variants/combinations.php
View File

@ -42,6 +42,7 @@ $show_files = GETPOST('show_files', 'int');
$confirm = GETPOST('confirm', 'alpha'); $confirm = GETPOST('confirm', 'alpha');
$toselect = GETPOST('toselect', 'array'); $toselect = GETPOST('toselect', 'array');
$cancel = GETPOST('cancel', 'alpha'); $cancel = GETPOST('cancel', 'alpha');
$delete_product = GETPOST('delete_product', 'alpha');
// Security check // Security check
$fieldvalue = (!empty($id) ? $id : $ref); $fieldvalue = (!empty($id) ? $id : $ref);
@ -244,7 +245,7 @@ if ($action === 'confirm_deletecombination') {
if ($prodcomb->fetch($valueid) > 0) { if ($prodcomb->fetch($valueid) > 0) {
$db->begin(); $db->begin();
if ($prodcomb->delete($user) > 0) { if ($prodcomb->delete($user) > 0 && (empty($delete_product) || ($delete_product == 'on' && $prodstatic->fetch($prodcomb->fk_product_child) > 0 && $prodstatic->delete($user) > 0))) {
$db->commit(); $db->commit();
setEventMessages($langs->trans('RecordSaved'), null, 'mesgs'); setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
header('Location: '.dol_buildpath('/variants/combinations.php?id='.$object->id, 2)); header('Location: '.dol_buildpath('/variants/combinations.php?id='.$object->id, 2));
@ -635,7 +636,7 @@ if (! empty($id) || ! empty($ref))
$langs->trans('Delete'), $langs->trans('Delete'),
$langs->trans('ProductCombinationDeleteDialog', $prodstatic->ref), $langs->trans('ProductCombinationDeleteDialog', $prodstatic->ref),
"confirm_deletecombination", "confirm_deletecombination",
'', array(array('label'=> $langs->trans('DeleteLinkedProduct'),'type'=> 'checkbox', 'name' => 'delete_product', 'value' => false)),
0, 0,
1 1
); );