X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=purchasing%2Fincludes%2Fui%2Finvoice_ui.inc;h=2e9520e708db3103a68b5aacf833e1e1fb639ace;hb=eea7d897f2c6b2234d4fca235a5a2d30ac900b45;hp=7470300dd71b0118dfe51e07e8c24f02f3bed22b;hpb=e9ad9e87f5eb2682d2e91c93134250fd8a8d2ad9;p=fa-stable.git
diff --git a/purchasing/includes/ui/invoice_ui.inc b/purchasing/includes/ui/invoice_ui.inc
index 7470300d..2e9520e7 100644
--- a/purchasing/includes/ui/invoice_ui.inc
+++ b/purchasing/includes/ui/invoice_ui.inc
@@ -122,12 +122,6 @@ function invoice_header(&$supp_trans)
}
text_row(_("Supplier's Ref.:"), 'supp_reference', $_POST['supp_reference'], 20, 60);
- if (get_company_pref('use_dimension'))
- dimensions_list_row(_('Dimension').':', 'dimension', null, true, _('Default'), false, 1);
-
- if (get_company_pref('use_dimension') == 2)
- dimensions_list_row(_('Dimension 2').':', 'dimension2', null, true, _('Default'), false, 2);
-
table_section(2, "33%");
if (isset($_POST['_tran_date_changed'])) {
@@ -142,18 +136,22 @@ function invoice_header(&$supp_trans)
label_row(_("Terms:"), $supp_trans->terms['description']);
+ if (get_company_pref('use_dimension'))
+ dimensions_list_row(_('Dimension').':', 'dimension', null, true, _('Default'), false, 1);
+
+ if (get_company_pref('use_dimension') == 2)
+ dimensions_list_row(_('Dimension 2').':', 'dimension2', null, true, _('Default'), false, 2);
+
table_section(3, "33%");
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);
@@ -176,7 +174,7 @@ function invoice_totals(&$supp_trans)
start_table(TABLESTYLE, "width='95%'");
label_row(_("Sub-total:"), price_format( $supp_trans->ov_amount), "colspan=$colspan align=right", "align=right");
- $taxes = $supp_trans->get_taxes($supp_trans->tax_group_id);
+ $taxes = $supp_trans->get_taxes();
$tax_total = display_edit_tax_items($taxes, $colspan, $supp_trans->tax_included, 0, true);
$display_total = price_format($supp_trans->ov_amount + $tax_total);
@@ -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);
@@ -293,7 +292,7 @@ function display_gl_items(&$supp_trans, $mode=0)
if (count($supp_trans->gl_codes) > 0)
{
- foreach ($supp_trans->gl_codes as $entered_gl_code)
+ foreach ($supp_trans->gl_codes as $n => $entered_gl_code)
{
alt_table_row_color($k);
@@ -314,9 +313,10 @@ function display_gl_items(&$supp_trans, $mode=0)
if ($mode == 1)
{
- delete_button_cell("Delete2" . $entered_gl_code->Counter, _("Delete"),
+ delete_button_cell("Delete2" . $n, _("Delete"),
_('Remove line from document'));
- label_cell("");
+ edit_button_cell("Edit" . $n, _("Edit"),
+ _('Edit line from document'));
}
end_row();
if ($mode > 1) {
@@ -359,16 +359,15 @@ function display_grn_items_for_selection(&$supp_trans, $k)
$result = get_grn_items(0, $supp_trans->supplier_id, false, true, 0, $_POST['receive_begin'], $_POST['receive_end']);
elseif ($supp_trans->src_docs)
$result = get_grn_items(0, $supp_trans->supplier_id, false, true, array_keys($supp_trans->src_docs));
- else
+ else
$result = get_grn_items(0, $supp_trans->supplier_id, false, true);
}
if (db_num_rows($result) == 0)
{
return false;
}
-
- /*Set up a table to show the outstanding GRN items for selection */
+ /*Set up a table to show the outstanding GRN items for selection */
while ($myrow = db_fetch($result))
{
$grn_already_on_invoice = false;
@@ -383,19 +382,11 @@ function display_grn_items_for_selection(&$supp_trans, $k)
if ($grn_already_on_invoice == false)
{
-
alt_table_row_color($k);
$n = $myrow["id"];
- label_cell(get_trans_view_str(ST_SUPPRECEIVE, $myrow["grn_batch_id"]));
- hidden('qty_recd'.$n, $myrow["qty_recd"], false);
- hidden('item_code'.$n, $myrow["item_code"], false);
- hidden('item_description'.$n, $myrow["description"], false);
- hidden('prev_quantity_inv'.$n, $myrow['quantity_inv'], false);
- hidden('order_price'.$n, $myrow['unit_price'], false);
- hidden('std_cost_unit'.$n, $myrow['std_cost_unit'], false);
- hidden('po_detail_item'.$n, $myrow['po_detail_item'], false);
- label_cell(get_trans_view_str(ST_PURCHORDER, $myrow["purch_order_no"]));
+ label_cell(get_trans_view_str(ST_SUPPRECEIVE, $myrow["grn_batch_id"]), "nowrap align='right'");
+ 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"]));
@@ -423,11 +414,6 @@ function display_grn_items_for_selection(&$supp_trans, $k)
submit_cells('grn_item_id'.$n, _("Add"), '', _("Add to Invoice"), true);
else
submit_cells('grn_item_id'.$n, _("Add"), '', _("Add to Credit Note"), true);
- if (($supp_trans->trans_type == ST_SUPPINVOICE) && $_SESSION["wa_current_user"]->can_access('SA_GRNDELETE')) { // Added 2008-10-18 by Joe Hunt. Special access rights needed.
- submit_cells('void_item_id'.$n, _("Remove"), '', _("WARNING! Be careful with removal. The operation is executed immediately and cannot be undone !!!"), true);
- submit_js_confirm('void_item_id'.$n,
- sprintf(_('You are about to remove all yet non-invoiced items from delivery line #%d. This operation also irreversibly changes related order line. Do you want to continue ?'), $n));
- }
end_row();
}
}
@@ -456,11 +442,7 @@ function display_grn_items(&$supp_trans, $mode=0)
if ($mode == 1)
{
if ($supp_trans->trans_type == ST_SUPPINVOICE)
- {
$heading = _("Items Received Yet to be Invoiced");
- if ($_SESSION["wa_current_user"]->can_access('SA_GRNDELETE')) // Added 2008-10-18 by Joe Hunt. Only admins can remove GRNs
- $heading2 = _("WARNING! Be careful with removal. The operation is executed immediately and cannot be undone !!!");
- }
else
$heading = _("Delivery Item Selected For Adding To A Supplier Credit Note");
}
@@ -504,8 +486,6 @@ function display_grn_items(&$supp_trans, $mode=0)
_("Received On"), _("Quantity Received"), _("Quantity Invoiced"),
_("Qty Yet To Invoice"), $supp_trans->tax_included ? _("Price after Tax") : _("Price before Tax"),
_("Total"), "");
- if (($supp_trans->trans_type == ST_SUPPINVOICE) && $_SESSION["wa_current_user"]->can_access('SA_GRNDELETE')) // Added 2008-10-18 by Joe Hunt. Only admins can remove GRNs
- $th[] = "";
if ($supp_trans->trans_type == ST_SUPPCREDIT)
{
$th[7] = _("Qty Yet To Credit");
@@ -528,12 +508,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);
@@ -551,8 +531,6 @@ function display_grn_items(&$supp_trans, $mode=0)
if ($mode == 1)
{
delete_button_cell("Delete" . $entered_grn->id, _("Edit"), _('Edit document line'));
- if (($supp_trans->trans_type == ST_SUPPINVOICE) && $_SESSION["wa_current_user"]->can_access('SA_GRNDELETE'))
- label_cell("");
}
end_row();
@@ -570,7 +548,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;
@@ -599,7 +577,7 @@ function display_grn_items(&$supp_trans, $mode=0)
//--------------------------------------------------------------------------------------------------
function get_duedate_from_terms(&$trans)
{
- $date = get_class($trans) == 'purch_order' ? $trans->orig_order_date : $trans->tran_date;
+ $date = $trans->tran_date;
if (!is_date($date))
{