admingit/altocompta
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Stock : by default date from user preference

Browse source
This commit is contained in:
sparkyx 2025-06-24 16:54:40 +02:00
parent a231e18b44
commit 19337b4e1c
1 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
include/class/stock.class.php
View file

@ -201,11 +201,21 @@ class Stock extends Stock_Sql
if (isset($p_array['wdate_start']) && $p_array['wdate_start'] != '') if (isset($p_array['wdate_start']) && $p_array['wdate_start'] != '')
{ {
$clause = $and." to_date('" . sql_string($p_array['wdate_start']) . "','DD.MM.YYYY')<=coalesce(sg_date,jr_date) "; $clause = $and." to_date('" . sql_string($p_array['wdate_start']) . "','DD.MM.YYYY')<=coalesce(sg_date,jr_date) ";
} }else{
$exercice=$g_user->get_exercice();
$periode=new Periode($cn);
$limit=$periode->get_limit($exercice);
$clause = $and.sprintf(" to_date ('%s','DD.MM.YYYY') <=coalesce(sg_date,jr_date)",$limit[0]->first_day());
}
if (isset($p_array['wdate_end']) && $p_array['wdate_end'] != '') if (isset($p_array['wdate_end']) && $p_array['wdate_end'] != '')
{ {
$clause.=$and . " to_date('" . sql_string($p_array['wdate_end']) . "','DD.MM.YYYY')>=coalesce(sg_date,jr_date) "; $clause.=$and . " to_date('" . sql_string($p_array['wdate_end']) . "','DD.MM.YYYY')>=coalesce(sg_date,jr_date) ";
} }else {
$exercice=$g_user->get_exercice();
$periode=new Periode($cn);
$limit=$periode->get_limit($exercice);
$clause .= $and.sprintf(" to_date ('%s','DD.MM.YYYY') >= coalesce(sg_date,jr_date)",$limit[1]->last_day());
}
if (isset($p_array['wamount_start']) && $p_array['wamount_start'] != '' && isNumber($p_array['wamount_start']) == 1 if (isset($p_array['wamount_start']) && $p_array['wamount_start'] != '' && isNumber($p_array['wamount_start']) == 1
&& $p_array['wamount_start'] != 0 ) && $p_array['wamount_start'] != 0 )
{ {