projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Moved all SQL statements from PHP files into relevant *_db.inc files.
[fa-stable.git]
/
admin
/
shipping_companies.php
diff --git
a/admin/shipping_companies.php
b/admin/shipping_companies.php
index 9422d8464b461c395bf1ed42cd66962ac23ce93c..fa7b264108d940c8544ea0b0991a6dfdeb1db031 100644
(file)
--- a/
admin/shipping_companies.php
+++ b/
admin/shipping_companies.php
@@
-53,7
+53,7
@@
if ($Mode == 'Delete')
{
// PREVENT DELETES IF DEPENDENT RECORDS IN 'sales_orders'
{
// PREVENT DELETES IF DEPENDENT RECORDS IN 'sales_orders'
- if (
sales_orders_has_shipper($selected_id
))
+ if (
key_in_foreign_table($selected_id, 'sales_orders', 'ship_via'
))
{
$cancel_delete = 1;
display_error(_("Cannot delete this shipping company because sales orders have been created using this shipper."));
{
$cancel_delete = 1;
display_error(_("Cannot delete this shipping company because sales orders have been created using this shipper."));
@@
-61,8
+61,7
@@
if ($Mode == 'Delete')
else
{
// PREVENT DELETES IF DEPENDENT RECORDS IN 'debtor_trans'
else
{
// PREVENT DELETES IF DEPENDENT RECORDS IN 'debtor_trans'
-
- if (debtor_trans_has_shipper($selected_id))
+ if (key_in_foreign_table($selected_id, 'debtor_trans', 'ship_via'))
{
$cancel_delete = 1;
display_error(_("Cannot delete this shipping company because invoices have been created using this shipping company."));
{
$cancel_delete = 1;
display_error(_("Cannot delete this shipping company because invoices have been created using this shipping company."));