Added 'no_purchase' option in stock_master and stock_categories.

[fa-stable.git] / purchasing / includes / ui / po_ui.inc

diff --git a/purchasing/includes/ui/po_ui.inc b/purchasing/includes/ui/po_ui.inc
index c91d42fd345ca34ee68ffe35b3834d8db85b6fce..8adca98b97edbaf258c81c9497f576be21e3764a 100644 (file)
--- a/purchasing/includes/ui/po_ui.inc
+++ b/purchasing/includes/ui/po_ui.inc
@@ -19,13 +19,15 @@ function copy_from_cart()
 
        $_POST['supplier_id'] = $cart->supplier_id;
        $_POST['OrderDate'] = $cart->orig_order_date;
-       if ($cart->trans_type==ST_SUPPINVOICE)
+       if ($cart->trans_type == ST_SUPPINVOICE)
                $_POST['due_date'] = $cart->due_date;
     $_POST['supp_ref'] = $cart->supp_ref;
     $_POST['ref'] = $cart->reference;
        $_POST['Comments'] = $cart->Comments;
     $_POST['StkLocation'] = $cart->Location;
     $_POST['delivery_address'] = $cart->delivery_address;
+    $_POST['tax_algorithm'] = $cart->tax_algorithm;
+       $_POST['prep_amount'] = price_format($cart->prep_amount);
 }
 
 function copy_to_cart()
@@ -34,19 +36,22 @@ function copy_to_cart()
 
        $cart->supplier_id = $_POST['supplier_id'];     
        $cart->orig_order_date = $_POST['OrderDate'];
-       if ($cart->trans_type==ST_SUPPINVOICE)
+       if ($cart->trans_type == ST_SUPPINVOICE)
                $cart->due_date = $_POST['due_date'];
        $cart->reference = $_POST['ref'];
        $cart->supp_ref = $_POST['supp_ref'];
        $cart->Comments = $_POST['Comments'];   
        $cart->Location = $_POST['StkLocation'];
        $cart->delivery_address = $_POST['delivery_address'];
+       if (isset($_POST['tax_algorithm']))
+           $cart->tax_algorithm = $_POST['tax_algorithm'];
+       $cart->prep_amount = input_num('prep_amount', 0);
 }
 // ------------------------------------------------------------------------------
 
 function get_supplier_details_to_order(&$order, $supplier_id)
 {
-       $sql = "SELECT curr_code, supp_name, tax_group_id, supp.tax_included,
+       $sql = "SELECT curr_code, supp_name, tax_group_id, supp.tax_included, supp.tax_algorithm,
                        supp.credit_limit - Sum(IFNULL(IF(trans.type=".ST_SUPPCREDIT.", -1, 1) 
                                * (ov_amount + ov_gst + ov_discount),0)) as cur_credit,
                                terms.terms, terms.days_before_due, terms.day_in_following_month
@@ -71,7 +76,7 @@ function get_supplier_details_to_order(&$order, $supplier_id)
        $_POST['curr_code'] = $myrow["curr_code"];
 
        $order->set_supplier($supplier_id, $myrow["supp_name"], $myrow["curr_code"], 
-               $myrow["tax_group_id"], $myrow["tax_included"]);
+               $myrow["tax_group_id"], $myrow["tax_included"], $myrow["tax_algorithm"]);
 }
 
 //---------------------------------------------------------------------------------------------------
@@ -130,6 +135,7 @@ function display_po_header(&$order)
                get_supplier_details_to_order($order, $_POST['supplier_id']); 
            get_duedate_from_terms($order);
                $_POST['due_date'] = $order->due_date;
+               $_POST['tax_algorithm'] = $order->tax_algorithm;
 
                // supplier default price update
                foreach ($order->line_items as $line_no=>$item) {
@@ -141,6 +147,7 @@ function display_po_header(&$order)
                }
            $Ajax->activate('items_table');
            $Ajax->activate('due_date');
+           $Ajax->activate('tax_algorithm');
        }
        set_global_supplier($_POST['supplier_id']);
 
@@ -348,6 +355,14 @@ function display_po_summary(&$po, $is_self=false, $editable=false)
        label_row(_("Delivery Address"), $po->delivery_address, "class='tableheader2'",
                "colspan=9");
 
+       if (!$editable && ($po->prep_amount > 0))
+       {
+               start_row();
+               label_cells(_("Required Pre-Payment"), price_format($po->prep_amount), "class='tableheader2'");
+               label_cells(_("Pre-Payments Allocated"), price_format($po->alloc), "class='tableheader2'");
+               end_row();
+       }
+
     if ($po->Comments != "")
        label_row(_("Order Comments"), $po->Comments, "class='tableheader2'",
                "colspan=9");
@@ -397,9 +412,7 @@ function po_item_controls(&$order, &$rowcounter, $line_no=-1)
        {
 //             hidden('line_no', ($_SESSION['PO']->lines_on_order + 1));
 
-               //Chaitanya : Manufcatured item can be purchased
-               stock_items_list_cells(null, 'stock_id', null, false, true, true);
-               //stock_purchasable_items_list_cells(null, 'stock_id', null, false, true, true);
+               stock_purchasable_items_list_cells(null, 'stock_id', null, false, true, true);
                if (list_updated('stock_id')) {
                            $Ajax->activate('price');
                            $Ajax->activate('units');
@@ -415,7 +428,7 @@ function po_item_controls(&$order, &$rowcounter, $line_no=-1)
                //$_POST['price'] = price_format(get_purchase_price ($order->supplier_id, $_POST['stock_id']));
                $_POST['price'] = price_decimal_format(get_purchase_price ($order->supplier_id, $_POST['stock_id']), $dec2);
                if ($order->trans_type == ST_PURCHORDER)
-                       $_POST['req_del_date'] = add_days(Today(), $SysPrefs->default_delivery_required_by());
+                       $_POST['req_del_date'] = add_days(Today(), $SysPrefs->default_receival_required_by());
                $qty_rcvd = '';
        }
 
@@ -457,6 +470,29 @@ function po_item_controls(&$order, &$rowcounter, $line_no=-1)
 
 //---------------------------------------------------------------------------------------------------
 
+function display_po_footer(&$trans)
+{
+       global $Ajax;
+
+start_table(TABLESTYLE2);
+
+if (list_updated('tax_algorithm')) {
+       $trans->tax_algorithm = $_POST['tax_algorithm'];
+    $Ajax->activate('items_table');
+}
+
+if ($trans->trans_type == ST_SUPPINVOICE) {
+       tax_algorithm_list_row(_("Tax algorithm:"), 'tax_algorithm', null, true);
+       cash_accounts_list_row(_("Payment:"), 'cash_account', null, false, _('Delayed'));
+} elseif ($trans->trans_type == ST_PURCHORDER)
+       amount_row(_("Pre-Payment Required:"), 'prep_amount');
+
+textarea_row(_("Memo:"), 'Comments', null, 70, 4);
+
+end_table();
+}
+//---------------------------------------------------------------------------------------------------
+
 
 
 ?>
\ No newline at end of file