X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fui%2Fpo_ui.inc;h=8adca98b97edbaf258c81c9497f576be21e3764a;hb=7f5a0ac613cd75593cd441a4c522dee1373fc097;hp=885af754583cc8d9beae75bb86fb57735c415c7a;hpb=84e2f869630484bd9380e5c30647a483bce14d1e;p=fa-stable.git diff --git a/purchasing/includes/ui/po_ui.inc b/purchasing/includes/ui/po_ui.inc index 885af754..8adca98b 100644 --- a/purchasing/includes/ui/po_ui.inc +++ b/purchasing/includes/ui/po_ui.inc @@ -19,11 +19,15 @@ function copy_from_cart() $_POST['supplier_id'] = $cart->supplier_id; $_POST['OrderDate'] = $cart->orig_order_date; + 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() @@ -32,25 +36,47 @@ function copy_to_cart() $cart->supplier_id = $_POST['supplier_id']; $cart->orig_order_date = $_POST['OrderDate']; + 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 FROM ".TB_PREF."suppliers - WHERE supplier_id = '$supplier_id'"; + $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 + FROM ".TB_PREF."suppliers supp + LEFT JOIN ".TB_PREF."supp_trans trans ON supp.supplier_id = trans.supplier_id + LEFT JOIN ".TB_PREF."payment_terms terms ON supp.payment_terms=terms.terms_indicator + WHERE supp.supplier_id = ".db_escape($supplier_id)." + GROUP BY + supp.supp_name"; + $result = db_query($sql, "The supplier details could not be retreived"); $myrow = db_fetch($result); - - $order->curr_code = $_POST['curr_code'] = $myrow["curr_code"]; - $order->supplier_name = $_POST['supplier_name'] = $myrow["supp_name"]; - $order->supplier_id = $_POST['supplier_id'] = $supplier_id; + $order->credit = $myrow["cur_credit"]; + $order->terms = array( + 'description' => $myrow['terms'], + 'days_before_due' => $myrow['days_before_due'], + 'day_in_following_month' => $myrow['day_in_following_month'] ); + + $_POST['supplier_id'] = $supplier_id; + $_POST['supplier_name'] = $myrow["supp_name"]; + $_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_algorithm"]); } //--------------------------------------------------------------------------------------------------- @@ -66,8 +92,9 @@ function create_new_po($trans_type, $trans_no) $_POST['OrderDate'] = new_doc_date(); if (!is_date_in_fiscalyear($_POST['OrderDate'])) $_POST['OrderDate'] = end_fiscalyear(); - $cart->orig_order_date = $_POST['OrderDate']; + $cart->due_date = $cart->orig_order_date = $_POST['OrderDate']; + $cart->trans_type = $trans_type; $cart->order_no = $trans_no; /*read in all the selected order into the Items cart */ @@ -83,11 +110,11 @@ function create_new_po($trans_type, $trans_no) function display_po_header(&$order) { - global $table_style2, $Ajax, $Refs; + global $Ajax, $Refs; $editable = ($order->order_no == 0); - start_outer_table("width=80% $table_style2"); + start_outer_table(TABLESTYLE2, "width=80%"); table_section(1); if ($editable) @@ -104,14 +131,23 @@ function display_po_header(&$order) } if ($order->supplier_id != get_post('supplier_id',-1)) { - get_supplier_details_to_order($order, $_POST['supplier_id']); + $old_supp = $order->supplier_id; + 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) { $line = &$order->line_items[$line_no]; - $line->price = get_purchase_price ($order->supplier_id, $_POST['stock_id']); - $line->quantity = get_purchase_conversion_factor ($order->supplier_id, $_POST['stock_id']); + $line->price = get_purchase_price ($order->supplier_id, $line->stock_id); + $line->quantity = + $line->quantity/get_purchase_conversion_factor ($old_supp, $line->stock_id) + *get_purchase_conversion_factor ($order->supplier_id, $line->stock_id); } $Ajax->activate('items_table'); + $Ajax->activate('due_date'); + $Ajax->activate('tax_algorithm'); } set_global_supplier($_POST['supplier_id']); @@ -122,6 +158,9 @@ function display_po_header(&$order) $_POST['OrderDate']); } + supplier_credit_row($order->supplier_id, $order->credit); + + if ($editable) { ref_row(_("Reference:"), 'ref'); @@ -143,17 +182,22 @@ function display_po_header(&$order) // if (!is_date_in_fiscalyear($_POST['OrderDate'])) // $_POST['OrderDate'] = end_fiscalyear(); //} - date_row(_("Order Date:"), 'OrderDate', '', true, 0, 0, 0, null, true); + date_row($order->trans_type==ST_PURCHORDER ? _("Order Date:") : + ($order->trans_type==ST_SUPPRECEIVE ? _("Delivery Date:") : _("Invoice Date:")), + 'OrderDate', '', true, 0, 0, 0, null, true); + if (isset($_POST['_OrderDate_changed'])) { + $order->orig_order_date = $_POST['OrderDate']; + get_duedate_from_terms($order); + $_POST['due_date'] = $order->due_date; $Ajax->activate('_ex_rate'); + $Ajax->activate('due_date'); } + if ($order->trans_type==ST_SUPPINVOICE) + date_row(_("Due Date:"), 'due_date', '', false, 0, 0, 0, null, true); text_row(_("Supplier's Reference:"), 'supp_ref', null, 16, 15); - - echo "