X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fui%2Fsales_credit_ui.inc;h=ccc69d70aab43107c55df127768983612d1dde50;hb=22486f7826944e00937e7ccceab1a927c94d8f6a;hp=be4adbf3060af84870e41abb06245b1d856f8830;hpb=1abdb8eb040311a301f60ad005690bef842e116f;p=fa-stable.git diff --git a/sales/includes/ui/sales_credit_ui.inc b/sales/includes/ui/sales_credit_ui.inc index be4adbf3..ccc69d70 100644 --- a/sales/includes/ui/sales_credit_ui.inc +++ b/sales/includes/ui/sales_credit_ui.inc @@ -1,23 +1,32 @@ . +***********************************************************************/ include_once($path_to_root . "/includes/ui.inc"); // ------------------------------------------------------------------------------ function display_credit_header(&$order) { - global $table_style, $Ajax; - start_table("width=80% $table_style"); - echo ""; // outer table - echo ""; + global $Ajax, $Refs; + + 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']*/) { @@ -26,7 +35,7 @@ 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']) || @@ -58,36 +67,35 @@ function display_credit_header(&$order) $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); - if ($_SESSION['Items']->trans_no==0) + $_POST['ref'] = $Refs->get_next(ST_CUSTCREDIT); + if ($order->trans_no==0) ref_row(_("Reference").':', 'ref'); else - label_row(_("Reference").':', $_POST['ref'] ); + label_row(_("Reference").':', $order->reference); - - echo "
"; - - echo ""; // outer table - 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(), + exchange_rate_display(get_company_currency(), $order->customer_currency, $_POST['OrderDate']); - echo "
"; - echo ""; // outer table - div_end(); } - - echo ""; + table_section(3); if (!isset($_POST['sales_type_id'])) $_POST['sales_type_id'] = $order->sales_type; @@ -101,28 +109,37 @@ function display_credit_header(&$order) $change_prices = 1; } - label_row(_("Customer Discount:"), ($order->default_discount * 100) . "%"); - echo "
"; + shippers_list_row(_("Shipping Company:"), 'ShipperID', $order->ship_via); - echo ""; // outer table + label_row(_("Customer Discount:"), ($order->default_discount * 100) . "%"); - echo ""; + table_section(4); 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'])) { - $change_prices = 1; - $Ajax->activate('currency'); + if (!is_company_currency($order->customer_currency) + && (get_base_sales_type()>0)) { + $change_prices = 1; + } + $Ajax->activate('_ex_rate'); } - shippers_list_row(_("Shipping Company:"), 'ShipperID', $order->ship_via); - - echo "
"; - - echo ""; + // 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); - end_table(1); // outer table + end_outer_table(1); // outer table if ($change_prices != 0) { foreach ($order->line_items as $line_no=>$item) { @@ -142,11 +159,11 @@ 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"),''); @@ -159,7 +176,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()); @@ -168,18 +185,18 @@ function display_credit_items($title, &$order) { alt_table_row_color($k); - label_cell("$line->stock_id"); + label_cell("$line->stock_id"); label_cell($line->item_description, "nowrap"); qty_cell($line->qty_dispatched, false, get_qty_dec($line->stock_id)); label_cell($line->units); amount_cell($line->price); - amount_cell($line->discount_percent * 100); + percent_cell($line->discount_percent * 100); amount_cell($line_total); 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(); @@ -195,22 +212,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, $_SESSION['Items']->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(); @@ -227,10 +247,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"); @@ -247,29 +268,32 @@ function credit_edit_item_controls(&$order, $rowcounter, $line_no=-1) } $item_info = get_item_edit_info($_POST['stock_id']); - $_POST['units'] = $item_info["units"]; - $_POST['qty'] = qty_format(0, $_POST['stock_id'], $dec); - $_POST['price'] = price_format(get_price($_POST['stock_id'], $order->customer_currency, - $order->sales_type, $order->price_factor, $order->document_date)); - + $dec = $item_info['decimals']; + $_POST['qty'] = number_format2(0, $dec); + $units = $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) { - 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('line_no', $line_no); set_focus('qty'); } @@ -285,16 +309,16 @@ function credit_edit_item_controls(&$order, $rowcounter, $line_no=-1) //--------------------------------------------------------------------------------- -function credit_options_controls() +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); @@ -303,7 +327,7 @@ if (isset($_POST['_CreditType_update'])) /*if the credit note is a return of goods then need to know which location to receive them into */ if (!isset($_POST['Location'])) - $_POST['Location'] = $_SESSION['Items']->Location; + $_POST['Location'] = $credit->Location; locations_list_row(_("Items Returned to Location"), 'Location', $_POST['Location']); } else