X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcustomer_invoice.php;h=9836de48fad516e4330dcd2c0eb17b8a60b08a55;hb=499e0e615d1a845c6c519754b3a213fdda0513ba;hp=ca3df67fb3a1693b3bfee5dd8e030b3c9563481e;hpb=f6857ddce763542393996620848daa7ce519842d;p=fa-stable.git
diff --git a/sales/customer_invoice.php b/sales/customer_invoice.php
index ca3df67f..9836de48 100644
--- a/sales/customer_invoice.php
+++ b/sales/customer_invoice.php
@@ -1,4 +1,14 @@
.
+***********************************************************************/
//---------------------------------------------------------------------------
//
// Entry/Modify Sales Invoice against single delivery
@@ -35,6 +45,7 @@ if (isset($_GET['ModifyInvoice'])) {
page($_SESSION['page_title'], false, false, "", $js);
//-----------------------------------------------------------------------------
+check_edit_conflicts();
if (isset($_GET['AddedID'])) {
@@ -43,13 +54,13 @@ if (isset($_GET['AddedID'])) {
display_notification(_("Selected deliveries has been processed"), true);
- display_note(get_customer_trans_view_str($trans_type, $invoice_no, _("View This Invoice")), 0, 1);
+ display_note(get_customer_trans_view_str($trans_type, $invoice_no, _("&View This Invoice")), 0, 1);
- display_note(print_document_link($invoice_no, _("Print This Invoice"), true, 10));
+ display_note(print_document_link($invoice_no, _("&Print This Invoice"), true, 10));
- display_note(get_gl_view_str($trans_type, $invoice_no, _("View the GL Journal Entries for this Invoice")),1);
+ display_note(get_gl_view_str($trans_type, $invoice_no, _("View the GL &Journal Entries for this Invoice")),1);
- hyperlink_params("$path_to_root/sales/inquiry/sales_deliveries_view.php", _("Select Another Delivery For Invoicing"), "OutstandingOnly=1");
+ hyperlink_params("$path_to_root/sales/inquiry/sales_deliveries_view.php", _("Select Another &Delivery For Invoicing"), "OutstandingOnly=1");
display_footer_exit();
@@ -59,11 +70,11 @@ if (isset($_GET['AddedID'])) {
display_notification_centered(sprintf(_('Sales Invoice # %d has been updated.'),$invoice_no));
- display_note(get_trans_view_str(10, $invoice_no, _("View This Invoice")));
+ display_note(get_trans_view_str(10, $invoice_no, _("&View This Invoice")));
echo '
';
- display_note(print_document_link($invoice_no, _("Print This Invoice"), true, 10));
+ display_note(print_document_link($invoice_no, _("&Print This Invoice"), true, 10));
- hyperlink_no_params($path_to_root . "/sales/inquiry/customer_inquiry.php", _("Select A Different Invoice to Modify"));
+ hyperlink_no_params($path_to_root . "/sales/inquiry/customer_inquiry.php", _("Select A Different &Invoice to Modify"));
display_footer_exit();
@@ -77,12 +88,16 @@ if (isset($_GET['AddedID'])) {
}
}
unset($line);
+
+ // Remove also src_doc delivery note
+ $sources = &$_SESSION['Items']->src_docs;
+ unset($sources[$_GET['RemoveDN']]);
}
//-----------------------------------------------------------------------------
if ( (isset($_GET['DeliveryNumber']) && ($_GET['DeliveryNumber'] > 0) )
- || isset($_GET['BatchInvoice'])) {
+|| isset($_GET['BatchInvoice'])) {
processing_start();
@@ -113,7 +128,7 @@ if ( (isset($_GET['DeliveryNumber']) && ($_GET['DeliveryNumber'] > 0) )
} elseif (isset($_GET['ModifyInvoice']) && $_GET['ModifyInvoice'] > 0) {
if ( get_parent_trans(10, $_GET['ModifyInvoice']) == 0) { // 1.xx compatibility hack
- echo"