X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=purchasing%2Fincludes%2Fui%2Finvoice_ui.inc;h=e682cdcad2df1ada44f0bccf48e4ba99273dd51b;hb=b71d9175e95d1a4520674f8adaa0cc46d1659447;hp=e3328cc26f06237a14015dcf54bc90c0987e71a2;hpb=8c22323e464635b27c9250bd312fd6ebd4f55119;p=fa-stable.git
diff --git a/purchasing/includes/ui/invoice_ui.inc b/purchasing/includes/ui/invoice_ui.inc
index e3328cc2..e682cdca 100644
--- a/purchasing/includes/ui/invoice_ui.inc
+++ b/purchasing/includes/ui/invoice_ui.inc
@@ -103,6 +103,7 @@ function invoice_header(&$supp_trans)
}
if ($supp_trans->supplier_id != $_POST['supplier_id'])
{
+ copy_to_trans($supp_trans);
// supplier has changed
// delete all the order items - drastic but necessary because of
// change of currency, etc
@@ -146,14 +147,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);
@@ -170,24 +169,24 @@ function invoice_totals(&$supp_trans)
copy_to_trans($supp_trans);
- $dim = get_company_pref('use_dimension');
- $colspan = ($dim == 2 ? 7 : ($dim == 1 ? 6 : 5));
+ $colspan = 2;
div_start('tax_table');
start_table(TABLESTYLE, "width='95%'");
- label_row(_("Sub-total:"), price_format( $supp_trans->ov_amount), "colspan=$colspan align=right", "align=right");
+ label_row(_("Sub-total:"), price_format( $supp_trans->ov_amount), "width=80% colspan=$colspan align=right", "width=10% align=right", 2);
$taxes = $supp_trans->get_taxes($supp_trans->tax_group_id);
$tax_total = display_edit_tax_items($taxes, $colspan, $supp_trans->tax_included, 0, true);
$display_total = price_format($supp_trans->ov_amount + $tax_total);
-
+ start_row();
if ($supp_trans->trans_type == ST_SUPPINVOICE)
- label_row(_("Invoice Total:"),
- $display_total, "colspan=$colspan align=right style='font-weight:bold;'", "align=right style='font-weight:bold;'");
+ label_cells(_("Invoice Total:"),
+ $display_total, "colspan=$colspan width=80% align=right style='font-weight:bold;'", "width=10% align=right style='font-weight:bold;'");
else
- label_row(_("Credit Note Total"),
- $display_total, "colspan=$colspan align=right style='font-weight:bold;color:red;'", "nowrap align=right style='font-weight:bold;color:red;'");
-
+ label_cells(_("Credit Note Total"),
+ $display_total, "colspan=$colspan width=80% align=right style='font-weight:bold;color:red;'", "width=10% nowrap align=right style='font-weight:bold;color:red;'");
+ submit_cells('update', _("Update"), "width=10% colspan=2 align='right'", _("Refresh"), true);
+ end_row();
end_table(1);
start_table(TABLESTYLE2);
textarea_row(_("Memo:"), "Comments", null, 50, 3);
@@ -199,11 +198,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 +316,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) {
@@ -385,15 +386,14 @@ function display_grn_items_for_selection(&$supp_trans, $k)
alt_table_row_color($k);
$n = $myrow["id"];
- label_cell(get_trans_view_str(ST_SUPPRECEIVE, $myrow["grn_batch_id"]));
+ label_cell(get_trans_view_str(ST_SUPPRECEIVE, $myrow["grn_batch_id"]), "nowrap align='right'");
hidden('qty_recd'.$n, $myrow["qty_recd"]);
hidden('item_code'.$n, $myrow["item_code"]);
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"]));
+ label_cell(get_trans_view_str(ST_PURCHORDER, $myrow["purch_order_no"]), "nowrap align='right'");
label_cell($myrow["item_code"]);
label_cell($myrow["description"]);
label_cell(sql2date($myrow["delivery_date"]));
@@ -526,12 +526,12 @@ function display_grn_items(&$supp_trans, $mode=0)
alt_table_row_color($k);
$grn_batch = get_grn_batch_from_item($entered_grn->id);
- label_cell(get_trans_view_str(ST_SUPPRECEIVE, $grn_batch));
+ label_cell(get_trans_view_str(ST_SUPPRECEIVE, $grn_batch), "nowrap align='right'");
if ($mode == 1)
{
// label_cell($entered_grn->id);
$row = get_grn_batch($grn_batch);
- label_cell(get_trans_view_str(ST_PURCHORDER, $row["purch_order_no"])); // PO
+ label_cell(get_trans_view_str(ST_PURCHORDER, $row["purch_order_no"]), "nowrap align='right'"); // PO
}
label_cell($entered_grn->item_code);
label_cell($entered_grn->item_description);
@@ -568,7 +568,7 @@ function display_grn_items(&$supp_trans, $mode=0)
if ($mode == 1)
{
$ret = display_grn_items_for_selection($supp_trans, $k);
- $colspan = 10;
+ $colspan = 9;
}
else
$colspan = 5;