[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpcompta-dev] r5157 - in phpcompta/tags/rel650/include: . template
From: |
phpcompta-dev |
Subject: |
[Phpcompta-dev] r5157 - in phpcompta/tags/rel650/include: . template |
Date: |
Wed, 5 Dec 2012 21:08:08 +0100 (CET) |
Author: danydb
Date: 2012-12-05 21:08:07 +0100 (Wed, 05 Dec 2012)
New Revision: 5157
Modified:
phpcompta/tags/rel650/include/class_acc_ledger_purchase.php
phpcompta/tags/rel650/include/class_acc_ledger_sold.php
phpcompta/tags/rel650/include/class_acc_payment.php
phpcompta/tags/rel650/include/template/form_ledger_detail.php
Log:
0000766: Utilisation des moyens de paiements : libell?\195?\169
diff?\195?\169rent pour l'op?\195?\169ration de paiement et d'achat/vente.
0000765: affichage des colonnes Prix HTVA quand la soci?\195?\169t?\195?\169
n'est pas assujettie ?\195?\160 la TVA
Modified: phpcompta/tags/rel650/include/class_acc_ledger_purchase.php
===================================================================
--- phpcompta/tags/rel650/include/class_acc_ledger_purchase.php 2012-11-29
22:17:33 UTC (rev 5156)
+++ phpcompta/tags/rel650/include/class_acc_ledger_purchase.php 2012-12-05
20:08:07 UTC (rev 5157)
@@ -795,7 +795,7 @@
/* insert into jrn */
$acc_pay->mt=$mt;
- $acc_pay->desc=$e_comm;
+ $acc_pay->desc=(!isset($e_comm_paiement) ||
strlen(trim($e_comm_paiement)) == 0) ?$e_comm:$e_comm_paiement;
$mp_jr_id=$acc_pay->insert_jrn();
$acjrn->grpt_id=$acseq;
$acjrn->update_internal_code($acinternal);
@@ -1529,13 +1529,16 @@
{
$r.=HtmlInput::hidden('e_mp_qcode_'.$e_mp,${'e_mp_qcode_'.$e_mp});
$r.=HtmlInput::hidden('acompte',$acompte);
+
$r.=HtmlInput::hidden('e_comm_paiement',$e_comm_paiement);
/* needed for generating a invoice */
$r.=HtmlInput::hidden('qcode_benef', ${'e_mp_qcode_' . $e_mp});
$fname = new Fiche($this->db);
$fname->get_by_qcode(${'e_mp_qcode_' . $e_mp});
$r.="<div style=\"clear:both\"></div>";
$r.='<div style="float:left"><h2 class="info">' . "Payé
par " . ${'e_mp_qcode_' . $e_mp} .
- " ".$fname->getName() ."</h2> ".
_('Déduction acompte ').h($acompte).'</div>';
+ " ".$fname->getName() ."</h2> ".
+ '<p>'._('Déduction acompte
').h($acompte).'</p>'.
+ _('Libellé :'
).h($e_comm_paiement).'</div>';
$r.='<br>';
}
// check for upload piece
Modified: phpcompta/tags/rel650/include/class_acc_ledger_sold.php
===================================================================
--- phpcompta/tags/rel650/include/class_acc_ledger_sold.php 2012-11-29
22:17:33 UTC (rev 5156)
+++ phpcompta/tags/rel650/include/class_acc_ledger_sold.php 2012-12-05
20:08:07 UTC (rev 5157)
@@ -565,8 +565,9 @@
$let_other=$acc_pay->insert_jrnx();
/* insert into jrn */
- $acjrn->desc=$e_comm;
+ $acc_pay->mt=$mt;
$acjrn->grpt_id=$acseq;
+ $acc_pay->desc=(!isset($e_comm_paiement) ||
strlen(trim($e_comm_paiement)) == 0) ?$e_comm:$e_comm_paiement;
$mp_jr_id=$acc_pay->insert_jrn();
$acjrn->update_internal_code($acinternal);
@@ -905,6 +906,7 @@
{
$r.=HtmlInput::hidden('e_mp_qcode_'.$e_mp,${'e_mp_qcode_'.$e_mp});
$r.=HtmlInput::hidden('acompte',$acompte);
+
$r.=HtmlInput::hidden('e_comm_paiement',$e_comm_paiement);
/* needed for generating a invoice */
$r.=HtmlInput::hidden('qcode_benef',${'e_mp_qcode_'.$e_mp});
@@ -912,7 +914,8 @@
$fname->get_by_qcode(${'e_mp_qcode_'.$e_mp});
$r.="<div style=\"clear:both\"></div>";
$r.='<div style="float:left"><h2 class="info">'."Payé
par ".${'e_mp_qcode_'.$e_mp}.
- " ".$fname->getName().'</H2> '._('Déduction
acompte ').h($acompte).'</div>';
+ " ".$fname->getName().'</H2>
'.'<p>'._('Déduction acompte ').h($acompte).'</p>'.
+ _('Libellé :'
).h($e_comm_paiement).'</div>';
$r.='<br>';
}
Modified: phpcompta/tags/rel650/include/class_acc_payment.php
===================================================================
--- phpcompta/tags/rel650/include/class_acc_payment.php 2012-11-29 22:17:33 UTC
(rev 5156)
+++ phpcompta/tags/rel650/include/class_acc_payment.php 2012-12-05 20:08:07 UTC
(rev 5157)
@@ -335,7 +335,16 @@
$acompte->value=0;
$r.=_(" Acompte à déduire");
$r.=$acompte->input();
- }
+ $r.='<p>';
+ $e_comm_paiement=new IText('e_comm_paiement');
+ $e_comm_paiement->table = 0;
+ $e_comm_paiement->setReadOnly(false);
+ $e_comm_paiement->size = 60;
+ $e_comm_paiement->tabindex = 3;
+ $r.=_(" Libellé du paiement");
+ $r.=$e_comm_paiement->input();
+ $r.='</p>';
+ }
$r.='<ol>';
$r.='<li ><input type="radio" name="e_mp" value="0"
checked>'._('Paiement encodé plus tard');
@@ -350,7 +359,7 @@
{
$a=new ICard();
$a->jrn=$row->mp_jrn_def_id;
- $a->set_attribute('typecard',$row->mp_fd_id);
+
$a->set_attribute('typecard',$row->mp_fd_id);
$a->name='e_mp_qcode_'.$row->mp_id;
$a->set_dblclick("fill_ipopcard(this);");
$a->set_callback('filter_card');
Modified: phpcompta/tags/rel650/include/template/form_ledger_detail.php
===================================================================
--- phpcompta/tags/rel650/include/template/form_ledger_detail.php
2012-11-29 22:17:33 UTC (rev 5156)
+++ phpcompta/tags/rel650/include/template/form_ledger_detail.php
2012-12-05 20:08:07 UTC (rev 5157)
@@ -22,13 +22,17 @@
<tr>
<th style="width:auto"colspan="2">Code <?=HtmlInput::infobulle(0)?></th>
<th><?=_('Dénomination')?></th>
+<? if ($flag_tva =='Y') : ?>
<th><?=_('prix/unité htva')?><?=HtmlInput::infobulle(6)?></th>
<th><?=_('quantité')?></th>
<th><?=_('Total HTVA')?></th>
-<? if ($flag_tva =='Y') : ?>
- <th><?=_('tva')?></th>
- <th><?=_('tot.tva')?></th>
-<th><?=_('tvac')?></th>
+ <th><?=_('tva')?></th>
+ <th><?=_('tot.tva')?></th>
+ <th><?=_('tvac')?></th>
+<? else: ?>
+ <th><?=_('prix/unité ')?><?=HtmlInput::infobulle(6)?></th>
+ <th><?=_('quantité')?></th>
+ <th><?=_('Total ')?></th>
<? endif;?>
---
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] r5157 - in phpcompta/tags/rel650/include: . template,
phpcompta-dev <=