X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fui%2Fpo_ui.inc;h=f9a5071c6bc5c1b80a6909d4f3c92220cd1f26ae;hb=99730b8d6deb7e81d2f1ebeb2ce7066d27729485;hp=e074abaf6c8ffaa70c28e2e3819811980b12e856;hpb=da8311619dd73feae101d246a1957b972e00cbd2;p=fa-stable.git diff --git a/purchasing/includes/ui/po_ui.inc b/purchasing/includes/ui/po_ui.inc index e074abaf..f9a5071c 100644 --- a/purchasing/includes/ui/po_ui.inc +++ b/purchasing/includes/ui/po_ui.inc @@ -34,7 +34,7 @@ function create_new_po() $_POST['OrderDate'] = Today(); if (!is_date_in_fiscalyear($_POST['OrderDate'])) $_POST['OrderDate'] = end_fiscalyear(); - $_SESSION['PO']->orig_order_date = $_POST['OrderDate']; + $_SESSION['PO']->orig_order_date = $_POST['OrderDate']; } //--------------------------------------------------------------------------------------------------- @@ -49,22 +49,22 @@ function display_po_header(&$order) echo ""; // outer table echo ""; - if ($editable) + if ($editable) { if (!isset($_POST['supplier_id']) && (get_global_supplier() != reserved_words::get_all())) $_POST['supplier_id'] = get_global_supplier(); - supplier_list_row(_("Supplier:"), 'supplier_id', $_POST['supplier_id'], false, true); + supplier_list_row(_("Supplier:"), 'supplier_id', null, false, true); - if ($order->supplier_id != $_POST['supplier_id']) + if ($order->supplier_id != $_POST['supplier_id']) { // supplier has changed // delete all the order items - drastic but necessary because of // change of currency, etc $order->clear_items(); } - } - else + } + else { hidden('supplier_id', $order->supplier_id); label_row(_("Supplier:"), $order->supplier_name); @@ -82,11 +82,11 @@ function display_po_header(&$order) $_POST['OrderDate']); } - if ($editable) + if ($editable) { - ref_row(_("Reference:"), 'ref', references::get_next(systypes::po())); - } - else + ref_row(_("Reference:"), 'ref', '', references::get_next(systypes::po())); + } + else { hidden('ref', $order->reference); label_row(_("Reference:"), $order->reference); @@ -97,7 +97,7 @@ function display_po_header(&$order) echo "
"; // outer table echo ""; - // kolla det här????????? + // check this out????????? //if (!isset($_POST['OrderDate']) || $_POST['OrderDate'] == "") // $_POST['OrderDate'] = $order->orig_order_date; //if (!isset($_POST['OrderDate']) || $_POST['OrderDate'] == "") @@ -106,7 +106,7 @@ function display_po_header(&$order) // if (!is_date_in_fiscalyear($_POST['OrderDate'])) // $_POST['OrderDate'] = end_fiscalyear(); //} - text_row(_("Order Date:"), 'OrderDate', $_POST['OrderDate'], 12, 12); + date_row(_("Order Date:"), 'OrderDate', '', $_POST['OrderDate'], 0, 0, 0); text_row(_("Supplier's Reference:"), 'Requisition', null, 16, 15); @@ -124,7 +124,7 @@ function display_po_header(&$order) echo ""; if (!isset($_POST['StkLocation']) || $_POST['StkLocation'] == "" || - isset($_POST['GetAddress']) || !isset($_POST['delivery_address']) || + isset($_POST['GetAddress']) || !isset($_POST['delivery_address']) || $_POST['delivery_address'] == "") { /*If this is the first time the form loaded set up defaults */ @@ -140,12 +140,12 @@ function display_po_header(&$order) $_SESSION['PO']->Location = $_POST['StkLocation']; $_SESSION['PO']->delivery_address = $_POST['delivery_address']; - } - else + } + else { /*The default location of the user is crook */ echo "
" . _("The default stock location set up for this user is not a currently defined stock location. Your system administrator needs to amend your user record."); } - } + } textarea_row(_("Deliver to:"), 'delivery_address', $_POST['delivery_address'], 35, 4); echo "
"; @@ -160,41 +160,43 @@ function display_po_items(&$order, $editable=true) { global $table_style; - display_heading2(_("Order Items")); + display_heading(_("Order Items")); start_table("$table_style width=80%"); $th = array(_("Item Code"), _("Item Description"), _("Quantity"), _("Unit"), _("Required Delivery Date"), _("Price"), _("Line Total")); - table_header($th); + + if (count($order->line_items)) $th[] = ''; + table_header($th); $total = 0; $k = 0; - foreach ($order->line_items as $po_line) + foreach ($order->line_items as $po_line) { if ($po_line->Deleted == false) { - $line_total = $po_line->quantity * $po_line->price; + $line_total = round($po_line->quantity * $po_line->price, user_price_dec()); if (!$editable || !isset($_GET['Edit']) || $_GET['Edit'] != $po_line->line_no) { alt_table_row_color($k); label_cell($po_line->stock_id); label_cell($po_line->item_description); - qty_cell($po_line->quantity); + 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) + if ($editable) { edit_link_cell(SID."Edit=" . $po_line->line_no); delete_link_cell(SID."Delete=" . $po_line->line_no); } end_row(); - } - else + } + else { po_item_controls($order, $po_line->stock_id); } @@ -205,8 +207,8 @@ function display_po_items(&$order, $editable=true) if (!isset($_GET['Edit']) && $editable) po_item_controls($order); - $display_total = number_format2($total,user_price_dec()); - label_row(_("Total Excluding Shipping/Tax"), $display_total, "colspan=6 align=right", + $display_total = price_format($total); + label_row(_("Total Excluding Shipping/Tax"), $display_total, "colspan=6 align=right", "nowrap align=right"); end_table(1); @@ -236,14 +238,14 @@ function display_po_summary(&$po, $is_self=false, $editable=false) start_row(); label_cells(_("Date"), $po->orig_order_date, "class='tableheader2'"); - if ($editable) + if ($editable) { if (!isset($_POST['Location'])) $_POST['Location'] = $po->Location; - label_cell(_("Deliver Into Location"), "class='tableheader2'"); + label_cell(_("Deliver Into Location"), "class='tableheader2'"); locations_list_cells(null, 'Location', $_POST['Location']); - } - else + } + else { label_cells(_("Deliver Into Location"), get_location_name($po->Location), "class='tableheader2'"); @@ -276,9 +278,9 @@ function po_item_controls(&$order, $stock_id=null) if (!isset($_POST['stock_id'])) $_POST['stock_id'] = $order->line_items[$_GET['Edit']]->stock_id; if (!isset($_POST['qty']) || ($_POST['qty'] == "")) - $_POST['qty'] = $order->line_items[$_GET['Edit']]->quantity; + $_POST['qty'] = qty_format($order->line_items[$_GET['Edit']]->quantity, $_POST['stock_id'], $dec); if (!isset($_POST['price']) || ($_POST['price'] == "")) - $_POST['price'] = $order->line_items[$_GET['Edit']]->price; + $_POST['price'] = price_format($order->line_items[$_GET['Edit']]->price); if (!isset($_POST['req_del_date']) || ($_POST['req_del_date'] == "")) $_POST['req_del_date'] = $order->line_items[$_GET['Edit']]->req_del_date; @@ -287,39 +289,36 @@ function po_item_controls(&$order, $stock_id=null) hidden('stock_id', $_POST['stock_id']); label_cell($_POST['stock_id']); label_cell($order->line_items[$_GET['Edit']]->item_description); - } - else + } + else { - hidden('line_no', ($_SESSION['PO']->lines_on_order + 1)); - text_cells(null, "StockID2", "", 12, 10, "", "", "onkeyup='recalcAccounts();' onKeyDown='if(event.keyCode==13) event.keyCode=9;' onblur='return setAccount(0, true);'"); - stock_purchasable_items_list_cells(null, 'stock_id', $_POST['stock_id'], false, false, "onchange='return setAccount(1, true)'"); - + stock_purchasable_items_list_cells(null, 'stock_id', null, false, true); $item_info = get_item_edit_info($_POST['stock_id']); $_POST['units'] = $item_info["units"]; - $_POST['qty'] = 1; - $_POST['price'] = get_purchase_price ($order->supplier_id, $_POST['stock_id']); - $_POST['req_del_date'] = date(user_date_display(),Mktime(0,0,0,date("m"),date("d")+10,date("y"))); + $_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); } - text_cells(null, 'qty', null, 13, 15); + qty_cells(null, 'qty', null, null, null, $dec); label_cell($_POST['units']); - text_cells(null, 'req_del_date', null, 12, 12); - text_cells(null, 'price', null, 15, 14); + date_cells(null, 'req_del_date', '', null, 0, 0, 0); + amount_cells(null, 'price', null); //$line_total = $_POST['qty'] * $_POST['price'] * (1 - $_POST['Disc'] / 100); - $line_total = $_POST['qty'] * $_POST['price']; + $line_total = round(input_num('qty') * input_num('price'), user_price_dec()); amount_cell($line_total); - if (isset($_GET['Edit'])) + if (isset($_GET['Edit'])) { submit_cells('UpdateLine', _("Update")); submit_cells('CancelUpdate', _("Cancel")); - } - else + } + else { submit_cells('EnterLine', _("Add Item"), "colspan=2"); }