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

Merged revisions 3224-3234 via svnmerge from

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

........
  r3225 | danydb | 2010-05-16 22:59:32 +0200 (Sun, 16 May 2010) | 2 lines
  
  Fix bug when you choose illimited in preference you can't get your follow-up list
........
  r3226 | danydb | 2010-05-17 23:12:34 +0200 (Mon, 17 May 2010) | 2 lines
  
  Add compute 
  Suspend and reactivate the strict mode if used
........
  r3227 | danydb | 2010-05-18 01:32:48 +0200 (Tue, 18 May 2010) | 2 lines
  
  Fix bug with the date
........
  r3228 | danydb | 2010-05-18 01:38:02 +0200 (Tue, 18 May 2010) | 2 lines
  
  Fix bug with period
........
  r3229 | danydb | 2010-05-18 01:40:01 +0200 (Tue, 18 May 2010) | 2 lines
  
  typo
........
  r3232 | danydb | 2010-05-21 12:38:51 +0200 (Fri, 21 May 2010) | 1 line
  
  In parameter -> company, empty field were fills with previous value
........
  r3233 | danydb | 2010-05-21 12:48:23 +0200 (Fri, 21 May 2010) | 1 line
  
  In calendar, we can several actions for the same day
........
  r3234 | danydb | 2010-05-21 16:38:33 +0200 (Fri, 21 May 2010) | 1 line
  
  For search accounting, we replace input id QUERY by ACC_QUERY, because it conflicts with the search of card in quick_writing.inc.php
........
This commit is contained in:
Dany De Bontridder 2010-05-21 14:40:15 +00:00
parent 8a51032a7a
commit e69a078e1f
7 changed files with 21 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
html/ajax_poste.php
View file

@ -28,7 +28,7 @@
- param c : control for storing the pcm_val -> javascript account
- param l : control for storing the pcm_lib -> javascript label
- param ctl : the node to update (ipopup)
- param q : the query -> javascript query
- param q : the acc_query -> javascript query
* - ctl (to return)
*
*
@ -68,7 +68,7 @@ case "sf":
$ipopup=$ctl;
$attr=sprintf('this.ctl=\'%s\';',$ipopup);
$ctl.='_content';
$it=new IText('query');
$it=new IText('acc_query');
$it->size=30;
$it->value=(isset($q))?$q:'';
$str_poste=$it->input();

BIN
html/image/loading.gif
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 8.3 KiB

Before After
Before After

8
html/js/accounting_item.js
View file

