X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fui%2Fsales_order_ui.inc;h=72ad103b1ebe6237b13ef88ba37062e38c85ec21;hb=2e2c1956eb2f82eebc95878752a19a376cc89485;hp=fbb669fdc0764d0143650e8603533d2c161d6bac;hpb=46c5f7a65a7659a44ae8254c63152074363d3987;p=fa-stable.git diff --git a/sales/includes/ui/sales_order_ui.inc b/sales/includes/ui/sales_order_ui.inc index fbb669fd..72ad103b 100644 --- a/sales/includes/ui/sales_order_ui.inc +++ b/sales/includes/ui/sales_order_ui.inc @@ -10,7 +10,6 @@ See the License here . ***********************************************************************/ include_once($path_to_root . "/sales/includes/cart_class.inc"); -include_once($path_to_root . "/includes/manufacturing.inc"); //-------------------------------------------------------------------------------- function add_to_order(&$order, $new_item, $new_item_qty, $price, $discount, $description='') @@ -44,27 +43,27 @@ function add_to_order(&$order, $new_item, $new_item_qty, $price, $discount, $des } $item_price = round($item_price, user_price_dec()); - if (!$item['is_foreign'] && $item['item_code'] != $item['stock_id']) - { // this is sales kit - recurse - add_to_order($order, $item['stock_id'], $new_item_qty*$item['quantity'], - $item_price, $discount); - } - else - { // stock item record eventually with foreign code + if (!$item['is_foreign'] && $item['item_code'] != $item['stock_id']) + { // this is sales kit - recurse + add_to_order($order, $item['stock_id'], $new_item_qty*$item['quantity'], + $item_price, $discount); + } + else + { // stock item record eventually with foreign code - // check duplicate stock item - foreach ($order->line_items as $order_item) - { - if (strcasecmp($order_item->stock_id, $item['stock_id']) == 0) + // check duplicate stock item + foreach ($order->line_items as $order_item) { - display_warning(_("For Part :").$item['stock_id']. " " - . _("This item is already on this document. You have been warned.")); - break; + if (strcasecmp($order_item->stock_id, $item['stock_id']) == 0) + { + display_warning(_("For Part :").$item['stock_id']. " " + . _("This item is already on this document. You have been warned.")); + break; + } } + $order->add_to_cart (count($order->line_items), $item['stock_id'], + $new_item_qty*$item['quantity'], $item_price, $discount, 0,0, $description); } - $order->add_to_cart (count($order->line_items), $item['stock_id'], - $new_item_qty*$item['quantity'], $item_price, $discount, 0,0, $description); - } } } @@ -72,6 +71,8 @@ function add_to_order(&$order, $new_item, $new_item_qty, $price, $discount, $des function get_customer_details_to_order(&$order, $customer_id, $branch_id) { + global $SysPrefs; + $ret_error = ""; $myrow = get_customer_to_order($customer_id); @@ -108,23 +109,27 @@ function get_customer_details_to_order(&$order, $customer_id, $branch_id) // FIX - implement editable contact selector in sales order $contact = get_branch_contacts($branch_id, 'order', $customer_id); - $order->set_branch($branch_id, $myrow["tax_group_id"], - $myrow["tax_group_name"], @$contact[0]["phone"], @$contact[0]["email"]); + $myrow["tax_group_name"], @$contact["phone"], @$contact["email"]); $address = trim($myrow["br_post_address"]) != '' ? $myrow["br_post_address"] : (trim($myrow["br_address"]) != '' ? $myrow["br_address"]:$deliver); $order->set_delivery($myrow["default_ship_via"], $myrow["br_name"], $address); - if ($order->trans_type == ST_SALESINVOICE || $order->trans_type == ST_SALESORDER) { + if ($order->trans_type == ST_SALESINVOICE) { $order->due_date = get_invoice_duedate($order->payment, $order->document_date); } + elseif ($order->trans_type == ST_SALESORDER) + $order->due_date = add_days($order->document_date, $SysPrefs->default_delivery_required_by()); + elseif ($order->trans_type == ST_SALESQUOTE) + $order->due_date = add_days($order->document_date, $SysPrefs->default_quote_valid_days()); + if($order->payment_terms['cash_sale']) { $order->set_location($order->pos["pos_location"], $order->pos["location_name"]); } else $order->set_location($myrow["default_location"], $myrow["location_name"]); - + return $ret_error; } @@ -132,12 +137,12 @@ function get_customer_details_to_order(&$order, $customer_id, $branch_id) function display_order_summary($title, &$order, $editable_items=false) { - global $SysPrefs; display_heading($title); div_start('items_table'); - start_table(TABLESTYLE, "colspan=7 width=90%"); + start_table(TABLESTYLE, "width='90%'"); + $th = array(_("Item Code"), _("Item Description"), _("Quantity"), _("Delivered"), _("Unit"), $order->tax_included ? _("Price after Tax") : _("Price before Tax"), _("Discount %"), _("Total"), ""); @@ -155,8 +160,9 @@ function display_order_summary($title, &$order, $editable_items=false) $k = 0; //row colour counter $id = find_submit('Edit'); - $has_marked = false; - foreach ($order->line_items as $line_no=>$stock_item) + + $low_stock = $order->check_qoh($_POST['OrderDate'], $_POST['Location']); + foreach ($order->get_items() as $line_no=>$stock_item) { $line_total = round($stock_item->qty_dispatched * $stock_item->price * (1 - $stock_item->discount_percent), @@ -165,26 +171,13 @@ function display_order_summary($title, &$order, $editable_items=false) $qoh_msg = ''; if (!$editable_items || $id != $line_no) { - if (!$SysPrefs->allow_negative_stock() && is_inventory_item($stock_item->stock_id)) { - $qoh = get_qoh_on_date($stock_item->stock_id, - $_POST['Location'], $_POST['OrderDate']); - if ($stock_item->qty_dispatched > $qoh) - { - // oops, we don't have enough of one of the component items - start_row("class='stockmankobg'"); - $qoh_msg .= $stock_item->stock_id . " - " . $stock_item->item_description . ": " . - _("Quantity On Hand") . " = " - . number_format2($qoh, get_qty_dec($stock_item->stock_id)) . '
'; - $has_marked = true; - } else - alt_table_row_color($k); - } else { + if (in_array($stock_item->stock_id, $low_stock)) + start_row("class='stockmankobg'"); // notice low stock status + else alt_table_row_color($k); - } view_stock_status_cell($stock_item->stock_id); - //label_cell($stock_item->item_description, "nowrap" ); label_cell($stock_item->item_description ); $dec = get_qty_dec($stock_item->stock_id); qty_cell($stock_item->qty_dispatched, false, $dec); @@ -239,12 +232,9 @@ function display_order_summary($title, &$order, $editable_items=false) end_row(); end_table(); - if ($has_marked) { + if ($low_stock) display_note(_("Marked items have insufficient quantities in stock as on day of delivery."), 0, 1, "class='stockmankofg'"); - if ($order->trans_type!=30 && !$SysPrefs->allow_negative_stock()) - display_error(_("The delivery cannot be processed because there is an insufficient quantity for item:") - . '
'. $qoh_msg); - } + div_end(); } @@ -254,7 +244,7 @@ function display_order_header(&$order, $editable, $date_text) { global $Ajax, $SysPrefs; - start_outer_table(TABLESTYLE2, "width=80%"); + start_outer_table(TABLESTYLE2, "width='80%'"); table_section(1); @@ -263,8 +253,6 @@ function display_order_header(&$order, $editable, $date_text) if (isset($order) && !$editable) { - // can't change the customer/branch if items already received on this order - //echo $order->customer_name . " - " . $order->deliver_to; label_row(null, $order->customer_name . " - " . $order->deliver_to); hidden('customer_id', $order->customer_id); hidden('branch_id', $order->Branch); @@ -304,7 +292,7 @@ function display_order_header(&$order, $editable, $date_text) else { - $old_order = (PHP_VERSION<5) ? $order : clone( $order ); + $old_order = (PHP_VERSION<5) ? $order : clone $order; $customer_error = get_customer_details_to_order($order, $_POST['customer_id'], $_POST['branch_id']); $_POST['Location'] = $order->Location; @@ -367,18 +355,17 @@ function display_order_header(&$order, $editable, $date_text) $row = get_customer_to_order($_POST['customer_id']); if ($row['dissallow_invoices'] == 1) $customer_error = _("The selected customer account is currently on hold. Please contact the credit control personnel to discuss."); - } } - ref_row(_("Reference").':', 'ref', _('Reference number unique for this document type'), null, ''); + ref_row(_("Reference").':', 'ref', _('Reference number unique for this document type'), null, '', $order->trans_type, array('date'=> @$_POST['OrderDate'])); table_section(2); - if (!is_company_currency($order->customer_currency)) + if (!is_company_currency($order->customer_currency) && in_array($order->trans_type, array(ST_SALESINVOICE, ST_CUSTDELIVERY))) { label_row(_("Customer Currency:"), $order->customer_currency); - exchange_rate_display($order->customer_currency, get_company_currency(), + exchange_rate_display(get_company_currency(), $order->customer_currency, ($editable ? $_POST['OrderDate'] : $order->document_date)); } @@ -387,15 +374,15 @@ function display_order_header(&$order, $editable, $date_text) label_row(_("Customer Discount:"), ($order->default_discount * 100) . "%"); table_section(3); - if ($order->pos['cash_sale'] || $order->pos['credit_sale']) { + start_row(); + if (($order->pos['cash_sale'] || $order->pos['credit_sale']) + && !$order->is_started()) { // editable payment type if (get_post('payment') !== $order->payment) { $order->payment = get_post('payment'); $order->payment_terms = get_payment_terms($order->payment); $order->due_date = get_invoice_duedate($order->payment, $order->document_date); if ($order->payment_terms['cash_sale']) { - $order->cash_account = $order->pos['pos_account']; - $order->account_name = $order->pos['bank_account_name']; $_POST['Location'] = $order->Location = $order->pos['pos_location']; $order->location_name = $order->pos['location_name']; } @@ -405,15 +392,15 @@ function display_order_header(&$order, $editable, $date_text) $paymcat = !$order->pos['cash_sale'] ? PM_CREDIT : (!$order->pos['credit_sale'] ? PM_CASH : PM_ANY); // all terms are available for SO - sale_payment_list_cells(_('Payment:'), 'payment', - (in_array($order->trans_type, array(ST_SALESQUOTE, ST_SALESORDER)) - ? PM_ANY : $paymcat), null); + $is_order = in_array($order->trans_type, array(ST_SALESQUOTE, ST_SALESORDER)); + sale_payment_list_cells(_('Payment:'), 'payment', $is_order ? PM_ANY : $paymcat, null, true, $is_order); } else { - label_cells(_('Payment:'), $order->payment_terms['terms']); + label_cells(_('Payment:'), $order->payment_terms['terms'], "class='label'"); } + end_row(); if($editable) { - $str = sales_types_list_row(_("Price List"), 'sales_type', null, true); + $str = sales_types_list_row(_("Price List:"), 'sales_type', null, true); } else { label_row(_("Price List:"), $order->sales_type_name); } @@ -475,7 +462,6 @@ function display_order_header(&$order, $editable, $date_text) $line = &$order->line_items[$line_no]; $line->price = get_kit_price($line->stock_id, $order->customer_currency, $order->sales_type, $order->price_factor, get_post('OrderDate')); - // $line->discount_percent = $order->default_discount; } $Ajax->activate('items_table'); } @@ -509,21 +495,21 @@ function sales_order_item_controls(&$order, &$rowcounter, $line_no=-1) hidden('item_description', $_POST['item_description']); label_cell($_POST['item_description']); } -// } else { -// sales_items_list_cells(null,'item_description', null, false, true); -// } - //label_cell($order->line_items[$line_no]->item_description, "nowrap"); $Ajax->activate('items_table'); } else // prepare new line { - sales_items_list_cells(null,'stock_id', null, false, true); + if ($order->fixed_asset) + stock_disposable_fa_list_cells(null,'stock_id', null, _('[Select item]'), true, $order->line_items); + else + sales_items_list_cells(null,'stock_id', null, false, true, true); if (list_updated('stock_id')) { $Ajax->activate('price'); $Ajax->activate('units'); $Ajax->activate('qty'); $Ajax->activate('line_total'); - } + } else + sales_items_list_cells(null,'stock_id', last_sales_order_detail($order, 'stk_code'), false, true, true); $item_info = get_item_edit_info($_POST['stock_id']); $units = $item_info["units"]; @@ -537,7 +523,11 @@ function sales_order_item_controls(&$order, &$rowcounter, $line_no=-1) $_POST['Disc'] = percent_format($order->default_discount * 100); } - qty_cells(null, 'qty', $_POST['qty'], null, null, $dec); + if ($order->fixed_asset) { + label_cell(1, '', 'qty'); + hidden('qty', 1); + } else + qty_cells(null, 'qty', $_POST['qty'], null, null, $dec); if ($order->trans_no!=0) { qty_cell($line_no==-1 ? 0 :$order->line_items[$line_no]->qty_done, false, $dec); @@ -583,12 +573,15 @@ function display_delivery_details(&$order) if ($order->payment_terms['cash_sale']) { // Direct payment sale $Ajax->activate('items_table'); display_heading(_('Cash payment')); - start_table(TABLESTYLE2, "width=60%"); + start_table(TABLESTYLE2, "width='60%'"); locations_list_row(_("Deliver from Location:"), 'Location', null, false, true); - label_row(_("Cash account:"), $order->account_name); + if (list_updated('Location')) + $Ajax->activate('items_table'); + label_row(_("Cash account:"), $order->pos['bank_account_name']); textarea_row(_("Comments:"), "Comments", $order->Comments, 31, 5); end_table(); + hidden('delivery_date', $order->due_date); } else { if ($order->trans_type==ST_SALESINVOICE) { @@ -611,10 +604,18 @@ function display_delivery_details(&$order) $delname = _("Required Delivery Date").':'; } display_heading($title); - start_outer_table(TABLESTYLE2, "width=90%"); + start_outer_table(TABLESTYLE2, "width='90%'"); table_section(1); - locations_list_row(_("Deliver from Location:"), 'Location', null, false, true); + locations_list_row(_("Deliver from Location:"), 'Location', null, false, true, $order->fixed_asset); + if ($order->payment_terms['days_before_due'] == -1) + { + $Ajax->addUpdate('items_table', 'prep_amount', price_format($order->get_trans_total())); // bind to items_table update + if (!$order->is_started()) + amount_row(_("Pre-Payment Required:"), 'prep_amount'); + else + label_row(_("Pre-Payment Required:"), price_format($order->prep_amount), "class='label'"); + } if (list_updated('Location')) $Ajax->activate('items_table'); @@ -622,7 +623,7 @@ function display_delivery_details(&$order) date_row($delname, 'delivery_date', $order->trans_type==ST_SALESORDER ? _('Enter requested day of delivery') : $order->trans_type==ST_SALESQUOTE ? _('Enter Valid until Date') : ''); - text_row(_("Deliver To:"), 'deliver_to', $order->deliver_to, 40, 40, + text_row(_("Deliver To:"), 'deliver_to', $order->deliver_to, 50, 60, _('Additional identifier for delivery e.g. name of receiving person')); textarea_row(_("Address:"), 'delivery_address', $order->delivery_address, 35, 5, @@ -643,4 +644,3 @@ function display_delivery_details(&$order) div_end(); } -?> \ No newline at end of file