Added confirmation js dialogs for deleting and restoring backup file.

[fa-stable.git] / reporting / rep209.php

diff --git a/reporting/rep209.php b/reporting/rep209.php
index ebf0dfafb614d6a9caa7280aa7eadf70473947db..7bd5c4ae1cbe5635ca880bc5ba12e474529d15b1 100644 (file)
--- a/reporting/rep209.php
+++ b/reporting/rep209.php
@@ -9,7 +9,9 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-$page_security = 2;
+
+$page_security = $_POST['PARAM_0'] == $_POST['PARAM_1'] ?
+       'SA_SUPPTRANSVIEW' : 'SA_SUPPBULKREP';
 // ----------------------------------------------------------------
 // $ Revision: 2.0 $
 // Creator:    Joe Hunt
@@ -24,7 +26,6 @@ include_once($path_to_root . "/includes/data_checks.inc");
 
 //----------------------------------------------------------------------------------------------------
 
-// trial_inquiry_controls();
 print_po();
 
 //----------------------------------------------------------------------------------------------------
@@ -32,7 +33,7 @@ function get_po($order_no)
 {
        $sql = "SELECT ".TB_PREF."purch_orders.*, ".TB_PREF."suppliers.supp_name,  ".TB_PREF."suppliers.supp_account_no,
                ".TB_PREF."suppliers.curr_code, ".TB_PREF."suppliers.payment_terms, ".TB_PREF."locations.location_name,
-               ".TB_PREF."suppliers.email, ".TB_PREF."suppliers.address
+               ".TB_PREF."suppliers.email, ".TB_PREF."suppliers.address, ".TB_PREF."suppliers.contact
                FROM ".TB_PREF."purch_orders, ".TB_PREF."suppliers, ".TB_PREF."locations
                WHERE ".TB_PREF."purch_orders.supplier_id = ".TB_PREF."suppliers.supplier_id
                AND ".TB_PREF."locations.loc_code = into_stock_location
@@ -84,7 +85,7 @@ function print_po()
 
        if ($email == 0)
        {
-               $rep = new FrontReport(_('PURCHASE ORDER'), "PurchaseOrderBulk.pdf", user_pagesize());
+               $rep = new FrontReport(_('PURCHASE ORDER'), "PurchaseOrderBulk", user_pagesize());
                $rep->currency = $cur;
                $rep->Font();
                $rep->Info($params, $cols, null, $aligns);
@@ -120,14 +121,14 @@ function print_po()
                                        $myrow2['units'] = $data['suppliers_uom'];
                                if ($data['conversion_factor'] != 1)
                                {
-                                       $myrow2['unit_price'] = round($myrow2['unit_price'] / $data['conversion_factor'], user_price_dec());
-                                       $myrow2['quantiry_ordered'] = round($myrow2['quantiry_ordered'] / $data['conversion_factor'], user_qty_dec());
+                                       $myrow2['unit_price'] = round2($myrow2['unit_price'] * $data['conversion_factor'], user_price_dec());
+                                       $myrow2['quantity_ordered'] = round2($myrow2['quantity_ordered'] / $data['conversion_factor'], user_qty_dec());
                                }
                        }       
-                       $Net = round2(($myrow2["unit_price"] * $myrow2["quantity_ordered"]),
-                         user_price_dec());
+                       $Net = round2(($myrow2["unit_price"] * $myrow2["quantity_ordered"]), user_price_dec());
                        $SubTotal += $Net;
-                       $DisplayPrice = number_format2($myrow2["unit_price"],$dec);
+                       $dec2 = 0;
+                       $DisplayPrice = price_decimal_format($myrow2["unit_price"],$dec2);
                        $DisplayQty = number_format2($myrow2["quantity_ordered"],get_qty_dec($myrow2['item_code']));
                        $DisplayNet = number_format2($Net,$dec);
                        //$rep->TextCol(0, 1,   $myrow2['item_code'], -2);
@@ -172,6 +173,7 @@ function print_po()
                {
                        $myrow['contact_email'] = $myrow['email'];
                        $myrow['DebtorName'] = $myrow['supp_name'];
+                       if ($myrow['contact'] != '') $myrow['DebtorName'] = $myrow['contact'];
                        $myrow['reference'] = $myrow['order_no'];
                        $rep->End($email, $doc_Order_no . " " . $myrow['reference'], $myrow);
                }