X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fsupplier_invoice.php;h=148e7b92b9b18aec0ad0a0b6e71ebf0af0c94e44;hb=2e181b13aa722a43e78b897404912d6b13a0a937;hp=28f7f33b982c9846f6e4f2e1759e751b901e1532;hpb=0517097815894f0221e3755a2d14612f69f72b86;p=fa-stable.git
diff --git a/purchasing/supplier_invoice.php b/purchasing/supplier_invoice.php
index 28f7f33b..148e7b92 100644
--- a/purchasing/supplier_invoice.php
+++ b/purchasing/supplier_invoice.php
@@ -1,5 +1,14 @@
.
+***********************************************************************/
$page_security=5;
$path_to_root="..";
@@ -84,7 +93,7 @@ function clear_fields()
unset($_POST['amount']);
unset($_POST['memo_']);
unset($_POST['AddGLCodeToTrans']);
- $Ajax->activate('gl_ctrls');
+ $Ajax->activate('gl_items');
set_focus('gl_code');
}
//------------------------------------------------------------------------------------------------
@@ -265,12 +274,11 @@ function check_item_data($n)
return true;
}
-$id = find_submit('grn_item_id');
-if ($id != -1)
+function commit_item_data($n)
{
- if (check_item_data($id))
+ if (check_item_data($n))
{
- if (input_num('this_quantity_inv'.$id) >= ($_POST['qty_recd'.$id] - $_POST['prev_quantity_inv'.$id]))
+ if (input_num('this_quantity_inv'.$n) >= ($_POST['qty_recd'.$n] - $_POST['prev_quantity_inv'.$n]))
{
$complete = true;
}
@@ -279,78 +287,67 @@ if ($id != -1)
$complete = false;
}
- $_SESSION['supp_trans']->add_grn_to_trans($id, $_POST['po_detail_item'.$id],
- $_POST['item_code'.$id], $_POST['item_description'.$id], $_POST['qty_recd'.$id],
- $_POST['prev_quantity_inv'.$id], input_num('this_quantity_inv'.$id),
- $_POST['order_price'.$id], input_num('ChgPrice'.$id), $complete,
- $_POST['std_cost_unit'.$id], "");
+ $_SESSION['supp_trans']->add_grn_to_trans($n, $_POST['po_detail_item'.$n],
+ $_POST['item_code'.$n], $_POST['item_description'.$n], $_POST['qty_recd'.$n],
+ $_POST['prev_quantity_inv'.$n], input_num('this_quantity_inv'.$n),
+ $_POST['order_price'.$n], input_num('ChgPrice'.$n), $complete,
+ $_POST['std_cost_unit'.$n], "");
}
}
-//--------------------------------------------------------------------------------------------------
-$id = find_submit('Delete');
-if ($id != -1)
-{
- $_SESSION['supp_trans']->remove_grn_from_trans($id);
- $Ajax->activate('grn_items');
- $Ajax->activate('grn_table');
- $Ajax->activate('inv_tot');
-}
+//-----------------------------------------------------------------------------------------
-$id = find_submit('Delete2');
+$id = find_submit('grn_item_id');
if ($id != -1)
{
- $_SESSION['supp_trans']->remove_gl_codes_from_trans($id);
- clear_fields();
- $Ajax->activate('gl_items');
- $Ajax->activate('inv_tot');
+ commit_item_data($id);
}
-start_form(false, true);
-
-start_table("$table_style2 width=98%", 8);
-echo "
"; // outer table
-
-echo "";
-
-invoice_header($_SESSION['supp_trans']);
-if ($_POST['supplier_id']=='')
- display_error('No supplier found for entered search text');
-else {
- echo " |
"; // outer table
-
- echo "";
-
- display_grn_items($_SESSION['supp_trans'], 1);
- //display_grn_items_for_selection();
- display_gl_items($_SESSION['supp_trans'], 1);
- //display_gl_controls();
-
- //echo " |
"; // outer table
- echo " ";
- div_start('inv_tot');
- invoice_totals($_SESSION['supp_trans']);
- div_end();
-}
-echo " |
";
-
-end_table(); // outer table
+if (isset($_POST['InvGRNAll']))
+{
+ foreach($_POST as $postkey=>$postval )
+ {
+ if (strpos($postkey, "qty_recd") === 0)
+ {
+ $id = substr($postkey, strlen("qty_recd"));
+ $id = (int)$id;
+ commit_item_data($id);
+ }
+ }
+}
-//-----------------------------------------------------------------------------------------
-$id = find_submit('grn_item_id');
-$id2 = find_submit('void_item_id');
-if ($id != -1 || $id2 != -1)
+//--------------------------------------------------------------------------------------------------
+$id3 = find_submit('Delete');
+if ($id3 != -1)
{
- $Ajax->activate('grn_table');
+ $_SESSION['supp_trans']->remove_grn_from_trans($id3);
$Ajax->activate('grn_items');
$Ajax->activate('inv_tot');
}
-if (get_post('AddGLCodeToTrans'))
+$id4 = find_submit('Delete2');
+if ($id4 != -1)
+{
+ $_SESSION['supp_trans']->remove_gl_codes_from_trans($id4);
+ clear_fields();
+ $Ajax->activate('gl_items');
$Ajax->activate('inv_tot');
+}
+$id2 = -1;
if ($_SESSION["wa_current_user"]->access == 2)
{
+ $id3 = find_submit('void_item_id');
+ if ($id3 != -1)
+ {
+ $js = "if(confirm(\""
+ .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 ?'), $id3)
+ ."\")) {
+ JsHttpRequest.request(\"void_confirm".$id3."\");
+ }";
+ $Ajax->addScript(true,$js);
+ }
+ $id2 = find_submit('void_confirm');
if ($id2 != -1) // Added section 2008-10-18 Joe Hunt for voiding delivery lines
{
begin_transaction();
@@ -374,12 +371,53 @@ if ($_SESSION["wa_current_user"]->access == 2)
-$myrow["QtyOstdg"], $myrow['std_cost_unit'], $grn["supplier_id"], 1, $myrow['unit_price']);
commit_transaction();
+ display_notification(sprintf(_('All yet non-invoiced items on delivery line # %d has been removed.'), $id2));
+
}
}
-echo "
";
+if (isset($_POST['go']))
+{
+ $Ajax->activate('gl_items');
+ display_quick_entries($_SESSION['supp_trans'], $_POST['qid'], input_num('totamount'), QE_SUPPINV);
+ $_POST['totamount'] = price_format(0); $Ajax->activate('totamount');
+ $Ajax->activate('inv_tot');
+}
+
+start_form(false, true);
+
+invoice_header($_SESSION['supp_trans']);
+
+if ($_POST['supplier_id']=='')
+ display_error('No supplier found for entered search text');
+else {
+ start_outer_table("$table_style2 width=98%", 5);
+
+ display_grn_items($_SESSION['supp_trans'], 1);
+
+ display_gl_items($_SESSION['supp_trans'], 1);
+
+ div_start('inv_tot');
+ invoice_totals($_SESSION['supp_trans']);
+ div_end();
+
+ end_outer_table(0, false);
+}
+
+//-----------------------------------------------------------------------------------------
+
+if ($id != -1 || $id2 != -1)
+{
+ $Ajax->activate('grn_items');
+ $Ajax->activate('inv_tot');
+}
+
+if (get_post('AddGLCodeToTrans'))
+ $Ajax->activate('inv_tot');
+
+br();
submit_center('PostInvoice', _("Enter Invoice"), true, '', true);
-echo "
";
+br();
end_form();