Merge pull request #966 from FHenry/3.4

Fix bug on service date strat date end in propal line not recorded
This commit is contained in:
Laurent Destailleur 2013-05-20 09:02:15 -07:00
commit 53c053604f

View File

@ -638,6 +638,7 @@ else if ($action == "addline" && $user->rights->propal->creer)
$product_desc = (GETPOST('product_desc')?GETPOST('product_desc'):(GETPOST('np_desc')?GETPOST('np_desc'):(GETPOST('dp_desc')?GETPOST('dp_desc'):'')));
$price_ht = GETPOST('price_ht');
$tva_tx = (GETPOST('tva_tx')?GETPOST('tva_tx'):0);
$predef=((! empty($idprod) && $conf->global->MAIN_FEATURES_LEVEL < 2) ? '_predef' : '');
if (empty($idprod) && GETPOST('type') < 0)
{
@ -1968,7 +1969,7 @@ else
// Show object lines
$result = $object->getLinesArray();
if (! empty($object->lines))
$ret=$object->printObjectLines($action,$mysoc,$soc,$lineid);
$ret=$object->printObjectLines($action,$mysoc,$soc,$lineid,1);
// Form to add new line
if ($object->statut == 0 && $user->rights->propal->creer)
@ -2283,4 +2284,4 @@ else
// End of page
llxFooter();
$db->close();
?>
?>