"; // outer table
- echo "";
+
+ start_outer_table("width=80% $table_style");
+ table_section(1);
$customer_error = "";
$change_prices = 0;
@@ -22,15 +31,7 @@ function display_credit_header(&$order)
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']);
- $_POST['branch_id'] = '';
- $Ajax->activate('branch_id');
+ $Ajax->activate('branch_id');
}
customer_branches_list_row(_("Branch:"), $_POST['customer_id'],
@@ -62,38 +63,41 @@ function display_credit_header(&$order)
}
if ($old_order->sales_type != $order->sales_type) {
// || $old_order->default_discount!=$order->default_discount
- $_POST['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'] = references::get_next(11);
- if ($_SESSION['Items']->trans_no==0)
+ if ($order->trans_no==0)
ref_row(_("Reference").':', 'ref');
else
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;
@@ -107,35 +111,48 @@ function display_credit_header(&$order)
$change_prices = 1;
}
- 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, $order->document_date);
- // $line->discount_percent = $order->default_discount;
- }
- $Ajax->activate('items_table');
- }
+ shippers_list_row(_("Shipping Company:"), 'ShipperID', $order->ship_via);
label_row(_("Customer Discount:"), ($order->default_discount * 100) . "%");
- echo " ";
-
- echo " | "; // outer table
- echo "";
+ table_section(4);
if (!isset($_POST['OrderDate']) || $_POST['OrderDate'] == "")
$_POST['OrderDate'] = $order->document_date;
- date_row(_("Date:"), 'OrderDate');
-
- shippers_list_row(_("Shipping Company:"), 'ShipperID', $order->ship_via);
+ date_row(_("Date:"), 'OrderDate', '', null, 0, 0, 0, null, true);
+ if (isset($_POST['_OrderDate_changed'])) {
+ if (!is_company_currency($order->customer_currency)
+ && (get_base_sales_type()>0)) {
+ $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 " ";
+ end_outer_table(1); // outer table
- echo " |
";
+ 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;
}
@@ -176,12 +193,12 @@ 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 document line'));
- edit_button_cell("Delete$line_no", _('Delete'),
+ delete_button_cell("Delete$line_no", _('Delete'),
_('Remove line from document'));
end_row();
@@ -208,7 +225,7 @@ function display_credit_items($title, &$order)
$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, 6, $order->tax_included);
$display_total = price_format(($subtotal + $_POST['ChargeFreightCost'] + $tax_total));
@@ -249,8 +266,9 @@ function credit_edit_item_controls(&$order, $rowcounter, $line_no=-1)
}
$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));
@@ -264,14 +282,14 @@ function credit_edit_item_controls(&$order, $rowcounter, $line_no=-1)
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"),
- _('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');
}
@@ -287,7 +305,7 @@ function credit_edit_item_controls(&$order, $rowcounter, $line_no=-1)
//---------------------------------------------------------------------------------
-function credit_options_controls()
+function credit_options_controls($credit)
{
global $table_style2, $Ajax;
echo "