X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fui%2Finvoice_ui.inc;h=d8dee0429e636996d0c6086cbf88a63234065d45;hb=477c1f221df891f39e9363f7b34e6ff1eb4ad4c7;hp=5d28ec6015e3fe086d3bd388715caf4018cc6668;hpb=50606312fee0bb0dbe984e2c08af53b7dab229bd;p=fa-stable.git diff --git a/purchasing/includes/ui/invoice_ui.inc b/purchasing/includes/ui/invoice_ui.inc index 5d28ec60..d8dee042 100644 --- a/purchasing/includes/ui/invoice_ui.inc +++ b/purchasing/includes/ui/invoice_ui.inc @@ -19,7 +19,13 @@ 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; + $_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); } //-------------------------------------------------------------------------------------------------- @@ -31,10 +37,20 @@ 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->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) @@ -64,7 +80,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); @@ -101,7 +117,10 @@ function invoice_header(&$supp_trans) 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) { @@ -109,9 +128,14 @@ 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%"); - 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']; @@ -135,7 +159,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); @@ -155,11 +179,11 @@ function invoice_totals(&$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%"); + 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); @@ -172,11 +196,6 @@ 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(); @@ -228,7 +247,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) { @@ -258,7 +277,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) @@ -376,14 +395,13 @@ function display_grn_items_for_selection(&$supp_trans, $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)); + 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($myrow["item_code"]); label_cell($myrow["description"]); @@ -439,7 +457,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) @@ -468,7 +486,8 @@ function display_grn_items(&$supp_trans, $mode=0) if ($supp_trans->trans_type == ST_SUPPCREDIT) { echo ""; - 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 "