20a21
>     
43c44
< 			$form['panes']['payment']['shown_total']['#suffix'] = '<p>'.t('based on current French VAT, round up/down to the nearest cent , applied on total price').'</p>';
---
> 			$form['panes']['payment']['shown_total']['#suffix'] = '<p>'.t('VAT is round up/down to the nearest real amount then applied on total price').'</p>';
52c53
< 		
---
>         
55c56
< 	
---
>           
57a59,61
>             $option->price = $option->price + ($option->price *  _uc_product_taxes_calculate($node));
> 						$option->price = round($option->price, 2);
> 
59,63c63,64
< 							case 'total':
< 								$option->price = $option->price + ($option->price *  _uc_product_taxes_calculate($node));
< 								$option->price = round($option->price, 2);
< 								
< 								$display_price = ', '. uc_currency_format($node->sell_price + $option->price);
---
> 							case 'total':								
> 								$display_price = ', '.$node->sell_price.'+'.$option->price.'='. uc_currency_format($node->sell_price + $option->price);
76a78
> 
165d166
< 	$node_type = node_get_types('type', $node);		
167c168
< 	
---
> 
179a181,239
> 
> 
> /******************************************************************************
>  * Theme Functions                                                            *
>  ******************************************************************************/
> 
> function phptemplate_cart_review_table($show_subtotal = TRUE) {
>   $items = uc_cart_get_contents();
>   $subtotal = 0;
> 
>   $output = '<table class="cart-review"><thead>'
>            .'<tr class="first last odd"><td class="first odd qty">'. t('Qty')
>            .'</td><td class="even products">'. t('Products')
>            .'</td><td class="last odd price">'. t('Price')
>            .'</td></tr></thead><tbody>';
> 
>   $row = 1;
>   for ($i = 0; $i < count($items); $i++) {
>     $item = $items[$i];
> 
>     $rows = array();
>     foreach($item->options as $option){
>       $rows[] = $option['attribute'] .': '. $option['name'];
>     }
>     $desc = $item->title . theme('item_list', $rows, NULL, 'ul', array('class' => 'product-options'));
> 
>     $total = ($item->qty) ? $item->qty * $item->price : $item->price;
>     
>     $node = node_load(array('nid'=>$item->nid));
>     $vat += ($item->qty) ? $item->qty * $item->price * _uc_product_taxes_calculate($node) : $item->price * _uc_product_taxes_calculate($node);
>     
>     
>     $subtotal += $total;
>     $qty = ($item->qty) ? $item->qty : '';
>     $tr_class = ($i % 2 == 0) ? 'even' : 'odd';
>     if ($show_subtotal && $i == count($items)) {
>       $tr_class .= ' last';
>     }
> 
>     $output .= '<tr class="'. $tr_class .'"><td class="qty">'
>              . t('!qtyx', array('!qty' => $qty)) .'</td><td class="products">'
>              . $desc .'</td><td class="price">'. uc_currency_format($total)
>               .'</td></tr>';
>   }
>   if ($show_subtotal) {
>     $tr_class = ($tr_class == 'even') ? 'odd' : 'even';
>     $output .= '<tr class="'. $tr_class .' last"><td class="subtotal" '
>               .'colspan="4"><span id="subtotal-title">'. t('Subtotal')
>               .'</span> '. uc_currency_format($subtotal) .'<br/>'
>               .'<span id="subtotal-title">'. t('VAT:')
>               .'</span> '. uc_currency_format($vat) .'<br/>'
>               .'<b><span id="subtotal-title">'. t('Total:')
>               .'</span> '. uc_currency_format($subtotal+$vat) .'</b><br/>'
>               .'</td></tr>';
>   }
>   $output .= '</tbody></table>';
> 
>   return $output;
> }