X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=sales%2Fincludes%2Fui%2Fsales_credit_ui.inc;h=1a69deee97c3dfeef95208d9ee26b6b72943469e;hb=4deaa6ba6e084655989c30cfb7d9dd307408c7dc;hp=c097cc976983853b2a1f32d2179b495dff6b8234;hpb=6159819c4115d50fcb52f4ad0c04737af2a28115;p=fa-stable.git
diff --git a/sales/includes/ui/sales_credit_ui.inc b/sales/includes/ui/sales_credit_ui.inc
index c097cc97..1a69deee 100644
--- a/sales/includes/ui/sales_credit_ui.inc
+++ b/sales/includes/ui/sales_credit_ui.inc
@@ -1,23 +1,32 @@
.
+***********************************************************************/
include_once($path_to_root . "/includes/ui.inc");
// ------------------------------------------------------------------------------
function display_credit_header(&$order)
{
- global $table_style, $Ajax;
- start_table("width=80% $table_style");
- echo "
"; // outer table
- echo "";
+ global $Ajax, $Refs;
+
+ start_outer_table(TABLESTYLE, "width='80%'");
+ table_section(1);
$customer_error = "";
$change_prices = 0;
- if (!isset($_POST['customer_id']) && (get_global_customer() != reserved_words::get_all()))
+ if (!isset($_POST['customer_id']) && (get_global_customer() != ALL_TEXT))
$_POST['customer_id'] = get_global_customer();
- customer_list_row(_("Customer:"), 'customer_id', null, false, true);
+ customer_list_row(_("Customer:"), 'customer_id', null, false, true, false, true);
if ($order->customer_id != $_POST['customer_id'] /*|| $order->sales_type != $_POST['sales_type_id']*/)
{
@@ -26,76 +35,63 @@ function display_credit_header(&$order)
}
customer_branches_list_row(_("Branch:"), $_POST['customer_id'],
- 'branch_id', null, false, 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'] = references::get_next(11);
- if ($_SESSION['Items']->trans_no==0)
+ $_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'] );
-
-
-
- echo " ";
+ label_row(_("Reference").':', $order->reference);
- echo " | "; // outer table
if (!is_company_currency($order->customer_currency))
{
- div_start('currency');
- echo "";
+ 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']);
- echo " ";
- echo " | "; // outer table
- div_end();
}
-
- echo "";
+ table_section(3);
if (!isset($_POST['sales_type_id']))
$_POST['sales_type_id'] = $order->sales_type;
@@ -109,24 +105,24 @@ function display_credit_header(&$order)
$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) . "%");
- echo " ";
-
- echo " | "; // outer table
- echo "";
+ table_section(4);
if (!isset($_POST['OrderDate']) || $_POST['OrderDate'] == "")
$_POST['OrderDate'] = $order->document_date;
- date_row(_("Date:"), 'OrderDate', '', null, 0, 0, 0, null, true);
+ date_row(_("Date:"), 'OrderDate', '', $order->trans_no==0, 0, 0, 0, null, true);
if (isset($_POST['_OrderDate_changed'])) {
- $change_prices = 1;
- $Ajax->activate('currency');
+ if (!is_company_currency($order->customer_currency)
+ && (get_base_sales_type()>0)) {
+ $change_prices = 1;
+ }
+ $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',
@@ -139,18 +135,13 @@ function display_credit_header(&$order)
else
hidden('dimension2_id', 0);
- echo " ";
-
- echo " |
";
-
- end_table(1); // outer table
+ 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');
}
@@ -163,13 +154,13 @@ function display_credit_header(&$order)
function display_credit_items($title, &$order)
{
- global $table_style, $path_to_root;
+ global $path_to_root;
display_heading($title);
div_start('items_table');
- start_table("$table_style 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[]= '';
@@ -180,7 +171,7 @@ function display_credit_items($title, &$order)
$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());
@@ -189,7 +180,7 @@ function display_credit_items($title, &$order)
{
alt_table_row_color($k);
- label_cell("