X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fui%2Fsales_order_ui.inc;h=2b2b028465ea5d045677f52ec424a38fa8f3bd29;hb=66626dafdf0a397406e36663f3ed15321d09984a;hp=a58cb9ee0f26d3c31955bbfb9e147c175128314b;hpb=5af53b13622ca77bc851cccaa087d7e2aedc3401;p=fa-stable.git diff --git a/sales/includes/ui/sales_order_ui.inc b/sales/includes/ui/sales_order_ui.inc index a58cb9ee..2b2b0284 100644 --- a/sales/includes/ui/sales_order_ui.inc +++ b/sales/includes/ui/sales_order_ui.inc @@ -4,7 +4,6 @@ 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) { @@ -33,19 +32,13 @@ 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. $order->set_customer($customer_id, $name, $myrow['curr_code'], $myrow['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) { @@ -69,6 +62,8 @@ function get_customer_details_to_order(&$order, $customer_id, $branch_id) $order->set_location($myrow["default_location"], $myrow["location_name"]); $order->set_delivery($myrow["default_ship_via"], $myrow["br_name"], $address); + if ($order->trans_type == 10) + $order->due_date = get_invoice_duedate($customer_id, $order->document_date); } return $ret_error; @@ -78,19 +73,22 @@ 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, $Ajax; 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); @@ -98,7 +96,6 @@ function display_order_summary($title, &$order, $editable_items=false) $k = 0; //row colour counter $id = find_submit('Edit'); - foreach ($order->line_items as $line_no=>$stock_item) { @@ -113,10 +110,10 @@ function display_order_summary($title, &$order, $editable_items=false) view_stock_status_cell($stock_item->stock_id); label_cell($stock_item->item_description, "nowrap" ); - qty_cell($stock_item->qty_dispatched); + qty_cell($stock_item->qty_dispatched, false, get_qty_dec($stock_item->stock_id)); if ($order->trans_no!=0) - amount_cell($stock_item->qty_done); + amount_cell($stock_item->qty_done); label_cell($stock_item->units); amount_cell($stock_item->price); @@ -126,8 +123,10 @@ function display_order_summary($title, &$order, $editable_items=false) if ($editable_items) { - edit_button_cell("Edit$line_no", _("Edit")); - edit_button_cell("Delete$line_no", _("Delete")); + edit_button_cell("Edit$line_no", _("Edit"), + _('Edit document line')); + edit_button_cell("Delete$line_no", _("Delete"), + _('Remove line from document')); } end_row(); } @@ -147,19 +146,21 @@ function display_order_summary($title, &$order, $editable_items=false) "nowrap align=right", 2); end_table(); + div_end(); } // ------------------------------------------------------------------------------ function display_order_header(&$order, $editable, $date_text, $display_tax_group=false) { - global $table_style; + global $table_style, $Ajax; + start_table("width=80% $table_style"); echo ""; // outer table echo ""; $customer_error = ""; - $change_prices = 0; + $change_prices = 0; if (isset($order) && !$editable) { @@ -171,67 +172,67 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group } else { - - 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 - // clear the branch selection - unset($_POST['branch_id']); - } - if (!isset($_POST['branch_id'])) - $_POST['branch_id'] = ""; + $Ajax->activate('branch_id'); + } + customer_branches_list_row(_("Branch:"), + $_POST['customer_id'], 'branch_id', null, false, true, true); - customer_branches_list_row(_("Branch:"), $_POST['customer_id'], 'branch_id', null, false, true, true); + if( ($order->customer_id != get_post('customer_id', -1)) || + ($order->Branch != get_post('branch_id', -1)) || + list_updated('customer_id')) { 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; + // 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 { - //set_global_customer($_POST['customer_id']); - if (($order->customer_id != $_POST['customer_id']) || - ($order->Branch != $_POST['branch_id'])) { $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 ($order->trans_type == 10) + { + $_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 - ) { - $change_prices = 1; + $_POST['sales_type'] = $order->sales_type; + $Ajax->activate('sales_type'); + $change_prices = 1; } - + unset($old_order); } - } // changed branch set_global_customer($_POST['customer_id']); + } // changed branch } if ($_SESSION['Items']->trans_type!=30) { - ref_cells(_("Reference").':', 'ref', null, ''); + ref_cells(_("Reference").':', 'ref', _('Reference number unique for this document type'), null, ''); } echo "
"; @@ -240,37 +241,31 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group if (!is_company_currency($order->customer_currency)) { + div_start('currency'); echo ""; label_row(_("Customer Currency:"), $order->customer_currency); exchange_rate_display($order->customer_currency, get_company_currency(), - ($editable ? $_POST['OrderDate'] : $order->document_date), $editable); + ($editable ? $_POST['OrderDate'] : $order->document_date)); echo "
"; + div_end(); echo ""; // outer table } - if( $order->sales_type != $_POST['sales_type']) { + + echo ""; + 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 "
"; @@ -283,7 +278,17 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group 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'), null, 0, 0, 0, null, true); + if (isset($_POST['_OrderDate_changed'])) { + $change_prices = 1; + $Ajax->activate('currency'); + if ($order->trans_type == 10) { + $_POST['delivery_date'] = get_invoice_duedate(get_post('customer_id'), get_post('OrderDate')); + } else + $_POST['delivery_date'] = add_days(get_post('OrderDate'), sys_prefs::default_delivery_required_by()); + $Ajax->activate('delivery_date'); + } } else { @@ -302,6 +307,16 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group 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_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; } @@ -309,67 +324,76 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group function sales_order_item_controls(&$order, &$rowcounter, $line_no=-1) { + global $Ajax; + alt_table_row_color($rowcounter); $id = find_submit('Edit'); if ($line_no!=-1 && $line_no == $id) { $_POST['stock_id'] = $order->line_items[$id]->stock_id; - $_POST['qty'] = qty_format($order->line_items[$id]->qty_dispatched); + $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); - $_POST['units'] = $order->line_items[$id]->units; + $units = $order->line_items[$id]->units; hidden('stock_id', $_POST['stock_id']); label_cell($_POST['stock_id']); label_cell($order->line_items[$line_no]->item_description, "nowrap"); + $Ajax->activate('items_table'); } else { - 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, "", "", "class='combo' rel='stock_id'"/* onblur='this.form.submit();'"*/); - stock_items_list_cells(null, 'stock_id', null, false, false, "class='combo' rel='StockID2'"); + stock_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"]; + $units = $item_info["units"]; + $dec = get_qty_dec($_POST['stock_id']); + $_POST['qty'] = number_format2(1, $dec); - $_POST['qty'] = qty_format(1); $_POST['price'] = price_format(get_price ($_POST['stock_id'], - $order->customer_currency, $order->sales_type)); + $order->customer_currency, $order->sales_type, + $order->price_factor, get_post('OrderDate'))); // 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); + + amount_cell($line_total, false, '','line_total'); if ($id!=-1) { - edit_button_cell('UpdateItem', _("Update")); - edit_button_cell('CancelItemChanges', _("Cancel")); + edit_button_cell('UpdateItem', _("Update"), + _('Confirm changes')); + edit_button_cell('CancelItemChanges', _("Cancel"), + _('Cancel changes')); 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(); @@ -402,16 +426,18 @@ function display_delivery_details(&$order) echo ""; -// echo $order->Location, $_POST['Location']; - - locations_list_row(_("Deliver from Location:"), 'Location', $_POST['Location']); + locations_list_row(_("Deliver from Location:"), 'Location', $order->Location); - date_row($delname, 'delivery_date', $order->due_date, 0, 0, 0); + date_row($delname, 'delivery_date', + _('Enter requested day of delivery'), $order->due_date, 0, 0, 0); - text_row(_("Deliver To:"), 'deliver_to', $order->deliver_to, 40, 40); + text_row(_("Deliver To:"), 'deliver_to', $order->deliver_to, 40, 40, + _('Additional identifier for delivery e.g. name of receiving person')); - textarea_row(_("Address:"), 'delivery_address', $order->delivery_address, 35, 5); - text_row(_("Contact Phone Number:"), 'phone', $order->phone, 25, 25); + textarea_row(_("Address:"), 'delivery_address', $order->delivery_address, 35, 5, + _('Delivery address. Default is address of customer branch')); + text_row(_("Contact Phone Number:"), 'phone', $order->phone, 25, 25, + _('Phone number of ordering person. Defaults to branch phone number')); echo "
"; @@ -419,11 +445,12 @@ function display_delivery_details(&$order) echo ""; - text_row(_("Customer Reference:"), 'cust_ref', $order->cust_ref, 25, 25); + 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); - small_amount_row(_("Shipping Charge:"), 'freight_cost', - price_format($_POST['freight_cost'])); + small_amount_row(_("Shipping Charge:"), 'freight_cost', + price_format(get_post('freight_cost',0))); shippers_list_row(_("Shipping Company:"), 'ship_via', $order->ship_via);