X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fui%2Fpo_ui.inc;h=ed696468740f8aa4a517b3ca262ea1bebaf953ea;hb=5b8f4c4b4aa8cf996bc071f116bfce1273200fa2;hp=f9e820b9c97012d576db0020c41dc33950183dbe;hpb=286cf5800df151d9f31d73d445500b49062d8d7a;p=fa-stable.git diff --git a/purchasing/includes/ui/po_ui.inc b/purchasing/includes/ui/po_ui.inc index f9e820b9..ed696468 100644 --- a/purchasing/includes/ui/po_ui.inc +++ b/purchasing/includes/ui/po_ui.inc @@ -1,60 +1,109 @@ . +***********************************************************************/ include_once($path_to_root . "/purchasing/includes/purchasing_db.inc"); -// ------------------------------------------------------------------------------ +//-------------------------------------------------------------------------------------------------- -function get_supplier_details_to_order(&$order, $supplier_id) +function copy_from_cart() { - $sql = "SELECT curr_code,supp_name FROM ".TB_PREF."suppliers - WHERE supplier_id = '$supplier_id'"; - $result = db_query($sql, "The supplier details could not be retreived"); + $cart = &$_SESSION['PO']; + + $_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); + $_POST['_ex_rate'] = $cart->ex_rate; + $_POST['cash_account'] = $cart->cash_account; + foreach($cart->tax_overrides as $id => $value) + $_POST['mantax'][$id] = price_format($value); +} - $myrow = db_fetch($result); +function copy_to_cart() +{ + $cart = &$_SESSION['PO']; - $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; + $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->cash_account = get_post('cash_account'); + } + $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); + $cart->ex_rate = input_num('_ex_rate', null); + + if (isset($_POST['mantax'])) { + foreach($_POST['mantax'] as $id => $tax) { + $cart->tax_overrides[$id] = user_numeric($_POST['mantax'][$id]); } + } } //--------------------------------------------------------------------------------------------------- -function create_new_po() +function create_new_po($trans_type, $trans_no) { - if (isset($_SESSION['PO'])) - { - unset ($_SESSION['PO']->line_items); - $_SESSION['PO']->lines_on_order = 0; - unset ($_SESSION['PO']); - } + global $Refs; - session_register("PO"); + if (isset($_SESSION['PO'])) + unset ($_SESSION['PO']->line_items, $_SESSION['PO']); - $_SESSION['PO'] = new purch_order; - $_POST['OrderDate'] = Today(); + $cart = new purch_order; + $_POST['OrderDate'] = new_doc_date(); if (!is_date_in_fiscalyear($_POST['OrderDate'])) $_POST['OrderDate'] = end_fiscalyear(); - $_SESSION['PO']->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 */ + if ($trans_no) { + read_po($trans_no, $cart); + $cart->order_no = $trans_no; + } else + $cart->reference = $Refs->get_next($trans_type); + $_SESSION['PO'] = &$cart; } //--------------------------------------------------------------------------------------------------- function display_po_header(&$order) { - global $table_style2, $Ajax; + global $Ajax, $Refs; $editable = ($order->order_no == 0); - start_table("width=80% $table_style2"); - echo ""; // outer table - echo ""; + start_outer_table(TABLESTYLE2, 'width=80%'); + table_section(1); if ($editable) { - if (!isset($_POST['supplier_id']) && (get_global_supplier() != reserved_words::get_all())) + if (!isset($_POST['supplier_id']) && (get_global_supplier() != ALL_TEXT)) $_POST['supplier_id'] = get_global_supplier(); - supplier_list_row(_("Supplier:"), 'supplier_id', null, false, true); + supplier_list_row(_("Supplier:"), 'supplier_id', null, false, true, false, true); } else { @@ -63,26 +112,49 @@ 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->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']); + 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('due_date'); + } + supplier_credit_row($order->supplier_id, $order->credit); + if (!is_company_currency($order->curr_code)) { label_row(_("Supplier Currency:"), $order->curr_code); - exchange_rate_display($order->curr_code, get_company_currency(), + exchange_rate_display(get_company_currency(), $order->curr_code, $_POST['OrderDate']); } + if ($editable) { - ref_row(_("Reference:"), 'ref', '', references::get_next(systypes::po())); + ref_row(_("Reference:"), 'ref'); } else { @@ -90,37 +162,15 @@ function display_po_header(&$order) label_row(_("Reference:"), $order->reference); } - echo "
"; - - echo ""; // outer table - - echo ""; - // check this out????????? - //if (!isset($_POST['OrderDate']) || $_POST['OrderDate'] == "") - // $_POST['OrderDate'] = $order->orig_order_date; - //if (!isset($_POST['OrderDate']) || $_POST['OrderDate'] == "") - //{ - // $_POST['OrderDate'] = Today(); - // if (!is_date_in_fiscalyear($_POST['OrderDate'])) - // $_POST['OrderDate'] = end_fiscalyear(); - //} - date_row(_("Order Date:"), 'OrderDate', '', $_POST['OrderDate'], 0, 0, 0, null, true); - if (isset($_POST['_OrderDate_changed'])) { - $Ajax->activate('_ex_rate'); - } - - text_row(_("Supplier's Reference:"), 'Requisition', null, 16, 15); + table_section(2); - echo "
"; + if ($order->trans_type==ST_SUPPINVOICE) + date_row(_("Due Date:"), 'due_date', '', false, 0, 0, 0, null, true); - echo ""; // outer table + text_row(_("Supplier's Reference:"), 'supp_ref', null, 16, 15); + locations_list_row(_("Receive Into:"), 'StkLocation', null, false, true); - echo ""; - - echo ""; - echo ""; + table_section(3); if (!isset($_POST['StkLocation']) || $_POST['StkLocation'] == "" || isset($_POST['_StkLocation_update']) || !isset($_POST['delivery_address']) || @@ -128,13 +178,9 @@ 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'] . "'"; - $result = db_query($sql,"could not get location info"); - - if (db_num_rows($result) == 1) + $loc_row = get_item_location(get_post('StkLocation')); + if ($loc_row) { - $loc_row = db_fetch($result); $_POST['delivery_address'] = $loc_row["delivery_address"]; $Ajax->activate('delivery_address'); $_SESSION['PO']->Location = $_POST['StkLocation']; @@ -148,26 +194,25 @@ function display_po_header(&$order) } textarea_row(_("Deliver to:"), 'delivery_address', $_POST['delivery_address'], 35, 4); - echo "
" . _("Receive Into:") . ""; - locations_list('StkLocation', null, false, true); - echo "
"; - echo ""; - end_table(); // outer table + end_outer_table(); // outer table } //--------------------------------------------------------------------------------------------------- function display_po_items(&$order, $editable=true) { - global $table_style; - display_heading(_("Order Items")); div_start('items_table'); - start_table("$table_style width=80%"); - - $th = array(_("Item Code"), _("Item Description"), _("Quantity"), _("Unit"), - _("Required Delivery Date"), _("Price"), _("Line Total")); - + start_table(TABLESTYLE, "width=80%"); + + $th = array(_("Item Code"), _("Item Description"), _("Quantity"), + _("Received"), _("Unit"), + _("Required Delivery Date"), $order->tax_included ? _("Price after Tax") : _("Price before Tax"), _("Line Total"), ""); + if ($order->trans_type != ST_PURCHORDER) + array_remove($th, 5); + if (count($order->line_items)) $th[] = ''; table_header($th); @@ -176,44 +221,58 @@ function display_po_items(&$order, $editable=true) $k = 0; foreach ($order->line_items as $line_no => $po_line) { - - if ($po_line->Deleted == false) + $line_total = round($po_line->quantity * $po_line->price, user_price_dec()); + if (!$editable || ($id != $line_no)) { - $line_total = round($po_line->quantity * $po_line->price, user_price_dec()); - if (!$editable || ($id != $line_no)) + alt_table_row_color($k); + label_cell($po_line->stock_id); + label_cell($po_line->item_description); + qty_cell($po_line->quantity, false, get_qty_dec($po_line->stock_id)); + qty_cell($po_line->qty_received, false, get_qty_dec($po_line->stock_id)); + label_cell($po_line->units); + if ($order->trans_type == ST_PURCHORDER) + label_cell($po_line->req_del_date); + amount_decimal_cell($po_line->price); + amount_cell($line_total); + + if ($editable) { - alt_table_row_color($k); - label_cell($po_line->stock_id); - label_cell($po_line->item_description); - qty_cell($po_line->quantity, false, get_qty_dec($po_line->stock_id)); - label_cell($po_line->units); - label_cell($po_line->req_del_date); - amount_cell($po_line->price); - amount_cell($line_total); - - if ($editable) - { edit_button_cell("Edit$line_no", _("Edit"), _('Edit document line')); - edit_button_cell("Delete$line_no", _("Delete"), - _('Remove line from document')); - } - end_row(); + delete_button_cell("Delete$line_no", _("Delete"), + _('Remove line from document')); } - else - { - po_item_controls($order, $po_line->stock_id); - } - $total += $line_total; + end_row(); + } + else + { + po_item_controls($order, $k, $line_no); } + $total += $line_total; } if ($id==-1 && $editable) - po_item_controls($order); + po_item_controls($order, $k); - $display_total = price_format($total); - label_row(_("Total Excluding Shipping/Tax"), $display_total, "colspan=6 align=right", - "nowrap align=right"); + $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, $order->trans_type==ST_SUPPINVOICE); + + $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(); @@ -223,8 +282,7 @@ function display_po_items(&$order, $editable=true) function display_po_summary(&$po, $is_self=false, $editable=false) { - global $table_style2; - start_table("$table_style2 width=90%"); + start_table(TABLESTYLE, "width=90%"); start_row(); label_cells(_("Reference"), $po->reference, "class='tableheader2'"); @@ -236,7 +294,7 @@ function display_po_summary(&$po, $is_self=false, $editable=false) if (!$is_self) { - label_cells(_("Purchase Order"), get_trans_view_str(systypes::po(), $po->order_no), + label_cells(_("Purchase Order"), get_trans_view_str(ST_PURCHORDER, $po->order_no), "class='tableheader2'"); } end_row(); @@ -256,14 +314,22 @@ function display_po_summary(&$po, $is_self=false, $editable=false) "class='tableheader2'"); } - if ($po->requisition_no != "") - label_cells(_("Supplier's Reference"), $po->requisition_no, "class='tableheader2'"); + if ($po->supp_ref != "") + label_cells(_("Supplier's Reference"), $po->supp_ref, "class='tableheader2'"); end_row(); if (!$editable) 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"); @@ -272,34 +338,50 @@ function display_po_summary(&$po, $is_self=false, $editable=false) //-------------------------------------------------------------------------------- -function po_item_controls(&$order, $stock_id=null) +function po_item_controls(&$order, &$rowcounter, $line_no=-1) { - global $Ajax; - start_row(); + global $Ajax, $SysPrefs; + alt_table_row_color($rowcounter); + + $dec2 = 0; $id = find_submit('Edit'); - if (($id != -1) && $stock_id != null) + if (($id != -1) && $line_no == $id) { - hidden('line_no', $id); +// hidden('line_no', $id); $_POST['stock_id'] = $order->line_items[$id]->stock_id; - $dec = get_qty_dec($_POST['stock_id']); + $dec = get_qty_dec($_POST['stock_id']); $_POST['qty'] = qty_format($order->line_items[$id]->quantity, $_POST['stock_id'], $dec); - $_POST['price'] = price_format($order->line_items[$id]->price); - $_POST['req_del_date'] = $order->line_items[$id]->req_del_date; + //$_POST['price'] = price_format($order->line_items[$id]->price); + $_POST['price'] = price_decimal_format($order->line_items[$id]->price, $dec2); + if ($order->trans_type == ST_PURCHORDER) + $_POST['req_del_date'] = $order->line_items[$id]->req_del_date; $_POST['units'] = $order->line_items[$id]->units; + $_POST['item_description'] = $order->line_items[$id]->item_description; hidden('stock_id', $_POST['stock_id']); label_cell($_POST['stock_id']); - label_cell($order->line_items[$id]->item_description); + + if ($order->line_items[$id]->descr_editable) + text_cells(null,'item_description', null, 45, 150); + else { + hidden('item_description', $_POST['item_description']); +// label_cell($_POST['item_description']); + label_cell($order->line_items[$id]->item_description); + } + $Ajax->activate('items_table'); + $qty_rcvd = $order->line_items[$id]->qty_received; } else { - hidden('line_no', ($_SESSION['PO']->lines_on_order + 1)); +// hidden('line_no', ($_SESSION['PO']->lines_on_order + 1)); - stock_purchasable_items_list_cells(null, 'stock_id', null, false, true); + //Chaitanya : Manufcatured item can be purchased + stock_items_list_cells(null, 'stock_id', null, false, true, false, true); + //stock_purchasable_items_list_cells(null, 'stock_id', null, false, true, true); if (list_updated('stock_id')) { $Ajax->activate('price'); $Ajax->activate('units'); @@ -310,17 +392,28 @@ function po_item_controls(&$order, $stock_id=null) $item_info = get_item_edit_info($_POST['stock_id']); $_POST['units'] = $item_info["units"]; - $dec = get_qty_dec($_POST['stock_id']); - $_POST['qty'] = qty_format(1, $_POST['stock_id'], $dec); - $_POST['price'] = price_format(get_purchase_price ($order->supplier_id, $_POST['stock_id'])); - $_POST['req_del_date'] = add_days(Today(), 10); + $dec = $item_info["decimals"]; + $_POST['qty'] = number_format2(get_purchase_conversion_factor ($order->supplier_id, $_POST['stock_id']), $dec); + //$_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_receival_required_by()); + $qty_rcvd = ''; } qty_cells(null, 'qty', null, null, null, $dec); + qty_cell($qty_rcvd, false, $dec); label_cell($_POST['units'], '', 'units'); - date_cells(null, 'req_del_date', '', null, 0, 0, 0); - amount_cells(null, 'price', null); + if ($order->trans_type == ST_PURCHORDER) + date_cells(null, 'req_del_date', '', null, 0, 0, 0); + 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()); @@ -328,15 +421,16 @@ function po_item_controls(&$order, $stock_id=null) if ($id!=-1) { - edit_button_cell('UpdateLine', _("Update"), - _('Confirm changes')); - edit_button_cell('CancelUpdate', _("Cancel"), - _('Cancel changes')); + button_cell('UpdateLine', _("Update"), + _('Confirm changes'), ICON_UPDATE); + button_cell('CancelUpdate', _("Cancel"), + _('Cancel changes'), ICON_CANCEL); + hidden('line_no', $line_no); set_focus('qty'); } else { - submit_cells('EnterLine', _("Add Item"), "colspan=2", + submit_cells('EnterLine', _("Add Item"), "colspan=2 align='center'", _('Add new item to document'), true); } @@ -345,6 +439,28 @@ function po_item_controls(&$order, $stock_id=null) //--------------------------------------------------------------------------------------------------- +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