projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Vlrsnup according to Apmuthu's list.
[fa-stable.git]
/
sales
/
customer_invoice.php
diff --git
a/sales/customer_invoice.php
b/sales/customer_invoice.php
index 155120dfe19e36dc7788ebe42da1b08dc3f53217..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();
}
@@
-48,7
+48,7
@@
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'])) {
@@
-66,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();
@@
-690,4
+694,3
@@
end_form();
end_page();
end_page();
-?>