X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fui%2Fsales_credit_ui.inc;h=1b68d087cd803cda78c87a5f360e24b14ebabef8;hb=22764a38ba722898cf7209435bbf41ba872e6948;hp=5fab4ce7305e45bf8b582e741930fd2a221548a4;hpb=7792e42d75607b7e2dbaf73c318b8b7d9367dd17;p=fa-stable.git diff --git a/sales/includes/ui/sales_credit_ui.inc b/sales/includes/ui/sales_credit_ui.inc index 5fab4ce7..1b68d087 100644 --- a/sales/includes/ui/sales_credit_ui.inc +++ b/sales/includes/ui/sales_credit_ui.inc @@ -6,31 +6,27 @@ include_once($path_to_root . "/includes/ui.inc"); function display_credit_header(&$order) { - global $table_style; + global $table_style, $Ajax; start_table("width=80% $table_style"); echo ""; // outer table echo ""; $customer_error = ""; + $change_prices = 0; if (!isset($_POST['customer_id']) && (get_global_customer() != reserved_words::get_all())) $_POST['customer_id'] = get_global_customer(); customer_list_row(_("Customer:"), 'customer_id', null, false, true); - if ($order->customer_id != $_POST['customer_id'] || $order->sales_type != $_POST['sales_type_id']) + if ($order->customer_id != $_POST['customer_id'] /*|| $order->sales_type != $_POST['sales_type_id']*/) { // customer has changed - - // delete all the order items - drastic but necessary because of - // change of currency, sales type, etc - $order->clear_items(); - - // clear the branch selection - unset($_POST['branch_id']); + $Ajax->activate('branch_id'); } - customer_branches_list_row(_("Branch:"), $_POST['customer_id'], 'branch_id', null, false, true, true); + customer_branches_list_row(_("Branch:"), $_POST['customer_id'], + 'branch_id', null, false, true, true); //if (($_SESSION['credit_items']->order_no == 0) || // ($order->customer_id != $_POST['customer_id']) || @@ -38,8 +34,40 @@ function display_credit_header(&$order) // $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'])) - $customer_error = get_customer_details_to_order($order, $_POST['customer_id'], $_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); + } set_global_customer($_POST['customer_id']); if (!isset($_POST['ref'])) @@ -48,7 +76,7 @@ function display_credit_header(&$order) ref_row(_("Reference").':', 'ref'); else label_row(_("Reference").':', $_POST['ref'] ); - + echo "
"; @@ -57,12 +85,14 @@ function display_credit_header(&$order) if (!is_company_currency($order->customer_currency)) { + div_start('currency'); echo ""; label_row(_("Customer Currency:"), $order->customer_currency); exchange_rate_display($order->customer_currency, get_company_currency(), - $_POST['OrderDate'], true); + $_POST['OrderDate']); echo "
"; echo ""; // outer table + div_end(); } echo ""; @@ -70,6 +100,16 @@ function display_credit_header(&$order) if (!isset($_POST['sales_type_id'])) $_POST['sales_type_id'] = $order->sales_type; sales_types_list_row(_("Sales Type"), 'sales_type_id', $_POST['sales_type_id'], true); + + if ($order->sales_type != $_POST['sales_type_id']) { + $myrow = get_sales_type($_POST['sales_type_id']); + $order->set_sales_type($myrow['id'], $myrow['sales_type'], + $myrow['tax_included'], $myrow['factor']); + $Ajax->activate('sales_type_id'); + $change_prices = 1; + } + + shippers_list_row(_("Shipping Company:"), 'ShipperID', $order->ship_via); label_row(_("Customer Discount:"), ($order->default_discount * 100) . "%"); echo "
"; @@ -81,12 +121,23 @@ function display_credit_header(&$order) if (!isset($_POST['OrderDate']) || $_POST['OrderDate'] == "") $_POST['OrderDate'] = $order->document_date; - date_row(_("Date:"), 'OrderDate'); - -// if (!isset($_POST['tax_group_id']) || $_POST['tax_group_id'] == "") -// $_POST['tax_group_id'] = $order->tax_group_id; -// tax_groups_list_row(_("Tax Group:"), 'tax_group_id', null, true); - shippers_list_row(_("Shipping Company:"), 'ShipperID', $order->ship_via); + date_row(_("Date:"), 'OrderDate', '', null, 0, 0, 0, null, true); + if (isset($_POST['_OrderDate_changed'])) { + $change_prices = 1; + $Ajax->activate('currency'); + } + // 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); echo ""; @@ -94,6 +145,17 @@ function display_credit_header(&$order) end_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, + $order->sales_type, $order->price_factor, get_post('OrderDate')); + // $line->discount_percent = $order->default_discount; + } + $Ajax->activate('items_table'); + } + + return $customer_error; } @@ -104,6 +166,7 @@ function display_credit_items($title, &$order) global $table_style, $path_to_root; display_heading($title); + div_start('items_table'); start_table("$table_style width=90%"); $th = array(_("Item Code"), _("Item Description"), _("Quantity"), _("Unit"), _("Price"), _("Discount %"), _("Total"),''); @@ -128,15 +191,17 @@ function display_credit_items($title, &$order) label_cell("$line->stock_id"); label_cell($line->item_description, "nowrap"); - qty_cell($line->qty_dispatched); + 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_button_cell("Delete$line_no", _('Delete')); + edit_button_cell("Edit$line_no", _('Edit'), + _('Edit document line')); + edit_button_cell("Delete$line_no", _('Delete'), + _('Remove line from document')); end_row(); } @@ -169,72 +234,70 @@ function display_credit_items($title, &$order) label_row(_("Credit Note Total"), $display_total, "colspan=6 align=right","class='amount'", 2); end_table(); + div_end(); } //--------------------------------------------------------------------------------- function credit_edit_item_controls(&$order, $rowcounter, $line_no=-1) { + global $Ajax; alt_table_row_color($rowcounter); $id = find_submit('Edit'); if ($line_no!=-1 && $line_no == $id) { - $_POST['stock_id'] = $order->line_items[$id]->stock_id; - $_POST['qty'] = qty_format($order->line_items[$id]->qty_dispatched); + $_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; hidden('stock_id', $_POST['stock_id']); label_cell($_POST['stock_id']); label_cell($order->line_items[$id]->item_description, "nowrap"); + $Ajax->activate('items_table'); } else { - if (get_company_pref('no_item_list')) - { - echo "\n"; - stock_items_list('stock_id', null, false, true); - echo "\n"; - } - else - { - text_cells(null, "StockID2", '', 12, 10, "", "", "class='combo' rel='stock_id'"/* " onblur='submit();'"*/); - stock_items_list_cells(null, 'stock_id', null, false, false, "class='combo' rel='StockID2'"); + stock_items_list_cells(null,'stock_id', null, false, true); + if (list_updated('stock_id')) { + $Ajax->activate('price'); + $Ajax->activate('qty'); + $Ajax->activate('units'); + $Ajax->activate('line_total'); } - $item_info = get_item_edit_info($_POST['stock_id']); + $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)); - $_POST['qty'] = qty_format(0); - $_POST['price'] = get_price($_POST['stock_id'], - $order->customer_currency, $order->sales_type); // default to the customer's discount % $_POST['Disc'] = percent_format($order->default_discount * 100); } + qty_cells(null, 'qty', $_POST['qty'], null, null, $dec); - qty_cells(null, 'qty', $_POST['qty']); -// if ($order->trans_no!=0) { -// amount_cell($line_no==-1 ? 0 :$order->line_items[$line_no]->qty_done); -// } label_cell($_POST['units']); amount_cells(null, 'price', null); small_amount_cells(null, 'Disc', percent_format(0), null, null, user_percent_dec()); - amount_cell($_POST['qty'] * $_POST['price'] * (1 - $_POST['Disc']/100)); + amount_cell(input_num('qty') * input_num('price') * (1 - input_num('Disc')/100)); if ($id!=-1) { - edit_button_cell('UpdateItem', _("Update")); - edit_button_cell('CancelItemChanges', _("Cancel")); + edit_button_cell('UpdateItem', _("Update"), + _('Confirm changes')); + edit_button_cell('CancelItemChanges', _("Cancel"), + _('Cancel changes')); hidden('line_no', $line_no); set_focus('qty'); } else { - submit_cells('AddItem', _("Add Item"), "colspan=2"); + submit_cells('AddItem', _("Add Item"), "colspan=2", + _('Add new item to document'), true); } end_row(); @@ -245,8 +308,13 @@ function credit_edit_item_controls(&$order, $rowcounter, $line_no=-1) function credit_options_controls() { - global $table_style2; + global $table_style2, $Ajax; echo "
"; + +if (isset($_POST['_CreditType_update'])) + $Ajax->activate('options'); + + div_start('options'); start_table("$table_style2"); credit_type_list_row(_("Credit Note Type"), 'CreditType', null, true); @@ -258,7 +326,6 @@ function credit_options_controls() if (!isset($_POST['Location'])) $_POST['Location'] = $_SESSION['Items']->Location; locations_list_row(_("Items Returned to Location"), 'Location', $_POST['Location']); - } else { @@ -268,6 +335,7 @@ function credit_options_controls() textarea_row(_("Memo"), "CreditText", null, 51, 3); echo ""; + div_end(); }