X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fui%2Fsales_order_ui.inc;h=bb20dce6abf46658ea78a9c7f6d61a88e8385a22;hb=b0e112621af4ffcf4fed2264bffd0ebbda258a48;hp=23a2fc1878bd338dd0bd613298bf4ea0d2cd4f90;hpb=de3a75773afa86df1739d14f24399d6f7a46f809;p=fa-stable.git diff --git a/sales/includes/ui/sales_order_ui.inc b/sales/includes/ui/sales_order_ui.inc index 23a2fc18..bb20dce6 100644 --- a/sales/includes/ui/sales_order_ui.inc +++ b/sales/includes/ui/sales_order_ui.inc @@ -1,25 +1,73 @@ . +***********************************************************************/ 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='') { + // 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); - foreach ($order->line_items AS $order_item) - { - if (strcasecmp($order_item->stock_id, $new_item) == 0) + 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) { - display_notification(_("For Part :") . $new_item . " " . _("This item is already on this order. 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),$new_item, $new_item_qty, $price, $discount); } - //--------------------------------------------------------------------------------- function get_customer_details_to_order(&$order, $customer_id, $branch_id) @@ -33,44 +81,50 @@ function get_customer_details_to_order(&$order, $customer_id, $branch_id) 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'] == "") - { - $ret_error = _("The selected customer does not have any branches. Please create at least one branch."); - unset($_POST['branch_id']); - $order->Branch = 0; - } -*/ - $deliver = $myrow['address']; // in case no delivery address. + $deliver = $myrow['address']; // in case no branch address use company address - $order->set_customer($customer_id, $name, $myrow['curr_code'], $myrow['discount']); + $order->set_customer($customer_id, $name, $myrow['curr_code'], + $myrow['discount'], $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']); + $order->set_sales_type($myrow['salestype'], $myrow['sales_type'], $myrow['tax_included'], + $myrow['factor']); -// if ($order->Branch != 0) + if ($order->trans_type != ST_SALESORDER && $order->trans_type != ST_SALESQUOTE) { - $result = get_branch_to_order($customer_id, $branch_id); + $order->dimension_id = $myrow['dimension_id']; + $order->dimension2_id = $myrow['dimension2_id']; + } + $result = get_branch_to_order($customer_id, $branch_id); - if (db_num_rows($result) == 0) - { + 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->set_branch($branch_id, $myrow["tax_group_id"], - $myrow["tax_group_name"], $myrow["phone"], $myrow["email"]); + $myrow = db_fetch($result); - $address = $myrow["br_post_address"]; + $order->set_branch($branch_id, $myrow["tax_group_id"], + $myrow["tax_group_name"], $myrow["phone"], $myrow["email"]); - if (strlen($address) <= 1) // if branch has no address - $address = $deliver; // set sales order address + $address = trim($myrow["br_post_address"]) != '' ? $myrow["br_post_address"] + : (trim($myrow["br_address"]) != '' ? $myrow["br_address"]:$deliver); - $order->set_location($myrow["default_location"], $myrow["location_name"]); - $order->set_delivery($myrow["default_ship_via"], $myrow["br_name"], + $order->set_delivery($myrow["default_ship_via"], $myrow["br_name"], $address); + if ($order->trans_type == ST_SALESINVOICE) { + $order->due_date = get_invoice_duedate($customer_id, $order->document_date); + if ($order->pos != -1) + $order->cash = date_diff2($order->due_date, Today(), 'd')<2; } - + if($order->cash ) { + if($order->pos != -1) { + $paym = get_sales_point($order->pos); + $order->set_location($paym["pos_location"], $paym["location_name"]); + } + } else + $order->set_location($myrow["default_location"], $myrow["location_name"]); + return $ret_error; } @@ -78,46 +132,65 @@ 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; + global $table_style, $path_to_root, $SysPrefs; display_heading($title); + + div_start('items_table'); start_table("$table_style colspan=7 width=90%"); $th = array(_("Item Code"), _("Item Description"), _("Quantity"), _("Delivered"), _("Unit"), _("Price"), _("Discount %"), _("Total"), ""); - if ($order->trans_no==0) { + if ($order->trans_no == 0) { unset( $th[3] ); } - if (count($order->line_items)) $th[]= ''; + if (count($order->line_items)) + $th[]= ''; table_header($th); $total = 0; $k = 0; //row colour counter + $id = find_submit('Edit'); + $has_marked = false; foreach ($order->line_items as $line_no=>$stock_item) { - $line_total = $stock_item->qty_dispatched * $stock_item->price * (1 - $stock_item->discount_percent); - - if (!isset($_GET['Edit'])) - $id = -1; - else - $id = $_GET['Edit']; + $line_total = round($stock_item->qty_dispatched * $stock_item->price * (1 - $stock_item->discount_percent), + user_price_dec()); + $qoh_msg = ''; if (!$editable_items || $id != $line_no) { - alt_table_row_color($k); + 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 { + alt_table_row_color($k); + } view_stock_status_cell($stock_item->stock_id); - label_cell($stock_item->item_description); - qty_cell($stock_item->qty_dispatched); + //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) - amount_cell($stock_item->qty_done); + qty_cell($stock_item->qty_done, false, $dec); label_cell($stock_item->units); amount_cell($stock_item->price); @@ -127,168 +200,249 @@ function display_order_summary($title, &$order, $editable_items=false) if ($editable_items) { - edit_link_cell(SID . "Edit=$line_no"); - delete_link_cell(SID . "Delete=$line_no"); + 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, $line_no); + 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); - $display_total = price_format($total); - label_row(_("Total Excluding Shipping"), $display_total, "colspan=6 align=right", - "nowrap align=right"); + $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 = 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", _("Refresh"), true); + end_row(); end_table(); + if ($has_marked) { + 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(); } // ------------------------------------------------------------------------------ function display_order_header(&$order, $editable, $date_text, $display_tax_group=false) { - global $table_style; - start_table("width=80% $table_style"); - echo ""; // outer table - echo ""; + global $table_style, $Ajax, $SysPrefs; + + start_outer_table("width=80% $table_style"); + table_section(1); + $customer_error = ""; - $change_prices = 0; + $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; + //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->trans_type==10) - $_POST['delivery_date'] = $_SESSION['Items']->due_date = - get_invoice_duedate($_POST['customer_id'], $_POST['OrderDate']); - else - $_POST['delivery_date'] = $_SESSION['Items']->due_date = - add_days($_POST['OrderDate'], 10); // FIX this should be in company prefs - } - if ($order->customer_id != $_POST['customer_id']) + if ($order->customer_id != get_post('customer_id', -1)) { // customer has changed - - // 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'] = ""; - - customer_branches_list_row(_("Branch:"), $_POST['customer_id'], 'branch_id', null, false, true, true); - - if (!isset($_POST['branch_id']) || $_POST['branch_id'] == "") - { - $customer_error = _("The selected customer does not have any branches. Please create at least one branch."); - unset($_POST['branch_id']); - $order->Branch = 0; - } else + $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')) { - //set_global_customer($_POST['customer_id']); - if (($order->customer_id != $_POST['customer_id']) || - ($order->Branch != $_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['sales_type'] = $order->sales_type; - + if (get_post('cash') !== $order->cash) { + $_POST['cash'] = $order->cash; + $Ajax->activate('delivery'); + $Ajax->activate('cash'); + } 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 - || $old_order->sales_type!=$order->sales_type + 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 - set_global_customer($_POST['customer_id']); - } - - if ($_SESSION['Items']->trans_type!=30) { - ref_cells(_("Reference").':', 'ref', null, ''); + 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."); + + } } - echo "
"; - - echo ""; // outer table + ref_cells(_("Reference").':', 'ref', _('Reference number unique for this document type'), null, ''); if (!is_company_currency($order->customer_currency)) { - echo ""; + table_section(2); + label_row(_("Customer Currency:"), $order->customer_currency); exchange_rate_display($order->customer_currency, get_company_currency(), - ($editable ? $_POST['OrderDate'] : $order->document_date), $editable); - echo "
"; - echo ""; // outer table + ($editable ? $_POST['OrderDate'] : $order->document_date)); } + table_section(3); + + if ($order->trans_type == ST_SALESINVOICE && $order->pos != -1) { + sale_payment_list_cells(_('Payment:'), 'cash', null, true); + $cash_payment = get_post('cash', 0); + // current user can issue both credit and cash invoices + if ($order->cash != $cash_payment) { + $order->cash = $cash_payment; + if ($cash_payment) { + $paym = get_sales_point(user_pos()); + $order->cash_account = $paym['pos_account']; + $order->account_name = $paym['bank_account_name']; + $_POST['Location'] = $order->Location = $paym['pos_location']; + $order->location_name = $paym['location_name']; + } + $Ajax->activate('items_table'); + $Ajax->activate('delivery'); + set_focus($order->pos == -1 ? 'delivery_date' : 'account'); + } + } else + hidden('cash', $order->cash); - if( $order->sales_type != $_POST['sales_type']) { + 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['tax_included'], $myrow['factor']); + $Ajax->activate('sales_type'); $change_prices = 1; } - if($change_prices!=0) - { - foreach ($order->line_items as $line_no=>$item) { - $line = &$order->line_items[$line_no]; - $line->price = get_price($line->stock_id, $order->customer_currency, - $order->sales_type); - // $line->discount_percent = $order->default_discount; - } - } - - echo ""; - if($editable) - sales_types_list_row(_("Price List"), 'sales_type', $_POST['sales_type'], true); - else { - label_row(_("Price List:"), $order->sales_type_name); - } label_row(_("Customer Discount:"), ($order->default_discount * 100) . "%"); - echo "
"; - - echo ""; // outer table - - echo ""; + + table_section(4); if ($editable) { if (!isset($_POST['OrderDate']) || $_POST['OrderDate'] == "") $_POST['OrderDate'] = $order->document_date; - date_row($date_text, 'OrderDate'); + date_row($date_text, 'OrderDate', _('Date of order receive'), + $order->trans_no==0, 0, 0, 0, null, true); + if (isset($_POST['_OrderDate_changed'])) { + 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('customer_id'), 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 { @@ -298,94 +452,108 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group 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); - } + label_row(_("Tax Group:"), $order->tax_group_name); + hidden('tax_group_id', $order->tax_group_id); } - echo "
"; - echo ""; + end_outer_table(1); // outer table - end_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'); + } return $customer_error; } //-------------------------------------------------------------------------------- -function sales_order_item_controls(&$order, $line_no=-1) +function sales_order_item_controls(&$order, &$rowcounter, $line_no=-1) { - start_row(); - if (isset($_GET['Edit']) && $line_no != -1) + global $Ajax; + + alt_table_row_color($rowcounter); + + $id = find_submit('Edit'); + if ($line_no!=-1 && $line_no == $id) // edit old line { - if (!isset($_POST['stock_id'])) - $_POST['stock_id'] = $order->line_items[$_GET['Edit']]->stock_id; - if (!isset($_POST['qty']) || ($_POST['qty'] == "")) - $_POST['qty'] = qty_format($order->line_items[$_GET['Edit']]->qty_dispatched); - if (!isset($_POST['price']) || ($_POST['price'] == "")) - $_POST['price'] = price_format($order->line_items[$_GET['Edit']]->price); - if (!isset($_POST['Disc']) || ($_POST['Disc'] == "")) - $_POST['Disc'] = percent_format($order->line_items[$_GET['Edit']]->discount_percent*100); - - $_POST['units'] = $order->line_items[$_GET['Edit']]->units; + $_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[$line_no]->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']); + } +// } 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 + else // prepare new line { - global $no_item_list; - if ($no_item_list) - { - echo "\n"; - stock_items_list('stock_id', null, false, true); - echo "\n"; - } - else - { - 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)'"); + sales_items_list_cells(null,'stock_id', null, false, true); + if (list_updated('stock_id')) { + $Ajax->activate('price'); + $Ajax->activate('units'); + $Ajax->activate('qty'); + $Ajax->activate('line_total'); } - $item_info = get_item_edit_info($_POST['stock_id']); - $_POST['units'] = $item_info["units"]; - $_POST['qty'] = qty_format(1); - $_POST['price'] = price_format(get_price ($_POST['stock_id'], - $order->customer_currency, $order->sales_type)); + $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'] = percent_format($order->default_discount * 100); } - qty_cells(null, 'qty', qty_format($_POST['qty'])); + qty_cells(null, 'qty', $_POST['qty'], null, null, $dec); if ($order->trans_no!=0) { - amount_cell($line_no==-1 ? 0 :$order->line_items[$line_no]->qty_done); + qty_cell($line_no==-1 ? 0 :$order->line_items[$line_no]->qty_done, false, $dec); } - label_cell($_POST['units']); - amount_cells(null, 'price'); + label_cell($units, '', 'units'); + + $str = amount_cells(null, 'price'); + small_amount_cells(null, 'Disc', percent_format($_POST['Disc']), null, null, user_percent_dec()); - $line_total = $_POST['qty'] * $_POST['price'] * (1 - $_POST['Disc'] / 100); - amount_cell($line_total); + $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")); + 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", + _('Add new item to document'), true); } end_row(); @@ -395,58 +563,73 @@ function sales_order_item_controls(&$order, $line_no=-1) function display_delivery_details(&$order) { - global $table_style2; - if ($order->trans_type==10) - { - $title = _("Delivery Details"); - $delname = _("Due Date").':'; - } - elseif ($order->trans_type==13) - { - $title = _("Invoice Delivery Details"); - $delname = _("Invoice before").':'; - } - else - { - $title = _("Order Delivery Details"); - $delname = _("Required Delivery Date").':'; - } - display_heading($title); - echo "
"; - start_table("$table_style2 width=90%"); - echo ""; // outer table - - echo ""; + global $table_style2, $Ajax; -// echo $order->Location, $_POST['Location']; + div_start('delivery'); - locations_list_row(_("Deliver from Location:"), 'Location', $_POST['Location']); + if (get_post('cash', 0)) { // Direct payment sale + $Ajax->activate('items_table'); + display_heading(_('Cash payment')); + start_table("$table_style2 width=60%"); + label_row(_("Deliver from Location:"), $order->location_name); - date_row($delname, 'delivery_date', $order->due_date, 0, 0, 0); + hidden('Location', $order->Location); + label_row(_("Cash account:"), $order->account_name); + textarea_row(_("Comments:"), "Comments", $order->Comments, 31, 5); + end_table(); + } else { - text_row(_("Deliver To:"), 'deliver_to', $order->deliver_to, 40, 40); - - textarea_row(_("Address:"), 'delivery_address', $order->delivery_address, 35, 5); - text_row(_("Contact Phone Number:"), 'phone', $order->phone, 25, 25); + 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("$table_style2 width=90%"); + table_section(1); - echo "
"; + locations_list_row(_("Deliver from Location:"), 'Location', null, + false, true); + if (list_updated('Location')) + $Ajax->activate('items_table'); - echo ""; // outer table - echo ""; + 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')); - text_row(_("Customer Reference:"), 'cust_ref', $order->cust_ref, 25, 25); - textarea_row(_("Comments:"), "Comments", $order->Comments, 31, 5); + textarea_row(_("Address:"), 'delivery_address', $order->delivery_address, 35, 5, + _('Delivery address. Default is address of customer branch')); - small_amount_row(_("Shipping Charge:"), 'freight_cost', - price_format($_POST['freight_cost'])); + table_section(2); - shippers_list_row(_("Shipping Company:"), 'ship_via', $order->ship_via); + 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); - 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