diff --git a/dev/initdemo/updatedemo.php b/dev/initdemo/updatedemo.php index 1d4a8f01f94..84abd12c6d0 100755 --- a/dev/initdemo/updatedemo.php +++ b/dev/initdemo/updatedemo.php @@ -67,16 +67,18 @@ $tables=array( 'commande'=>array(0=>'date_commande', 1=>'date_valid', 2=>'date_cloture'), 'facture'=>array(0=>'datef', 1=>'date_valid', 2=>'date_lim_reglement'), 'paiement'=>array(0=>'datep'), - 'bank'=>array(0=>'datev', 1=>'dateo', ) + 'bank'=>array(0=>'datev', 1=>'dateo'), + 'supplier_proposal'=>array(0=>'datec', 1=>'date_valid', 2=>'date_cloture') ); $year=2010; $currentyear=$tmp['year']; while ($year <= $currentyear) { + //$year=2021; $delta=($currentyear - $year); - $delta=-1; - + //$delta=-1; + if ($delta) { foreach($tables as $tablekey => $tableval) diff --git a/htdocs/install/mysql/migration/repair.sql b/htdocs/install/mysql/migration/repair.sql index 147f516c479..9cc35e50b0d 100755 --- a/htdocs/install/mysql/migration/repair.sql +++ b/htdocs/install/mysql/migration/repair.sql @@ -41,6 +41,7 @@ delete from llx_livraisondet where fk_livraison in (select rowid from llx_livrai delete from llx_livraison where ref = ''; delete from llx_expeditiondet where fk_expedition in (select rowid from llx_expedition where ref = ''); delete from llx_expedition where ref = ''; +delete from llx_holiday_logs where fk_user_update not IN (select rowid from llx_user); update llx_deplacement set dated='2010-01-01' where dated < '2000-01-01'; diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php index 967a510d714..512db4b7c4d 100644 --- a/htdocs/supplier_proposal/list.php +++ b/htdocs/supplier_proposal/list.php @@ -61,6 +61,8 @@ $sall=GETPOST("sall"); $mesg=(GETPOST("msg") ? GETPOST("msg") : GETPOST("mesg")); $year=GETPOST("year"); $month=GETPOST("month"); +$yearvalid=GETPOST("yearvalid"); +$monthvalid=GETPOST("monthvalid"); // Nombre de ligne pour choix de produit/service predefinis $NBLINES=4; @@ -130,6 +132,8 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") ||GETPO $search_societe=''; $search_montant_ht=''; $search_author=''; + $yearvalid=''; + $monthvalid=''; $year=''; $month=''; $viewstatut=''; @@ -192,7 +196,7 @@ $companystatic=new Societe($db); $now=dol_now(); $sql = 'SELECT s.rowid, s.nom as name, s.town, s.client, s.code_client,'; -$sql.= ' p.rowid as supplier_proposalid, p.note_private, p.total_ht, p.ref, p.fk_statut, p.fk_user_author, p.date_livraison as dp,'; +$sql.= ' p.rowid as supplier_proposalid, p.note_private, p.total_ht, p.ref, p.fk_statut, p.fk_user_author, p.date_valid, p.date_livraison as dp,'; if (! $user->rights->societe->client->voir && ! $socid) $sql .= " sc.fk_soc, sc.fk_user,"; $sql.= ' u.login'; $sql.= ' FROM '.MAIN_DB_PREFIX.'societe as s, '.MAIN_DB_PREFIX.'supplier_proposal as p'; @@ -211,28 +215,13 @@ if (! $user->rights->societe->client->voir && ! $socid) //restriction { $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id; } -if ($search_ref) { - $sql .= natural_search('p.ref', $search_ref); -} -if ($search_societe) { - $sql .= natural_search('s.nom', $search_societe); -} -if ($search_author) -{ - $sql.= " AND u.login LIKE '%".$db->escape(trim($search_author))."%'"; -} -if ($search_montant_ht) -{ - $sql.= " AND p.total_ht='".$db->escape(price2num(trim($search_montant_ht)))."'"; -} -if ($sall) { - $sql .= natural_search(array_keys($fieldstosearchall), $sall); -} +if ($search_ref) $sql .= natural_search('p.ref', $search_ref); +if ($search_societe) $sql .= natural_search('s.nom', $search_societe); +if ($search_author) $sql.= " AND u.login LIKE '%".$db->escape(trim($search_author))."%'"; +if ($search_montant_ht) $sql.= " AND p.total_ht='".$db->escape(price2num(trim($search_montant_ht)))."'"; +if ($sall) $sql .= natural_search(array_keys($fieldstosearchall), $sall); if ($socid) $sql.= ' AND s.rowid = '.$socid; -if ($viewstatut <> '') -{ - $sql.= ' AND p.fk_statut IN ('.$viewstatut.')'; -} +if ($viewstatut <> '') $sql.= ' AND p.fk_statut IN ('.$viewstatut.')'; if ($month > 0) { if ($year > 0 && empty($day)) @@ -246,6 +235,19 @@ else if ($year > 0) { $sql.= " AND p.date_livraison BETWEEN '".$db->idate(dol_get_first_day($year,1,false))."' AND '".$db->idate(dol_get_last_day($year,12,false))."'"; } +if ($monthvalid > 0) +{ + if ($yearvalid > 0 && empty($dayvalid)) + $sql.= " AND p.date_valid BETWEEN '".$db->idate(dol_get_first_day($yearvalid,$monthvalid,false))."' AND '".$db->idate(dol_get_last_day($yearvalid,$monthvalid,false))."'"; + else if ($yearvalid > 0 && ! empty($dayvalid)) + $sql.= " AND p.date_valid BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $monthvalid, $dayvalid, $yearvalid))."' AND '".$db->idate(dol_mktime(23, 59, 59, $monthvalid, $dayvalid, $yearvalid))."'"; + else + $sql.= " AND date_format(p.date_valid, '%m') = '".$monthvalid."'"; +} +else if ($yearvalid > 0) +{ + $sql.= " AND p.date_valid BETWEEN '".$db->idate(dol_get_first_day($yearvalid,1,false))."' AND '".$db->idate(dol_get_last_day($yearvalid,12,false))."'"; +} if ($search_sale > 0) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$search_sale; if ($search_user > 0) { @@ -341,6 +343,7 @@ if ($result) print ''; print_liste_field_titre($langs->trans('Ref'),$_SERVER["PHP_SELF"],'p.ref','',$param,'',$sortfield,$sortorder); print_liste_field_titre($langs->trans('Supplier'),$_SERVER["PHP_SELF"],'s.nom','',$param,'',$sortfield,$sortorder); + print_liste_field_titre($langs->trans('Date'),$_SERVER["PHP_SELF"],'p.date_valid','',$param, 'align="center"',$sortfield,$sortorder); print_liste_field_titre($langs->trans('SupplierProposalDate'),$_SERVER["PHP_SELF"],'p.date_livraison','',$param, 'align="center"',$sortfield,$sortorder); print_liste_field_titre($langs->trans('AmountHT'),$_SERVER["PHP_SELF"],'p.total_ht','',$param, 'align="right"',$sortfield,$sortorder); print_liste_field_titre($langs->trans('Author'),$_SERVER["PHP_SELF"],'u.login','',$param,'align="center"',$sortfield,$sortorder); @@ -356,6 +359,15 @@ if ($result) print ''; print ''; + // Date valid + print ''; + //print $langs->trans('Month').': '; + print ''; + //print ' '.$langs->trans('Year').': '; + $syearvalid = $yearvalid; + $formother->select_year($syearvalid,'yearvalid',1, 20, 5); + print ''; + // Date print ''; //print $langs->trans('Month').': '; @@ -435,7 +447,12 @@ if ($result) print $companystatic->getNomUrl(1,'customer'); print ''; - // Date askprice + // Date + print ''; + print dol_print_date($db->jdate($objp->date_valid), 'day'); + print "\n"; + + // Date delivery print ''; print dol_print_date($db->jdate($objp->dp), 'day'); print "\n"; @@ -466,14 +483,14 @@ if ($result) if($num<$limit){ $var=!$var; print ''.$langs->trans("TotalHT").''; - print ''.price($total).''; + print ''.price($total).''; print ''; } else { $var=!$var; print ''.$langs->trans("TotalHTforthispage").''; - print ''.price($total).''; + print ''.price($total).''; print ''; }