/[drupal]/contributions/modules/storm/storminvoice/storminvoice.admin.inc
ViewVC logotype

Diff of /contributions/modules/storm/storminvoice/storminvoice.admin.inc

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

revision 1.1, Wed Jun 11 12:55:05 2008 UTC revision 1.2, Tue Jul 1 07:47:42 2008 UTC
# Line 1  Line 1 
1  <?php  <?php
2  // $Id$  // $Id: storminvoice.admin.inc,v 1.1 2008/06/11 12:55:05 robertogerola Exp $
3    
4  /**  /**
5   * @file   * @file
# Line 61  function storminvoice_list() { Line 61  function storminvoice_list() {
61      ),      ),
62    );    );
63    
64    $s  = "SELECT n.title, sin.* FROM {storminvoice} sin INNER JOIN {node} n ON n.nid=sin.nid WHERE n.status=1 AND n.type='storminvoice' ";    $s  = "SELECT n.title, sin.* FROM {node} AS n INNER JOIN {storminvoice} AS sin ON n.nid=sin.nid WHERE n.status=1 AND n.type='storminvoice' ";
65    
66    $s_totals_topay = "SELECT SUM(amount) amount, SUM(vat) vat, SUM(total) total FROM {storminvoice} sin    $s_totals_topay = "SELECT SUM(amount) amount, SUM(vat) vat, SUM(total) total FROM {storminvoice} sin
67    INNER JOIN {node} n ON n.nid=sin.nid WHERE n.status=1 AND n.type='storminvoice' AND sin.paymentdate=0";    INNER JOIN {node} n ON n.nid=sin.nid WHERE n.status=1 AND n.type='storminvoice' AND sin.paymentdate=0";
# Line 114  function storminvoice_list() { Line 114  function storminvoice_list() {
114      $tablesort = ' ORDER BY LPAD(sin.number, 10, "0") DESC';      $tablesort = ' ORDER BY LPAD(sin.number, 10, "0") DESC';
115    }    }
116    
117    $sql = storminvoice_access_sql($s, $where);    $s = db_rewrite_sql($s);
118    $r = pager_query($sql . $tablesort, $itemsperpage, 0, NULL);    $s = storminvoice_access_sql($s, $where);
119      $r = pager_query($s . $tablesort, $itemsperpage, 0, NULL);
120    $invoices = array();    $invoices = array();
121    while ($invoice = db_fetch_object($r)) {    while ($invoice = db_fetch_object($r)) {
122      $invoices[] = $invoice;      $invoices[] = $invoice;
# Line 182  function storminvoice_list_filter() { Line 183  function storminvoice_list_filter() {
183      '#weight' => -20,      '#weight' => -20,
184    );    );
185    
186    $s = "SELECT n.nid, n.title FROM {stormorganization} sor INNER JOIN {node} n ON sor.nid=n.nid WHERE n.status=1 AND n.type='stormorganization' ORDER BY n.title";    $s = "SELECT n.nid, n.title FROM {node} AS n INNER JOIN {stormorganization} AS sor ON sor.vid=n.vid WHERE n.status=1 AND n.type='stormorganization' ORDER BY n.title";
187      $s = db_rewrite_sql($s);
188    $r = db_query(stormorganization_access_sql($s));    $r = db_query(stormorganization_access_sql($s));
189    $organizations = array();    $organizations = array();
190    while ($organization = db_fetch_object($r)) {    while ($organization = db_fetch_object($r)) {
# Line 197  function storminvoice_list_filter() { Line 199  function storminvoice_list_filter() {
199      '#attributes' => array('onchange' => "stormproject_organization_projects(this, 'edit-project-nid', true, 'All')"),      '#attributes' => array('onchange' => "stormproject_organization_projects(this, 'edit-project-nid', true, 'All')"),
200    );    );
201    
202    $s = "SELECT n.nid, n.title FROM {stormproject} spr INNER JOIN {node} n ON spr.nid=n.nid    $s = "SELECT n.nid, n.title FROM {node} AS n INNER JOIN {stormproject} AS spr ON spr.vid=n.vid
203    WHERE n.status=1 AND spr.organization_nid=%d AND n.type='stormproject' ORDER BY n.title";    WHERE n.status=1 AND spr.organization_nid=%d AND n.type='stormproject' ORDER BY n.title";
204      $s = db_rewrite_sql($s);
205    $r = db_query(stormproject_access_sql($s), $organization_nid);    $r = db_query(stormproject_access_sql($s), $organization_nid);
206    $projects = array();    $projects = array();
207    while ($project = db_fetch_array($r)) {    while ($project = db_fetch_array($r)) {
# Line 283  function storminvoice_list_filter_reset( Line 286  function storminvoice_list_filter_reset(
286  function _storminvoice_project_invoices_js($organization_nid, $project_nid) {  function _storminvoice_project_invoices_js($organization_nid, $project_nid) {
287    $invoices = array();    $invoices = array();
288    
289    $r = db_query(storminvoice_access_sql("SELECT n.nid, n.title FROM {storminvoice} sin INNER JOIN {node} n    $s = "SELECT n.nid, n.title FROM {node} AS n INNER JOIN {storminvoice} AS sin
290    ON n.nid=sin.nid WHERE n.status=1 AND n.type='storminvoice' AND sin.organization_nid=%d AND sin.project_nid=%d    ON n.vid=sin.vid WHERE n.status=1 AND n.type='storminvoice' AND sin.organization_nid=%d AND sin.project_nid=%d
291    ORDER BY n.title"), $organization_nid, $project_nid);    ORDER BY n.title";
292      $s = db_rewrite_sql($s);
293    
294      $r = db_query(storminvoice_access_sql($s), $organization_nid, $project_nid);
295    while ($item = db_fetch_object($r)) {    while ($item = db_fetch_object($r)) {
296      $nid = $item->nid;      $nid = $item->nid;
297      $invoices[$nid] = $item->title;      $invoices[$nid] = $item->title;
Legend:
Removed from v.1.1  
changed lines
  Added in v.1.2
  ViewVC Help
Powered by ViewVC 1.1.2