New: Add the now button on date list
This commit is contained in:
parent
c43970f116
commit
0b7bada016
@ -1693,7 +1693,7 @@ if ($_GET['action'] == 'create')
|
|||||||
|
|
||||||
// Date invoice
|
// Date invoice
|
||||||
print '<tr><td>'.$langs->trans('Date').'</td><td colspan="2">';
|
print '<tr><td>'.$langs->trans('Date').'</td><td colspan="2">';
|
||||||
$html->select_date($dateinvoice,'','','','',"add");
|
$html->select_date($dateinvoice,'','','','',"add",1,1);
|
||||||
print '</td></tr>';
|
print '</td></tr>';
|
||||||
|
|
||||||
// Payment term
|
// Payment term
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
<?php
|
<?php
|
||||||
/* Copyright (C) 2002-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
/* Copyright (C) 2002-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
||||||
* Copyright (C) 2004-2009 Laurent Destailleur <eldy@users.sourceforge.net>
|
* Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||||
* Copyright (C) 2004 Christophe Combelles <ccomb@free.fr>
|
* Copyright (C) 2004 Christophe Combelles <ccomb@free.fr>
|
||||||
* Copyright (C) 2005 Marc Barilley / Ocebo <marc@ocebo.fr>
|
* Copyright (C) 2005 Marc Barilley / Ocebo <marc@ocebo.fr>
|
||||||
* Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
|
* Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
|
||||||
@ -423,10 +423,10 @@ if ($_GET['action'] == 'create')
|
|||||||
$societe->fetch($_GET['socid']);
|
$societe->fetch($_GET['socid']);
|
||||||
}
|
}
|
||||||
|
|
||||||
$datefacture=dol_mktime(12,0,0,$_POST['remonth'],$_POST['reday'],$_POST['reyear']);
|
$datetmp=dol_mktime(12,0,0,$_POST['remonth'],$_POST['reday'],$_POST['reyear']);
|
||||||
$datedue=dol_mktime(12,0,0,$_POST['echmonth'],$_POST['echday'],$_POST['echyear']);
|
$dateinvoice=($datetmp==''?(empty($conf->global->MAIN_AUTOFILL_DATE)?-1:0):$datetmp);
|
||||||
|
$datetmp=dol_mktime(12,0,0,$_POST['echmonth'],$_POST['echday'],$_POST['echyear']);
|
||||||
$dateinvoice=($datefacture==''?(empty($conf->global->MAIN_AUTOFILL_DATE)?-1:0):$datefacture);
|
$datedue=($datetmp==''?-1:$datetmp);
|
||||||
|
|
||||||
print '<form name="add" action="fiche.php" method="post">';
|
print '<form name="add" action="fiche.php" method="post">';
|
||||||
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
|
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
|
||||||
@ -456,12 +456,12 @@ if ($_GET['action'] == 'create')
|
|||||||
|
|
||||||
// Date invoice
|
// Date invoice
|
||||||
print '<tr><td>'.$langs->trans('DateInvoice').'</td><td>';
|
print '<tr><td>'.$langs->trans('DateInvoice').'</td><td>';
|
||||||
$html->select_date($dateinvoice,'','','','',"add");
|
$html->select_date($dateinvoice,'','','','',"add",1,1);
|
||||||
print '</td></tr>';
|
print '</td></tr>';
|
||||||
|
|
||||||
// Due date
|
// Due date
|
||||||
print '<tr><td>'.$langs->trans('DateEcheance').'</td><td>';
|
print '<tr><td>'.$langs->trans('DateEcheance').'</td><td>';
|
||||||
$html->select_date('','ech','','','',"add");
|
$html->select_date($datedue,'ech','','','',"add",1,1);
|
||||||
print '</td></tr>';
|
print '</td></tr>';
|
||||||
|
|
||||||
print '</table><br>';
|
print '</table><br>';
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user