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

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into

Browse Source 
develop

Conflicts:
	htdocs/compta/tva/card.php
This commit is contained in:
Laurent Destailleur 2020-02-08 16:01:41 +01:00
commit 5f507b2df5
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
htdocs/compta/tva/card.php
View File

@ -41,6 +41,7 @@ if (empty($refund)) $refund=0;
$datev=dol_mktime(12, 0, 0, GETPOST("datevmonth", 'int'), GETPOST("datevday", 'int'), GETPOST("datevyear", 'int')); $datev=dol_mktime(12, 0, 0, GETPOST("datevmonth", 'int'), GETPOST("datevday", 'int'), GETPOST("datevyear", 'int'));
$datep=dol_mktime(12, 0, 0, GETPOST("datepmonth", 'int'), GETPOST("datepday", 'int'), GETPOST("datepyear", 'int')); $datep=dol_mktime(12, 0, 0, GETPOST("datepmonth", 'int'), GETPOST("datepday", 'int'), GETPOST("datepyear", 'int'));
// Security check // Security check
$socid = GETPOST('socid', 'int'); $socid = GETPOST('socid', 'int');
if ($user->socid) $socid=$user->socid; if ($user->socid) $socid=$user->socid;
@ -73,7 +74,7 @@ if ($action == 'setlib' && $user->rights->tax->charges->creer)
if ($action == 'setdatev' && $user->rights->tax->charges->creer) if ($action == 'setdatev' && $user->rights->tax->charges->creer)
{ {
$object->fetch($id); $object->fetch($id);
$object->datev=dol_mktime(12, 0, 0, GETPOST('datevmonth', 'int'), GETPOST('datevday', 'int'), GETPOST('datevyear', 'int')); $object->datev = $datev;
$result=$object->update($user); $result=$object->update($user);
if ($result < 0) dol_print_error($db, $object->error); if ($result < 0) dol_print_error($db, $object->error);
@ -84,11 +85,12 @@ if ($action == 'add' && $_POST["cancel"] <> $langs->trans("Cancel"))
{ {
$error=0; $error=0;
$object->accountid=GETPOST("accountid", 'int'); $object->accountid = GETPOST("accountid", 'int');
$object->type_payment=GETPOST("type_payment", 'alphanohtml'); $object->type_payment = GETPOST("type_payment", 'alphanohtml');
$object->num_payment=GETPOST("num_payment", 'alphanohtml'); $object->num_payment = GETPOST("num_payment", 'alphanohtml');
$object->datev=$datev;
$object->datep=$datep; $object->datev = $datev;
$object->datep = $datep;
$amount = price2num(GETPOST("amount", 'alpha')); $amount = price2num(GETPOST("amount", 'alpha'));
if ($refund == 1) { if ($refund == 1) {