<?php
/**********************************************************************
Copyright (C) FrontAccounting, LLC.
- Released under the terms of the GNU Affero General Public License,
- AGPL, as published by the Free Software Foundation, either version
- 3 of the License, or (at your option) any later version.
+ Released under the terms of the GNU General Public License, GPL,
+ as published by the Free Software Foundation, either version 3
+ of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- See the License here <http://www.gnu.org/licenses/agpl-3.0.html>.
+ See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
***********************************************************************/
//--------------------------------------------------------------------------------------------------
{
foreach ( $supp_trans->gl_codes as $gl_line)
{
- $supp_trans->ov_amount += $gl_line->amount;
+ ////////// 2009-08-18 Joe Hunt
+ if (!is_tax_account($gl_line->gl_code))
+ $supp_trans->ov_amount += $gl_line->amount;
}
}
}
table_section(1);
- if (!isset($_POST['supplier_id']) && (get_global_supplier() != reserved_words::get_all()))
- $_POST['supplier_id'] = get_global_supplier();
-
- supplier_list_row(_("Supplier:"), 'supplier_id', $_POST['supplier_id'], false, true);
+ if (isset($_POST['invoice_no']))
+ {
+ $trans = get_supp_trans($_POST['invoice_no'], 20);
+ $_POST['supplier_id'] = $trans['supplier_id'];
+ $supp = $trans['supplier_name'] . " - " . $trans['SupplierCurrCode'];
+ label_row(_("Supplier:"), $supp.hidden('supplier_id', $_POST['supplier_id'], false));
+ }
+ else
+ {
+ if (!isset($_POST['supplier_id']) && (get_global_supplier() != reserved_words::get_all()))
+ $_POST['supplier_id'] = get_global_supplier();
+ supplier_list_row(_("Supplier:"), 'supplier_id', $_POST['supplier_id'], false, true);
+ }
if ($supp_trans->supplier_id != $_POST['supplier_id'])
{
// supplier has changed
else
ref_row(_("Reference:"), 'reference', '', references::get_next(21));
- text_row(_("Supplier's Ref.:"), 'supp_reference', $_POST['supp_reference'], 20, 20);
+ if (isset($_POST['invoice_no']))
+ {
+ label_row(_("Supplier's Ref.:"), $_POST['invoice_no'].hidden('invoice_no', $_POST['invoice_no'], false).hidden('supp_reference', $_POST['invoice_no'], false));
+ }
+ else
+ text_row(_("Supplier's Ref.:"), 'supp_reference', $_POST['supp_reference'], 20, 20);
table_section(2, "33%");
- date_row(_("Date") . ":", 'tran_date', '', null, 0, 0, 0, "", true);
+ date_row(_("Date") . ":", 'tran_date', '', true, 0, 0, 0, "", true);
if (isset($_POST['_tran_date_changed'])) {
$Ajax->activate('_ex_rate');
$supp_trans->tran_date = $_POST['tran_date'];
function display_gl_items(&$supp_trans, $mode=0)
{
- global $table_style, $path_to_root;
+ global $table_style, $path_to_root, $Ajax;
// if displaying in form, and no items, exit
if (($mode == 2 || $mode == 3) && count($supp_trans->gl_codes) == 0)
if ($mode == 1)
{
- $qes = has_quick_entries(-1, 0);
+ $qes = has_quick_entries(QE_SUPPINV);
if ($qes !== false)
{
echo "<div style='float:right;'>";
echo _("Quick Entry:")." ";
- quick_entries_list('qid', null, 0, 1);
- echo " "._("Amount")." ";
- $amount = input_num('totamount');
+ quick_entries_list('qid', null, QE_SUPPINV, true);
+ $qid = get_quick_entry(get_post('qid'));
+ if (list_updated('qid')) {
+ unset($_POST['totamount']); // enable default
+ $Ajax->activate('totamount');
+ }
+ echo " ".$qid['base_desc'].":"." ";
+
+ $amount = input_num('totamount', $qid['base_amount']);
$dec = user_price_dec();
echo "<input class='amount' type='text' name='totamount' size='7' maxlength='12' dec='$dec' value='$amount'> ";
submit('go', _("Go"), true, false, true);
echo "</div>";
+
}
}
display_heading($heading);
label_cell("");
}
end_row();
-
- $total_gl_value += $entered_gl_code->amount;
-
+ /////////// 2009-08-18 Joe Hunt
+ if ($mode > 1 && !is_tax_account($entered_gl_code->gl_code))
+ $total_gl_value += $entered_gl_code->amount;
+ else
+ $total_gl_value += $entered_gl_code->amount;
$i++;
if ($i > 15)
{
if ($supp_trans->is_invoice)
$result = get_grn_items(0, $supp_trans->supplier_id, true);
- else
- $result = get_grn_items(0, $supp_trans->supplier_id, false, true);
-
+ else
+ {
+ if (isset($_POST['receive_begin']) && isset($_POST['receive_end']))
+ $result = get_grn_items(0, $supp_trans->supplier_id, false, true, 0, $_POST['receive_begin'], $_POST['receive_end']);
+ else if (isset($_POST['invoice_no']))
+ $result = get_grn_items(0, $supp_trans->supplier_id, false, true, $_POST['invoice_no']);
+ else
+ $result = get_grn_items(0, $supp_trans->supplier_id, false, true);
+ }
if (db_num_rows($result) == 0)
{
return false;
else
qty_cells(null, 'This_QuantityCredited'.$n, number_format2(max($myrow["quantity_inv"], 0), $dec),
null, null, $dec);
- amount_cells(null, 'ChgPrice'.$n, price_format($myrow["unit_price"]));
+ $dec2 = 0;
+ amount_cells(null, 'ChgPrice'.$n, price_decimal_format($myrow["unit_price"], $dec2), null, null, $dec2);
if ($supp_trans->is_invoice)
amount_cell(round2($myrow["unit_price"] * ($myrow["qty_recd"] - $myrow["quantity_inv"]), user_price_dec()));
else
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->is_invoice && $_SESSION["wa_current_user"]->access == 2) // Added 2008-10-18 by Joe Hunt. Only admins can remove GRNs
+ if ($supp_trans->is_invoice && $_SESSION["wa_current_user"]->access == 2) { // Added 2008-10-18 by Joe Hunt. Only admins can remove GRNs
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();
}
}
if ($mode == 1)
{
+ if (!$supp_trans->is_invoice && !isset($_POST['invoice_no']))
+ {
+ echo "</td>";
+ date_cells(_("Received between"), 'receive_begin', "", null, -30, 0, 0, "valign=middle");
+ date_cells(_("and"), 'receive_end', '', null, 1, 0, 0, "valign=middle");
+ submit_cells('RefreshInquiry', _("Search"),'',_('Refresh Inquiry'), true);
+ echo "<td>";
+ }
+
if ($heading2 != "")
{
//br();
qty_cell($entered_grn->prev_quantity_inv, false, $dec);
}
qty_cell(abs($entered_grn->this_quantity_inv), true, $dec);
- amount_cell($entered_grn->chg_price);
+ amount_decimal_cell($entered_grn->chg_price);
amount_cell( round2($entered_grn->chg_price * abs($entered_grn->this_quantity_inv), user_price_dec()), true);
if ($mode == 1)
projects / fa-stable.git / blobdiff