@ -57,7 +57,7 @@ function PcmnUpdate(p_value,p_lib,p_parent,p_type,p_dossier)
* - account the tag which will contains the number
* - label the tag which will contains the label
* - bracket if the value must be surrounded by [ ]
* - query for the initial query
* - acc_query for the initial query
*\see ajax_poste.php
*/
function search_poste(obj) {
@ -76,7 +76,7 @@ function search_poste(obj) {
if( obj.no_overwrite) {queryString+="&nover";}
if( obj.bracket) {queryString+="&bracket";}
if ( ! obj.noquery) {
if( obj.query) {queryString+="&q="+obj.query;}
if( obj.acc_query) {queryString+="&q="+obj.acc_query;}
else {
if ($(obj).account) {
var e=$(obj).account;
@ -113,7 +113,7 @@ function search_get_poste(obj) {
if ( obj.elements['jrn'] ) { queryString+="&j="+$F('jrn');}
if ( obj.elements['account']) { queryString+="&c="+$F('account');}
if ( obj.elements['label']) { queryString+="&l="+$F('label');}
if( obj.elements['query']) {queryString+="&q="+$F('query');}
if( obj.elements['acc_query']) {queryString+="&q="+$F('acc_query');}
if (obj.ctl ) {queryString+="&ctl="+obj.ctl;}
if( obj.elements['nosearch']) {queryString+="&nq";}
if( obj.elements['nover']) {queryString+="&nover";}
@ -160,4 +160,4 @@ function result_poste_search(req) {
*/
function errorPoste() {
alert('Ajax failed');
}
}

8
html/parametre.php
View file

@ -285,13 +285,21 @@ if ( $p_action=='company') {
echo dossier::hidden();
echo "<table class=\"result\" style=\"width:70%\">";
echo "<tr>".td(_('Nom société')).$all->input("p_name",$my->MY_NAME)."</tr>";
$all->value='';
echo "<tr>".td(_("Téléphone")).$all->input("p_tel",$my->MY_TEL)."</tr>";
$all->value='';
echo "<tr>".td(_("Fax")).$all->input("p_fax",$my->MY_FAX)."</tr>";
$all->value='';
echo "<tr>".td(_("Rue ")).$all->input("p_street",$my->MY_STREET)."</tr>";
$all->value='';
echo "<tr>".td(_("Numéro")).$all->input("p_no",$my->MY_NUMBER)."</tr>";
$all->value='';
echo "<tr>".td(_("Code Postal")).$all->input("p_cp",$my->MY_CP)."</tr>";
$all->value='';
echo "<tr>".td(_("Commune")).$all->input("p_Commune",$my->MY_COMMUNE)."</tr>";
$all->value='';
echo "<tr>".td(_("Pays")).$all->input("p_pays",$my->MY_PAYS)."</tr>";
$all->value='';
echo "<tr>".td(_("Numéro de Tva")).$all->input("p_tva",$my->MY_TVA)."</tr>";
if ( $User->check_action(PARCA)==0) $compta->setReadonly(true);
echo "<tr>".td(_("Utilisation de la compta. analytique")).$compta->input("p_compta",$array)."</tr>";

4
include/class_acc_ledger.php
View file

@ -1005,7 +1005,7 @@ jr_comment||' ('||jr_internal||')'||case when jr_pj_number is not null and jr_pj
if ($this->check_periode() == true) {
$lPeriode->p_id=$period;
} else {
$lPeriode->find_periode($e_date);
$lPeriode->find_periode($date);
}
$ret="";
$ret.="<table>";
@ -1027,7 +1027,7 @@ jr_comment||' ('||jr_internal||')'||case when jr_pj_number is not null and jr_pj
$ret.=HtmlInput::hidden('date',$date);
$ret.=HtmlInput::hidden('desc',$desc);
$ret.=HtmlInput::hidden('period',$period);
$ret.=HtmlInput::hidden('period',$lPeriode->p_id);
$ret.=HtmlInput::hidden('e_pj',$e_pj);
$ret.=HtmlInput::hidden('e_pj_suggest',$e_pj_suggest);
$mt=microtime(true);

5
include/class_action.php
View file

@ -774,7 +774,8 @@ class Action
$step=$_SESSION['g_pagesize'];
$page=(isset($_GET['offset']))?$_GET['page']:1;
$offset=(isset($_GET['offset']))?Database::escape_string($_GET['offset']):0;
$limit=" LIMIT $step OFFSET $offset ";
if ( $step != -1 ) $limit=" LIMIT $step OFFSET $offset ";
else $limit='';
$bar=jrn_navigation_bar($offset,$max_line,$step,$page);
$Res=$this->db->exec_sql($sql.$limit);
@ -796,7 +797,7 @@ class Action
// if there are no records return a message
if ( sizeof ($a_row) == 0 or $a_row == false )
{
$r='<div class="u_redcontent">';
$r='<div style="clear:both">';
$r.='<hr>Aucun enregistrement trouvé';
$r.="</div>";
return $r;

3
include/class_calendar.php
View file

@ -51,7 +51,8 @@ class Calendar {
$array=$cn->get_array($sql,array($this->month,$this->year,$_SESSION['g_user']));
for ($i=0;$i<count($array);$i++) {
$ind=$array[$i]['ag_timestamp_day'];
$p_array[$ind]='<A HREF="commercial.php?'.dossier::get().'&p_action=suivi_courrier&sa=detail&ag_id='.$array[$i]['ag_id'].'">';
$p_array[$ind]=(isset($p_array[$ind]))?$p_array[$ind]:'';
$p_array[$ind].='<A HREF="commercial.php?'.dossier::get().'&p_action=suivi_courrier&sa=detail&ag_id='.$array[$i]['ag_id'].'">';
$p_array[$ind].="<span class=\"day\">".h($array[$i]['ag_title_fmt']).'</span>';
$p_array[$ind].="</A>";