lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Some fixes in point of sale module

Browse Source
This commit is contained in:
Laurent Destailleur 2009-09-14 01:27:00 +00:00
parent eb23e9400e
commit d9e82272cf
5 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/cashdesk/templates/facturation1.tpl.php
View File

@ -155,7 +155,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
<input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>" /> <input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>" />
<fieldset class="cadre_facturation"><legend class="titre1"><?php echo $langs->trans("Difference"); ?></legend> <fieldset class="cadre_facturation"><legend class="titre1"><?php echo $langs->trans("Difference"); ?></legend>
<table> <table>
<tr><th class="label1"><?php echo $langs->trans("DueAmount"); ?></th><th class="label1"><?php echo $langs->trans("Received"); ?></th><th class="label1"><?php echo $langs->trans("RemainderToPay"); ?></th></tr> <tr><th class="label1"><?php echo $langs->trans("AmountExpected"); ?></th><th class="label1"><?php echo $langs->trans("Received"); ?></th><th class="label1"><?php echo $langs->trans("ExcessReceived"); ?></th></tr>
<tr> <tr>
<!-- Affichage du montant du --> <!-- Affichage du montant du -->
<td><input class="texte2_off" type="text" name="txtDu" value="<?php echo price2num($obj_facturation->prix_total_ttc (), 'MT'); ?>" disabled="disabled" /></td> <td><input class="texte2_off" type="text" name="txtDu" value="<?php echo price2num($obj_facturation->prix_total_ttc (), 'MT'); ?>" disabled="disabled" /></td>

3
htdocs/cashdesk/templates/liste_articles.tpl.php
View File

@ -59,9 +59,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
} }
$remise = $tab[$i]['remise']; $remise = $tab[$i]['remise'];
$total_ht = ($tab[$i]['total_ht'] - $remise);
echo ('<p>'.$tab[$i]['qte'].' x '.price2num( $tab[$i]['price'], 'MT').$remise_percent.' = '.price2num($total_ht, 'MT').' '.$conf->monnaie.' HT ('.price2num($tab[$i]['total_ttc'], 'MT').' '.$conf->monnaire.' TTC)</p>'."\n"); echo ('<p>'.$tab[$i]['qte'].' x '.price2num( $tab[$i]['price'], 'MT').$remise_percent.' = '.price2num($tab[$i]['total_ht'], 'MT').' '.$conf->monnaie.' HT ('.price2num($tab[$i]['total_ttc'], 'MT').' '.$conf->monnaie.' TTC)</p>'."\n");
echo ('</div>'."\n"); echo ('</div>'."\n");
} }

5
htdocs/cashdesk/templates/ticket.tpl.php
View File

@ -40,6 +40,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
position: absolute; position: absolute;
top: 0; top: 0;
right: 0; right: 0;
font-size: 16px;
} }
.infos { .infos {
@ -133,9 +134,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
for ( $i = 0; $i < count($tab); $i++ ) { for ( $i = 0; $i < count($tab); $i++ ) {
$remise = $tab[$i]['remise']; $remise = $tab[$i]['remise'];
$total_ht = $tab[$i]['total_ht'] - $remise; echo ('<tr><td>'.$tab[$i]['ref'].'</td><td>'.$tab[$i]['label'].'</td><td>'.$tab[$i]['qte'].'</td><td>'.$tab[$i]['remise_percent'].'</td><td class="total">'.price2num($tab[$i]['total_ht'],'MT').' '.$conf->monnaie.'</td></tr>'."\n");
echo ('<tr><td>'.$tab[$i]['ref'].'</td><td>'.$tab[$i]['label'].'</td><td>'.$tab[$i]['qte'].'</td><td>'.$tab[$i]['remise_percent'].'</td><td class="total">'.price2num($total_ht,'MT').' '.$conf->monnaie.'</td></tr>'."\n");
} }

2
htdocs/langs/en_US/bills.lang
View File

@ -351,6 +351,8 @@ UsBillingContactAsIncoiveRecipientIfExist=Use customer billing contact address i
ShowUnpaidLateOnly=Show late unpaid invoice only ShowUnpaidLateOnly=Show late unpaid invoice only
PaymentInvoiceRef=Payment invoice %s PaymentInvoiceRef=Payment invoice %s
ValidateInvoice=Validate invoice ValidateInvoice=Validate invoice
Cash=Cash
Reported=Delayed
# oursin PDF model # oursin PDF model
Of=du Of=du

2
htdocs/langs/fr_FR/bills.lang
View File

@ -353,6 +353,8 @@ ShowUnpaidAll=Afficher tous les impayés
ShowUnpaidLateOnly=Afficher impayés en retard uniquement ShowUnpaidLateOnly=Afficher impayés en retard uniquement
PaymentInvoiceRef=Paiement facture %s PaymentInvoiceRef=Paiement facture %s
ValidateInvoice=Valider facture ValidateInvoice=Valider facture
Cash=Liquide
Reported=Différé
# oursin PDF model # oursin PDF model
Of=du Of=du