{
global $Ajax, $Refs;
- start_outer_table(TABLESTYLE, "width=80%");
+ start_outer_table(TABLESTYLE, "width='80%'");
table_section(1);
$customer_error = "";
}
customer_branches_list_row(_("Branch:"), $_POST['customer_id'],
- 'branch_id', null, false, true, 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'] = $Refs->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);
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']);
}
table_section(3);
$change_prices = 1;
}
- shippers_list_row(_("Shipping Company:"), 'ShipperID', $order->ship_via);
+ shipping_methods_list_row(_("Shipping:"), 'ShipperID', $order->ship_via);
label_row(_("Customer Discount:"), ($order->default_discount * 100) . "%");
}
$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',
$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');
}
display_heading($title);
div_start('items_table');
- start_table(TABLESTYLE, "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[]= '';
$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());
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");
$dec = $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["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)
{
//---------------------------------------------------------------------------------
-?>
\ No newline at end of file
projects / fa-stable.git / blobdiff