Cosmetic bug

This commit is contained in:
sparkyx 2006-07-06 21:10:02 +00:00
parent 69f975e216
commit ad6e3ad625
6 changed files with 41 additions and 16 deletions

View file

@ -122,13 +122,14 @@ if ( $sub_action == "list")
}
// show the menu with the list item selected
echo '<div class="u_subtmenu">';
echo ShowMenuJrnUser($_SESSION['g_dossier'],'FIN',0,'<td class="selectedcell">Liste</td>');
echo ShowMenuJrnUser($_SESSION['g_dossier'],'FIN',0,'<td class="selectedcell">Liste</td>'.
'<td class="cell"><A class="mtitle" HREF="commercial.php?liste&p_action=bank&sa=solde">Solde</A></td>');
echo '</div>';
echo '<div class="u_redcontent">';
echo '<form>';
$hid=new widget("hidden");
$hid->name="p_action";
@ -149,18 +150,19 @@ if ( $sub_action == "list")
$current=(isset($_GET['p_periode']))?$_GET['p_periode']:$User->GetPeriode();
$w->selected=$current;
echo 'Période '.$w->IOValue("p_periode",$periode_start).$w->Submit('gl_submit','Valider');
echo 'Période '.$w->IOValue("p_periode",$periode_start);
$qcode=(isset($_GET['qcode']))?$_GET['qcode']:"";
echo JS_SEARCH_CARD;
$w=new widget('js_search_only');
$w->name='qcode';
$w->value=$qcode;
$w->label='qcode';
$w->extra='4,8,9,14';
$w->label='';
$w->extra='4';
$sp= new widget("span");
echo $sp->IOValue("qcode_label",$qcode)."</TD></TR>";
echo $w->IOValue();
echo $w->Submit('gl_submit','Rechercher');
echo '</form>';
echo $retour;
// Show list of sell
// Date - date of payment - Customer - amount

View file

@ -110,9 +110,9 @@ class Admin extends fiche{
" ".$admin->strAttribut(ATTR_DEF_PAYS).
"</TD>";
$r.="<td>";
$r.=sprintf('<A HREF="%s?p_action=contact&qcode=%s&url=%s" title="Contact">C</A> - ',
$r.=sprintf('<A class="mtitle" HREF="%s?p_action=contact&qcode=%s&url=%s" title="Contact">C</A> - ',
$script,$admin->strAttribut(ATTR_DEF_QUICKCODE),$url);
$r.=sprintf('<A HREF="%s?p_action=suivi_courrier&sa=list&qcode=%s&url=%s" title="Action">A</A> - ',
$r.=sprintf('<A class="mtitle" HREF="%s?p_action=suivi_courrier&sa=list&qcode=%s&url=%s" title="Action">A</A> - ',
$script,$admin->strAttribut(ATTR_DEF_QUICKCODE) ,$url);
$r.='</TD>';

View file

@ -80,7 +80,8 @@ class Document
{
// create a temp directory in /tmp to unpack file and to parse it
$dirname=tempnam('/tmp','doc_');
echo $dirname;
unlink($dirname);
mkdir ($dirname);
echo_debug('class_action',__LINE__,"Dirname is $dirname");
@ -107,9 +108,14 @@ class Document
if ( strpos($row['md_mimetype'],'vnd.oasis') != 0 )
{
echo_debug('class_document',__LINE__,'Unzip the OOo');
echo '<span id="gen_msg">';
echo '<blink><font color="red">Un moment de patience, le document se prépare...</font></blink>';
echo '</span>';
ob_start();
system("unzip ".$filename);
// Remove the file we do not need anymore
unlink($filename);
ob_end_clean();
$file_to_parse="content.xml";
$type="OOo";
}
@ -126,7 +132,11 @@ class Document
// if the doc is a OOo, we need to re-zip it
if ( strpos($row['md_mimetype'],'vnd.oasis') != 0 )
{
ob_start();
system ("zip -r ".$filename." *");
ob_end_clean();
echo "le document est prêt ";
$file_to_parse=$filename;
}
// Create a directory

View file

@ -394,7 +394,7 @@ class widget {
if ( $this->table==1)
{
$r=sprintf('<TD>
<INPUT TYPE="button" onClick=SearchCard(\'%s\',\'%s\',\'%s\',\'%s\') value="Search">
<INPUT TYPE="button" onClick=SearchCard(\'%s\',\'%s\',\'%s\',\'%s\') value="QuickCode">
%s</TD><TD> <INPUT TYPE="Text" NAME="%s" VALUE="%s" SIZE="8" TABINDEX="%s">
',
$l_sessid,
@ -410,7 +410,7 @@ class widget {
else
{
$r=sprintf('
<INPUT TYPE="button" onClick=SearchCard(\'%s\',\'%s\',\'%s\',\'%s\') value="Search">
<INPUT TYPE="button" onClick=SearchCard(\'%s\',\'%s\',\'%s\',\'%s\') value="QuickCode">
%s <INPUT TYPE="Text" NAME="%s" VALUE="%s" SIZE="8" TABINDEX="%s"> ',
$l_sessid,
$this->extra,

View file

@ -119,11 +119,21 @@ if ( $sub_action == "list")
$current=(isset($_GET['p_periode']))?$_GET['p_periode']:$User->GetPeriode();
$w->selected=$current;
echo 'Période '.$w->IOValue("p_periode",$periode_start).$w->Submit('gl_submit','Valider');
echo 'Période '.$w->IOValue("p_periode",$periode_start);
$qcode=(isset($_GET['qcode']))?$_GET['qcode']:"";
printf ('<span>Tiers QuickCode: <input type="text" name="qcode" value="%s"></span>',
$qcode);
echo JS_SEARCH_CARD;
$w=new widget('js_search_only');
$w->name='qcode';
$w->value=$qcode;
$w->label='';
$w->extra='9';
$w->table=0;
$sp= new widget("span");
echo $sp->IOValue("qcode_label","",$qcode);
echo $w->IOValue();
echo $w->Submit('gl_submit','Rechercher');
// Show list of sell
// Date - date of payment - Customer - amount
$sql=SQL_LIST_ALL_INVOICE." and jr_tech_per=".$current." and jr_def_type='VEN'" ;

View file

@ -205,11 +205,14 @@ $w->label="Choississez le journal";
print $w->IOValue("jrn_id",$ret);
print '</TR>';
print '<TR>';
$periode_start=make_array($cn,"select p_id,to_char(p_start,'DD-MM-YYYY') from parm_periode order by p_id");
// filter on the current year
$filter_year=" where p_exercice='".$User->getExercice()."'";
$periode_start=make_array($cn,"select p_id,to_char(p_start,'DD-MM-YYYY') from parm_periode $filter_year order by p_id");
$w->label="Depuis";
print $w->IOValue('from_periode',$periode_start);
$w->label=" jusqu'à ";
$periode_end=make_array($cn,"select p_id,to_char(p_end,'DD-MM-YYYY') from parm_periode order by p_id");
$periode_end=make_array($cn,"select p_id,to_char(p_end,'DD-MM-YYYY') from parm_periode $filter_year order by p_id");
print $w->IOValue('to_periode',$periode_end);
print "</TR><TR>";
$centralise=new widget("checkbox");