X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fui%2Finvoice_ui.inc;h=9c75a9714275aa9b05846b63969e62b15079d089;hb=561f438a3a1f7b5753d2b09238871418710e687f;hp=eefe95f1d9201382348e96decf2bce9166d17d14;hpb=675124bdf52880ebf3813da82cd095dcf8b788bd;p=fa-stable.git
diff --git a/purchasing/includes/ui/invoice_ui.inc b/purchasing/includes/ui/invoice_ui.inc
index eefe95f1..9c75a971 100644
--- a/purchasing/includes/ui/invoice_ui.inc
+++ b/purchasing/includes/ui/invoice_ui.inc
@@ -19,6 +19,10 @@ function copy_from_trans(&$supp_trans)
$_POST['supp_reference'] = $supp_trans->supp_reference;
$_POST['reference'] = $supp_trans->reference;
$_POST['supplier_id'] = $supp_trans->supplier_id;
+ $_POST['_ex_rate'] = $supp_trans->ex_rate;
+ if (isset($supp_trans->tax_overrides))
+ foreach($supp_trans->tax_overrides as $id => $value)
+ $_POST['mantax'][$id] = price_format($value);
}
//--------------------------------------------------------------------------------------------------
@@ -30,8 +34,17 @@ function copy_to_trans(&$supp_trans)
$supp_trans->due_date = $_POST['due_date'];
$supp_trans->supp_reference = $_POST['supp_reference'];
$supp_trans->reference = $_POST['reference'];
+ $supp_trans->ex_rate = input_num('_ex_rate', null);
+
+ $supp_trans->ov_amount = $supp_trans->ov_discount = 0; /* for starters */
+ if (isset($_POST['mantax'])) {
+ foreach($_POST['mantax'] as $id => $tax) {
+ $supp_trans->tax_overrides[$id] = user_numeric($_POST['mantax'][$id]);
+ }
+ }
+ else
+ unset($supp_trans->tax_overrides);
- $supp_trans->ov_amount = 0; /* for starters */
if (count($supp_trans->grn_items) > 0)
{
foreach ( $supp_trans->grn_items as $grn)
@@ -61,7 +74,7 @@ function invoice_header(&$supp_trans)
if (!isset($_POST['tran_date']))
copy_from_trans($supp_trans);
- start_outer_table(TABLESTYLE2, "width=95%");
+ start_outer_table(TABLESTYLE2, "width='95%'");
table_section(1);
@@ -69,7 +82,7 @@ function invoice_header(&$supp_trans)
{
$trans = get_supp_trans($_POST['invoice_no'], ST_SUPPINVOICE);
$_POST['supplier_id'] = $trans['supplier_id'];
- $supp = $trans['supplier_name'] . " - " . $trans['SupplierCurrCode'];
+ $supp = $trans['supplier_name'] . " - " . $trans['curr_code'];
label_row(_("Supplier:"), $supp.hidden('supplier_id', $_POST['supplier_id'], false));
}
else
@@ -124,7 +137,7 @@ function invoice_header(&$supp_trans)
if ($supplier_currency != $company_currency)
{
label_row(_("Supplier's Currency:"), "" . $supplier_currency . "");
- exchange_rate_display($supplier_currency, $company_currency, $_POST['tran_date']);
+ exchange_rate_display($company_currency, $supplier_currency, $_POST['tran_date']);
}
label_row(_("Tax Group:"), $supp_trans->tax_description);
@@ -141,11 +154,11 @@ function invoice_totals(&$supp_trans)
$dim = get_company_pref('use_dimension');
$colspan = ($dim == 2 ? 7 : ($dim == 1 ? 6 : 5));
- start_table(TABLESTYLE, "width=95%");
+ 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);
- $tax_total = display_edit_tax_items($taxes, $colspan, $supp_trans->tax_included);
+ $tax_total = display_edit_tax_items($taxes, $colspan, $supp_trans->tax_included, 0, true);
$display_total = price_format($supp_trans->ov_amount + $tax_total);
@@ -208,7 +221,7 @@ function display_gl_items(&$supp_trans, $mode=0)
else
$heading = _("GL Items for this Credit Note");
- start_outer_table(TABLESTYLE, "width=95%");
+ start_outer_table(TABLESTYLE, "width='95%'");
if ($mode == 1)
{
@@ -238,7 +251,7 @@ function display_gl_items(&$supp_trans, $mode=0)
end_outer_table(0, false);
div_start('gl_items');
- start_table(TABLESTYLE, "width=95%");
+ start_table(TABLESTYLE, "width='95%'");
$dim = get_company_pref('use_dimension');
if ($dim == 2)
@@ -319,6 +332,7 @@ function display_gl_items(&$supp_trans, $mode=0)
function display_grn_items_for_selection(&$supp_trans, $k)
{
+
if ($supp_trans->trans_type == ST_SUPPINVOICE)
$result = get_grn_items(0, $supp_trans->supplier_id, true);
else
@@ -354,15 +368,15 @@ function display_grn_items_for_selection(&$supp_trans, $k)
alt_table_row_color($k);
$n = $myrow["id"];
- label_cell(get_trans_view_str(25, $myrow["grn_batch_id"]));
- label_cell($myrow["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(25, $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).
+ hidden('location'.$n, $myrow["loc_code"], false));
label_cell(get_trans_view_str(ST_PURCHORDER, $myrow["purch_order_no"]));
label_cell($myrow["item_code"]);
label_cell($myrow["description"]);
@@ -394,7 +408,7 @@ function display_grn_items_for_selection(&$supp_trans, $k)
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));
+ _('You are about to remove all yet non-invoiced items from selected delivery line. This operation also irreversibly changes related order line. Do you want to continue ?'));
}
end_row();
}
@@ -418,7 +432,7 @@ function display_grn_items(&$supp_trans, $mode=0)
if (($mode == 2 || $mode == 3) && count($supp_trans->grn_items) == 0)
return 0;
- start_outer_table("style='border:1px solid #cccccc;' width=95%");
+ start_outer_table("style='border:1px solid #cccccc;' width='95%'");
$heading2 = "";
if ($mode == 1)
@@ -457,17 +471,17 @@ function display_grn_items(&$supp_trans, $mode=0)
{
display_note($heading2, 0, 0, "class='overduefg'");
}
- echo "| ";
+ echo " | ";
submit('InvGRNAll', _("Add All Items"), true, false,true);
}
end_outer_table(0, false);
div_start('grn_items');
- start_table(TABLESTYLE, "width=95%");
+ start_table(TABLESTYLE, "width='95%'");
if ($mode == 1)
{
- $th = array(_("Delivery"), _("Sequence #"), _("P.O."), _("Item"), _("Description"),
+ $th = array(_("Delivery"), _("P.O."), _("Item"), _("Description"),
_("Received On"), _("Quantity Received"), _("Quantity Invoiced"),
_("Qty Yet To Invoice"), $supp_trans->tax_included ? _("Price after Tax") : _("Price before Tax"),
_("Total"), "");
@@ -475,7 +489,7 @@ function display_grn_items(&$supp_trans, $mode=0)
$th[] = "";
if ($supp_trans->trans_type == ST_SUPPCREDIT)
{
- $th[8] = _("Qty Yet To Credit");
+ $th[7] = _("Qty Yet To Credit");
}
}
else
@@ -498,10 +512,9 @@ function display_grn_items(&$supp_trans, $mode=0)
label_cell(get_trans_view_str(ST_SUPPRECEIVE,$grn_batch));
if ($mode == 1)
{
- label_cell($entered_grn->id);
$row = get_grn_batch($grn_batch);
label_cell($row['purch_order_no']); // PO
- }
+ }
label_cell($entered_grn->item_code);
label_cell($entered_grn->item_description);
$dec = get_qty_dec($entered_grn->item_code);
|