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

Merge pull request #10919 from grandoc/new_branch_26_03_2019

Browse Source 
New branch 26 03 2019
This commit is contained in:
Laurent Destailleur 2019-03-31 18:23:05 +02:00 committed by GitHub
commit 0d564cdd6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/actions_massactions.inc.php
View File

@ -539,7 +539,7 @@ if ($massaction == 'confirm_createbills') // Create bills from orders
{ {
$orders = GETPOST('toselect', 'array'); $orders = GETPOST('toselect', 'array');
$createbills_onebythird = GETPOST('createbills_onebythird', 'int'); $createbills_onebythird = GETPOST('createbills_onebythird', 'int');
$validate_invoices = GETPOST('valdate_invoices', 'int'); $validate_invoices = GETPOST('validate_invoices', 'int');
$TFact = array(); $TFact = array();
$TFactThird = array(); $TFactThird = array();

4
htdocs/fourn/commande/list.php
View File

@ -228,7 +228,7 @@ if (empty($reshook))
{ {
$orders = GETPOST('toselect', 'array'); $orders = GETPOST('toselect', 'array');
$createbills_onebythird = GETPOST('createbills_onebythird', 'int'); $createbills_onebythird = GETPOST('createbills_onebythird', 'int');
$validate_invoices = GETPOST('valdate_invoices', 'int'); $validate_invoices = GETPOST('validate_invoices', 'int');
$TFact = array(); $TFact = array();
$TFactThird = array(); $TFactThird = array();
@ -682,7 +682,7 @@ if ($resql)
print $langs->trans('ValidateInvoices'); print $langs->trans('ValidateInvoices');
print '</td>'; print '</td>';
print '<td>'; print '<td>';
print $form->selectyesno('valdate_invoices', 1, 1); print $form->selectyesno('validate_invoices', 1, 1);
print '</td>'; print '</td>';
print '</tr>'; print '</tr>';
print '</table>'; print '</table>';

2
htdocs/fourn/facture/list.php
View File

@ -518,7 +518,7 @@ if ($resql)
print $langs->trans('ValidateInvoices'); print $langs->trans('ValidateInvoices');
print '</td>'; print '</td>';
print '<td>'; print '<td>';
print $form->selectyesno('valdate_invoices', 1, 1); print $form->selectyesno('validate_invoices', 1, 1);
print '</td>'; print '</td>';
print '</tr>'; print '</tr>';
print '</table>'; print '</table>';

2
htdocs/projet/tasks/time.php
View File

@ -830,7 +830,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
print $langs->trans('ValidateInvoices'); print $langs->trans('ValidateInvoices');
print '</td>'; print '</td>';
print '<td>'; print '<td>';
print $form->selectyesno('valdate_invoices', 0, 1); print $form->selectyesno('validate_invoices', 0, 1);
print '</td>'; print '</td>';
print '</tr>';*/ print '</tr>';*/
print '</table>'; print '</table>';

6
htdocs/reception/list.php
View File

@ -159,7 +159,7 @@ if (empty($reshook))
$receptions = GETPOST('toselect', 'array'); $receptions = GETPOST('toselect', 'array');
$createbills_onebythird = GETPOST('createbills_onebythird', 'int'); $createbills_onebythird = GETPOST('createbills_onebythird', 'int');
$validate_invoices = GETPOST('valdate_invoices', 'int'); $validate_invoices = GETPOST('validate_invoices', 'int');
$TFact = array(); $TFact = array();
$TFactThird = array(); $TFactThird = array();
@ -584,12 +584,12 @@ if ($resql)
print '<td>'; print '<td>';
if (! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_BILL)) if (! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_BILL))
{ {
print $form->selectyesno('valdate_invoices', 0, 1, 1); print $form->selectyesno('validate_invoices', 0, 1, 1);
print ' ('.$langs->trans("AutoValidationNotPossibleWhenStockIsDecreasedOnInvoiceValidation").')'; print ' ('.$langs->trans("AutoValidationNotPossibleWhenStockIsDecreasedOnInvoiceValidation").')';
} }
else else
{ {
print $form->selectyesno('valdate_invoices', 0, 1); print $form->selectyesno('validate_invoices', 0, 1);
} }
print '</td>'; print '</td>';
print '</tr>'; print '</tr>';