Changeset 497

Timestamp:

Mar 3, 2013, 1:03:25 PM (11 years ago)

Author:

chronos

Message:

• Upraveno: Zobecněn proces aktualizace dat tabulek při přechodu na nové období. Nyní se používá pole Action jakožto akce přidat, změnit, odebrat a ReplaceId jakožto id položky, které se operace týká.
• Přidáno: Podpora pro uživatelské akce v seznamech v sekci Správa dat.
• Upraveno: Řešení procesu generování nových faktur a plateb zákazníků při přechodu na nové období.

Location:

trunk

Files:

• Common/Version.php (modified) (1 diff)
• Modules/IS/IS.php (modified) (1 diff)
• admin/FullInstall.php (modified) (43 diffs)
• admin/Updates.php (modified) (1 diff)
• finance/clenove.php (modified) (4 diffs)
• finance/finance.php (modified) (5 diffs)
• finance/manage.php (modified) (10 diffs)
• form_classes.php (modified) (8 diffs)

trunk/Common/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 496; // Subversion revision
-$DatabaseRevision = 495; 
-$ReleaseTime = '2013-03-01';
+$Revision = 497; // Subversion revision
+$DatabaseRevision = 497; 
+$ReleaseTime = '2013-03-03';
 
 ?>

trunk/Modules/IS/IS.php

@@ -219 +219 @@
     $Output .= '<ul class="ActionMenu">';
     $Output .= '<li><a href="?a=add&amp;t='.$Table.'"><img alt="Přidat" title="Přidat" src="'.
-        $this->System->Link('/images/add.png').'"/>Přidat</a></li>';
+      $this->System->Link('/images/add.png').'"/>Přidat</a></li>';
     $Output .= '<li><a href="?a=list&amp;t='.$Table.'"><img alt="Seznam" title="Seznam" src="'.
-        $this->System->Link('/images/list.png').'"/>Seznam</a></li>';
+      $this->System->Link('/images/list.png').'"/>Seznam</a></li>';
+    if(array_key_exists('Actions', $FormClass))
+    {
+      foreach($FormClass['Actions'] as $Action)
+        $Output .= '<li><a href="'.$this->System->Link($Action['URL']).'"><img alt="'.$Action['Caption'].'" title="'.$Action['Caption'].'" src="'.
+            $this->System->Link('/images/action.png').'"/>'.$Action['Caption'].'</a></li>';
+    }
     $Output .= '</ul>';
     return($Output);

trunk/admin/FullInstall.php

