X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fui%2Fsales_order_ui.inc;h=bb20dce6abf46658ea78a9c7f6d61a88e8385a22;hb=b0e112621af4ffcf4fed2264bffd0ebbda258a48;hp=49cc8b736f99d30aae61f4525991c82a75789897;hpb=26f7d5bdd85e7717436e3dcb67c9a6be1fe20e15;p=fa-stable.git diff --git a/sales/includes/ui/sales_order_ui.inc b/sales/includes/ui/sales_order_ui.inc index 49cc8b73..bb20dce6 100644 --- a/sales/includes/ui/sales_order_ui.inc +++ b/sales/includes/ui/sales_order_ui.inc @@ -1,24 +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) @@ -32,7 +81,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']); @@ -41,6 +90,11 @@ function get_customer_details_to_order(&$order, $customer_id, $branch_id) $order->set_sales_type($myrow['salestype'], $myrow['sales_type'], $myrow['tax_included'], $myrow['factor']); + if ($order->trans_type != ST_SALESORDER && $order->trans_type != ST_SALESQUOTE) + { + $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) @@ -53,16 +107,15 @@ 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) { + if ($order->trans_type == ST_SALESINVOICE) { $order->due_date = get_invoice_duedate($customer_id, $order->document_date); if ($order->pos != -1) - $order->cash = date_diff($order->due_date, Today(), 'd')<2; + $order->cash = date_diff2($order->due_date, Today(), 'd')<2; } if($order->cash ) { if($order->pos != -1) { @@ -79,7 +132,7 @@ 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); @@ -102,24 +155,42 @@ 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) { $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, "nowrap" ); - qty_cell($stock_item->qty_dispatched, false, get_qty_dec($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); 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); @@ -131,7 +202,7 @@ function display_order_summary($title, &$order, $editable_items=false) { edit_button_cell("Edit$line_no", _("Edit"), _('Edit document line')); - edit_button_cell("Delete$line_no", _("Delete"), + delete_button_cell("Delete$line_no", _("Delete"), _('Remove line from document')); } end_row(); @@ -147,11 +218,35 @@ function display_order_summary($title, &$order, $editable_items=false) 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", 2); + $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(); } @@ -159,26 +254,31 @@ function display_order_summary($title, &$order, $editable_items=false) function display_order_header(&$order, $editable, $date_text, $display_tax_group=false) { - global $table_style, $Ajax; + global $table_style, $Ajax, $SysPrefs; - 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; 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); + customer_list_row(_("Customer:"), 'customer_id', null, false, true, false, true); if ($order->customer_id != get_post('customer_id', -1)) { @@ -186,27 +286,29 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group $Ajax->activate('branch_id'); } customer_branches_list_row(_("Branch:"), - $_POST['customer_id'], 'branch_id', null, false, true, true); + $_POST['customer_id'], 'branch_id', null, false, true, true, true); - if( ($order->customer_id != get_post('customer_id', -1)) || + 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'] == "") + list_updated('customer_id')) { - // ignore errors on customer search box call - if ($_POST['customer_id'] == '') - $customer_error = _("No customer found for entered text."); + + 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 - $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']); + $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; @@ -216,7 +318,7 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group $Ajax->activate('delivery'); $Ajax->activate('cash'); } else { - if ($order->trans_type == 10) + if ($order->trans_type == ST_SALESINVOICE) { $_POST['delivery_date'] = $order->due_date; $Ajax->activate('delivery_date'); @@ -229,43 +331,48 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group // change prices if necessary // what about discount in template case? if ($old_order->customer_currency != $order->customer_currency) { - $change_prices = 1; + $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; + $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']); + 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."); + + } } - if ($_SESSION['Items']->trans_type!=30) { - ref_cells(_("Reference").':', 'ref', _('Reference number unique for this document type'), null, ''); - } - - echo "
"; - - echo ""; // outer table + ref_cells(_("Reference").':', 'ref', _('Reference number unique for this document type'), null, ''); if (!is_company_currency($order->customer_currency)) { - div_start('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)); - echo "
"; - div_end(); - echo ""; // outer table } + table_section(3); - - echo ""; - if ($order->trans_type == 10 && $order->pos != -1) { + 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 @@ -278,7 +385,7 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group $_POST['Location'] = $order->Location = $paym['pos_location']; $order->location_name = $paym['location_name']; } - check_qoh($order); + $Ajax->activate('items_table'); $Ajax->activate('delivery'); set_focus($order->pos == -1 ? 'delivery_date' : 'account'); } @@ -299,28 +406,43 @@ 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) { if (!isset($_POST['OrderDate']) || $_POST['OrderDate'] == "") $_POST['OrderDate'] = $order->document_date; - date_row($date_text, 'OrderDate', - _('Date of order receive'), null, 0, 0, 0, null, true); + date_row($date_text, 'OrderDate', _('Date of order receive'), + $order->trans_no==0, 0, 0, 0, null, true); if (isset($_POST['_OrderDate_changed'])) { - $change_prices = 1; - $Ajax->activate('currency'); - if ($order->trans_type == 10) { + 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'), sys_prefs::default_delivery_required_by()); + $_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 { @@ -331,18 +453,15 @@ 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) { $line = &$order->line_items[$line_no]; - $line->price = get_price($line->stock_id, $order->customer_currency, + $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; } @@ -361,7 +480,7 @@ function sales_order_item_controls(&$order, &$rowcounter, $line_no=-1) alt_table_row_color($rowcounter); $id = find_submit('Edit'); - if ($line_no!=-1 && $line_no == $id) + 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']); @@ -369,14 +488,24 @@ function sales_order_item_controls(&$order, &$rowcounter, $line_no=-1) $_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, "nowrap"); + 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 { - stock_items_list_cells(null,'stock_id', null, false, true); + sales_items_list_cells(null,'stock_id', null, false, true); if (list_updated('stock_id')) { $Ajax->activate('price'); $Ajax->activate('units'); @@ -386,15 +515,14 @@ function sales_order_item_controls(&$order, &$rowcounter, $line_no=-1) $item_info = get_item_edit_info($_POST['stock_id']); $units = $item_info["units"]; - $dec = get_qty_dec($_POST['stock_id']); + $dec = $item_info['decimals']; $_POST['qty'] = number_format2(1, $dec); - - $_POST['price'] = price_format(get_price ($_POST['stock_id'], + $price = get_kit_price($_POST['stock_id'], $order->customer_currency, $order->sales_type, - $order->price_factor, get_post('OrderDate'))); + $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', $_POST['qty'], null, null, $dec); @@ -415,10 +543,10 @@ function sales_order_item_controls(&$order, &$rowcounter, $line_no=-1) if ($id!=-1) { - edit_button_cell('UpdateItem', _("Update"), - _('Confirm changes')); - edit_button_cell('CancelItemChanges', _("Cancel"), - _('Cancel changes')); + button_cell('UpdateItem', _("Update"), + _('Confirm changes'), ICON_UPDATE); + button_cell('CancelItemChanges', _("Cancel"), + _('Cancel changes'), ICON_CANCEL); hidden('LineNo', $line_no); set_focus('qty'); } @@ -437,93 +565,71 @@ function display_delivery_details(&$order) { global $table_style2, $Ajax; -div_start('delivery'); + div_start('delivery'); if (get_post('cash', 0)) { // Direct payment sale + $Ajax->activate('items_table'); 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) + if ($order->trans_type==ST_SALESINVOICE) { $title = _("Delivery Details"); $delname = _("Due Date").':'; } - elseif ($order->trans_type==13) + 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); - 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); if (list_updated('Location')) - check_qoh($order); + $Ajax->activate('items_table'); + date_row($delname, 'delivery_date', - $order->trans_type==30 ? _('Enter requested day of delivery') : '', - $order->due_date, 0, 0, 0); + $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')); 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 "
"; - - echo ""; // outer table - - echo ""; + table_section(2); + 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); - small_amount_row(_("Shipping Charge:"), 'freight_cost', - 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(); } -function check_qoh($order) -{ - $msg = ''; - foreach($order->line_items as $line_no => $line) { - $qoh = get_qoh_on_date($line->stock_id, $_POST['Location'], $_POST['OrderDate']); - if ($line->qty_dispatched > $qoh) { - $msg .= $line->stock_id . " - " . $line->item_description . ": " . - _("Quantity On Hand") . " = " - . number_format2($qoh, get_qty_dec($line->stock_id)) . '
'; - } - } - if (strlen($msg)) { - display_error(_("The delivery cannot be processed because there is an insufficient quantity for item:") - . '
'. $msg); - return false; - } - return true; -} ?> \ No newline at end of file