Changeset 786 for trunk/Modules/Portal

Timestamp:

Jan 11, 2016, 12:06:08 AM (9 years ago)

Author:

chronos

Message:

• Modified: Now billing period for invoice generation is calculated as aligned to year boundary and if period is not complete then only valid months are used.
• Removed: ToDo list and list of task and bugs is available in Trac web system.
• Modified: BillingPeriodNext was replaced by more general ChangeAction in Member table.
• Added: Log new monthly finance recalculation report to log table.

File:

• trunk/Modules/Portal/Portal.php (modified) (4 diffs)

trunk/Modules/Portal/Portal.php

@@ -40 +40 @@
         'DIC' => array('Type' => 'String', 'Caption' => 'DIČ', 'Default' => ''),
         'FamilyMemberCount' => array('Type' => 'Integer', 'Caption' => 'Počet osob v domácnosti', 'Default' => '', 'Suffix' => 'osob'),
-        'BillingPeriodNext' => array('Type' => 'TFinanceBillingPeriod', 'Caption' => 'Požadované fakturované období', 'Default' => ''),
       ),
     ));
@@ -196 +195 @@
           $CustomerUserRel = $DbResult->fetch_assoc();
           $DbResult = $this->Database->query('SELECT Member.Id, '.
-            'Member.FamilyMemberCount, Member.BillingPeriodNext, Subject.Name, Subject.AddressStreet, '.
+            'Member.FamilyMemberCount, Subject.Name, Subject.AddressStreet, '.
             'Subject.AddressTown, Subject.AddressPSC, Subject.AddressCountry, Subject.IC, Subject.DIC FROM Member JOIN Subject '.
            'ON Subject.Id = Member.Subject WHERE Member.Id='.$CustomerUserRel['Customer']);
@@ -215 +214 @@
         if($Form->Values['FamilyMemberCount'] < 0)
           $Form->Values['FamilyMemberCount'] = 0;
-        if($Form->Values['BillingPeriodNext'] < 2)
-          $Form->Values['BillingPeriodNext'] = 2;
 
         $DbResult = $this->Database->update('Member', 'Id='.$this->System->User->User['Member'],
-           array('FamilyMemberCount' => $Form->Values['FamilyMemberCount'],
-           'BillingPeriodNext' => $Form->Values['BillingPeriodNext']));
+           array('FamilyMemberCount' => $Form->Values['FamilyMemberCount']));
         $DbResult = $this->Database->query('SELECT Subject FROM Member WHERE Id='.$this->System->User->User['Member']);
         $Member = $DbResult->fetch_assoc();
@@ -231 +227 @@
         $this->System->ModuleManager->Modules['Log']->NewRecord('Member+Subject', 'Nastavení člena/subjektu změněno',
           $Form->Values['Name']);
-        $DbResult = $this->Database->query('SELECT Member.Id, Member.FamilyMemberCount, Member.BillingPeriodNext, '.
+        $DbResult = $this->Database->query('SELECT Member.Id, Member.FamilyMemberCount, '.
           'Subject.Name, Subject.AddressStreet, Subject.AddressTown, Subject.AddressPSC, '.
           'Subject.AddressCountry, Subject.IC, Subject.DIC FROM Member JOIN Subject '.