X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=purchasing%2Fincludes%2Fui%2Finvoice_ui.inc;h=a508d4bb0924a28b625fe3ee36434e2af66f60dc;hb=e735f0a06f8a43ed4885ff51a5c0b4332c130b40;hp=0694cdaed82828180523bfb153d982fc5a12362a;hpb=802dea67580f5dbedab6920760e040b0cb535aef;p=fa-stable.git
diff --git a/purchasing/includes/ui/invoice_ui.inc b/purchasing/includes/ui/invoice_ui.inc
index 0694cdae..a508d4bb 100644
--- a/purchasing/includes/ui/invoice_ui.inc
+++ b/purchasing/includes/ui/invoice_ui.inc
@@ -19,6 +19,7 @@ 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['tax_algorithm'] = $supp_trans->tax_algorithm;
}
//--------------------------------------------------------------------------------------------------
@@ -30,6 +31,8 @@ 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'];
+ if (isset($_POST['tax_algorithm']))
+ $supp_trans->tax_algorithm = $_POST['tax_algorithm'];
$supp_trans->ov_amount = 0; /* for starters */
if (count($supp_trans->grn_items) > 0)
@@ -45,7 +48,7 @@ function copy_to_trans(&$supp_trans)
foreach ( $supp_trans->gl_codes as $gl_line)
{
////////// 2009-08-18 Joe Hunt
- if (!is_tax_account($gl_line->gl_code))
+ if (!is_tax_account($gl_line->gl_code) || $supp_trans->tax_included)
$supp_trans->ov_amount += $gl_line->amount;
}
}
@@ -65,19 +68,28 @@ function invoice_header(&$supp_trans)
table_section(1);
- if (isset($_POST['invoice_no']))
+ if ($supp_trans->trans_type == ST_SUPPCREDIT && $supp_trans->src_docs)
{
- $trans = get_supp_trans($_POST['invoice_no'], ST_SUPPINVOICE);
- $_POST['supplier_id'] = $trans['supplier_id'];
- $supp = $trans['supplier_name'] . " - " . $trans['SupplierCurrCode'];
+// $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));
- }
+ }
else
{
if (!isset($_POST['supplier_id']) && (get_global_supplier() != ALL_TEXT))
$_POST['supplier_id'] = get_global_supplier();
- supplier_list_row(_("Supplier:"), 'supplier_id', $_POST['supplier_id'], false, true);
+ if (!$supp_trans->trans_no)
+ supplier_list_row(_("Supplier:"), 'supplier_id', $_POST['supplier_id'], false, true);
+ else
+ label_row(_("Supplier:"), $supp_trans->supplier_name
+ .($supp_trans->currency ? ' - '.$supp_trans->currency : '')
+ .hidden('supplier_id', $_POST['supplier_id'], false));
}
if ($supp_trans->supplier_id != $_POST['supplier_id'])
{
@@ -111,7 +123,7 @@ function invoice_header(&$supp_trans)
date_row(_("Due Date") . ":", 'due_date');
- label_row(_("Terms:"), $supp_trans->terms_description);
+ label_row(_("Terms:"), $supp_trans->terms['description']);
table_section(3, "33%");
@@ -128,6 +140,7 @@ function invoice_header(&$supp_trans)
}
label_row(_("Tax Group:"), $supp_trans->tax_description);
+ supplier_credit_row($supp_trans->supplier_id, $supp_trans->credit);
end_outer_table(1);
}
@@ -136,15 +149,18 @@ function invoice_header(&$supp_trans)
function invoice_totals(&$supp_trans)
{
+ global $Ajax;
+
copy_to_trans($supp_trans);
$dim = get_company_pref('use_dimension');
$colspan = ($dim == 2 ? 7 : ($dim == 1 ? 6 : 5));
+ 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");
$taxes = $supp_trans->get_taxes($supp_trans->tax_group_id);
- $tax_total = display_edit_tax_items($taxes, $colspan, 0); // tax_included==0 (we are the company)
+ $tax_total = display_edit_tax_items($taxes, $colspan, $supp_trans->tax_included);
$display_total = price_format($supp_trans->ov_amount + $tax_total);
@@ -157,15 +173,22 @@ function invoice_totals(&$supp_trans)
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'];
+ $_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);
@@ -252,7 +275,7 @@ function display_gl_items(&$supp_trans, $mode=0)
$th[] = "";
}
table_header($th);
- $total_gl_value=0;
+ $total_gl_value=$total = 0;
$i = $k = 0;
if (count($supp_trans->gl_codes) > 0)
@@ -285,10 +308,13 @@ function display_gl_items(&$supp_trans, $mode=0)
}
end_row();
/////////// 2009-08-18 Joe Hunt
- if ($mode > 1 && !is_tax_account($entered_gl_code->gl_code))
- $total_gl_value += $entered_gl_code->amount;
+ if ($mode > 1) {
+ if ($supp_trans->tax_included || !is_tax_account($entered_gl_code->gl_code))
+ $total_gl_value += $entered_gl_code->amount;
+ }
else
$total_gl_value += $entered_gl_code->amount;
+ $total += $entered_gl_code->amount;
$i++;
if ($i > 15)
{
@@ -301,7 +327,7 @@ function display_gl_items(&$supp_trans, $mode=0)
if ($mode == 1)
display_gl_controls($supp_trans, $k);
$colspan = ($dim == 2 ? 4 : ($dim == 1 ? 3 : 2));
- label_row(_("Total"), price_format($total_gl_value),
+ label_row(_("Total"), price_format($total),
"colspan=".$colspan." align=right", "nowrap align=right", ($mode==1?3:1));
end_table(1);
@@ -314,14 +340,14 @@ 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);
+ if ($supp_trans->trans_type == ST_SUPPINVOICE) // outstanding grns and eventually for selected invoice
+ $result = get_grn_items(0, $supp_trans->supplier_id, true, false, $supp_trans->trans_no);
else
- {
+ { // 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 (isset($_POST['invoice_no']))
- $result = get_grn_items(0, $supp_trans->supplier_id, false, true, $_POST['invoice_no']);
+ else if ($supp_trans->src_docs)
+ $result = get_grn_items(0, $supp_trans->supplier_id, false, true, array_keys($supp_trans->src_docs));
else
$result = get_grn_items(0, $supp_trans->supplier_id, false, true);
}
@@ -343,13 +369,14 @@ function display_grn_items_for_selection(&$supp_trans, $k)
$grn_already_on_invoice = true;
}
}
+
if ($grn_already_on_invoice == false)
{
alt_table_row_color($k);
$n = $myrow["id"];
- label_cell(get_trans_view_str(25, $myrow["grn_batch_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).
@@ -368,15 +395,20 @@ function display_grn_items_for_selection(&$supp_trans, $k)
if ($supp_trans->trans_type == ST_SUPPINVOICE)
qty_cells(null, 'this_quantity_inv'.$n, number_format2($myrow["qty_recd"] - $myrow["quantity_inv"], $dec),
null, null, $dec);
- else
+ else
qty_cells(null, 'This_QuantityCredited'.$n, number_format2(max($myrow["quantity_inv"], 0), $dec),
null, null, $dec);
- $dec2 = 0;
- amount_cells(null, 'ChgPrice'.$n, price_decimal_format($myrow["unit_price"], $dec2), null, null, $dec2);
+ $dec2 = 0;
if ($supp_trans->trans_type == ST_SUPPINVOICE)
+ {
+ amount_cells(null, 'ChgPrice'.$n, price_decimal_format($myrow["unit_price"], $dec2), null, null, $dec2);
amount_cell(round2($myrow["unit_price"] * ($myrow["qty_recd"] - $myrow["quantity_inv"]), user_price_dec()));
- else
- amount_cell(round2($myrow["unit_price"] * max($myrow['quantity_inv'], 0), user_price_dec()));
+ }
+ else
+ {
+ amount_cells(null, 'ChgPrice'.$n, price_decimal_format($myrow["act_price"], $dec2), null, null, $dec2);
+ amount_cell(round2($myrow["act_price"] * max($myrow['quantity_inv'], 0), user_price_dec()));
+ }
if ($supp_trans->trans_type == ST_SUPPINVOICE)
submit_cells('grn_item_id'.$n, _("Add"), '', _("Add to Invoice"), true);
else
@@ -428,28 +460,28 @@ function display_grn_items(&$supp_trans, $mode=0)
$heading = _("Received Items Charged on this Invoice");
else
$heading = _("Received Items Credited on this Note");
- }
+ }
display_heading($heading);
if ($mode == 1)
{
- if ($supp_trans->trans_type == ST_SUPPCREDIT && !isset($_POST['invoice_no']))
+ if ($supp_trans->trans_type == ST_SUPPCREDIT)
{
echo "";
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 "| ";
- }
-
+ }
+
if ($heading2 != "")
{
display_note($heading2, 0, 0, "class='overduefg'");
- }
+ }
echo " | ";
submit('InvGRNAll', _("Add All Items"), true, false,true);
- }
+ }
end_outer_table(0, false);
@@ -459,7 +491,8 @@ function display_grn_items(&$supp_trans, $mode=0)
{
$th = array(_("Delivery"), _("Sequence #"), _("P.O."), _("Item"), _("Description"),
_("Received On"), _("Quantity Received"), _("Quantity Invoiced"),
- _("Qty Yet To Invoice"), _("Order Price"), _("Total"), "");
+ _("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)
@@ -552,19 +585,22 @@ function display_grn_items(&$supp_trans, $mode=0)
}
//--------------------------------------------------------------------------------------------------
-function get_duedate_from_terms(&$supp_trans)
+function get_duedate_from_terms(&$trans)
{
- if (!is_date($supp_trans->tran_date))
+ $date = get_class($trans) == 'purch_order' ? $trans->orig_order_date : $trans->tran_date;
+
+ if (!is_date($date))
{
- $supp_trans->tran_date = Today();
+ $date = Today();
}
- if (substr( $supp_trans->terms, 0, 1) == "1")
+ if ($trans->terms['day_in_following_month'])
{ /*Its a day in the following month when due */
- $supp_trans->due_date = add_days(end_month($supp_trans->tran_date), (int) substr( $supp_trans->terms,1));
+ $trans->due_date =
+ add_days(end_month($date), $trans->terms["day_in_following_month"]);
}
else
{ /*Use the Days Before Due to add to the invoice date */
- $supp_trans->due_date = add_days($supp_trans->tran_date, (int) substr( $supp_trans->terms,1));
+ $trans->due_date = add_days($date, $trans->terms["days_before_due"]);
}
}
|