@@ -3 +3 @@
 function FullInstall($Manager)
 {
-  $Manager->Execute("CREATE TABLE IF NOT EXISTS `ChatHistory` (
+  $Manager->Execute("
+--
+-- Funkce
+--
+CREATE DEFINER=`centrala`@`localhost` FUNCTION `CompareNetworkPrefix`(Address1 INT(11) UNSIGNED, Address2 INT(11) UNSIGNED, Size INT(11)) RETURNS tinyint(1)
+RETURN Address1 & (-1 << (32 - Size)) = Address2 & (-1 << (32 - Size));
+      
+--
+-- Struktura tabulky `ChatHistory`
+--
+
+CREATE TABLE IF NOT EXISTS `ChatHistory` (
   `Id` int(11) NOT NULL AUTO_INCREMENT,
   `Nick` varchar(64) COLLATE utf8_czech_ci NOT NULL,
@@ -100 +111 @@
   `ValidTo` date DEFAULT NULL,
   PRIMARY KEY (`Id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=2 ;
 
 -- --------------------------------------------------------
@@ -115 +126 @@
   PRIMARY KEY (`Id`),
   KEY `Employee` (`Employee`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=2 ;
 
 -- --------------------------------------------------------
@@ -127 +138 @@
   `Name` varchar(256) COLLATE utf8_czech_ci NOT NULL,
   `Size` int(11) NOT NULL,
-  PRIMARY KEY (`Id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=1 ;
+  `Directory` int(11) DEFAULT NULL,
+  PRIMARY KEY (`Id`),
+  KEY `Directory` (`Directory`)
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=6298 ;
+
+--
+-- RELACE PRO TABULKU `File`:
+--   `Directory`
+--       `FileDirectory` -> `Id`
+--
+
+-- --------------------------------------------------------
+
+--
+-- Struktura tabulky `FileDirectory`
+--
+
+CREATE TABLE IF NOT EXISTS `FileDirectory` (
+  `Id` int(11) NOT NULL AUTO_INCREMENT,
+  `Name` varchar(255) NOT NULL,
+  `Parent` int(11) DEFAULT NULL,
+  PRIMARY KEY (`Id`),
+  KEY `Parent` (`Parent`)
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=2 ;
+
+--
+-- RELACE PRO TABULKU `FileDirectory`:
+--   `Parent`
+--       `FileDirectory` -> `Id`
+--
 
 -- --------------------------------------------------------
@@ -184 +223 @@
 
 --
--- Struktura tabulky `FinanceBills`
---
-
-CREATE TABLE IF NOT EXISTS `FinanceBills` (
+-- Struktura tabulky `FinanceBillsItemsOld`
+--
+
+CREATE TABLE IF NOT EXISTS `FinanceBillsItemsOld` (
+  `Id` int(11) NOT NULL AUTO_INCREMENT,
+  `Bill` int(11) NOT NULL DEFAULT '0',
+  `Description` varchar(255) COLLATE utf8_czech_ci NOT NULL,
+  `Price` float NOT NULL DEFAULT '0',
+  `Quantity` float NOT NULL DEFAULT '1',
+  PRIMARY KEY (`Id`),
+  KEY `Bill` (`Bill`)
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=17839 ;
+
+--
+-- RELACE PRO TABULKU `FinanceBillsItemsOld`:
+--   `Bill`
+--       `FinanceBillsOld` -> `Id`
+--
+
+-- --------------------------------------------------------
+
+--
+-- Struktura tabulky `FinanceBillsOld`
+--
+
+CREATE TABLE IF NOT EXISTS `FinanceBillsOld` (
   `Id` int(11) NOT NULL AUTO_INCREMENT,
   `TimeFrom` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
@@ -204 +265 @@
 
 --
--- RELACE PRO TABULKU `FinanceBills`:
+-- RELACE PRO TABULKU `FinanceBillsOld`:
 --   `Subject`
 --       `Subject` -> `Id`
---
-
--- --------------------------------------------------------
-
---
--- Struktura tabulky `FinanceBillsItems`
---
-
-CREATE TABLE IF NOT EXISTS `FinanceBillsItems` (
-  `Id` int(11) NOT NULL AUTO_INCREMENT,
-  `Bill` int(11) NOT NULL DEFAULT '0',
-  `Description` varchar(255) COLLATE utf8_czech_ci NOT NULL,
-  `Price` float NOT NULL DEFAULT '0',
-  `Quantity` float NOT NULL DEFAULT '1',
-  PRIMARY KEY (`Id`),
-  KEY `Bill` (`Bill`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=17839 ;
-
---
--- RELACE PRO TABULKU `FinanceBillsItems`:
---   `Bill`
---       `FinanceBills` -> `Id`
 --
 
@@ -252 +291 @@
 
 --
--- Struktura tabulky `FinanceClaimLiabilityItem`
---
-
-CREATE TABLE IF NOT EXISTS `FinanceClaimLiabilityItem` (
-  `Id` int(11) NOT NULL AUTO_INCREMENT,
-  `FinanceClaimLiability` int(11) NOT NULL DEFAULT '0',
+-- Struktura tabulky `FinanceGroup`
+--
+
+CREATE TABLE IF NOT EXISTS `FinanceGroup` (
+  `Id` int(11) NOT NULL AUTO_INCREMENT,
+  `Description` varchar(128) COLLATE utf8_czech_ci NOT NULL DEFAULT '',
+  PRIMARY KEY (`Id`)
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=4 ;
+
+-- --------------------------------------------------------
+
+--
+-- Struktura tabulky `FinanceInvoice`
+--
+
+CREATE TABLE IF NOT EXISTS `FinanceInvoice` (
+  `Id` int(11) NOT NULL AUTO_INCREMENT,
+  `BillCode` varchar(16) COLLATE utf8_czech_ci NOT NULL,
+  `Subject` int(11) NOT NULL DEFAULT '0',
+  `TimeCreation` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `TimeDue` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `TimePayment` datetime DEFAULT NULL,
+  `Value` float NOT NULL DEFAULT '0',
+  `File` int(11) DEFAULT NULL,
+  `Text` varchar(255) COLLATE utf8_czech_ci NOT NULL DEFAULT '',
+  `PeriodTo` date DEFAULT NULL,
+  `PeriodFrom` date DEFAULT NULL,
+  PRIMARY KEY (`Id`),
+  KEY `Subject` (`Subject`),
+  KEY `Bill` (`File`)
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=8773 ;
+
+--
+-- RELACE PRO TABULKU `FinanceInvoice`:
+--   `File`
+--       `File` -> `Id`
+--   `Subject`
+--       `Subject` -> `Id`
+--
+
+-- --------------------------------------------------------
+
+--
+-- Struktura tabulky `FinanceInvoiceItem`
+--
+
+CREATE TABLE IF NOT EXISTS `FinanceInvoiceItem` (
+  `Id` int(11) NOT NULL AUTO_INCREMENT,
+  `FinanceInvoice` int(11) NOT NULL DEFAULT '0',
   `Description` varchar(255) COLLATE utf8_czech_ci NOT NULL,
   `Price` float NOT NULL DEFAULT '0',
@@ -263 +345 @@
   `Quantity` float NOT NULL DEFAULT '1',
   PRIMARY KEY (`Id`),
-  KEY `FinanceClaimLiability` (`FinanceClaimLiability`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=1 ;
-
---
--- RELACE PRO TABULKU `FinanceClaimLiabilityItem`:
---   `FinanceClaimLiability`
---       `FinanceClaimsLiabilities` -> `Id`
---
-
--- --------------------------------------------------------
-
---
--- Struktura tabulky `FinanceClaimsLiabilities`
---
-
-CREATE TABLE IF NOT EXISTS `FinanceClaimsLiabilities` (
-  `Id` int(11) NOT NULL AUTO_INCREMENT,
-  `BillCode` varchar(16) COLLATE utf8_czech_ci NOT NULL,
-  `Subject` int(11) NOT NULL DEFAULT '0',
-  `TimeCreation` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-  `TimeDue` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-  `TimePayment` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-  `Value` float NOT NULL DEFAULT '0',
-  `Bill` int(11) DEFAULT '0',
-  `Text` varchar(255) COLLATE utf8_czech_ci NOT NULL DEFAULT '',
-  `PeriodTo` date DEFAULT NULL,
-  `PeriodFrom` date DEFAULT NULL,
-  PRIMARY KEY (`Id`),
-  KEY `Subject` (`Subject`),
-  KEY `Bill` (`Bill`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=8770 ;
-
---
--- RELACE PRO TABULKU `FinanceClaimsLiabilities`:
---   `Subject`
---       `Subject` -> `Id`
---
-
--- --------------------------------------------------------
-
---
--- Struktura tabulky `FinanceGroup`
---
-
-CREATE TABLE IF NOT EXISTS `FinanceGroup` (
-  `Id` int(11) NOT NULL AUTO_INCREMENT,
-  `Description` varchar(128) COLLATE utf8_czech_ci NOT NULL DEFAULT '',
-  PRIMARY KEY (`Id`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=4 ;
+  KEY `FinanceClaimLiability` (`FinanceInvoice`)
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=8192 ;
+
+--
+-- RELACE PRO TABULKU `FinanceInvoiceItem`:
+--   `FinanceInvoice`
+--       `FinanceInvoice` -> `Id`
+--
 
 -- --------------------------------------------------------
@@ -362 +403 @@
   `BillCode` varchar(32) COLLATE utf8_czech_ci DEFAULT NULL,
   `Taxable` tinyint(1) NOT NULL DEFAULT '1',
-  `Bill` int(11) DEFAULT NULL,
+  `File` int(11) DEFAULT NULL,
   `Text` varchar(255) COLLATE utf8_czech_ci NOT NULL DEFAULT 'Vklad',
   `Network` int(11) NOT NULL DEFAULT '1',
@@ -371 +412 @@
   UNIQUE KEY `BillCode_2` (`BillCode`),
   KEY `Subject` (`Subject`),
-  KEY `Bill` (`Bill`),
+  KEY `Bill` (`File`),
   KEY `BankAccount` (`BankAccount`),
   KEY `Treasury` (`Treasury`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=6543 ;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=6546 ;
 
 --
 -- RELACE PRO TABULKU `FinanceOperation`:
+--   `File`
+--       `File` -> `Id`
 --   `Subject`
 --       `Subject` -> `Id`
---   `Bill`
---       `FinanceBills` -> `Id`
 --   `BankAccount`
 --       `FinanceBankAccount` -> `Id`
 --   `Treasury`
 --       `FinanceTreasury` -> `Id`
---
-
--- --------------------------------------------------------
-
---
--- Struktura tabulky `FinanceOperationItem`
---
-
-CREATE TABLE IF NOT EXISTS `FinanceOperationItem` (
-  `Id` int(11) NOT NULL AUTO_INCREMENT,
-  `FinanceOperation` int(11) NOT NULL DEFAULT '0',
-  `Description` varchar(255) COLLATE utf8_czech_ci NOT NULL,
-  `Price` float NOT NULL DEFAULT '0',
-  `VAT` float NOT NULL DEFAULT '0',
-  `Quantity` float NOT NULL DEFAULT '1',
-  PRIMARY KEY (`Id`),
-  KEY `FinanceOperation` (`FinanceOperation`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=1 ;
-
---
--- RELACE PRO TABULKU `FinanceOperationItem`:
---   `FinanceOperation`
---       `FinanceOperation` -> `Id`
 --
 
@@ -525 +543 @@
   PRIMARY KEY (`Id`),
   KEY `Parent` (`Parent`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=38 ;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=40 ;
 
 --
@@ -561 +579 @@
   KEY `Time` (`Time`),
   KEY `User` (`User`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=41115 ;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=38283 ;
 
 --
@@ -581 +599 @@
   `Longitude` double NOT NULL,
   PRIMARY KEY (`Id`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=260 ;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=767 ;
 
 -- --------------------------------------------------------
@@ -636 +654 @@
   KEY `BillingPeriodNext` (`BillingPeriodNext`),
   KEY `NetworkSegment` (`NetworkSegment`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=200 ;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=201 ;
 
 --
@@ -667 +685 @@
   PRIMARY KEY (`Id`),
   KEY `Member` (`Member`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=182 ;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=183 ;
 
 --
@@ -787 +805 @@
   KEY `Type` (`Type`),
   KEY `MapPosition` (`MapPosition`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=644 ;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=645 ;
 
 --
@@ -917 +935 @@
   KEY `Device` (`Device`),
   KEY `Type` (`Type`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=711 ;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=712 ;
 
 --
@@ -956 +974 @@
   KEY `host_id` (`NetworkInterface`),
   KEY `time` (`Time`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 -- --------------------------------------------------------
@@ -987 +1005 @@
   KEY `Interface1` (`Interface1`),
   KEY `Interface2` (`Interface2`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=357 ;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=356 ;
 
 --
 -- RELACE PRO TABULKU `NetworkLink`:
+--   `Interface2`
+--       `NetworkInterface` -> `Id`
 --   `Interface1`
 --       `NetworkInterface` -> `Id`
---   `Interface2`
---       `NetworkInterface` -> `Id`
 --
 
@@ -1021 +1039 @@
   PRIMARY KEY (`Id`),
   KEY `Comment` (`Comment`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=1422 ;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=1430 ;
 
 -- --------------------------------------------------------
@@ -1119 +1137 @@
   KEY `Link` (`Link`),
   KEY `User` (`User`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=973330 ;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=973387 ;
 
 --
@@ -1254 +1272 @@
   KEY `AssignedGroup` (`AssignedGroup`),
   KEY `AssignedOperation` (`AssignedOperation`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=226 ;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=227 ;
 
 --
@@ -1304 +1322 @@
   KEY `UnitOfMeasure` (`UnitOfMeasure`),
   KEY `Manufacturer` (`Manufacturer`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=180 ;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=181 ;
 
 --
@@ -1345 +1363 @@
 --
 -- RELACE PRO TABULKU `Service`:
+--   `ReplaceId`
+--       `Service` -> `Id`
 --   `Category`
 --       `ServiceCategory` -> `Id`
---   `ReplaceId`
---       `Service` -> `Id`
 --
 
@@ -1377 +1395 @@
   KEY `Service` (`Service`),
   KEY `Customer` (`Customer`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=437 ;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=511 ;
 
 --
 -- RELACE PRO TABULKU `ServiceCustomerRel`:
+--   `Service`
+--       `Service` -> `Id`
 --   `Customer`
 --       `Member` -> `Id`
@@ -1432 +1452 @@
   KEY `Segment` (`Segment`),
   KEY `Location` (`Location`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=182 ;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=186 ;
 
 --
@@ -1462 +1482 @@
   `DIC` varchar(32) COLLATE utf8_czech_ci NOT NULL DEFAULT '',
   `PayVAT` int(11) NOT NULL,
-  `MapPositionX` float NOT NULL DEFAULT '0',
-  `MapPositionY` float NOT NULL DEFAULT '0',
+  `MapPosition` int(11) DEFAULT NULL,
   `WWW` varchar(255) COLLATE utf8_czech_ci NOT NULL,
   `Note` varchar(255) COLLATE utf8_czech_ci NOT NULL,
   PRIMARY KEY (`Id`),
-  KEY `AddressCountry` (`AddressCountry`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=231 ;
+  KEY `AddressCountry` (`AddressCountry`),
+  KEY `MapPosition` (`MapPosition`)
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=233 ;
 
 --
 -- RELACE PRO TABULKU `Subject`:
+--   `MapPosition`
+--       `MapPosition` -> `Id`
 --   `AddressCountry`
 --       `Country` -> `Id`
@@ -1663 +1685 @@
   UNIQUE KEY `Name` (`Login`),
   UNIQUE KEY `Nick` (`Name`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=252 ;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=253 ;
 
 -- --------------------------------------------------------
@@ -1678 +1700 @@
   KEY `Customer` (`Customer`),
   KEY `User` (`User`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=520 ;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=521 ;
 
 --
@@ -1696 +1718 @@
 CREATE TABLE IF NOT EXISTS `UserOnline` (
   `Id` int(11) NOT NULL AUTO_INCREMENT,
-  `User` int(11) NOT NULL DEFAULT '0' COMMENT 'User.Id',
+  `User` int(11) DEFAULT NULL COMMENT 'User.Id',
   `ActivityTime` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
   `LoginTime` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
@@ -1705 +1727 @@
   PRIMARY KEY (`Id`),
   KEY `User` (`User`)
-) ENGINE=MEMORY  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=2 ;
+) ENGINE=MEMORY  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=2430 ;
 
 -- --------------------------------------------------------
@@ -1747 +1769 @@
 
 --
+-- Omezení pro tabulku `File`
+--
+ALTER TABLE `File`
+  ADD CONSTRAINT `File_ibfk_1` FOREIGN KEY (`Directory`) REFERENCES `FileDirectory` (`Id`);
+
+--
+-- Omezení pro tabulku `FileDirectory`
+--
+ALTER TABLE `FileDirectory`
+  ADD CONSTRAINT `FileDirectory_ibfk_1` FOREIGN KEY (`Parent`) REFERENCES `FileDirectory` (`Id`);
+
+--
 -- Omezení pro tabulku `FinanceBankAccount`
 --
@@ -1753 +1787 @@
 
 --
--- Omezení pro tabulku `FinanceBills`
---
-ALTER TABLE `FinanceBills`
-  ADD CONSTRAINT `FinanceBills_ibfk_1` FOREIGN KEY (`Subject`) REFERENCES `Subject` (`Id`);
-
---
--- Omezení pro tabulku `FinanceBillsItems`
---
-ALTER TABLE `FinanceBillsItems`
-  ADD CONSTRAINT `FinanceBillsItems_ibfk_1` FOREIGN KEY (`Bill`) REFERENCES `FinanceBills` (`Id`);
-
---
--- Omezení pro tabulku `FinanceClaimLiabilityItem`
---
-ALTER TABLE `FinanceClaimLiabilityItem`
-  ADD CONSTRAINT `FinanceClaimLiabilityItem_ibfk_1` FOREIGN KEY (`FinanceClaimLiability`) REFERENCES `FinanceClaimsLiabilities` (`Id`);
-
---
--- Omezení pro tabulku `FinanceClaimsLiabilities`
---
-ALTER TABLE `FinanceClaimsLiabilities`
-  ADD CONSTRAINT `FinanceClaimsLiabilities_ibfk_1` FOREIGN KEY (`Subject`) REFERENCES `Subject` (`Id`);
+-- Omezení pro tabulku `FinanceBillsItemsOld`
+--
+ALTER TABLE `FinanceBillsItemsOld`
+  ADD CONSTRAINT `FinanceBillsItemsOld_ibfk_1` FOREIGN KEY (`Bill`) REFERENCES `FinanceBillsOld` (`Id`);
+
+--
+-- Omezení pro tabulku `FinanceBillsOld`
+--
+ALTER TABLE `FinanceBillsOld`
+  ADD CONSTRAINT `FinanceBillsOld_ibfk_1` FOREIGN KEY (`Subject`) REFERENCES `Subject` (`Id`);
+
+--
+-- Omezení pro tabulku `FinanceInvoice`
+--
+ALTER TABLE `FinanceInvoice`
+  ADD CONSTRAINT `FinanceInvoice_ibfk_2` FOREIGN KEY (`File`) REFERENCES `File` (`Id`),
+  ADD CONSTRAINT `FinanceInvoice_ibfk_1` FOREIGN KEY (`Subject`) REFERENCES `Subject` (`Id`);
+
+--
+-- Omezení pro tabulku `FinanceInvoiceItem`
+--
+ALTER TABLE `FinanceInvoiceItem`
+  ADD CONSTRAINT `FinanceInvoiceItem_ibfk_1` FOREIGN KEY (`FinanceInvoice`) REFERENCES `FinanceInvoice` (`Id`);
 
 --
@@ -1780 +1815 @@
 --
 ALTER TABLE `FinanceOperation`
+  ADD CONSTRAINT `FinanceOperation_ibfk_5` FOREIGN KEY (`File`) REFERENCES `File` (`Id`),
   ADD CONSTRAINT `FinanceOperation_ibfk_1` FOREIGN KEY (`Subject`) REFERENCES `Subject` (`Id`),
-  ADD CONSTRAINT `FinanceOperation_ibfk_2` FOREIGN KEY (`Bill`) REFERENCES `FinanceBills` (`Id`),
   ADD CONSTRAINT `FinanceOperation_ibfk_3` FOREIGN KEY (`BankAccount`) REFERENCES `FinanceBankAccount` (`Id`),
   ADD CONSTRAINT `FinanceOperation_ibfk_4` FOREIGN KEY (`Treasury`) REFERENCES `FinanceTreasury` (`Id`);
-
---
--- Omezení pro tabulku `FinanceOperationItem`
---
-ALTER TABLE `FinanceOperationItem`
-  ADD CONSTRAINT `FinanceOperationItem_ibfk_1` FOREIGN KEY (`FinanceOperation`) REFERENCES `FinanceOperation` (`Id`);
 
 --
@@ -1868 +1897 @@
 --
 ALTER TABLE `NetworkLink`
-  ADD CONSTRAINT `NetworkLink_ibfk_1` FOREIGN KEY (`Interface1`) REFERENCES `NetworkDevice` (`Id`),
-  ADD CONSTRAINT `NetworkLink_ibfk_2` FOREIGN KEY (`Interface1`) REFERENCES `NetworkInterface` (`Id`),
-  ADD CONSTRAINT `NetworkLink_ibfk_3` FOREIGN KEY (`Interface2`) REFERENCES `NetworkInterface` (`Id`);
+  ADD CONSTRAINT `NetworkLink_ibfk_2` FOREIGN KEY (`Interface2`) REFERENCES `NetworkInterface` (`Id`),
+  ADD CONSTRAINT `NetworkLink_ibfk_1` FOREIGN KEY (`Interface1`) REFERENCES `NetworkInterface` (`Id`);
 
 --
@@ -1925 +1953 @@
 --
 ALTER TABLE `Service`
-  ADD CONSTRAINT `Service_ibfk_1` FOREIGN KEY (`Category`) REFERENCES `ServiceCategory` (`Id`),
-  ADD CONSTRAINT `Service_ibfk_2` FOREIGN KEY (`ReplaceId`) REFERENCES `Service` (`Id`);
+  ADD CONSTRAINT `Service_ibfk_2` FOREIGN KEY (`ReplaceId`) REFERENCES `Service` (`Id`),
+  ADD CONSTRAINT `Service_ibfk_1` FOREIGN KEY (`Category`) REFERENCES `ServiceCategory` (`Id`);
 
 --
@@ -1932 +1960 @@
 --
 ALTER TABLE `ServiceCustomerRel`
+  ADD CONSTRAINT `ServiceCustomerRel_ibfk_3` FOREIGN KEY (`Service`) REFERENCES `Service` (`Id`),
   ADD CONSTRAINT `ServiceCustomerRel_ibfk_2` FOREIGN KEY (`Customer`) REFERENCES `Member` (`Id`);
 
@@ -1953 +1982 @@
 --
 ALTER TABLE `Subject`
+  ADD CONSTRAINT `Subject_ibfk_2` FOREIGN KEY (`MapPosition`) REFERENCES `MapPosition` (`Id`),
   ADD CONSTRAINT `Subject_ibfk_1` FOREIGN KEY (`AddressCountry`) REFERENCES `Country` (`Id`);
 
@@ -1999 +2029 @@
 ALTER TABLE `Work`
   ADD CONSTRAINT `Work_ibfk_1` FOREIGN KEY (`User`) REFERENCES `User` (`Id`),
-  ADD CONSTRAINT `Work_ibfk_2` FOREIGN KEY (`Task`) REFERENCES `Task` (`Id`);");
+  ADD CONSTRAINT `Work_ibfk_2` FOREIGN KEY (`Task`) REFERENCES `Task` (`Id`);
+      ");
   $Manager->Execute("INSERT INTO `SystemVersion` (`Id`, `Revision`) VALUES
-(1, 491);");
+(1, 495);");
   
 }
@@ -2018 +2049 @@
   $Manager->Execute("INSERT INTO `User` (`Id`, `Login`, `Name`, `Password`, `Salt`, `Email`, `LastIpAddress`, `LastLoginTime`, `RegistrationTime`, `Locked`, `ICQ`, `PhoneNumber`, `InitPassword`) VALUES
 (1, 'admin', 'Správce', '05d97409afcce47d028c0d2a04cf359998cbaaf1', 'b295d117135a9763da282e7dae73a5ca7d3e5b11', 'admin@localhost', '', '0000-00-00 00:00:00', '2013-03-01 19:40:22', 0, 0, '+420123456789', '');");
-  $Manager->Execute("INSERT INTO `Subject` (`Id`, `Name`, `AddressStreet`, `AddressTown`, `AddressPSC`, `AddressCountry`, `IC`, `DIC`, `PayVAT`, `MapPositionX`, `MapPositionY`, `WWW`, `Note`) VALUES
-(1, 'Franta Vopršálek', 'Na hradě 1001', 'Bouzov', 12345, 1, '12345667', 'CZ1234567890', 0, 1, 2, '', '');");
+  $Manager->Execute("INSERT INTO `MapPosition` (`Id`, `Name`, `Latitude`, `Longitude`) VALUES
+(1, 'Franta Vopršálek', 47.555, 11.082)");
+  $Manager->Execute("INSERT INTO `Subject` (`Id`, `Name`, `AddressStreet`, `AddressTown`, `AddressPSC`, `AddressCountry`, `IC`, `DIC`, `PayVAT`, `MapPosition`, `WWW`, `Note`) VALUES
+(1, 'Franta Vopršálek', 'Na hradě 1001', 'Bouzov', 12345, 1, '12345667', 'CZ1234567890', 0, 1, '', '');");
   $Manager->Execute("INSERT INTO `UnitOfMeasure` (`Id`, `Unit`, `Name`) VALUES
 (1, 'ks', 'kus'),
@@ -2186 +2219 @@
 (15, 'Kino Vatra', 0, 15, 1, 'http://www.dkvsetin.cz/rss/kino/8'),
 (16, 'Obec Hovězí', 0, 16, 1, 'http://www.obec-hovezi.cz/web/rss.xml');");
-  $Manager->Execute("INSERT INTO `MapPosition` (`Id`, `Name`, `Latitude`, `Longitude`) VALUES
-(1, 'Franta Vopršálek', 47.555, 11.082)");
   $Manager->Execute("INSERT INTO `FinanceBillingPeriod` (`Id`, `Name`, `MonthCount`) VALUES
 (1, 'Nikdy', 0),
@@ -2362 +2393 @@
   $Manager->Execute("INSERT INTO `ServiceCustomerRel` (`Id`, `Service`, `Customer`, `Period`) VALUES
 (1, 1, 1, 0), (2, 1, 1, 1);");
-  $Manager->Execute("INSERT INTO `File` (`Id` ,`Name` ,`Size` ,`Directory`) VALUES (NULL , 'invoice_1.pdf', '123', NULL);");
+  $Manager->Execute("INSERT INTO `File` (`Id` ,`Name` ,`Size` ,`Directory`) ".
+    "VALUES (1 , 'invoice_1.pdf', '123', NULL);");
   $Manager->Execute("INSERT INTO `FinanceInvoice` (`Id` ,`BillCode` ,`Subject` ,`TimeCreation` ,`TimeDue` ,`TimePayment` ,`Value` ,`File` ,`Text` ,`PeriodTo` ,`PeriodFrom`) ".
     "VALUES (1 , 'VF123/2013', '1', NOW( ) , '0000-00-00 00:00:00', NULL , '300', '1', 'Měsíční paušál', '2013-01-01', '2013-01-31');");
   $Manager->Execute("INSERT INTO `FinanceInvoiceItem` (`Id` ,`FinanceInvoice` ,`Description` ,`Price` ,`VAT` ,`Quantity`) ".
-     "VALUES (1 , '1', 'Internet 16M', '300', '21', '1');");
+    "VALUES (1 , '1', 'Internet 16M', '300', '21', '1');");
   $Manager->Execute("INSERT INTO `FinanceYear` (`Id`, `Year`, `DateStart`, `DateEnd`) VALUES
 (1, 2007, '2007-12-01', '2007-12-31'),
@@ -2378 +2410 @@
 (1, 10000, 100000, 10000, 50, 6, 1024, 50, 138),
 (0, 10000, 100000, 10000, 50, 6, 1024, 50, 138);");
+  $Manager->Execute("INSERT INTO `DocumentLine` (`Id`, `Name`, `Shortcut`) VALUES
+(1, 'Příjmy do pokladny', 'PP'),
+(2, 'Výdeje z pokladny', 'VP'),
+(3, 'Příjem na účet', 'BV'),
+(4, 'Výdej z účtu', 'PR'),
+(5, 'Přijaté faktury', 'PF'),
+(6, 'Vydané faktury', 'VF'),
+(7, 'Výdej ze skladu', 'VS'),
+(8, 'Příjem na sklad', 'PS');");
 }
 

trunk/admin/Updates.php

@@ -24 +24 @@
 }
 
+function UpdateTo497($Manager)
+{
+  $Manager->Execute("ALTER TABLE `FinanceCharge` ADD `Id` INT NOT NULL AUTO_INCREMENT FIRST , ADD PRIMARY KEY ( `Id` ) ");
+  $Manager->Execute("ALTER TABLE `FinanceCharge` ADD `ReplaceId` INT NULL ,ADD INDEX ( `ReplaceId` ) ");
+  $Manager->Execute("DELETE FROM `FinanceCharge` WHERE `FinanceCharge`.`Period` = 1");
+  $Manager->Execute("ALTER TABLE `FinanceCharge` DROP `Period`");
+  $Manager->Execute("ALTER TABLE `FinanceCharge` ADD `Action` ENUM( 'add', 'modify', 'remove' ) NULL AFTER `TopTariffPrice` ");
+  $Manager->Execute("ALTER TABLE `FinanceCharge` ADD FOREIGN KEY ( `ReplaceId` ) REFERENCES `FinanceCharge` (".
+    "`Id`) ON DELETE RESTRICT ON UPDATE RESTRICT ;");
+  $Manager->Execute("ALTER TABLE `FinanceCharge` ADD INDEX ( `Action` )");
+  $Manager->Execute("INSERT INTO `ISMenuItem` (`Id` ,`Name` ,`Parent` ,`Table` ,`IconName`) ".
+    "VALUES (NULL , 'Parametry účtování', '2', 'FinanceCharge', '');");
+  $Manager->Execute("INSERT INTO `ISMenuItem` (`Id` ,`Name` ,`Parent` ,`Table` ,`IconName`) ".
+    "VALUES (NULL , 'Úseky sítě', '2', 'NetworkSegment', ''");
+  $Manager->Execute("ALTER TABLE `ServiceCustomerRel` ADD `Action` ENUM( 'add', 'modify', 'remove' ) NULL , ".
+    "ADD `ReplaceId` INT NULL");
+  $Manager->Execute("DELETE FROM `ServiceCustomerRel` WHERE `Period`=1");
+  $Manager->Execute("ALTER TABLE `ServiceCustomerRel` DROP `Period`");
+  $Manager->Execute("ALTER TABLE `ServiceCustomerRel` ADD INDEX ( `Action` )");
+  $Manager->Execute("ALTER TABLE `ServiceCustomerRel` ADD INDEX ( `ReplaceId` ) ");
+  $Manager->Execute("ALTER TABLE `ServiceCustomerRel` ADD FOREIGN KEY ( `ReplaceId` ) REFERENCES `ServiceCustomerRel` (".
+    "`Id`) ON DELETE RESTRICT ON UPDATE RESTRICT ;");
+  $Manager->Execute("ALTER TABLE `Service` ADD `Action` ENUM( 'add', 'modify', 'remove' ) NULL AFTER `CustomerCount`");
+  $Manager->Execute("ALTER TABLE `Service` ADD INDEX ( `Action` )");
+  $Manager->Execute("INSERT INTO `ISMenuItem` (`Id` ,`Name` ,`Parent` ,`Table` ,`IconName`) ".
+    "VALUES (NULL , 'Placení zákazníků', '2', 'MemberPayment', '');");
+}
+
 $Updates = array(
         491 => array('Revision' => 493, 'Function' => 'UpdateTo493'),
   493 => array('Revision' => 494, 'Function' => 'UpdateTo494'),
   494 => array('Revision' => 495, 'Function' => 'UpdateTo495'),
+  495 => array('Revision' => 497, 'Function' => 'UpdateTo497'),
 );
 

trunk/finance/clenove.php

@@ -17 +17 @@
       'Subject.Name, NetworkDevice, '.
       '(SELECT GROUP_CONCAT(Service.Name) FROM ServiceCustomerRel LEFT JOIN Service '.
-      'ON Service.Id=ServiceCustomerRel.Service WHERE ServiceCustomerRel.Customer=Member.Id AND ServiceCustomerRel.Period=0) AS ServicesCurrentMonth, '.
-      '(SELECT GROUP_CONCAT(Service.Name) FROM ServiceCustomerRel LEFT JOIN Service '.
-      'ON Service.Id=ServiceCustomerRel.Service WHERE ServiceCustomerRel.Customer=Member.Id AND ServiceCustomerRel.Period=1) AS ServicesNextMonth, '.
+      'ON Service.Id=ServiceCustomerRel.Service WHERE ServiceCustomerRel.Customer=Member.Id AND '.
+      'ServiceCustomerRel.Action IS NULL) AS ServicesCurrentMonth, '.
+      //'(SELECT GROUP_CONCAT(Service.Name) FROM ServiceCustomerRel LEFT JOIN Service '.
+      //'ON Service.Id=ServiceCustomerRel.Service WHERE ServiceCustomerRel.Customer=Member.Id AND '.
+      //'ServiceCustomerRel.Period=1) AS ServicesNextMonth, '.
       'User.Name AS FullName FROM MemberPayment LEFT JOIN Member ON '.
       'Member.Id=MemberPayment.Member LEFT JOIN Subject ON Subject.Id=Member.Subject '.
@@ -36 +38 @@
       array('Name' => 'Cash', 'Title' => 'Stav účtu [Kč]'), 
       array('Name' => 'ServicesCurrentMonth', 'Title' => 'Běžící tarif'), 
-      array('Name' => 'ServicesNextMonth', 'Title' => 'Příští tarif'), 
+      //array('Name' => 'ServicesNextMonth', 'Title' => 'Příští tarif'), 
       array('Name' => 'Note', 'Title' => 'Poznámky'), 
       array('Name' => 'WWW', 'Title' => 'WWW'), 
@@ -55 +57 @@
       if($Row['Cash'] < 0) $Row['Cash'] = '<span style="color: red;">'.$Row['Cash'].'</span>';
       $Tarif = $Row['ServicesCurrentMonth'];
-      $PristiTarif = $Row['ServicesNextMonth'];
+      //$PristiTarif = $Row['ServicesNextMonth'];
       $Output .= '<tr><td>'.$Row['FullName'].'</td><td><a href="user_state.php?Subject='.$Row['Id'].'">'.$Row['Name'].'</a></td>';
       //<td align="right">'.$Row['network_device'].'</td>
-      $Output .= '<td align="right">'.$Row['MonthlyTotal'].'</td><td align="right">'.$Row['Cash'].'</td><td align="center">'.$Tarif.'</td><td align="center">'.$PristiTarif.'</td><td>'.$Row['Note'].'</td><td>'.$Row['WWW'].'</td></tr>';
+      $Output .= '<td align="right">'.$Row['MonthlyTotal'].'</td><td align="right">'.$Row['Cash'].'</td>'.
+      '<td align="center">'.$Tarif.'</td>'.
+      //'<td align="center">'.$PristiTarif.'</td>'.
+      '<td>'.$Row['Note'].'</td><td>'.$Row['WWW'].'</td></tr>';
       $TotalDevice += $Row['NetworkDevice'];
       $TotalMonth += ($Row['MonthlyTotal']);
@@ -64 +69 @@
     $Output .= '<tr><td><strong>Celkem</strong></td><td>&nbsp;</td>';
     //<td align="right"><strong>'.$TotalDevice.'</strong></td>
-    $Output .= '<td align="right"><strong>'.$TotalMonth.'</strong></td><td align="right"><strong>'.$TotalCash.'</strong></td><td align="right">&nbsp;</td><td align="right">&nbsp;</td><td align="right">&nbsp;</td><td align="right">&nbsp;</td></tr>';
+    $Output .= '<td align="right"><strong>'.$TotalMonth.'</strong></td>'.
+    '<td align="right"><strong>'.$TotalCash.'</strong></td><td align="right">&nbsp;</td>'.
+    //'<td align="right">&nbsp;</td>'.
+    '<td align="right">&nbsp;</td><td align="right">&nbsp;</td></tr>';
     $Output .= '</table>';
     $Output .= $PageList['Output'];

trunk/finance/finance.php

@@ -54 +54 @@
       $DbResult = $this->Database->query('SELECT COUNT(*) FROM `Member` '.
         'LEFT JOIN `ServiceCustomerRel` ON `ServiceCustomerRel`.`Customer`=`Member`.`Id` '.
-        'WHERE (`ServiceCustomerRel`.`Service`='.$Index.') AND (`Member`.`BillingPeriod` > 1) AND (`Member`.`Blocked`=0)');
+        'WHERE (`ServiceCustomerRel`.`Service`='.$Index.') AND (`Member`.`BillingPeriod` > 1) '.
+        'AND (`Member`.`Blocked`=0)');
       $Row = $DbResult->fetch_row();
       $this->Tariffs[$Index]['CustomerCount'] = $Row[0];
@@ -103 +104 @@
       $this->BillingPeriods[$BillingPeriod['Id']] = $BillingPeriod;
     
-    $DbResult = $this->Database->query('SELECT * FROM `FinanceCharge` WHERE `Period`='.$Period);
+    // Period parameter is not used as it have to be determined from item replacement
+    $DbResult = $this->Database->query('SELECT * FROM `FinanceCharge` WHERE `ReplaceId` IS NULL LIMIT 1');
     $Row = $DbResult->fetch_array();
     $this->kWh = $Row['kWh'];
@@ -203 +205 @@
          'FROM `ServiceCustomerRel` LEFT JOIN '.
          '`Service` ON `Service`.`Id` = `ServiceCustomerRel`.`Service` WHERE `ServiceCustomerRel`.`Customer`='.
-         $Member['Id'].' AND `ServiceCustomerRel`.`Period`=1');
+         $Member['Id'].' AND `ServiceCustomerRel`.`Action` IS NULL');
       $DbRow = $DbResult2->fetch_assoc();      
       $Monthly = 0;
@@ -259 +261 @@
         $DbResult2 = $this->Database->query('SELECT * FROM NetworkSegment WHERE Id='.$ID);
         $Row4 = $DbResult2->fetch_array();
-        $this->Database->update('NetworkSegment', 'Id='.$Row4['Id'], array('Users' => ($Row4['Users'] + $Row3[0]), 'UsersOverheads' => ($Row4['UsersOverheads'] + $Row3[0])));
+        $this->Database->update('NetworkSegment', 'Id='.$Row4['Id'], 
+          array('Users' => ($Row4['Users'] + $Row3[0]), 'UsersOverheads' => ($Row4['UsersOverheads'] + $Row3[0])));
         $ID = $Row4['Parent'];
       }
-      $this->Database->update('NetworkSegment', 'Id='.$NetworkSegment['Id'], array('Price' => $Row2['Price'], 'Users' => ($Row3[0] + $RowP['Users']), 'Consumption' => $Row2['Consumption'], 'UsersOverheads' => ($Row3[0] + $RowP2['UsersOverheads'])));
+      $this->Database->update('NetworkSegment', 'Id='.$NetworkSegment['Id'], 
+        array('Price' => $Row2['Price'], 'Users' => ($Row3[0] + $RowP['Users']), 'Consumption' => $Row2['Consumption'], 'UsersOverheads' => ($Row3[0] + $RowP2['UsersOverheads'])));
     }
 
@@ -268 +272 @@
     $DbResult = $this->Database->select('Member', 'COUNT(*)');
     $Row = $DbResult->fetch_array();
-    $DbResult = $this->Database->update('NetworkSegment', 'Id='.$this->InternetSegmentId, array('Users' => $Row[0], 'UsersOverheads' => $Row[0]));
+    $DbResult = $this->Database->update('NetworkSegment', 'Id='.$this->InternetSegmentId, 
+      array('Users' => $Row[0], 'UsersOverheads' => $Row[0]));
     $this->System->Modules['Log']->NewRecord('Finance', 'RecalculateSegmentParameters');
     return($Output);

trunk/finance/manage.php

@@ -71 +71 @@
         $Output .= '<a href="?Operation=ConvertPDFToFile">Převést data z databáze do souborů</a><br />';
         $Output .= '<a href="?Operation=Bills">Správa dokladů</a><br />';
-        $Output .= '<a href="?Operation=Recalculate">Přepočet financí</a><br />';
+        //$Output .= '<a href="?Operation=Recalculate">Přepočet financí</a><br />';
         $Output .= '<a href="?Operation=ShowMonthlyPayment">Měsíční vyúčtování</a><br />';
-        $Output .= '<a href="clenove.php">Seznam členů</a><br />';
+        //$Output .= '<a href="clenove.php">Seznam členů</a><br />';
         $Output .= '<a href="zivnost.php">Živnost</a><br />';
         $Output .= '<a href="?Operation=GenerateBills">Generovat chybějící doklady</a><br />';
@@ -135 +135 @@
       $DbResult = $this->Database->select('FinanceInvoice', '*', 'Subject='.$Subject.
       ' AND TimePayment IS NULL AND Value > 0 ORDER BY TimeCreation LIMIT 1');
-      //echo($Database->error);
       if($DbResult->num_rows > 0)
       {
@@ -147 +146 @@
             'TimeCreation' => TimeToMysqlDateTime($LastInsertTime), 
             'CashFlowId' => $OpenedClaim['Id'], 'Direction' => 'In'));
-          //echo($Database->LastQuery);
         } else break;
       } else break;
@@ -153 +151 @@
   }
 
-  function InsertLiability($Subject, $Value, $TimeCreation, $TimeDue, $Text, 
+  function InsertInvoice($Subject, $TimeCreation, $TimeDue, $Items, 
     $DocumentLine, $PeriodFrom, $PeriodTo)
   {
@@ -159 +157 @@
 
     $BillCode = $this->System->Modules['Finance']->GetNextDocumentLineNumber($DocumentLine);
+    $SumValue = 0;
+    foreach($Items as $Item)
+      $SumValue = $SumValue + $Item['Price'];
     $this->Database->insert('FinanceInvoice', array( 
       'Subject' => $Subject, 'TimeCreation' => TimeToMysqlDateTime($TimeCreation), 
-      'TimeDue' => TimeToMysqlDateTime($TimeDue), 'Value' => $Value, 'BillCode' => $BillCode,
+      'TimeDue' => TimeToMysqlDateTime($TimeDue), 'Value' => $SumValue, 'BillCode' => $BillCode,
       'PeriodFrom' => TimeToMysqlDate($PeriodFrom), 'PeriodTo' => TimeToMysqlDate($PeriodTo)));
     $InvoiceId = $this->Database->insert_id;
-    $this->Database->insert('FinanceInvoice', array('FinanceInvoice' => $InvoiceId, 
-      'Description' => $Text, 'Price' => $Value, 'Quantity' => 1, 'VAT' => 0));
-    $Output = '.'; //$this->Database->LastQuery.'<br />';
+    foreach($Items as $Item)
+    $this->Database->insert('FinanceInvoiceItem', array('FinanceInvoice' => $InvoiceId, 
+      'Description' => $Item['Description'], 'Price' => $Item['Price'], 'Quantity' => $Item['Quantity'], 'VAT' => $Item['VAT']));
     //$LastInsertTime = $Time;
     //$this->CheckAdvancesAndLiabilities($Subject);
-    return($Output);
+    return($InvoiceId);
   }
 
@@ -256 +257 @@
     $Form = new Form('NewInvoice');
     $Form->LoadvaluesFromForm();
-    //print_r($Form->Values);
-    $this->InsertLiability($Form->Values['Subject'], $Form->Values['Value'], 
-      $Form->Values['TimeCreation'], $Form->Values['TimeDue'], $Form->Values['Text'], 
+    $Items = array(array('Price' => $Form->Values['Value'], 
+      'Description' => $Form->Values['Text'], 'Quantity' => 1, 'VAT' => 21));
+    $LastId = $this->InsertInvoice($Form->Values['Subject'],  
+      $Form->Values['TimeCreation'], $Form->Values['TimeDue'], $Items, 
       $Form->Values['DocumentLine'], NULL, NULL);
-    $LastId = $this->Database->insert_id;
     $DbResult = $this->Database->select('FinanceInvoice', 'BillCode', 'Id='.$LastId);
     $DbRow = $DbResult->fetch_assoc();
@@ -304 +305 @@
       'MemberPayment.Cash AS Cash, '.
       '(SELECT GROUP_CONCAT(Service.Name) FROM ServiceCustomerRel LEFT JOIN Service '.
-      'ON Service.Id=ServiceCustomerRel.Service WHERE ServiceCustomerRel.Customer=Member.Id AND ServiceCustomerRel.Period=1) AS ServicesNextMonth, '.
+      'ON Service.Id=ServiceCustomerRel.Service WHERE ServiceCustomerRel.Customer=Member.Id AND '.
+      'ServiceCustomerRel.Action IS NULL) AS ServicesNextMonth, '.
       'UNIX_TIMESTAMP(Member.BillingPeriodLastDate) AS LastDate, Subject.Name AS SubjectName, '.
       'FinanceBillingPeriod.Name AS BillingPeriodName '.
@@ -350 +352 @@
   }
   
+  function ProduceInvoices()
+  {
+    $Output = '';
+    
+    // Generuj účetní položky
+    $DbResult = $this->Database->query('SELECT Member.*, MemberPayment.MonthlyTotal, UNIX_TIMESTAMP(Member.BillingPeriodLastDate), Subject.Name AS SubjectName FROM MemberPayment JOIN Member ON Member.Id=MemberPayment.Member JOIN Subject ON Subject.Id=Member.Subject');
+    while($Member = $DbResult->fetch_assoc())
+    {
+      $Output .= $Member['SubjectName'].': ';
+      $Period = $this->GetBillingPeriod($Member['BillingPeriodNext']);
+      if($Period['From'] > $Member['UNIX_TIMESTAMP(Member.BillingPeriodLastDate)'])
+      {
+        $this->Database->update('Member', 'Id='.$Member['Id'],
+            array('BillingPeriod' => $Member['BillingPeriodNext']));
+        $Member['BillingPeriod'] = $Member['BillingPeriodNext'];
+      }
+      $Period = $this->GetBillingPeriod($Member['BillingPeriod']);
+      if(($Period['From'] > $Member['UNIX_TIMESTAMP(Member.BillingPeriodLastDate)']) and
+          ($Member['Blocked'] == 0))
+      {
+        $InvoiceItems = array();
+        $MonthlyTotal = 0;
+        $DbResult2 = $this->Database->query('SELECT Service.* FROM ServiceCustomerRel LEFT JOIN Service '.
+          'ON Service.Id=ServiceCustomerRel.Service WHERE (ServiceCustomerRel.Customer='.
+          $Member['Id'].') AND (ServiceCustomerRel.Action IS NULL)');
+        while($Service = $DbResult2->fetch_assoc())
+        {
+          $InvoiceItems[] = array('Description' => $Service['Name'], 'Price' => $Service['Price'],
+              'Quantity' => $Period['MonthCount'], 'VAT' => 21);
+          $MonthlyTotal += $Service['Price'];
+        }
+        if($Member['Hire'] != 0)
+        {
+          $Output .= '<tr><td>Nájem</td><td>'.(-$Member['Hire']).'</td></tr>';
+          $MonthlyTotal -= $Member['Hire'];
+        }
+        if($Member['MonthlyPlus'] != 0)
+        {
+          $MonthlyTotal -= $Member['MonthlyPlus'];
+        }
+        $PayPerPeriod = $MonthlyTotal * $Period['MonthCount'];
+    
+        $TimePeriodText = date('j.n.Y', $Period['From']).' - '.date('j.n.Y', $Period['To']);
+        $Output .= $TimePeriodText.': '.$MonthlyTotal.' * '.$Period['MonthCount'].' = '.$PayPerPeriod.'<br />';
+        $this->InsertInvoice($Member['Subject'], 'NOW()', 'DATE_ADD(NOW(), INTERVAL '.INVOICE_DUE_DAYS.' DAY)', 
+          $InvoiceItems, INVOICE_OUT_DOC_LINE, $Period['From'], $Period['To']);
+    
+        $Output .= $this->SendPaymentEmail($Member['Id']);
+        $this->Database->update('Member', 'Id='.$Member['Id'], array('BillingPeriodLastDate' => TimeToMysqlDateTime($Period['To'])));
+      } else $Output .= '<br />';
+    }  
+    return($Output);
+  }
+  
+  function TableUpdatePeriod($Table)
+  {
+    $DbResult = $this->Database->select($Table, '*', '`Action` IS NOT NULL');
+    while($Service = $DbResult->fetch_array())
+    {
+      if($Service['Action'] == 'add')
+      {
+        unset($Service['Id']);
+        unset($Serivce['ReplaceId']);
+        unset($Serivce['Action']);
+        $this->Database->insert($Table, $Service);
+      } else
+      if($Service['Action'] == 'modify')
+      {
+        unset($Service['Id']);
+        unset($Service['Action']);
+        $ReplaceId = $Service['ReplaceId'];
+        unset($Service['ReplaceId']);
+        $this->Database->update($Table, 'Id='.$ReplaceId, $Service);
+      } else
+      if($Service['Action'] == 'delete')
+      {
+        $this->Database->delete($Table, '`Id`='.$Service['ReplaceId']);
+      }
+    }
+    $this->Database->delete($Table, '`Action` IS NOT NULL');
+  }  
+  
   function ProcessMonthlyPayment()
   {
@@ -363 +447 @@
     $Output -= 'Datum: '.date('j.n.Y').'<br />';
     
-    $Datum = explode('-', $Overall['Date']);
-    $Mesic = date('m') + 0;
+    $DateParts = explode('-', $Overall['Date']);
+    $MonthLast = $DateParts[1];
+    $MonthCurrent = date('m') + 0;
 
     $Output .= $Finance->RecalculateSegmentParameters();
@@ -402 +487 @@
 
     // Zkontrolovat odečtení měsíčního poplatku
-    //$Mesic = '1';
-    $Output .= 'Kontrola odečtení poplatků: Poslední měsíc-'.round($Datum[1]).' Aktuální měsíc-'.$Mesic.'<br />';
-    if($Mesic != $Datum[1])
+    $Output .= 'Kontrola odečtení poplatků: Poslední měsíc-'.$MonthLast.' Aktuální měsíc-'.$MonthCurrent.'<br />';
+    //if($MonthCurrent != $MonthLast)
     {
       $Output .= 'Odečítám měsíční poplatek...<br />';
-
-      // Generuj účetní položky
-      $DbResult = $this->Database->query('SELECT Member.*, MemberPayment.MonthlyTotal, UNIX_TIMESTAMP(Member.BillingPeriodLastDate), Subject.Name AS SubjectName FROM MemberPayment JOIN Member ON Member.Id=MemberPayment.Member JOIN Subject ON Subject.Id=Member.Subject');
-      while($Member = $DbResult->fetch_assoc())
-      {
-        $Output .= $Member['SubjectName'].': ';
-        //$Member['UNIX_TIMESTAMP(Member.BillingPeriodLastDate)'] = MysqlDateTimeToTime('2009-04-01 1:1:1');
-        $Period = $this->GetBillingPeriod($Member['BillingPeriodNext']);
-        if($Period['From'] > $Member['UNIX_TIMESTAMP(Member.BillingPeriodLastDate)'])
-        {
-          $this->Database->update('Member', 'Id='.$Member['Id'], 
-            array('BillingPeriod' => $Member['BillingPeriodNext']));
-          $Member['BillingPeriod'] = $Member['BillingPeriodNext'];
-        }
-        $Period = $this->GetBillingPeriod($Member['BillingPeriod']);
-        if(($Period['From'] > $Member['UNIX_TIMESTAMP(Member.BillingPeriodLastDate)']) and ($Member['InternetTariffCurrentMonth'] != TARIFF_FREE) and ($PayPerPeriod > 0) and
-        ($Member['Blocked'] == 0))
-        {
-          $BillItems = array();
-          $MonthlyTotal = 0;
-          $DbResult2 = $this->Database->query('(SELECT Service.* FROM ServiceCustomerRel LEFT JOIN Service '.
-            'ON Service.Id=ServiceCustomerRel.Service WHERE ServiceCustomerRel.Customer='.$Member['Id'].') AND (ServiceCustomerRel.Period=0)');
-          while($Service = $DbResult2->fetch_assoc())
-          {
-            $BillItems[] = array('Description' => $Service['Name'], 'Price' => $Service['Price'], 
-            'Quantity' => $Period['MonthCount']);
-            $MonthlyTotal += $ServicePrice['Price'];
-            $this->Database->update('ServiceCustomerRel', 'Id=');  
-          }
-          if($Member['Hire'] != 0)
-          {
-            $Output .= '<tr><td>Nájem</td><td>'.(-$Member['Hire']).'</td></tr>';
-            $MonthlyTotal -= $Member['Hire'];
-          }
-          if($Member['MonthlyPlus'] != 0)
-          {
-            $MonthlyTotal -= $Member['MonthlyPlus'];
-          }
-          $PayPerPeriod = $MonthlyTotal * $Period['MonthCount'];
-    
-//echo($Mesic.'%'.$MonthCount.'='.($Mesic % $MonthCount).' ');                  
-          $TimePeriodText = date('j.n.Y', $Period['From']).' - '.date('j.n.Y', $Period['To']);
-          $Output .= $TimePeriodText.': '.$MonthlyTotal.' * '.$Period['MonthCount'].' = '.$PayPerPeriod.'<br />';
-          $BillCode = $Finance->GetNextDocumentLineNumber(INVOICE_OUT_DOC_LINE); 
-          $BillId = $this->System->Modules['Bill']->CreateBill($Member['Subject'], 
-            $BillItems, time(), time() + 3600 * 24 * INVOICE_DUE_DAYS, $BillCode, $Period['From'], $Period['To']);
-          $this->Database->insert('FinanceInvoice', array( 
-            'Subject' => $Member['Subject'], 'TimeCreation' => 'NOW()', 
-            'TimeDue' => 'DATE_ADD(NOW(), INTERVAL '.INVOICE_DUE_DAYS.' DAY)',             
-            'Bill' => $BillId, 'BillCode' => $BillCode));
-          $InvoiceId = $this->Database->insert_id;
-          $this->Database->insert('FinanceInvoiceItem', array('FinanceInvoice' => $InvoiceId,
-            'Value' => $PayPerPeriod, 'Text' => 'Vyúčtování služeb za období '.$TimePeriodText,
-           'Quantity' => 1, 'VAT' => 0));
-          
-          $Output .= $this->SendPaymentEmail($Member['Id']);
-          $this->Database->update('Member', 'Id='.$Member['Id'], array('BillingPeriodLastDate' => TimeToMysqlDateTime($Period['To'])));
-        } else $Output .= '<br />';
-      }
+      $this->ProduceInvoices();    
       
       // Update finance charge
       $Output .= 'Měním aktuální parametry sítě...<br>';
-      $this->Database->delete('FinanceCharge', 'Period = 0');
-      $DbResult = $this->Database->select('FinanceCharge', '*', 'Period = 1');
-      $Charge = $DbResult->fetch_assoc();
-      //print_r($Charge);
-      $DbResult = $this->Database->insert('FinanceCharge', array('Period' => 0, 'Internet' => $Charge['Internet'], 'InternetSpeed' => $Charge['InternetSpeed'], 'InternetSpeedReserve' => $Charge['InternetSpeedReserve'], 'AdministrationPerUser' => $Charge['AdministrationPerUser'], 'kWh' => $Charge['kWh'], 'BaseSpeedElement' => $Charge['BaseSpeedElement'], 'BaseTariffPrice' => $Charge['BaseTariffPrice'], 'TopTariffPrice' => $Charge['TopTariffPrice']));
+      $this->TableUpdatePeriod('FinanceCharge');
 
       $Output .= 'Přidávám měsíční přehled...<br />';
-      $this->Database->insert('FinanceMonthlyOverall', array('Date' => 'NOW()', 'Money' => $Finance->Internet, 'kWh' => $Finance->kWh, 'Administration' => $Finance->Sprava, 'AdministrationTotal' => $SpravaCelkem, 'ConsumptionTotal' => $TotalConsumptionCost, 'TotalPaid' => $Finance->TotalPaid, 'BaseTariffPrice' => $Charge['BaseTariffPrice'], 'TopTariffPrice' => $Charge['TopTariffPrice'], 'MemberCount' => $Finance->InternetUsers));
+      $this->Database->insert('FinanceMonthlyOverall', array('Date' => 'NOW()', 
+        'Money' => $Finance->Internet, 'kWh' => $Finance->kWh, 
+        'Administration' => $Finance->Sprava, 'AdministrationTotal' => $SpravaCelkem, 
+        'ConsumptionTotal' => $TotalConsumptionCost, 'TotalPaid' => $Finance->TotalPaid, 
+        'BaseTariffPrice' => $Charge['BaseTariffPrice'], 
+        'TopTariffPrice' => $Charge['TopTariffPrice'], 'MemberCount' => $Finance->InternetUsers));
 
       // Update services
-      $Output .= 'Měním aktuální tarify....<br>';
-      $DbResult = $this->Database->select('Service', '*', '`ReplaceId` IS NOT NULL');
-      while($Service = $DbResult->fetch_array())
-      {
-        $Service['Id'] = $Service['ReplaceId'];
-        $Service['ReplaceId'] = '';
-        $this->Database->update('Service', 'Id='.$Service['ReplaceId'], $Service);
-      }
-      $this->Database->delete('Service', '`ReplaceId` IS NOT NULL');
-
+      $Output .= 'Aktualizuji služby....<br>';
+      $this->TableUpdatePeriod('Service');    
+      // Update customer service selections
+      $Output .= 'Aktualizuji výběr služeb zákazníků....<br>';
+      $this->TableUpdatePeriod('ServiceCustomerRel');     
+      
       $Finance->RecalculateMemberPayment();
       //CreateMonthlyOverallBill();

trunk/form_classes.php

@@ -14 +14 @@
 */
 
-
 $FormClasses = array(    
+  'MemberPayment' => array(
+    'Title' => 'Placení zákazníků',
+    'Table' => 'MemberPayment',
+    'Items' => array(
+      'Member' => array('Type' => 'TMember', 'Caption' => 'Zákazník', 'Default' => '', 'ReadOnly' => true),
+      'MonthlyTotal' => array('Type' => 'Integer', 'Caption' => 'Celkem měsíčně', 'Default' => '0', 'Suffix' => 'Kč', 'ReadOnly' => true),
+      'MonthlyInternet' => array('Type' => 'Integer', 'Caption' => 'Internet měsíčně', 'Default' => '', 'Suffix' => 'Kč', 'ReadOnly' => true),
+      'MonthlyConsumption' => array('Type' => 'Integer', 'Caption' => 'Spotřeba měsíčně', 'Default' => '', 'Suffix' => 'Kč', 'ReadOnly' => true),
+      'NetworkDevice' => array('Type' => 'Integer', 'Caption' => 'Podíl na zařízení', 'Default' => '', 'Suffix' => 'Kč', 'ReadOnly' => true),
+      'MonthlyPlus' => array('Type' => 'Integer', 'Caption' => 'Měsíčně plus', 'Default' => '', 'Suffix' => 'Kč', 'ReadOnly' => true),
+      'Cash' => array('Type' => 'Integer', 'Caption' => 'Kredit', 'Default' => '', 'Suffix' => 'Kč', 'ReadOnly' => true),
+    ),
+    'Actions' => array(
+      array('Caption' => 'Přepočítat', 'URL' => '/finance/manage.php?Operation=Recalculate'),
+    ),
+  ),
+  'NetworkSegment' => array(
+    'Title' => 'Úsek sítě',
+    'Table' => 'NetworkSegment',
+    'Items' => array(
+      'Name' => array('Type' => 'String', 'Caption' => 'Jméno', 'Default' => ''),
+      'Price' => array('Type' => 'Integer', 'Caption' => 'Cena', 'Default' => '0', 'Suffix' => 'Kč', 'ReadOnly' => true),
+      'Parent' => array('Type' => 'TNetworkSegment', 'Caption' => 'Nadřazený', 'Default' => '', 'Null' => true),
+      'Users' => array('Type' => 'Integer', 'Caption' => 'Uživatelů', 'Default' => '0', 'ReadOnly' => true),
+      'Consumption' => array('Type' => 'Integer', 'Caption' => 'Spotřeba', 'Default' => '0', 'ReadOnly' => true, 'Suffix' => 'Wattů'),
+      'UsersOverheads' => array('Type' => 'Integer', 'Caption' => 'Podílníků', 'Default' => '0', 'ReadOnly' => true),
+    ),
+  ),
+  'FinanceCharge' => array(
+    'Title' => 'Parametry účtování',
+    'Table' => 'FinanceCharge',
+    'Items' => array(
+      'Internet' => array('Type' => 'Integer', 'Caption' => 'Platba Internetu', 'Default' => '0', 'Suffix' => 'Kč'),
+      'InternetSpeed' => array('Type' => 'Integer', 'Caption' => 'Rychlost Internetu', 'Default' => '0', 'Suffix' => 'Mbit/s'),
+      'InternetSpeedReserve' => array('Type' => 'Integer', 'Caption' => 'Rezerva rychlosti', 'Default' => '0', 'Suffix' => 'Mbit/s'),
+      'AdministrationPerUser' => array('Type' => 'Integer', 'Caption' => 'Správa za uživatele', 'Default' => '0', 'Suffix' => 'Kč'),
+      'kWh' => array('Type' => 'Integer', 'Caption' => 'Cena kWh', 'Default' => '0', 'Suffix' => 'Kč'),
+      'BaseSpeedElement' => array('Type' => 'Integer', 'Caption' => 'Základní díl rychlosti', 'Default' => '0', 'Suffix' => 'Mbit/s'),
+      'BaseTariffPrice' => array('Type' => 'Integer', 'Caption' => 'Základní cena tarifu', 'Default' => '0', 'Suffix' => 'Kč'),
+      'TopTariffPrice' => array('Type' => 'Integer', 'Caption' => 'Nejvyšší cena tarifu', 'Default' => '0', 'Suffix' => 'Kč'),
+      'Action' => array('Type' => 'TActionEnum', 'Caption' => 'Změna období', 'Default' => ''),        
+      'ReplaceId' => array('Type' => 'TFinanceCharge', 'Caption' => 'Cílová položka', 'Default' => '0', 'Null' => true),
+    ),
+  ),
   'File' => array(
     'Title' => 'Soubor',
@@ -94 +137 @@
       'Service' => array('Type' => 'TService', 'Caption' => 'Služba', 'Default' => ''),        
       'Customer' => array('Type' => 'TMember', 'Caption' => 'Zákazník', 'Default' => ''),        
-      'Period' => array('Type' => 'Integer', 'Caption' => 'Období', 'Default' => ''),        
+      'Action' => array('Type' => 'TActionEnum', 'Caption' => 'Změna období', 'Default' => ''),        
+      'ReplaceId' => array('Type' => 'TServiceCustomerRel', 'Caption' => 'Cílová položka', 'Default' => '', 'Null' => true),        
     ),
   ),
@@ -309 +353 @@
       'Storage' => array('Type' => 'Integer', 'Caption' => 'Úložiště', 'Default' => '0', 'Suffix' => 'GB'),
       'CPUCount' => array('Type' => 'Integer', 'Caption' => 'Počet jader', 'Default' => '0', 'Suffix' => ''),
-      'ReplaceId' => array('Type' => 'TService', 'Caption' => 'Nahradit', 'Default' => '', 'Null' => true),
+      'Action' => array('Type' => 'TActionEnum', 'Caption' => 'Změna období', 'Default' => ''),        
+      'ReplaceId' => array('Type' => 'TService', 'Caption' => 'Cílová položka', 'Default' => '', 'Null' => true),
     ),
   ),
@@ -536 +581 @@
   ),
   'FinanceInvoice' => array(
-    'Title' => 'Závazky a pohledávky',
+    'Title' => 'Faktury',
     'Table' => 'FinanceInvoice',
     'DefaultSortColumn' => 'TimeCreation',
@@ -556 +601 @@
       'FinanceInvoice' => array('Type' => 'TFinanceInvoice', 'Caption' => 'Faktura', 'Default' => '0'),
       'Description' => array('Type' => 'String', 'Caption' => 'Popis', 'Default' => 'Položka'),
-      'Price' => array('Type' => 'Float', 'Caption' => 'Částka [Kč]', 'Default' => '0', 'Suffix' => 'Kč'),
+      'Price' => array('Type' => 'Float', 'Caption' => 'Částka', 'Default' => '0', 'Suffix' => 'Kč'),
       'Quantity' => array('Type' => 'Integer', 'Caption' => 'Množství', 'Default' => '1'),
-      'VAT' => array('Type' => 'Integer', 'Caption' => 'Daň [%]', 'Default' => '19', 'Suffix' => '%'),
+      'VAT' => array('Type' => 'Integer', 'Caption' => 'Daň', 'Default' => '19', 'Suffix' => '%'),
     ),
   ),
@@ -720 +765 @@
     'States' => array('Zakoupeno', 'Prodáno', 'Zařazeno do použití', 'Vyřazeno z použití', 'Zasláno do reklamace', 'Přijato z reklamace'),
   ),
+  'TActionEnum' => array(
+    'Type' => 'Enumeration',
+    'States' => array('' => '', 'add' => 'Přidat', 'modify' => 'Upravit', 'remove' => 'Odstranit'),
+  ),    
   'TService' => array(
     'Type' => 'Reference',
@@ -813 +862 @@
     'Filter' => '1',
   ),
+  'TServiceCustomerRel' => array(
+    'Type' => 'Reference',
+    'Table' => 'ServiceCustomerRel',
+    'Id' => 'Id',
+    'Name' => 'Id',
+    'Filter' => '1',
+  ),
   'TNetworkSegment' => array(
     'Type' => 'Reference',
@@ -991 +1047 @@
     'Type' => 'Reference',
     'Table' => 'PermissionOperation',
+    'Id' => 'Id',
+    'Name' => 'Id',
+    'Filter' => '1',
+  ),
+  'TFinanceCharge' => array(
+    'Type' => 'Reference',
+    'Table' => 'FinanceCharge',
     'Id' => 'Id',
     'Name' => 'Id',