Changeset 719 for trunk/Modules/Finance/Bill.php

Timestamp:

Jan 2, 2015, 11:16:56 PM (10 years ago)

Author:

chronos

Message:

• Added: Support for Hidden items in form types values.
• Added: Support for Filtered items in form types values.
• Modified: FinanceOperation Value splitted to (Direction * Value). Direction can be +1 or -1 depends on if money goes out or in company.
• Added: Menu "Incomes and spends" is now splitted to incomes/spends of bank account or treasury. Direction and document line is filled automatically.

File:

• trunk/Modules/Finance/Bill.php (modified) (2 diffs)

trunk/Modules/Finance/Bill.php

@@ -166 +166 @@
     //}
     $BooleanText = array('Ne', 'Ano');
-    if($Operation['Value'] < 0)
+    if($Operation['Direction'] == -1)
     $Desc = array(
       'Type' => 'VÝDAJOVÝ',
       'Signature' => 'Vydal',
-      'Sign' => -1,
       'Target' => 'Vydáno komu',
     );
-    else $Desc = array(
+    else if($Operation['Direction'] == 1)
+    $Desc = array(
       'Type' => 'PŘÍJMOVÝ',
       'Signature' => 'Přijal',
-      'Sign' => 1,
       'Target' => 'Přijato od',
     );
+    else throw new Exception('Wrong finance direction');
 
     $Output = '<table width="100%" border="1" cellspacing="0" cellpadding="3"><tr><td width="50%">'.
@@ -201 +201 @@
     if($Subject['DIC'] != '') $Output .= 'DIČ: '.$Subject['DIC'].'<br>';
     $Description = $Operation['Text'];
-    $Total = $Operation['Value'] * $Desc['Sign'];
     $Output .= '</td></tr>'.
-      '<tr><td colspan="2"><strong>Částka:</strong> '.$Total.' Kč<br><br>'.
+      '<tr><td colspan="2"><strong>Částka:</strong> '.$Operation['Value'].' Kč<br><br>'.
       '</td></tr>'.
       '<tr><td colspan="2"><strong>Účel platby:</strong><br>'.$Description.'</td></tr>'.