From ead99c59769088ccc20f93cc3aadf6ae05499c3f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 30 Mar 2020 12:12:23 +0200 Subject: [PATCH] Enhance updatedemo --- dev/initdemo/updatedemo.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dev/initdemo/updatedemo.php b/dev/initdemo/updatedemo.php index ca11b98d468..aceaeb88456 100755 --- a/dev/initdemo/updatedemo.php +++ b/dev/initdemo/updatedemo.php @@ -67,7 +67,7 @@ $tmp=dol_getdate(dol_now()); $tables=array( 'propal'=>array(0=>'datep', 1=>'fin_validite', 2=>'date_valid', 3=>'date_cloture'), 'commande'=>array(0=>'date_commande', 1=>'date_valid', 2=>'date_cloture'), - 'facture'=>array(0=>'datef', 1=>'date_valid', 2=>'date_lim_reglement'), + 'facture'=>array(0=>'datec', 0=>'datef', 1=>'date_valid', 2=>'date_lim_reglement'), 'paiement'=>array(0=>'datep'), 'bank'=>array(0=>'datev', 1=>'dateo'), 'commande_fournisseur'=>array(0=>'date_commande', 1=>'date_valid', 3=>'date_creation', 4=>'date_approve', 5=>'date_approve2', 6=>'date_livraison'), @@ -79,10 +79,11 @@ $currentyear=$tmp['year']; while ($year <= $currentyear) { //$year=2021; - $delta=($currentyear - $year); + $delta1=($currentyear - $year); + $delta2=($currentyear - $year - 1); //$delta=-1; - if ($delta) + if ($delta1) { foreach($tables as $tablekey => $tableval) { @@ -105,7 +106,7 @@ while ($year <= $currentyear) foreach($tableval as $field) { if ($j) $sql2.=", "; - $sql2.= $field." = DATE_ADD(".$field.", INTERVAL ".$delta." YEAR)"; + $sql2.= $field." = ".$db->ifsql("DATE_ADD(".$field.", INTERVAL ".$delta1." YEAR) > NOW()", "DATE_ADD(".$field.", INTERVAL ".$delta2." YEAR)", "DATE_ADD(".$field.", INTERVAL ".$delta1." YEAR)"); $j++; } $sql2.=" WHERE rowid = ".$obj->rowid;