Changeset 396
- Timestamp:
- 05/15/08 12:28:37
- Files:
-
- trunk/phpbms/THANKS.txt (modified) (1 diff)
- trunk/phpbms/modules/bms/report/aritems_clientstatement.php (modified) (2 diffs)
- trunk/phpbms/modules/bms/report/aritems_summary.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/phpbms/THANKS.txt
r381 r396 4 4 * Hauge Quality Water - http://haguekc.com/ 5 5 * Black Tie: Audio, Lighting & Video - http://blacktie.com.mx 6 * Concept Z Performance - http://www.conceptzperformance.com/ trunk/phpbms/modules/bms/report/aritems_clientstatement.php
r312 r396 84 84 clients.lastname, 85 85 clients.company, 86 clients.address1,87 clients.address2,88 clients.city,89 clients.postalcode,90 clients.state,91 clients.country,86 addresses.address1, 87 addresses.address2, 88 addresses.city, 89 addresses.postalcode, 90 addresses.state, 91 addresses.country, 92 92 clients.creditlimit, 93 93 clients.homephone, … … 97 97 users.lastname AS saleslastname 98 98 FROM 99 (aritems INNER JOIN clients ON aritems.clientid = clients.id) 100 LEFT JOIN users ON clients.salesmanagerid = users.id"; 99 (aritems INNER JOIN clients 100 ON aritems.clientid = clients.id 101 INNER JOIN addresstorecord 102 ON addresstorecord.tabledefid = 2 AND addresstorecord.primary = 1 103 AND addresstorecord.recordid = clients.id 104 INNER JOIN addresses 105 ON addresstorecord.addressid = addresses.id 106 )LEFT JOIN users 107 ON clients.salesmanagerid = users.id"; 101 108 102 109 $this->sortorder = 'if(clients.lastname!="",concat(clients.lastname,", ",clients.firstname,if(clients.company!="",concat(" (",clients.company,")"),"")),clients.company)'; trunk/phpbms/modules/bms/report/aritems_summary.php
r311 r396 93 93 clients.lastname, 94 94 clients.company, 95 clients.address1,96 clients.address2,97 clients.city,98 clients.postalcode,99 clients.state,100 clients.country,95 addresses.address1, 96 addresses.address2, 97 addresses.city, 98 addresses.postalcode, 99 addresses.state, 100 addresses.country, 101 101 clients.creditlimit, 102 102 clients.homephone, … … 106 106 users.lastname AS saleslastname 107 107 FROM 108 (aritems INNER JOIN clients ON aritems.clientid = clients.id) 109 LEFT JOIN users ON clients.salesmanagerid = users.id"; 108 (aritems INNER JOIN clients 109 ON aritems.clientid = clients.id 110 INNER JOIN addresstorecord 111 ON addresstorecord.tabledefid = 2 AND addresstorecord.primary = 1 112 AND addresstorecord.recordid = clients.id 113 INNER JOIN addresses 114 ON addresstorecord.addressid = addresses.id 115 )LEFT JOIN users 116 ON clients.salesmanagerid = users.id"; 110 117 111 118 $this->sortorder = 'if(clients.lastname!="",concat(clients.lastname,", ",clients.firstname,if(clients.company!="",concat(" (",clients.company,")"),"")),clients.company)';
