X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fui%2Fsales_order_ui.inc;h=b44cd305ba83460393a5038dea1366dc2b1d4948;hb=960bbc5e344bce59854afae242a269dd6b54671b;hp=dcea9477f0bc54f3f2275913d6774e47497c538c;hpb=bb591d97302d64e5b0078d5d4621e1e89d7820e5;p=fa-stable.git diff --git a/sales/includes/ui/sales_order_ui.inc b/sales/includes/ui/sales_order_ui.inc index dcea9477..b44cd305 100644 --- a/sales/includes/ui/sales_order_ui.inc +++ b/sales/includes/ui/sales_order_ui.inc @@ -90,6 +90,8 @@ 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']); + $order->credit = $myrow['cur_credit']; + if ($order->trans_type != ST_SALESORDER && $order->trans_type != ST_SALESQUOTE) { $order->dimension_id = $myrow['dimension_id']; @@ -104,24 +106,22 @@ function get_customer_details_to_order(&$order, $customer_id, $branch_id) $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"], $myrow["phone"], $myrow["email"]); + $myrow["tax_group_name"], @$contact[0]["phone"], @$contact[0]["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) { + if ($order->trans_type == ST_SALESINVOICE || $order->trans_type == ST_SALESORDER) { $order->due_date = get_invoice_duedate($order->payment, $order->document_date); -// if ($order->pos != -1) -// $order->cash = date_diff2($order->due_date, Today(), 'd')<2; } - if($order->cash ) { - if($order->pos != -1) { - $pos = get_sales_point($order->pos); - $order->set_location($pos["pos_location"], $pos["location_name"]); - } + 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"]); @@ -132,15 +132,15 @@ 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, $SysPrefs; + global $SysPrefs; display_heading($title); div_start('items_table'); - start_table("$table_style colspan=7 width=90%"); + start_table(TABLESTYLE, "colspan=7 width=90%"); $th = array(_("Item Code"), _("Item Description"), _("Quantity"), _("Delivered"), - _("Unit"), _("Price"), _("Discount %"), _("Total"), ""); + _("Unit"), $order->tax_included ? _("Price after Tax") : _("Price before Tax"), _("Discount %"), _("Total"), ""); if ($order->trans_no == 0) { unset( $th[3] ); @@ -227,9 +227,7 @@ function display_order_summary($title, &$order, $editable_items=false) 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); @@ -237,7 +235,7 @@ function display_order_summary($title, &$order, $editable_items=false) start_row(); label_cells(_("Amount Total"), $display_total, "colspan=$colspan align=right","align=right"); - submit_cells('update', _("Update"), "colspan=2", _("Refresh"), true); + submit_cells('update', _("Update"), "colspan=2 align='center'", _("Refresh"), true); end_row(); end_table(); @@ -254,9 +252,9 @@ 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, $SysPrefs; + global $Ajax, $SysPrefs; - start_outer_table("width=80% $table_style"); + start_outer_table(TABLESTYLE2, "width=80%"); table_section(1); @@ -313,7 +311,20 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group $_POST['deliver_to'] = $order->deliver_to; $_POST['delivery_address'] = $order->delivery_address; $_POST['phone'] = $order->phone; - if (get_post('payment') !== $order->payment) { + $_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'); @@ -360,38 +371,47 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group } } - ref_cells(_("Reference").':', 'ref', _('Reference number unique for this document type'), null, ''); + ref_row(_("Reference").':', 'ref', _('Reference number unique for this document type'), null, ''); + + table_section(2); if (!is_company_currency($order->customer_currency)) { - 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)); } - table_section(3); - if (($order->trans_type != ST_CUSTDELIVERY) && ($order->pos != -1)) { // editable payment type + customer_credit_row($_POST['customer_id'], $order->credit); + + label_row(_("Customer Discount:"), ($order->default_discount * 100) . "%"); + + table_section(3); + 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->cash = $order->payment_terms['cash_sale']; - if ($order->cash) { - $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']; + $order->due_date = get_invoice_duedate($order->payment, $order->document_date); + if ($order->payment_terms['cash_sale']) { + $order->cash_account = $order->pos['pos_account']; + $order->account_name = $order->pos['bank_account_name']; + $_POST['Location'] = $order->Location = $order->pos['pos_location']; + $order->location_name = $order->pos['location_name']; } $Ajax->activate('items_table'); $Ajax->activate('delivery'); - set_focus($order->pos == -1 ? 'delivery_date' : 'account'); } - sale_payment_list_cells(_('Payment:'), 'payment', null); + $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']); } + if($editable) { $str = sales_types_list_row(_("Price List"), 'sales_type', null, true); } else { @@ -405,8 +425,6 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group $change_prices = 1; } - label_row(_("Customer Discount:"), ($order->default_discount * 100) . "%"); - table_section(4); if ($editable) @@ -552,7 +570,7 @@ function sales_order_item_controls(&$order, &$rowcounter, $line_no=-1) } else { - submit_cells('AddItem', _("Add Item"), "colspan=2", + submit_cells('AddItem', _("Add Item"), "colspan=2 align='center'", _('Add new item to document'), true); } @@ -563,17 +581,17 @@ function sales_order_item_controls(&$order, &$rowcounter, $line_no=-1) function display_delivery_details(&$order) { - global $table_style2, $Ajax; + global $Ajax; div_start('delivery'); - if ($order->cash) { // Direct payment sale + + if ($order->payment_terms['cash_sale']) { // 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); + start_table(TABLESTYLE2, "width=60%"); - hidden('Location', $order->Location); + locations_list_row(_("Deliver from Location:"), 'Location', null, false, true); label_row(_("Cash account:"), $order->account_name); textarea_row(_("Comments:"), "Comments", $order->Comments, 31, 5); end_table(); @@ -599,11 +617,10 @@ function display_delivery_details(&$order) $delname = _("Required Delivery Date").':'; } display_heading($title); - start_outer_table("$table_style2 width=90%"); + start_outer_table(TABLESTYLE2, "width=90%"); table_section(1); - locations_list_row(_("Deliver from Location:"), 'Location', null, - false, true); + locations_list_row(_("Deliver from Location:"), 'Location', null, false, true); if (list_updated('Location')) $Ajax->activate('items_table');