svn+ssh://danydb@svn/svn/phpcompta/branches/rel500
........
r2874 | danydb | 2010-01-15 15:52:38 +0100 (Fri, 15 Jan 2010) | 3 lines
The extra info are now available for ledger purchase, opportunity to clean
code
........
r2875 | danydb | 2010-01-15 19:51:33 +0100 (Fri, 15 Jan 2010) | 2 lines
Fix bug : in rapport, the from doesn't work, the result is always 0
........
r2876 | danydb | 2010-01-16 17:17:50 +0100 (Sat, 16 Jan 2010) | 1 line
For Comptabilité->ACH and Comptabilité->VEN add shortcut to printing and customer/supplier
........
r2877 | danydb | 2010-01-16 17:30:56 +0100 (Sat, 16 Jan 2010) | 2 lines
Action : add search by type of documents
........
r2878 | danydb | 2010-01-17 00:31:03 +0100 (Sun, 17 Jan 2010) | 1 line
Fix bug : cannot choose a tva rate
........
r2879 | danydb | 2010-01-20 22:37:11 +0100 (Wed, 20 Jan 2010) | 6 lines
Action
======
add a button for adding a card there is no filter on the category
You can add whatever you want
........
r2880 | danydb | 2010-01-21 16:10:57 +0100 (Thu, 21 Jan 2010) | 1 line
Correct stylesheet : todo list
........
r2882 | danydb | 2010-01-21 16:15:54 +0100 (Thu, 21 Jan 2010) | 1 line
Change Suivi Courrier by Suivi
........
r2883 | danydb | 2010-01-21 16:38:42 +0100 (Thu, 21 Jan 2010) | 1 line
Style color is now a copy of style light
........
r2884 | danydb | 2010-01-22 12:54:57 +0100 (Fri, 22 Jan 2010) | 3 lines
Bug: cannot see all the follow up in the list
Improve : border orange for today
........
r2885 | danydb | 2010-01-22 13:03:36 +0100 (Fri, 22 Jan 2010) | 2 lines
Remove debug info
........
r2886 | danydb | 2010-01-22 13:12:54 +0100 (Fri, 22 Jan 2010) | 2 lines
Fix bug : date order in todo list
........
r2887 | danydb | 2010-01-22 13:14:02 +0100 (Fri, 22 Jan 2010) | 2 lines
Improve fix order for todo list
........
r2888 | danydb | 2010-01-22 15:30:39 +0100 (Fri, 22 Jan 2010) | 8 lines
Fix bug :
* show all actions (no filter anymore)
* Show interne if in an action there is no card
Improve :
* todo list highlight today
* calendar highlight today
........
r2889 | danydb | 2010-01-22 23:21:39 +0100 (Fri, 22 Jan 2010) | 1 line
Improve action : description can be enlarged for big note
........
r2890 | danydb | 2010-01-22 23:39:28 +0100 (Fri, 22 Jan 2010) | 2 lines
Improve : enlarge if description > 300 char
........
r2891 | danydb | 2010-01-22 23:40:20 +0100 (Fri, 22 Jan 2010) | 2 lines
improve : big desc if > 300 char
........
r2892 | danydb | 2010-01-22 23:40:49 +0100 (Fri, 22 Jan 2010) | 1 line
Improve Item forecast = 50
........
r2893 | danydb | 2010-01-23 17:12:33 +0100 (Sat, 23 Jan 2010) | 1 line
Update Documentation
........
r2894 | danydb | 2010-01-23 19:36:53 +0100 (Sat, 23 Jan 2010) | 1 line
Fix Bug : unknow tag for document : vent_art_tva_code
........
r2895 | danydb | 2010-01-23 22:19:29 +0100 (Sat, 23 Jan 2010) | 1 line
Add Example of invoice
........
r2896 | danydb | 2010-01-23 22:20:22 +0100 (Sat, 23 Jan 2010) | 1 line
Update logo
........
283 lines
7.2 KiB
PHP
283 lines
7.2 KiB
PHP
<fieldset>
|
|
<legend>
|
|
<?=_('Informations générales')?>
|
|
</legend>
|
|
<div style="float:right">
|
|
<?echo $retour;
|
|
?>
|
|
</div>
|
|
<div style="float:left;width:50%">
|
|
<em> <strong><?php echo $sp->input(); ?></strong></em>
|
|
|
|
<table width="50%">
|
|
<TR>
|
|
<TD>
|
|
<?=_('Date')?>
|
|
</TD>
|
|
<TD>
|
|
<?php echo $date->input();
|
|
?>
|
|
</TD>
|
|
</TR>
|
|
<TR>
|
|
<TD>
|
|
<?=_('Heure')?>
|
|
</TD>
|
|
<TD>
|
|
<?php echo $str_ag_hour;
|
|
?>
|
|
</TD>
|
|
</TR>
|
|
<tr>
|
|
<TD>
|
|
<?=_('Reference')?>
|
|
</TD>
|
|
<TD>
|
|
<?php echo $str_ag_ref;
|
|
?>
|
|
</TD>
|
|
</TR>
|
|
<tr>
|
|
<TD>
|
|
<?=_('Destinataire')?>
|
|
</TD>
|
|
<TD>
|
|
<?php echo $w->search().$w->input();
|
|
?>
|
|
</td>
|
|
</Tr>
|
|
<tr>
|
|
<TD>
|
|
<?=_('Contact')?>
|
|
</TD>
|
|
<TD>
|
|
<?php echo $ag_contact->search().$ag_contact->input();
|
|
?>
|
|
</td>
|
|
</Tr>
|
|
<tr>
|
|
<TD colspan="2">
|
|
<?php echo $spcontact->input(); ?>
|
|
</td>
|
|
</Tr>
|
|
</table>
|
|
<?echo $str_add_button;?>
|
|
|
|
</div>
|
|
<div style="float:left;width:50%">
|
|
<table>
|
|
<tr>
|
|
<td>
|
|
<?=_('Concerne')?>
|
|
</td>
|
|
<td>
|
|
<?php echo $lag_ref_ag_id;
|
|
?>
|
|
</td>
|
|
</tr>
|
|
<tr>
|
|
<TD>
|
|
<?=_('Type')?>
|
|
</TD>
|
|
<TD>
|
|
<?php echo $str_doc_type;
|
|
?>
|
|
</TD>
|
|
</tr>
|
|
|
|
<tr>
|
|
<TD>
|
|
<?=_('Calendrier')?>
|
|
</TD>
|
|
<TD>
|
|
<?php echo $str_ag_cal;
|
|
?>
|
|
</TD>
|
|
</tr>
|
|
<tr>
|
|
<TD>
|
|
<?=_('Etat')?>
|
|
</TD>
|
|
<td>
|
|
<?php echo $str_state;
|
|
?>
|
|
<TD>
|
|
</TD>
|
|
</TR>
|
|
<tr>
|
|
<TD>
|
|
<?=_('Priorité')?>
|
|
</TD>
|
|
<td>
|
|
<?php echo $str_ag_priority;
|
|
?>
|
|
<TD>
|
|
</TD>
|
|
</TR>
|
|
<tr>
|
|
<TD>
|
|
<?=_('Affecté')?>
|
|
</TD>
|
|
<td>
|
|
<?php echo $str_ag_dest;?>
|
|
<TD>
|
|
</TD>
|
|
</TR>
|
|
</table>
|
|
|
|
</div>
|
|
|
|
</fieldset>
|
|
<fieldset>
|
|
<legend>
|
|
<?=_('Description')?>
|
|
</legend>
|
|
<p>
|
|
<script language="javascript">
|
|
function enlarge(p_id_textarea){
|
|
$(p_id_textarea).rows=40; $(p_id_textarea).cols=120;
|
|
$('bt_enlarge').style.display="none";
|
|
$('bt_small').style.display="inline";
|
|
}
|
|
function small(p_id_textarea){
|
|
$(p_id_textarea).rows=5; $(p_id_textarea).cols=70;
|
|
$('bt_enlarge').style.display="inline";
|
|
$('bt_small').style.display="none";
|
|
|
|
}
|
|
</script>
|
|
|
|
<?=_('Titre')?>
|
|
<br>
|
|
<?php echo $title->input();
|
|
?>
|
|
<br>
|
|
<?=_('Commentaire')?>
|
|
<br>
|
|
<?php echo $desc->input();
|
|
$style_enl='style="display:inline"';$style_small='style="display:none"';
|
|
if (strlen($desc->value)>300) {$style_enl='style="display:none"';$style_small='style="display:inline"';}
|
|
?>
|
|
<input type="button" id="bt_enlarge" <?=$style_enl?> value="+" onclick="enlarge('ag_comment');return false;">
|
|
<input type="button" id="bt_small" <?=$style_small?> value="-" style="display:none" onclick="small('ag_comment');return false;">
|
|
</p>
|
|
</fieldset>
|
|
<input type='button' value='Montrer articles' id="toggleButton" onclick='toggleShowDetail()'>
|
|
<fieldset id="fldDetail" style='display:block'>
|
|
<LEGEND> <?=_('Détail des articles')?>
|
|
</LEGEND>
|
|
<?php // hidden fields
|
|
for ($i=0;$i<count($aArticle);$i++) :
|
|
echo $aArticle[$i]['ad_id'];
|
|
echo $aArticle[$i]['hidden_tva'];
|
|
echo $aArticle[$i]['hidden_htva'];
|
|
endfor;
|
|
?>
|
|
<table id="art" >
|
|
<tr>
|
|
<th><?=_('Fiche')?></th>
|
|
<th><?=_('Description')?></th>
|
|
<th><?=_('prix unitaire')?></th>
|
|
<th><?=_('quantité')?></th>
|
|
<th><?=_('Code TVA')?></th>
|
|
<th><?=_('Montant TVA')?></th>
|
|
<th><?=_('Montant TVAC')?></th>
|
|
<!-- <th>Montant TVAC</th> -->
|
|
</tr>
|
|
<?for ($i=0;$i<count($aArticle);$i++): ?>
|
|
<TR>
|
|
<TD><?php echo $aArticle[$i]['fid'] ?></TD>
|
|
<TD><?php echo $aArticle[$i]['desc'] ?></TD>
|
|
<TD class="num"><?php echo $aArticle[$i]['pu'] ?></TD>
|
|
<TD class="num"><?php echo $aArticle[$i]['quant'] ?></TD>
|
|
<TD class="num"><?php echo $aArticle[$i]['tvaid'] ?></TD>
|
|
<TD class="num"><?php echo $aArticle[$i]['tva'] ?></TD>
|
|
<TD class="num"><?php echo $aArticle[$i]['tvac'] ?></TD>
|
|
|
|
<!-- <TD class="num"><?php echo $aArticle[$i]['ctva'] ?></TD>
|
|
<TD class="num"><?php echo $aArticle[$i]['htva'] ?></TD>
|
|
<TD class="num"><?php echo $aArticle[$i]['atva'] ?></TD>
|
|
<TD class="num"><?php echo $aArticle[$i]['totaltvac'] ?></TD>
|
|
-->
|
|
</TR>
|
|
<?php endfor; ?>
|
|
</table>
|
|
<script language="JavaScript">
|
|
toggleShowDetail();
|
|
function toggleShowDetail() {
|
|
try {var detail=g('fldDetail');
|
|
var but=g('toggleButton');
|
|
if (detail.style.display=='block' ) { but.value="<?=_("Montrer les détails")?>";detail.style.display='none';}
|
|
else { but.value="<?=_("Cacher les détails")?>";detail.style.display='block';} }
|
|
catch (error) {alert(error);}
|
|
}
|
|
|
|
</script>
|
|
<div style="float: left; text-align: right; padding-right: 5px; font-size: 1.2em; font-weight: bold; color: blue;">
|
|
<input name="act" id="act" value="<?=_('Actualiser')?>" onclick="compute_all_purchase();" type="button">
|
|
|
|
<div style="float: right; text-align: left; font-size: 1.2em; font-weight: bold; color: blue;" id="sum">
|
|
<br><span id="htva">0.0</span>
|
|
<br><span id="tva">0.0</span>
|
|
<br><span id="tvac">0.0</span>
|
|
</div>
|
|
|
|
<div style="float: left; text-align: right; padding-right: 5px; font-size: 1.2em; font-weight: bold; color: blue;">
|
|
<br>Total HTVA
|
|
<br>Total TVA
|
|
<br>Total TVAC
|
|
</div>
|
|
</div>
|
|
|
|
</fieldset>
|
|
<fieldset >
|
|
<legend>
|
|
<?=_('Document à générer')?>
|
|
</legend>
|
|
<?php echo $str_select_doc;
|
|
echo $str_submit_generate;
|
|
?>
|
|
</fieldset>
|
|
<fieldset>
|
|
<legend>
|
|
<?=_('Pièces attachées')?>
|
|
</legend>
|
|
<?php
|
|
for ($i=0;$i<sizeof($aAttachedFile);$i++) :
|
|
?>
|
|
<p>
|
|
<A class="mtitle" id="<?php echo "doc".$aAttachedFile[$i]['d_id'];?>" href="<?php echo $aAttachedFile[$i]['link']?>"><?php echo $aAttachedFile[$i]['d_filename'];?>
|
|
</A>
|
|
<?php $rmDoc=sprintf("javascript:if ( confirm('"._('Voulez-vous effacer le document')." %s')==true ) {remove_document('%s','%s','%s');}",
|
|
$aAttachedFile[$i]['d_filename'],
|
|
$_REQUEST['PHPSESSID'],
|
|
dossier::id(),
|
|
$aAttachedFile[$i]['d_id']);
|
|
?>
|
|
<a class="mtitle" id="<?php echo "ac".$aAttachedFile[$i]['d_id'];?>" href="<?php echo $rmDoc;?>">Effacer</a>
|
|
</p>
|
|
<?php
|
|
endfor;
|
|
?>
|
|
<script language="javascript">
|
|
function addFiles() {
|
|
try {
|
|
docAdded=document.getElementById('add_file');
|
|
new_element=document.createElement('li');
|
|
new_element.innerHTML='<input class="inp" type="file" value="" name="file_upload[]"/>';
|
|
docAdded.appendChild(new_element);
|
|
}
|
|
catch(exception) { alert('<?=j(_('Je ne peux pas ajouter de fichier'))?>'); alert(exception);}
|
|
}
|
|
</script>
|
|
<p>
|
|
<strong>Fichiers à ajouter: </strong>
|
|
<ol id='add_file'>
|
|
<li>
|
|
<?php echo $upload->input();
|
|
?>
|
|
</li>
|
|
</ol>
|
|
</p>
|
|
<input type="button" onclick="addFiles();" value="Ajouter un fichier">
|
|
</fieldset>
|