projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged changes in main trunk up to 2.0.6 (see CHANGELOG)
[fa-stable.git]
/
sales
/
includes
/
db
/
sales_points_db.inc
diff --git
a/sales/includes/db/sales_points_db.inc
b/sales/includes/db/sales_points_db.inc
index 6f54fa2206d86c6e432259582bb096fbd67c65a2..d095c71191ca73c143dc6ef917079cba206b9929 100644
(file)
--- a/
sales/includes/db/sales_points_db.inc
+++ b/
sales/includes/db/sales_points_db.inc
@@
-27,7
+27,7
@@
function get_all_sales_points()
.TB_PREF."sales_pos as pos,"
.TB_PREF."locations as loc,"
.TB_PREF."bank_accounts as acc"
.TB_PREF."sales_pos as pos,"
.TB_PREF."locations as loc,"
.TB_PREF."bank_accounts as acc"
- ." WHERE pos.pos_location=loc.loc_code AND pos.pos_account=acc.
account_code
";
+ ." WHERE pos.pos_location=loc.loc_code AND pos.pos_account=acc.
id
";
return db_query($sql, "could not get all POS definitions");
}
return db_query($sql, "could not get all POS definitions");
}
@@
-38,7
+38,7
@@
function get_sales_point($id)
.TB_PREF."sales_pos as pos,"
.TB_PREF."locations as loc,"
.TB_PREF."bank_accounts as acc"
.TB_PREF."sales_pos as pos,"
.TB_PREF."locations as loc,"
.TB_PREF."bank_accounts as acc"
- ." WHERE
id=$id AND pos.pos_location=loc.loc_code AND pos.pos_account=acc.account_code
";
+ ." WHERE
pos.id=$id AND pos.pos_location=loc.loc_code AND pos.pos_account=acc.id
";
$result = db_query($sql, "could not get POS definition");
$result = db_query($sql, "could not get POS definition");