Added taxes display for sales order/quotation.

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index ca9ea2dd6ff103a3fb3f05fe90fe3f12ff57f3d7..ccb8b87b74edd23687067730f8b0baeae575dc59 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,13 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+
+25-Aug-2010 Janusz Dobrowolski
++ Added taxes display for sales order/quotation
+$ /sales/includes/cart_class.inc
+  /sales/view/view_sales_order.php
+  /reporting/rep109.php
+
 24-Aug-2010 Joe Hunt
 # Removed old headerfunc in rep111.php (Sales Quotation)
 $ /reporting/rep111.php

diff --git a/reporting/rep109.php b/reporting/rep109.php
index 56498f0b62658a773552024f1329ec7cc4e2f1d6..26ffb53a2a7c7828f47d21ba34dd67852b01461d 100644 (file)
--- a/reporting/rep109.php
+++ b/reporting/rep109.php
@@ -23,6 +23,7 @@ include_once($path_to_root . "/includes/session.inc");
 include_once($path_to_root . "/includes/date_functions.inc");
 include_once($path_to_root . "/includes/data_checks.inc");
 include_once($path_to_root . "/sales/includes/sales_db.inc");
+include_once($path_to_root . "/taxes/tax_calc.inc");
 
 //----------------------------------------------------------------------------------------------------
 
@@ -103,10 +104,13 @@ function print_sales_orders()
 
                $result = get_sales_order_details($i, ST_SALESORDER);
                $SubTotal = 0;
+               $items = $prices = array();
                while ($myrow2=db_fetch($result))
                {
                        $Net = round2(((1 - $myrow2["discount_percent"]) * $myrow2["unit_price"] * $myrow2["quantity"]),
                           user_price_dec());
+                       $prices[] = $Net;
+                       $items[] = $myrow2['stk_code'];
                        $SubTotal += $Net;
                        $DisplayPrice = number_format2($myrow2["unit_price"],$dec);
                        $DisplayQty = number_format2($myrow2["quantity"],get_qty_dec($myrow2['stk_code']));
@@ -149,12 +153,60 @@ function print_sales_orders()
                $rep->TextCol(3, 6, $doc_Shipping, -2);
                $rep->TextCol(6, 7,     $DisplayFreight, -2);
                $rep->NewLine();
+
                $DisplayTotal = number_format2($myrow["freight_cost"] + $SubTotal, $dec);
-               $rep->Font('bold');
-               if ($myrow['tax_included'] == 0)
+               if ($myrow['tax_included'] == 0) {
                        $rep->TextCol(3, 6, $doc_TOTAL_ORDER, - 2);
-               else    
-                       $rep->TextCol(3, 6, $doc_TOTAL_ORDER2, - 2);
+                       $rep->TextCol(6, 7,     $DisplayTotal, -2);
+                       $rep->NewLine();
+               }
+
+               $tax_items = get_tax_for_items($items, $prices, $myrow["freight_cost"],
+                 $myrow['tax_group_id'], $myrow['tax_included'],  null);
+               $first = true;
+               foreach($tax_items as $tax_item)
+               {
+                       $DisplayTax = number_format2($tax_item['Value'], $dec);
+
+                       if (isset($suppress_tax_rates) && $suppress_tax_rates == 1)
+                               $tax_type_name = $tax_item['tax_type_name'];
+                       else
+                               $tax_type_name = $tax_item['tax_type_name']." (".$tax_item['rate']."%) ";
+
+                       if ($myrow['tax_included'])
+                       {
+                               if (isset($alternative_tax_include_on_docs) && $alternative_tax_include_on_docs == 1)
+                               {
+                                       if ($first)
+                                       {
+                                               $rep->TextCol(3, 6, _("Total Tax Excluded"), -2);
+                                               $rep->TextCol(6, 7,     number_format2($sign*$tax_item['net_amount'], $dec), -2);
+                                               $rep->NewLine();
+                                       }
+                                       $rep->TextCol(3, 6, $tax_type_name, -2);
+                                       $rep->TextCol(6, 7,     $DisplayTax, -2);
+                                       $first = false;
+                               }
+                               else
+                                       $rep->TextCol(3, 7, $doc_Included . " " . $tax_type_name . $doc_Amount . ": " . $DisplayTax, -2);
+                       }
+                       else
+                       {
+                               $SubTotal += $tax_item['Value'];
+                               $rep->TextCol(3, 6, $tax_type_name, -2);
+                               $rep->TextCol(6, 7,     $DisplayTax, -2);
+                       }
+                       $rep->NewLine();
+               }
+
+               $rep->NewLine();
+
+               $DisplayTotal = number_format2($myrow["freight_cost"] + $SubTotal, $dec);
+               $rep->Font('bold');
+//             if ($myrow['tax_included'] == 0)
+//                     $rep->TextCol(3, 6, $doc_TOTAL_ORDER, - 2);
+//             else    
+               $rep->TextCol(3, 6, $doc_TOTAL_ORDER2, - 2);
                $rep->TextCol(6, 7,     $DisplayTotal, -2);
                $words = price_in_words($myrow["freight_cost"] + $SubTotal, ST_SALESORDER);
                if ($words != "")

diff --git a/sales/includes/cart_class.inc b/sales/includes/cart_class.inc
index d8792dd73a094e8858dbdb520c13055fc22c97a2..00b311684623ee981682796749bcafbe52d5a691 100644 (file)
--- a/sales/includes/cart_class.inc
+++ b/sales/includes/cart_class.inc
@@ -465,7 +465,8 @@ class cart
 
                foreach ($this->line_items as $ln_itm) {
                        $items[] = $ln_itm->stock_id;
-                       $prices[] = round(($ln_itm->qty_dispatched *
+                       $prices[] = round(((
+                               $this->trans_type==ST_SALESORDER ?      $ln_itm->quantity : $ln_itm->qty_dispatched) *
                                $ln_itm->line_price()* (1 - $ln_itm->discount_percent)),  user_price_dec());
                }
 

diff --git a/sales/view/view_sales_order.php b/sales/view/view_sales_order.php
index a9e780e22e2331f70bba43a7010ef45578418073..9d287ed961baed9b38fb07350b591fbf40f5d9a2 100644 (file)
--- a/sales/view/view_sales_order.php
+++ b/sales/view/view_sales_order.php
@@ -222,15 +222,26 @@ foreach ($_SESSION['View']->line_items as $stock_item) {
        end_row();
 }
 
-$items_total = $_SESSION['View']->get_items_total();
-
-$display_total = price_format($items_total + $_SESSION['View']->freight_cost);
-
 label_row(_("Shipping"), price_format($_SESSION['View']->freight_cost),
        "align=right colspan=6", "nowrap align=right", 1);
-label_row(_("Total Order Value"), $display_total, "align=right colspan=6",
+
+$sub_tot = $_SESSION['View']->get_items_total() + $_SESSION['View']->freight_cost;
+
+$display_sub_tot = price_format($sub_tot);
+
+label_row(_("Sub Total"), $display_sub_tot, "align=right colspan=6",
        "nowrap align=right", 1);
 
+$taxes = $_SESSION['View']->get_taxes();
+
+$tax_total = display_edit_tax_items($taxes, 6, $_SESSION['View']->tax_included,2);
+
+$display_total = price_format($sub_tot + $tax_total);
+
+start_row();
+label_cells(_("Amount Total"), $display_total, "colspan=6 align='right'","align='right'");
+label_cell('', "colspan=2");
+end_row();
 end_table(2);
 
 end_page(true, false, false, $_GET['trans_type'], $_GET['trans_no']);