diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index cb54afd5e8d..8e963e799e9 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -332,7 +332,7 @@ if ($_POST['action'] == 'setremise' && $user->rights->facture->creer) $result = $fac->set_remise($user, $_POST['remise']); } -if ($_POST['action'] == 'addligne' && $user->rights->facture->creer) +if (($_POST['action'] == 'addligne' || $_POST['action'] == 'addligne_predef') && $user->rights->facture->creer) { if ($_POST['qty'] && ( $_POST['desc'] || $_POST['idprod'])) { @@ -340,13 +340,29 @@ if ($_POST['action'] == 'addligne' && $user->rights->facture->creer) $fac->fetch($_POST['facid']); $datestart=''; $dateend=''; - if ($_POST['date_startyear'] && $_POST['date_startmonth'] && $_POST['date_startday']) + // Si ajout champ produit libre + if ($_POST['action'] == 'addligne') { - $datestart=$_POST['date_startyear'].'-'.$_POST['date_startmonth'].'-'.$_POST['date_startday']; + if ($_POST['date_startyear'] && $_POST['date_startmonth'] && $_POST['date_startday']) + { + $datestart=$_POST['date_startyear'].'-'.$_POST['date_startmonth'].'-'.$_POST['date_startday']; + } + if ($_POST['date_endyear'] && $_POST['date_endmonth'] && $_POST['date_endday']) + { + $dateend=$_POST['date_endyear'].'-'.$_POST['date_endmonth'].'-'.$_POST['date_endday']; + } } - if ($_POST['date_endyear'] && $_POST['date_endmonth'] && $_POST['date_endday']) + // Si ajout champ produit prédéfini + if ($_POST['action'] == 'addligne_predef') { - $dateend=$_POST['date_endyear'].'-'.$_POST['date_endmonth'].'-'.$_POST['date_endday']; + if ($_POST['date_start_predefyear'] && $_POST['date_start_predefmonth'] && $_POST['date_start_predefday']) + { + $datestart=$_POST['date_start_predefyear'].'-'.$_POST['date_start_predefmonth'].'-'.$_POST['date_start_predefday']; + } + if ($_POST['date_end_predefyear'] && $_POST['date_end_predefmonth'] && $_POST['date_end_predefday']) + { + $dateend=$_POST['date_end_predefyear'].'-'.$_POST['date_end_predefmonth'].'-'.$_POST['date_end_predefday']; + } } $result = $fac->addline( $_POST['facid'], @@ -1626,7 +1642,7 @@ else { print '