Supplier transactions now show supplier reference for PO Deliveries.

[fa-stable.git] / purchasing / includes / ui / invoice_ui.inc

diff --git a/purchasing/includes/ui/invoice_ui.inc b/purchasing/includes/ui/invoice_ui.inc
index 111ac32411c6c1973fcf60d2547dcb0a122f7313..ff9c84680d428b9ffdd25f1281022cec57d87265 100644 (file)
--- 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)
@@ -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:"), "<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);
@@ -145,7 +158,7 @@ function invoice_totals(&$supp_trans)
        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);
 
@@ -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
@@ -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();
        }