[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpcompta-dev] r5368 - in phpcompta/trunk: html include include/templat
|
From: |
phpcompta-dev |
|
Subject: |
[Phpcompta-dev] r5368 - in phpcompta/trunk: html include include/template |
|
Date: |
Fri, 30 Aug 2013 22:42:31 +0200 (CEST) |
Author: danydb
Date: 2013-08-30 22:42:30 +0200 (Fri, 30 Aug 2013)
New Revision: 5368
Modified:
phpcompta/trunk/html/style.css
phpcompta/trunk/include/class_acc_ledger_fin.php
phpcompta/trunk/include/class_fiche.php
phpcompta/trunk/include/class_icard.php
phpcompta/trunk/include/class_iposte.php
phpcompta/trunk/include/class_itva_popup.php
phpcompta/trunk/include/compta_fin.inc.php
phpcompta/trunk/include/impress_jrn.inc.php
phpcompta/trunk/include/operation_ods_new.inc.php
phpcompta/trunk/include/template/dashboard.php
phpcompta/trunk/include/template/form_ledger_detail.php
phpcompta/trunk/include/template/form_ledger_fin.php
Log:
am?\195?\169liore apparence
Modified: phpcompta/trunk/html/style.css
===================================================================
--- phpcompta/trunk/html/style.css 2013-08-30 14:44:22 UTC (rev 5367)
+++ phpcompta/trunk/html/style.css 2013-08-30 20:42:30 UTC (rev 5368)
@@ -78,7 +78,6 @@
text-align:center;
padding:0px;
margin:0px;
- border:1px solid grey;
}
@@ -1009,11 +1008,10 @@
}
h2#jrn_name
{
- color:darkgrey;
+ color:blue;
font-size:2.74em;
margin-right:30%;
float: right;
-
}
tr.footer{
font-size:0.87em;
@@ -1094,7 +1092,7 @@
}
a.line:hover,div_content a.line
{
- font-size:0.57em;
+ font-size:0.87em;
text-decoration:underline;
display:inline;
color: #0000ff;
Modified: phpcompta/trunk/include/class_acc_ledger_fin.php
===================================================================
--- phpcompta/trunk/include/class_acc_ledger_fin.php 2013-08-30 14:44:22 UTC
(rev 5367)
+++ phpcompta/trunk/include/class_acc_ledger_fin.php 2013-08-30 20:42:30 UTC
(rev 5368)
@@ -469,7 +469,7 @@
$r.='';
$r.='<fieldset><legend>Banque, caisse </legend>';
$r.= '<div id="jrn_name_div">';
- $r.='<h2 class="title" id="jrn_name" style="display:inline">' .
$this->get_name() . '</h2>';
+ $r.='<h2 id="jrn_name" style="display:inline">' .
$this->get_name() . '</h2>';
$r.= '</div>';
$r.='<TABLE width="100%">';
// Date
Modified: phpcompta/trunk/include/class_fiche.php
===================================================================
--- phpcompta/trunk/include/class_fiche.php 2013-08-30 14:44:22 UTC (rev
5367)
+++ phpcompta/trunk/include/class_fiche.php 2013-08-30 20:42:30 UTC (rev
5368)
@@ -489,9 +489,8 @@
break;
case 'zone':
$w = new ITextArea();
- $w->width = $attr->ad_size;
- $w->heigh = 2;
- break;
+ $w->style=' class="itextarea"
style="margin:0px;width:100%"';
+ break;
case 'poste':
$w = new IPoste("av_text" .
$attr->ad_id);
$w->set_attribute('ipopup',
'ipop_account');
@@ -618,9 +617,8 @@
break;
case 'zone':
$w = new
ITextArea('av_text' . $r->ad_id);
- $w->width = $r->ad_size;
- $w->heigh = 2;
- $w->value = $r->av_text;
+ $w->style='
class="itextarea" style="margin:0px;width:100%"';
+ $w->value =
$r->av_text;
break;
case 'poste':
$w = new
IPoste("av_text" . $r->ad_id);
Modified: phpcompta/trunk/include/class_icard.php
===================================================================
--- phpcompta/trunk/include/class_icard.php 2013-08-30 14:44:22 UTC (rev
5367)
+++ phpcompta/trunk/include/class_icard.php 2013-08-30 20:42:30 UTC (rev
5368)
@@ -287,7 +287,7 @@
{
if ( $this->readOnly==true) return '';
if ( ! isset($this->id )) $this->id=$this->name;
- $button=new ISmallButton($this->name.'_bt');
+ $button=new ISmallButton($this->name.'_bt',"","","smallbutton");
$button->label=_('Recherche');
$a="";
foreach (array('typecard','jrn','label','price','tvaid') as $att)
Modified: phpcompta/trunk/include/class_iposte.php
===================================================================
--- phpcompta/trunk/include/class_iposte.php 2013-08-30 14:44:22 UTC (rev
5367)
+++ phpcompta/trunk/include/class_iposte.php 2013-08-30 20:42:30 UTC (rev
5368)
@@ -130,7 +130,7 @@
public function dsp_button()
{
$this->id=($this->id=="")?$this->name:$this->id;
- $ib=new ISmallButton($this->id.'_bt');
+ $ib=new IButton($this->id.'_bt',"","","smallbutton");
$ib->label=_('Recherche');
// $ib->extra='style="background:url(image/search.png)
no-repeat;background-position:0;padding-left:36px;"';
$ib->javascript='search_poste(this)';
Modified: phpcompta/trunk/include/class_itva_popup.php
===================================================================
--- phpcompta/trunk/include/class_itva_popup.php 2013-08-30 14:44:22 UTC
(rev 5367)
+++ phpcompta/trunk/include/class_itva_popup.php 2013-08-30 20:42:30 UTC
(rev 5368)
@@ -127,7 +127,7 @@
$this->id=($this->id=="")?$this->name:$this->id;
// button
- $bt=new ISmallButton('bt_'.$this->id);
+ $bt=new IButton('bt_'.$this->id,"smallbutton");
$bt->tabindex="-1";
$bt->label=_(' TVA ');
$bt->set_attribute('gDossier',dossier::id());
Modified: phpcompta/trunk/include/compta_fin.inc.php
===================================================================
--- phpcompta/trunk/include/compta_fin.inc.php 2013-08-30 14:44:22 UTC (rev
5367)
+++ phpcompta/trunk/include/compta_fin.inc.php 2013-08-30 20:42:30 UTC (rev
5368)
@@ -75,7 +75,8 @@
if ( ! isset ($correct ))
{
echo '<div class="content">';
- echo '<h2 class="info">'._('Confirmation').' </h2>';
+ echo h1('Confirmation','');
+ echo_warning("Attention, cette opération n'est pas encore
sauvée : vous devez encore confirmer");
echo '<form name="form_detail" class="print"
enctype="multipart/form-data" class="print" METHOD="POST">';
echo HtmlInput::hidden('ac',$_REQUEST['ac']);
echo $Ledger->confirm($_POST);
@@ -110,7 +111,7 @@
echo '<div class="content">';
$a= $Ledger->insert($_POST);
- echo '<h2 class="info">'._('Enregistrement').' </h2>';
+ echo '<h1>'._('Enregistrement').' </h1>';
echo '<div class="content">';
echo $a;
echo '</div>';
Modified: phpcompta/trunk/include/impress_jrn.inc.php
===================================================================
--- phpcompta/trunk/include/impress_jrn.inc.php 2013-08-30 14:44:22 UTC (rev
5367)
+++ phpcompta/trunk/include/impress_jrn.inc.php 2013-08-30 20:42:30 UTC (rev
5368)
@@ -92,7 +92,21 @@
echo HtmlInput::get_to_hidden(array('ac', 'type'));
echo '</fieldset>';
echo '</form>';
+?>
+<div class="noprint"
style="position:absolute;right:5%;top:200px;background-color:yellow;border: 1px
solid black">
+ <h3>
+ Remarque : choix possibles
+ </h3>
+ <ul>
+ <li> Détail opérations ne donne pas le même résultat si on regarde
tous les journaux ou un journal de type ACH ou VEN</li>
+ <li> Liste opérations ne donne pas le même résultat si on regarde tous
les journaux ou un journal de type ACH ou VEN</li>
+ <li> Journaux VEN ou ACH en mode "détail opérations" donne les détails
des factures, y compris les montants, TVA et quantité par article</li>
+ <li> Journaux VEN ou ACH en mode "liste opérations" donne pour chaque
opération, le total de la TVA, ND, ...</li>
+ </ul>
+
+</div>
+<?php
echo '<FORM METHOD="GET">' . dossier::hidden();
@@ -325,7 +339,7 @@
foreach ($Row as $line)
{
echo '<div
style="margin-top:2px;margin-bottom:10px;border:solid 1px black">';
- $class = ' class="odd" style="font-stretch:
expanded;font-size:12px;"';
+ $class = ' class="odd" style="font-stretch:
expanded;font-size:1em;"';
echo '<table class="result" style="font-weight:
bolder;font-variant: small-caps;width:100%;">';
echo "<tr $class>";
echo '<TD style="width:5%">' . $line['date'] . "</TD>";
Modified: phpcompta/trunk/include/operation_ods_new.inc.php
===================================================================
--- phpcompta/trunk/include/operation_ods_new.inc.php 2013-08-30 14:44:22 UTC
(rev 5367)
+++ phpcompta/trunk/include/operation_ods_new.inc.php 2013-08-30 20:42:30 UTC
(rev 5368)
@@ -59,7 +59,7 @@
echo '</form>';
echo '</div>';
echo '<div id="jrn_name_div">';
-echo '<h2 class="title" id="jrn_name" style="display:inline">' .
$ledger->get_name() . '</h2>';
+echo '<h2 id="jrn_name" style="display:inline">' . $ledger->get_name() .
'</h2>';
echo '</div>';
// Show the predef operation
Modified: phpcompta/trunk/include/template/dashboard.php
===================================================================
--- phpcompta/trunk/include/template/dashboard.php 2013-08-30 14:44:22 UTC
(rev 5367)
+++ phpcompta/trunk/include/template/dashboard.php 2013-08-30 20:42:30 UTC
(rev 5368)
@@ -48,7 +48,7 @@
'</a>'.
'</td>'.
'<td>'.
-
HtmlInput::smallbutton('del','X','onClick="todo_list_remove('.$row['tl_id'].')"').
+
HtmlInput::button('del','X','onClick="todo_list_remove('.$row['tl_id'].')"','smallbutton').
'</td>'.
'</tr>';
}
Modified: phpcompta/trunk/include/template/form_ledger_detail.php
===================================================================
--- phpcompta/trunk/include/template/form_ledger_detail.php 2013-08-30
14:44:22 UTC (rev 5367)
+++ phpcompta/trunk/include/template/form_ledger_detail.php 2013-08-30
20:42:30 UTC (rev 5368)
@@ -1,6 +1,6 @@
<div id="jrn_name_div">
- <h2 class="title" id="jrn_name"> <?php echo $this->get_name()?></h2>
+ <h2 id="jrn_name"> <?php echo $this->get_name()?></h2>
</div>
<table>
<tr>
Modified: phpcompta/trunk/include/template/form_ledger_fin.php
===================================================================
--- phpcompta/trunk/include/template/form_ledger_fin.php 2013-08-30
14:44:22 UTC (rev 5367)
+++ phpcompta/trunk/include/template/form_ledger_fin.php 2013-08-30
20:42:30 UTC (rev 5368)
@@ -1,6 +1,6 @@
<fieldset>
<div id="jrn_name_div">
- <h2 class="title" id="jrn_name"> <?php echo $this->get_name()?></h2>
+ <h2 id="jrn_name"> <?php echo $this->get_name()?></h2>
</div>
<legend><?php echo $f_legend ?> </legend>
<?php
---
PhpCompta est un logiciel de comptabilité libre en ligne (full web)
Projet opensource http://www.phpcompta.eu
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpcompta-dev] r5368 - in phpcompta/trunk: html include include/template,
phpcompta-dev <=