X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fui%2Fsales_credit_ui.inc;h=9a52b8ae48358fbf555d7eb4fbeaabc66a83e6f6;hb=fd59c60718609c1bf3240a303030167a4f1b1885;hp=811167d603aa9103d82f1401c88eb3ee79d71a1c;hpb=e871e7b7f097ec86efa815e2005786710afb79e4;p=fa-stable.git
diff --git a/sales/includes/ui/sales_credit_ui.inc b/sales/includes/ui/sales_credit_ui.inc
index 811167d6..9a52b8ae 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,17 +34,49 @@ 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']))
$_POST['ref'] = references::get_next(11);
if ($_SESSION['Items']->trans_no==0)
- ref_row(_("Reference:"), 'ref');
+ ref_row(_("Reference").':', 'ref');
else
- label_row(_("Reference"), $_POST['ref'], "class='tableheader2'");
-
+ 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,19 +121,51 @@ 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)
+ {
+ if ($order->dimension_id != $_POST['dimension_id']) {
+ $order->dimension_id = $_POST['dimension_id'];
+ $Ajax->activate('dimension_id');
+ }
+ dimensions_list_row(_("Dimension:"), 'dimension_id', null, true, ' ', false, 1, true);
+ if ($dim > 1)
+ {
+ if ($order->dimension2_id != $_POST['dimension2_id']) {
+ $order->dimension2_id = $_POST['dimension2_id'];
+ $Ajax->activate('dimension2_id');
+ }
+ dimensions_list_row(_("Dimension")." 2:", 'dimension2_id', null, true, ' ', false, 2, true);
+ }
+ }
+ if ($dim < 2)
+ hidden('dimension2_id', 0);
+ if ($dim < 1)
+ hidden('dimension_id', 0);
+
echo "";
echo " |
";
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;
}
@@ -101,146 +173,141 @@ function display_credit_header(&$order)
function display_credit_items($title, &$order)
{
- global $table_style, $path_to_root;
-
- display_heading($title);
- start_table("$table_style width=90%");
- $th = array(_("Item Code"), _("Item Description"), _("Quantity"), _("Unit"),
- _("Price"), _("Discount %"), _("Total"),'');
-
- if (count($order->line_items)) $th[]= '';
+ global $table_style, $path_to_root;
- table_header($th);
+ display_heading($title);
+ div_start('items_table');
+ start_table("$table_style width=90%");
+ $th = array(_("Item Code"), _("Item Description"), _("Quantity"), _("Unit"),
+ _("Price"), _("Discount %"), _("Total"),'');
- $subtotal = 0;
- $k = 0; //row colour counter
+ if (count($order->line_items)) $th[]= '';
- foreach ($order->line_items as $line_no=>$line)
- {
- $line_total = $line->qty_dispatched * $line->price * (1 - $line->discount_percent);
- if (!isset($_GET['Edit']))
- $id = -1;
- else
- $id = $_GET['Edit'];
-
- if ( $id != $line_no)
-
- {
- alt_table_row_color($k);
-
- label_cell("