Changeset 738 for trunk/Modules/Finance


Ignore:
Timestamp:
Apr 14, 2015, 10:20:16 PM (10 years ago)
Author:
chronos
Message:
  • Removed: Spaces on end of line.
  • Modified: Tabs converted to spaces.
Location:
trunk/Modules/Finance
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/Modules/Finance/Bill.php

    r727 r738  
    44{
    55  var $SpecificSymbol = 1; // počítačová sít
    6   var $Checked; 
    7  
     6  var $Checked;
     7
    88  function GenerateHTML()
    99  {
    … …  
    2121  function HtmlToPdf($HtmlCode)
    2222  {
    23         $Encoding = new Encoding();
    24         if($this->Checked == false) {
    25                 if(CommandExist('htmldoc')) {
    26                         $this->Checked = true;
    27                 } else throw new Exception('htmldoc is not installed.');
    28         }
     23    $Encoding = new Encoding();
     24    if($this->Checked == false) {
     25      if(CommandExist('htmldoc')) {
     26        $this->Checked = true;
     27      } else throw new Exception('htmldoc is not installed.');
     28    }
    2929    $Output = shell_exec('echo "'.addslashes($Encoding->FromUTF8($HtmlCode)).
    3030      '"|htmldoc --no-numbered --webpage --no-embedfonts --charset 8859-2 -t pdf -');
    … …  
    3939  function ShowSubjectInfo($Subject)
    4040  {
    41         $BooleanText = array('Ne', 'Ano');
    42         $Output = $Subject['Name'].'<br>'.
     41    $BooleanText = array('Ne', 'Ano');
     42    $Output = $Subject['Name'].'<br>'.
    4343      $Subject['AddressStreet'].'<br>'.
    4444      $Subject['AddressPSC'].' '.$Subject['AddressTown'].'<br>';
    … …  
    4747    if($Subject['Account'] != '') $Output .= 'Účet: '.$Subject['Account'].'<br>';
    4848    if($Subject['PayVAT'] != '') $Output .= 'Plátce DPH: '.$BooleanText[$Subject['PayVAT']].'<br>';
    49         return($Output);
     49    return($Output);
    5050  }
    5151
    … …  
    8181    if($Invoice['Direction'] == -1)
    8282    {
    83         $Subject = $SubjectTo;
    84         $SubjectTo = $SubjectFrom;
    85         $SubjectFrom = $Subject;
     83      $Subject = $SubjectTo;
     84      $SubjectTo = $SubjectFrom;
     85      $SubjectFrom = $Subject;
    8686    }
    8787

  • trunk/Modules/Finance/Finance.php

    r737 r738  
    159159  function GetVATByType($TypeId)
    160160  {
    161         $Time = time();
    162         $DbResult = $this->Database->select('FinanceVAT', 'Value', '(Type='.$TypeId.
     161    $Time = time();
     162    $DbResult = $this->Database->select('FinanceVAT', 'Value', '(Type='.$TypeId.
    163163      ') AND (ValidFrom <= "'.TimeToMysqlDate($Time).'") AND ((ValidTo >= "'.
    164164      TimeToMysqlDate($Time).'") OR (ValidTo IS NULL)) LIMIT 1');
    … …  
    204204      'DefaultSortOrder' => 1,
    205205      'Items' => array(
    206         'Direction' => array('Type' => 'TFinanceOperationDirection', 'Caption' => 'Směr', 'Default' => '1'),
    207         'DocumentLine' => array('Type' => 'TDocumentLine', 'Caption' => 'Dokladová řada', 'Default' => ''),
     206        'Direction' => array('Type' => 'TFinanceOperationDirection', 'Caption' => 'Směr', 'Default' => '1'),
     207        'DocumentLine' => array('Type' => 'TDocumentLine', 'Caption' => 'Dokladová řada', 'Default' => ''),
    208208        'BillCode' => array('Type' => 'String', 'Caption' => 'Označení', 'Default' => ''),
    209209        'Subject' => array('Type' => 'TSubject', 'Caption' => 'Subjekt', 'Default' => ''),
    … …  
    274274      'DefaultSortOrder' => 1,
    275275      'Items' => array(
    276         'Direction' => array('Type' => 'TFinanceInvoiceDirection', 'Caption' => 'Směr', 'Default' => '1'),
    277         'DocumentLine' => array('Type' => 'TDocumentLine', 'Caption' => 'Dokladová řada', 'Default' => ''),
     276        'Direction' => array('Type' => 'TFinanceInvoiceDirection', 'Caption' => 'Směr', 'Default' => '1'),
     277        'DocumentLine' => array('Type' => 'TDocumentLine', 'Caption' => 'Dokladová řada', 'Default' => ''),
    278278        'BillCode' => array('Type' => 'String', 'Caption' => 'Označení', 'Default' => ''),
    279279        'Subject' => array('Type' => 'TSubject', 'Caption' => 'Subjekt', 'Default' => ''),
    … …  
    286286        'PeriodFrom' => array('Type' => 'Date', 'Caption' => 'Období od', 'Default' => '', 'Null' => true),
    287287        'PeriodTo' => array('Type' => 'Date', 'Caption' => 'Období do', 'Default' => '', 'Null' => true),
    288         'Cash' => array('Type' => 'Boolean', 'Caption' => 'Platit hotově', 'Default' => ''),
     288        'Cash' => array('Type' => 'Boolean', 'Caption' => 'Platit hotově', 'Default' => ''),
    289289        'Items' => array('Type' => 'TFinanceInvoiceItemListInvoice', 'Caption' => 'Položky', 'Default' => ''),
    290290        'OperationRel' => array('Type' => 'TFinanceInvoiceOperationRelListInvoice', 'Caption' => 'Platba', 'Default' => ''),
    … …  
    314314
    315315    $this->System->FormManager->RegisterFormType('TFinanceInvoiceDirection', array(
    316                 'Type' => 'Enumeration',
    317                 'States' => array(-1 => 'Příjem', 1 => 'Výdej'),
     316        'Type' => 'Enumeration',
     317        'States' => array(-1 => 'Příjem', 1 => 'Výdej'),
    318318    ));
    319319
    … …  
    323323      'Items' => array(
    324324        'Name' => array('Type' => 'String', 'Caption' => 'Název', 'Default' => '0'),
    325         'Subject' => array('Type' => 'TSubject', 'Caption' => 'Subjekt', 'Default' => '0'),
     325        'Subject' => array('Type' => 'TSubject', 'Caption' => 'Subjekt', 'Default' => '0'),
    326326      ),
    327327    ));
    … …  
    353353    ));
    354354    $this->System->FormManager->RegisterFormType('TFinanceTreasury', array(
    355         'Type' => 'Reference',
    356         'Table' => 'FinanceTreasury',
    357         'Id' => 'Id',
    358         'Name' => 'Name',
    359         'Filter' => '1',
     355      'Type' => 'Reference',
     356      'Table' => 'FinanceTreasury',
     357      'Id' => 'Id',
     358      'Name' => 'Name',
     359      'Filter' => '1',
    360360    ));
    361361    $this->System->FormManager->RegisterClass('FinanceBankAccount', array(
    … …  
    374374        'LoginPassword' => array('Type' => 'String', 'Caption' => 'Přihlašovací heslo', 'Default' => ''),
    375375        'Operations' => array('Type' => 'TFinanceOperationListAccount', 'Caption' => 'Operace', 'Default' => ''),
    376         'Use' => array('Type' => 'Boolean', 'Caption' => 'Používat', 'Default' => '0'),
     376        'Use' => array('Type' => 'Boolean', 'Caption' => 'Používat', 'Default' => '0'),
    377377        'LastImportDate' => array('Type' => 'Date', 'Caption' => 'Datum posledního importu', 'Default' => ''),
    378378        'LastImportId' => array('Type' => 'String', 'Caption' => 'Id posledního importu', 'Default' => ''),
    … …  
    380380          'ReadOnly' => true, 'Suffix' => 'Kč', 'SQL' => '(SELECT SUM(`FinanceOperation`.`Value` * `FinanceOperation`.`Direction`) FROM `FinanceOperation` '.
    381381          'WHERE `FinanceOperation`.`BankAccount`=#Id)'),
    382         'AutoImport' => array('Type' => 'Boolean', 'Caption' => 'Automaticky stahovat z banky', 'Default' => ''),
     382        'AutoImport' => array('Type' => 'Boolean', 'Caption' => 'Automaticky stahovat z banky', 'Default' => ''),
    383383      ),
    384384      'ItemActions' => array(
    … …  
    388388    ));
    389389    $this->System->FormManager->RegisterFormType('TFinanceBankAccount', array(
    390         'Type' => 'Reference',
    391         'Table' => 'FinanceBankAccount',
    392         'Id' => 'Id',
    393         'Name' => 'Comment',
    394         'Filter' => '1',
     390      'Type' => 'Reference',
     391      'Table' => 'FinanceBankAccount',
     392      'Id' => 'Id',
     393      'Name' => 'Comment',
     394      'Filter' => '1',
    395395    ));
    396396    $this->System->FormManager->RegisterClass('FinanceBank', array(
    … …  
    433433        'TopTariffPrice' => array('Type' => 'Integer', 'Caption' => 'Nejvyšší cena tarifu', 'Default' => '0', 'Suffix' => 'Kč'),
    434434        'ChangeAction' => array('Type' => 'TActionEnum', 'Caption' => 'Změna - akce', 'Default' => '', 'Null' => true),
    435                 'ChangeTime' => array('Type' => 'DateTime', 'Caption' => 'Změna - čas', 'Default' => '', 'Null' => true),
    436         'ChangeReplaceId' => array('Type' => 'TFinanceCharge', 'Caption' => 'Změna - položka', 'Default' => '0', 'Null' => true),
     435        'ChangeTime' => array('Type' => 'DateTime', 'Caption' => 'Změna - čas', 'Default' => '', 'Null' => true),
     436        'ChangeReplaceId' => array('Type' => 'TFinanceCharge', 'Caption' => 'Změna - položka', 'Default' => '0', 'Null' => true),
    437437      ),
    438438    ));
    … …  
    475475    ));
    476476    $this->System->FormManager->RegisterFormType('TFinanceVAT', array(
    477         'Type' => 'Reference',
    478         'Table' => 'FinanceVAT',
    479         'Id' => 'Id',
    480         'Name' => 'Name',
    481         'Filter' => '1',
     477      'Type' => 'Reference',
     478      'Table' => 'FinanceVAT',
     479      'Id' => 'Id',
     480      'Name' => 'Name',
     481      'Filter' => '1',
    482482    ));
    483483    $this->System->FormManager->RegisterFormType('TFinanceVATType', array(
    484                 'Type' => 'Reference',
    485                 'Table' => 'FinanceVATType',
    486                 'Id' => 'Id',
    487                 'Name' => 'Name',
    488                 'Filter' => '1',
     484      'Type' => 'Reference',
     485      'Table' => 'FinanceVATType',
     486      'Id' => 'Id',
     487      'Name' => 'Name',
     488      'Filter' => '1',
    489489    ));
    490490    $this->System->FormManager->RegisterFormType('TBankAccount', array(
    491         'Type' => 'Reference',
    492         'Table' => 'FinanceBankAccount',
    493         'Id' => 'Id',
    494         'Name' => 'CONCAT(`Comment`, " (", `Number`, "/", '.
    495         '(SELECT `FinanceBank`.`Code` FROM `FinanceBank` WHERE `FinanceBank`.`Id`=`FinanceBankAccount`.`Bank`), ")")',
    496         'Filter' => '1',
     491      'Type' => 'Reference',
     492      'Table' => 'FinanceBankAccount',
     493      'Id' => 'Id',
     494      'Name' => 'CONCAT(`Comment`, " (", `Number`, "/", '.
     495      '(SELECT `FinanceBank`.`Code` FROM `FinanceBank` WHERE `FinanceBank`.`Id`=`FinanceBankAccount`.`Bank`), ")")',
     496      'Filter' => '1',
    497497    ));
    498498
    … …  
    509509  function BeforeInsertFinanceOperation($Form)
    510510  {
    511         if(array_key_exists('Time', $Form->Values)) $Year = date("Y", $Form->Values['Time']);
    512           else $Year = date("Y", $Form->Values['ValidFrom']);
     511    if(array_key_exists('Time', $Form->Values)) $Year = date("Y", $Form->Values['Time']);
     512      else $Year = date("Y", $Form->Values['ValidFrom']);
    513513    $DocumentLine = $Form->Values['DocumentLine'];
    514514    $Form->Values['BillCode'] = $this->System->Modules['Finance']->GetNextDocumentLineNumber($DocumentLine, $Year);

  • trunk/Modules/Finance/Import.php

    r719 r738  
    2525    }
    2626  }
    27  
     27
    2828  function Prepare()
    29   {   
     29  {
    3030    $Finance = $this->System->Modules['Finance'];
    3131    $Finance->LoadMonthParameters(0);
    … …  
    3939      {
    4040        if(substr($Data[$Key][$Key2], 0, 2) == '\"')
    41           $Data[$Key][$Key2] = substr($Data[$Key][$Key2], 2, -2); 
     41          $Data[$Key][$Key2] = substr($Data[$Key][$Key2], 2, -2);
    4242      }
    4343    }
    4444    $Header = array(
    45       0 => 'datum zaúčtování',         
     45      0 => 'datum zaúčtování',
    4646      1 => 'částka',
    4747      2 => 'měna',
    … …  
    6060    //print_r($_POST['Source']);
    6161    //print_r($Data);
    62  
     62
    6363    if($Header != $Data[0]) $Output = 'Nekompatibilní struktura CSV';
    64     else 
     64    else
    6565    {
    6666      array_shift($Data);
    … …  
    8585          $Subject = '? ('.$Value[5].')';
    8686        }
    87         if(!is_numeric($Subject)) 
     87        if(!is_numeric($Subject))
    8888        {
    8989          $Mode = 'Ručně';
    9090          $Style = 'style="background-color: LightPink;" ';
    91         } else 
     91        } else
    9292        {
    9393          $Mode = 'Automaticky';
    9494          $Style = '';
    9595        }
    96    
     96
    9797        if($Money < 0) $Text = 'Platba převodem';
    9898          else $Text = 'Přijatá platba';
    … …  
    106106            '<td><input type="text" name="Taxable'.$I.'" value="1"/></td>'.
    107107            '<td><input type="text" name="Network'.$I.'" value="1"/></td>'.
    108             '</tr><tr><td colspan="7">'.implode(', ', $Value).'</td></tr>'; 
     108            '</tr><tr><td colspan="7">'.implode(', ', $Value).'</td></tr>';
    109109        $I++;
    110110      }
    … …  
    114114        '<th>Datum</th><th>Var. symbol</th><th>Protiúčet</th><th>Částka [Kč]</th><th>Text</th><th>Zdanitelné</th><th>Síť</th></tr>';
    115115      $Output .= $Automatic.'</table>';
    116       $Output .= '<input type="hidden" name="ItemCount" value="'.$I.'"/>'; 
    117       $Output .= '<input type="submit" value="Zpracovat"/></form>';     
     116      $Output .= '<input type="hidden" name="ItemCount" value="'.$I.'"/>';
     117      $Output .= '<input type="submit" value="Zpracovat"/></form>';
    118118    }
    119119    return($Output);
    120120  }
    121  
     121
    122122  function InsertMoney($Subject, $Value, $Direction, $Cash, $Taxable, $Time, $Text, $DocumentLine)
    123123  {
    … …  
    125125    $BillCode = $this->System->Modules['Finance']->GetNextDocumentLineNumber($DocumentLine, $Year);
    126126    // TODO: Fixed BankAccount=1, allow to select bank account for import
    127     $this->Database->insert('FinanceOperation', array('Text' => $Text, 
    128       'Subject' => $Subject, 'Cash' => $Cash, 'Value' => $Value, 'Direction' => $Direction, 
     127    $this->Database->insert('FinanceOperation', array('Text' => $Text,
     128      'Subject' => $Subject, 'Cash' => $Cash, 'Value' => $Value, 'Direction' => $Direction,
    129129      'Time' => TimeToMysqlDateTime($Time), 'Taxable' => $Taxable, 'BillCode' => $BillCode,
    130130      'BankAccount' => 1));
    … …  
    136136    $Finance->LoadMonthParameters(0);
    137137    $Output = '';
    138    
     138
    139139    for($I = $_POST['ItemCount'] - 1; $I >= 0 ; $I--)
    140140    {
    141         // TODO: Use links to database records instead of contants
     141      // TODO: Use links to database records instead of contants
    142142      if($_POST['Money'.$I] < 0) {
    143         $DocumentLine = 4;
    144         $Direction = -1;
     143        $DocumentLine = 4;
     144        $Direction = -1;
    145145      } else {
    146         $DocumentLine = 3;
    147         $Direction = 1;
     146        $DocumentLine = 3;
     147        $Direction = 1;
    148148      }
    149149      $Date = explode('-', $_POST['Date'.$I]);

  • trunk/Modules/Finance/Manage.php

    r727 r738  
    109109    $SumValue = 0;
    110110    foreach($Items as $Item)
    111       $SumValue = $SumValue + ceil($Item['Price'] * $Item['Quantity']);   
     111      $SumValue = $SumValue + ceil($Item['Price'] * $Item['Quantity']);
    112112    $this->Database->insert('FinanceInvoice', array(
    113113      'Subject' => $Subject, 'Time' => TimeToMysqlDateTime($TimeCreation),
    114       'TimeDue' => TimeToMysqlDateTime($TimeDue), 'Value' => $SumValue, 
    115         'Direction' => $Direction, 'BillCode' => $BillCode,
     114      'TimeDue' => TimeToMysqlDateTime($TimeDue), 'Value' => $SumValue,
     115      'Direction' => $Direction, 'BillCode' => $BillCode,
    116116      'PeriodFrom' => TimeToMysqlDate($PeriodFrom), 'PeriodTo' => TimeToMysqlDate($PeriodTo),
    117117      'Generate' => 1, 'DocumentLine' => $DocumentLine));
    … …  
    163163          $MonthlyTotal += $Service['Price'];
    164164        }
    165         $PayPerPeriod = $MonthlyTotal * $Period['MonthCount'];               
     165        $PayPerPeriod = $MonthlyTotal * $Period['MonthCount'];
    166166        // We can't produce negative invoice except storno invoice.
    167         // TODO: In case of negative invoice it is not sufficient to reverse invoicing direction 
    168         // Other subject should invoice only possitive items. Negative items should be somehow removed. 
     167        // TODO: In case of negative invoice it is not sufficient to reverse invoicing direction
     168        // Other subject should invoice only possitive items. Negative items should be somehow removed.
    169169        if($MonthlyTotal >= 0) {
    170                 $DocumentLine = DOC_LINE_INVOICE_OUT;       
    171                 $Direction = 1; // Standard out invoice
     170          $DocumentLine = DOC_LINE_INVOICE_OUT;
     171          $Direction = 1; // Standard out invoice
    172172        } else {
    173                 $DocumentLine = DOC_LINE_INVOICE_IN;
     173          $DocumentLine = DOC_LINE_INVOICE_IN;
    174174          $Direction = -1; // In case of negative total value generate reverse invoice for other subject
    175175          foreach($InvoiceItems as $Index => $Item)
    176                 $InvoiceItems[$Index]['Price'] = -$Item['Price'];
    177         }       
    178        
     176          $InvoiceItems[$Index]['Price'] = -$Item['Price'];
     177        }
     178
    179179        if($PayPerPeriod != 0)
    180180        {
    … …  
    195195  function TableUpdateChanges($Table)
    196196  {
    197         $Time = time();
     197    $Time = time();
    198198    $DbResult = $this->Database->select($Table, '*', '(`ChangeAction` IS NOT NULL) AND '.
    199         '(`ChangeTime` <= "'.TimeToMysqlDateTime($Time).'") ORDER BY `ChangeTime` ASC');
     199      '(`ChangeTime` <= "'.TimeToMysqlDateTime($Time).'") ORDER BY `ChangeTime` ASC');
    200200    while($Service = $DbResult->fetch_array())
    201201    {
    … …  
    225225  function ProcessTableUpdates()
    226226  {
    227         // Update finance charge
    228         $Output = 'Měním aktuální parametry sítě...<br>';
    229         $this->TableUpdateChanges('FinanceCharge');
    230        
    231         // Update services
    232         $Output .= 'Aktualizuji služby....<br>';
    233         $this->TableUpdateChanges('Service');
    234        
    235         // Update customer service selections
    236         $Output .= 'Aktualizuji výběr služeb zákazníků....<br>';
    237         $this->TableUpdateChanges('ServiceCustomerRel');
    238 
    239         return($Output);
    240   }
    241  
     227    // Update finance charge
     228    $Output = 'Měním aktuální parametry sítě...<br>';
     229    $this->TableUpdateChanges('FinanceCharge');
     230
     231    // Update services
     232    $Output .= 'Aktualizuji služby....<br>';
     233    $this->TableUpdateChanges('Service');
     234
     235    // Update customer service selections
     236    $Output .= 'Aktualizuji výběr služeb zákazníků....<br>';
     237    $this->TableUpdateChanges('ServiceCustomerRel');
     238
     239    return($Output);
     240  }
     241
    242242  function ProcessMonthlyPayment()
    243243  {
    … …  
    246246
    247247    $Output .= $this->ProcessTableUpdates();
    248    
     248
    249249    $Finance = &$this->System->Modules['Finance'];
    250250    $Finance->LoadMonthParameters(0);
    … …  
    282282      $Output .= 'Odečítám měsíční poplatek...<br />';
    283283      $Output .= $this->ProduceInvoices();
    284      
     284
    285285      $Output .= 'Přidávám měsíční přehled...<br />';
    286286      $DbResult = $this->Database->query('SELECT * FROM `FinanceCharge` WHERE (`ChangeAction` IS NULL) LIMIT 1');
    … …  
    327327
    328328    $DbResult = $this->Database->query('SELECT `FinanceBankAccount`.*, '.
    329                 'CONCAT(`FinanceBankAccount`.`Number`, "/", `FinanceBank`.`Code`) AS `NumberFull` FROM `FinanceBankAccount` '.
     329      'CONCAT(`FinanceBankAccount`.`Number`, "/", `FinanceBank`.`Code`) AS `NumberFull` FROM `FinanceBankAccount` '.
    330330      'JOIN `FinanceBank` ON `FinanceBank`.`Id`=`FinanceBankAccount`.`Bank` '.
    331331      'WHERE (`FinanceBankAccount`.`Subject`='.$Config['Finance']['MainSubjectId'].') '.
    332         'AND (`FinanceBankAccount`.`Use`=1)');
     332      'AND (`FinanceBankAccount`.`Use`=1)');
    333333    $MainSubjectAccount = $DbResult->fetch_assoc();
    334334
    … …  
    356356      $DbResult = $this->Database->query('SELECT T1.* FROM ((SELECT `Text`, `Time`, (`Value`*`Direction`) AS `Value`, `File` FROM `FinanceOperation` WHERE (`Subject`='.$Member['Subject'].')) UNION ALL '.
    357357        '(SELECT (SELECT GROUP_CONCAT(`Description` SEPARATOR ", ") FROM `FinanceInvoiceItem` '.
    358         'WHERE `FinanceInvoiceItem`.`FinanceInvoice` = `FinanceInvoice`.`Id`) AS `Text`, '.
    359         '`Time`, -(`Value`*`Direction`) AS `Value`, `File` FROM `FinanceInvoice` WHERE (`Subject`='.
     358        'WHERE `FinanceInvoiceItem`.`FinanceInvoice` = `FinanceInvoice`.`Id`) AS `Text`, '.
     359        '`Time`, -(`Value`*`Direction`) AS `Value`, `File` FROM `FinanceInvoice` WHERE (`Subject`='.
    360360        $Member['Subject'].')) ORDER BY `Time` DESC) AS `T1` WHERE (`T1`.`Time` > "'.$Member['BillingPeriodLastDate'].'")');
    361361      while($DbRow = $DbResult->fetch_assoc())

  • trunk/Modules/Finance/UserState.php

    r728 r738  
    99  function ShowFinanceOperation($Subject)
    1010  {
    11         $UserOperationTableQuery = '((SELECT `Text`, `Time`, (`Value`*`Direction`) AS `Value`, `File`, `BillCode`, NULL AS `PeriodFrom`, NULL AS `PeriodTo` '.
    12           'FROM `FinanceOperation` WHERE (`Subject`='.$Subject['Id'].')) UNION ALL '.
    13                 '(SELECT (SELECT GROUP_CONCAT(`Description` SEPARATOR ",") FROM `FinanceInvoiceItem` WHERE `FinanceInvoice`=`FinanceInvoice`.`Id`) AS `Text`, '.
    14                 '`Time`, -(`Value`*`Direction`) AS `Value`, `File`, `BillCode`, `PeriodFrom`, `PeriodTo` FROM `FinanceInvoice` WHERE (`Subject`='.$Subject['Id'].')))';
     11    $UserOperationTableQuery = '((SELECT `Text`, `Time`, (`Value`*`Direction`) AS `Value`, `File`, `BillCode`, NULL AS `PeriodFrom`, NULL AS `PeriodTo` '.
     12      'FROM `FinanceOperation` WHERE (`Subject`='.$Subject['Id'].')) UNION ALL '.
     13      '(SELECT (SELECT GROUP_CONCAT(`Description` SEPARATOR ",") FROM `FinanceInvoiceItem` WHERE `FinanceInvoice`=`FinanceInvoice`.`Id`) AS `Text`, '.
     14      '`Time`, -(`Value`*`Direction`) AS `Value`, `File`, `BillCode`, `PeriodFrom`, `PeriodTo` FROM `FinanceInvoice` WHERE (`Subject`='.$Subject['Id'].')))';
    1515
    1616    $Output = '<div style="text-align:center">Výpis finančních operací</div>';
    17         $DbResult = $this->Database->query('SELECT COUNT(*) FROM '.$UserOperationTableQuery.' AS `T1`');
    18         $DbRow = $DbResult->fetch_row();
    19         $PageList = GetPageList($DbRow[0]);
     17    $DbResult = $this->Database->query('SELECT COUNT(*) FROM '.$UserOperationTableQuery.' AS `T1`');
     18    $DbRow = $DbResult->fetch_row();
     19    $PageList = GetPageList($DbRow[0]);
    2020
    21         $Output .= $PageList['Output'];
    22         $Output .= '<table class="WideTable" style="font-size: small;">';
     21    $Output .= $PageList['Output'];
     22    $Output .= '<table class="WideTable" style="font-size: small;">';
    2323
    24         $TableColumns = array(
    25                         array('Name' => 'Time', 'Title' => 'Datum'),
    26                         array('Name' => 'Text', 'Title' => 'Popis'),
    27                         array('Name' => 'Value', 'Title' => 'Změna [Kč]'),
    28                         array('Name' => 'State', 'Title' => 'Zůstatek [Kč]'),
    29                         array('Name' => 'PeriodFrom', 'Title' => 'Období'),
    30                         array('Name' => 'BillCode', 'Title' => 'Doklad'),
    31         );
    32         $Order = GetOrderTableHeader($TableColumns, 'Time', 1);
    33         $Output .= $Order['Output'];
     24    $TableColumns = array(
     25        array('Name' => 'Time', 'Title' => 'Datum'),
     26        array('Name' => 'Text', 'Title' => 'Popis'),
     27        array('Name' => 'Value', 'Title' => 'Změna [Kč]'),
     28        array('Name' => 'State', 'Title' => 'Zůstatek [Kč]'),
     29        array('Name' => 'PeriodFrom', 'Title' => 'Období'),
     30        array('Name' => 'BillCode', 'Title' => 'Doklad'),
     31    );
     32    $Order = GetOrderTableHeader($TableColumns, 'Time', 1);
     33    $Output .= $Order['Output'];
    3434
    35         $StateQuery = 'SELECT SUM(`T2`.`Value`) FROM '.$UserOperationTableQuery.
    36           ' AS `T2` WHERE `T2`.`Time` <= `T1`.`Time` ';
    37         $Query = 'SELECT *, ('.$StateQuery.') AS `State` FROM '.$UserOperationTableQuery.' AS `T1` '.$Order['SQL'].$PageList['SQLLimit'];
     35    $StateQuery = 'SELECT SUM(`T2`.`Value`) FROM '.$UserOperationTableQuery.
     36      ' AS `T2` WHERE `T2`.`Time` <= `T1`.`Time` ';
     37    $Query = 'SELECT *, ('.$StateQuery.') AS `State` FROM '.$UserOperationTableQuery.' AS `T1` '.$Order['SQL'].$PageList['SQLLimit'];
    3838
    39         $DbResult = $this->Database->query($Query);
     39    $DbResult = $this->Database->query($Query);
    4040    $SumValue = 0;
    41         while($Row = $DbResult->fetch_assoc())
    42         {
    43                 $Row['State'] = round($Row['State'], 2);
    44                 if($Row['State'] > 0) $Row['State'] = '<span style="color:green;">'.$Row['State'].'</span>';
    45                 if($Row['State'] < 0) $Row['State'] = '<span style="color:red;">'.$Row['State'].'</span>';
    46                 if($Row['Value'] == -0) $Row['Value'] = 0;
    47                 if($Row['Value'] > 0) $Row['Value'] = '+'.$Row['Value'];
    48                 if($Row['BillCode'] == '') $Row['BillCode'] = 'PDF';
    49                 if($Row['File'] > 0) $Invoice = '<a href="'.$this->System->Link('/file?id='.$Row['File']).'">'.$Row['BillCode'].'</a>';
    50                 else $Invoice = NotBlank($Row['BillCode']);
    51                 if($Row['PeriodFrom'] != '') $Period = HumanDate($Row['PeriodFrom']).' - '.HumanDate($Row['PeriodTo']);
    52                 else $Period = '&nbsp;';
    53                 $Output .= '<tr><td style="text-align: right;">'.HumanDate($Row['Time']).'</td>'.
    54                                 '<td style="text-align: left;">'.$Row['Text'].'</td>'.
    55                                 '<td style="text-align: right;">'.round($Row['Value'], 2).'</td>'.
    56                                 '<td style="text-align: right;">'.$Row['State'].'</td>'.
    57                                 '<td>'.$Period.'</td>'.
    58                                 '<td>'.$Invoice.'</td></tr>';
    59                 $SumValue = $SumValue + $Row['Value'];
    60         }
    61         $Output .= '</table>';
    62         $Output .= $PageList['Output'];
    63         return($Output);
     41    while($Row = $DbResult->fetch_assoc())
     42    {
     43      $Row['State'] = round($Row['State'], 2);
     44      if($Row['State'] > 0) $Row['State'] = '<span style="color:green;">'.$Row['State'].'</span>';
     45      if($Row['State'] < 0) $Row['State'] = '<span style="color:red;">'.$Row['State'].'</span>';
     46      if($Row['Value'] == -0) $Row['Value'] = 0;
     47      if($Row['Value'] > 0) $Row['Value'] = '+'.$Row['Value'];
     48      if($Row['BillCode'] == '') $Row['BillCode'] = 'PDF';
     49      if($Row['File'] > 0) $Invoice = '<a href="'.$this->System->Link('/file?id='.$Row['File']).'">'.$Row['BillCode'].'</a>';
     50      else $Invoice = NotBlank($Row['BillCode']);
     51      if($Row['PeriodFrom'] != '') $Period = HumanDate($Row['PeriodFrom']).' - '.HumanDate($Row['PeriodTo']);
     52      else $Period = '&nbsp;';
     53      $Output .= '<tr><td style="text-align: right;">'.HumanDate($Row['Time']).'</td>'.
     54          '<td style="text-align: left;">'.$Row['Text'].'</td>'.
     55          '<td style="text-align: right;">'.round($Row['Value'], 2).'</td>'.
     56          '<td style="text-align: right;">'.$Row['State'].'</td>'.
     57          '<td>'.$Period.'</td>'.
     58          '<td>'.$Invoice.'</td></tr>';
     59      $SumValue = $SumValue + $Row['Value'];
     60    }
     61    $Output .= '</table>';
     62    $Output .= $PageList['Output'];
     63    return($Output);
    6464  }
    6565
    … …  
    8585      } else return($this->SystemMessage('Chyba', 'Nejste zákazníkem'));
    8686    }
    87        
     87
    8888    // Load customer info
    8989    $DbResult = $this->Database->query('SELECT * FROM `Member` WHERE `Id`='.$CustomerId);
    9090    if($DbResult->num_rows == 1)
    9191    {
    92         $Customer = $DbResult->fetch_assoc();     
     92      $Customer = $DbResult->fetch_assoc();
    9393    } else return($this->SystemMessage('Položka nenalezena', 'Zákazník nenalezen'));
    94    
    95    
     94
     95
    9696    // Load subject info
    9797    $DbResult = $this->Database->query('SELECT * FROM `Subject` WHERE `Id`='.$Customer['Subject']);
    9898    if($DbResult->num_rows == 1)
    99     {   
    100       $Subject = $DbResult->fetch_assoc();     
     99    {
     100      $Subject = $DbResult->fetch_assoc();
    101101    } else return($this->SystemMessage('Položka nenalezena', 'Subjekt nenalezen'));
    102    
    103    
    104     $Output = '<table width="100%" border="0" cellspacing="0" cellpadding="3"><tr><td valign="top">';       
     102
     103
     104    $Output = '<table width="100%" border="0" cellspacing="0" cellpadding="3"><tr><td valign="top">';
    105105
    106106    // Account state
    … …  
    120120
    121121    $DbResult = $this->Database->query('SELECT FinanceBankAccount.*, CONCAT(FinanceBankAccount.Number, "/", FinanceBank.Code) AS NumberFull FROM FinanceBankAccount '.
    122                 'JOIN FinanceBank ON FinanceBank.Id=FinanceBankAccount.Bank '.
    123                 'WHERE (FinanceBankAccount.`Subject`='.$this->System->Config['Finance']['MainSubjectId'].') AND (FinanceBankAccount.`Use`=1)');
     122        'JOIN FinanceBank ON FinanceBank.Id=FinanceBankAccount.Bank '.
     123        'WHERE (FinanceBankAccount.`Subject`='.$this->System->Config['Finance']['MainSubjectId'].') AND (FinanceBankAccount.`Use`=1)');
    124124    $SubjectFromAccount = $DbResult->fetch_assoc();
    125125    $Account = $SubjectFromAccount['NumberFull'];
    … …  
    138138    while($DbRow = $DbResult->fetch_assoc())
    139139    {
    140             $Output .= '<tr><td>'.$DbRow['Name'].'</td><td>'.$DbRow['Price'].'</td></tr>';
     140      $Output .= '<tr><td>'.$DbRow['Name'].'</td><td>'.$DbRow['Price'].'</td></tr>';
    141141      $Total += $DbRow['Price'];
    142142    }

  • trunk/Modules/Finance/Zivnost.php

    r724 r738  
    5050    $Balance['SmallAssets']['End'] = $Row[0] + 0;
    5151    return($Balance);
    52   } 
     52  }
    5353
    5454  function Show()
    … …  
    142142        $Output .= '<strong>Příjmy za rok '.$Year['Year'].'</strong>';
    143143        $Output .= '<table style="font-size: smaller;" class="WideTable">';
    144         $Output .= '<tr><th>Čas</th><th>Kód</th><th>Subjekt</th><th>Text</th><th>Hodnota [Kč]</th><th>Daňový</th><th>Hotovost</th></tr>';       
     144        $Output .= '<tr><th>Čas</th><th>Kód</th><th>Subjekt</th><th>Text</th><th>Hodnota [Kč]</th><th>Daňový</th><th>Hotovost</th></tr>';
    145145        $DbResult = $this->Database->query('SELECT * FROM FinanceOperation LEFT JOIN Subject ON Subject.Id = FinanceOperation.Subject '.
    146146          'WHERE (Direction = 1) AND (FinanceOperation.Time >= "'.$Year['DateStart'].'") AND (FinanceOperation.Time <= "'.$Year['DateEnd'].'") ORDER BY Time');
    … …  
    172172        $Output .= '<strong>Výdaje za rok '.$Year['Year'].'</strong>';
    173173        $Output .= '<table style="font-size: smaller;" class="WideTable">';
    174         $Output .= '<tr><th>Čas</th><th>Kód</th><th>Subjekt</th><th>Text</th><th>Hodnota [Kč]</th><th>Daňový</th><th>Hotovost</th></tr>';       
     174        $Output .= '<tr><th>Čas</th><th>Kód</th><th>Subjekt</th><th>Text</th><th>Hodnota [Kč]</th><th>Daňový</th><th>Hotovost</th></tr>';
    175175        $DbResult = $this->Database->query('SELECT * FROM FinanceOperation LEFT JOIN Subject ON Subject.Id = FinanceOperation.Subject '.
    176176          'WHERE (Direction = -1) AND (FinanceOperation.Time >= "'.$Year['DateStart'].'") AND (FinanceOperation.Time <= "'.$Year['DateEnd'].'") ORDER BY Time');
    … …  
    197197        $DbResult = $this->Database->select('FinanceYear', '*', 'Id='.$_GET['year']);
    198198        $Year = $DbResult->fetch_assoc();
    199        
     199
    200200        $Total = 0;
    201201        $Output .= '<strong>Pohledávky za rok '.$Year['Year'].'</strong>';
    … …  
    234234          $Row['Value'] = $Row['Value'] * -1;
    235235          $Output .= '<tr><td>'.HumanDate($Row['Time']).'</td><td>'.$Row['BillCode'].
    236             '</td><td>'.$Row['Name'].'</td><td>'.$Row['Text'].'</td><td>'.($Row['Value'] * $Row['Direction']).'</td></tr>';         
     236            '</td><td>'.$Row['Name'].'</td><td>'.$Row['Text'].'</td><td>'.($Row['Value'] * $Row['Direction']).'</td></tr>';
    237237          $Total += $Row['Value'];
    238238        }
    … …  
    288288        $Output .= '<tr><th>Datum vytvoření</th><th>Datum zaplacení</th><th>Název</th><th>Hodnota [Kč]</th><th>Doklad</th></tr>';
    289289        $DbResult = $this->Database->select('FinanceInvoice', '*, (SELECT GROUP_CONCAT(Description SEPARATOR ",") '.
    290                 'FROM FinanceInvoiceItem WHERE FinanceInvoiceItem.FinanceInvoice = FinanceInvoice.Id) AS Text',
    291                 'Subject='.$_GET['Id'].' ORDER BY Time');
     290          'FROM FinanceInvoiceItem WHERE FinanceInvoiceItem.FinanceInvoice = FinanceInvoice.Id) AS Text',
     291          'Subject='.$_GET['Id'].' ORDER BY Time');
    292292        while($Row = $DbResult->fetch_array())
    293293        {
    … …  
    317317          'WHERE (FinanceInvoice.Subject = Subject.Id) AND (FinanceInvoice.Direction = -1) '.
    318318          'AND (TimePayment IS NULL)) AS OpenedLiabilities, '.
    319                 '(SELECT SUM(FinanceOperation.Value*FinanceOperation.Direction) '.
     319          '(SELECT SUM(FinanceOperation.Value*FinanceOperation.Direction) '.
    320320          'FROM FinanceOperation WHERE FinanceOperation.Subject = Subject.Id AND FinanceOperation.Direction = 1) '.
    321321          'AS Gains, (SELECT SUM(FinanceOperation.Value*FinanceOperation.Direction) FROM FinanceOperation WHERE '.
    … …  
    341341        $Output .= '<strong>Roční přehledy</strong><br/>';
    342342        $Output .= $this->ShowFinanceYears();
    343         if(array_key_exists('year', $_GET)) 
     343        if(array_key_exists('year', $_GET))
    344344        {
    345345          $Year = $_GET['year'] * 1;
    … …  
    353353    return($Output);
    354354  }
    355  
     355
    356356  function ShowFinanceYears()
    357357  {
Note: See TracChangeset for help on using the changeset viewer.