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

Fix: Must use active tag of vat, not county table.

Browse Source
This commit is contained in:
Laurent Destailleur 2014-10-27 12:59:19 +01:00
parent 6f77dc83c4
commit dd20d04002
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/cashdesk/affContenu.php
View File

@ -43,6 +43,9 @@ else
$obj_facturation = new Facturation(); $obj_facturation = new Facturation();
} }
// Right area with selected articles (shopping cart)
print '<div class="liste_articles">'; print '<div class="liste_articles">';
require ('tpl/liste_articles.tpl.php'); require ('tpl/liste_articles.tpl.php');

4
htdocs/cashdesk/facturation.php
View File

@ -158,9 +158,9 @@ $sql = "SELECT t.rowid, t.taux";
$sql.= " FROM ".MAIN_DB_PREFIX."c_tva as t"; $sql.= " FROM ".MAIN_DB_PREFIX."c_tva as t";
$sql.= ", ".MAIN_DB_PREFIX."c_country as c"; $sql.= ", ".MAIN_DB_PREFIX."c_country as c";
$sql.= " WHERE t.fk_pays = c.rowid"; $sql.= " WHERE t.fk_pays = c.rowid";
$sql.= " AND c.active = 1"; $sql.= " AND t.active = 1";
$sql.= " AND c.code = '".$mysoc->country_code."'"; $sql.= " AND c.code = '".$mysoc->country_code."'";
//print $request; //print $sql;
$resql = $db->query($sql); $resql = $db->query($sql);
if ($resql) if ($resql)

11
htdocs/cashdesk/tpl/facturation1.tpl.php
View File

@ -111,8 +111,9 @@ $langs->load("cashdesk");
<td> <td>
<input class="texte1_off" type="text" name="txtStock" value="<?php echo $obj_facturation->stock() ?>" disabled="disabled" /> <input class="texte1_off" type="text" name="txtStock" value="<?php echo $obj_facturation->stock() ?>" disabled="disabled" />
</td> </td>
<!-- Affichage du prix unitaire --> <!-- Show unit price -->
<td><input class="texte1_off" type="text" name="txtPrixUnit" value="<?php echo price2num($obj_facturation->prix(), 'MU'); ?>" disabled="disabled" /></td> <?php // TODO Remove the disabled and use this value when adding product into cart ?>
<td><input class="texte1_off" type="text" name="txtPrixUnit" value="<?php echo price2num($obj_facturation->prix(), 'MU'); ?>" onchange="javascript: modif();" disabled="disabled" /></td>
<td><?php echo $conf->currency; ?></td> <td><?php echo $conf->currency; ?></td>
<!-- Choix de la remise --> <!-- Choix de la remise -->
<td><input class="texte1" type="text" id="txtRemise" name="txtRemise" value="0" onkeyup="javascript: modif();" onfocus="javascript: this.select();"/> <td><input class="texte1" type="text" id="txtRemise" name="txtRemise" value="0" onkeyup="javascript: modif();" onfocus="javascript: this.select();"/>
@ -122,9 +123,9 @@ $langs->load("cashdesk");
<td><input class="texte1_off" type="text" name="txtTotal" value="" disabled="disabled" /></td><td><?php echo $conf->currency; ?></td> <td><input class="texte1_off" type="text" name="txtTotal" value="" disabled="disabled" /></td><td><?php echo $conf->currency; ?></td>
<!-- Choix du taux de TVA --> <!-- Choix du taux de TVA -->
<td class="select_tva"> <td class="select_tva">
<?php //var_dump($tab_tva); ?>
<select name="selTva" onchange="javascript: modif();" > <select name="selTva" onchange="javascript: modif();" >
<?php <?php
$tva_tx = $obj_facturation->tva(); $tva_tx = $obj_facturation->tva();
$tab_tva_size=count($tab_tva); $tab_tva_size=count($tab_tva);
for($i=0;$i < $tab_tva_size;$i++) { for($i=0;$i < $tab_tva_size;$i++) {
@ -132,12 +133,10 @@ $langs->load("cashdesk");
if ( $tva_tx == $tab_tva[$i]['taux'] ) if ( $tva_tx == $tab_tva[$i]['taux'] )
$selected = 'selected="selected"'; $selected = 'selected="selected"';
else else
$selected = ''; $selected = '';
echo ('<option '.$selected.' value="'.$tab_tva[$i]['rowid'].'">'.$tab_tva[$i]['taux'].'</option>'."\n "); echo ('<option '.$selected.' value="'.$tab_tva[$i]['rowid'].'">'.$tab_tva[$i]['taux'].'</option>'."\n ");
} }
?> ?>
</select> </select>
</td> </td>