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

Merged revisions 3879,3883-3893 via svnmerge from

Browse source 
file:///home/developper/svn/phpcompta/branches/rel530

........
  r3887 | danydb | 2010-12-27 22:48:49 +0100 (Mon, 27 Dec 2010) | 2 lines
  
  remove useless tags
........
  r3888 | danydb | 2010-12-27 23:35:12 +0100 (Mon, 27 Dec 2010) | 2 lines
  
  Date in doc to generate
........
  r3889 | danydb | 2010-12-28 00:13:19 +0100 (Tue, 28 Dec 2010) | 1 line
  
  Fix date problème in customer/supplier follow up
........
  r3890 | danydb | 2010-12-28 01:09:39 +0100 (Tue, 28 Dec 2010) | 2 lines
  
  size  align to right
........
  r3891 | danydb | 2010-12-28 01:49:26 +0100 (Tue, 28 Dec 2010) | 2 lines
  
  order the attribute to add by name
........
  r3892 | danydb | 2010-12-29 15:00:09 +0100 (Wed, 29 Dec 2010) | 2 lines
  
  Bug cannot clone forecast
........
  r3893 | danydb | 2011-01-03 17:45:34 +0100 (Mon, 03 Jan 2011) | 1 line
  
  Order properly the audit
........
This commit is contained in:
Dany De Bontridder 2011-01-03 16:47:58 +00:00
parent 3b00e11181
commit 8dda6661c7
8 changed files with 21 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

8
include/action.common.inc.php
View file

@ -89,9 +89,11 @@ if ( $sub_action=="update" )
}
else
{
ShowActionList($cn,$base);
$url="?$base&sa=detail&ag_id=".$act2->ag_id.'&'.dossier::get();
echo '<p><a class="mtitle" href="'.$url.'">'.hb(_('Action sauvée').' : '.$act2->ag_ref).'</a></p>';
ShowActionList($cn,$base);
echo '<p><a class="mtitle" href="'.$url.'">'.hb(_('Action sauvée').' : '.$act2->ag_ref).'</a></p>';
}
}
//----------------------------------------------------------------------
@ -220,6 +222,10 @@ if ( $sub_action == "save_action_st2" )
// insert into action_gestion
echo $act->save();
$url="?$base&sa=detail&ag_id=".$act2->ag_id.'&'.dossier::get();
echo '<p><a class="mtitle" href="'.$url.'">'.hb('Action Sauvée : '.$act->ag_ref).'</a></p>';
ShowActionList($cn,$base);
$url="?$base&sa=detail&ag_id=".$act->ag_id.'&'.dossier::get();
echo '<p><a class="mtitle" href="'.$url.'">'.hb('Action Sauvée : '.$act->ag_ref).'</a></p>';

4
include/audit_log.php
View file

@ -29,7 +29,7 @@
<?php
$cn=new Database();
$cn->exec_sql("select ac_user,ac_ip,to_char(ac_date,'DD.MM.YYYY HH24:MI') as fmt_date,ac_state,ac_module from audit_connect order by 3");
$cn->exec_sql("select ac_user,ac_ip,to_char(ac_date,'DD.MM.YYYY HH24:MI') as fmt_date,ac_state,ac_module from audit_connect order by ac_datedesc ");
?>
<TABLE CLASS="result" style="border-collapse:separate;border-spacing:2">
<tr>
@ -81,4 +81,4 @@ switch ( $r['ac_state'] )
<?
endfor;
?>
</DIV>
</DIV>

10
include/class_action.php
View file

