X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=inline;f=purchasing%2Fincludes%2Fui%2Finvoice_ui.inc;h=ef4b812846d63dc7e4cf756ca729ac444a4c38f9;hb=72998423b6010dfd9a07025f836eef56736a7037;hp=93524a4b3cd7503e2152e6e4dd6c9eaf99a07478;hpb=3862c1a48d8d699ff03d6fe31ee7b4cf492aa5e0;p=fa-stable.git
diff --git a/purchasing/includes/ui/invoice_ui.inc b/purchasing/includes/ui/invoice_ui.inc
index 93524a4b..ef4b8128 100644
--- a/purchasing/includes/ui/invoice_ui.inc
+++ b/purchasing/includes/ui/invoice_ui.inc
@@ -146,14 +146,12 @@ function invoice_header(&$supp_trans)
set_global_supplier($_POST['supplier_id']);
- $supplier_currency = get_supplier_currency($supp_trans->supplier_id);
-
$company_currency = get_company_currency();
- if ($supplier_currency != $company_currency)
+ if ($supp_trans->currency != $company_currency)
{
- label_row(_("Supplier's Currency:"), "" . $supplier_currency . "");
- exchange_rate_display($company_currency, $supplier_currency, $_POST['tran_date']);
+ label_row(_("Supplier's Currency:"), "" . $supp_trans->currency . "");
+ exchange_rate_display($company_currency, $supp_trans->currency, $_POST['tran_date']);
}
label_row(_("Tax Group:"), $supp_trans->tax_description);
@@ -199,11 +197,12 @@ function invoice_totals(&$supp_trans)
function display_gl_controls(&$supp_trans, $k)
{
$accs = get_supplier_accounts($supp_trans->supplier_id);
- $_POST['gl_code'] = $accs['purchase_account'] ?
- $accs['purchase_account'] : get_company_pref('default_cogs_act');
+ if (!isset($_POST['gl_code']))
+ $_POST['gl_code'] = $accs['purchase_account'] ?
+ $accs['purchase_account'] : get_company_pref('default_cogs_act');
alt_table_row_color($k);
- echo gl_all_accounts_list('gl_code', null, true, true);
+ echo gl_all_accounts_list('gl_code', null, false, true);
$dim = get_company_pref('use_dimension');
if ($dim >= 1)
dimensions_list_cells(null, 'dimension_id', null, true, " ", false, 1);
@@ -316,7 +315,8 @@ function display_gl_items(&$supp_trans, $mode=0)
{
delete_button_cell("Delete2" . $entered_gl_code->Counter, _("Delete"),
_('Remove line from document'));
- label_cell("");
+ edit_button_cell("Edit" . $entered_gl_code->Counter, _("Edit"),
+ _('Edit line from document'));
}
end_row();
if ($mode > 1) {
@@ -391,7 +391,6 @@ function display_grn_items_for_selection(&$supp_trans, $k)
hidden('item_description'.$n, $myrow["description"]);
hidden('prev_quantity_inv'.$n, $myrow['quantity_inv']);
hidden('order_price'.$n, $myrow['unit_price']);
- hidden('std_cost_unit'.$n, $myrow['std_cost_unit']);
hidden('po_detail_item'.$n, $myrow['po_detail_item']);
label_cell(get_trans_view_str(ST_PURCHORDER, $myrow["purch_order_no"]), "nowrap align='right'");
label_cell($myrow["item_code"]);