X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fui%2Fsales_order_ui.inc;h=5ef26f8cad0e7b3386da24c41a4cf16b772416f4;hb=c2f32b7b39e8c21c29f66fee832938b2ad2f31cb;hp=56926b42a451e930747ec2d204ef29df8978849d;hpb=3a5c989060c96623b8f621ba89f8eb4405fb1588;p=fa-stable.git diff --git a/sales/includes/ui/sales_order_ui.inc b/sales/includes/ui/sales_order_ui.inc index 56926b42..5ef26f8c 100644 --- a/sales/includes/ui/sales_order_ui.inc +++ b/sales/includes/ui/sales_order_ui.inc @@ -57,7 +57,7 @@ function add_to_order(&$order, $new_item, $new_item_qty, $price, $discount) { if (strcasecmp($order_item->stock_id, $item['stock_id']) == 0) { - display_notification(_("For Part :").$item['stock_id']. " " + display_warning(_("For Part :").$item['stock_id']. " " . _("This item is already on this order. You have been warned.")); break; } @@ -80,7 +80,7 @@ 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."); - $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'], $myrow['pymt_discount']); @@ -106,10 +106,9 @@ function get_customer_details_to_order(&$order, $customer_id, $branch_id) $order->set_branch($branch_id, $myrow["tax_group_id"], $myrow["tax_group_name"], $myrow["phone"], $myrow["email"]); - $address = $myrow["br_post_address"]; + $address = trim($myrow["br_post_address"]) != '' ? $myrow["br_post_address"] + : (trim($myrow["br_address"]) != '' ? $myrow["br_address"]:$deliver); - if (strlen($address) <= 1) // if branch has no address - $address = $deliver; // set sales order address $order->set_delivery($myrow["default_ship_via"], $myrow["br_name"], $address); if ($order->trans_type == 10) { @@ -168,7 +167,8 @@ function display_order_summary($title, &$order, $editable_items=false) view_stock_status_cell($stock_item->stock_id); - label_cell($stock_item->item_description, "nowrap" ); + //label_cell($stock_item->item_description, "nowrap" ); + label_cell($stock_item->item_description ); qty_cell($stock_item->qty_dispatched, false, get_qty_dec($stock_item->stock_id)); if ($order->trans_no!=0) @@ -214,10 +214,10 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group { global $table_style, $Ajax; - start_table("width=80% $table_style"); - echo ""; // outer table - echo ""; + start_outer_table("width=80% $table_style"); + table_section(1); + $customer_error = ""; $change_prices = 0; @@ -308,28 +308,22 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group } // changed branch } - if ($_SESSION['Items']->trans_type!=30) { + if ($order->trans_type != 30) { ref_cells(_("Reference").':', 'ref', _('Reference number unique for this document type'), null, ''); } - echo "
"; - - echo ""; // outer table - if (!is_company_currency($order->customer_currency)) { + table_section(2); + 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)); - echo "
"; div_end(); - echo ""; // outer table } + table_section(3); - - echo ""; if ($order->trans_type == 10 && $order->pos != -1) { sale_payment_list_cells(_('Payment:'), 'cash', null, true); $cash_payment = get_post('cash', 0); @@ -364,11 +358,8 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group } label_row(_("Customer Discount:"), ($order->default_discount * 100) . "%"); - echo "
"; - - echo ""; // outer table - - echo ""; + + table_section(4); if ($editable) { @@ -378,7 +369,10 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group date_row($date_text, 'OrderDate', _('Date of order receive'), null, 0, 0, 0, null, true); if (isset($_POST['_OrderDate_changed'])) { - $change_prices = 1; + if (!is_company_currency($order->customer_currency) + && (get_base_sales_type()>0)) { + $change_prices = 1; + } $Ajax->activate('currency'); if ($order->trans_type == 10) { $_POST['delivery_date'] = get_invoice_duedate(get_post('customer_id'), get_post('OrderDate')); @@ -410,13 +404,10 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group if ($display_tax_group) { label_row(_("Tax Group:"), $order->tax_group_name); - hidden('tax_group_id', $_SESSION['Items']->tax_group_id); + hidden('tax_group_id', $order->tax_group_id); } - echo "
"; - - echo ""; - end_table(1); // outer table + end_outer_table(1); // outer table if ($change_prices != 0) { foreach ($order->line_items as $line_no=>$item) { @@ -447,10 +438,12 @@ function sales_order_item_controls(&$order, &$rowcounter, $line_no=-1) $_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['item_description'] = $order->line_items[$id]->item_description; $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"); + text_cells(null,'item_description', null, 45, 150); + //label_cell($order->line_items[$line_no]->item_description, "nowrap"); $Ajax->activate('items_table'); } else // prepare new line @@ -515,17 +508,17 @@ function display_delivery_details(&$order) { global $table_style2, $Ajax; -div_start('delivery'); + div_start('delivery'); if (get_post('cash', 0)) { // Direct payment sale display_heading(_('Cash payment')); - echo ""; + start_table("$table_style2 width=60%"); label_row(_("Deliver from Location:"), $order->location_name); hidden('Location', $order->Location); label_row(_("Cash account:"), $order->account_name); textarea_row(_("Comments:"), "Comments", $order->Comments, 31, 5); - echo "
"; + end_table(); } else { if ($order->trans_type==10) @@ -544,10 +537,8 @@ div_start('delivery'); $delname = _("Required Delivery Date").':'; } display_heading($title); - echo "
"; - start_table("$table_style2 width=90%"); - echo ""; // outer table - echo ""; + start_outer_table("$table_style2 width=90%"); + table_section(1); locations_list_row(_("Deliver from Location:"), 'Location', null, false, true); @@ -565,11 +556,7 @@ div_start('delivery'); text_row(_("Contact Phone Number:"), 'phone', $order->phone, 25, 25, _('Phone number of ordering person. Defaults to branch phone number')); - echo "
"; - - echo ""; // outer table - - echo ""; + table_section(2); text_row(_("Customer Reference:"), 'cust_ref', $order->cust_ref, 25, 25, _('Customer reference number for this order (if any)')); @@ -579,9 +566,8 @@ div_start('delivery'); price_format(get_post('freight_cost',0))); shippers_list_row(_("Shipping Company:"), 'ship_via', $order->ship_via); - echo "
"; - echo ""; - end_table(1); // outer table + + end_outer_table(1); } div_end(); } @@ -590,6 +576,7 @@ function check_qoh($order) { $msg = ''; foreach($order->line_items as $line_no => $line) { + if (!is_inventory_item($line['stock_id'])) continue; $qoh = get_qoh_on_date($line->stock_id, $_POST['Location'], $_POST['OrderDate']); if ($line->qty_dispatched > $qoh) { $msg .= $line->stock_id . " - " . $line->item_description . ": " .