@ -525,7 +525,7 @@ class Action
*/
function get()
{
$sql="select ag_id, ag_comment,to_char (ag_timestamp,'DD-MM-YYYY') as ag_timestamp,".
$sql="select ag_id, ag_comment,to_char (ag_timestamp,'DD.MM.YYYY') as ag_timestamp,".
" f_id_dest,ag_title,ag_comment,ag_ref,d_id,ag_type,ag_state, ".
" ag_ref_ag_id, ag_dest, ag_hour, ag_priority, ag_cal,ag_contact ".
" from action_gestion left join document using (ag_id) where ag_id=".$this->ag_id;
@ -610,7 +610,7 @@ class Action
$sql="insert into action_gestion".
"(ag_id,ag_timestamp,ag_type,ag_title,f_id_dest,ag_comment,ag_ref,ag_ref_ag_id, ag_dest, ".
" ag_hour, ag_priority,ag_cal,ag_owner,ag_contact,ag_state) ".
" values ($1,to_date($2,'DD-MM-YYYY'),$3,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13,$14,$15)";
" values ($1,to_date($2,'DD.MM.YYYY'),$3,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13,$14,$15)";
$this->db->exec_sql($sql,array($this->ag_id, /* 1 */
$this->ag_timestamp, /* 2 */
$this->dt_id, /* 3 */
@ -776,7 +776,7 @@ class Action
$p_filter_doc=" 1=1 ";
$sql="
select ag_id,to_char(ag_timestamp,'DD-MM-YYYY') as my_date,ag_ref_ag_id,f_id_dest".
select ag_id,to_char(ag_timestamp,'DD.MM.YYYY') as my_date,ag_ref_ag_id,f_id_dest".
",ag_title,md_type,dt_value,ag_ref, ag_priority,ag_state
from action_gestion
left outer join document_modele on (ag_type=md_type)
@ -817,7 +817,7 @@ class Action
return $r;
}
$today=date('d-m-Y');
$today=date('d.m.Y');
$i=0;
//show the sub_action
foreach ($a_row as $row )
@ -1015,7 +1015,7 @@ class Action
$this->qcode_dest=(isset($p_array['qcode_dest']))?$p_array['qcode_dest']:"";
$this->f_id_dest=(isset($p_array['f_id_dest']))?$p_array['f_id_dest']:0;
$this->ag_ref_ag_id=(isset($p_array['ag_ref_ag_id']))?$p_array['ag_ref_ag_id']:0;
$this->ag_timestamp=(isset($p_array['ag_timestamp']))?$p_array['ag_timestamp']:date('d-m-Y');
$this->ag_timestamp=(isset($p_array['ag_timestamp']))?$p_array['ag_timestamp']:date('d.m.Y');
$this->qcode_dest=(isset($p_array['qcode_dest']))?$p_array['qcode_dest']:"";
$this->dt_id=(isset($p_array['dt_id']))?$p_array['dt_id']:"";
$this->ag_state=(isset($p_array['ag_state']))?$p_array['ag_state']:2;

4
include/class_document.php
View file

@ -492,8 +492,8 @@ class Document
$r=' Date inconnue ';
// Date are in $_REQUEST['ag_date']
// or $_POST['e_date']
if ( isset ($_REQUEST['ag_date']))
$r=$_REQUEST['ag_date'];
if ( isset ($_REQUEST['ag_timestamp']))
$r=$_REQUEST['ag_timestamp'];
if ( isset ($_REQUEST['e_date']))
$r=$_REQUEST['e_date'];

2
include/class_fiche_def.php
View file

@ -502,7 +502,7 @@ class Fiche_Def
$Res=$this->cn->exec_sql("select ad_id,ad_text from attr_def
where
ad_id not in (select ad_id from fiche_def natural join jnt_fic_attr
where fd_id=".$this->id.")");
where fd_id=$1) order by ad_text",array($this->id) );
$M=Database::num_row($Res);
// Show the unused attribute

2
include/dossier.inc.php
View file

@ -194,7 +194,7 @@ if ( $sa == 'list' )
$size=$cn->get_value("select pg_database_size($1)/(1024*1024)::float",
array($str_name));
echo "<TD><I> ".h($Dossier['dos_description'])."</I></td>";
echo td(nbm($size)."MB");
echo td(nbm($size)."MB",' style="text-align:right"');
echo td($str_name);
echo "<TD>";

5
include/forecast.inc.php
View file

@ -46,12 +46,13 @@ if ( isset($_GET['del']))
/*
* Cloning
*/
if (isset ($_POST['clone']))
if (isset ($_REQUEST ['clone']))
{
echo "<h2> cloning</h2>";
/*
* We need to clone the forecast
*/
$anti=new Forecast($cn,$_POST['f_id']);
$anti=new Forecast($cn,$_REQUEST ['f_id']);
$anti->object_clone();
}

2
include/payment_middle.inc.php
View file

@ -172,5 +172,3 @@ echo HtmlInput::button_anchor(_('Ajout'),'?p_action=divers&sa=mp&sb=ins&'.dossie
echo '</div>';
?>
?>
?>