projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Additional access control related ui helpers added: check_edit_access, access_post...
[fa-stable.git]
/
sales
/
customer_invoice.php
diff --git
a/sales/customer_invoice.php
b/sales/customer_invoice.php
index d71084785717cbc44a37521e08eddb744925a97c..7f46f16968f61aea38bf28f7c13bd701422fcae5 100644
(file)
--- a/
sales/customer_invoice.php
+++ b/
sales/customer_invoice.php
@@
-27,10
+27,10
@@
include_once($path_to_root . "/taxes/tax_calc.inc");
include_once($path_to_root . "/admin/db/shipping_db.inc");
$js = "";
include_once($path_to_root . "/admin/db/shipping_db.inc");
$js = "";
-if ($use_popup_windows) {
+if ($
SysPrefs->
use_popup_windows) {
$js .= get_js_open_window(900, 500);
}
$js .= get_js_open_window(900, 500);
}
-if (
$use_date_picker
) {
+if (
user_use_date_picker()
) {
$js .= get_js_date_picker();
}
$js .= get_js_date_picker();
}
@@
-47,7
+47,8
@@
if (isset($_GET['ModifyInvoice'])) {
page($_SESSION['page_title'], false, false, "", $js);
//-----------------------------------------------------------------------------
page($_SESSION['page_title'], false, false, "", $js);
//-----------------------------------------------------------------------------
-check_edit_conflicts();
+
+check_edit_conflicts(get_post('cart_id'));
if (isset($_GET['AddedID'])) {
if (isset($_GET['AddedID'])) {
@@
-65,6
+66,10
@@
if (isset($_GET['AddedID'])) {
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");
+ if (!db_num_rows(get_allocatable_from_cust_transactions(null, $invoice_no, $trans_type)))
+ hyperlink_params("$path_to_root/sales/customer_payments.php", _("Entry &customer payment for this invoice"),
+ "SInvoice=".$invoice_no);
+
hyperlink_params("$path_to_root/admin/attachments.php", _("Add an Attachment"), "filterType=$trans_type&trans_no=$invoice_no");
display_footer_exit();
hyperlink_params("$path_to_root/admin/attachments.php", _("Add an Attachment"), "filterType=$trans_type&trans_no=$invoice_no");
display_footer_exit();
@@
-129,7
+134,7
@@
if ( (isset($_GET['DeliveryNumber']) && ($_GET['DeliveryNumber'] > 0) )
} elseif (isset($_GET['ModifyInvoice']) && $_GET['ModifyInvoice'] > 0) {
} elseif (isset($_GET['ModifyInvoice']) && $_GET['ModifyInvoice'] > 0) {
- check_is_
closed
(ST_SALESINVOICE, $_GET['ModifyInvoice']);
+ check_is_
editable
(ST_SALESINVOICE, $_GET['ModifyInvoice']);
/*
if ( get_sales_parent_numbers(ST_SALESINVOICE, $_GET['ModifyInvoice']) == 0) { // 1.xx compatibility hack
echo"<center><br><b>" . _("There are no delivery notes for this invoice.<br>
/*
if ( get_sales_parent_numbers(ST_SALESINVOICE, $_GET['ModifyInvoice']) == 0) { // 1.xx compatibility hack
echo"<center><br><b>" . _("There are no delivery notes for this invoice.<br>
@@
-138,7
+143,6
@@
if ( (isset($_GET['DeliveryNumber']) && ($_GET['DeliveryNumber'] > 0) )
display_footer_exit();
}
*/
display_footer_exit();
}
*/
- check_is_closed(ST_SALESINVOICE, $_GET['ModifyInvoice']);
processing_start();
$_SESSION['Items'] = new Cart(ST_SALESINVOICE, $_GET['ModifyInvoice']);
processing_start();
$_SESSION['Items'] = new Cart(ST_SALESINVOICE, $_GET['ModifyInvoice']);
@@
-333,12
+337,6
@@
function check_data()
set_focus('ref');
return false;
}
set_focus('ref');
return false;
}
-
- if (!is_new_reference($_POST['ref'], 10)) {
- display_error(_("The entered reference is already in use."));
- set_focus('ref');
- return false;
- }
}
if(!$prepaid)
}
if(!$prepaid)
@@
-374,19
+372,27
@@
function check_data()
//-----------------------------------------------------------------------------
if (isset($_POST['process_invoice']) && check_data()) {
//-----------------------------------------------------------------------------
if (isset($_POST['process_invoice']) && check_data()) {
-
$newinvoice= $_SESSION['Items']->trans_no == 0;
copy_to_cart();
$newinvoice= $_SESSION['Items']->trans_no == 0;
copy_to_cart();
- if ($newinvoice) new_doc_date($_SESSION['Items']->document_date);
+ if ($newinvoice)
+ new_doc_date($_SESSION['Items']->document_date);
$invoice_no = $_SESSION['Items']->write();
$invoice_no = $_SESSION['Items']->write();
- processing_end();
-
- if ($newinvoice) {
- meta_forward($_SERVER['PHP_SELF'], "AddedID=$invoice_no");
- } else {
- meta_forward($_SERVER['PHP_SELF'], "UpdatedID=$invoice_no");
+ if ($invoice_no == -1)
+ {
+ display_error(_("The entered reference is already in use."));
+ set_focus('ref');
}
}
+ else
+ {
+ processing_end();
+
+ if ($newinvoice) {
+ meta_forward($_SERVER['PHP_SELF'], "AddedID=$invoice_no");
+ } else {
+ meta_forward($_SERVER['PHP_SELF'], "UpdatedID=$invoice_no");
+ }
+ }
}
if(list_updated('payment')) {
}
if(list_updated('payment')) {
@@
-688,4
+694,3
@@
end_form();
end_page();
end_page();
-?>