Changeset 509


Ignore:
Timestamp:
Apr 1, 2013, 11:37:49 PM (11 years ago)
Author:
chronos
Message:
  • Opraveno: Generování bankovního účtu do dokladů a emailů.
Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/admin/Updates.php

    r507 r509  
    154154    "VALUES (NULL , 'Banka', '2', '', '');");
    155155  $Id = $Manager->Database->insert_id;
    156   $Manager->Execute("UPDATE `ISMenuItem` SET `Parent` = '".$Id."' WHERE `ISMenuItem`.`Id` =''Bankovní účty'; ".
     156  $Manager->Execute("UPDATE `ISMenuItem` SET `Parent` = '".$Id."' WHERE `ISMenuItem`.`Id` ='Bankovní účty'; ".
    157157    "UPDATE `ISMenuItem` SET `Parent` = '".$Id."' WHERE `ISMenuItem`.`Id` ='Import z účtu';".
    158158    "UPDATE `ISMenuItem` SET `Parent` = '".$Id."' WHERE `ISMenuItem`.`Name` ='Banky';");

  • trunk/finance/bills.php

    r500 r509  
    4343    $MainSubject = $DbResult->fetch_assoc();
    4444   
    45     $DbResult = $this->Database->query('SELECT FinanceBankAccount.*, FinanceBank.Code AS NumberFull FROM FinanceBankAccount '.
     45    $DbResult = $this->Database->query('SELECT FinanceBankAccount.*, CONCAT(FinanceBankAccount.Number, "/", FinanceBank.Code) AS NumberFull FROM FinanceBankAccount '.
    4646      'JOIN FinanceBank ON FinanceBank.Id=FinanceBankAccount.Bank '.
    4747      'WHERE (FinanceBankAccount.`Subject`='.$Config['Finance']['MainSubjectId'].') AND (FinanceBankAccount.`Use`=1)');
    … …  
    135135    $MainSubject = $DbResult->fetch_assoc();
    136136   
    137     $DbResult = $this->Database->query('SELECT FinanceBankAccount.*, FinanceBank.Code AS NumberFull FROM FinanceBankAccount '.
     137    $DbResult = $this->Database->query('SELECT FinanceBankAccount.*, CONCAT(FinanceBankAccount.Number, "/", FinanceBank.Code) AS NumberFull FROM FinanceBankAccount '.
    138138      'JOIN FinanceBank ON FinanceBank.Id=FinanceBankAccount.Bank '.
    139139      'WHERE (FinanceBankAccount.`Subject`='.$Config['Finance']['MainSubjectId'].') AND (FinanceBankAccount.`Use`=1)');
    … …  
    154154      'IČ: '.$MainSubject['IC'].'<br>'.
    155155      'DIČ: '.$MainSubject['DIC'].'<br>'.
    156       'Účet: '.$MainSubjectAccount['Number'].'<br>'.
     156      'Účet: '.$MainSubjectAccount['NumberFull'].'<br>'.
    157157      'Plátce DPH: '.$BooleanText[$MainSubject['PayVAT']].
    158158      '</td><td width="50%" valign="top">'.

  • trunk/finance/manage.php

    r508 r509  
    560560    $MainSubject = $DbResult->fetch_assoc(); 
    561561   
    562     $DbResult = $this->Database->query('SELECT FinanceBankAccount.*, FinanceBank.Code AS NumberFull FROM FinanceBankAccount '.
     562    $DbResult = $this->Database->query('SELECT FinanceBankAccount.*, CONCAT(FinanceBankAccount.Number, "/", FinanceBank.Code) AS NumberFull FROM FinanceBankAccount '.
    563563      'JOIN FinanceBank ON FinanceBank.Id=FinanceBankAccount.Bank '.
    564564      'WHERE (FinanceBankAccount.`Subject`='.$Config['Finance']['MainSubjectId'].') AND (FinanceBankAccount.`Use`=1)');

  • trunk/finance/tarify.php

    r507 r509  
    1818    $Output .= '<br />';
    1919
    20     $Output .= '<table width="50%" class="WideTable" style="font-size: small;">';
     20    $Output .= '<table width="70%" class="WideTable" style="font-size: small;">';
    2121    $Output .= '<tr><th>Název tarifu</th><th>Min. rychlost [kbit/s]</th><th>Max. rychlost [kbit/s]</th><th>Agregační poměr</th><th>Počet podílníků</th><th>Cena [Kč]</th><th>Součet ceny [Kč]</th></tr>';
    2222    $TotalPrice = 0;
Note: See TracChangeset for help on using the changeset viewer.