X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fui%2Fsales_credit_ui.inc;h=1b68d087cd803cda78c87a5f360e24b14ebabef8;hb=22764a38ba722898cf7209435bbf41ba872e6948;hp=9a52b8ae48358fbf555d7eb4fbeaabc66a83e6f6;hpb=fd59c60718609c1bf3240a303030167a4f1b1885;p=fa-stable.git diff --git a/sales/includes/ui/sales_credit_ui.inc b/sales/includes/ui/sales_credit_ui.inc index 9a52b8ae..1b68d087 100644 --- a/sales/includes/ui/sales_credit_ui.inc +++ b/sales/includes/ui/sales_credit_ui.inc @@ -129,26 +129,16 @@ function display_credit_header(&$order) // 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) + 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 ""; echo ""; @@ -205,7 +195,7 @@ 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'),