$_POST['supp_reference'] = $supp_trans->supp_reference;
$_POST['reference'] = $supp_trans->reference;
$_POST['supplier_id'] = $supp_trans->supplier_id;
- $_POST['tax_algorithm'] = $supp_trans->tax_algorithm;
+ $_POST['dimension'] = $supp_trans->dimension;
+ $_POST['dimension2'] = $supp_trans->dimension2;
+
+ $_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);
}
//--------------------------------------------------------------------------------------------------
$supp_trans->due_date = $_POST['due_date'];
$supp_trans->supp_reference = $_POST['supp_reference'];
$supp_trans->reference = $_POST['reference'];
- if (isset($_POST['tax_algorithm']))
- $supp_trans->tax_algorithm = $_POST['tax_algorithm'];
+ $supp_trans->dimension = @$_POST['dimension'];
+ $supp_trans->dimension2 = @$_POST['dimension2'];
+
+ $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)
{
foreach ( $supp_trans->gl_codes as $gl_line)
{
- ////////// 2009-08-18 Joe Hunt
if (!is_tax_account($gl_line->gl_code) || $supp_trans->tax_included)
$supp_trans->ov_amount += $gl_line->amount;
}
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);
if ($supp_trans->trans_type == ST_SUPPCREDIT && $supp_trans->src_docs)
{
-// $trans = get_supp_trans($_POST['invoice_no'], ST_SUPPINVOICE);
-// $trans = get_supp_trans($supp_trans->supplier_id, ST_SUPPINVOICE);
-// $_POST['supplier_id'] = $trans['supplier_id'];
-// $supp = $trans['supplier_name'] . " - " . $trans['SupplierCurrCode'];
-
$_POST['supplier_id'] = $supp_trans->supplier_id;
$supp = $supp_trans->supplier_name." - ".$supp_trans->currency;
label_row(_("Supplier:"), $supp.hidden('supplier_id', $_POST['supplier_id'], false));
copy_from_trans($supp_trans);
}
- ref_row(_("Reference:"), 'reference', '', $Refs->get_next($supp_trans->trans_type));
+ date_row(_("Date") . ":", 'tran_date', '', true, 0, 0, 0, "", true);
+
+ ref_row(_("Reference:"), 'reference', '', $Refs->get_next($supp_trans->trans_type, null,
+ array('supplier' => get_post('supplier_id'), 'date' => get_post('tran_date'))), false, $supp_trans->trans_type);
if ($supp_trans->trans_type == ST_SUPPCREDIT)
{
table_section(2, "33%");
- 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'];
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']);
if ($supplier_currency != $company_currency)
{
label_row(_("Supplier's Currency:"), "<b>" . $supplier_currency . "</b>");
- 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);
$dim = get_company_pref('use_dimension');
$colspan = ($dim == 2 ? 7 : ($dim == 1 ? 6 : 5));
div_start('tax_table');
- 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);
end_table(1);
start_table(TABLESTYLE2);
- tax_algorithm_list_row(_("Tax algorithm:"), 'tax_algorithm', null, true);
- if (list_updated('tax_algorithm')) {
- $supp_trans->tax_algorithm = $_POST['tax_algorithm'];
- $Ajax->activate('tax_table');
- }
textarea_row(_("Memo:"), "Comments", null, 50, 3);
end_table(1);
div_end();
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);
amount_cells(null, 'amount');
if ($dim < 1)
text_cells_ex(null, 'memo_', 35, 50, null, null, null, hidden('dimension_id', 0, false).hidden('dimension2_id', 0, false));
- else if ($dim < 2)
+ elseif ($dim < 2)
text_cells_ex(null, 'memo_', 35, 50, null, null, null, hidden('dimension2_id', 0, false));
else
text_cells_ex(null, 'memo_', 35, 50, null, null, null);
else
$heading = _("GL Items for this Credit Note");
- start_outer_table(TABLESTYLE, "width=95%");
+ start_outer_table(TABLESTYLE, "width='95%'");
if ($mode == 1)
{
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)
$th = array(_("Account"), _("Name"), _("Dimension")." 1", _("Dimension")." 2", _("Amount"), _("Memo"));
- else if ($dim == 1)
+ elseif ($dim == 1)
$th = array(_("Account"), _("Name"), _("Dimension"), _("Amount"), _("Memo"));
else
$th = array(_("Account"), _("Name"), _("Amount"), _("Memo"));
{
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();
- /////////// 2009-08-18 Joe Hunt
if ($mode > 1) {
if ($supp_trans->tax_included || !is_tax_account($entered_gl_code->gl_code))
$total_gl_value += $entered_gl_code->amount;
{ // only invoiced
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 ($supp_trans->src_docs)
+ 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;
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"]));
- 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(ST_PURCHORDER, $myrow["purch_order_no"]));
+ 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"]), "nowrap align='right'");
label_cell($myrow["item_code"]);
label_cell($myrow["description"]);
label_cell(sql2date($myrow["delivery_date"]));
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)
if ($supp_trans->trans_type == ST_SUPPCREDIT)
{
echo "</td>";
- date_cells(_("Received between"), 'receive_begin', "", null, -30, 0, 0, "valign=middle");
+ date_cells(_("Received between"), 'receive_begin', "", null,
+ -user_transaction_days(), 0, 0, "valign=middle");
date_cells(_("and"), 'receive_end', '', null, 1, 0, 0, "valign=middle");
submit_cells('RefreshInquiry', _("Search"),'',_('Refresh Inquiry'), true);
echo "<td>";
{
display_note($heading2, 0, 0, "class='overduefg'");
}
- echo "</td><td width=10% align='right'>";
+ echo "</td><td width='10%' align='right'>";
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"), "");
$th[] = "";
if ($supp_trans->trans_type == ST_SUPPCREDIT)
{
- $th[8] = _("Qty Yet To Credit");
+ $th[7] = _("Qty Yet To Credit");
}
}
else
label_cell(get_trans_view_str(ST_SUPPRECEIVE, $grn_batch));
if ($mode == 1)
{
- label_cell($entered_grn->id);
+// label_cell($entered_grn->id);
$row = get_grn_batch($grn_batch);
label_cell(get_trans_view_str(ST_PURCHORDER, $row["purch_order_no"])); // PO
}
$dec = get_qty_dec($entered_grn->item_code);
if ($mode == 1)
{
- label_cell("");
- qty_cell($entered_grn->qty_recd, false, $dec);
+ label_cell(sql2date($row['delivery_date']));
+ qty_cell($entered_grn->qty_recd, false, $dec);
qty_cell($entered_grn->prev_quantity_inv, false, $dec);
}
qty_cell(abs($entered_grn->this_quantity_inv), true, $dec);
if ($mode == 1)
{
$ret = display_grn_items_for_selection($supp_trans, $k);
- $colspan = 10;
+ $colspan = 9;
}
else
$colspan = 5;
//--------------------------------------------------------------------------------------------------
-?>
\ No newline at end of file
projects / fa-stable.git / blobdiff