X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fui%2Fsales_credit_ui.inc;h=f4725d3febdace0525b325f6cde00c173e2ab504;hb=3d8405dc9f78b3141d63c574e53b21ba38e45c10;hp=3267bb4343c029d6d1e2a76d9b89a5ad53dbf643;hpb=99730b8d6deb7e81d2f1ebeb2ce7066d27729485;p=fa-stable.git
diff --git a/sales/includes/ui/sales_credit_ui.inc b/sales/includes/ui/sales_credit_ui.inc
index 3267bb43..f4725d3f 100644
--- a/sales/includes/ui/sales_credit_ui.inc
+++ b/sales/includes/ui/sales_credit_ui.inc
@@ -1,36 +1,41 @@
.
+***********************************************************************/
include_once($path_to_root . "/includes/ui.inc");
// ------------------------------------------------------------------------------
function display_credit_header(&$order)
{
- global $table_style;
- start_table("width=80% $table_style");
- echo "
"; // outer table
- echo "";
+ global $table_style, $Ajax;
+
+ start_outer_table("width=80% $table_style");
+ table_section(1);
$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 +43,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']))
@@ -50,49 +87,69 @@ function display_credit_header(&$order)
label_row(_("Reference").':', $_POST['ref'] );
-
- echo " ";
-
- echo " | "; // outer table
-
if (!is_company_currency($order->customer_currency))
{
- echo "";
+ table_section(2);
+
+ div_start('currency');
label_row(_("Customer Currency:"), $order->customer_currency);
exchange_rate_display($order->customer_currency, get_company_currency(),
- $_POST['OrderDate'], true);
- echo " ";
- echo " | "; // outer table
+ $_POST['OrderDate']);
+ div_end();
}
-
- echo "";
+ table_section(3);
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;
+ }
- 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');
-
-// 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);
-
- echo " ";
-
- echo " |
";
+ 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);
+
+ 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,
+ $order->sales_type, $order->price_factor, get_post('OrderDate'));
+ // $line->discount_percent = $order->default_discount;
+ }
+ $Ajax->activate('items_table');
+ }
- end_table(1); // outer table
return $customer_error;
}
@@ -104,6 +161,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"),'');
@@ -132,11 +190,13 @@ function display_credit_items($title, &$order)
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'));
+ delete_button_cell("Delete$line_no", _('Delete'),
+ _('Remove line from document'));
end_row();
}
@@ -169,18 +229,19 @@ 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['stock_id'], $dec);
$_POST['price'] = price_format($order->line_items[$id]->price);
@@ -189,15 +250,22 @@ function credit_edit_item_controls(&$order, $rowcounter, $line_no=-1)
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
{
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']);
+ $dec = $item_info['decimals'];
+ $_POST['qty'] = number_format2(0, $dec);
$_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));
@@ -205,27 +273,27 @@ function credit_edit_item_controls(&$order, $rowcounter, $line_no=-1)
$_POST['Disc'] = percent_format($order->default_discount * 100);
}
-
qty_cells(null, 'qty', $_POST['qty'], null, null, $dec);
-// 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"));
+ button_cell('UpdateItem', _("Update"),
+ _('Confirm changes'), ICON_UPDATE);
+ button_cell('CancelItemChanges', _("Cancel"),
+ _('Cancel changes'), ICON_CANCEL);
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();
@@ -236,8 +304,13 @@ function credit_edit_item_controls(&$order, $rowcounter, $line_no=-1)
function credit_options_controls()
{
- global $table_style2;
+ global $table_style2, $Ajax;
echo "