X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fui%2Fsales_order_ui.inc;h=20509efcf373ba48fedd64c0148a925aac6acc5f;hb=fc24ee893402902fc58632dabb5d7c2594e191d0;hp=3f86df5e571f44d8fdb519a54f5515891b4e3178;hpb=37f4a02e0f4bea58e5b2097d583bf9395ffc515f;p=fa-stable.git diff --git a/sales/includes/ui/sales_order_ui.inc b/sales/includes/ui/sales_order_ui.inc index 3f86df5e..20509efc 100644 --- a/sales/includes/ui/sales_order_ui.inc +++ b/sales/includes/ui/sales_order_ui.inc @@ -1,100 +1,135 @@ . +***********************************************************************/ 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) +function add_to_order(&$order, $new_item, $new_item_qty, $price, $discount, $description='') { - $already_on_order = 0; - - foreach ($order->line_items AS $order_item) - { - if (strcasecmp($order_item->stock_id, $new_item) == 0) - { - $already_on_order = 1; - display_error(_("For Part :") . $new_item . " " . "This item is already on this order. You can change the quantity ordered of the existing line if necessary."); - } + // calculate item price to sum of kit element prices factor for + // value distribution over all exploded kit items + $std_price = get_kit_price($new_item, $order->customer_currency, + $order->sales_type, $order->price_factor, get_post('OrderDate'), true); + + if ($std_price == 0) + $price_factor = 0; + else + $price_factor = $price/$std_price; + + $kit = get_item_kit($new_item); + $item_num = db_num_rows($kit); + + while($item = db_fetch($kit)) { + $std_price = get_kit_price($item['stock_id'], $order->customer_currency, + $order->sales_type, $order->price_factor, get_post('OrderDate'), true); + + // rounding differences are included in last price item in kit + $item_num--; + if ($item_num) { + $price -= $item['quantity']*$std_price*$price_factor; + $item_price = $std_price*$price_factor; + } else { + if ($item['quantity']) + $price = $price/$item['quantity']; + $item_price = $price; + } + $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 + + // check duplicate stock item + foreach ($order->line_items as $order_item) + { + 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); + } } - - if ($already_on_order != 1) - { - $order->add_to_cart ($new_item, $new_item_qty, $price, $discount); - } /* end of if not already on the order */ } - //--------------------------------------------------------------------------------- function get_customer_details_to_order(&$order, $customer_id, $branch_id) { + global $SysPrefs; + $ret_error = ""; - // Now check to ensure this account is not on hold */ - $sql = "SELECT ".TB_PREF."debtors_master.name, ".TB_PREF."debtors_master.address, ".TB_PREF."credit_status.dissallow_invoices, - ".TB_PREF."debtors_master.sales_type AS salestype, ".TB_PREF."sales_types.sales_type, ".TB_PREF."debtors_master.curr_code, - ".TB_PREF."debtors_master.discount - FROM ".TB_PREF."debtors_master, ".TB_PREF."credit_status, ".TB_PREF."sales_types - WHERE ".TB_PREF."debtors_master.sales_type=".TB_PREF."sales_types.id - AND ".TB_PREF."debtors_master.credit_status=".TB_PREF."credit_status.id - AND ".TB_PREF."debtors_master.debtor_no = '" . $customer_id . "'"; - $result =db_query($sql,"Customer Record Retreive"); + $myrow = get_customer_to_order($customer_id); - $myrow = db_fetch($result); - - $order->customer_id = $customer_id; - $order->Branch = $branch_id; - $order->customer_name = $myrow['name']; + $name = $myrow['name']; if ($myrow['dissallow_invoices'] == 1) $ret_error = _("The selected customer account is currently on hold. Please contact the credit control personnel to discuss."); - if (!isset($_POST['branch_id']) || $_POST['branch_id'] == "") + $deliver = $myrow['address']; // in case no branch address use company address + + $order->set_customer($customer_id, $name, $myrow['curr_code'], + $myrow['discount'], $myrow['payment_terms'], $myrow['pymt_discount']); + + // the sales type determines the price list to be used by default + $order->set_sales_type($myrow['salestype'], $myrow['sales_type'], $myrow['tax_included'], + $myrow['factor']); + + $order->credit = $myrow['cur_credit']; + + if ($order->trans_type != ST_SALESORDER && $order->trans_type != ST_SALESQUOTE) { - $ret_error = _("The selected customer does not have any branches. Please create at least one branch."); - unset($_POST['branch_id']); - $order->Branch = ""; + $order->dimension_id = $myrow['dimension_id']; + $order->dimension2_id = $myrow['dimension2_id']; } + $result = get_branch_to_order($customer_id, $branch_id); - # the sales type determines the price list to be used by default - $order->default_sales_type = $myrow['salestype']; - $order->sales_type_name = $myrow['sales_type']; - $order->customer_currency = $myrow['curr_code']; - $order->default_discount = $myrow['discount']; - $deliver = $myrow['address']; // in case no deliveraddress. - - if ($order->Branch != "") + if (db_num_rows($result) == 0) { - # the branch was also selected from the customer selection so default the delivery details from the customer branches table cust_branch. The order process will ask for branch details later anyway - $sql = "SELECT ".TB_PREF."cust_branch.br_name, ".TB_PREF."cust_branch.br_post_address, phone, email, - default_location, default_ship_via, - ".TB_PREF."tax_groups.name AS tax_group_name, ".TB_PREF."tax_groups.id AS tax_group_id - FROM ".TB_PREF."cust_branch, ".TB_PREF."tax_groups - WHERE ".TB_PREF."cust_branch.tax_group_id = ".TB_PREF."tax_groups.id - AND ".TB_PREF."cust_branch.branch_code='" . $order->Branch . "' - AND ".TB_PREF."cust_branch.debtor_no = '" . $order->customer_id . "'"; - - $result = db_query($sql,"Customer Branch Record Retreive"); - - if (db_num_rows($result) == 0) - { - return _("The selected customer and branch are not valid, or the customer does not have any branches."); - } - - $myrow = db_fetch($result); - $order->deliver_to = $myrow["br_name"]; - $order->delivery_address = $myrow["br_post_address"]; - if (strlen($order->delivery_address) <= 1) - $order->delivery_address = $deliver; - $order->phone = $myrow["phone"]; - $order->email = $myrow["email"]; - $order->Location = $myrow["default_location"]; - $order->ship_via = $myrow["default_ship_via"]; - $order->tax_group_name = $myrow["tax_group_name"]; - $order->tax_group_id = $myrow["tax_group_id"]; + return _("The selected customer and branch are not valid, or the customer does not have any branches."); } + $myrow = db_fetch($result); + + // 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["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->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; } @@ -102,233 +137,425 @@ function get_customer_details_to_order(&$order, $customer_id, $branch_id) function display_order_summary($title, &$order, $editable_items=false) { - global $table_style, $path_to_root; display_heading($title); - start_table("$table_style colspan=7 width=90%"); + + div_start('items_table'); + start_table(TABLESTYLE, "width='90%'"); + $th = array(_("Item Code"), _("Item Description"), _("Quantity"), - _("Unit"), _("Price"), _("Discount %"), _("Total"), "", ""); - table_header($th); + _("Delivered"), + _("Unit"), $order->tax_included ? _("Price after Tax") : _("Price before Tax"), _("Discount %"), _("Total"), ""); + + if ($order->trans_no == 0) { + unset( $th[3] ); + } + + if (count($order->line_items)) + $th[]= ''; + + table_header($th); $total = 0; $k = 0; //row colour counter - foreach ($order->line_items as $stock_item) + $id = find_submit('Edit'); + + $low_stock = $order->check_qoh($_POST['OrderDate'], $_POST['Location']); + foreach ($order->get_items() as $line_no=>$stock_item) { - $line_total = $stock_item->quantity * $stock_item->price * (1 - $stock_item->discount_percent); + $line_total = round($stock_item->qty_dispatched * $stock_item->price * (1 - $stock_item->discount_percent), + user_price_dec()); - if (!isset($_GET['Edit'])) - $id = ""; - else - $id = $_GET['Edit']; - if (!$editable_items || $id != $stock_item->stock_id) + $qoh_msg = ''; + if (!$editable_items || $id != $line_no) { - alt_table_row_color($k); + 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); - qty_cell($stock_item->quantity); - label_cell($stock_item->units); - amount_cell($stock_item->price); - - amount_cell($stock_item->discount_percent * 100); - amount_cell($line_total); - - if ($editable_items) - { - edit_link_cell(SID . "Edit=$stock_item->stock_id"); - delete_link_cell(SID . "Delete=$stock_item->stock_id"); - } - end_row(); - } - else + + //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); + + if ($order->trans_no!=0) + qty_cell($stock_item->qty_done, false, $dec); + + label_cell($stock_item->units); + amount_cell($stock_item->price); + + percent_cell($stock_item->discount_percent * 100); + amount_cell($line_total); + + if ($editable_items) + { + edit_button_cell("Edit$line_no", _("Edit"), + _('Edit document line')); + delete_button_cell("Delete$line_no", _("Delete"), + _('Remove line from document')); + } + end_row(); + } + else { - sales_order_item_controls($order, $stock_item->stock_id); + sales_order_item_controls($order, $k, $line_no); } $total += $line_total; } - if (!isset($_GET['Edit']) && $editable_items) - sales_order_item_controls($order); + if ($id==-1 && $editable_items) + sales_order_item_controls($order, $k); + + $colspan = 6; + if ($order->trans_no!=0) + ++$colspan; + start_row(); + label_cell(_("Shipping Charge"), "colspan=$colspan align=right"); + small_amount_cells(null, 'freight_cost', price_format(get_post('freight_cost',0))); + label_cell('', 'colspan=2'); + end_row(); + $display_sub_total = price_format($total + input_num('freight_cost')); + 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 = number_format2($total,user_price_dec()); - label_row(_("Total Excluding Tax/Shipping"), $display_total, "colspan=6 align=right", - "nowrap align=right"); + $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"); + submit_cells('update', _("Update"), "colspan=2 align='center'", _("Refresh"), true); + end_row(); end_table(); + if ($low_stock) + display_note(_("Marked items have insufficient quantities in stock as on day of delivery."), 0, 1, "class='stockmankofg'"); + + div_end(); } // ------------------------------------------------------------------------------ -function display_order_header(&$order, $editable, $date_text, $display_tax_group=false) +function display_order_header(&$order, $editable, $date_text) { - global $table_style; - start_table("width=80% $table_style"); - echo ""; // outer table - echo ""; + global $Ajax, $SysPrefs; + + start_outer_table(TABLESTYLE2, "width='80%'"); + table_section(1); + $customer_error = ""; + $change_prices = 0; if (isset($order) && !$editable) { // can't change the customer/branch if items already received on this order - echo $order->customer_name . " - " . $order->deliver_to; - } - else + //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); + hidden('sales_type', $order->sales_type); + if ($order->trans_type != ST_SALESORDER && $order->trans_type != ST_SALESQUOTE) { + hidden('dimension_id', $order->dimension_id); // 2008-11-12 Joe Hunt + hidden('dimension2_id', $order->dimension2_id); + } + } + else { + customer_list_row(_("Customer:"), 'customer_id', null, false, true, false, true); - if (!isset($_POST['customer_id']) && (get_global_customer() != reserved_words::get_all())) - $_POST['customer_id'] = get_global_customer(); - - customer_list_row(_("Customer:"), 'customer_id', null, false, true); - - if (!isset($_POST['delivery_date'])) - { - if ($order->direct_invoice) - $_POST['delivery_date'] = $_SESSION['Items']->delivery_date = - get_invoice_duedate($_POST['customer_id'], $_POST['OrderDate']); - else - $_POST['delivery_date'] = $_SESSION['Items']->delivery_date = - add_days($_POST['OrderDate'], 10); - } - if ($order->customer_id != $_POST['customer_id']) + if ($order->customer_id != get_post('customer_id', -1)) { // customer has changed + $Ajax->activate('branch_id'); + } + customer_branches_list_row(_("Branch:"), + $_POST['customer_id'], 'branch_id', null, false, true, true, true); + + if( ($order->customer_id != get_post('customer_id', -1)) || + ($order->Branch != get_post('branch_id', -1)) || + list_updated('customer_id')) + { - // delete all the order items - drastic but necessary because of - // change of currency, sales type, etc - $order->clear_items(); - - // clear the branch selection - unset($_POST['branch_id']); + if (!isset($_POST['branch_id']) || $_POST['branch_id'] == "") + { + // ignore errors on customer search box call + if ($_POST['customer_id'] == '') + $customer_error = _("No customer found for entered text."); + else + $customer_error = _("The selected customer does not have any branches. Please create at least one branch."); + unset($_POST['branch_id']); + $order->Branch = 0; + } + else + { + + $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; + $_POST['deliver_to'] = $order->deliver_to; + $_POST['delivery_address'] = $order->delivery_address; + $_POST['phone'] = $order->phone; + $_POST['delivery_date'] = $order->due_date; + + if (!in_array($order->trans_type, array(ST_SALESQUOTE, ST_SALESORDER)) + && ($order->pos['cash_sale'] != $order->pos['credit_sale']) + && (($order->payment_terms['cash_sale'] && !$order->pos['cash_sale']) || + (!$order->payment_terms['cash_sale'] && !$order->pos['credit_sale']))) { + // force payment terms refresh if terms are editable + // and pos have no permitions for terms selected in customer record. + // Terms are set to first terms in allowed category below. + display_warning( + sprintf(_("Customer's payment terms '%s' cannot be selected on this POS"), + $order->payment_terms['terms'])); + $order->payment = ''; + } elseif (get_post('payment') !== $order->payment) { + $_POST['payment'] = $order->payment; + $Ajax->activate('delivery'); + $Ajax->activate('payment'); + } else { + if ($order->trans_type == ST_SALESINVOICE) + { + $_POST['delivery_date'] = $order->due_date; + $Ajax->activate('delivery_date'); + } + $Ajax->activate('Location'); + $Ajax->activate('deliver_to'); + $Ajax->activate('phone'); + $Ajax->activate('delivery_address'); + } + // change prices if necessary + // what about discount in template case? + if ($old_order->customer_currency != $order->customer_currency) { + $change_prices = 1; + } + if ($old_order->sales_type != $order->sales_type) { + // || $old_order->default_discount!=$order->default_discount + $_POST['sales_type'] = $order->sales_type; + $Ajax->activate('sales_type'); + $change_prices = 1; + } + if ($old_order->dimension_id != $order->dimension_id) { + $_POST['dimension_id'] = $order->dimension_id; + $Ajax->activate('dimension_id'); + } + if ($old_order->dimension2_id != $order->dimension2_id) { + $_POST['dimension2_id'] = $order->dimension2_id; + $Ajax->activate('dimension2_id'); + } + unset($old_order); + } + set_global_customer($_POST['customer_id']); + } // changed branch + else + { + $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."); } - - customer_branches_list_row(_("Branch:"), $_POST['customer_id'], 'branch_id', null, false, true, true); - - if (!isset($_POST['branch_id'])) - $_POST['branch_id'] = ""; - //set_global_customer($_POST['customer_id']); - if (($order->customer_id != $_POST['customer_id']) || - ($order->Branch != $_POST['branch_id'])) - $customer_error = get_customer_details_to_order($order, $_POST['customer_id'], $_POST['branch_id']); - - set_global_customer($_POST['customer_id']); } - echo "
"; - echo ""; // outer table + ref_row(_("Reference").':', 'ref', _('Reference number unique for this document type'), null, ''); + + 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))) { - echo ""; label_row(_("Customer Currency:"), $order->customer_currency); - exchange_rate_display($order->customer_currency, get_company_currency(), - ($editable?$_POST['OrderDate']:$order->orig_order_date), $editable); - echo "
"; - echo ""; // outer table + exchange_rate_display(get_company_currency(), $order->customer_currency, + ($editable ? $_POST['OrderDate'] : $order->document_date)); } - echo ""; - label_row(_("Sales Type:"), $order->sales_type_name); + customer_credit_row($_POST['customer_id'], $order->credit); + label_row(_("Customer Discount:"), ($order->default_discount * 100) . "%"); - echo "
"; - echo ""; // outer table + table_section(3); + start_row(); + if ($order->pos['cash_sale'] || $order->pos['credit_sale']) { + // 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']) { + $_POST['Location'] = $order->Location = $order->pos['pos_location']; + $order->location_name = $order->pos['location_name']; + } + $Ajax->activate('items_table'); + $Ajax->activate('delivery'); + } + $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); + } else { + label_cells(_('Payment:'), $order->payment_terms['terms']); + } + end_row(); + + if($editable) { + $str = sales_types_list_row(_("Price List:"), 'sales_type', null, true); + } else { + label_row(_("Price List:"), $order->sales_type_name); + } + if ($order->sales_type != $_POST['sales_type']) { + $myrow = get_sales_type($_POST['sales_type']); + $order->set_sales_type($myrow['id'], $myrow['sales_type'], + $myrow['tax_included'], $myrow['factor']); + $Ajax->activate('sales_type'); + $change_prices = 1; + } - echo ""; + table_section(4); - if ($editable) + if ($editable) { - if (!isset($_POST['OrderDate']) || $_POST['OrderDate'] == "") - $_POST['OrderDate'] = $order->orig_order_date; - - date_row($date_text, 'OrderDate'); + if (!isset($_POST['OrderDate']) || $_POST['OrderDate'] == "") + $_POST['OrderDate'] = $order->document_date; + + date_row($date_text, 'OrderDate', _('Date of order receive'), + $order->trans_no==0, 0, 0, 0, null, true); + if (isset($_POST['_OrderDate_changed']) || list_updated('payment')) { + if (!is_company_currency($order->customer_currency) + && (get_base_sales_type()>0)) { + $change_prices = 1; + } + $Ajax->activate('_ex_rate'); + if ($order->trans_type == ST_SALESINVOICE) { + $_POST['delivery_date'] = get_invoice_duedate(get_post('payment'), get_post('OrderDate')); + } else + $_POST['delivery_date'] = add_days(get_post('OrderDate'), $SysPrefs->default_delivery_required_by()); + $Ajax->activate('items_table'); + $Ajax->activate('delivery_date'); + } + if ($order->trans_type != ST_SALESORDER && $order->trans_type != ST_SALESQUOTE) + { // 2008-11-12 Joe Hunt added dimensions + $dim = get_company_pref('use_dimension'); + if ($dim > 0) + dimensions_list_row(_("Dimension").":", 'dimension_id', + null, true, ' ', false, 1, false); + else + hidden('dimension_id', 0); + if ($dim > 1) + dimensions_list_row(_("Dimension")." 2:", 'dimension2_id', + null, true, ' ', false, 2, false); + else + hidden('dimension2_id', 0); + } } - else + else { - label_row($date_text, $order->orig_order_date); - hidden('OrderDate', $order->orig_order_date); + label_row($date_text, $order->document_date); + hidden('OrderDate', $order->document_date); } - if ($display_tax_group) - { - if ($editable) - { - if (!isset($_POST['tax_group_id'])) - $_POST['tax_group_id'] = $_SESSION['Items']->tax_group_id; - tax_groups_list_row(_("Tax Group:"), 'tax_group_id', $_POST['tax_group_id'], true); - } - else - { - label_row(_("Tax Group:"), $order->tax_group_name); - hidden('tax_group_id', $_SESSION['Items']->tax_group_id); + end_outer_table(1); // outer table + + if ($change_prices != 0) { + foreach ($order->line_items as $line_no=>$item) { + $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'); } - echo "
"; - - echo ""; - - end_table(1); // outer table return $customer_error; } //-------------------------------------------------------------------------------- -function sales_order_item_controls(&$order, $stock_id=null) +function sales_order_item_controls(&$order, &$rowcounter, $line_no=-1) { - start_row(); - - if (isset($_GET['Edit']) && $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; - if (!isset($_POST['price']) || ($_POST['price'] == "")) - $_POST['price'] = $order->line_items[$_GET['Edit']]->price; - if (!isset($_POST['Disc']) || ($_POST['Disc'] == "")) - $_POST['Disc'] = ($order->line_items[$_GET['Edit']]->discount_percent)*100; + global $Ajax; - $_POST['units'] = $order->line_items[$_GET['Edit']]->units; + alt_table_row_color($rowcounter); + $id = find_submit('Edit'); + if ($line_no!=-1 && $line_no == $id) // edit old line + { + $_POST['stock_id'] = $order->line_items[$id]->stock_id; + $dec = get_qty_dec($_POST['stock_id']); + $_POST['qty'] = number_format2($order->line_items[$id]->qty_dispatched, $dec); + $_POST['price'] = price_format($order->line_items[$id]->price); + $_POST['Disc'] = percent_format($order->line_items[$id]->discount_percent*100); + $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[$stock_id]->item_description); - } - else + 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']); + } +// } 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 { - text_cells(null, "StockID2", "", 12, 10, "", "", "onkeyup='recalcAccounts();' onKeyDown='if(event.keyCode==13) event.keyCode=9;' onblur='return setAccount(0, true);'"); - stock_items_list_cells(null, 'stock_id', null, false, false, "onchange='return setAccount(1, true)'"); - $item_info = get_item_edit_info($_POST['stock_id']); - $_POST['units'] = $item_info["units"]; + 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'); + } - $_POST['qty'] = 1; - $_POST['price'] = get_price ($_POST['stock_id'], $order->customer_id); + $item_info = get_item_edit_info($_POST['stock_id']); + $units = $item_info["units"]; + $dec = $item_info['decimals']; + $_POST['qty'] = number_format2(1, $dec); + $price = get_kit_price($_POST['stock_id'], + $order->customer_currency, $order->sales_type, + $order->price_factor, get_post('OrderDate')); + $_POST['price'] = price_format($price); // default to the customer's discount % - $_POST['Disc'] = $order->default_discount * 100; + $_POST['Disc'] = percent_format($order->default_discount * 100); } - text_cells(null, 'qty', $_POST['qty'], 12, 15); + 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); + } + + label_cell($units, '', 'units'); - label_cell($_POST['units']); amount_cells(null, 'price'); - text_cells(null, 'Disc', $_POST['Disc'], 7, 5); - $line_total = $_POST['qty'] * $_POST['price'] * (1 - $_POST['Disc'] / 100); - amount_cell($line_total); + small_amount_cells(null, 'Disc', percent_format($_POST['Disc']), null, null, user_percent_dec()); + + $line_total = input_num('qty') * input_num('price') * (1 - input_num('Disc') / 100); - if (isset($_GET['Edit'])) + amount_cell($line_total, false, '','line_total'); + + if ($id!=-1) { - submit_cells('UpdateItem', _("Update")); - submit_cells('CancelItemChanges', _("Cancel")); - } - else + button_cell('UpdateItem', _("Update"), + _('Confirm changes'), ICON_UPDATE); + button_cell('CancelItemChanges', _("Cancel"), + _('Cancel changes'), ICON_CANCEL); + hidden('LineNo', $line_no); + set_focus('qty'); + } + else { - submit_cells('AddItem', _("Add Item"), "colspan=2"); + submit_cells('AddItem', _("Add Item"), "colspan=2 align='center'", + _('Add new item to document'), true); } end_row(); @@ -338,51 +565,75 @@ function sales_order_item_controls(&$order, $stock_id=null) function display_delivery_details(&$order) { - global $table_style2; + global $Ajax; - if ($order->direct_invoice) - { - $title = _("Invoice Delivery Details"); - $delname = _("Due Date"); - } - else - { - $title = _("Order Delivery Details"); - $delname = _("Required Delivery Date:"); - } - display_heading($title); - echo "
"; - start_table("$table_style2 width=90%"); - echo ""; // outer table + div_start('delivery'); - echo ""; - locations_list_row(_("Deliver from Location:"), 'Location', $order->Location); - date_row($delname, 'delivery_date', $order->delivery_date, 0, 0, 0); + if ($order->payment_terms['cash_sale']) { // Direct payment sale + $Ajax->activate('items_table'); + display_heading(_('Cash payment')); + start_table(TABLESTYLE2, "width='60%'"); - text_row(_("Deliver To:"), 'deliver_to', $order->deliver_to, 40, 40); + locations_list_row(_("Deliver from Location:"), 'Location', null, false, true); + 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) + { + $title = _("Delivery Details"); + $delname = _("Due Date").':'; + } + elseif ($order->trans_type==ST_CUSTDELIVERY) + { + $title = _("Invoice Delivery Details"); + $delname = _("Invoice before").':'; + } + elseif ($order->trans_type==ST_SALESQUOTE) + { + $title = _("Quotation Delivery Details"); + $delname = _("Valid until").':'; + } + else + { + $title = _("Order Delivery Details"); + $delname = _("Required Delivery Date").':'; + } + display_heading($title); + start_outer_table(TABLESTYLE2, "width='90%'"); + table_section(1); - textarea_row(_("Address:"), 'delivery_address', $order->delivery_address, 35, 5); - text_row(_("Contact Phone Number:"), 'phone', $order->phone, 25, 25); + locations_list_row(_("Deliver from Location:"), 'Location', null, false, true); + if (list_updated('Location')) + $Ajax->activate('items_table'); - echo "
"; - echo ""; // outer table + 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, + _('Additional identifier for delivery e.g. name of receiving person')); - echo ""; + textarea_row(_("Address:"), 'delivery_address', $order->delivery_address, 35, 5, + _('Delivery address. Default is address of customer branch')); - text_row(_("Customer Reference:"), 'cust_ref', $order->cust_ref, 25, 25); - textarea_row(_("Comments:"), "Comments", $order->Comments, 31, 5); + table_section(2); - text_row(_("Shipping Charge:"), 'freight_cost', $order->freight_cost, 10, 10); + text_row(_("Contact Phone Number:"), 'phone', $order->phone, 25, 25, + _('Phone number of ordering person. Defaults to branch phone number')); + text_row(_("Customer Reference:"), 'cust_ref', $order->cust_ref, 25, 25, + _('Customer reference number for this order (if any)')); + textarea_row(_("Comments:"), "Comments", $order->Comments, 31, 5); - shippers_list_row(_("Shipping Company:"), 'ship_via', $order->ship_via); - if ($_SESSION['Items']->direct_invoice) - textarea_row(_("Memo"), 'InvoiceText', null, 31, 3); - echo "
"; + shippers_list_row(_("Shipping Company:"), 'ship_via', $order->ship_via); - echo ""; - end_table(1); // outer table + end_outer_table(1); + } + div_end(); } ?> \ No newline at end of file