Automated merge from 14.0 to 15.0 by tool pullmerge.sh
This commit is contained in:
commit
bf6c8090a5
1 changed files with 2 additions and 0 deletions
|
|
@ -253,12 +253,14 @@ print '<td width="80"> </td>';
|
|||
print "</tr>\n";
|
||||
|
||||
// Allow payments on different thirdparties bills but same parent company
|
||||
/*
|
||||
print '<tr class="oddeven"><td>';
|
||||
print $langs->trans("PaymentOnDifferentThirdBills");
|
||||
print '</td><td width="60" align="center">';
|
||||
print $form->selectyesno("FACTURE_PAYMENTS_ON_DIFFERENT_THIRDPARTIES_BILLS", $conf->global->FACTURE_PAYMENTS_ON_DIFFERENT_THIRDPARTIES_BILLS, 1);
|
||||
print '</td><td class="right">';
|
||||
print "</td></tr>\n";
|
||||
*/
|
||||
|
||||
// Allow to group payments by mod in rapports
|
||||
print '<tr class="oddeven"><td>';
|
||||
|
|
|
|||
Loading…
Reference in a new issue