diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 05174fd940b15b93d3c16b618646eb5747e6c32d..aad8b77811f4207b6442b0ef2ad90cc7e81f7269 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -3800,30 +3800,20 @@ else if ($id > 0 || ! empty($ref)) // Lines $result = $object->getLinesArray(); - print ' <form name="addproduct" id="addproduct" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . (($action != 'editline') ? '#add' : '#line_' . GETPOST('lineid')) . '" method="POST"> - <input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '"> - <input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateligne') . '"> - <input type="hidden" name="mode" value=""> - <input type="hidden" name="id" value="' . $object->id . '"> - '; - - if (! empty($conf->use_javascript_ajax) && $object->statut == 0) { - include DOL_DOCUMENT_ROOT . '/core/tpl/ajaxrow.tpl.php'; - } - - print '<div class="div-table-responsive">'; - print '<table id="tablelines" class="noborder noshadow" width="100%">'; - // Show global modifiers if (! empty($conf->global->INVOICE_USE_SITUATION)) { if ($object->situation_cycle_ref && $object->statut == 0) { - print '<tr class="liste_titre nodrag nodrop">'; + print '<div class="div-table-responsive">'; + print '<form name="updatealllines" id="updatealllines" action="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '"#updatealllines" method="POST">'; print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '" />'; print '<input type="hidden" name="action" value="updatealllines" />'; print '<input type="hidden" name="id" value="' . $object->id . '" />'; - + + print '<table id="tablelines" class="noborder noshadow" width="100%">'; + print '<tr class="liste_titre nodrag nodrop">'; + if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) { print '<td align="center" width="5"> </td>'; } @@ -3846,7 +3836,7 @@ else if ($id > 0 || ! empty($ref)) print '<td width="10"> </td>'; print '<td width="10"> </td>'; print "</tr>\n"; - + if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) { print '<td align="center" width="5"> </td>'; } @@ -3859,10 +3849,33 @@ else if ($id > 0 || ! empty($ref)) print '<td align="right" class="nowrap"><input type="text" size="1" value="" name="all_progress">%</td>'; print '<td colspan="4" align="right"><input class="button" type="submit" name="all_percent" value="Modifier" /></td>'; print '</tr>'; + + print '</table>'; + print '</form>'; + + print '</div>'; + } + + } + + + + print ' <form name="addproduct" id="addproduct" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . (($action != 'editline') ? '#add' : '#line_' . GETPOST('lineid')) . '" method="POST"> + <input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '"> + <input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateligne') . '"> + <input type="hidden" name="mode" value=""> + <input type="hidden" name="id" value="' . $object->id . '"> + '; + + if (! empty($conf->use_javascript_ajax) && $object->statut == 0) { + include DOL_DOCUMENT_ROOT . '/core/tpl/ajaxrow.tpl.php'; } + print '<div class="div-table-responsive">'; + print '<table id="tablelines" class="noborder noshadow" width="100%">'; + // Show object lines if (! empty($object->lines)) $ret = $object->printObjectLines($action, $mysoc, $soc, $lineid, 1);