X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fui%2Fsales_credit_ui.inc;h=9d9223f405e79dbbdcef86c8f8862963da57e180;hb=24fb0a10f96e0ffba9b877c662ae2bf9dc79256b;hp=d27fd0a90ebd6a64d0c210077c5edd6fc7c43083;hpb=e8ae3516539a520338117f25d401c0fc234973a4;p=fa-stable.git diff --git a/sales/includes/ui/sales_credit_ui.inc b/sales/includes/ui/sales_credit_ui.inc index d27fd0a9..9d9223f4 100644 --- a/sales/includes/ui/sales_credit_ui.inc +++ b/sales/includes/ui/sales_credit_ui.inc @@ -15,18 +15,18 @@ include_once($path_to_root . "/includes/ui.inc"); function display_credit_header(&$order) { - global $table_style, $Ajax; + global $Ajax, $Refs; - start_outer_table("width=80% $table_style"); + start_outer_table(TABLESTYLE, "width='80%'"); table_section(1); $customer_error = ""; $change_prices = 0; - if (!isset($_POST['customer_id']) && (get_global_customer() != reserved_words::get_all())) + if (!isset($_POST['customer_id']) && (get_global_customer() != ALL_TEXT)) $_POST['customer_id'] = get_global_customer(); - customer_list_row(_("Customer:"), 'customer_id', null, false, true); + customer_list_row(_("Customer:"), 'customer_id', null, false, true, false, true); if ($order->customer_id != $_POST['customer_id'] /*|| $order->sales_type != $_POST['sales_type_id']*/) { @@ -35,67 +35,61 @@ function display_credit_header(&$order) } customer_branches_list_row(_("Branch:"), $_POST['customer_id'], - 'branch_id', null, false, true, true); + 'branch_id', null, false, true, true, true); - //if (($_SESSION['credit_items']->order_no == 0) || - // ($order->customer_id != $_POST['customer_id']) || - // ($order->Branch != $_POST['branch_id'])) - // $customer_error = get_customer_details_to_order($order, $_POST['customer_id'], $_POST['branch_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; - $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) { - $change_prices = 1; - } - if ($old_order->sales_type != $order->sales_type) { - // || $old_order->default_discount!=$order->default_discount - $_POST['sales_type_id'] = $order->sales_type; - $Ajax->activate('sales_type_id'); - $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); - } + { + + $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; + $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) { + $change_prices = 1; + } + if ($old_order->sales_type != $order->sales_type) { + $_POST['sales_type_id'] = $order->sales_type; + $Ajax->activate('sales_type_id'); + $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']); if (!isset($_POST['ref'])) - $_POST['ref'] = references::get_next(11); + $_POST['ref'] = $Refs->get_next(ST_CUSTCREDIT, null, array('customer' => get_post('customer_id'), + 'branch' => get_post('branch_id'), 'date' => get_post('OrderDate'))); if ($order->trans_no==0) ref_row(_("Reference").':', 'ref'); else - label_row(_("Reference").':', $_POST['ref'] ); + label_row(_("Reference").':', $order->reference); if (!is_company_currency($order->customer_currency)) { table_section(2); - div_start('currency'); label_row(_("Customer Currency:"), $order->customer_currency); - exchange_rate_display($order->customer_currency, get_company_currency(), + exchange_rate_display(get_company_currency(), $order->customer_currency, $_POST['OrderDate']); - div_end(); } table_section(3); @@ -120,15 +114,15 @@ function display_credit_header(&$order) if (!isset($_POST['OrderDate']) || $_POST['OrderDate'] == "") $_POST['OrderDate'] = $order->document_date; - date_row(_("Date:"), 'OrderDate', '', null, 0, 0, 0, null, true); + date_row(_("Date:"), 'OrderDate', '', $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('currency'); + $Ajax->activate('_ex_rate'); } - // 2008-11-12 Joe Hunt added dimensions + // added dimensions $dim = get_company_pref('use_dimension'); if ($dim > 0) dimensions_list_row(_("Dimension").":", 'dimension_id', @@ -148,7 +142,6 @@ function display_credit_header(&$order) $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'); } @@ -161,13 +154,13 @@ function display_credit_header(&$order) function display_credit_items($title, &$order) { - global $table_style, $path_to_root; + global $path_to_root; display_heading($title); div_start('items_table'); - start_table("$table_style width=90%"); + start_table(TABLESTYLE, "width='90%'"); $th = array(_("Item Code"), _("Item Description"), _("Quantity"), _("Unit"), - _("Price"), _("Discount %"), _("Total"),''); + _("Price"), _("Discount %"), _("Total"),''); if (count($order->line_items)) $th[]= ''; @@ -178,7 +171,7 @@ function display_credit_items($title, &$order) $id = find_submit('Edit'); - foreach ($order->line_items as $line_no=>$line) + foreach ($order->get_items() as $line_no=>$line) { $line_total = round($line->qty_dispatched * $line->price * (1 - $line->discount_percent), user_price_dec()); @@ -214,22 +207,25 @@ function display_credit_items($title, &$order) if ($id==-1) credit_edit_item_controls($order, $k); + $colspan = 6; $display_sub_total = price_format($subtotal); - label_row(_("Sub-total"), $display_sub_total, "colspan=6 align=right", "align=right", 2); + label_row(_("Sub-total"), $display_sub_total, "colspan=$colspan align=right", "align=right", 2); if (!isset($_POST['ChargeFreightCost']) OR ($_POST['ChargeFreightCost'] == "")) - $_POST['ChargeFreightCost'] = price_format(0); - - amount_cells_ex(_("Shipping"), 'ChargeFreightCost', 8, 8, $_POST['ChargeFreightCost'], "colspan=6 align=right"); + $_POST['ChargeFreightCost'] = 0; + start_row(); + label_cell(_("Shipping"), "colspan=$colspan align=right"); + small_amount_cells(null, 'ChargeFreightCost', price_format(get_post('ChargeFreightCost',0))); label_cell('', 'colspan=2'); + end_row(); $taxes = $order->get_taxes($_POST['ChargeFreightCost']); - $tax_total = display_edit_tax_items($taxes, 6, $order->tax_included); + $tax_total = display_edit_tax_items($taxes, $colspan, $order->tax_included, 2); $display_total = price_format(($subtotal + $_POST['ChargeFreightCost'] + $tax_total)); - label_row(_("Credit Note Total"), $display_total, "colspan=6 align=right","class='amount'", 2); + label_row(_("Credit Note Total"), $display_total, "colspan=$colspan align=right","class='amount'", 2); end_table(); div_end(); @@ -246,10 +242,11 @@ function credit_edit_item_controls(&$order, $rowcounter, $line_no=-1) if ($line_no!=-1 && $line_no == $id) { $_POST['stock_id'] = $order->line_items[$id]->stock_id; + $dec = get_qty_dec($_POST['stock_id']); $_POST['qty'] = qty_format($order->line_items[$id]->qty_dispatched, $_POST['stock_id'], $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[$id]->item_description, "nowrap"); @@ -266,23 +263,25 @@ function credit_edit_item_controls(&$order, $rowcounter, $line_no=-1) } $item_info = get_item_edit_info($_POST['stock_id']); - $dec = $item_info['decimals']; + $dec = !$item_info ? 0 : $item_info['decimals']; $_POST['qty'] = number_format2(0, $dec); - $_POST['units'] = $item_info["units"]; - $_POST['price'] = price_format(get_price($_POST['stock_id'], $order->customer_currency, - $order->sales_type, $order->price_factor, $order->document_date)); - + $units = !$item_info ? "" : $item_info["units"]; + $price = get_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', $_POST['qty'], null, null, $dec); - label_cell($_POST['units']); - amount_cells(null, 'price', null); - small_amount_cells(null, 'Disc', percent_format(0), null, null, user_percent_dec()); + label_cell($units, '', 'units'); + amount_cells(null, 'price'); + small_amount_cells(null, 'Disc', percent_format($_POST['Disc']), null, null, user_percent_dec()); - amount_cell(input_num('qty') * input_num('price') * (1 - input_num('Disc')/100)); + amount_cell(input_num('qty') * input_num('price') * (1 - input_num('Disc')/100), false, '', 'line_total'); if ($id!=-1) { @@ -307,14 +306,14 @@ function credit_edit_item_controls(&$order, $rowcounter, $line_no=-1) function credit_options_controls($credit) { - global $table_style2, $Ajax; - echo "
"; + global $Ajax; + br(); -if (isset($_POST['_CreditType_update'])) - $Ajax->activate('options'); + if (isset($_POST['_CreditType_update'])) + $Ajax->activate('options'); - div_start('options'); - start_table("$table_style2"); + div_start('options'); + start_table(TABLESTYLE2); credit_type_list_row(_("Credit Note Type"), 'CreditType', null, true); @@ -340,4 +339,3 @@ if (isset($_POST['_CreditType_update'])) //--------------------------------------------------------------------------------- -?> \ No newline at end of file