X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fui%2Fpo_ui.inc;h=8adca98b97edbaf258c81c9497f576be21e3764a;hb=7f5a0ac613cd75593cd441a4c522dee1373fc097;hp=6f50643fe33f20eeef969d3b502288eba56d916b;hpb=40ee20a833a502a0914202b56473fb330d5774cf;p=fa-stable.git diff --git a/purchasing/includes/ui/po_ui.inc b/purchasing/includes/ui/po_ui.inc index 6f50643f..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,22 +36,29 @@ 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, tax_group_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 + * (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 - WHERE supp.supplier_id = '$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"; @@ -55,10 +66,17 @@ function get_supplier_details_to_order(&$order, $supplier_id) $myrow = db_fetch($result); $order->credit = $myrow["cur_credit"]; - $order->tax_group_id = $myrow["tax_group_id"]; - $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->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"]); } //--------------------------------------------------------------------------------------------------- @@ -74,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 */ @@ -113,7 +132,11 @@ function display_po_header(&$order) if ($order->supplier_id != get_post('supplier_id',-1)) { $old_supp = $order->supplier_id; - get_supplier_details_to_order($order, $_POST['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]; @@ -123,6 +146,8 @@ function display_po_header(&$order) *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']); @@ -135,7 +160,6 @@ function display_po_header(&$order) supplier_credit_row($order->supplier_id, $order->credit); - table_section(2); if ($editable) { @@ -147,6 +171,8 @@ function display_po_header(&$order) label_row(_("Reference:"), $order->reference); } + table_section(2); + // check this out????????? //if (!isset($_POST['OrderDate']) || $_POST['OrderDate'] == "") // $_POST['OrderDate'] = $order->orig_order_date; @@ -156,10 +182,19 @@ 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); locations_list_row(_("Receive Into:"), 'StkLocation', null, false, true); @@ -173,7 +208,7 @@ function display_po_header(&$order) /*If this is the first time the form loaded set up defaults */ //$_POST['StkLocation'] = $_SESSION['UserStockLocation']; - $sql = "SELECT delivery_address, phone FROM ".TB_PREF."locations WHERE loc_code='" . $_POST['StkLocation'] . "'"; + $sql = "SELECT delivery_address, phone FROM ".TB_PREF."locations WHERE loc_code=".db_escape($_POST['StkLocation']); $result = db_query($sql,"could not get location info"); if (db_num_rows($result) == 1) @@ -207,7 +242,7 @@ function display_po_items(&$order, $editable=true) $th = array(_("Item Code"), _("Item Description"), _("Quantity"), _("Received"), _("Unit"), - _("Required Delivery Date"), _("Price"), _("Line Total"), ""); + _("Required Delivery Date"), $order->tax_included ? _("Price after Tax") : _("Price before Tax"), _("Line Total"), ""); if ($order->trans_type != ST_PURCHORDER) array_remove($th, 5); @@ -252,10 +287,25 @@ function display_po_items(&$order, $editable=true) if ($id==-1 && $editable) po_item_controls($order, $k); - $display_total = price_format($total); - label_row(_("Total Excluding Shipping/Tax"), $display_total, "colspan=" - .(count($order->line_items) ? 7:6)." align=right", - "nowrap align=right", 2); + $colspan = count($th)-2; + if (count($order->line_items)) + $colspan--; + + $display_sub_total = price_format($total); + + label_row(_("Sub-total"), $display_sub_total, "colspan=$colspan align=right","align=right", 2); + + $taxes = $order->get_taxes(input_num('freight_cost')); + + $tax_total = display_edit_tax_items($taxes, $colspan, $order->tax_included, 2); + + $display_total = price_format(($total + input_num('freight_cost') + $tax_total)); + + start_row(); + label_cells(_("Amount Total"), $display_total, "colspan=$colspan align='right'","align='right'"); + $order->order_no ? submit_cells('update', _("Update"), "colspan=2 align='center'", _("Refresh"), true) + : label_cell('', "colspan=2"); + end_row(); end_table(1); div_end(); @@ -305,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"); @@ -315,7 +373,7 @@ function display_po_summary(&$po, $is_self=false, $editable=false) function po_item_controls(&$order, &$rowcounter, $line_no=-1) { - global $Ajax; + global $Ajax, $SysPrefs; alt_table_row_color($rowcounter); @@ -370,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(), 10); + $_POST['req_del_date'] = add_days(Today(), $SysPrefs->default_receival_required_by()); $qty_rcvd = ''; } @@ -380,7 +438,13 @@ function po_item_controls(&$order, &$rowcounter, $line_no=-1) label_cell($_POST['units'], '', 'units'); if ($order->trans_type == ST_PURCHORDER) date_cells(null, 'req_del_date', '', null, 0, 0, 0); - amount_cells(null, 'price', null, null, null, $dec2); + if ($qty_rcvd > 0) + { + amount_decimal_cell($_POST['price']); + hidden('price', $_POST['price']); + } + else + amount_cells(null, 'price', null, null, null, $dec2); //$line_total = $_POST['qty'] * $_POST['price'] * (1 - $_POST['Disc'] / 100); $line_total = round(input_num('qty') * input_num('price'), user_price_dec()); @@ -397,7 +461,7 @@ function po_item_controls(&$order, &$rowcounter, $line_no=-1) } else { - submit_cells('EnterLine', _("Add Item"), "colspan=2", + submit_cells('EnterLine', _("Add Item"), "colspan=2 align='center'", _('Add new item to document'), true); } @@ -406,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