Changeset 646

Timestamp:

Mar 25, 2014, 12:35:46 PM (11 years ago)

Author:

chronos

Message:

• Přidáno: Tabulka Smlouvy.

Location:

trunk

Files:

• Application/Version.php (modified) (1 diff)
• Common/Setup/Updates.php (modified) (2 diffs)
• Modules/Finance/Finance.php (modified) (2 diffs)
• Modules/IS/IS.php (modified) (1 diff)

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 645; // Subversion revision
-$DatabaseRevision = 645; // SQL structure revision
-$ReleaseTime = strtotime('2014-03-24');
+$Revision = 646; // Subversion revision
+$DatabaseRevision = 646; // SQL structure revision
+$ReleaseTime = strtotime('2014-03-25');

trunk/Common/Setup/Updates.php

@@ -576 +576 @@
 }
 
+function UpdateTo646($Manager)
+{
+        $Manager->Execute('CREATE TABLE IF NOT EXISTS `Contract` (
+  `Id` int(11) NOT NULL AUTO_INCREMENT,
+  `BillCode` varchar(255) NOT NULL,
+  `Subject` int(11) NOT NULL,
+  `DocumentLine` int(11) NOT NULL,
+  `ValidFrom` date NOT NULL,
+  `ValidTo` date DEFAULT NULL,
+  `File` int(11) DEFAULT NULL,
+  PRIMARY KEY (`Id`),
+  KEY `Subject` (`Subject`),
+  KEY `DocumentLine` (`DocumentLine`),
+  KEY `File` (`File`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;');
+  $Manager->Execute('ALTER TABLE `Contract`
+  ADD CONSTRAINT `Contract_ibfk_3` FOREIGN KEY (`File`) REFERENCES `File` (`Id`),
+  ADD CONSTRAINT `Contract_ibfk_1` FOREIGN KEY (`Subject`) REFERENCES `Subject` (`Id`),
+  ADD CONSTRAINT `Contract_ibfk_2` FOREIGN KEY (`DocumentLine`) REFERENCES `DocumentLine` (`Id`);
+');
+  $Manager->Execute("INSERT INTO `Action` (
+`Id` ,`Name` ,`Title` ,`Type` ,`URL` ,`Group` ,`Icon` ,`PermissionOperation` ,
+`Enable`) VALUES (NULL , '', 'Smlouvy', '1', '/is/?t=Contract&a=list', NULL , NULL , NULL , '1'
+);");
+  $ActionId = $Manager->Database->insert_id;
+  $Manager->Execute("INSERT INTO `MenuItem` (`Id` ,`Name` ,`Parent` ,`Action` ,`Menu`) ".
+    "VALUES (NULL , 'Smlouvy', '2', '".$ActionId."', '1');");
+  $Manager->Execute("INSERT INTO `Action` (
+`Id` ,`Name` ,`Title` ,`Type` ,`URL` ,`Group` ,`Icon` ,`PermissionOperation` ,
+`Enable`) VALUES (NULL , '', 'Sazby DPH', '1', '/is/?t=FinanceVAT&a=list', NULL , NULL , NULL , '1'
+);");
+  $ActionId = $Manager->Database->insert_id;
+  $Manager->Execute("INSERT INTO `MenuItem` (`Id` ,`Name` ,`Parent` ,`Action` ,`Menu`) ".
+    "VALUES (NULL , 'Sazby DPH', '2', '".$ActionId."', '1');");
+}
+
 
 class Updates
@@ -614 +650 @@
       632 => array('Revision' => 633, 'Function' => 'UpdateTo633'),
       633 => array('Revision' => 645, 'Function' => 'UpdateTo645'),
+      645 => array('Revision' => 646, 'Function' => 'UpdateTo646'),
     ));
   }

trunk/Modules/Finance/Finance.php

@@ -489 +489 @@
       ),
     ));
+    $this->System->FormManager->RegisterClass('Contract', array(
+      'Title' => 'Smlouvy',
+      'Table' => 'Contract',
+      'Items' => array(
+        'DocumentLine' => array('Type' => 'TDocumentLine', 'Caption' => 'Dokladová řada', 'Default' => ''),
+        'BillCode' => array('Type' => 'String', 'Caption' => 'Kód', 'Default' => ''),
+        'Subject' => array('Type' => 'TSubject', 'Caption' => 'Subjekt', 'Default' => ''),
+        'ValidFrom' => array('Type' => 'Date', 'Caption' => 'Platnost od', 'Default' => ''),
+        'ValidTo' => array('Type' => 'Date', 'Caption' => 'Platnost do', 'Default' => '', 'Null' => true),
+        'File' => array('Type' => 'TFile', 'Caption' => 'Soubor', 'Default' => '', 'Null' => true),
+      ),
+      'BeforeInsert' => array($this, 'BeforeInsertFinanceOperation'),
+    ));
 
     $this->System->AddModule(new Bill($this->System));
@@ -502 +515 @@
   function BeforeInsertFinanceOperation($Form)
   {
-        $Year = date("Y", $Form->Values['Time']);
+        if(array_key_exists('Time', $Form->Values)) $Year = date("Y", $Form->Values['Time']);
+          else $Year = date("Y", $Form->Values['ValidFrom']);
     $DocumentLine = $Form->Values['DocumentLine'];
     $Form->Values['BillCode'] = $this->System->Modules['Finance']->GetNextDocumentLineNumber($DocumentLine, $Year);

trunk/Modules/IS/IS.php

@@ -494 +494 @@
       '<a href="?a=delete&amp;t='.$Table.'&amp;i=#RowId"><img alt="Smazat" title="Smazat" src="'.
       $this->System->Link('/images/delete.png').'" onclick="return confirmAction(\'Opravdu smazat položku?\');"/></a>';
-    if($Table != '') $FormClass = $this->System->FormManager->Classes[$Table];
-      else return($this->SystemMessage('Chyba', 'Tabulka nenalezena'));
+    if(($Table != '') and (array_key_exists($Table, $this->System->FormManager->Classes))) $FormClass = $this->System->FormManager->Classes[$Table];
+      else return($this->SystemMessage('Chyba', 'Tabulka '.$Table.' nenalezena'));
     if(array_key_exists('ItemActions', $FormClass))
     {