projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added report langauge selector
[fa-stable.git]
/
sales
/
allocations
/
customer_allocation_main.php
diff --git
a/sales/allocations/customer_allocation_main.php
b/sales/allocations/customer_allocation_main.php
index 5e7d292a872f817b2bc516412fa4fa6105f9c882..ef40147e2a8490753961653b0d1d4e1ab9e15b3b 100644
(file)
--- a/
sales/allocations/customer_allocation_main.php
+++ b/
sales/allocations/customer_allocation_main.php
@@
-9,8
+9,8
@@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
***********************************************************************/
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
***********************************************************************/
-$pa
th_to_root="../.."
;
-$pa
ge_security = 3
;
+$pa
ge_security = 'SA_SALESALLOC'
;
+$pa
th_to_root = "../.."
;
include($path_to_root . "/includes/db_pager.inc");
include_once($path_to_root . "/includes/session.inc");
include($path_to_root . "/includes/db_pager.inc");
include_once($path_to_root . "/includes/session.inc");
@@
-19,31
+19,25
@@
include_once($path_to_root . "/sales/includes/sales_db.inc");
$js = "";
if ($use_popup_windows)
$js .= get_js_open_window(900, 500);
$js = "";
if ($use_popup_windows)
$js .= get_js_open_window(900, 500);
-page(_("Customer Allocations"), false, false, "", $js);
+page(_(
$help_context =
"Customer Allocations"), false, false, "", $js);
//--------------------------------------------------------------------------------
//--------------------------------------------------------------------------------
-set_editor('customer', 'customer_id' , 'ShowSettled');
start_form();
/* show all outstanding receipts and credits to be allocated */
start_form();
/* show all outstanding receipts and credits to be allocated */
- /*Clear any previous allocation records */
- if (isset($_SESSION['alloc']))
- {
- unset($_SESSION['alloc']->allocs);
- unset($_SESSION['alloc']);
- }
- if (!isset($_POST['customer_id']))
+
+ if (!isset($_POST['customer_id']))
$_POST['customer_id'] = get_global_customer();
echo "<center>" . _("Select a customer: ") . " ";
$_POST['customer_id'] = get_global_customer();
echo "<center>" . _("Select a customer: ") . " ";
- customer_list('customer_id', $_POST['customer_id'], true, true);
+
echo
customer_list('customer_id', $_POST['customer_id'], true, true);
echo "<br>";
check(_("Show Settled Items:"), 'ShowSettled', null, true);
echo "</center><br><br>";
set_global_customer($_POST['customer_id']);
echo "<br>";
check(_("Show Settled Items:"), 'ShowSettled', null, true);
echo "</center><br><br>";
set_global_customer($_POST['customer_id']);
- if (isset($_POST['customer_id']) && ($_POST['customer_id'] ==
reserved_words::get_all()
))
+ if (isset($_POST['customer_id']) && ($_POST['customer_id'] ==
ALL_TEXT
))
{
unset($_POST['customer_id']);
}
{
unset($_POST['customer_id']);
}
@@
-65,7
+59,9
@@
start_form();
//--------------------------------------------------------------------------------
function systype_name($dummy, $type)
{
//--------------------------------------------------------------------------------
function systype_name($dummy, $type)
{
- return systypes::name($type);
+ global $systypes_array;
+
+ return $systypes_array[$type];
}
function trans_view($trans)
}
function trans_view($trans)
@@
-113,10
+109,6
@@
if (isset($_POST['customer_id'])) {
$table =& new_db_pager('alloc_tbl', $sql, $cols);
$table->set_marker('check_settled', _("Marked items are settled."), 'settledbg', 'settledfg');
$table =& new_db_pager('alloc_tbl', $sql, $cols);
$table->set_marker('check_settled', _("Marked items are settled."), 'settledbg', 'settledfg');
-if (get_post('_ShowSettled_update') || get_post('_customer_id_update')) {
- $table->set_sql($sql);
- $table->set_columns($cols);
-}
$table->width = "75%";
display_db_pager($table);
$table->width = "75%";
display_db_pager($table);