Merge lp:cbadmin into lp:cbadmin/release

[McSeem]

изменения со времени последнего релиза

[McSeem (mcseemz)]

я же автор

review: Approve

[lp:cbadmin]

117. By McSeem on 2011-04-06

множественные изменения

118. By McSeem on 2011-04-20

новая система конфигурации плагинов через dependenci injection
настраиваемый тайминг при печати в картинку
устранение ошибок

119. By McSeem on 2011-04-25

мелкие исправления
в контекст EmailMgr добавлен dateFormat
переход на netbeans 7
попытки интеграции JasperReports

Unmerged revisions

119. By McSeem on 2011-04-25

мелкие исправления
в контекст EmailMgr добавлен dateFormat
переход на netbeans 7
попытки интеграции JasperReports

118. By McSeem on 2011-04-20

новая система конфигурации плагинов через dependenci injection
настраиваемый тайминг при печати в картинку
устранение ошибок

117. By McSeem on 2011-04-06

множественные изменения

116. By McSeem on 2011-01-23

ошибка при отсутствии курса валюты при занесении оплаты - теперь визуальное предупреждение, а не фатальный сбой
ошибка в новой несохраненной заявке, если при этом работать со справочником городов
добавлено бизнес правило: нельзя аннулировать заявки, если по некоторым услугам проведены оплаты поставщикам. Даже если впоследставии оплаты удалены
Исправлены ошибки при переводе заявки в недоступный статус. После предупреждения о невозможности позволял сохранить заявку в новом статусе.
мелкие правки

115. By McSeem on 2011-01-19

Взаимозависимые заявки - поправлена шапка окна
#704334 Добавить столбец "Комиссия" на закладку поиска
Оплаты по заявкам - в два раза ускорен поиск и отображение оплат
Отправка письма в случае ошибки - теперь включает информацию о машине и пользователе

114. By McSeem on 2011-01-13

автоматическая отправка отправка текста ошибки при ошибке - настройки log4j
переход на log4j 1.2.16
Заявки - ошибка инициализации городов вылета и прилёта.

#701498 Important: неверная привязка пассажиров к блокам в подтверждении
Заявки/перелеты - Ошибка при обновлении списка городов на возврат при изменении его в справочнике при открытой заявке

Заявки - в новой заявке дата оплаты = +3 рабочих дня
Заявки - в новой заявке не сбрасывался комментарий
Заявки - смена страны корректно отрабатывается закладками

Заявки/перелеты - косметика закладки, теперь выделение не сбрасывается при сохранении, обновляются услуги перелета на закладке услуг
Оплаты по блокам/услугам - не сохранялась оплата из-за отсутсвия значения "комиссия посреднику".
Оплаты по услугам - на закладке оплат поля с датами зависели от галок на закладке услуг
Оплаты/добавление оплаты - поле "рубли +%" теперь показывает остаток к оплате с учетом процентов
Справочники - исправлено задвоение данных в талицах сложных справочников
Заявки/услуги - при сохранении балун появлялся не у той кнопки
Заявки/услуги - в дропдауне пассажиров показывались только имена

113. By McSeem on 2011-01-11

Исправлена ошибка при добавлении первой записи в пустой справочник
Исправлена ошибка при отрисовке таблицы поиска в заявках
Изменение справочника мультипанели сбрасывало значения не из справочников
Ошибка при открытии заявки, если в рейсе вылета/возврата не прописано время
Добавление рейса - авиакомпанию можно добавлять из окна
Добавление рейса - Исправление ошибки при сохранении, если не выбрана авиакомпания
Заявки - закладка услуг - обновление пассажиров на ходу, косметика
Заявки - закладка услуг - обновление списка услуг на ходу, например, при сохранении перелета
Справочники - исправлена ситуация, при которой кнопка "Удалить" не переименовывалась в "Восстановить"
Справочники - исправление ошибки с задвоением строки при изменении/удалении
Сообщения об ошибках при обновлении форматируются так, чтобы помещаться на экран
исправлена ошибка в закладке услуг, при которой не обновлялись услуги, если ни одной не было выделено
Исправление ошибки в комбопанели, при которой она самостоятельно переключалась в enabled после обновления содержимого

112. By McSeem on 2011-01-03

Мелкие доработки по замечаниям
заявки - перелеты - список зависимы
заявки - заявка - название заказчика
флаг flightProgramOnly в cbadmin.properties, который скрывает кнопку добавления рейсов в заявках-перелетах
Заявки-перелеты - перенос кнопку сохранения
переделана работа с хранением и поиском цен
#673376 В заявках не показывается время вылета
#680546 В заявке на вкладке рассадки не показывается блок вылета
#677517 Не удается удалить рейс
#677514 Не заменяются данные в справочнике ЮЛ
#617430 проставление "+%" = 0 в оплате при выборе валюты заявки
ошибка, в окне добавления оплат светилась служебная валюта "---", выбор которой рушил окно.

Недавно! - стобец "дата оплаты"
Недавно - фильтр по номеру документа
Скоро! - после переименования остается в меню окон
Рейсы-блоки - переименовать кнопки
заявки: поиск по имени/фамилии туриста
Название авиакомпании включает код теперь
#683199 переделать закладку комментария в заявке
#683226 В отчетах сумма оплат - за минусом комиссии
#683225 Калькулятор в оплате
Скорость отчетов должна повыситься на 30%
Справочник оплат: флаг "оплата по курсу даты подтверждения"
Оплаты: блокировка даты оплаты
Оплаты: рубли - остаток по курсу даты оплаты
#683201 комментарии и зависимости на вкладке "Туристы"
Добавление оплаты. Добавить поле "ЦБ+%" для справки
Исправление ошибки при загрузке курсов
Недавно - итого по валютам в таблицу снизу
Разграничение доступа к полю "скидка"
поиск в физ-юрлицах - по Ctrl-F на таблице
радикально увеличена скорость загрузки справочников физ-юрлиц
резервирование/восстановлеие теперь привязано к текущему имени базы данных, а не к каноническому

111. By McSeem on 2010-11-30

payments modification

110. By McSeem on 2010-11-26

Заявки-перелеты - перенос кнопку сохранения
переделана работа с хранением и поиском цен

#673376 В заявках не показывается время вылета
#680546 В заявке на вкладке рассадки не показывается блок вылета
#677517 Не удается удалить рейс
#677514 Не заменяются данные в справочнике ЮЛ
#617430 проставление "+%" = 0 в оплате при выборе валюты заявки

ошибка, в окне добавления оплат светилась служебная валюта "---", выбор которой рушил окно.

Недавно! - стобец "дата оплаты"
Недавно - фильтр по номеру документа
Скоро! - после переименования остается в меню окон
Рейсы-блоки - переименовать кнопки

CB: депозиты - окно занесения
Оплаты - комиссия посреднику

=== modified file 'docs/model4.mwb'
Binary files docs/model4.mwb	2010-11-14 22:58:19 +0000 and docs/model4.mwb	2011-04-25 18:28:30 +0000 differ
=== modified file 'docs/model4.mwb.bak'
Binary files docs/model4.mwb.bak	2010-11-14 22:58:19 +0000 and docs/model4.mwb.bak	2011-04-25 18:28:30 +0000 differ
=== modified file 'nbproject/build-impl.xml'
--- nbproject/build-impl.xml	2010-11-18 09:20:32 +0000
+++ nbproject/build-impl.xml	2011-04-25 18:28:30 +0000
@@ -81,7 +81,14 @@
     </target>
     <target depends="-pre-init,-init-private,-init-libraries,-init-user,-init-project,-init-macrodef-property" name="-do-init">
         <available file="${manifest.file}" property="manifest.available"/>
-        <available file="${application.splash}" property="splashscreen.available"/>
+        <condition property="splashscreen.available">
+            <and>
+                <not>
+                    <equals arg1="${application.splash}" arg2="" trim="true"/>
+                </not>
+                <available file="${application.splash}"/>
+            </and>
+        </condition>
         <condition property="main.class.available">
             <and>
                 <isset property="main.class"/>
@@ -96,8 +103,14 @@
                 <isset property="main.class.available"/>
             </and>
         </condition>
+        <condition property="do.archive">
+            <not>
+                <istrue value="${jar.archive.disabled}"/>
+            </not>
+        </condition>
         <condition property="do.mkdist">
             <and>
+                <isset property="do.archive"/>
                 <isset property="libs.CopyLibs.classpath"/>
                 <not>
                     <istrue value="${mkdist.disabled}"/>
@@ -110,40 +123,41 @@
                 <isset property="do.mkdist"/>
             </and>
         </condition>
-        <condition property="manifest.available+main.class+mkdist.available+splashscreen.available">
-            <and>
-                <istrue value="${manifest.available+main.class+mkdist.available}"/>
-                <istrue value="${splashscreen.available}"/>
-            </and>
-        </condition>
-        <condition property="do.archive">
-            <not>
-                <istrue value="${jar.archive.disabled}"/>
-            </not>
-        </condition>
         <condition property="do.archive+manifest.available">
             <and>
                 <isset property="manifest.available"/>
                 <istrue value="${do.archive}"/>
             </and>
         </condition>
+        <condition property="do.archive+main.class.available">
+            <and>
+                <isset property="main.class.available"/>
+                <istrue value="${do.archive}"/>
+            </and>
+        </condition>
+        <condition property="do.archive+splashscreen.available">
+            <and>
+                <isset property="splashscreen.available"/>
+                <istrue value="${do.archive}"/>
+            </and>
+        </condition>
         <condition property="do.archive+manifest.available+main.class">
             <and>
                 <istrue value="${manifest.available+main.class}"/>
                 <istrue value="${do.archive}"/>
             </and>
         </condition>
-        <condition property="do.archive+manifest.available+main.class+mkdist.available">
-            <and>
-                <istrue value="${manifest.available+main.class+mkdist.available}"/>
-                <istrue value="${do.archive}"/>
-            </and>
+        <condition property="manifest.available-mkdist.available">
+            <or>
+                <istrue value="${manifest.available}"/>
+                <isset property="do.mkdist"/>
+            </or>
         </condition>
-        <condition property="do.archive+manifest.available+main.class+mkdist.available+splashscreen.available">
-            <and>
-                <istrue value="${manifest.available+main.class+mkdist.available+splashscreen.available}"/>
-                <istrue value="${do.archive}"/>
-            </and>
+        <condition property="manifest.available+main.class-mkdist.available">
+            <or>
+                <istrue value="${manifest.available+main.class}"/>
+                <isset property="do.mkdist"/>
+            </or>
         </condition>
         <condition property="have.tests">
             <or>
@@ -199,8 +213,17 @@
         <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
             <length length="0" string="${endorsed.classpath}" when="greater"/>
         </condition>
-        <property name="javac.fork" value="false"/>
+        <condition else="false" property="jdkBug6558476">
+            <and>
+                <matches pattern="1\.[56]" string="${java.specification.version}"/>
+                <not>
+                    <os family="unix"/>
+                </not>
+            </and>
+        </condition>
+        <property name="javac.fork" value="${jdkBug6558476}"/>
         <property name="jar.index" value="false"/>
+        <property name="jar.index.metainf" value="${jar.index}"/>
         <available file="${meta.inf.dir}/persistence.xml" property="has.persistence.xml"/>
     </target>
     <target name="-post-init">
@@ -328,7 +351,9 @@
                 <delete>
                     <files includesfile="${javac.includesfile.binary}"/>
                 </delete>
-                <delete file="${javac.includesfile.binary}"/>
+                <delete>
+                    <fileset file="${javac.includesfile.binary}"/>
+                </delete>
             </sequential>
         </macrodef>
     </target>
@@ -338,7 +363,8 @@
             <attribute default="${excludes}" name="excludes"/>
             <attribute default="**" name="testincludes"/>
             <sequential>
-                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true" tempdir="${build.dir}">
+                <property name="junit.forkmode" value="perTest"/>
+                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
                     <batchtest todir="${build.test.results.dir}">
                         <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
                             <filename name="@{testincludes}"/>
@@ -354,11 +380,56 @@
                     <formatter type="brief" usefile="false"/>
                     <formatter type="xml"/>
                     <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
+                    <jvmarg value="-ea"/>
                     <jvmarg line="${run.jvmargs}"/>
                 </junit>
             </sequential>
         </macrodef>
     </target>
+    <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile, -profile-init-check" name="profile-init"/>
+    <target name="-profile-pre-init">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target name="-profile-post-init">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target name="-profile-init-macrodef-profile">
+        <macrodef name="resolve">
+            <attribute name="name"/>
+            <attribute name="value"/>
+            <sequential>
+                <property name="@{name}" value="${env.@{value}}"/>
+            </sequential>
+        </macrodef>
+        <macrodef name="profile">
+            <attribute default="${main.class}" name="classname"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <property environment="env"/>
+                <resolve name="profiler.current.path" value="${profiler.info.pathvar}"/>
+                <java classname="@{classname}" dir="${profiler.info.dir}" fork="true" jvm="${profiler.info.jvm}">
+                    <jvmarg value="${profiler.info.jvmargs.agent}"/>
+                    <jvmarg line="${profiler.info.jvmargs}"/>
+                    <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
+                    <arg line="${application.args}"/>
+                    <classpath>
+                        <path path="${run.classpath}"/>
+                    </classpath>
+                    <syspropertyset>
+                        <propertyref prefix="run-sys-prop."/>
+                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
+                    </syspropertyset>
+                    <customize/>
+                </java>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile" name="-profile-init-check">
+        <fail unless="profiler.info.jvm">Must set JVM to use for profiling in profiler.info.jvm</fail>
+        <fail unless="profiler.info.jvmargs.agent">Must set profiler agent JVM arguments in profiler.info.jvmargs.agent</fail>
+    </target>
     <target depends="-init-debug-args" name="-init-macrodef-nbjpda">
         <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2se-project/1">
             <attribute default="${main.class}" name="name"/>
@@ -453,6 +524,7 @@
     </target>
     <target name="-init-macrodef-copylibs">
         <macrodef name="copylibs" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${manifest.file}" name="manifest"/>
             <element name="customize" optional="true"/>
             <sequential>
                 <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
@@ -468,7 +540,7 @@
                     </chainedmapper>
                 </pathconvert>
                 <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
-                <copylibs compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}" manifest="${manifest.file}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
+                <copylibs compress="${jar.compress}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
                     <fileset dir="${build.classes.dir}"/>
                     <manifest>
                         <attribute name="Class-Path" value="${jar.classpath}"/>
@@ -597,10 +669,10 @@
         <!-- Empty placeholder for easier customization. -->
         <!-- You can override this target in the ../build.xml file. -->
     </target>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive" name="-do-jar-without-manifest" unless="manifest.available">
+    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive" name="-do-jar-without-manifest" unless="manifest.available-mkdist.available">
         <j2seproject1:jar/>
     </target>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive+manifest.available" name="-do-jar-with-manifest" unless="manifest.available+main.class">
+    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive+manifest.available" name="-do-jar-with-manifest" unless="manifest.available+main.class-mkdist.available">
         <j2seproject1:jar manifest="${manifest.file}"/>
     </target>
     <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive+manifest.available+main.class" name="-do-jar-with-mainclass" unless="manifest.available+main.class+mkdist.available">
@@ -609,44 +681,53 @@
                 <j2seproject1:attribute name="Main-Class" value="${main.class}"/>
             </j2seproject1:manifest>
         </j2seproject1:jar>
-        <echo>To run this application from the command line without Ant, try:</echo>
+        <echo level="info">To run this application from the command line without Ant, try:</echo>
         <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
         <property location="${dist.jar}" name="dist.jar.resolved"/>
         <pathconvert property="run.classpath.with.dist.jar">
             <path path="${run.classpath}"/>
             <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
         </pathconvert>
-        <echo>java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
-    </target>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar,-init-macrodef-copylibs" if="do.archive+manifest.available+main.class+mkdist.available+splashscreen.available" name="-do-jar-with-libraries-and-splashscreen">
+        <echo level="info">java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
+    </target>
+    <target depends="init" if="do.archive" name="-do-jar-with-libraries-create-manifest" unless="manifest.available">
+        <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
+        <touch file="${tmp.manifest.file}" verbose="false"/>
+    </target>
+    <target depends="init" if="do.archive+manifest.available" name="-do-jar-with-libraries-copy-manifest">
+        <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
+        <copy file="${manifest.file}" tofile="${tmp.manifest.file}"/>
+    </target>
+    <target depends="init,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest" if="do.archive+main.class.available" name="-do-jar-with-libraries-set-main">
+        <manifest file="${tmp.manifest.file}" mode="update">
+            <attribute name="Main-Class" value="${main.class}"/>
+        </manifest>
+    </target>
+    <target depends="init,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest" if="do.archive+splashscreen.available" name="-do-jar-with-libraries-set-splashscreen">
         <basename file="${application.splash}" property="splashscreen.basename"/>
         <mkdir dir="${build.classes.dir}/META-INF"/>
         <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>
-        <j2seproject3:copylibs>
-            <customize>
-                <attribute name="Main-Class" value="${main.class}"/>
-                <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
-            </customize>
-        </j2seproject3:copylibs>
-        <echo>To run this application from the command line without Ant, try:</echo>
-        <property location="${dist.jar}" name="dist.jar.resolved"/>
-        <echo>java -jar "${dist.jar.resolved}"</echo>
-    </target>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar,-init-macrodef-copylibs" if="do.archive+manifest.available+main.class+mkdist.available" name="-do-jar-with-libraries" unless="splashscreen.available">
-        <j2seproject3:copylibs>
-            <customize>
-                <attribute name="Main-Class" value="${main.class}"/>
-            </customize>
-        </j2seproject3:copylibs>
-        <echo>To run this application from the command line without Ant, try:</echo>
-        <property location="${dist.jar}" name="dist.jar.resolved"/>
-        <echo>java -jar "${dist.jar.resolved}"</echo>
-    </target>
+        <manifest file="${tmp.manifest.file}" mode="update">
+            <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
+        </manifest>
+    </target>
+    <target depends="init,-init-macrodef-copylibs,compile,-pre-pre-jar,-pre-jar,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest,-do-jar-with-libraries-set-main,-do-jar-with-libraries-set-splashscreen" if="do.mkdist" name="-do-jar-with-libraries-pack">
+        <j2seproject3:copylibs manifest="${tmp.manifest.file}"/>
+        <echo level="info">To run this application from the command line without Ant, try:</echo>
+        <property location="${dist.jar}" name="dist.jar.resolved"/>
+        <echo level="info">java -jar "${dist.jar.resolved}"</echo>
+    </target>
+    <target depends="-do-jar-with-libraries-pack" if="do.archive" name="-do-jar-with-libraries-delete-manifest">
+        <delete>
+            <fileset file="${tmp.manifest.file}"/>
+        </delete>
+    </target>
+    <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest,-do-jar-with-libraries-set-main,-do-jar-with-libraries-set-splashscreen,-do-jar-with-libraries-pack,-do-jar-with-libraries-delete-manifest" name="-do-jar-with-libraries"/>
     <target name="-post-jar">
         <!-- Empty placeholder for easier customization. -->
         <!-- You can override this target in the ../build.xml file. -->
     </target>
-    <target depends="init,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries-and-splashscreen,-do-jar-with-libraries,-post-jar,jnlp" description="Build JAR." name="jar"/>
+    <target depends="init,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries,-post-jar,jnlp" description="Build JAR." name="jar"/>
     <!--
                 =================
                 EXECUTION SECTION
@@ -712,6 +793,72 @@
     </target>
     <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/>
     <!--
+                =================
+                PROFILING SECTION
+                =================
+            -->
+    <target depends="profile-init,compile" description="Profile a project in the IDE." if="netbeans.home" name="profile">
+        <nbprofiledirect>
+            <classpath>
+                <path path="${run.classpath}"/>
+            </classpath>
+        </nbprofiledirect>
+        <profile/>
+    </target>
+    <target depends="profile-init,compile-single" description="Profile a selected class in the IDE." if="netbeans.home" name="profile-single">
+        <fail unless="profile.class">Must select one file in the IDE or set profile.class</fail>
+        <nbprofiledirect>
+            <classpath>
+                <path path="${run.classpath}"/>
+            </classpath>
+        </nbprofiledirect>
+        <profile classname="${profile.class}"/>
+    </target>
+    <!--
+                =========================
+                APPLET PROFILING  SECTION
+                =========================
+            -->
+    <target depends="profile-init,compile-single" if="netbeans.home" name="profile-applet">
+        <nbprofiledirect>
+            <classpath>
+                <path path="${run.classpath}"/>
+            </classpath>
+        </nbprofiledirect>
+        <profile classname="sun.applet.AppletViewer">
+            <customize>
+                <arg value="${applet.url}"/>
+            </customize>
+        </profile>
+    </target>
+    <!--
+                =========================
+                TESTS PROFILING  SECTION
+                =========================
+            -->
+    <target depends="profile-init,compile-test-single" if="netbeans.home" name="profile-test-single">
+        <nbprofiledirect>
+            <classpath>
+                <path path="${run.test.classpath}"/>
+            </classpath>
+        </nbprofiledirect>
+        <junit dir="${profiler.info.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" jvm="${profiler.info.jvm}" showoutput="true">
+            <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
+            <jvmarg value="${profiler.info.jvmargs.agent}"/>
+            <jvmarg line="${profiler.info.jvmargs}"/>
+            <test name="${profile.class}"/>
+            <classpath>
+                <path path="${run.test.classpath}"/>
+            </classpath>
+            <syspropertyset>
+                <propertyref prefix="test-sys-prop."/>
+                <mapper from="test-sys-prop.*" to="*" type="glob"/>
+            </syspropertyset>
+            <formatter type="brief" usefile="false"/>
+            <formatter type="xml"/>
+        </junit>
+    </target>
+    <!--
                 ===============
                 JAVADOC SECTION
                 ===============
@@ -757,7 +904,7 @@
     <target if="do.depend.true" name="-compile-test-depend">
         <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
     </target>
-    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
+    <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
         <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" processorpath="${javac.test.processorpath}" srcdir="${test.src.dir}"/>
         <copy todir="${build.test.classes.dir}">
             <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
@@ -772,7 +919,7 @@
         <!-- Empty placeholder for easier customization. -->
         <!-- You can override this target in the ../build.xml file. -->
     </target>
-    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
+    <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
         <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
         <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/>
         <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" processorpath="${javac.test.processorpath}" sourcepath="${test.src.dir}" srcdir="${test.src.dir}"/>

=== modified file 'nbproject/genfiles.properties'
--- nbproject/genfiles.properties	2010-11-18 09:20:32 +0000
+++ nbproject/genfiles.properties	2011-04-25 18:28:30 +0000
@@ -4,5 +4,8 @@
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
 nbproject/build-impl.xml.data.CRC32=5d2382f7
-nbproject/build-impl.xml.script.CRC32=b7e0b772
-nbproject/build-impl.xml.stylesheet.CRC32=229523de@1.38.3.45
+nbproject/build-impl.xml.script.CRC32=aba842bd
+nbproject/build-impl.xml.stylesheet.CRC32=0c01fd8e@1.43.1.45
+nbproject/profiler-build-impl.xml.data.CRC32=5d2382f7
+nbproject/profiler-build-impl.xml.script.CRC32=abda56ed
+nbproject/profiler-build-impl.xml.stylesheet.CRC32=f10cf54c@1.11.1

=== modified file 'nbproject/private/private.properties'
--- nbproject/private/private.properties	2010-10-16 07:11:43 +0000
+++ nbproject/private/private.properties	2011-04-25 18:28:30 +0000
@@ -1,9 +1,9 @@
-compile.on.save=true
+compile.on.save=false
 do.depend=false
 do.jar=true
 file.reference.poi-3.2-FINAL-20081019.jar=/home/mcseem/projects/charterbilet/build/lib/poi-3.6-20091214.jar
 javac.debug=true
 javadoc.preview=true
 jaxbwiz.endorsed.dirs=/home/mcseem/soft/netbeans-6.8/ide12/modules/ext/jaxb/api
-user.properties.file=/home/mcseem/.netbeans/6.9/build.properties
+user.properties.file=/home/mcseem/.netbeans/7.0/build.properties
 work.dir=/home/mcseem/projects/charterbilet/build/cbadmin/src

=== modified file 'nbproject/private/private.xml'
--- nbproject/private/private.xml	2010-11-20 09:27:56 +0000
+++ nbproject/private/private.xml	2011-04-25 18:28:30 +0000
@@ -3,87 +3,131 @@
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/1">
         <file>
             <url>src/cbadmin/gui/win_offer.java</url>
-            <line>914</line>
+            <line>916</line>
         </file>
         <file>
             <url>src/cbadmin/gui/win_reservations.java</url>
-            <line>2229</line>
-            <line>2288</line>
-            <line>2354</line>
-            <line>2525</line>
-            <line>2832</line>
+            <line>251</line>
+            <line>2324</line>
+            <line>2366</line>
+            <line>2619</line>
+            <line>2914</line>
+            <line>3265</line>
+        </file>
+        <file>
+            <url>src/cbadmin/gui/support/PriceFieldsHelper.java</url>
+            <line>78</line>
         </file>
         <file>
             <url>src/cbadmin/util/UpdateMgr.java</url>
-            <line>294</line>
-            <line>623</line>
-        </file>
-        <file>
-            <url>src/cbadmin/gui/win_flight.java</url>
-            <line>2194</line>
-            <line>2633</line>
-            <line>2642</line>
+            <line>203</line>
         </file>
         <file>
             <url>src/cbadmin/gui/win_flight_add.java</url>
-            <line>95</line>
-            <line>822</line>
-            <line>840</line>
-        </file>
-        <file>
-            <url>src/cbadmin/gui/win_offer_copy.java</url>
-            <line>335</line>
-        </file>
-        <file>
-            <url>src/cbadmin/gui/win_flight_block_change_multi.java</url>
-            <line>622</line>
+            <line>85</line>
+            <line>829</line>
+            <line>847</line>
+        </file>
+        <file>
+            <url>src/cbadmin/gui/PanelReservationServices.java</url>
+            <line>662</line>
+        </file>
+        <file>
+            <url>src/cbadmin/entity2/Block.java</url>
+            <line>392</line>
+        </file>
+        <file>
+            <url>src/cbadmin/entity2/Reservation.java</url>
+            <line>174</line>
+            <line>956</line>
         </file>
         <file>
             <url>src/cbadmin/gui/win_statuscheck.java</url>
             <line>1330</line>
         </file>
         <file>
-            <url>src/cbadmin/gui/win_payment_block.java</url>
-            <line>845</line>
-            <line>916</line>
+            <url>src/cbadmin/gui/win_statuscheck_past.java</url>
+            <line>712</line>
         </file>
         <file>
             <url>src/cbadmin/gui/main.java</url>
-            <line>704</line>
-        </file>
-        <file>
-            <url>src/cbadmin/gui/win_statuscheck_past.java</url>
-            <line>684</line>
-        </file>
-        <file>
-            <url>src/cbadmin/gui/PanelReservationFlight.java</url>
-            <line>681</line>
-            <line>1376</line>
-            <line>1484</line>
+            <line>718</line>
+            <line>991</line>
         </file>
         <file>
             <url>src/cbadmin/gui/support/PanelDictionaryComboBeanInfo.java</url>
             <line>290</line>
         </file>
         <file>
+            <url>src/cbadmin/gui/win_payment_reservation.java</url>
+            <line>208</line>
+            <line>865</line>
+            <line>987</line>
+        </file>
+        <file>
             <url>src/cbadmin/gui/win_payment_add.java</url>
-            <line>358</line>
-            <line>441</line>
-            <line>585</line>
-        </file>
-        <file>
-            <url>src/cbadmin/gui/win_payment_reservation.java</url>
-            <line>770</line>
+            <line>359</line>
+            <line>442</line>
+            <line>587</line>
+        </file>
+        <file>
+            <url>src/cbadmin/gui/win_flight.java</url>
+            <line>2166</line>
+            <line>2606</line>
+        </file>
+        <file>
+            <url>src/cbadmin/gui/win_offer_copy.java</url>
+            <line>335</line>
+        </file>
+        <file>
+            <url>src/cbadmin/gui/win_payment_service.java</url>
+            <line>632</line>
+            <line>1169</line>
+        </file>
+        <file>
+            <url>src/cbadmin/gui/dic_ClientUl.java</url>
+            <line>805</line>
+        </file>
+        <file>
+            <url>src/cbadmin/gui/win_payment_block.java</url>
+            <line>845</line>
+            <line>916</line>
+        </file>
+        <file>
+            <url>src/cbadmin/gui/win_flight_block_change_multi.java</url>
+            <line>622</line>
+        </file>
+        <file>
+            <url>src/cbadmin/business/PriceVendorDefault.java</url>
+            <line>55</line>
+        </file>
+        <file>
+            <url>src/cbadmin/entity2/db_interface.java</url>
+            <line>187</line>
+        </file>
+        <file>
+            <url>src/cbadmin/gui/PanelReservationFlight.java</url>
+            <line>717</line>
+            <line>1177</line>
+            <line>1275</line>
+        </file>
+        <file>
+            <url>src/cbadmin/gui/dic_helper.java</url>
+            <line>127</line>
         </file>
         <file>
             <url>src/cbadmin/gui/win_flight_block_add.java</url>
-            <line>157</line>
-            <line>547</line>
+            <line>145</line>
+            <line>517</line>
         </file>
         <file>
             <url>src/cbadmin/gui/win_flightload.java</url>
-            <line>1669</line>
-            <line>2214</line>
+            <line>2137</line>
+            <line>2212</line>
+        </file>
+        <file>
+            <url>src/cbadmin/gui/win_payment_add_income.java</url>
+            <line>589</line>
         </file>
         <file>
             <url>src/cbadmin/gui/win_flight_program_period_add.java</url>

=== added directory 'nbproject/private/profiler'
=== added file 'nbproject/private/profiler/configurations.xml'
--- nbproject/private/profiler/configurations.xml	1970-01-01 00:00:00 +0000
+++ nbproject/private/profiler/configurations.xml	2011-04-25 18:28:30 +0000
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+<properties>
+<entry key="2_profiler.settings.code.region.cpu.res.buf.size">1000</entry>
+<entry key="2_profiler.settings.sort.results.by.thread.cpu.time">false</entry>
+<entry key="0_profiler.settings.instrumentation.filter.selectedprofiler.filter.type">profiler.simple.filter</entry>
+<entry key="0_profiler.settings.instrument.empty.methods">false</entry>
+<entry key="3_profiler.settings.override.jvm.args"/>
+<entry key="0_profiler.settings.instrumentation.filter.selectedprofiler.simple.filter.name"/>
+<entry key="1_profiler.settings.profiling.type">8</entry>
+<entry key="0_profiler.settings.cpu.exclude.wait.time">true</entry>
+<entry key="0_profiler.settings.override.working.dir"/>
+<entry key="3_profiler.settings.instrument.empty.methods">false</entry>
+<entry key="1_profiler.settings.thread.cpu.timer.on">false</entry>
+<entry key="1_profiler.settings.instrumentation.root.methods.size">0</entry>
+<entry key="3_profiler.settings.obj.alloc.stack.sampling.depth">0</entry>
+<entry key="2_profiler.settings.override">false</entry>
+<entry key="profiler.settings.lastselected">2</entry>
+<entry key="2_profiler.settings.instrument.spawned.threads">true</entry>
+<entry key="0_profiler.settings.threads.monitoring.enabled">false</entry>
+<entry key="0_profiler.settings.istrument.getter.setter.methods">false</entry>
+<entry key="3_profiler.settings.cpu.quick.filterprofiler.simple.filter.value"/>
+<entry key="2_profiler.settings.instrumentation.filter.selectedprofiler.filter.type">profiler.filter.set</entry>
+<entry key="3_profiler.settings.cpu.quick.filterprofiler.simple.filter.type">1</entry>
+<entry key="2_profiler.settings.n.profiled.threads.limit">40</entry>
+<entry key="3_profiler.settings.instr.scheme">1</entry>
+<entry key="1_profiler.settings.sort.results.by.thread.cpu.time">false</entry>
+<entry key="2_profiler.settings.instr.scheme">3</entry>
+<entry key="1_profiler.settings.instrument.method.invoke">true</entry>
+<entry key="3_profiler.settings.profilingpoints.enabled">true</entry>
+<entry key="1_profiler.settings.instr.scheme">3</entry>
+<entry key="2_profiler.settings.sampling.interval">10</entry>
+<entry key="0_profiler.settings.instr.scheme">1</entry>
+<entry key="1_profiler.settings.run.gc.on.get.results.in.memory.profiling">true</entry>
+<entry key="2_profiler.settings.settings.name">cbadmin CPU Analysis</entry>
+<entry key="0_profiler.settings.sort.results.by.thread.cpu.time">false</entry>
+<entry key="0_profiler.settings.profiling.type">1</entry>
+<entry key="1_profiler.settings.cpu.exclude.wait.time">true</entry>
+<entry key="3_profiler.settings.cpu.quick.filterprofiler.simple.filter.name">Quick filter...</entry>
+<entry key="2_profiler.settings.obj.alloc.stack.sampling.interval">10</entry>
+<entry key="3_profiler.settings.instrumentation.filter.selectedprofiler.simple.filter.type">0</entry>
+<entry key="3_profiler.settings.override">false</entry>
+<entry key="1_profiler.settings.obj.alloc.stack.sampling.depth">0</entry>
+<entry key="1_profiler.settings.cpu.quick.filterprofiler.filter.type">profiler.simple.filter</entry>
+<entry key="1_profiler.settings.instrumentation.marker.methods.size">0</entry>
+<entry key="2_profiler.settings.thread.cpu.timer.on">false</entry>
+<entry key="0_profiler.settigns.ispreset">true</entry>
+<entry key="0_profiler.settings.instrumentation.filter.selectedprofiler.simple.filter.value"/>
+<entry key="3_profiler.settings.instrumentation.filter.selectedprofiler.simple.filter.name"/>
+<entry key="2_profiler.settings.override.working.dir"/>
+<entry key="0_profiler.settings.cpu.quick.filterprofiler.simple.filter.type">1</entry>
+<entry key="2_profiler.settings.cpu.quick.filterprofiler.simple.filter.value"/>
+<entry key="2_profiler.settings.override.jvm.args"/>
+<entry key="0_profiler.settings.profile.underlying.framework">false</entry>
+<entry key="2_profiler.settings.profile.underlying.framework">true</entry>
+<entry key="3_profiler.settings.thread.cpu.timer.on">false</entry>
+<entry key="2_profiler.settings.cpu.exclude.wait.time">true</entry>
+<entry key="2_profiler.settings.threads.monitoring.enabled">false</entry>
+<entry key="1_profiler.settings.instrumentation.filter.selectedFilterSet-type">false</entry>
+<entry key="1_profiler.settings.instrument.spawned.threads">false</entry>
+<entry key="1_profiler.settings.n.profiled.threads.limit">32</entry>
+<entry key="0_profiler.settings.cpu.quick.filterprofiler.simple.filter.name">Quick filter...</entry>
+<entry key="2_profiler.settings.instrumentation.root.methods.size">0</entry>
+<entry key="2_profiler.settings.instrument.empty.methods">false</entry>
+<entry key="3_profiler.settings.cpu.profiling.type">0</entry>
+<entry key="3_profiler.settings.cpu.quick.filterprofiler.filter.type">profiler.simple.filter</entry>
+<entry key="1_profiler.settings.instrumentation.filter.selectedFilterSet-name">Exclude Java core classes</entry>
+<entry key="1_profiler.settings.sampling.interval">10</entry>
+<entry key="2_profiler.settings.cpu.profiling.type">0</entry>
+<entry key="0_profiler.settings.run.gc.on.get.results.in.memory.profiling">true</entry>
+<entry key="1_profiler.settigns.ispreset">true</entry>
+<entry key="0_profiler.settings.instrument.method.invoke">true</entry>
+<entry key="0_profiler.settings.obj.alloc.stack.sampling.interval">10</entry>
+<entry key="3_profiler.settings.cpu.exclude.wait.time">true</entry>
+<entry key="1_profiler.settings.cpu.quick.filterprofiler.simple.filter.value"/>
+<entry key="1_profiler.settings.code.region.cpu.res.buf.size">1000</entry>
+<entry key="3_profiler.settings.instrumentation.marker.methods.size">0</entry>
+<entry key="3_profiler.settings.instrument.method.invoke">true</entry>
+<entry key="3_profiler.settings.code.region.cpu.res.buf.size">1000</entry>
+<entry key="0_profiler.settings.instrumentation.marker.methods.size">0</entry>
+<entry key="1_profiler.settings.instrumentation.filter.selectedprofiler.filter.type">profiler.filter.set</entry>
+<entry key="0_profiler.settings.override">false</entry>
+<entry key="3_profiler.settings.obj.alloc.stack.sampling.interval">10</entry>
+<entry key="1_profiler.settings.settings.name">Analyze Performance</entry>
+<entry key="1_profiler.settings.cpu.quick.filterprofiler.simple.filter.type">1</entry>
+<entry key="1_profiler.settings.cpu.profiling.type">0</entry>
+<entry key="1_profiler.settings.override.jvm.args"/>
+<entry key="2_profiler.settings.obj.alloc.stack.sampling.depth">0</entry>
+<entry key="1_profiler.settings.instrument.empty.methods">false</entry>
+<entry key="0_profiler.settings.cpu.quick.filterprofiler.filter.type">profiler.simple.filter</entry>
+<entry key="3_profiler.settings.run.gc.on.get.results.in.memory.profiling">true</entry>
+<entry key="1_profiler.settings.cpu.quick.filterprofiler.simple.filter.name">Quick filter...</entry>
+<entry key="3_profiler.settings.instrument.spawned.threads">false</entry>
+<entry key="2_profiler.settigns.ispreset">false</entry>
+<entry key="1_profiler.settings.threads.monitoring.enabled">false</entry>
+<entry key="0_profiler.settings.instrumentation.root.methods.size">0</entry>
+<entry key="2_profiler.settings.instrumentation.filter.selectedFilterSet-active_filter-0">Java Core Classes</entry>
+<entry key="3_profiler.settings.instrumentation.filter.selectedprofiler.simple.filter.value"/>
+<entry key="2_profiler.settings.instrumentation.filter.selectedFilterSet-type">false</entry>
+<entry key="1_profiler.settings.override.working.dir"/>
+<entry key="3_profiler.settings.istrument.getter.setter.methods">false</entry>
+<entry key="0_profiler.settings.n.profiled.threads.limit">32</entry>
+<entry key="0_profiler.settings.cpu.quick.filterprofiler.simple.filter.value"/>
+<entry key="3_profiler.settings.instrumentation.root.methods.size">0</entry>
+<entry key="3_profiler.settings.n.profiled.threads.limit">32</entry>
+<entry key="0_profiler.settings.cpu.profiling.type">0</entry>
+<entry key="3_profiler.settings.instrumentation.filter.selectedprofiler.filter.type">profiler.simple.filter</entry>
+<entry key="3_profiler.settings.settings.name">Analyze Memory</entry>
+<entry key="3_profiler.settings.profiling.type">2</entry>
+<entry key="0_profiler.settings.instrument.spawned.threads">false</entry>
+<entry key="2_profiler.settings.instrumentation.filter.selectedFilterSet-name">Exclude Java core classes</entry>
+<entry key="2_profiler.settings.instrumentation.marker.methods.size">0</entry>
+<entry key="0_profiler.settings.obj.alloc.stack.sampling.depth">0</entry>
+<entry key="3_profiler.settings.sampling.interval">10</entry>
+<entry key="2_profiler.settings.cpu.quick.filterprofiler.filter.type">profiler.simple.filter</entry>
+<entry key="0_profiler.settings.profilingpoints.enabled">true</entry>
+<entry key="2_profiler.settings.cpu.quick.filterprofiler.simple.filter.type">1</entry>
+<entry key="3_profiler.settigns.ispreset">true</entry>
+<entry key="1_profiler.settings.override">false</entry>
+<entry key="1_profiler.settings.obj.alloc.stack.sampling.interval">10</entry>
+<entry key="1_profiler.settings.instrumentation.filter.selectedFilterSet-active_filter-0">Java Core Classes</entry>
+<entry key="3_profiler.settings.override.working.dir"/>
+<entry key="2_profiler.settings.istrument.getter.setter.methods">true</entry>
+<entry key="0_profiler.settings.sampling.interval">10</entry>
+<entry key="1_profiler.settings.profile.underlying.framework">false</entry>
+<entry key="2_profiler.settings.instrument.method.invoke">true</entry>
+<entry key="3_profiler.settings.profile.underlying.framework">false</entry>
+<entry key="1_profiler.settings.profilingpoints.enabled">false</entry>
+<entry key="1_profiler.settings.istrument.getter.setter.methods">false</entry>
+<entry key="2_profiler.settings.cpu.quick.filterprofiler.simple.filter.name">Quick filter...</entry>
+<entry key="0_profiler.settings.instrumentation.filter.selectedprofiler.simple.filter.type">0</entry>
+<entry key="3_profiler.settings.sort.results.by.thread.cpu.time">false</entry>
+<entry key="0_profiler.settings.thread.cpu.timer.on">false</entry>
+<entry key="0_profiler.settings.override.jvm.args"/>
+<entry key="3_profiler.settings.threads.monitoring.enabled">false</entry>
+<entry key="2_profiler.settings.profiling.type">8</entry>
+<entry key="0_profiler.settings.settings.name">Monitor Application</entry>
+<entry key="0_profiler.settings.code.region.cpu.res.buf.size">1000</entry>
+<entry key="2_profiler.settings.profilingpoints.enabled">false</entry>
+<entry key="2_profiler.settings.run.gc.on.get.results.in.memory.profiling">true</entry>
+</properties>

=== modified file 'nbproject/project.properties'
--- nbproject/project.properties	2010-10-30 14:08:17 +0000
+++ nbproject/project.properties	2011-04-25 18:28:30 +0000
@@ -38,7 +38,8 @@
     ${libs.ApacheCayenne.classpath}:\
     ${libs.CopyLibs.classpath}:\
     ${libs.ApacheCommons.classpath}:\
-    ${libs.jXLS.classpath}
+    ${libs.jXLS.classpath}:\
+    ${libs.cbadminJasper.classpath}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false
@@ -71,6 +72,7 @@
 main.class=cbadmin.gui.main
 manifest.file=manifest.mf
 meta.inf.dir=${src.dir}/META-INF
+mkdist.disabled=false
 platform.active=default_platform
 run.classpath=\
     ${javac.classpath}:\

=== modified file 'src/backupscripts/h2backup' (properties changed: +x to -x)
=== modified file 'src/backupscripts/h2restore' (properties changed: +x to -x)
=== modified file 'src/backupscripts/mysqlbackup' (properties changed: +x to -x)
--- src/backupscripts/mysqlbackup	2010-06-29 08:30:00 +0000
+++ src/backupscripts/mysqlbackup	2011-04-25 18:28:30 +0000
@@ -1,2 +1,2 @@
 mkdir ./backup
-mysqldump u170323_test --user=u170323 --password=unpallyan7dip --result-file=./backup/mysqlbackup.sql
\ No newline at end of file
+mysqldump %%database%% --user=%%user%% --password=%%password%% --host=%%server%% --result-file=./backup/%%database%%backup.sql
\ No newline at end of file

=== modified file 'src/backupscripts/mysqlrestore' (properties changed: +x to -x)
--- src/backupscripts/mysqlrestore	2010-06-29 08:30:00 +0000
+++ src/backupscripts/mysqlrestore	2011-04-25 18:28:30 +0000
@@ -1,1 +1,4 @@
-mysql --user=u170323 --password=unpallyan7dip --database=u170323_test -e '\.  ./backup/mysqlbackup.sql'
+mysql --user=%%user%% --password=%%password%% --database=%%database%% --host=%%server%% --skip-column-names --execute="SELECT concat('DROP TABLE ',table_name,';') FROM information_schema.TABLES WHERE TABLE_SCHEMA='u170323_test';" > ./backup/drop.sql
+mysql --user=%%user%% --password=%%password%% --database=%%database%% --host=%%server%% --execute="Set foreign_key_checks=off;source ./backup/drop.sql;"
+
+mysql --user=%%user%% --password=%%password%% --database=%%database%% --host=%%server%% --default-character-set=cp1251 -e '\.  ./backup/%%database%%backup.sql'

=== modified file 'src/build-info.properties'
--- src/build-info.properties	2010-11-20 09:27:56 +0000
+++ src/build-info.properties	2011-04-25 18:28:30 +0000
@@ -1,5 +1,7 @@
 #This file is automatically generated - DO NOT EDIT
-#Fri, 19 Nov 2010 15:24:11 +0300
+#Mon, 25 Apr 2011 13:38:48 +0400
 
 Built-By=mcseem
-Build-Version=324
+Build-Version=1479
+
+Build-Date=25.04.2011 13\:38

=== modified file 'src/build.number'
--- src/build.number	2010-11-20 09:27:56 +0000
+++ src/build.number	2011-04-25 18:28:30 +0000
@@ -1,3 +1,3 @@
 #Build Number for ANT. Do not edit!
-#Fri Nov 19 15:24:11 MSK 2010
-build.number=325
+#Mon Apr 25 13:38:48 MSD 2011
+build.number=1480

=== modified file 'src/cayenne.xml'
--- src/cayenne.xml	2010-10-16 07:11:43 +0000
+++ src/cayenne.xml	2011-04-25 18:28:30 +0000
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <domains project-version="3.0.0.1">
 <domain name="cbadmin">
-	<property name="cayenne.DataRowStore.remote.notify" value="true"/>
+	<property name="cayenne.DataRowStore.snapshot.size" value="1"/>
+	<property name="cayenne.DataDomain.sharedCache" value="false"/>
 
 	<map name="cbadmin" location="cbadmin.map.xml"/>
 	<map name="cbadminExportPnlPlugin" location="cbadminExportPnlPlugin.map.xml"/>
+	<map name="cbadminPluginDeposit" location="cbadminPluginDeposit.map.xml"/>
 	<map name="cbadminPluginDocpack" location="cbadminPluginDocpack.map.xml"/>
 	<map name="cbadminPluginHotel" location="cbadminPluginHotel.map.xml"/>
-	<map name="cbadminPluginPayrequest" location="cbadminPluginPayrequest.map.xml"/>
+	<map name="cbadminPluginRcc" location="cbadminPluginRcc.map.xml"/>
 	<map name="cbadminPluginTour" location="cbadminPluginTour.map.xml"/>
 	<map name="cbadminPluginWeb" location="cbadminPluginWeb.map.xml"/>
 
@@ -15,10 +17,11 @@
 		 datasource="cbadminNode.driver.xml"
 		 factory="org.apache.cayenne.conf.DriverDataSourceFactory"
 		 schema-update-strategy="org.apache.cayenne.access.dbsync.CreateIfNoSchemaStrategy">
+			<map-ref name="cbadminPluginRcc"/>
 			<map-ref name="cbadminPluginTour"/>
 			<map-ref name="cbadminPluginHotel"/>
 			<map-ref name="cbadmin"/>
-			<map-ref name="cbadminPluginPayrequest"/>
+			<map-ref name="cbadminPluginDeposit"/>
 			<map-ref name="cbadminPluginDocpack"/>
 			<map-ref name="cbadminPluginWeb"/>
 			<map-ref name="cbadminExportPnlPlugin"/>

=== modified file 'src/cbadmin.map.xml'
--- src/cbadmin.map.xml	2010-11-04 23:24:26 +0000
+++ src/cbadmin.map.xml	2011-04-25 18:28:30 +0000
@@ -30,6 +30,7 @@
 	</db-entity>
 	<db-entity name="block" catalog="u170323_test">
 		<db-attribute name="capacity" type="SMALLINT" isMandatory="true" length="5"/>
+		<db-attribute name="deletedate" type="TIMESTAMP" length="19"/>
 		<db-attribute name="id" type="BIGINT" isPrimaryKey="true" isGenerated="true" isMandatory="true" length="10"/>
 		<db-attribute name="id_class" type="BIGINT" isMandatory="true" length="10"/>
 		<db-attribute name="id_currency" type="BIGINT" isMandatory="true" length="10"/>
@@ -41,7 +42,7 @@
 		<db-attribute name="ICQ" type="VARCHAR" length="20"/>
 		<db-attribute name="agent_type" type="TINYINT" isMandatory="true"/>
 		<db-attribute name="cl_type" type="BIGINT" isMandatory="true" length="10"/>
-		<db-attribute name="created" type="TIMESTAMP" isMandatory="true" length="19"/>
+		<db-attribute name="created" type="TIMESTAMP" length="19"/>
 		<db-attribute name="deletedate" type="TIMESTAMP" length="19"/>
 		<db-attribute name="delivery_address" type="VARCHAR" length="255"/>
 		<db-attribute name="discount" type="REAL" isMandatory="true" length="12"/>
@@ -82,6 +83,7 @@
 		<db-attribute name="uname" type="VARCHAR" isMandatory="true" length="50"/>
 	</db-entity>
 	<db-entity name="client_ul" catalog="u170323_test">
+		<db-attribute name="gendir" type="VARCHAR" length="100"/>
 		<db-attribute name="id_client" type="BIGINT" isPrimaryKey="true" isMandatory="true" length="10"/>
 		<db-attribute name="orgagree_date" type="DATE" length="10"/>
 		<db-attribute name="orgagree_end" type="DATE" length="10"/>
@@ -127,6 +129,7 @@
 		<db-attribute name="id_airline" type="BIGINT" isMandatory="true" length="10"/>
 		<db-attribute name="id_airport_from" type="BIGINT" isMandatory="true" length="10"/>
 		<db-attribute name="id_airport_to" type="BIGINT" isMandatory="true" length="10"/>
+		<db-attribute name="id_flight_program_paired" type="BIGINT" length="10"/>
 	</db-entity>
 	<db-entity name="flight_program_periods" catalog="u170323_test">
 		<db-attribute name="comment" type="VARCHAR" length="200"/>
@@ -215,6 +218,7 @@
 		<db-attribute name="deletedate" type="TIMESTAMP" length="19"/>
 		<db-attribute name="frozen" type="TINYINT" isMandatory="true" length="3"/>
 		<db-attribute name="id" type="BIGINT" isPrimaryKey="true" isGenerated="true" isMandatory="true" length="10"/>
+		<db-attribute name="id_currency_preferred" type="BIGINT" length="10"/>
 		<db-attribute name="name" type="VARCHAR" isMandatory="true" length="255"/>
 		<db-attribute name="webshow" type="TINYINT" isMandatory="true" length="3"/>
 	</db-entity>
@@ -234,6 +238,15 @@
 		<db-attribute name="name" type="VARCHAR" isMandatory="true" length="60"/>
 		<db-attribute name="webshow" type="TINYINT" isMandatory="true" length="3"/>
 	</db-entity>
+	<db-entity name="list_email" catalog="u170323_test">
+		<db-attribute name="client_type" type="TINYINT" isMandatory="true" length="3"/>
+		<db-attribute name="deletedate" type="TIMESTAMP" length="19"/>
+		<db-attribute name="email_body" type="LONGVARCHAR" isMandatory="true" length="65535"/>
+		<db-attribute name="email_subject" type="VARCHAR" isMandatory="true" length="255"/>
+		<db-attribute name="frozen" type="TINYINT" isMandatory="true" length="3"/>
+		<db-attribute name="id" type="BIGINT" isPrimaryKey="true" isMandatory="true" length="10"/>
+		<db-attribute name="name" type="VARCHAR" isMandatory="true" length="60"/>
+	</db-entity>
 	<db-entity name="list_neighbours" catalog="u170323_test">
 		<db-attribute name="city1" type="BIGINT" isPrimaryKey="true" isMandatory="true" length="10"/>
 		<db-attribute name="city2" type="BIGINT" isPrimaryKey="true" isMandatory="true" length="10"/>
@@ -243,8 +256,11 @@
 	<db-entity name="list_pay_method" catalog="u170323_test">
 		<db-attribute name="deletedate" type="TIMESTAMP" length="19"/>
 		<db-attribute name="frozen" type="TINYINT" isMandatory="true" length="3"/>
-		<db-attribute name="id" type="BIGINT" isPrimaryKey="true" isGenerated="true" isMandatory="true" length="10"/>
+		<db-attribute name="id" type="BIGINT" isPrimaryKey="true" isMandatory="true" length="10"/>
 		<db-attribute name="name" type="VARCHAR" isMandatory="true" length="60"/>
+		<db-attribute name="owner" type="VARCHAR" length="10"/>
+		<db-attribute name="percent_commission" type="REAL" isMandatory="true" length="12"/>
+		<db-attribute name="rate_state" type="TINYINT" isMandatory="true" length="3"/>
 		<db-attribute name="webshow" type="TINYINT" isMandatory="true" length="3"/>
 	</db-entity>
 	<db-entity name="list_reservation_status" catalog="u170323_test">
@@ -330,6 +346,7 @@
 	</db-entity>
 	<db-entity name="payment" catalog="u170323_test">
 		<db-attribute name="comment" type="VARCHAR" length="255"/>
+		<db-attribute name="commission" type="DECIMAL" isMandatory="true" length="13" scale="4"/>
 		<db-attribute name="date_factpayment" type="DATE" length="10"/>
 		<db-attribute name="date_payment" type="DATE" isMandatory="true" length="10"/>
 		<db-attribute name="deletedate" type="TIMESTAMP" length="19"/>
@@ -344,21 +361,12 @@
 		<db-attribute name="pluspercent" type="REAL" isMandatory="true" length="12"/>
 		<db-attribute name="summa_payed" type="REAL" isMandatory="true" length="12"/>
 	</db-entity>
-	<db-entity name="promo" catalog="u170323_test">
-		<db-attribute name="descr" type="LONGVARCHAR" isMandatory="true" length="65535"/>
-		<db-attribute name="heading" type="LONGVARCHAR" isMandatory="true" length="65535"/>
-		<db-attribute name="id" type="BIGINT" isPrimaryKey="true" isMandatory="true" length="10"/>
-		<db-attribute name="id_city" type="BIGINT" isMandatory="true" length="10"/>
-		<db-attribute name="id_country" type="BIGINT" isMandatory="true" length="10"/>
-		<db-attribute name="keywords" type="LONGVARCHAR" isMandatory="true" length="65535"/>
-		<db-attribute name="meta_name" type="LONGVARCHAR" isMandatory="true" length="65535"/>
-		<db-attribute name="ref" type="VARCHAR" length="255"/>
-		<db-attribute name="reftext" type="LONGVARCHAR" isMandatory="true" length="65535"/>
-		<db-attribute name="title" type="LONGVARCHAR" isMandatory="true" length="65535"/>
-	</db-entity>
 	<db-entity name="reservation" catalog="u170323_test">
-		<db-attribute name="billdate" type="TIMESTAMP" length="19"/>
 		<db-attribute name="comment" type="LONGVARCHAR" length="65535"/>
+		<db-attribute name="date_bill" type="TIMESTAMP" length="19"/>
+		<db-attribute name="date_confirm" type="TIMESTAMP" length="19"/>
+		<db-attribute name="date_pay" type="TIMESTAMP" length="19"/>
+		<db-attribute name="date_prepay" type="TIMESTAMP" length="19"/>
 		<db-attribute name="date_reserved" type="DATE" isMandatory="true" length="10"/>
 		<db-attribute name="deletedate" type="TIMESTAMP" length="19"/>
 		<db-attribute name="delivery_address" type="LONGVARCHAR" length="65535"/>
@@ -380,10 +388,8 @@
 		<db-attribute name="id_vacation_category" type="BIGINT" length="10"/>
 		<db-attribute name="isfrozen" type="TINYINT" isMandatory="true" length="3"/>
 		<db-attribute name="number" type="VARCHAR" length="20"/>
-		<db-attribute name="pay_date" type="TIMESTAMP" length="19"/>
 		<db-attribute name="percent_commission" type="REAL" isMandatory="true" length="12"/>
 		<db-attribute name="phone" type="VARCHAR" isMandatory="true" length="60"/>
-		<db-attribute name="prepay_date" type="TIMESTAMP" length="19"/>
 		<db-attribute name="summa_payed" type="REAL" isMandatory="true" length="12"/>
 		<db-attribute name="summa_reserved" type="REAL" isMandatory="true" length="12"/>
 	</db-entity>
@@ -405,6 +411,7 @@
 	</db-entity>
 	<db-entity name="reservation_ul" catalog="u170323_test">
 		<db-attribute name="deletedate" type="TIMESTAMP" length="19"/>
+		<db-attribute name="gendir" type="VARCHAR" length="100"/>
 		<db-attribute name="id" type="BIGINT" isPrimaryKey="true" isGenerated="true" isMandatory="true" length="10"/>
 		<db-attribute name="is_vendor" type="TINYINT" isMandatory="true" length="3"/>
 		<db-attribute name="orgagree_date" type="DATE" length="10"/>
@@ -442,7 +449,7 @@
 		<db-attribute name="isautomatic" type="TINYINT" length="3"/>
 		<db-attribute name="marginfix" type="REAL" isMandatory="true" length="12"/>
 		<db-attribute name="marginpercent" type="REAL" isMandatory="true" length="12"/>
-		<db-attribute name="name" type="VARCHAR" length="50"/>
+		<db-attribute name="name" type="VARCHAR" length="250"/>
 		<db-attribute name="sellprice" type="REAL" isMandatory="true" length="12"/>
 	</db-entity>
 	<db-entity name="service_payment" catalog="u170323_test">
@@ -482,7 +489,7 @@
 	</db-entity>
 	<db-entity name="userright" catalog="u170323_test">
 		<db-attribute name="deletedate" type="TIMESTAMP" length="19"/>
-		<db-attribute name="id" type="BIGINT" isPrimaryKey="true" isGenerated="true" isMandatory="true" length="10"/>
+		<db-attribute name="id" type="BIGINT" isPrimaryKey="true" isMandatory="true" length="10"/>
 		<db-attribute name="name" type="VARCHAR" isMandatory="true" length="50"/>
 	</db-entity>
 	<db-entity name="userrole" catalog="u170323_test">
@@ -502,27 +509,11 @@
 		<db-attribute name="name" type="VARCHAR" isMandatory="true" length="45"/>
 		<db-attribute name="version" type="INTEGER" isMandatory="true" length="10"/>
 	</db-entity>
-	<db-entity name="vlnews" catalog="u170323_test">
-		<db-attribute name="ann" type="LONGVARCHAR" length="65535"/>
-		<db-attribute name="arch" type="SMALLINT" length="5"/>
-		<db-attribute name="autor" type="VARCHAR" length="255"/>
-		<db-attribute name="data" type="DATE" length="10"/>
-		<db-attribute name="descr" type="LONGVARCHAR" length="65535"/>
-		<db-attribute name="img1b" type="VARCHAR" isMandatory="true" length="255"/>
-		<db-attribute name="img1m" type="VARCHAR" length="255"/>
-		<db-attribute name="img2b" type="VARCHAR" isMandatory="true" length="255"/>
-		<db-attribute name="img2m" type="VARCHAR" isMandatory="true" length="255"/>
-		<db-attribute name="img3b" type="VARCHAR" isMandatory="true" length="255"/>
-		<db-attribute name="img3m" type="VARCHAR" isMandatory="true" length="255"/>
-		<db-attribute name="name" type="LONGVARCHAR" length="65535"/>
-		<db-attribute name="see" type="SMALLINT" length="5"/>
-		<db-attribute name="title" type="VARCHAR" length="255"/>
-		<db-attribute name="uid" type="BIGINT" isPrimaryKey="true" isMandatory="true" length="10"/>
-		<db-attribute name="url" type="VARCHAR" length="255"/>
-	</db-entity>
 	<obj-entity name="Block" className="cbadmin.entity2.Block" dbEntityName="block" superClassName="cbadmin.entity2.db_interface">
-		<obj-attribute name="capacity" type="short" db-attribute-path="capacity"/>
+		<obj-attribute name="capacity" type="int" db-attribute-path="capacity"/>
+		<obj-attribute name="deletedate" type="java.util.Date" db-attribute-path="deletedate"/>
 		<obj-attribute name="price" type="float" db-attribute-path="price"/>
+		<post-add method-name="onPostAdd"/>
 		<post-update method-name="onPostUpdate"/>
 		<post-load method-name="onPostLoad"/>
 	</obj-entity>
@@ -535,6 +526,7 @@
 		<obj-attribute name="discount" type="java.lang.Float" db-attribute-path="discount"/>
 		<obj-attribute name="fax" type="java.lang.String" db-attribute-path="fax"/>
 		<obj-attribute name="icq" type="java.lang.String" db-attribute-path="ICQ"/>
+		<obj-attribute name="id_key" type="java.lang.Long" db-attribute-path="id"/>
 		<obj-attribute name="isVendor" type="java.lang.Byte" db-attribute-path="is_vendor"/>
 		<obj-attribute name="name" type="java.lang.String" db-attribute-path="name"/>
 		<obj-attribute name="password" type="java.lang.String" db-attribute-path="password"/>
@@ -554,10 +546,12 @@
 		<obj-attribute name="contactPassport" type="java.lang.String" db-attribute-path="contact_passport"/>
 		<obj-attribute name="contactPatronymic" type="java.lang.String" db-attribute-path="contact_patronymic"/>
 		<obj-attribute name="contactRegAddress" type="java.lang.String" db-attribute-path="contact_reg_address"/>
+		<obj-attribute name="id_key" type="java.lang.Long" db-attribute-path="id_client"/>
 		<obj-attribute name="passportz" type="java.lang.String" db-attribute-path="passportz"/>
 		<obj-attribute name="sex" type="java.lang.Long" db-attribute-path="sex"/>
 	</obj-entity>
 	<obj-entity name="ClientUl" className="cbadmin.entity2.ClientUl" dbEntityName="client_ul" superClassName="cbadmin.entity2.db_interface">
+		<obj-attribute name="gendir" type="java.lang.String" db-attribute-path="gendir"/>
 		<obj-attribute name="orgagreeDate" type="java.util.Date" db-attribute-path="orgagree_date"/>
 		<obj-attribute name="orgagreeEnd" type="java.util.Date" db-attribute-path="orgagree_end"/>
 		<obj-attribute name="orgagreeNum" type="java.lang.String" db-attribute-path="orgagree_num"/>
@@ -610,13 +604,13 @@
 		<obj-attribute name="timeTo" type="java.util.Date" db-attribute-path="time_to"/>
 	</obj-entity>
 	<obj-entity name="ListAge" className="cbadmin.entity2.ListAge" dbEntityName="list_age" superClassName="cbadmin.entity2.db_interface">
-		<obj-attribute name="agefrom" type="java.lang.Byte" db-attribute-path="agefrom"/>
-		<obj-attribute name="ageto" type="java.lang.Byte" db-attribute-path="ageto"/>
+		<obj-attribute name="agefrom" type="int" db-attribute-path="agefrom"/>
+		<obj-attribute name="ageto" type="int" db-attribute-path="ageto"/>
 		<obj-attribute name="deletedate" type="java.util.Date" db-attribute-path="deletedate"/>
 		<obj-attribute name="frozen" type="java.lang.Byte" db-attribute-path="frozen"/>
-		<obj-attribute name="isAdult" type="java.lang.Byte" db-attribute-path="is_adult"/>
-		<obj-attribute name="isChild" type="java.lang.Byte" db-attribute-path="is_child"/>
-		<obj-attribute name="isInfant" type="java.lang.Byte" db-attribute-path="is_infant"/>
+		<obj-attribute name="isAdult" type="int" db-attribute-path="is_adult"/>
+		<obj-attribute name="isChild" type="int" db-attribute-path="is_child"/>
+		<obj-attribute name="isInfant" type="int" db-attribute-path="is_infant"/>
 		<obj-attribute name="name" type="java.lang.String" db-attribute-path="name"/>
 		<obj-attribute name="webshow" type="java.lang.Byte" db-attribute-path="webshow"/>
 	</obj-entity>
@@ -683,6 +677,14 @@
 		<obj-attribute name="name" type="java.lang.String" db-attribute-path="name"/>
 		<obj-attribute name="webshow" type="java.lang.Byte" db-attribute-path="webshow"/>
 	</obj-entity>
+	<obj-entity name="ListEmail" className="cbadmin.entity2.ListEmail" dbEntityName="list_email" superClassName="cbadmin.entity2.db_interface">
+		<obj-attribute name="clientType" type="int" db-attribute-path="client_type"/>
+		<obj-attribute name="deletedate" type="java.util.Date" db-attribute-path="deletedate"/>
+		<obj-attribute name="emailBody" type="java.lang.String" db-attribute-path="email_body"/>
+		<obj-attribute name="emailSubject" type="java.lang.String" db-attribute-path="email_subject"/>
+		<obj-attribute name="frozen" type="java.lang.Byte" db-attribute-path="frozen"/>
+		<obj-attribute name="name" type="java.lang.String" db-attribute-path="name"/>
+	</obj-entity>
 	<obj-entity name="ListNeighbours" className="cbadmin.entity2.ListNeighbours" dbEntityName="list_neighbours" superClassName="cbadmin.entity2.db_interface">
 		<obj-attribute name="distance" type="java.lang.Integer" db-attribute-path="distance"/>
 		<obj-attribute name="howToGetTo" type="java.lang.String" db-attribute-path="how_to_get_to"/>
@@ -690,7 +692,11 @@
 	<obj-entity name="ListPayMethod" className="cbadmin.entity2.ListPayMethod" dbEntityName="list_pay_method" superClassName="cbadmin.entity2.db_interface">
 		<obj-attribute name="deletedate" type="java.util.Date" db-attribute-path="deletedate"/>
 		<obj-attribute name="frozen" type="java.lang.Byte" db-attribute-path="frozen"/>
+		<obj-attribute name="id_key" type="java.lang.Long" db-attribute-path="id"/>
 		<obj-attribute name="name" type="java.lang.String" db-attribute-path="name"/>
+		<obj-attribute name="owner" type="java.lang.String" db-attribute-path="owner"/>
+		<obj-attribute name="percentCommission" type="java.lang.Float" db-attribute-path="percent_commission"/>
+		<obj-attribute name="rateState" type="int" db-attribute-path="rate_state"/>
 		<obj-attribute name="webshow" type="java.lang.Byte" db-attribute-path="webshow"/>
 	</obj-entity>
 	<obj-entity name="ListReservationStatus" className="cbadmin.entity2.ListReservationStatus" dbEntityName="list_reservation_status" superClassName="cbadmin.entity2.db_interface">
@@ -739,6 +745,7 @@
 		<obj-attribute name="deletedate" type="java.util.Date" db-attribute-path="deletedate"/>
 		<obj-attribute name="family" type="java.lang.String" db-attribute-path="family"/>
 		<obj-attribute name="idOffer" type="java.lang.Long" db-attribute-path="id_offer"/>
+		<obj-attribute name="id_key" type="java.lang.Long" db-attribute-path="id"/>
 		<obj-attribute name="isDocsBack" type="java.lang.Byte" db-attribute-path="is_docs_back"/>
 		<obj-attribute name="isDocsThere" type="java.lang.Byte" db-attribute-path="is_docs_there"/>
 		<obj-attribute name="name" type="java.lang.String" db-attribute-path="name"/>
@@ -754,6 +761,7 @@
 	</obj-entity>
 	<obj-entity name="Payment" className="cbadmin.entity2.Payment" dbEntityName="payment" superClassName="cbadmin.entity2.db_interface">
 		<obj-attribute name="comment" type="java.lang.String" db-attribute-path="comment"/>
+		<obj-attribute name="commission" type="java.math.BigDecimal" db-attribute-path="commission"/>
 		<obj-attribute name="dateFactpayment" type="java.util.Date" db-attribute-path="date_factpayment"/>
 		<obj-attribute name="datePayment" type="java.util.Date" db-attribute-path="date_payment"/>
 		<obj-attribute name="deletedate" type="java.util.Date" db-attribute-path="deletedate"/>
@@ -762,12 +770,16 @@
 		<obj-attribute name="moneyholder" type="java.lang.String" db-attribute-path="moneyholder"/>
 		<obj-attribute name="pluspercent" type="java.lang.Float" db-attribute-path="pluspercent"/>
 		<obj-attribute name="summaPayed" type="java.lang.Double" db-attribute-path="summa_payed"/>
+		<post-persist method-name="onPostPersist"/>
 		<post-update method-name="onPostUpdate"/>
 		<post-load method-name="onPostLoad"/>
 	</obj-entity>
 	<obj-entity name="Reservation" className="cbadmin.entity2.Reservation" dbEntityName="reservation" superClassName="cbadmin.entity2.db_interface">
-		<obj-attribute name="billdate" type="java.util.Date" db-attribute-path="billdate"/>
 		<obj-attribute name="comment" type="java.lang.String" db-attribute-path="comment"/>
+		<obj-attribute name="dateBill" type="java.util.Date" db-attribute-path="date_bill"/>
+		<obj-attribute name="dateConfirm" type="java.util.Date" db-attribute-path="date_confirm"/>
+		<obj-attribute name="datePay" type="java.util.Date" db-attribute-path="date_pay"/>
+		<obj-attribute name="datePrepay" type="java.util.Date" db-attribute-path="date_prepay"/>
 		<obj-attribute name="dateReserved" type="java.util.Date" db-attribute-path="date_reserved"/>
 		<obj-attribute name="deletedate" type="java.util.Date" db-attribute-path="deletedate"/>
 		<obj-attribute name="deliveryAddress" type="java.lang.String" db-attribute-path="delivery_address"/>
@@ -776,12 +788,11 @@
 		<obj-attribute name="fax" type="java.lang.String" db-attribute-path="fax"/>
 		<obj-attribute name="icq" type="java.lang.String" db-attribute-path="icq"/>
 		<obj-attribute name="idOffer" type="long" db-attribute-path="id_offer"/>
+		<obj-attribute name="id_key" type="java.lang.Long" db-attribute-path="id"/>
 		<obj-attribute name="isfrozen" type="byte" db-attribute-path="isfrozen"/>
 		<obj-attribute name="number" type="java.lang.String" db-attribute-path="number"/>
-		<obj-attribute name="payDate" type="java.util.Date" db-attribute-path="pay_date"/>
 		<obj-attribute name="percentCommission" type="java.lang.Float" db-attribute-path="percent_commission"/>
 		<obj-attribute name="phone" type="java.lang.String" db-attribute-path="phone"/>
-		<obj-attribute name="prepayDate" type="java.util.Date" db-attribute-path="prepay_date"/>
 		<obj-attribute name="summaPayed" type="float" db-attribute-path="summa_payed"/>
 		<obj-attribute name="summaReserved" type="float" db-attribute-path="summa_reserved"/>
 		<post-add method-name="onPostAdd"/>
@@ -800,9 +811,12 @@
 		<obj-attribute name="contactPatronymic" type="java.lang.String" db-attribute-path="contact_patronymic"/>
 		<obj-attribute name="contactRegaddress" type="java.lang.String" db-attribute-path="contact_regaddress"/>
 		<obj-attribute name="deletedate" type="java.util.Date" db-attribute-path="deletedate"/>
+		<obj-attribute name="id_key" type="java.lang.Long" db-attribute-path="id"/>
 	</obj-entity>
 	<obj-entity name="ReservationUl" className="cbadmin.entity2.ReservationUl" dbEntityName="reservation_ul" superClassName="cbadmin.entity2.db_interface">
 		<obj-attribute name="deletedate" type="java.util.Date" db-attribute-path="deletedate"/>
+		<obj-attribute name="gendir" type="java.lang.String" db-attribute-path="gendir"/>
+		<obj-attribute name="id_key" type="java.lang.Long" db-attribute-path="id"/>
 		<obj-attribute name="isVendor" type="java.lang.Byte" db-attribute-path="is_vendor"/>
 		<obj-attribute name="orgagreeDate" type="java.util.Date" db-attribute-path="orgagree_date"/>
 		<obj-attribute name="orgagreeEnd" type="java.util.Date" db-attribute-path="orgagree_end"/>
@@ -826,6 +840,7 @@
 		<obj-attribute name="buyprice" type="java.lang.Float" db-attribute-path="buyprice"/>
 		<obj-attribute name="dateFrom" type="java.util.Date" db-attribute-path="date_from"/>
 		<obj-attribute name="dateTo" type="java.util.Date" db-attribute-path="date_to"/>
+		<obj-attribute name="id_key" type="java.lang.Long" db-attribute-path="id"/>
 		<obj-attribute name="marginfix" type="java.lang.Float" db-attribute-path="marginfix"/>
 		<obj-attribute name="marginpercent" type="java.lang.Float" db-attribute-path="marginpercent"/>
 		<obj-attribute name="name" type="java.lang.String" db-attribute-path="name"/>
@@ -956,9 +971,12 @@
 	<db-relationship name="flightArray" source="flight_program" target="flight" toMany="true">
 		<db-attribute-pair source="id" target="id_flight_program"/>
 	</db-relationship>
-	<db-relationship name="flightProgramPeriodsArray" source="flight_program" target="flight_program_periods" toMany="true">
+	<db-relationship name="flightProgramPeriods" source="flight_program" target="flight_program_periods" toMany="true">
 		<db-attribute-pair source="id" target="id_flight_program"/>
 	</db-relationship>
+	<db-relationship name="toFlightProgram" source="flight_program" target="flight_program" toMany="false">
+		<db-attribute-pair source="id_flight_program_paired" target="id"/>
+	</db-relationship>
 	<db-relationship name="toListAirline" source="flight_program" target="list_airline" toMany="false">
 		<db-attribute-pair source="id_airline" target="id"/>
 	</db-relationship>
@@ -1061,6 +1079,9 @@
 	<db-relationship name="servicePriceArray" source="list_country" target="service_price" toMany="true">
 		<db-attribute-pair source="id" target="id_country"/>
 	</db-relationship>
+	<db-relationship name="toListCurrency" source="list_country" target="list_currency" toMany="false">
+		<db-attribute-pair source="id_currency_preferred" target="id"/>
+	</db-relationship>
 	<db-relationship name="vendorPreferredArray" source="list_country" target="vendor_preferred" toMany="true">
 		<db-attribute-pair source="id" target="id_country"/>
 	</db-relationship>
@@ -1359,7 +1380,8 @@
 	<obj-relationship name="offersForIdFlightthere" source="Flight" target="Offer" deleteRule="Deny" db-relationship-path="offersForThere"/>
 	<obj-relationship name="passengersForIdFlightback" source="Flight" target="Passenger" deleteRule="Deny" db-relationship-path="passengersForBack"/>
 	<obj-relationship name="passengersForIdFlightthere" source="Flight" target="Passenger" deleteRule="Deny" db-relationship-path="passengersForThere"/>
-	<obj-relationship name="flightProgramPeriodses" source="FlightProgram" target="FlightProgramPeriods" deleteRule="Deny" db-relationship-path="flightProgramPeriodsArray"/>
+	<obj-relationship name="flightProgramPaired" source="FlightProgram" target="FlightProgram" deleteRule="Nullify" db-relationship-path="toFlightProgram"/>
+	<obj-relationship name="flightProgramPeriods" source="FlightProgram" target="FlightProgramPeriods" deleteRule="Deny" db-relationship-path="flightProgramPeriods"/>
 	<obj-relationship name="flights" source="FlightProgram" target="Flight" deleteRule="Deny" db-relationship-path="flightArray"/>
 	<obj-relationship name="listAirline" source="FlightProgram" target="ListAirline" deleteRule="Nullify" db-relationship-path="toListAirline"/>
 	<obj-relationship name="listAirportByIdAirportFrom" source="FlightProgram" target="ListAirport" deleteRule="Nullify" db-relationship-path="toListAirport"/>
@@ -1393,6 +1415,7 @@
 	<obj-relationship name="passengersForIdClassthere" source="ListClass" target="Passenger" deleteRule="Deny" db-relationship-path="passengersForIdClassthere"/>
 	<obj-relationship name="listAirlines" source="ListCountry" target="ListAirline" deleteRule="Deny" db-relationship-path="listAirlineArray"/>
 	<obj-relationship name="listCities" source="ListCountry" target="ListCity" deleteRule="Deny" db-relationship-path="listCityArray"/>
+	<obj-relationship name="preferredCurrency" source="ListCountry" target="ListCurrency" deleteRule="Nullify" db-relationship-path="toListCurrency"/>
 	<obj-relationship name="reservations" source="ListCountry" target="Reservation" deleteRule="Deny" db-relationship-path="reservationArray"/>
 	<obj-relationship name="servicePriceArray" source="ListCountry" target="ServicePrice" deleteRule="Deny" db-relationship-path="servicePriceArray"/>
 	<obj-relationship name="vendorPreferredArray" source="ListCountry" target="VendorPreferred" deleteRule="Deny" db-relationship-path="vendorPreferredArray"/>

=== modified file 'src/cbadmin.properties'
--- src/cbadmin.properties	2010-11-13 10:31:30 +0000
+++ src/cbadmin.properties	2011-04-25 18:28:30 +0000
@@ -4,6 +4,10 @@
 mail.user = [e-mail]
 mail.password = samba
 mail.smtp.auth = true
+mail.from = [e-mail]
+
+#\u0435\u0441\u043b\u0438 \u0443\u043a\u0430\u0437\u0430\u043d, \u0442\u043e \u043f\u043e \u043d\u0435\u043c\u0443 \u0430\u0432\u0442\u043e\u043c\u0430\u0442\u043e\u043c \u0443\u0445\u043e\u0434\u044f\u0442 \u043b\u043e\u0433\u0438 \u043f\u0440\u0438 \u043e\u0448\u0438\u0431\u043a\u0430\u0445
+adminEmail = [e-mail]
 
 #mail.transport.protocol = smtp
 #mail.host = mail.hqhost.net
@@ -94,4 +98,14 @@
 backupScript = backupscripts/mysqlbackup
 restoreScript = backupscripts/mysqlrestore
 
-cayenneXml = cayenne-test.xml
\ No newline at end of file
+#test file
+cayenneXml = cayenne-test.xml
+
+#use confirmation date for payment instead of invoice date
+useConfirmdate = 1
+
+#tolerance in hundredths to detect full payment
+compareDifference = 5
+
+#wait for file in print, seconds
+printTimeout = 30
\ No newline at end of file

=== added directory 'src/cbadmin/business'
=== added file 'src/cbadmin/business/Money.java'
--- src/cbadmin/business/Money.java	1970-01-01 00:00:00 +0000
+++ src/cbadmin/business/Money.java	2011-04-25 18:28:30 +0000
@@ -0,0 +1,334 @@
+package cbadmin.business;
+
+//import java.math.BigDecimal;
+
+import cbadmin.util.utils;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.Types;
+import org.apache.cayenne.map.DbAttribute;
+import org.apache.cayenne.validation.ValidationResult;
+
+//import java.math.BigInteger;
+//import java.sql.CallableStatement;
+//import java.sql.PreparedStatement;
+//import java.sql.ResultSet;
+//import java.sql.Types;
+//import org.apache.cayenne.map.DbAttribute;
+//import org.apache.cayenne.validation.ValidationResult;
+
+/**
+ * взято из
+ * http://www.idinews.com/sourcecode/MoneyJava.html
+ * @author 1996 Information Disciplines, Inc., Chicago
+ */
+
+//%TITLE    Money Class            (copyright 1996, Information Disciplines, Inc)
+public final class Money implements org.apache.cayenne.access.types.ExtendedType    //// implements java.lang,Comparable
+{
+//   Internal representation:   Always an integer, scaled so that unity
+//   -----------------------      is the smallest measurable quantity
+
+protected int scale=default_scale;//  Smallest fraction of monetary unit to
+public static int default_scale=10000;//  Smallest fraction of monetary unit to
+                              //    be represented (e.g. 100: cents,
+                              //    200: 8ths, 1000: mills);
+                              //  User can override before creating
+                              //    any Money objects
+
+protected long  value;        //  Amount in monetary units * scale
+//%SPACE 3
+//   Constructors and assignment operations
+//   --------------------------------------
+
+// To support literal constants as well as simple input, we allow
+// conversion from floating point, just as in the constructor.
+
+ public Money(final double x) {value = Math.round(x * scale);}
+ public Money(final double x, final byte digits) {scale = 10^digits; value = Math.round(x * (scale));}
+ public Money()         {}      //  Default constructor, for efficiency
+ public Money(final Money x)  {value = x.value; scale = x.scale; }
+ public Money(final BigDecimal x)  {
+     if (x==null)   value = 0;
+     else value = (x.multiply(new BigDecimal(scale))).longValue();
+ }
+//%SPACE 3
+//  Pseudo assignment operators
+//  ---------------------------
+
+ public Money set(final Money  rs)
+        {value=         rs.value;       return this;}
+ public Money set(final double rs)
+        {value= Math.round(rs * scale); return this;}
+//%SPACE 3
+//  Accessors
+//  ---------
+
+public long  wholeUnits() {return value / scale;}
+
+public short cents     () {return (short)((value*100)/scale
+                                           - (100 * wholeUnits()));}
+
+/**
+ * нельзя пользоваться этим методом при работе с валютами. только для отладки.
+ * может быть потеря точности потеря точности
+ * @return
+ */
+public double doubleValue () {return (double)value / (double)scale;}
+
+public BigDecimal bigdecimalValue () {return new BigDecimal(value).divide(new BigDecimal(scale));}
+
+//%EJECT
+//  Numeric utility functions
+//  -------------------------
+
+public Money abs()
+       {Money  result = new Money(this);
+        if (value < 0) result.value = - result.value;
+        return result;
+       }
+
+public short sign()
+       {return (short)(value > 0 ?  1
+                    :  value < 0 ? -1 : 0);}
+
+//  Relational (predicate) operations:
+//  ---------------------------------
+
+ public boolean equals      (final Money  rs) {return value == rs.value;}
+ public boolean lessThan    (final Money  rs) {return value <  rs.value;}
+ public boolean greaterThan (final Money  rs) {return value >  rs.value;}
+
+ public boolean equals      (final double rs) {return value == rs * scale;}
+ public boolean lessThan    (final double rs) {return value <  rs * scale;}
+ public boolean greaterThan (final double rs) {return value >  rs * scale;}
+
+//  These three functions are to comply with Java library conventions.
+//  They are rarely needed in manipulating Money objects.
+
+ @Override
+ public boolean equals        (final Object rs)
+                {return rs instanceof Money && ((Money)rs).value == value;}
+
+ public int compareTo         (final Object rs)
+                {return sub((Money)rs).sign();}
+
+ /**
+  * сравнение с учетом разрешенной погрешности
+  * @param rs
+  * @return -1 если меньше, 0 если разница в пределах допуска, иначе +1
+  */
+public int compareTolerance         (final Money rs) {
+    return utils.compareMoney(doubleValue(), rs.doubleValue());
+}
+
+ @Override
+ public int hashCode          ()
+                {return (new Long(value)).hashCode();}
+
+//  Arithmetic operations:
+//  ---------------------
+
+//  For efficiency we follow Scott Myers ("More Effective C++", Addison
+//  Wesley) in defining the compound assignment operators as primitive,
+//  and then defining most ordinary arithmetic operators in terms of them.
+//  Note that the compound assignment operators are much more
+//  efficient, since no new object is created.
+
+ public Money  addSet (final Money  rs)
+                {value += rs.value;     return this;}
+ public Money  addSet (final double rs)
+                {value += rs * scale;   return this;}
+ public Money  subSet (final Money  rs)
+                {value -= rs.value;     return this;}
+ public Money  subSet (final double rs)
+                {value -= rs * scale;   return this;}
+ public Money  mpySet (final double rs)
+                {value *= rs;           return this;}
+ public Money  divSet (final double rs)
+                {Math.round(value/=rs); return this;}
+
+ public Money  minusSet()
+                {value = - value;       return this;}
+
+ public Money  add (final Money  rs)
+                {return new Money(this).addSet(rs);}
+ public Money  add (final double rs)
+                {return new Money(this).addSet(rs);}
+ public Money  sub (final Money  rs)
+                {return new Money(this).subSet(rs);}
+ public Money  sub (final double rs)
+                {return new Money(this).subSet(rs);}
+ public Money  mpy (final double rs)
+                {return new Money(this).mpySet(rs);}
+ public Money  div (final double rs)
+                {return new Money(this).divSet(rs);}
+ public double div (final Money  rs)
+//                {return Math.round((double)value/(double)rs.value);}
+                {return (double)value/(double)rs.value /**(double)rs.scale/(double)scale*/;}
+//public Money div (final Money  rs)
+//                {return new Money(this).divSet(rs);}
+
+ public Money  minus()
+                {return new Money(this).minusSet();}
+//%EJECT
+//   External representation: Constants used in output and input functions
+//   -----------------------  (User may override)
+
+public static String pfx_symbol     = "";     // Leading currency symbol '$'
+public static String sfx_symbol     = "";      // Trailing currency symbol
+public static char  decimal_point   = '.';     // Character for fractions
+public static String group_separator = "";     // Character for 1000nds ','
+public static String unit_name = "dollar";     // Name of monetary unit
+public static String cent_name = "cent";       // Name of fraction unit
+
+static long   divisors[] = {        1,       1000,     1000000,
+                   (long)1E9, (long)1E12,(long)1E15, (long)1E18};
+
+//  Conversion functions
+//  --------------------
+
+//  The following function is needed by toString (below) in order to
+//  develop its result in left-to-right order:
+
+  private static short log10(long x) //  This function returns the number
+  {short result;                     //    of decimal digits in an integer
+   for (result=0; x>=10; result++, x/=10); // Decimal "shift" and count
+   return result;
+  }
+ 
+//  Conversion to string
+//  --------------------
+
+//  The result (external Money representation) is the concatenation of:
+//  -   a leading minus sign, if needed
+//  -   the prefix currency symbol, if any (U.S.:  '$')
+//  -   groups of 3-digits separated by the group_separator (English: comma)
+//           (no leading zeros on the leftmost group)
+//  -   a decimal point (English: period)
+//  -   the fractional portion, normally two digits, more if needed
+//           and if scale > 100
+//  -   the suffix currency symbol, if any (U.S.:  none)
+
+ public String toString (int signs) {
+boolean negative = (value < 0);        //  Remember original sign
+  value = negative ? -value : value;     //  Discard sign temporarily
+  long    whole = wholeUnits();          //  Separate arg. into whole
+  short   cents = cents();               //    and fractional monetary units
+  short   rest  = (short)(value - (cents + 100 * whole) * scale / 100);
+
+  String result = (negative ? "-" : ""); //  Insert prefix minus, if needed
+  result = result + pfx_symbol;          //  Insert dollar sign or equiv.
+
+//  (function continued on next page)
+//%EJECT
+  //  Append groups of 3 digits separated by punctuation
+
+  int    group_no  = log10(whole) / 3;
+  int    group_val = (int)(whole  / divisors[group_no]);
+
+  result = result + group_val;            // Append leftmost 3-digits
+                                         //   without leading 0's
+
+  while (group_no > 0)                    // For each remaining 3-digit group
+   {result    = result + group_separator;         // Insert punctuation
+    whole    -= group_val * divisors[group_no--]; // Compute new remainder
+    group_val = (short)(whole/divisors[group_no]);// Get next 3-digit value
+    if   (group_val < 100) result = result + "0"; // Insert embedded 0's
+    if   (group_val <  10) result = result + "0"; //   as needed
+    result = result + group_val;                  // Append group value
+   }
+
+//  Append the fractional portion
+
+  result = result + decimal_point;   //    Append decimal point
+  if (cents < 10)                    //    Insert leading 0 if needed
+       result = result + "0";
+  result = result + cents;           //    Append cents value
+
+  if (rest > 0)                      //    Test for fractional pennies
+     {while ((rest *= 10) < scale);  //    (rest *= power(10,log10(scale)))
+//        result = result + (rest/scale);//    Append fractional pennies, if any
+      String pennies = new Long(rest/scale).toString();
+      result = result + pennies.substring(0, signs>pennies.length() ? pennies.length()-1 : signs-1);//    Append fractional pennies, if any
+     }
+  if (negative) value = - value;     //    Restore original sign
+
+//  utils.getLogger().debug("Money value="+value+" toString="+result);
+  return result + sfx_symbol;        //    Append final symbol, if any
+ }
+
+
+ @Override
+ public String toString () {
+    return toString(10);
+
+}     //    *******  End of toString function
+
+ //==============================================================
+ //org.apache.cayenne.access.types.ExtendedType
+
+    public String getClassName() {
+        return this.getClass().getName();
+    }
+
+    public boolean validateProperty(Object source, String property, Object value,
+            DbAttribute dbAttribute, ValidationResult validationResult) {
+        Money money = (Money) value;
+        //неможет быть случая когда что-то не так
+
+//        if (!g.isValid()) {
+//            String msg = "Invalid geometry";
+//            validationResult.addFailure(new BeanValidationFailure(source, property, msg));
+//            return false;
+//        }
+        return true;
+    }
+
+    public void setJdbcObject(PreparedStatement statement, Object value, int pos, int type,
+            int precision) throws Exception {
+        Money g = (Money) value;
+        switch (type) {
+//        case Types.BLOB:
+//            statement.setBytes(pos, g.toText().getBytes(CHARSET));
+//            break;
+        default:
+            statement.setBigDecimal(pos, g.bigdecimalValue());
+            break;
+        }
+    }
+
+    public Object materializeObject(ResultSet rs, int index, int type) throws Exception {
+        BigDecimal dec = null;
+        switch (type) {
+//        case Types.BLOB:
+//            wkt = new String(rs.getBytes(index), CHARSET);
+//            break;
+        default:
+            dec = rs.getBigDecimal(index);
+            break;
+        }
+        if (dec == null) return (Money) null;
+
+        return new Money(dec);
+    }
+
+    public Object materializeObject(CallableStatement rs, int index, int type) throws Exception {
+        BigDecimal dec = null;
+        switch (type) {
+//        case Types.BLOB:
+//            wkt = new String(rs.getBytes(index), CHARSET);
+//            break;
+        default:
+            dec = rs.getBigDecimal(index);
+            break;
+        }
+        if (dec == null) return (Money) null;
+
+        return new Money(dec);
+    }
+
+}     //    *******  End of class definition

=== added file 'src/cbadmin/business/PaymentVendorInterface.java'
--- src/cbadmin/business/PaymentVendorInterface.java	1970-01-01 00:00:00 +0000
+++ src/cbadmin/business/PaymentVendorInterface.java	2011-04-25 18:28:30 +0000
@@ -0,0 +1,52 @@
+package cbadmin.business;
+
+import cbadmin.entity2.Payment;
+
+/**
+ * обработчик специальных типов оплат. например, оплата с депозита, которая должна изменять сопутствующие таблицы
+ * вендор не влияет на сохранение оплаты, он производит вспомогательные действия
+ * @author mcseem
+ */
+public interface PaymentVendorInterface {
+
+    /**
+     * проверить, может ли пользователь что-то делать с этой оплатой
+     * @return true если всё в порядке, права есть
+     */
+    public boolean checkRights();
+
+    /**
+     * можно ли сохранять.
+     * @param payment
+     * @return null если нет ошибок, оначе строку с ошибкой
+     */
+    public String canSave(Payment payment, int operation);
+
+    /**
+     * после добавления оплаты
+     * @param payment
+     * @return
+     */
+    public boolean add(Payment payment);
+    /**
+     * перед удалением оплаты
+     * @param payment
+     * @return
+     */
+    public boolean delete(Payment payment);
+    /**
+     * обновление оплаты. статус указывает,
+     * @param payment
+     * @param order - порядок. CONST_FROM - предыдущее состояние оплаты, CONST_TO - финальное состояние оплаты
+     * @return
+     */
+    public boolean update(Payment payment, int order);
+
+    public final int CONST_SAVE_OPERATION = 1;
+    public final int CONST_BEFORE_UPDATE_OPERATION = 2;
+    public final int CONST_AFTER_UPDATE_OPERATION = 3;
+    public final int CONST_DELETE_OPERATION = 4;
+
+    public final int CONST_FROM = 1;
+    public final int CONST_TO = 2;
+}

=== added file 'src/cbadmin/business/Price.java'
--- src/cbadmin/business/Price.java	1970-01-01 00:00:00 +0000
+++ src/cbadmin/business/Price.java	2011-04-25 18:28:30 +0000
@@ -0,0 +1,100 @@
+package cbadmin.business;
+
+import cbadmin.entity2.ListAge;
+
+/**
+ * Найденная цена
+ * @author mcseem
+ */
+public final class Price {
+    private Money buyPrice = new Money();
+    private Money marginFix = new Money();
+    private Money marginPercent = new Money();
+    private Money sellPrice = new Money();
+    private ListAge age;
+//    private int agefrom;
+//    private int ageto;
+    private int period; //периоды действия из PriceInterface
+    private Integer id; //id найденной цены, если есть
+
+    public Price() {}   //оптимизации
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public int getPeriod() {
+        return period;
+    }
+
+    public void setPeriod(int period) {
+        this.period = period;
+    }
+
+    /**
+     * если цена относится к какому-либо конкретному возрасному периоду.
+     * применяется при расчете туров
+     * @return
+     */
+    public ListAge getListAge() {
+        return age;
+    }
+
+    public void setListAge(ListAge age) {
+        this.age = age;
+    }
+
+
+    public Money getBuyPrice() {
+        return buyPrice;
+    }
+
+    public void setBuyPrice(Money buyPrice) {
+        this.buyPrice = buyPrice;
+    }
+
+    public Money getMarginFix() {
+        return marginFix;
+    }
+
+    public void setMarginFix(Money marginFix) {
+        this.marginFix = marginFix;
+    }
+
+    public Money getMarginPercent() {
+        return marginPercent;
+    }
+
+    public void setMarginPercent(Money marginPercent) {
+        this.marginPercent = marginPercent;
+    }
+
+    public Money getSellPrice() {
+        return sellPrice;
+    }
+
+    public void setSellPrice(Money sellPrice) {
+        this.sellPrice = sellPrice;
+    }
+
+    /**
+     * пересчитать процент маржи
+     */
+    public void calcMarginPercent() {
+        if (getBuyPrice().wholeUnits()+getBuyPrice().cents()+
+            getMarginFix().wholeUnits()+getMarginFix().cents()==0) setMarginPercent(new Money(0));
+        else {
+            setMarginPercent(
+                new Money(getSellPrice().
+                div(getBuyPrice().add(getMarginFix()) )).add(-1).mpy(100)
+                );
+//            utils.getLogger().debug("calcMarginPercent: sellprice="+getSellPrice().toString()+"bp+mf="+getBuyPrice().add(getMarginFix()).toString()+
+//                " division="+getSellPrice().div(getBuyPrice().add(getMarginFix()) )
+//                );
+        }
+    }
+}

=== added file 'src/cbadmin/business/PriceInterface.java'
--- src/cbadmin/business/PriceInterface.java	1970-01-01 00:00:00 +0000
+++ src/cbadmin/business/PriceInterface.java	2011-04-25 18:28:30 +0000
@@ -0,0 +1,62 @@
+package cbadmin.business;
+
+import cbadmin.entity2.ListAge;
+import cbadmin.entity2.ListCountry;
+import cbadmin.entity2.ListCurrency;
+import java.util.Date;
+
+/**
+ * общий интерфейс для всех цен в базе
+ * @author mcseem
+ */
+public interface PriceInterface {
+
+    public void setId(Integer id);
+    public Integer getId();
+
+    public void setBuyprice(Float buyprice);
+    public Float getBuyprice();
+
+    public void setDateFrom(Date dateFrom);
+    public Date getDateFrom();
+
+    public void setDateTo(Date dateTo);
+
+    public Date getDateTo();
+
+    public void setMarginfix(Float marginfix);
+
+    public Float getMarginfix();
+
+    public void setMarginpercent(Float marginpercent);
+
+    public Float getMarginpercent();
+
+    public void setPeriod(Byte period);
+
+    public Byte getPeriod();
+
+    public void setSellprice(Float sellprice);
+
+    public Float getSellprice();
+
+    public void setListAge(ListAge listAge);
+
+    public ListAge getListAge();
+
+    public void setListCountry(ListCountry listCountry);
+
+    public ListCountry getListCountry();
+
+    public void setListCurrency(ListCurrency listCurrency);
+
+    public ListCurrency getListCurrency();
+
+    public boolean save();
+    public PriceInterface clone();
+
+    public static byte CONST_PERIOD_DAY = 0;
+    public static byte CONST_PERIOD_NIGHT = 1;
+    public static byte CONST_PERIOD_TRIP = 2;
+
+}

=== added file 'src/cbadmin/business/PriceVendorDefault.java'
--- src/cbadmin/business/PriceVendorDefault.java	1970-01-01 00:00:00 +0000
+++ src/cbadmin/business/PriceVendorDefault.java	2011-04-25 18:28:30 +0000
@@ -0,0 +1,161 @@
+package cbadmin.business;
+
+import cbadmin.entity2.Client;
+import cbadmin.entity2.ListCountry;
+import cbadmin.entity2.ListCurrency;
+import cbadmin.entity2.ListService;
+import cbadmin.entity2.ServicePrice;
+import cbadmin.entity2.db_interface;
+import cbadmin.util.CalendarDate;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
+import org.apache.cayenne.exp.ExpressionFactory;
+
+/**
+ * Поиск цен в услугах по-умолчанию
+ * ОГРАНИЧЕНИЕ - не работает поиск цен в случае если периоды меняются на ходу. до этого числа один, с этого другой.
+ * Предполагаем, что периоды установлен на сезон
+ *
+ * если не указана дата рождения или категория возраста
+ * то поднять все на дату начала, создать столько цен сколько найдено
+ * далее интеллект
+ * смотрим когда заканчивается период. Находим более раннюю дату - параметры или период. Считаем до этой даты
+ * выбираем след. дату, поднимаем периоды по условиям
+ * обычно периоды заканчиваются одновременно, поэтому сохраняем результат для других периодов
+ * если цена для этого возрастного периода не найдена, то он отваливается
+ * @author mcseem
+ */
+public class PriceVendorDefault extends PriceVendorProto implements PriceVendorInterface {
+    /**
+     * поиск по параметрам в хеше.
+     * @param params: параметры
+     * <ol>
+     * <li>CONST_PARAM_DATEFROM : Date</li>
+     * <li>CONST_PARAM_DATETO : Date</li>
+     * <li>CONST_PARAM_COUNTRY : ListCountry</li>
+     * <li>CONST_PARAM_LISTSERVICE : ListService</li>
+     * <li>CONST_PARAM_VENDOR : Client</li>
+     * <li>CONST_PARAM_CURRENCY : ListCurrency</li>
+     * <li>[CONST_PARAM_BIRTHDAY : Date]</li>
+     * <li>[CONST_PARAM_AGECATEGORY : Integer]</li>
+     * </ol>
+     * @return float[4] {buy, margin fix, margin %, sell}
+     */
+
+    public Collection<Price> findPrice(HashMap<String, Object> params) {
+        HashMap<Integer, Price> result = new HashMap(); //id возраста и цена, накопленная по этому возрасту
+//        ListService service = (ListService) params.get(CONST_PARAM_LISTSERVICE);
+        CalendarDate datefrom = new CalendarDate(null, (Date) params.get(CONST_PARAM_DATEFROM));
+        if (!isCacheOn) cache.clear(); //будет локальный для текущего запуска
+
+        findPrice(params, result, datefrom, true);  //запускаем обсчет
+        for (Price price : result.values()) price.calcMarginPercent();
+
+        return result.values();
+    }
+
+//------------------------------------------------
+    public void findPrice(HashMap<String, Object> params,
+            HashMap<Integer, Price> result, 
+            CalendarDate datefrom,
+            boolean isFirst) {
+        
+        ListService service = (ListService) params.get(CONST_PARAM_LISTSERVICE);
+        CalendarDate dateto = new CalendarDate(null,(Date) params.get(CONST_PARAM_DATETO));
+        ListCountry country = (ListCountry) params.get(CONST_PARAM_COUNTRY);
+        ListCurrency currency = (ListCurrency) params.get(CONST_PARAM_CURRENCY);
+        Client vendor  = (Client) params.get(CONST_PARAM_VENDOR);
+
+        Date birthday = null;
+        Integer ageCategory = null;
+        if (params.get(CONST_PARAM_BIRTHDAY)!=null) birthday = (Date) params.get(CONST_PARAM_BIRTHDAY);
+        else if(params.get(CONST_PARAM_AGECATEGORY) != null) ageCategory = (Integer) params.get(CONST_PARAM_AGECATEGORY);
+
+        //из дня рождения найти возраст на дату рейса
+        int years = 0;
+        if (birthday!=null) {
+            CalendarDate cd = new CalendarDate(null, birthday);
+            years = cd.monthsUntil(datefrom)/12;
+        }
+
+        Collection<ServicePrice> res = null;
+
+        if (!cache.containsKey(datefrom)) {
+            ArrayList conditions = new ArrayList();
+            conditions.add(ExpressionFactory.greaterOrEqualExp(ServicePrice.DATE_TO_PROPERTY, datefrom.toDate(null)));
+            conditions.add(ExpressionFactory.lessOrEqualExp(ServicePrice.DATE_FROM_PROPERTY, datefrom.toDate(null)));
+            if (service!=null)
+                conditions.add(ExpressionFactory.matchExp(ServicePrice.LIST_SERVICE_PROPERTY, service));
+            if (vendor!=null)
+                conditions.add(ExpressionFactory.matchExp(ServicePrice.VENDOR_PROPERTY, vendor));
+            if (country!=null)
+                conditions.add(ExpressionFactory.matchExp(ServicePrice.LIST_COUNTRY_PROPERTY, country));
+            res = db_interface.queryConditions(ServicePrice.class, conditions); //подняли все цены
+            cache.put(datefrom, res);
+        }
+        else res = cache.get(datefrom);
+
+        //смотрим какие периоды получили
+        HashMap<Integer, PriceInterface> priceFound = new HashMap();
+
+        // из результата поиска выкинуть те, которые не нашлись
+        for (PriceInterface sprice : res) {
+            //интересны только те ценовые периоды, которые есть в ценах. либо все, если это первый проход
+            if (!isFirst)
+                if (!result.containsKey(sprice.getListAge()==null ? null : sprice.getListAge().getId())) continue;
+
+            // из найденных выкинуть те, которые не подходят под условия возраста/категории
+            if (ageCategory!=null) {
+                if (sprice.getListAge()!=null && !sprice.getListAge().isInCategory(ageCategory)) continue;
+            }
+            if (birthday!=null) {
+                    if (sprice.getListAge()!=null && !sprice.getListAge().isInPeriod(years)) continue;
+            }
+
+            priceFound.put(sprice.getListAge()==null ? null : sprice.getListAge().getId(), sprice);
+        }
+
+        //выкидываем цену, для которой не найден из результата функции
+        for (Iterator<Integer> it = result.keySet().iterator(); it.hasNext();) {
+            Integer curr = it.next();
+            if (!priceFound.containsKey(curr)) it.remove();   //удаляем пропавшую цену
+        }
+
+        if (!isFirst && result.isEmpty()) { //для скорости можно уде тут возвращать
+            return;
+        }
+
+        //если цена считается за период и она уже посчитана, то этот ценовой период выкидываем
+        for (Price price : result.values()) {
+            if (price.getPeriod()==PriceInterface.CONST_PERIOD_TRIP) priceFound.remove(price.getListAge().getId());
+        }
+
+        //на текущий момент найденные ценовые периоды соответствуют ценам результата для непервого прохода
+        //поэтому считать надо все, для первого прохода добавлять
+        for (PriceInterface sprice : priceFound.values()) {
+            CalendarDate dateend = dateto;
+            boolean isFinal = true; //нужно ли еще искать периоды для этой цены
+            //пересчитать количество дней, которые действует ценовой период
+            if (sprice.getDateTo().before(dateend.toDate(null))) {
+                dateend = new CalendarDate(null, sprice.getDateTo());
+                isFinal = false;    //нужны еще проходы
+            }
+            int days = datefrom.daysUntil(dateend)+1;
+            if (sprice.getPeriod()==PriceInterface.CONST_PERIOD_NIGHT && isFinal) days--;  //ночей на одну меньше
+            if (sprice.getPeriod()==PriceInterface.CONST_PERIOD_TRIP) days=1;  //одна штука
+            //в случае если нужно искать еще, то посчитать ночь между этим периодом и следующим
+            addPrice(result, sprice, days, currency, isFirst);
+
+            CalendarDate cdnext = dateend.addDays(1);   //следующая дата
+            if (!cdnext.isAfter(dateto))  {   //добираем
+                findPrice(params, result, cdnext, false);
+            }
+        }
+        return;     //всё обсчитали
+    }
+
+}
+//282
\ No newline at end of file

=== added file 'src/cbadmin/business/PriceVendorFlight.java'
--- src/cbadmin/business/PriceVendorFlight.java	1970-01-01 00:00:00 +0000
+++ src/cbadmin/business/PriceVendorFlight.java	2011-04-25 18:28:30 +0000
@@ -0,0 +1,237 @@
+package cbadmin.business;
+
+import cbadmin.entity2.Block;
+import cbadmin.entity2.Flight;
+import cbadmin.entity2.ListClass;
+import cbadmin.entity2.ListCurrency;
+import cbadmin.entity2.Offer;
+import cbadmin.entity2.db_interface;
+import cbadmin.util.CalendarDate;
+import cbadmin.util.CurrencyMgr;
+import cbadmin.util.utils;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import org.apache.cayenne.exp.ExpressionFactory;
+
+
+/**
+ * поиск по предложениям на перелет
+ * @author mcseem
+ */
+public class PriceVendorFlight implements PriceVendorInterface {
+
+    /**
+     * поиск подходящей цены по параметрам
+     * @param params: параметры
+     * <ol>
+     * <li>CONST_PARAM_FLIGHTFROM : Flight</li>
+     * <li>CONST_PARAM_CLASSFROM : ListClass</li>
+     * <li>CONST_PARAM_FLIGHTTO : Flight</li>
+     * <li>CONST_PARAM_CLASSTO : ListClass</li>
+     * <li>CONST_PARAM_BIRTHDAY : Date</li>
+     * <li>CONST_PARAM_CURRENCY : ListCurrency</li>
+     * </ol>
+     * @return float[4] {buy, margin fix, margin %, sell}
+     */
+    public Collection<Price> findPrice(HashMap<String, Object> params) {
+        List<Price> result = new ArrayList();
+        Flight flightfrom = (Flight) params.get(CONST_PARAM_FLIGHTFROM);
+        Flight flightto = (Flight) params.get(CONST_PARAM_FLIGHTTO);
+        ListClass classfrom = (ListClass) params.get(CONST_PARAM_CLASSFROM);
+        ListClass classto = (ListClass) params.get(CONST_PARAM_CLASSTO);
+        Date birthday = (Date) params.get(CONST_PARAM_BIRTHDAY);
+        ListCurrency currency = (ListCurrency) params.get(CONST_PARAM_CURRENCY);
+
+        if (birthday==null) {
+            utils.getLogger().debug(this.getClass().getName()+": birthday is null. returning");
+            return result;
+        }
+
+        Price price = getPrice(birthday, flightfrom, flightto, classfrom, classto, currency);
+        if (price!=null) result.add(price);
+//        else utils.getLogger().debug("PriceVendorFlight.findPrice: price found=" + price.getSellPrice().doubleValue());
+        return result;
+    }
+
+    
+    private Price getPrice(Date birthday, Flight flightfrom, Flight flightto, ListClass classfrom, ListClass classto,
+            ListCurrency currency) {
+        boolean pricefound = false; //хоть какая-то цена найдена
+
+        //получить цены ================================================
+        //взять возраст
+        int age = 0;
+        CalendarDate cd = new CalendarDate(null, birthday);
+
+        CalendarDate cdNow = new CalendarDate(null, new Date());
+        //ориентиреумся на дату вылета/возврата/сегодня
+        if (flightfrom!=null || flightto==null)
+            cdNow = new CalendarDate(null, flightfrom != null ? flightfrom.getDateFrom() : flightto.getDateFrom());
+
+        CalendarDate cd2 = cdNow.addMonths(-2 * 12);
+        CalendarDate cd12 = cdNow.addMonths(-12 * 12);
+        if (cd.isBefore(cd12)) {
+            age = AGE_ADT;
+        } else if (cd.isBefore(cd2)) {
+            age = AGE_CHD;
+        } else {
+            age = AGE_INF;
+        }
+        utils.getLogger().debug("PriceVendorFlight: age=" + age);
+        Price result = new Price();
+
+        float price1 = 0;
+        float price2 = 0;
+        float price3 = 0;
+        float priceFinal = 0;
+        List conditions = null;
+        List<Offer> offers = null;
+        if (flightfrom != null) {
+            //для начала вылет
+            conditions = new ArrayList();
+            conditions.add(ExpressionFactory.matchExp(Offer.DELETEDATE_PROPERTY, null));
+            conditions.add(ExpressionFactory.matchExp(Offer.FLIGHT_BY_ID_FLIGHTTHERE_PROPERTY, flightfrom));
+            conditions.add(ExpressionFactory.matchExp(Offer.FLIGHT_BY_ID_FLIGHTBACK_PROPERTY, null));
+            //класс прописываем
+            if (classfrom.getParentClass() == null) {
+                conditions.add(ExpressionFactory.matchExp(Offer.LIST_CLASS_PROPERTY, classfrom));
+            } else {
+                conditions.add(ExpressionFactory.matchExp(Offer.LIST_CLASS_PROPERTY, Block.load(Block.CLASS_DEFAULT_ID)));
+            }
+            offers = db_interface.queryConditions(Offer.class, conditions);
+            if (!offers.isEmpty()) {
+                //есть вылет
+                try {
+                    if (age == AGE_INF)
+                        price1 = (float) CurrencyMgr.convert(utils.isFNull((offers.get(0)).getPrice13()),
+                                offers.get(0).getListCurrency(), currency, new Date());
+                    else if (age == AGE_CHD)
+                        price1 = (float) CurrencyMgr.convert(utils.isFNull((offers.get(0)).getPrice12()),
+                                offers.get(0).getListCurrency(), currency, new Date());
+                    else
+                        price1 = (float) CurrencyMgr.convert(utils.isFNull((offers.get(0)).getPrice11()),
+                                offers.get(0).getListCurrency(), currency, new Date());
+                    
+                    pricefound = true;
+                } catch (Exception ex) {
+                    utils.getLogger().error("Cannot convert currency", ex);
+                }
+            }
+        }
+        if (flightto != null) {
+            //теперь возврат
+            conditions = new ArrayList();
+            conditions.add(ExpressionFactory.matchExp(Offer.DELETEDATE_PROPERTY, null));
+            conditions.add(ExpressionFactory.matchExp(Offer.FLIGHT_BY_ID_FLIGHTTHERE_PROPERTY, flightto));
+            conditions.add(ExpressionFactory.matchExp(Offer.FLIGHT_BY_ID_FLIGHTBACK_PROPERTY, null));
+            //класс прописываем
+            if (classto.getParentClass() == null) {
+                conditions.add(ExpressionFactory.matchExp(Offer.LIST_CLASS_PROPERTY, classto));
+            } else {
+                conditions.add(ExpressionFactory.matchExp(Offer.LIST_CLASS_PROPERTY, Block.load(Block.CLASS_DEFAULT_ID)));
+            }
+            offers = db_interface.queryConditions(Offer.class, conditions);
+            if (!offers.isEmpty()) {
+                //есть возврат
+                try {
+                    if (age == AGE_INF)
+                        price2 = (float) CurrencyMgr.convert(utils.isFNull((offers.get(0)).getPrice13()),
+                                offers.get(0).getListCurrency(), currency, new Date());
+                    else if (age == AGE_CHD)
+                        price2 = (float) CurrencyMgr.convert(utils.isFNull((offers.get(0)).getPrice12()),
+                                offers.get(0).getListCurrency(), currency, new Date());
+                    else
+                        price2 = (float) CurrencyMgr.convert(utils.isFNull((offers.get(0)).getPrice11()),
+                                offers.get(0).getListCurrency(), currency, new Date());
+
+                    pricefound = true;
+                } catch (Exception ex) {
+                    utils.getLogger().error("Cannot convert currency", ex);
+                }
+
+            }
+        }
+        if (flightfrom != null && flightto != null) {
+            //теперь всё вместе
+            conditions = new ArrayList();
+            conditions.add(ExpressionFactory.matchExp(Offer.DELETEDATE_PROPERTY, null));
+            conditions.add(ExpressionFactory.matchExp(Offer.FLIGHT_BY_ID_FLIGHTTHERE_PROPERTY, flightfrom));
+            conditions.add(ExpressionFactory.matchExp(Offer.FLIGHT_BY_ID_FLIGHTBACK_PROPERTY, flightto));
+            //класс прописываем
+            if (classfrom.getParentClass() == null) {
+                conditions.add(ExpressionFactory.matchExp(Offer.LIST_CLASS_PROPERTY, classfrom));
+            } else {
+                conditions.add(ExpressionFactory.matchExp(Offer.LIST_CLASS_PROPERTY, Block.load(Block.CLASS_DEFAULT_ID)));
+            }
+            if (classto.getParentClass() == null) {
+                conditions.add(ExpressionFactory.matchExp(Offer.LIST_CLASS_PROPERTY, classto));
+            } else {
+                conditions.add(ExpressionFactory.matchExp(Offer.LIST_CLASS_PROPERTY, Block.load(Block.CLASS_DEFAULT_ID)));
+            }
+            offers = db_interface.queryConditions(Offer.class, conditions);
+            if (!offers.isEmpty()) {
+                //есть возврат
+                try {
+                    if (age == AGE_INF)
+                        price3 = (float) CurrencyMgr.convert(utils.isFNull((offers.get(0)).getPrice13()),
+                                offers.get(0).getListCurrency(), currency, new Date());
+                    else if (age == AGE_CHD)
+                        price3 = (float) CurrencyMgr.convert(utils.isFNull((offers.get(0)).getPrice12()),
+                                offers.get(0).getListCurrency(), currency, new Date());
+                    else
+                        price3 = (float) CurrencyMgr.convert(utils.isFNull((offers.get(0)).getPrice11()),
+                                offers.get(0).getListCurrency(), currency, new Date());
+
+                    pricefound = true;
+                } catch (Exception ex) {
+                    utils.getLogger().error("Cannot convert currency", ex);
+                }
+
+            }
+        }
+        if (flightfrom != null && flightto != null) {
+            //если классы отличаются
+            if (!classfrom.getId().equals(classto.getId())) {
+                priceFinal = price1 + price2;
+                if (flightfrom != null && price1 == 0) {
+                    utils.getLogger().debug("PriceVendorFlight: no price FROM");
+                }
+                if (flightto != null && price2 == 0) {
+                    utils.getLogger().debug("PriceVendorFlight: no price BACK");
+                }
+                
+            } else {
+                priceFinal = price3;
+            }
+        } else {
+            priceFinal = price1 + price2;
+            if (flightfrom != null && price1 == 0) {
+                utils.getLogger().debug("PriceVendorFlight: no price FROM");
+            }
+            if (flightto != null && price2 == 0) {
+                utils.getLogger().debug("PriceVendorFlight: no price BACK");
+            }
+        }
+        result.setSellPrice(new Money(priceFinal));
+        if (pricefound) {
+            utils.getLogger().debug("PriceVendorFlight: price found="+priceFinal);
+            return result;
+        } else {
+            utils.getLogger().debug("PriceVendorFlight: no price found");
+            return null;
+        }
+    }
+
+    public void setCacheMode(boolean cacheOn) {
+        //ничего не  будем делать кеширование здесь не нужно
+//        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    private int AGE_INF = 1;
+    private int AGE_CHD = 2;
+    private int AGE_ADT = 3;
+
+}

=== added file 'src/cbadmin/business/PriceVendorInterface.java'
--- src/cbadmin/business/PriceVendorInterface.java	1970-01-01 00:00:00 +0000
+++ src/cbadmin/business/PriceVendorInterface.java	2011-04-25 18:28:30 +0000
@@ -0,0 +1,54 @@
+package cbadmin.business;
+
+import java.util.Collection;
+import java.util.HashMap;
+
+/**
+ * интерфейс для поиска цены. для поиска каждой услуги параметры свои
+ * @author mcseem
+ */
+public interface PriceVendorInterface {
+//    public float[] findPrice(Object... params);
+    public Collection<Price> findPrice(HashMap<String, Object> params);
+    public void setCacheMode(boolean cacheOn);
+
+    //для унификации введем ряд параметров. соответствующих текущим объектам системы и поиска
+    public static String CONST_PARAM_DATEFROM = "datefrom";
+    public static String CONST_PARAM_DATETO = "dateto";
+    public static String CONST_PARAM_FLIGHTFROM = "flightfrom";
+    public static String CONST_PARAM_FLIGHTTO = "flightto";
+    public static String CONST_PARAM_CLASSFROM = "classfrom";
+    public static String CONST_PARAM_CLASSTO = "classto";
+    public static String CONST_PARAM_COUNTRY = "country";
+    public static String CONST_PARAM_CITY = "city";
+    public static String CONST_PARAM_CITYFROM = "cityfrom"; //TRF
+    public static String CONST_PARAM_CITYTO = "cityto";     //TRF
+
+    public static String CONST_PARAM_BIRTHDAY = "birthday";
+    public static String CONST_PARAM_LENGTH = "length";
+    public static String CONST_PARAM_VENDOR = "vendor";
+    public static String CONST_PARAM_EXTRABED = "extrabed";
+    public static String CONST_PARAM_POSITION = "position"; //позиция в номере
+    public static String CONST_PARAM_CURRENCY = "currency";
+    public static String CONST_PARAM_AGECATEGORY = "age";   //категория возраста
+    public static String CONST_PARAM_HOTEL = "hotel";
+    public static String CONST_PARAM_ROOMTYPE = "roomtype";
+    public static String CONST_PARAM_MEALTYPE = "mealtype";
+    public static String CONST_PARAM_CATEGORY = "category";
+    public static String CONST_PARAM_LISTSERVICE = "listservice";   //текущий тип услуги
+    public static String CONST_PARAM_LISTAGE = "ageid";     //текущий возраст. нужен в редких случаях для поиска конкретной цены
+                                                            //идет в споффер
+    
+    public static Integer CONST_AGECATEGORY_INFANT = 0;   //удалить, если не используется
+    public static Integer CONST_AGECATEGORY_CHILD = 1;
+    public static Integer CONST_AGECATEGORY_ADULT = 2;
+    public static Integer CONST_AGECATEGORY_ADTCHD = 3;
+
+
+    public static String CONST_PARAM_PRICEID = "prcid";   //ID цены для восстановления деталей. идет в споффер
+    public static String CONST_PARAM_NODEEPLOOKUP = "nolookup";   //если не надо искать цены по усложненным алгоритмам
+        //нужно для предотвращения зацикливания, например в проживаниях и доплатах на питание
+
+
+
+}

=== added file 'src/cbadmin/business/PriceVendorProto.java'
--- src/cbadmin/business/PriceVendorProto.java	1970-01-01 00:00:00 +0000
+++ src/cbadmin/business/PriceVendorProto.java	2011-04-25 18:28:30 +0000
@@ -0,0 +1,92 @@
+package cbadmin.business;
+
+import cbadmin.entity2.ListCurrency;
+import cbadmin.util.CalendarDate;
+import cbadmin.util.CurrencyMgr;
+import cbadmin.util.utils;
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashMap;
+
+/**
+ * базовый класс для вендоров цен. общие методы
+ * @author mcseem
+ */
+abstract public class PriceVendorProto {
+
+    /**
+     * добавить цену. Проценты не высчитываются, они должны в конце определиться
+     * @param result    - хеш с ценами
+     * @param sprice    - найденный ценовой период
+     * @param count     - количество дней или ночей
+     * @param currency  - валюта, к кторой привети, либо null если не приводить
+     * @param create    - нужно ли создавать запись, или пользоваться только существующими
+     */
+    protected void addPrice(HashMap<Integer, Price> result, PriceInterface sprice, int count,  ListCurrency currency, boolean create) {
+//        utils.getLogger().debug("addPrice: count="+count+" buyprice="+sprice.getBuyprice());
+        Price price = result.get(sprice.getListAge()==null ? null : sprice.getListAge().getId());
+        if (price==null && !create) return; //не надо создавать
+        if (price==null) {
+//            utils.getLogger().debug("create new price");
+            price = new Price();
+            price.setPeriod(sprice.getPeriod());
+            price.setListAge(sprice.getListAge());
+            price.setId(sprice.getId());
+            result.put(sprice.getListAge()==null ? null : sprice.getListAge().getId(), price);
+        }
+        try {
+            price.getBuyPrice().addSet(count*CurrencyMgr.convert(sprice.getBuyprice(), sprice.getListCurrency(), currency, new Date()));
+            price.getMarginFix().addSet(count*CurrencyMgr.convert(sprice.getMarginfix(), sprice.getListCurrency(), currency, new Date()));
+            price.getSellPrice().addSet(count*CurrencyMgr.convert(sprice.getSellprice(), sprice.getListCurrency(), currency, new Date()));
+        } catch (Exception ex) {
+            utils.getLogger().debug("Cannot convert currency", ex);
+        }
+//        utils.getLogger().debug("addPrice: buyprice="+price.getBuyPrice().toString());
+    }
+
+    protected void addPrice(HashMap<Integer, Price> result, Price sprice, boolean create) {
+        if (sprice==null) {
+//            utils.getLogger().debug("addPrice sprice=null");
+            return;
+        }
+//        utils.getLogger().debug("addPrice: count="+count+" buyprice="+sprice.getBuyprice());
+        Price price = result.get(sprice.getListAge()==null ? null : sprice.getListAge().getId());
+        if (price==null && !create) {
+//            utils.getLogger().debug("addPrice price=null, create=false");
+            return;
+        } //не надо создавать
+        if (price==null) {
+//            utils.getLogger().debug("create new price");
+            price = new Price();
+            price.setPeriod(sprice.getPeriod());
+            price.setListAge(sprice.getListAge());
+            price.setId(sprice.getId());
+//            result.put(sprice.getListAge()==null ? null : sprice.getListAge().getId(), price);
+        }
+            price.getBuyPrice().addSet(sprice.getBuyPrice());
+            price.getMarginFix().addSet(sprice.getMarginFix());
+            price.getSellPrice().addSet(sprice.getSellPrice());
+            result.put(sprice.getListAge()==null ? null : sprice.getListAge().getId(), price);
+//            utils.getLogger().debug("addPrice done result contains "+result.get(sprice.getListAge()==null ? null : sprice.getListAge().getId()).getSellPrice().doubleValue());
+//        utils.getLogger().debug("addPrice: buyprice="+price.getBuyPrice().toString());
+    }
+
+
+    public void setCacheMode(boolean cacheOn) {
+        isCacheOn = cacheOn;
+        if (isCacheOn) {    //входим в режим кеширования
+            //подтянуть все цены,
+        }
+        else {
+            utils.getContext().getQueryCache().removeGroup(CONST_CACHE_GROUP);
+            cache.clear();
+        }
+    }
+
+    private final static String CONST_CACHE_GROUP="price";
+
+    protected boolean isCacheOn = false;
+    protected HashMap<CalendarDate, Collection> cache = new HashMap();
+
+
+}

=== added file 'src/cbadmin/business/ReporterInterface.java'
--- src/cbadmin/business/ReporterInterface.java	1970-01-01 00:00:00 +0000
+++ src/cbadmin/business/ReporterInterface.java	2011-04-25 18:28:30 +0000
@@ -0,0 +1,49 @@
+package cbadmin.business;
+
+import cbadmin.entity2.Reservation;
+import java.util.Collection;
+
+/**
+ * Интерфейс для тех, кто строит собственную отчетность
+ * В первую очередь для счетов и подтверждений
+ * @author mcseem
+ */
+public interface ReporterInterface {
+    /**
+     * получить список функциональности, поддерживаемой имплементатором
+     * @return список строковых констант
+     */
+    Collection<Functional> getFunctionality();
+    /**
+     * создать счет
+     * @param res - заявка
+     * @return путь к файлу с созданным счетом
+     * @throws Exception в случае проблем, если результат не получился
+     */
+    String createInvoice(Reservation res) throws Exception;
+    /**
+     * создать счет для отправки по email
+     * @param res - заявка
+     * @return - путь к файлу шаблона
+     * @throws Exception в случае проблем, если результат не получился
+     */
+    String createInvoiceEmail(Reservation res) throws Exception;
+    /**
+     * создать подтверждение бронирования (лист бронирования)
+     * @param res - заявка
+     * @return - путь к файлу шаблона
+     * @throws Exception в случае проблем, если результат не получился
+     */
+    String createAccept(Reservation res) throws Exception;
+    /**
+     * создать подтверждение бронирования (лист бронирования) для отправки по email
+     * @param res - заявка
+     * @return - путь к файлу шаблона
+     * @throws Exception в случае проблем, если результат не получился
+     */
+    String createAcceptEmail(Reservation res) throws Exception;
+
+    public enum Functional {
+        INVOICE, INVOICE_EMAIL, ACCEPT, ACCEPT_EMAIL
+    }
+}

=== added file 'src/cbadmin/business/xlsbuilder.java'
--- src/cbadmin/business/xlsbuilder.java	1970-01-01 00:00:00 +0000
+++ src/cbadmin/business/xlsbuilder.java	2011-04-25 18:28:30 +0000
@@ -0,0 +1,572 @@
+package cbadmin.business;
+
+import cbadmin.entity2.ListCity;
+import cbadmin.entity2.ListCurrency;
+import cbadmin.entity2.Passenger;
+import cbadmin.entity2.Payment;
+import java.util.Collection;
+import java.util.List;
+import cbadmin.entity2.Reservation;
+import cbadmin.entity2.Service;
+
+import cbadmin.entity2.db_interface;
+import cbadmin.util.PropertiesMgr;
+import cbadmin.util.utils;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import javax.swing.JOptionPane;
+import net.sf.jasperreports.engine.JasperFillManager;
+import net.sf.jasperreports.engine.JasperPrint;
+import net.sf.jasperreports.engine.JasperReport;
+import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
+import net.sf.jasperreports.engine.export.JRXlsExporter;
+import net.sf.jasperreports.engine.export.JRXlsExporterParameter;
+import net.sf.jasperreports.engine.util.JRLoader;
+import net.sf.jxls.exception.ParsePropertyException;
+import net.sf.jxls.transformer.XLSTransformer;
+import org.apache.cayenne.exp.Expression;
+import org.apache.cayenne.exp.ExpressionFactory;
+import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
+import plugins.core.impl.CorePluginImpl;
+
+/**
+ *
+ * @author mcseem
+ */
+public class xlsbuilder implements ReporterInterface{
+
+
+//-------------------------------------------------
+//ReporterInterface
+    public Collection<Functional> getFunctionality() {
+        HashSet<ReporterInterface.Functional> funcs = new HashSet();
+        funcs.add(Functional.ACCEPT);
+        funcs.add(Functional.ACCEPT_EMAIL);
+        funcs.add(Functional.INVOICE);
+        funcs.add(Functional.INVOICE_EMAIL);
+        return funcs;
+    }
+
+    public String createInvoice(Reservation res) throws Exception {
+        return createInvoice(res, null);
+    }
+
+    public String createInvoiceEmail(Reservation res) throws Exception {
+        String source = PropertiesMgr.getInvoiceReport();   //файл для отчета
+        return createInvoice(res, source);
+    }
+
+    public String createAcceptEmail(Reservation res) throws Exception {
+        return createAccept(res);
+    }
+//-------------------------------------------------
+
+
+   /**
+    * Создание подтверждение бронирования
+    * @param reservation
+    * @return путь к файлу
+    * @throws Exception
+    */
+    public String createAccept( Reservation reservation ) throws Exception {
+        utils.getLogger().debug("Start createXLSaccept");
+        String baseDirectory = PropertiesMgr.getReportFolder();
+        String outDirectory = PropertiesMgr.getTempFolder();
+        String source = PropertiesMgr.getAcceptReport();   //файл для отчета
+        String xlsSource = baseDirectory + "/" + source;
+        String xlsDest = outDirectory + "/" + reservation.getId().toString()+"_" + source;
+
+        Map beans = new HashMap();
+
+        List vals=new java.util.ArrayList();
+
+        //скидку выставим
+        if (reservation.getDiscount()==null) {reservation.setDiscount(new Integer(0));}
+
+        //получим бронь
+        beans.put("reservation", reservation);
+
+        //получить пассажиров
+        //перекачать в список
+        for (Passenger pass : reservation.getPassengers()) {
+            if (pass.getDeletedate()!=null) {continue;} //без удаленных
+            pass.processCustomFields();
+            vals.add(pass); 
+        }
+
+        beans.put("passenger", vals);
+
+      //получить все комбинации рейсов из туристов
+      //список туристов с уникальными рейсами
+      List uniqueFPass=new java.util.ArrayList();
+        for (int i = 0; i < vals.size(); i++) {
+            Passenger pass = (Passenger) vals.get(i);
+            boolean dup = false;
+            for (int j = 0; j < uniqueFPass.size(); j++) {    //для каждого юника
+                Passenger passUnique = (Passenger) uniqueFPass.get(j);
+
+                if (pass.getFlightByIdFlightthere() == passUnique.getFlightByIdFlightthere()
+                        && pass.getFlightByIdFlightback() == passUnique.getFlightByIdFlightback()
+                        && pass.getCalculatedClassthere() == passUnique.getCalculatedClassthere()
+                        && pass.getCalculatedClassback() == passUnique.getCalculatedClassback()
+                        ) {
+                    dup = true;   //дубликат найден
+                    continue;
+                }
+            }
+            if (!dup) {   //нет дубликата
+                uniqueFPass.add(pass);
+            }
+        }
+        beans.put("passflight", uniqueFPass);
+        utils.getLogger().info("CITY: "+reservation.getForeignCity());
+        beans.put("citythereto", reservation.getForeignCity());
+
+        //получить все остальные услуги. уникалить по названию и датам
+        List<Service> services = new ArrayList();
+
+        for(Service serv : reservation.getServices()) {
+            Integer servid = serv.getListService().getId();
+            //берем услуги, не связанные с пассажирами
+            if (serv.getPassenger()==null &&
+                !servid.equals(PropertiesMgr.getServiceAvia())) {
+                //нашли остальную услугу
+
+                services.add(serv);
+            }
+        }
+        beans.put("otherServices", services);
+
+        //получить валюту брони
+        ListCurrency cur=reservation.getListCurrency();
+        beans.put("currency", cur);
+
+        XLSTransformer transformer = new XLSTransformer();
+        transformer.transformXLS(xlsSource, beans, xlsDest);
+//      recalcXLS(xlsDest);  //обновление формул
+
+        return xlsDest;
+   }
+
+   /**
+    * Создание счета
+    * использует invoiceReport, reportFolder, tempFolder, xlspreview
+    * @param id_reservation ID брони
+    * @param templateName файл с шаблоном (опционально)
+    * @return
+    * @throws java.lang.Exception
+    */
+    private String createInvoice(Reservation reservation, String templateName) throws Exception {
+        utils.getLogger().debug("Start createXLSinvoice");
+
+        String baseDirectory = PropertiesMgr.getReportFolder();
+        String outDirectory = PropertiesMgr.getTempFolder();
+        String source = PropertiesMgr.getInvoiceNostampReport();   //файл для отчета
+        if (templateName!=null) source = templateName;
+
+
+        String xlsSource = baseDirectory + "/" + source;
+        String xlsDest = outDirectory + "/" + reservation.getId().toString()+"_" + source;
+
+        Map beans = new HashMap();
+        List vals = new java.util.ArrayList();
+        ListCity cityto = null;
+
+        Integer itemcount = new Integer(0);
+        //получить пассажиров
+        //перекачать в список
+        for (Passenger pass : reservation.getPassengers()) {
+            if (pass.getDeletedate() != null) { continue;  } //без удаленных
+//            if (pass.getFlightByIdFlightthere() == null) { continue;  } //без рейсов
+            vals.add(pass);
+            itemcount++;
+        }
+
+        Integer totalsum = new Integer(new Float(reservation.getSummaReserved()).intValue());
+        beans.put("totalsum", totalsum);
+        beans.put("itemcount", itemcount);
+        beans.put("reservation", reservation);
+
+        //получить все комбинации рейсов из туристов
+        //список туристов с уникальными рейсами
+        List uniqueFPass = new java.util.ArrayList();
+        for (int i = 0; i < vals.size(); i++) {
+            Passenger pass = (Passenger) vals.get(i);
+            pass.processCustomFields();
+            boolean dup = false;
+            for (int j = 0; j < uniqueFPass.size(); j++) {    //для каждого юника
+                Passenger passUnique = (Passenger) uniqueFPass.get(j);
+//                passUnique.processCustomFields();
+                
+                if (pass.getFlightByIdFlightthere() == passUnique.getFlightByIdFlightthere() &&
+                    pass.getFlightByIdFlightback() == passUnique.getFlightByIdFlightback() &&
+                    pass.getPriceFlight()==passUnique.getPriceFlight() &&
+                    pass.getTicketName().equals(passUnique.getTicketName())
+                    ) {
+                    passUnique.setCount(passUnique.getCount()+1);
+                    dup = true;   //дубликат найден
+                }
+            }
+            if (!dup) {   //нет дубликата
+                pass.setCount(1);
+                uniqueFPass.add(pass);   //добавляем пассажира
+            }
+        }
+        beans.put("passflight", uniqueFPass);
+        beans.put("citythereto", reservation.getForeignCity());
+
+        //получить валюту брони
+        ListCurrency cur = reservation.getListCurrency();
+        beans.put("currency", cur);
+
+        XLSTransformer transformer = new XLSTransformer();
+        transformer.transformXLS(xlsSource, beans, xlsDest);
+//      recalcXLS(xlsDest);  //обновление формул
+
+        return xlsDest;
+    }
+
+
+   /**
+    * Создание приходного ордера
+    * @param payment - оплата
+    * @return путь к файлу
+    * @throws Exception
+    */
+    public static String createXLSkassaIn( Payment payment ) throws Exception {
+        utils.getLogger().debug("Start createXLSkassaIn");
+
+        String source = PropertiesMgr.getProperty(PROP_KASSAIN_REPORT, DEFAULT_KASSAIN_REPORT);   //файл для отчета
+        if (source.equals(DEFAULT_KASSAIN_REPORT)) {
+            if (!utils.extractResource("plugins/core/"+source, PropertiesMgr.getReportFolder()+"/"+source)) {
+                utils.getLogger().error(CorePluginImpl.PLUGIN_NAME+": cannot extract resource plugins/core/"+source);
+                throw new Exception("Не найден файл с шаблоном");
+            }
+        }
+
+        String baseDirectory = PropertiesMgr.getReportFolder();
+        String outDirectory = PropertiesMgr.getTempFolder();
+        String xlsSource = baseDirectory + "/" + source;
+        String xlsDest = outDirectory + "/" + payment.getId().toString()+"_" + source;
+
+        Map beans = new HashMap();
+        beans.put("reservation", payment.getReservation());
+        beans.put("payment", payment);
+
+        XLSTransformer transformer = new XLSTransformer();
+        transformer.transformXLS(xlsSource, beans, xlsDest);
+//      recalcXLS(xlsDest);  //обновление формул
+
+        return xlsDest;
+   }
+
+   /**
+    * Создание расходного ордера
+    * @param payment - оплата
+    * @return путь к файлу
+    * @throws Exception
+    */
+    public static String createXLSkassaOut( Payment payment ) throws Exception {
+        utils.getLogger().debug("Start createXLSkassaOut");
+
+        String source = PropertiesMgr.getProperty(PROP_KASSAOUT_REPORT, DEFAULT_KASSAOUT_REPORT);   //файл для отчета
+        if (source.equals(DEFAULT_KASSAOUT_REPORT)) {
+            if (!utils.extractResource("plugins/core/"+source, PropertiesMgr.getReportFolder()+"/"+source)) {
+                utils.getLogger().error(CorePluginImpl.PLUGIN_NAME+": cannot extract resource plugins/core/"+source);
+                throw new Exception("Не найден файл с шаблоном");
+            }
+        }
+
+        String baseDirectory = PropertiesMgr.getReportFolder();
+        String outDirectory = PropertiesMgr.getTempFolder();
+        String xlsSource = baseDirectory + "/" + source;
+        String xlsDest = outDirectory + "/" + payment.getId().toString()+"_" + source;
+
+        Map beans = new HashMap();
+        beans.put("reservation", payment.getReservation());
+        beans.put("payment", payment);
+
+        XLSTransformer transformer = new XLSTransformer();
+        transformer.transformXLS(xlsSource, beans, xlsDest);
+//      recalcXLS(xlsDest);  //обновление формул
+
+        return xlsDest;
+   }
+
+
+    /**
+     * создать отчет по пассажирам на направлении (гор.вылета/гор.возврата/дата)
+     * @param cityfrom
+     * @param cityto
+     * @param datefrom
+     * @return  путь к файлу
+     * @throws Exception
+     */
+    public static String createXLSflightlistdirection( ListCity cityfrom, ListCity cityto, Date datefrom) throws Exception {
+        utils.getLogger().debug("Start createXLSflightlistdirection");
+
+        String baseDirectory = PropertiesMgr.getReportFolder();
+        String outDirectory = PropertiesMgr.getTempFolder();
+        String source = PropertiesMgr.getFlightlistdirReport();   //файл для отчета
+
+        String name="";
+        if (cityfrom!=null) name+=cityfrom.getId().toString()+"_";
+        else name+="__";
+        if (cityto!=null) name+=cityto.getId().toString()+"_";
+        else name+="__";
+
+        String xlsSource = baseDirectory + "/" + source;
+        String xlsDest = outDirectory + "/" + name + source;
+
+        Map beans = new HashMap();
+
+        List vals=new java.util.ArrayList();
+
+        //получим бронь
+        if (cityfrom!=null) beans.put("cityfrom", cityfrom);
+        if (cityto!=null) beans.put("cityto", cityto);
+        beans.put("datefrom", datefrom);
+
+        //рейсы на вылет --------------------------------
+        List conditions = new ArrayList();
+            conditions.add(ExpressionFactory.matchExp("deletedate", null)); //пассажир не удален
+
+        List subconditions = new ArrayList();
+            subconditions.add(ExpressionFactory.matchExp("flightByIdFlightthere+.deletedate", null));   //рейс не удален
+        if (datefrom != null)
+            subconditions.add(ExpressionFactory.matchExp("flightByIdFlightthere+.dateFrom", datefrom));
+        if (cityfrom != null)
+            subconditions.add(ExpressionFactory.matchExp("flightByIdFlightthere+.listAirportByIdAirportFrom+.listCity", cityfrom));
+        if (cityto != null)
+            subconditions.add(ExpressionFactory.matchExp("flightByIdFlightthere+.listAirportByIdAirportTo+.listCity", cityto));
+            Expression qual = ExpressionFactory.joinExp(Expression.AND, subconditions);
+
+        subconditions = new ArrayList();
+            subconditions.add(ExpressionFactory.matchExp("flightByIdFlightback+.deletedate", null));   //рейс не удален
+        if (datefrom != null)
+            subconditions.add(ExpressionFactory.matchExp("flightByIdFlightback+.dateFrom", datefrom));
+        if (cityfrom != null)
+            subconditions.add(ExpressionFactory.matchExp("flightByIdFlightback+.listAirportByIdAirportFrom+.listCity", cityfrom));
+        if (cityto != null)
+            subconditions.add(ExpressionFactory.matchExp("flightByIdFlightback+.listAirportByIdAirportTo+.listCity", cityto));
+            Expression qual2 = ExpressionFactory.joinExp(Expression.AND, subconditions);
+        subconditions = new ArrayList();
+        subconditions.add(qual);
+        subconditions.add(qual2);
+        Expression qual3 = ExpressionFactory.joinExp(Expression.OR, subconditions);
+        conditions.add(qual3);
+        
+        List<Passenger> resFrom = db_interface.queryConditions(Passenger.class, conditions);
+
+        //получить пассажиров на вылет
+        for (Passenger pass : resFrom) {
+            pass.processCustomFields();
+            vals.add(pass); }
+
+        beans.put("passenger", vals);
+
+        XLSTransformer transformer = new XLSTransformer();
+        transformer.transformXLS(xlsSource, beans, xlsDest);
+//      recalcXLS(xlsDest);  //обновление формул
+
+        return xlsDest;
+   }
+
+    /**
+     * пересчет всех формул в файле
+     * @param path
+     * @throws java.io.FileNotFoundException
+     * @throws java.io.IOException
+     */
+//   public static void recalcXLS(String path) throws FileNotFoundException, IOException {
+//      FileInputStream fis = new FileInputStream(path);
+//      HSSFWorkbook wb = new HSSFWorkbook(fis); //or new XSSFWorkbook("/somepath/test.xls")
+//      HSSFFormulaEvaluator evaluator = new HSSFFormulaEvaluator(wb);
+//      for (int sheetNum = 0; sheetNum < wb.getNumberOfSheets(); sheetNum++) {
+//         HSSFSheet sheet = wb.getSheetAt(sheetNum);
+//
+//         for (Iterator<HSSFRow> it = sheet.rowIterator(); it.hasNext();) {
+//            HSSFRow r = it.next();
+//            for (Iterator<HSSFCell> it2 = r.cellIterator(); it2.hasNext();) {
+//               HSSFCell c = it2.next();
+//               if (c.getCellType() == HSSFCell.CELL_TYPE_FORMULA) {
+//                  evaluator.evaluateFormulaCell(c);
+//               }
+//            }
+//         }
+//      }
+//      wb.write(new FileOutputStream(path));
+//   }
+
+
+
+    /**
+     * печать счета в картинку
+     * использует invoiceNostampReport, xlsPrintCommand, xlsPrintExtension, reportFolder, tempFolder
+     * @param id_reservation
+     * @return путь к картинке
+     * @throws Exception
+     */
+    public static String printXLS(String res) throws Exception {
+//        String source = PropertiesMgr.getInvoiceReport();   //файл для отчета
+//        String res = createXLSinvoice(id_reservation, source);
+
+        String xlsprint = PropertiesMgr.getXlsPrintCommand();
+        
+        res = res.replace("/", File.separator);
+
+        //отрезать расширение
+        String res2 = res.substring(0, res.lastIndexOf("."));
+        utils.getLogger().info("Result filename without extension: "+res2);
+
+        String filename = res2;
+        String extension = PropertiesMgr.getXlsPrintExtension(); //расширение у результата
+        if (!extension.equals("")) filename = res2+"."+extension;
+
+        File f = new File(filename);
+        f.delete();
+
+        utils.getLogger().info("Result should be: "+f.getAbsolutePath());
+
+        String commandLine = (xlsprint+" "+res).replace("/", File.separator);
+        utils.getLogger().info("Going to run: "+commandLine);
+        Process p = Runtime.getRuntime().exec(commandLine);
+
+        int count=PropertiesMgr.getPropertyInteger("printTimeout");
+        utils.getLogger().debug("wait for file max seconds: "+count);
+        while (count>0) {
+            try {
+                if (!f.exists()) { Thread.sleep(1000); }
+                else break;
+            } catch (InterruptedException interruptedException) {
+                throw new Exception("Interrupted while waiting for file");
+            }
+            count--;
+        }
+//        p.waitFor();
+
+        if (!f.exists()) throw new Exception("File "+f.getAbsolutePath()+" not discovered");
+        return filename;
+    }
+
+
+    /**
+    * Открытие XLS файла на просмотр
+    * @param filename полное имя файла
+    */
+    public static void openXLS( String filename) {
+        try { //запуск превью
+            utils.getLogger().debug("openXLS: filename="+filename);
+            String xlspreview = PropertiesMgr.getXlspreview();
+            utils.getLogger().debug("openXLS: previewer="+xlspreview);
+            utils.getLogger().debug("openXLS: fileseparator="+File.separator);
+            String toRun = xlspreview.replace("/", File.separator);
+            toRun += " " + filename.replace("/", File.separator);
+            utils.getLogger().info("Running: "+toRun);
+            Process p = Runtime.getRuntime().exec(toRun);
+        } catch (IOException ex) {
+            utils.getLogger().error(ex);
+            JOptionPane.showMessageDialog(null, "Не удалось открыть файл "+filename);
+        }
+    }
+
+    /**
+     * Обработать файл jXLS
+     * @param xlsSource - входной файл
+     * @param beans - подготовленные бины
+     * @param xlsDest - выходной файл
+     * @return true - если всё успешно
+     */
+    public static boolean transformXLS( String xlsSource, Map beans, String xlsDest) throws InvalidFormatException {
+        XLSTransformer transformer = new XLSTransformer();
+        try {
+            transformer.transformXLS(xlsSource, beans, xlsDest);
+        } catch (ParsePropertyException ex) {
+            utils.getLogger().info(ex);
+            return false;
+        } catch (IOException ex) {
+            utils.getLogger().info(ex);
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * регистрация репортеров
+     * @param rif
+     */
+    public static void registerReporter(ReporterInterface rif) {
+        if (reporters.isEmpty() && !(rif instanceof xlsbuilder)) registerReporter(new xlsbuilder());
+        for (ReporterInterface.Functional func : rif.getFunctionality()) {
+            reporters.put(func, rif);
+        }
+    }
+
+    /**
+     * генерация отчета классом, ответственным за это
+     * @param func
+     * @param res
+     * @return
+     * @throws Exception
+     */
+    public static String doReport(ReporterInterface.Functional func, Reservation res) throws Exception {
+        if (reporters.isEmpty()) registerReporter(new xlsbuilder());
+        
+        if (!reporters.containsKey(func)) throw new Exception("Не обнаружен функционал для создания этого отчета");
+        ReporterInterface reporter = reporters.get(func);
+        if (func.equals(ReporterInterface.Functional.ACCEPT)) return reporter.createAccept(res);
+        if (func.equals(ReporterInterface.Functional.ACCEPT_EMAIL)) return reporter.createAcceptEmail(res);
+        if (func.equals(ReporterInterface.Functional.INVOICE)) return reporter.createInvoice(res);
+        if (func.equals(ReporterInterface.Functional.INVOICE_EMAIL)) return reporter.createInvoiceEmail(res);
+        throw new Exception("Запрос на неизвестный отчет");
+    }
+
+    
+    public static Collection<Passenger> jasperPassenger() {
+        List<Passenger> passengers = new ArrayList<Passenger>();
+        return passengers;
+    }
+    
+   public static Collection<Passenger> jasperPassenger(Map<String, Object> beans, String name) throws Exception
+    {
+        
+        List<Passenger> passengers = (List<Passenger>) beans.get(name);
+        
+        String outputFileName = "payments-report.xls";
+        JasperReport report = (JasperReport) JRLoader.loadObject(utils.getClassloader().getResourceAsStream("report1.jasper"));
+        JasperPrint print = JasperFillManager.fillReport(report, beans,
+                new JRBeanCollectionDataSource(passengers));
+        FileOutputStream fs = new FileOutputStream(new File(outputFileName));
+        JRXlsExporter exporterXLS = new JRXlsExporter();
+        exporterXLS.setParameter(JRXlsExporterParameter.JASPER_PRINT, print);
+        exporterXLS.setParameter(JRXlsExporterParameter.OUTPUT_STREAM, fs);
+        exporterXLS.setParameter(JRXlsExporterParameter.IS_ONE_PAGE_PER_SHEET, Boolean.TRUE);
+        exporterXLS.setParameter(JRXlsExporterParameter.IS_WHITE_PAGE_BACKGROUND, Boolean.FALSE);
+        exporterXLS.setParameter(JRXlsExporterParameter.IS_REMOVE_EMPTY_SPACE_BETWEEN_ROWS, Boolean.TRUE);
+        exporterXLS.exportReport();
+        
+//        return outputFileName;
+        return passengers;
+        
+    }
+    
+
+    /**
+     * связка функционала с классами отчетности
+     */
+    private static HashMap<ReporterInterface.Functional, ReporterInterface> reporters = new HashMap();
+
+
+    private static String PROP_KASSAIN_REPORT = "kassainReport";
+    private static String PROP_KASSAOUT_REPORT = "kassaoutReport";
+
+    private static String DEFAULT_KASSAIN_REPORT = "kassain_default.xls";
+    private static String DEFAULT_KASSAOUT_REPORT = "kassaout_default.xls";
+
+}

=== modified file 'src/cbadmin/entity2/Block.java'
--- src/cbadmin/entity2/Block.java	2010-11-15 22:27:20 +0000
+++ src/cbadmin/entity2/Block.java	2011-04-25 18:28:30 +0000
@@ -2,6 +2,7 @@
 
 import cbadmin.entity2.auto._Block;
 import cbadmin.util.CurrencyMgr;
+import cbadmin.util.PluginMgr;
 import cbadmin.util.PropertiesMgr;
 import cbadmin.util.utils;
 import java.util.ArrayList;
@@ -10,6 +11,7 @@
 import java.util.HashSet;
 import java.util.List;
 import org.apache.cayenne.exp.ExpressionFactory;
+import plugins.BlockListenerPlugin;
 
 public class Block extends _Block {
 
@@ -23,22 +25,16 @@
         else return getVendor().getName();
     }
 
-    @Override
-    public void setDeletedate(Date d) {
-        if (getId()==null) throw new IllegalStateException("Not initialized.");
-        if (d!=null) {
-            setFlight(null);
-            deleteDirect();
-        }
-        else {  //это восстановление, не трогаем
-        }
-    }
-
-    @Override
-    public Date getDeletedate() {
-        if (getId()==null) throw new IllegalStateException("Not initialized.");
-        else return null;
-    }
+//    @Override
+//    public void setDeletedate(Date d) {
+//        if (getId()==null) throw new IllegalStateException("Not initialized.");
+//        if (d!=null) {
+//            setFlight(null);
+//            deleteDirect();
+//        }
+//        else {  //это восстановление, не трогаем
+//        }
+//    }
 
     @Override
     /**
@@ -46,10 +42,34 @@
      */
     public boolean delete() {
         if (this.getSummaPayed()!=0) return false;
+        if (!this.getPassengersForIdBlockback().isEmpty()) return false;
+        if (!this.getPassengersForIdBlockthere().isEmpty()) return false;
+
+        for (BlockListenerPlugin plugin : PluginMgr.getPlugins(BlockListenerPlugin.class))
+            if (!plugin.deleteBlock(this)) return false;
+
         return super.delete();
     }
 
     /**
+     * можно ли удалить этот блок безболезненно.
+     * Зависит от того, можно ли удалить все его зависимости.
+     * Зависит от того, есть ли неудаленные оплаты по нему.
+     * Есть ли на нем пассажиры.
+     * @return true если блок может быть удален
+     */
+    public boolean canDelete() {
+        if (!getNonDeletedPassengers().isEmpty()) return false;
+        if (!getNonDeletedPayments().isEmpty()) return false;
+
+        //спрашиваем у плагинов, если есть
+        for (BlockListenerPlugin plugin : PluginMgr.getPlugins(BlockListenerPlugin.class))
+            if (!plugin.canDeleteBlock(this)) return false;
+
+        return true;
+    }
+
+    /**
      * поиск блоков по рейсу и поставщику
      * @param flight рейс
      * @param vendor поставщик
@@ -59,8 +79,26 @@
         List conditions = new ArrayList();
         conditions.add(ExpressionFactory.matchExp(Block.FLIGHT_PROPERTY, flight));
         conditions.add(ExpressionFactory.matchExp(Block.VENDOR_PROPERTY, vendor));
-        return db_interface.queryConditions(Block.class, conditions);
-    }
+        conditions.add(ExpressionFactory.matchExp(Block.DELETEDATE_PROPERTY, null));
+        return db_interface.queryConditions(Block.class, conditions);
+    }
+
+    /**
+     * поиск блоков по рейсу и поставщику
+     * @param flight рейс
+     * @param vendor поставщик
+     * @param lclass класс перелета
+     * @return  список найденных блоков
+     */
+    public static List<Block> queryByFlightVendorClass(Flight flight, Client vendor, ListClass lclass) {
+        List conditions = new ArrayList();
+        conditions.add(ExpressionFactory.matchExp(Block.FLIGHT_PROPERTY, flight));
+        conditions.add(ExpressionFactory.matchExp(Block.VENDOR_PROPERTY, vendor));
+        conditions.add(ExpressionFactory.matchExp(Block.LIST_CLASS_PROPERTY, lclass));
+        conditions.add(ExpressionFactory.matchExp(Block.DELETEDATE_PROPERTY, null));
+        return db_interface.queryConditions(Block.class, conditions);
+    }
+
 
 //========================================================
 //заявки/пассажиры
@@ -73,7 +111,7 @@
         List<Passenger> pass = new ArrayList();
         pass.addAll(getPassengersForIdBlockthere());
         pass.addAll(getPassengersForIdBlockback());
-        List res = new ArrayList();
+        List<Passenger> res = new ArrayList();
 
         for (Passenger passenger : pass) {
             if (passenger.getDeletedate()!=null) continue;
@@ -237,18 +275,31 @@
     }
 //===========================================================
 //оплаты
+
+    /**
+     * количество сидящих пассажиров
+     * @return
+     */
+    public List<Payment> getNonDeletedPayments() {
+        if (getId()==null) throw new IllegalStateException("Not initialized.");
+        List<Payment> payments = new ArrayList();
+        for (Payment payment : getPayments()) if (!payment.isDeleted()) payments.add(payment);
+        return payments;
+    }
+
+
     /**
      * сумма к оплате
      * @param curres
      * @return
      */
-    public double getSummaToPay(ListCurrency curres) {
+    public double getSummaToPay(ListCurrency curres,  Date calcdate) {
         if (getId()==null) throw new IllegalStateException("Not initialized.");
         double total = 0;
         if (getPrice()==0) return total;    //нулевая сумма
 
             try {
-                Date calcdate = new Date();
+                if (calcdate==null) calcdate = new Date();
                 total += CurrencyMgr.convert(getPrice()*getCapacity(), getListCurrency().getId(), curres.getId(), calcdate);
             } catch (Exception ex) {
                 utils.getLogger().error(ex);
@@ -259,12 +310,20 @@
     }
 
     /**
+     * сумма к оплате
+     * @param curres
+     * @return
+     */
+    public double getSummaToPay(ListCurrency curres) {
+        return getSummaToPay(curres, null);
+    }
+
+    /**
      * сумма к оплате  в текущей валюте
      * @return
      */
     public double getSummaToPay() {
-        if (getId()==null) throw new IllegalStateException("Not initialized.");
-        return getSummaToPay(getListCurrency());
+        return getSummaToPay(getListCurrency(), null);
     }
 
     /**
@@ -285,7 +344,7 @@
                 continue;
             }
 
-            payed += payment.getPayed(getListCurrency(), curres);
+            payed += payment.getPayed(getListCurrency(), curres, true);
         }
         utils.getLogger().info("getSummaPayed: summa="+payed);
         return payed;
@@ -313,6 +372,27 @@
 
 //=============================================================
 //вспомогательное
+    /**
+     * заполнение всех полей в отдельный метод для повторного использования
+     * @param flight
+     * @param vendor поставщик блока
+     * @param capacity
+     * @param lclass класс перелета
+     * @param currency
+     * @param price
+     */
+    public void fill(Flight flight, Client vendor, int capacity, ListClass lclass, ListCurrency currency, float price) {
+        this.setListClass(lclass);
+        this.setVendor(vendor);
+        this.setFlight(flight);
+        this.setListCurrency(currency);
+        this.setCapacity(capacity);
+        this.setPrice(price);
+    }
+
+//=============================================================
+//шаблоны
+
     //для детализации прогнозного отчета
     public double getSummaLeftEuro() {
         if (getId()==null) throw new IllegalStateException("Not initialized.");
@@ -329,7 +409,7 @@
         if (getListCurrency().getId().equals(CurrencyMgr.CURRENCY_ROUBLE_ID)) return getSummaToPay()-getSummaPayed();
         else return 0;
     }
-    public double getSummaReservationsPaid() {
+    public double getSummaReservationsPaidRoubles() {
         if (getId()==null) throw new IllegalStateException("Not initialized.");
         double sum = 0;
         for (Reservation res : getReservationsMain()) {
@@ -342,6 +422,22 @@
         }
         return sum;
     }
+    public double getSummaReservationsPaidNoCommissionRoubles() {
+        if (getId()==null) throw new IllegalStateException("Not initialized.");
+        double sum = 0;
+        for (Reservation res : getReservationsMain()) {
+
+            if (res.getListReservationStatus().getId().equals(Reservation.RESERVATION_STATUS_NEW) ) continue;
+            if (res.getListReservationStatus().getId().equals(Reservation.RESERVATION_STATUS_INPROGRESS) ) continue;
+            if (res.getListReservationStatus().getId().equals(Reservation.RESERVATION_STATUS_VOIDED) ) continue;
+
+            double sumtot = res.getSummaPayedNoCommissionRoubles();
+            if (sumtot>=res.getAviaVendorsToPayDiscountRoubles()) sum += res.getAviaVendorsToPayDiscountRoubles();
+            else sum+= res.getSummaPayedNoCommissionRoubles();
+        }
+        return sum;
+    }
+
     public double getSummaReservationsLeftRouble() {
         if (getId()==null) throw new IllegalStateException("Not initialized.");
         double sum = 0;
@@ -352,7 +448,9 @@
             if (res.getListReservationStatus().getId().equals(Reservation.RESERVATION_STATUS_VOIDED) ) continue;
 
             if (res.getListCurrency().getId().equals(CurrencyMgr.CURRENCY_ROUBLE_ID))
-                sum+= res.getSummaToPay(res.getListCurrency(), res.getDiscount())-res.getSummaPayed(res.getListCurrency());
+                if (res.getSummaPayed(res.getListCurrency())<res.getAviaVendorsToPayDiscountRoubles())
+                    sum+= res.getAviaVendorsToPayDiscountRoubles()-res.getSummaPayed(res.getListCurrency());
+//                sum+= res.getSummaToPay(res.getListCurrency(), res.getDiscount(), null)-res.getSummaPayed(res.getListCurrency());
         }
         return sum;
     }
@@ -365,7 +463,7 @@
             if (res.getListReservationStatus().getId().equals(Reservation.RESERVATION_STATUS_VOIDED) ) continue;
 
             if (res.getListCurrency().getId().equals(CurrencyMgr.CURRENCY_DOLLAR_ID))
-                sum+= res.getSummaToPay(res.getListCurrency(), res.getDiscount())-res.getSummaPayed(res.getListCurrency());
+                sum+= res.getSummaToPay(res.getListCurrency(), res.getDiscount(), null)-res.getSummaPayed(res.getListCurrency());
         }
         return sum;
     }
@@ -378,7 +476,7 @@
             if (res.getListReservationStatus().getId().equals(Reservation.RESERVATION_STATUS_VOIDED) ) continue;
 
             if (res.getListCurrency().getId().equals(CurrencyMgr.CURRENCY_EURO_ID))
-                sum+= res.getSummaToPay(res.getListCurrency(), res.getDiscount())-res.getSummaPayed(res.getListCurrency());
+                sum+= res.getSummaToPay(res.getListCurrency(), res.getDiscount(), null)-res.getSummaPayed(res.getListCurrency());
         }
         return sum;
     }
@@ -458,5 +556,22 @@
     "Поставщик"
         };
 
+    @Override
+    protected void onPostAdd() {
+        utils.getLogger().debug("Block.onPostAdd called");
+        
+        setCapacity(0);
+        setPrice(0);
+    }
+
+    //направления транзакций с блоками
+    /**
+     * мы покупаем. у нас увеличивается
+     */
+    public static int CONST_DIRECTION_BUY = 1;
+    /**
+     * мы продаем. у нас уменьшается
+     */
+    public static int CONST_DIRECTION_SELL = 2;
 
 }

=== modified file 'src/cbadmin/entity2/Client.java'
--- src/cbadmin/entity2/Client.java	2010-11-04 23:24:26 +0000
+++ src/cbadmin/entity2/Client.java	2011-04-25 18:28:30 +0000
@@ -3,9 +3,11 @@
 import cbadmin.entity2.auto._Client;
 import java.util.ArrayList;
 import java.util.Comparator;
+import java.util.HashMap;
 import java.util.List;
 import org.apache.cayenne.exp.Expression;
 import org.apache.cayenne.exp.ExpressionFactory;
+import org.apache.cayenne.query.PrefetchTreeNode;
 
 public class Client extends _Client {
 
@@ -22,6 +24,16 @@
         return queryAllNotDeleted(Client.class);
     }
 
+    public static List<Client> queryAllNotDeletedNameNotNull() {
+        List conditions = new ArrayList();
+        conditions.add(ExpressionFactory.noMatchExp(Client.NAME_PROPERTY, null));
+        conditions.add(ExpressionFactory.matchExp(Client.DELETEDATE_PROPERTY, null));
+        return db_interface.queryConditions(Client.class, conditions);
+
+//        return queryAllNotDeleted(Client.class);
+    }
+
+
     /**
      * Нужно сформировать имя при сохранении
      * @return
@@ -47,13 +59,14 @@
         conditions.add(ExpressionFactory.matchExp(Client.UNAME_PROPERTY, name));
         List<db_interface> list =  db_interface.queryConditions(Client.class, conditions);
         for (db_interface val : list) {
-            if (val.getId()!=id) return true;
+            if (!val.getId().equals(id)) return true;
         }
         return false;
     }
     public static List queryByUname(String name) {
         List conditions = new ArrayList();
         conditions.add(ExpressionFactory.matchExp(Client.UNAME_PROPERTY, name));
+
         return db_interface.queryConditions(Client.class, conditions);
     }
 
@@ -66,7 +79,11 @@
         Expression qualifier2 = ExpressionFactory.matchExp(Client.CL_TYPE_PROPERTY, 1);
         List conds = new ArrayList();
         conds.add(qualifier2);
-        return queryConditions(Client.class, conds);
+
+        HashMap<String, Integer> map = new HashMap();
+        map.put("clientFl", PrefetchTreeNode.DISJOINT_PREFETCH_SEMANTICS);
+
+        return queryConditions(Client.class, conds, map);
     }
 
 /**
@@ -77,7 +94,11 @@
         Expression qualifier2 = ExpressionFactory.matchExp(Client.CL_TYPE_PROPERTY, 2);
         List conds = new ArrayList();
         conds.add(qualifier2);
-        return queryConditions(Client.class, conds);
+        HashMap<String, Integer> map = new HashMap();
+        map.put("clientUl", PrefetchTreeNode.JOINT_PREFETCH_SEMANTICS);
+
+        return queryConditions(Client.class, conds, map);
+
     }
 
 

=== modified file 'src/cbadmin/entity2/Flight.java'
--- src/cbadmin/entity2/Flight.java	2010-11-04 23:24:26 +0000
+++ src/cbadmin/entity2/Flight.java	2011-04-25 18:28:30 +0000
@@ -33,6 +33,7 @@
         for (int i = 0; i < blocks.length; i++) {
             Block block = (Block)blocks[i];
             block.delete();   //на самом деле там физически удаляется
+                                //20.03.2011 уже нет, также ставится deletedate
         }
         return super.delete();
     }
@@ -71,6 +72,20 @@
     }
 
     /**
+     * можно ли удалить этот рейс безболезненно.
+     * Зависит от того, можно ли удалить все входящие в него блоки.
+     * Зависит от того, есть ли предложения на этот рейс(?)
+     * @return true если рейс может быть удален
+     */
+    public boolean canDelete() {
+        for (Block block : getBlocks()) {   //нам нужны только неудаленные блоки. направление (покупаем/продаем) значения не имеет
+            if (!block.canDelete()) return false;
+        }
+        //предложения рассматривать не будем. они отрабатывают автоматом
+        return true;
+    }
+
+    /**
      * создаем блок waitlist
      * @return
      */
@@ -96,21 +111,49 @@
             return true;
     }
 
+    /**
+     * получить блоки в рейсе БЕЗ удаленных. для получения удаленных следует использовать запрос.
+     * @return
+     */
+    @Override
+    public List<Block> getBlocks() {
+        List<Block> blocks = new ArrayList();
+
+        for (Block block : super.getBlocks()) {
+            if (!block.isDeleted()) blocks.add(block);
+        }
+        return blocks;
+    }
 
 //-------------------------------
     public List<Passenger> getNonDeletedPassengers() {
         List<Passenger> pass = getPassengersForIdFlightthere();
         pass.addAll(getPassengersForIdFlightback());
-        List res = new ArrayList();
+        List<Passenger> res = new ArrayList();
 
         for (Passenger passenger : pass) {
-            if (passenger.getDeletedate()!=null) continue;
+            if (passenger.isDeleted()) continue;
             res.add(passenger);
         }
         return res;
     }
 
     /**
+     * найти не waitlist блоки
+     * @return
+     */
+    public List<Block> getNonWaitlistBlocks() {
+        List<Block> blocks = getBlocks();
+        List<Block> res = new ArrayList();
+
+        for (Block block : blocks) {
+            if (!block.getListClass().isWaitlist()) res.add(block);
+        }
+        return res;
+    }
+
+
+    /**
      * найти удаленный рейс этой программы (т.е. с тем же номером) за эту дату
      * @param program
      * @param date
@@ -148,6 +191,7 @@
 
 /**
  * получить список рейсов по параметрам
+ * удаленные не показываем
  */
     public static List<Flight> queryByCountryAndDate(ListCountry countryFrom, ListCountry countryTo, Date date) {
         List conditions = new ArrayList();
@@ -163,6 +207,7 @@
                     ) , countryTo));
         conditions.add(ExpressionFactory.matchExp(
                 Flight.DATE_FROM_PROPERTY , date));
+        conditions.add(ExpressionFactory.matchExp(Flight.DELETEDATE_PROPERTY , null));
 
         //принудительно кешируем, эти данные не меняются
         return db_interface.queryConditions(Flight.class, conditions, "flightCache");
@@ -170,6 +215,11 @@
 
 /**
  * получить список рейсов по параметрам
+ * @param cityFrom город вылета
+ * @param cityTo  город прилёта
+ * @param airline авиакомпания. null для всех
+ * @param datefrom дата с. Опциональна
+ * @param dateto дата по. Опциональна
  */
     public static List<String> getFlightList(ListCity cityFrom, ListCity cityTo, 
             ListAirline airline, Date datefrom, Date dateto) {
@@ -180,6 +230,7 @@
         if (airline!=null) hql = hql + " and f.listAirline=:airline ";
         if (datefrom!=null) hql = hql + " and f.dateFrom>=:datefrom ";
         if (dateto!=null) hql = hql + " and f.dateFrom<=:dateto ";
+        hql = hql + " and f.deletedate is null ";
 
         EJBQLQuery query = new EJBQLQuery(hql);
         query.setParameter("cityfrom", cityFrom);
@@ -195,17 +246,23 @@
 
 /**
  * получить список рейсов по городам и дате
+ * без удаленных
  */
     public static List<Flight> getFlightList(ListCity cityFrom, ListCity cityTo, Date date) {
         //заполнить список рейсов для данного города и даты
 
         List conditions = new ArrayList();
         conditions.add(ExpressionFactory.matchExp(Flight.DELETEDATE_PROPERTY, null));
-        conditions.add(ExpressionFactory.matchExp("listAirportByIdAirportFrom.listCity", cityFrom));
-        conditions.add(ExpressionFactory.matchExp("listAirportByIdAirportTo.listCity", cityTo));
+        conditions.add(ExpressionFactory.matchExp(
+                utils.path(Flight.LIST_AIRPORT_BY_ID_AIRPORT_FROM_PROPERTY,
+                ListAirport.LIST_CITY_PROPERTY), cityFrom));
+        conditions.add(ExpressionFactory.matchExp(
+                utils.path(Flight.LIST_AIRPORT_BY_ID_AIRPORT_TO_PROPERTY,
+                ListAirport.LIST_CITY_PROPERTY), cityTo));
         conditions.add(ExpressionFactory.matchExp(Flight.DATE_FROM_PROPERTY, date));
 
         List<Flight> resultFlight = db_interface.queryConditions(Flight.class, conditions);
+        if (resultFlight==null) resultFlight = new ArrayList<Flight>();
         return resultFlight;
     }
 

=== modified file 'src/cbadmin/entity2/FlightProgram.java'
--- src/cbadmin/entity2/FlightProgram.java	2010-06-01 20:53:46 +0000
+++ src/cbadmin/entity2/FlightProgram.java	2011-04-25 18:28:30 +0000
@@ -8,7 +8,7 @@
 
     @Override
     public boolean delete() {
-        Object[] pers = getFlightProgramPeriodses().toArray();
+        Object[] pers = getFlightProgramPeriods().toArray();
         for (int i = 0; i < pers.length; i++) {
             FlightProgramPeriods per = (FlightProgramPeriods)pers[i];
             per.delete();   //на самом деле там физически удаляется
@@ -29,5 +29,17 @@
         return res;
     }
 
+    /**
+     * можно ли удалить этот период безболезненно.
+     * Зависит от того, можно ли удалить все входящие в него рейсы.
+     * @return true если период может быть удален
+     */
+    public boolean canDelete() {
+        for (FlightProgramPeriods flightprogramperiod : getFlightProgramPeriods()) {
+            if (flightprogramperiod.isDeleted()) continue;
+            if (!flightprogramperiod.canDelete()) return false;
+        }
+        return true;
+    }
 
 }

=== modified file 'src/cbadmin/entity2/FlightProgramPeriods.java'
--- src/cbadmin/entity2/FlightProgramPeriods.java	2010-04-09 06:21:55 +0000
+++ src/cbadmin/entity2/FlightProgramPeriods.java	2011-04-25 18:28:30 +0000
@@ -27,7 +27,7 @@
      */
     @Override
     public boolean delete() {
-        Object[] flights = getFlights().toArray();
+        Object[] flights = getNonDeletedFlights().toArray();
         for (int i = 0; i < flights.length; i++) {
             Flight flight = (Flight)flights[i];
             flight.delete();   //на самом деле там физически удаляется
@@ -51,7 +51,7 @@
         return blocks;
     }
 
-        public List<Flight> getNonDeletedFlights() {
+    public List<Flight> getNonDeletedFlights() {
         if (getId()==null) throw new IllegalStateException("Not initialized.");
         List<Flight> pass = getFlights();
         List res = new ArrayList();
@@ -63,4 +63,19 @@
         return res;
     }
 
+    /**
+     * можно ли удалить этот период безболезненно.
+     * Зависит от того, можно ли удалить все входящие в него рейсы.
+     * @return true если период может быть удален
+     */
+    public boolean canDelete() {
+        for (Flight flight : getFlights()) {
+            if (flight.isDeleted()) continue;
+            if (!flight.canDelete()) return false;
+        }
+        return true;
+    }
+
+
+
 }

=== modified file 'src/cbadmin/entity2/ListAge.java'
--- src/cbadmin/entity2/ListAge.java	2010-09-21 14:26:29 +0000
+++ src/cbadmin/entity2/ListAge.java	2011-04-25 18:28:30 +0000
@@ -1,7 +1,7 @@
 package cbadmin.entity2;
 
 import cbadmin.entity2.auto._ListAge;
-import cbadmin.util.PriceVendorInterface;
+import cbadmin.business.PriceVendorInterface;
 
 public class ListAge extends _ListAge {
 
@@ -10,13 +10,20 @@
     }
 
 
+    /**
+     * если сразу в две категории попал
+     * @return
+     */
+    public boolean isAdultChild() {
+        return isAdult() && isChild();
+    }
 
     public void setInfant(Boolean infant) {
         if (infant) setIsInfant(new Byte("1"));
         else setIsInfant(new Byte("0"));
     }
     public boolean isInfant() {
-        return (getIsInfant().byteValue()==1);
+        return (getIsInfant()==1);
     }
 
     public void setAdult(Boolean adult) {
@@ -24,7 +31,7 @@
         else setIsAdult(new Byte("0"));
     }
     public boolean isAdult() {
-        return (getIsAdult().byteValue()==1);
+        return (getIsAdult()==1);
     }
 
     public void setChild(Boolean child) {
@@ -32,7 +39,7 @@
         else setIsChild(new Byte("0"));
     }
     public boolean isChild() {
-        return (getIsChild().byteValue()==1);
+        return (getIsChild()==1);
     }
 
 
@@ -43,9 +50,11 @@
      */
     public boolean isInPeriod(int age) {
         if (age<0) return false;
+        if (getAgefrom()==0 && getAgeto()==0)    return true;
 
         if (getAgefrom()==0)    return age<=getAgeto();
         if (getAgeto()==0)    return age>=getAgefrom();
+        if (getAgeto()==0)    return age>=getAgefrom();
         return age>=getAgefrom() && age<=getAgeto();
     }
 
@@ -54,7 +63,7 @@
      * @param ageCategory - категория возраста. Дефиниции в PriceVendorInterface
      * @return true если попадает
      */
-    public boolean isInCategory(String ageCategory) {
+    public boolean isInCategory(Integer ageCategory) {
         if (ageCategory.equals(PriceVendorInterface.CONST_AGECATEGORY_INFANT) && isInfant()) return true;
         if (ageCategory.equals(PriceVendorInterface.CONST_AGECATEGORY_CHILD) && isChild()) return true;
         if (ageCategory.equals(PriceVendorInterface.CONST_AGECATEGORY_ADULT) && isAdult()) return true;

=== modified file 'src/cbadmin/entity2/ListAirline.java'
--- src/cbadmin/entity2/ListAirline.java	2010-10-16 07:11:43 +0000
+++ src/cbadmin/entity2/ListAirline.java	2011-04-25 18:28:30 +0000
@@ -7,6 +7,23 @@
 
 public class ListAirline extends _ListAirline {
 
+    /**
+     * вернуть имя с кодом авиакомпании
+     * @return
+     */
+    @Override
+    public String getName() {
+        return super.getName()+" ("+getCode()+")";
+    }
+
+    /**
+     * вернуть чистое имя, без кода авиакомпании
+     * @return
+     */
+    public String getCleanName() {
+        return super.getName();
+    }
+
     public static List<ListAirline> queryAll() {
         return queryAll(ListAirline.class);
     }

=== modified file 'src/cbadmin/entity2/ListClass.java'
--- src/cbadmin/entity2/ListClass.java	2010-11-04 23:24:26 +0000
+++ src/cbadmin/entity2/ListClass.java	2011-04-25 18:28:30 +0000
@@ -36,5 +36,12 @@
         return res;
     }
 
+    /**
+     * класс относится к waitlist'ам
+     * @return
+     */
+    public boolean isWaitlist() {
+        return (getParentClass()!=null);
+    }
 
 }

=== added file 'src/cbadmin/entity2/ListEmail.java'
--- src/cbadmin/entity2/ListEmail.java	1970-01-01 00:00:00 +0000
+++ src/cbadmin/entity2/ListEmail.java	2011-04-25 18:28:30 +0000
@@ -0,0 +1,7 @@
+package cbadmin.entity2;
+
+import cbadmin.entity2.auto._ListEmail;
+
+public class ListEmail extends _ListEmail {
+
+}

=== modified file 'src/cbadmin/entity2/ListPayMethod.java'
--- src/cbadmin/entity2/ListPayMethod.java	2010-11-04 23:24:26 +0000
+++ src/cbadmin/entity2/ListPayMethod.java	2011-04-25 18:28:30 +0000
@@ -1,7 +1,10 @@
 package cbadmin.entity2;
 
 import cbadmin.entity2.auto._ListPayMethod;
+import cbadmin.util.utils;
 import java.util.List;
+import org.apache.cayenne.ObjectId;
+import org.apache.cayenne.query.EJBQLQuery;
 
 public class ListPayMethod extends _ListPayMethod {
 
@@ -9,5 +12,33 @@
         return queryAllNotDeleted(ListPayMethod.class);
     }
 
+    public void setId(Long id) {
+        ObjectId oid = new ObjectId("ListPayMethod", ID_PK_COLUMN, id);
+        setObjectId(oid);
+    }
+
+
+    /**
+     * получить номер последней пользовательской услуги
+     * @return
+     */
+    public static Long getLastId() {
+
+        EJBQLQuery query = new EJBQLQuery("select max(a.id_key) FROM ListPayMethod a");
+        List<Long> list = utils.getContext().performQuery(query);
+        if (list.isEmpty()) return CONST_CUSTOM_SERVICES_FROM;
+        else return list.get(0).longValue();
+    }
+
+    public static Long CONST_CUSTOM_SERVICES_FROM = new Long(1000);
+
+    /**
+     * оплата по курсу на дату высталвения подверждения и счета
+     */
+    public static int CONST_RATE_BILLDATE = 1;
+    /**
+     * оплата по курсу на дату оплаты
+     */
+    public static int CONST_RATE_PAYDATE = 0;
 
 }

=== modified file 'src/cbadmin/entity2/Passenger.java'
--- src/cbadmin/entity2/Passenger.java	2010-10-24 21:50:24 +0000
+++ src/cbadmin/entity2/Passenger.java	2011-04-25 18:28:30 +0000
@@ -177,38 +177,22 @@
 
     /*
      * рассчитать класс на вылет
-     * 1. Если пассажиры, то берутся классы для пассажиров.
-     * 2. Если нет пассажиров, либо они не сидят, то берется предложение, по которому сформирована заявка.
-     * 3. Если нет предложения, то берется класс по-умолчанию
+     * если есть родительский класс, то это WL, нужен папа
      */
     public ListClass getCalculatedClassthere() {
-        if (getFlightByIdFlightthere()==null) return null;
-        if (getListClassByIdClassthere()!=null) return getListClassByIdClassthere();
-        //получим предложение, в котором рейсы
-        Offer offer = db_interface.load(Offer.class, new Long(getReservation().getIdOffer()).intValue());
-        if (offer!=null) { //получить класс перелета из предложения, если есть
-            ListClass cls=offer.getListClass();
-            return cls;
-        }
-        return ListClass.load(Block.CLASS_DEFAULT_ID);
+        if (getBlockByIdBlockthere()==null) return null;    //не сидит
+        if (getBlockByIdBlockthere().getListClass().getParentClass()!=null) return getBlockByIdBlockthere().getListClass().getParentClass();
+        else return getBlockByIdBlockthere().getListClass();
     }
 
     /*
-     * рассчитать класс на вылет
-     * 1. Если пассажиры, то берутся классы для пассажиров.
-     * 2. Если нет пассажиров, либо они не сидят, то берется предложение, по которому сформирована заявка.
-     * 3. Если нет предложения, то берется класс по-умолчанию
+     * рассчитать класс на возврат
+     * если есть родительский класс, то это WL, нужен папа
      */
     public ListClass getCalculatedClassback() {
-        if (getFlightByIdFlightback()==null) return null;
-        if (getListClassByIdClassback()!=null) return getListClassByIdClassback();
-        //получим предложение, в котором рейсы
-        Offer offer = db_interface.load(Offer.class, new Long(getReservation().getIdOffer()).intValue());
-        if (offer!=null) { //получить класс перелета из предложения, если есть
-            ListClass cls=offer.getListClass();
-            return cls;
-        }
-        return ListClass.load(Block.CLASS_DEFAULT_ID);
+        if (getBlockByIdBlockback()==null) return null;    //не сидит
+        if (getBlockByIdBlockback().getListClass().getParentClass()!=null) return getBlockByIdBlockback().getListClass().getParentClass();
+        else return getBlockByIdBlockback().getListClass();
     }
 
     /**
@@ -292,9 +276,7 @@
         if (getId()==null) throw new IllegalStateException("Not initialized.");
         double rub = 0;
         try {
-            Date date = new Date();
-            if (getReservation().getBilldate()!=null) date = getReservation().getBilldate();
-            //по возможности берем дату выставления счета
+            Date date = getReservation().getReportDate(); //по возможности берем дату
 
             utils.getLogger().debug("getPriceFlightRoubles: date="+date);
 
@@ -375,6 +357,13 @@
         else return null;
     }
 
+    public Object showFieldIfNotWaitlist(Block block, Object obj, Object objelse) {
+        if (block==null) return objelse;
+        if (block.getListClass()==null) return objelse;
+        if (block.getListClass().getParentClass()==null) return obj;
+        else return objelse;
+    }
+
 //==============================================================
 //сохранения услуги перелета при сохранении пассажира
     
@@ -564,6 +553,7 @@
 
     @Override
     protected void onPostAdd() {
+        utils.getLogger().debug("Passenger.onPostAdd called");
         CalendarDate cd = new CalendarDate(1900,1,1);
         setBirthday(cd.toDate(null));
         setActive(cd.toDate(null));

=== modified file 'src/cbadmin/entity2/Payment.java'
--- src/cbadmin/entity2/Payment.java	2010-09-29 11:52:28 +0000
+++ src/cbadmin/entity2/Payment.java	2011-04-25 18:28:30 +0000
@@ -12,19 +12,24 @@
 
 
 /**
- * посчитать реальную оплату с учетом фиксированного курса и процентов
+ * посчитать реальную оплату с учетом фиксированного курса и процентов.
+ * Опционально берется либо только доход, либо доход с комиссией
  * @param parentcur - валюта родительского объекта. К ней считается кросскурс
  * @param outcur валюта результата
+ * @param addCommission true - присуммировать коммиссию посредника к доходу. При суммировании получается полная сумма, заплаченная клиентом
  * @return
  */
-    public Double getPayed(ListCurrency parentcur, ListCurrency outcur) {
+    public Double getPayed(ListCurrency parentcur, ListCurrency outcur, boolean addCommission) {
         utils.getLogger().debug("PaymentDAO.getPayed "+parentcur.getAbbr()+", "+outcur.getAbbr());
         Date datepayment = getDatePayment();
         double payed=0;
 
+        //сумма для конверсии
+        double summaPayed = getSummaPayed() + (addCommission ? getCommission().doubleValue() : 0);
+
         //валюта оплаты и вывода совпадает
         if (outcur.getId().equals(getListCurrency().getId())) {
-            payed = getSummaPayed();
+            payed = summaPayed;
             utils.getLogger().debug("PaymentDAO.getPayed cur equals. returning "+payed);
             return payed;
         }
@@ -49,13 +54,13 @@
 
             //если из рублей куда-то перевести, то учесть процент к ЦБ
             if (getListCurrency().getId().equals(CurrencyMgr.CURRENCY_ROUBLE_ID))
-                temppayed = getSummaPayed() * crossrate / (1+getPluspercent()/100);
+                temppayed = summaPayed * crossrate / (1+getPluspercent()/100);
             //иначе учесть % к ЦБ в другую сторону
-            else temppayed = getSummaPayed() * crossrate * (1+getPluspercent()/100);
-            utils.getLogger().debug("PaymentDAO.getPayed SummaPayed="+getSummaPayed());
-            utils.getLogger().debug("PaymentDAO.getPayed Pluspercent="+getPluspercent());
-            utils.getLogger().debug("PaymentDAO.getPayed temppayed="+temppayed);
-            utils.getLogger().debug("PaymentDAO.getPayed datepayment="+datepayment);
+            else temppayed = summaPayed * crossrate * (1+getPluspercent()/100);
+//            utils.getLogger().debug("PaymentDAO.getPayed SummaPayed="+summaPayed);
+//            utils.getLogger().debug("PaymentDAO.getPayed Pluspercent="+getPluspercent());
+//            utils.getLogger().debug("PaymentDAO.getPayed temppayed="+temppayed);
+//            utils.getLogger().debug("PaymentDAO.getPayed datepayment="+datepayment);
 
             //double crossrate2 = CurrencyMgr.getCrossRate(curres.getId(), getListCurrency().getId(), datepayment);
             double crossrate2 = CurrencyMgr.getCrossRate(parentcur.getId(), outcur.getId(), datepayment);
@@ -69,6 +74,13 @@
         return payed;
     }
 
+    /**
+     * сумма дохода и комиссии для безконверсии
+     */
+    public Double getPayedTotal() {
+       return getSummaPayed()+getCommission().doubleValue();
+    }
+
 //=======================================================
 //для шаблонов
     /**
@@ -86,7 +98,7 @@
         }
         else {
             //payed += getPayed(getObject().getListCurrency(), parentCurrency);
-            payed += getPayed(parentCurrency, parentCurrency);
+            payed += getPayed(parentCurrency, parentCurrency, true);
         }
 
         return payed;
@@ -105,12 +117,15 @@
     public Integer getJustRoubles() {
         if (getId()==null) throw new IllegalStateException("Not initialized.");
         double rub = 0;
-        try {
-            rub = CurrencyMgr.convert(getSummaPayed(), getListCurrency().getId(),
-                    CurrencyMgr.CURRENCY_ROUBLE_ID, getDatePayment());
-        } catch (Exception ex) {
-            utils.getLogger().error(ex);
-        }
+
+        rub = getPayed(ListCurrency.load(CurrencyMgr.CURRENCY_ROUBLE_ID), ListCurrency.load(CurrencyMgr.CURRENCY_ROUBLE_ID), true);
+
+//        try {
+//            rub = CurrencyMgr.convert(getPayedTotal(), getListCurrency().getId(),
+//                    CurrencyMgr.CURRENCY_ROUBLE_ID, getDatePayment());
+//        } catch (Exception ex) {
+//            utils.getLogger().error(ex);
+//        }
         return new Integer(new Double(rub).intValue());
     }
 
@@ -121,12 +136,15 @@
     public Integer getJustKopeeks() {
         if (getId()==null) throw new IllegalStateException("Not initialized.");
         double rub = 0;
-        try {
-            rub = CurrencyMgr.convert(getSummaPayed(), getListCurrency().getId(),
-                    CurrencyMgr.CURRENCY_ROUBLE_ID, getDatePayment());
-        } catch (Exception ex) {
-            utils.getLogger().error(ex);
-        }
+
+        rub = getPayed(ListCurrency.load(CurrencyMgr.CURRENCY_ROUBLE_ID), ListCurrency.load(CurrencyMgr.CURRENCY_ROUBLE_ID), true);
+
+//        try {
+//            rub = CurrencyMgr.convert(getPayedTotal(), getListCurrency().getId(),
+//                    CurrencyMgr.CURRENCY_ROUBLE_ID, getDatePayment());
+//        } catch (Exception ex) {
+//            utils.getLogger().error(ex);
+//        }
         return new Integer(new Double((rub - new Double(rub).intValue())*100).intValue()) ;
     }
 
@@ -140,15 +158,17 @@
         double rub = 0;
 
         if (parentCurrency==null) {
-            try {
-                rub = CurrencyMgr.convert(getSummaPayed(), getListCurrency().getId(),
-                        CurrencyMgr.CURRENCY_ROUBLE_ID, getDatePayment());
-            } catch (Exception ex) {
-                utils.getLogger().error(ex);
-            }
+            rub = getPayed(ListCurrency.load(CurrencyMgr.CURRENCY_ROUBLE_ID), ListCurrency.load(CurrencyMgr.CURRENCY_ROUBLE_ID), true);
+//
+//            try {
+//                rub = CurrencyMgr.convert(getSummaPayed(), getListCurrency().getId(),
+//                        CurrencyMgr.CURRENCY_ROUBLE_ID, getDatePayment());
+//            } catch (Exception ex) {
+//                utils.getLogger().error(ex);
+//            }
         }
         else {
-            rub = getPayed(parentCurrency, ListCurrency.load(CurrencyMgr.CURRENCY_ROUBLE_ID));
+            rub = getPayed(parentCurrency, ListCurrency.load(CurrencyMgr.CURRENCY_ROUBLE_ID), true);
         }
         return new Double(rub);
     }
@@ -186,6 +206,11 @@
     }
 
     @Override
+    protected void onPostPersist() {
+        onPostUpdate(props, propnames, origvalues);
+    }
+
+    @Override
     protected void onPostLoad() {
         onPostLoad(props, origvalues);
     }
@@ -212,6 +237,7 @@
     Payment.SUMMA_PAYED_PROPERTY,
     Payment.LIST_CURRENCY_PROPERTY,
     Payment.LIST_PAY_METHOD_PROPERTY,
+    Payment.RESERVATION_PROPERTY
         };
 
         String propnames[] = {
@@ -225,5 +251,6 @@
     "Сумма оплаты",
     "Валюта",
     "Метод оплаты",
+    "Заявка"
         };
 }

=== modified file 'src/cbadmin/entity2/Reservation.java'
--- src/cbadmin/entity2/Reservation.java	2010-11-04 23:24:26 +0000
+++ src/cbadmin/entity2/Reservation.java	2011-04-25 18:28:30 +0000
@@ -4,6 +4,7 @@
 import cbadmin.util.CurrencyMgr;
 import cbadmin.util.PropertiesMgr;
 import cbadmin.util.utils;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Comparator;
@@ -28,6 +29,28 @@
         else return "---";
     }
 
+    @Override
+    public boolean save() {
+        //проверка на то, нужно ли номер для заявки прописывать
+        if (getNumber()==null || getNumber().isEmpty() || getNumber().startsWith("-")) {   //нужен номер
+            //получить услуги
+            for (Service service : getServices()) {
+                if (service.isDeleted()) continue;
+                //AAAММГГ####
+                if (service.getListService().getId().equals(PropertiesMgr.getServiceAvia())) {
+                    //это перелет, обрабатываем так
+                    setNumber(getForeignCity()+(new SimpleDateFormat("MMyy").format(getDateFirstFlight()))+getId());
+                }
+                else {
+                    setNumber("MOW"+(new SimpleDateFormat("MMyy").format(getDateReserved()))+getId());
+                }
+                break;
+            }
+        }
+
+        return super.save();
+    }
+
     /**
      * при неинициализированной брони getPassengers=null
      * @return
@@ -75,6 +98,16 @@
         }
         return min;
     }
+
+    @Override
+    public void setFrozen(Boolean frozen) {
+        if (frozen) setIsfrozen(new Byte("1"));
+        else setIsfrozen(new Byte("0"));
+    }
+    @Override
+    public boolean isFrozen() {
+        return (getIsfrozen()==1);
+    }
 //=================================================================
 //оплаченность
 
@@ -89,28 +122,40 @@
         double payed = 0;
         List<Payment> pmnt = getPayments();
         for (Payment payment : pmnt) {
-            if (payment.getDeletedate() != null) { continue; }
-
-            //та же валюта. не надо конверсий
-            if (curres.getId().equals(payment.getListCurrency().getId())) {
-                payed += payment.getSummaPayed();
-                utils.getLogger().debug("ReservationDAO.getSummaPayed equal cur. next payment");
-                continue;
-            }
-
-            payed += payment.getPayed(getListCurrency(), curres);
-
-        }
-        utils.getLogger().debug("ReservationDAO.getSummaPayed return="+payed);
-        return payed;
-    }
-
-    /**
-     * сумма к оплате без учета услуг.
+            if (payment.isDeleted()) { continue; }
+
+            payed += payment.getPayed(getListCurrency(), curres, true);
+        }
+        utils.getLogger().debug("ReservationDAO.getSummaPayed return="+payed);
+        return payed;
+    }
+
+    /**
+     * оплаченная сумма в нужной валюте с учетом даты оплаты и типа оплаты и после вычета комиссии
+     * @param curres
+     * @return
+     */
+    public double getSummaPayedNoCommission(ListCurrency curres) {
+        if (getId()==null) return 0;
+        utils.getLogger().debug("ReservationDAO.getSummaPayed reservation="+getId()+", currency="+curres.getAbbr());
+        double payed = 0;
+        List<Payment> pmnt = getPayments();
+        for (Payment payment : pmnt) {
+            if (payment.isDeleted()) { continue; }
+
+            payed += payment.getPayed(getListCurrency(), curres, false);
+        }
+        utils.getLogger().debug("ReservationDAO.getSummaPayed return="+payed);
+        return payed;
+    }
+
+
+    /**
+     * сумма к оплате с учетом скидки.
      * @return
      */
     public double getSummaToPay() {
-        return getSummaToPay(getListCurrency(), getDiscount());
+        return getSummaToPay(getListCurrency(), getDiscount(), null);
     }
 
     /**
@@ -118,7 +163,7 @@
      * @param curres
      * @return
      */
-    public double getSummaToPay(ListCurrency curres, int discountperc) {
+    public double getSummaToPay(ListCurrency curres, int discountperc, Date calcdate) {
         if (getId()==null) return 0;
         double total = 0;   // на которую влияет скидка
         double totalNotAffected = 0;   // на которую не влияет скидка
@@ -126,15 +171,15 @@
         double perctotalNotAffected = 0;   // процент от заявки, на который не влияет скидка
         boolean isError = false;
 
+        //выбираем какую дату брать
+        if (calcdate==null) calcdate = getReportDate();
+        
         //добавляем услуги
         if (getServices()==null || getServices().isEmpty()) ;
         else {
             for (Service service : getServices()) {
-                Date calcdate = new Date();
-
                 if (service.getListService().isPercentOfTotal()) continue;  //в этом прозоде не учитываем
                 try {
-                    if (getBilldate()!=null) calcdate = getBilldate();
                     if (service.getListService().isAffected())
                         total += CurrencyMgr.convert(service.getSellprice()*service.getPax(), service.getListCurrency(), curres, calcdate);
                     else
@@ -150,12 +195,9 @@
             if (isError) return -1; //ошибка случилась
 
             for (Service service : getServices()) {
-                Date calcdate = new Date();
-
                 if (!service.getListService().isPercentOfTotal()) continue;  //в этом прозоде учитываем
 
                 try {
-                    if (getBilldate()!=null) calcdate = getBilldate();
                     if (service.getListService().isAffected())
                         perctotal += (total+totalNotAffected)*service.getMarginpercent()/100;
                     else
@@ -188,12 +230,34 @@
     }
 
     /**
+     * Пересчет суммы оплаченного в рубли
+     * @return
+     */
+    public double getSummaPayedNoCommissionRoubles() {
+        if (getId()==null) throw new IllegalStateException("Not initialized.");
+        return Math.floor(getSummaPayedNoCommission(ListCurrency.load(CurrencyMgr.CURRENCY_ROUBLE_ID))*100)/100;
+    }
+
+    /**
      * сумма к оплате в рублях без учета услуг.
      * @return
      */
     public double getSummaToPayRoubles() {
-        return getSummaToPay(ListCurrency.load(CurrencyMgr.CURRENCY_ROUBLE_ID), getDiscount());
-    }
+        return Math.floor(
+                getSummaToPay(ListCurrency.load(CurrencyMgr.CURRENCY_ROUBLE_ID), getDiscount(), null)*(100+getPercentCommission())
+                )/100;
+    }
+
+    /**
+     * сумма к оплате в рублях без учета скидки.
+     * @return
+     */
+    public double getSummaToPayNoDiscountRoubles() {
+        return Math.floor(
+                getSummaToPay(ListCurrency.load(CurrencyMgr.CURRENCY_ROUBLE_ID), 0, null)*(100+getPercentCommission())
+                )/100;
+    }
+
 
     /**
      * сумма к оплате в рублях прописью. копейки цифрами
@@ -243,7 +307,7 @@
     public boolean changeStatusAutomatic(){
         if (getId()==null) throw new IllegalStateException("Not initialized.");
         double payed = getSummaPayed(getListCurrency());
-        double topay = getSummaToPay(getListCurrency(), getDiscount());
+        double topay = getSummaToPay(getListCurrency(), getDiscount(), null);
         int comparedmoney = utils.compareMoney(payed, topay);   //сравнение оплаченного и к оплате
 
         if (getListReservationStatus().getId().equals(RESERVATION_STATUS_NEW)) {   //первое открытие заявки
@@ -251,14 +315,16 @@
             save();
         }
         else if (getListReservationStatus().getId().equals(RESERVATION_STATUS_INPROGRESS)) {   //отправка подтверждения
-            setListReservationStatus(ListReservationStatus.load(RESERVATION_STATUS_ACCEPTED));
+            if (topay!=0) setListReservationStatus(ListReservationStatus.load(RESERVATION_STATUS_ACCEPTED));
+            else setListReservationStatus(ListReservationStatus.load(RESERVATION_STATUS_PAYED));
             save();
         }
         else if (getListReservationStatus().getId().equals(RESERVATION_STATUS_ACCEPTED)    ||
                 getListReservationStatus().getId().equals(RESERVATION_STATUS_PREPAYED)     ||
                 getListReservationStatus().getId().equals(RESERVATION_STATUS_PAYED)        ||
                 getListReservationStatus().getId().equals(RESERVATION_STATUS_OVERPAYED) ) {   //оплата прошла
-            if (payed==0) setListReservationStatus(ListReservationStatus.load(RESERVATION_STATUS_ACCEPTED));
+            if (topay==0 && payed==0) setListReservationStatus(ListReservationStatus.load(RESERVATION_STATUS_PAYED));
+            else if(payed == 0) setListReservationStatus(ListReservationStatus.load(RESERVATION_STATUS_ACCEPTED));
             else if (comparedmoney<0) setListReservationStatus(ListReservationStatus.load(RESERVATION_STATUS_PREPAYED));
             else if (comparedmoney==0) setListReservationStatus(ListReservationStatus.load(RESERVATION_STATUS_PAYED));
             else setListReservationStatus(ListReservationStatus.load(RESERVATION_STATUS_OVERPAYED));
@@ -299,7 +365,7 @@
         double topay = 0;
         if (!(getListCurrency()==null)) {
             payed = getSummaPayed(getListCurrency());
-            topay = getSummaToPay(getListCurrency(), getDiscount());
+            topay = getSummaToPay(getListCurrency(), getDiscount(),  null);
         }
 
         int comparedmoney = utils.compareMoney(payed, topay);   //сравнение оплаченного и к оплате
@@ -399,6 +465,19 @@
             }
             else isSuccess = true;
         }
+        else if (status.equals(Reservation.RESERVATION_STATUS_VOIDED)) {
+            List<Service> services = getServices();
+            isSuccess = true;
+            if (services!=null) {
+                for(Service service : services)
+                    if (!service.getPaymentsDone().isEmpty()) {
+                        if (alert) JOptionPane.showMessageDialog(null, "В заявке есть услуги, по которым уже проведены оплаты поставщику.");
+                        isSuccess = false;
+                        break;
+                    }
+            }
+            else isSuccess = true;
+        }
         else isSuccess = true;
 //        if (status.equals(Reservation.RESERVATION_STATUS_MONEYBACK)) { isSuccess = true; }
 //        if (status.equals(Reservation.RESERVATION_STATUS_VOIDED)) isSuccess = true;
@@ -406,6 +485,31 @@
         return isSuccess;
     }
 
+    /**
+     * перевод заявки в статус "аннулирована"
+     * @return
+     */
+    public boolean doVoid() {
+        if (getId()==null) throw new IllegalStateException("Not initialized.");
+        if (!checkStatusChangePossible(Reservation.RESERVATION_STATUS_VOIDED, true)) return false;
+        for (Passenger pas : getPassengers()) {
+            if (!pas.isDeleted()) { pas.delete(); }
+        }
+        //удаляем услуги, не привязанные к пассажирам
+        List<Service> servs = getServices();
+        ArrayList<Service> services = new ArrayList();
+        services.addAll(servs);
+        for(Service service : services)
+            if (!service.isDeleted()) { service.delete(); }
+        
+        //войдируем статус
+        setListReservationStatus(ListReservationStatus.load(Reservation.RESERVATION_STATUS_VOIDED));
+        boolean res = delete();
+        if (!res) utils.getContext().rollbackChanges();
+        return res;
+    }
+
+
 //----------------------------------------------------------------------------
 
     /**
@@ -455,6 +559,7 @@
 //блоки
     /**
      * Основной блок, с которым связывается эта заявка. Берется по блоку первого неудаленного пассажира
+     * Сначала сортируются по убыванию по дате вылета
      * Применяется в финансовом отчете
      * Применяется при определении параметров рейса на вылет для заявки
      * @return
@@ -661,6 +766,10 @@
     }
 //=======================================================================
 //для шаблонов
+    /**
+     * контактный адрес в зависимости от типа заказчика
+     * @return
+     */
     public String getReservationClientAddress() {
         if (getReservationUl()!=null) {
             return getReservationUl().getOrgregAddress();
@@ -671,7 +780,10 @@
         return null;
     }
 
-
+    /**
+     * имя контактного лица в зависимости от типа заказчика
+     * @return
+     */
     public String getContactname() {
         if (getId()==null) throw new IllegalStateException("Not initialized.");
         if (getReservationUl()!=null) {
@@ -685,6 +797,89 @@
     }
 
     /**
+     * поставщик услуг в заявке. Имеет смысл когда перепродается чужой тур.
+     * Сначала ищет поставщика проживания. Если не найден, то первого встречного.
+     * Иначе null.
+     * @return
+     */
+    public ClientUl getVendor() {
+        if (getServices()==null || getServices().isEmpty()) ;
+        else {
+            for (Service service : getServices()) {
+                if (service.getListService().getId().equals(PropertiesMgr.getServiceAccomodation())) 
+                    return service.getVendor().getClientUl();
+            }
+            for (Service service : getServices())  return service.getVendor().getClientUl();
+        }
+        return null;
+    }
+
+    /**
+     * оплаты всем поставщикам услуг, кроме перелетов
+     * @return
+     */
+    public double getNonAviaVendorsPayedRoubles() {
+        double summa = 0;
+        for (Service service : getServices()) {
+            if (service.isDeleted()) continue;
+            if (!service.getListService().getId().equals(PropertiesMgr.getServiceAvia())) { //есть неперелетная услуга
+                if (service.getSummaToPayVendor()!=0)
+                    summa += service.getSummaPayedVendor(ListCurrency.load(CurrencyMgr.CURRENCY_ROUBLE_ID));
+            }
+        }
+        return summa;
+    }
+
+    /**
+     * сумма к оплате всем поставщикам услуг, кроме перелетов
+     * @return
+     */
+    public double getNonAviaVendorsToPayRoubles() {
+        double summa = 0;
+        for (Service service : getServices()) {
+            if (service.isDeleted()) continue;
+            if (!service.getListService().getId().equals(PropertiesMgr.getServiceAvia())) { //есть неперелетная услуга
+                if (service.getSummaToPayVendor()!=0)
+                    summa += service.getSummaToPayVendor(ListCurrency.load(CurrencyMgr.CURRENCY_ROUBLE_ID));
+            }
+        }
+        return summa;
+    }
+
+    /**
+     * сумма к оплате по всем перелетам в рублях с учетом скидки по заявке
+     * @return
+     */
+    public double getAviaVendorsToPayDiscountRoubles() {
+        double summa = 0;
+        for (Service service : getServices()) {
+            if (service.isDeleted()) continue;
+            if (!service.getListService().getId().equals(PropertiesMgr.getServiceAvia())) { //есть неперелетная услуга
+                if (service.getSummaToPayVendor()!=0)
+                    summa += service.getSummaToPayVendor(ListCurrency.load(CurrencyMgr.CURRENCY_ROUBLE_ID));
+            }
+        }
+        return summa*((100-this.getDiscount()))/100;
+    }
+
+    /**
+     * сумма к оплате по всем перелетам в рублях с учетом скидки по заявке
+     * @return
+     */
+    public double getAviaVendorsToPayDiscount() {
+        double summa = 0;
+        for (Service service : getServices()) {
+            if (service.isDeleted()) continue;
+            if (!service.getListService().getId().equals(PropertiesMgr.getServiceAvia())) { //есть неперелетная услуга
+                if (service.getSummaToPayVendor()!=0)
+                    summa += service.getSummaToPayVendor(this.getListCurrency());
+            }
+        }
+        return summa*((100-this.getDiscount()))/100;
+    }
+
+
+    /**
      * Получить все оплаты в Payment, без удаленных
      * @return
      */
@@ -718,11 +913,47 @@
 
 
     /**
-     * сумма к оплате без учета услуг.
+     * сумма к оплате в валюте без учета скидки.
      * @return
      */
     public double getSummaToPayNoDiscount() {
-        return getSummaToPay(getListCurrency(), 0);
+        return getSummaToPay(getListCurrency(), 0,  null);
+    }
+
+    /**
+     * для договора
+     * @return
+     */
+    public String getPassengersDetailed() {
+        utils.getLogger().debug("getPassengersDetailed called");
+        String result = "";
+        SimpleDateFormat sdf = new SimpleDateFormat("dd.MM.yyyy");
+        for(Passenger pass : getNonDeletedPassengers() ) {
+            String bd = "";
+            try { bd = sdf.format(pass.getBirthday()); }
+            catch (Exception ex) { bd="---"; }
+
+            String ac = "";
+            try { ac = sdf.format(pass.getActive()); }
+            catch (Exception ex) { ac="---"; }
+
+            result += pass.getFamily()+" "+pass.getName()+" | "+bd+" | "+pass.getSerial()+" | "+ac+"\n";
+        }
+        return result;
+    }
+
+    /**
+     * Дата, на которую надо пересчитывать суммы к оплате
+     * зависит от даты подтверждения или счета, в зависимости от настроек
+     * если нет ни того ни другого, то на сегодня
+     */
+    public Date getReportDate() {
+        Date calcdate = new Date();
+        if (!PropertiesMgr.getProperty("useConfirmdate", PropertiesMgr.PROP_NOT_EXIST).equals(PropertiesMgr.PROP_NOT_EXIST))
+            calcdate = getDateConfirm();
+        else calcdate = getDateBill();
+        if (calcdate==null) calcdate = new Date();
+        return calcdate;
     }
 //===================================================================================
 
@@ -748,6 +979,7 @@
      */
     @Override
     protected void onPostAdd() {
+        utils.getLogger().debug("Reservation.onPostAdd called");
         setIdOffer(0);
         setSummaReserved(0);
         setSummaPayed(0);
@@ -788,7 +1020,7 @@
     HashMap origvalues = new HashMap();
 
         String props[] = {
-    Reservation.BILLDATE_PROPERTY,
+    Reservation.DATE_BILL_PROPERTY,
     Reservation.COMMENT_PROPERTY,
     Reservation.DATE_RESERVED_PROPERTY,
     Reservation.DELETEDATE_PROPERTY,
@@ -798,10 +1030,10 @@
     Reservation.FAX_PROPERTY,
     Reservation.ICQ_PROPERTY,
     Reservation.ISFROZEN_PROPERTY,
-    Reservation.PAY_DATE_PROPERTY,
+    Reservation.DATE_PAY_PROPERTY,
     Reservation.PERCENT_COMMISSION_PROPERTY,
     Reservation.PHONE_PROPERTY,
-    Reservation.PREPAY_DATE_PROPERTY,
+    Reservation.DATE_PREPAY_PROPERTY,
     Reservation.SUMMA_RESERVED_PROPERTY,
     Reservation.CLIENT_PROPERTY,
     Reservation.LIST_COUNTRY_PROPERTY,
@@ -812,7 +1044,8 @@
     Reservation.RESERVATION_FL_PROPERTY,
     Reservation.RESERVATION_UL_PROPERTY,
     Reservation.USER_PROPERTY,
-    Reservation.PERCENT_COMMISSION_PROPERTY
+    Reservation.PERCENT_COMMISSION_PROPERTY,
+    Reservation.DATE_CONFIRM_PROPERTY
         };
 
         String propnames[] = {
@@ -840,8 +1073,8 @@
     "Физлицо",
     "Юрлицо",
     "Менеджер",
-    "Процент комиссии"
-
+    "Процент комиссии",
+    "Дата подтверждения"
         };
 
 }

=== modified file 'src/cbadmin/entity2/ReservationUl.java'
--- src/cbadmin/entity2/ReservationUl.java	2010-11-04 23:24:26 +0000
+++ src/cbadmin/entity2/ReservationUl.java	2011-04-25 18:28:30 +0000
@@ -66,6 +66,7 @@
         copy.setOrgname(this.getOrgname());
         copy.setOrgpostAddress(this.getOrgpostAddress());
         copy.setOrgregAddress(this.getOrgregAddress());
+        copy.setGendir(this.getGendir());
         copy.setIsVendor(this.getIsVendor());
 
         return copy;

=== modified file 'src/cbadmin/entity2/Service.java'
--- src/cbadmin/entity2/Service.java	2010-09-29 11:52:28 +0000
+++ src/cbadmin/entity2/Service.java	2011-04-25 18:28:30 +0000
@@ -30,6 +30,16 @@
         else return null;
     }
 
+    /**
+     * если нет описания услуги, то подставлять её тип
+     * @return
+     */
+    public String getDescription() {
+        if (super.getName().trim().equals("---") || super.getName().trim().isEmpty())
+            return getListService().getName();
+        else return super.getName().trim();
+    }
+
     public void setAutomatic(boolean automatic) {
         if (automatic) setAutomatic(new Byte(new Integer(1).byteValue()));
         else setAutomatic(new Byte(new Integer(0).byteValue()));
@@ -147,7 +157,7 @@
                 continue;
             }
             else
-                payed += payment.getPayed(getListCurrency(), curres)*part;
+                payed += payment.getPayed(getListCurrency(), curres, true)*part;
         }
         utils.getLogger().info("getSummaPayed: summa="+payed);
         return payed;

=== modified file 'src/cbadmin/entity2/ServicePrice.java'
--- src/cbadmin/entity2/ServicePrice.java	2010-08-09 04:15:09 +0000
+++ src/cbadmin/entity2/ServicePrice.java	2011-04-25 18:28:30 +0000
@@ -1,9 +1,10 @@
 package cbadmin.entity2;
 
+import cbadmin.business.PriceInterface;
 import cbadmin.entity2.auto._ServicePrice;
 import java.util.Date;
 
-public class ServicePrice extends _ServicePrice {
+public class ServicePrice extends _ServicePrice implements PriceInterface {
 
     @Override
     public void setDeletedate(Date d) {
@@ -20,4 +21,21 @@
         return null;
     }
 
+    @Override
+    public ServicePrice clone() {
+        ServicePrice per = new ServicePrice();
+        per.setBuyprice(getBuyprice());
+        per.setMarginfix(getMarginfix());
+        per.setMarginpercent(getMarginpercent());
+        per.setSellprice(getSellprice());
+        per.setDateFrom(getDateFrom());
+        per.setDateTo(getDateTo());
+        per.setListCurrency(getListCurrency());
+        per.setListService(getListService());
+        per.setListCountry(getListCountry());
+        per.setVendor(getVendor());
+        per.setListAge(getListAge());
+        per.setPeriod(getPeriod());
+        return per;
+    }
 }

=== modified file 'src/cbadmin/entity2/auto/_Block.java'
--- src/cbadmin/entity2/auto/_Block.java	2010-06-01 20:53:46 +0000
+++ src/cbadmin/entity2/auto/_Block.java	2011-04-25 18:28:30 +0000
@@ -1,5 +1,6 @@
 package cbadmin.entity2.auto;
 
+import java.util.Date;
 import java.util.List;
 
 import cbadmin.entity2.Client;
@@ -19,6 +20,7 @@
 public abstract class _Block extends db_interface {
 
     public static final String CAPACITY_PROPERTY = "capacity";
+    public static final String DELETEDATE_PROPERTY = "deletedate";
     public static final String PRICE_PROPERTY = "price";
     public static final String FLIGHT_PROPERTY = "flight";
     public static final String LIST_CLASS_PROPERTY = "listClass";
@@ -30,12 +32,19 @@
 
     public static final String ID_PK_COLUMN = "id";
 
-    public void setCapacity(short capacity) {
+    public void setCapacity(int capacity) {
         writeProperty("capacity", capacity);
     }
-    public short getCapacity() {
+    public int getCapacity() {
         Object value = readProperty("capacity");
-        return (value != null) ? (Short) value : 0;
+        return (value != null) ? (Integer) value : 0;
+    }
+
+    public void setDeletedate(Date deletedate) {
+        writeProperty("deletedate", deletedate);
+    }
+    public Date getDeletedate() {
+        return (Date)readProperty("deletedate");
     }
 
     public void setPrice(float price) {
@@ -118,6 +127,8 @@
     }
 
 
+    protected abstract void onPostAdd();
+
     protected abstract void onPostUpdate();
 
     protected abstract void onPostLoad();

=== modified file 'src/cbadmin/entity2/auto/_Client.java'
--- src/cbadmin/entity2/auto/_Client.java	2010-08-25 07:05:29 +0000
+++ src/cbadmin/entity2/auto/_Client.java	2011-04-25 18:28:30 +0000
@@ -30,6 +30,7 @@
     public static final String DISCOUNT_PROPERTY = "discount";
     public static final String FAX_PROPERTY = "fax";
     public static final String ICQ_PROPERTY = "icq";
+    public static final String ID_KEY_PROPERTY = "id_key";
     public static final String IS_VENDOR_PROPERTY = "isVendor";
     public static final String NAME_PROPERTY = "name";
     public static final String PASSWORD_PROPERTY = "password";
@@ -104,6 +105,13 @@
         return (String)readProperty("icq");
     }
 
+    public void setId_key(Long id_key) {
+        writeProperty("id_key", id_key);
+    }
+    public Long getId_key() {
+        return (Long)readProperty("id_key");
+    }
+
     public void setIsVendor(Byte isVendor) {
         writeProperty("isVendor", isVendor);
     }

=== modified file 'src/cbadmin/entity2/auto/_ClientFl.java'
--- src/cbadmin/entity2/auto/_ClientFl.java	2010-05-27 16:30:42 +0000
+++ src/cbadmin/entity2/auto/_ClientFl.java	2011-04-25 18:28:30 +0000
@@ -25,6 +25,7 @@
     public static final String CONTACT_PASSPORT_PROPERTY = "contactPassport";
     public static final String CONTACT_PATRONYMIC_PROPERTY = "contactPatronymic";
     public static final String CONTACT_REG_ADDRESS_PROPERTY = "contactRegAddress";
+    public static final String ID_KEY_PROPERTY = "id_key";
     public static final String PASSPORTZ_PROPERTY = "passportz";
     public static final String SEX_PROPERTY = "sex";
     public static final String CLIENT_PROPERTY = "client";
@@ -109,6 +110,13 @@
         return (String)readProperty("contactRegAddress");
     }
 
+    public void setId_key(Long id_key) {
+        writeProperty("id_key", id_key);
+    }
+    public Long getId_key() {
+        return (Long)readProperty("id_key");
+    }
+
     public void setPassportz(String passportz) {
         writeProperty("passportz", passportz);
     }

=== modified file 'src/cbadmin/entity2/auto/_ClientUl.java'
--- src/cbadmin/entity2/auto/_ClientUl.java	2010-05-28 14:23:00 +0000
+++ src/cbadmin/entity2/auto/_ClientUl.java	2011-04-25 18:28:30 +0000
@@ -13,6 +13,7 @@
  */
 public abstract class _ClientUl extends db_interface {
 
+    public static final String GENDIR_PROPERTY = "gendir";
     public static final String ORGAGREE_DATE_PROPERTY = "orgagreeDate";
     public static final String ORGAGREE_END_PROPERTY = "orgagreeEnd";
     public static final String ORGAGREE_NUM_PROPERTY = "orgagreeNum";
@@ -31,6 +32,13 @@
 
     public static final String ID_CLIENT_PK_COLUMN = "id_client";
 
+    public void setGendir(String gendir) {
+        writeProperty("gendir", gendir);
+    }
+    public String getGendir() {
+        return (String)readProperty("gendir");
+    }
+
     public void setOrgagreeDate(Date orgagreeDate) {
         writeProperty("orgagreeDate", orgagreeDate);
     }

=== modified file 'src/cbadmin/entity2/auto/_FlightProgram.java'
--- src/cbadmin/entity2/auto/_FlightProgram.java	2010-04-09 06:21:55 +0000
+++ src/cbadmin/entity2/auto/_FlightProgram.java	2011-04-25 18:28:30 +0000
@@ -4,6 +4,7 @@
 import java.util.List;
 
 import cbadmin.entity2.Flight;
+import cbadmin.entity2.FlightProgram;
 import cbadmin.entity2.FlightProgramPeriods;
 import cbadmin.entity2.ListAirline;
 import cbadmin.entity2.ListAirport;
@@ -19,7 +20,8 @@
 
     public static final String DELETEDATE_PROPERTY = "deletedate";
     public static final String FLIGHT_NUM_PROPERTY = "flightNum";
-    public static final String FLIGHT_PROGRAM_PERIODSES_PROPERTY = "flightProgramPeriodses";
+    public static final String FLIGHT_PROGRAM_PAIRED_PROPERTY = "flightProgramPaired";
+    public static final String FLIGHT_PROGRAM_PERIODS_PROPERTY = "flightProgramPeriods";
     public static final String FLIGHTS_PROPERTY = "flights";
     public static final String LIST_AIRLINE_PROPERTY = "listAirline";
     public static final String LIST_AIRPORT_BY_ID_AIRPORT_FROM_PROPERTY = "listAirportByIdAirportFrom";
@@ -41,15 +43,24 @@
         return (String)readProperty("flightNum");
     }
 
-    public void addToFlightProgramPeriodses(FlightProgramPeriods obj) {
-        addToManyTarget("flightProgramPeriodses", obj, true);
-    }
-    public void removeFromFlightProgramPeriodses(FlightProgramPeriods obj) {
-        removeToManyTarget("flightProgramPeriodses", obj, true);
+    public void setFlightProgramPaired(FlightProgram flightProgramPaired) {
+        setToOneTarget("flightProgramPaired", flightProgramPaired, true);
+    }
+
+    public FlightProgram getFlightProgramPaired() {
+        return (FlightProgram)readProperty("flightProgramPaired");
+    }
+
+
+    public void addToFlightProgramPeriods(FlightProgramPeriods obj) {
+        addToManyTarget("flightProgramPeriods", obj, true);
+    }
+    public void removeFromFlightProgramPeriods(FlightProgramPeriods obj) {
+        removeToManyTarget("flightProgramPeriods", obj, true);
     }
     @SuppressWarnings("unchecked")
-    public List<FlightProgramPeriods> getFlightProgramPeriodses() {
-        return (List<FlightProgramPeriods>)readProperty("flightProgramPeriodses");
+    public List<FlightProgramPeriods> getFlightProgramPeriods() {
+        return (List<FlightProgramPeriods>)readProperty("flightProgramPeriods");
     }
 
 

=== modified file 'src/cbadmin/entity2/auto/_ListAge.java'
--- src/cbadmin/entity2/auto/_ListAge.java	2010-09-21 14:26:29 +0000
+++ src/cbadmin/entity2/auto/_ListAge.java	2011-04-25 18:28:30 +0000
@@ -27,18 +27,20 @@
 
     public static final String ID_PK_COLUMN = "id";
 
-    public void setAgefrom(Byte agefrom) {
+    public void setAgefrom(int agefrom) {
         writeProperty("agefrom", agefrom);
     }
-    public Byte getAgefrom() {
-        return (Byte)readProperty("agefrom");
+    public int getAgefrom() {
+        Object value = readProperty("agefrom");
+        return (value != null) ? (Integer) value : 0;
     }
 
-    public void setAgeto(Byte ageto) {
+    public void setAgeto(int ageto) {
         writeProperty("ageto", ageto);
     }
-    public Byte getAgeto() {
-        return (Byte)readProperty("ageto");
+    public int getAgeto() {
+        Object value = readProperty("ageto");
+        return (value != null) ? (Integer) value : 0;
     }
 
     public void setDeletedate(Date deletedate) {
@@ -55,25 +57,28 @@
         return (Byte)readProperty("frozen");
     }
 
-    public void setIsAdult(Byte isAdult) {
+    public void setIsAdult(int isAdult) {
         writeProperty("isAdult", isAdult);
     }
-    public Byte getIsAdult() {
-        return (Byte)readProperty("isAdult");
+    public int getIsAdult() {
+        Object value = readProperty("isAdult");
+        return (value != null) ? (Integer) value : 0;
     }
 
-    public void setIsChild(Byte isChild) {
+    public void setIsChild(int isChild) {
         writeProperty("isChild", isChild);
     }
-    public Byte getIsChild() {
-        return (Byte)readProperty("isChild");
+    public int getIsChild() {
+        Object value = readProperty("isChild");
+        return (value != null) ? (Integer) value : 0;
     }
 
-    public void setIsInfant(Byte isInfant) {
+    public void setIsInfant(int isInfant) {
         writeProperty("isInfant", isInfant);
     }
-    public Byte getIsInfant() {
-        return (Byte)readProperty("isInfant");
+    public int getIsInfant() {
+        Object value = readProperty("isInfant");
+        return (value != null) ? (Integer) value : 0;
     }
 
     public void setName(String name) {

=== modified file 'src/cbadmin/entity2/auto/_ListCountry.java'
--- src/cbadmin/entity2/auto/_ListCountry.java	2010-08-25 07:05:29 +0000
+++ src/cbadmin/entity2/auto/_ListCountry.java	2011-04-25 18:28:30 +0000
@@ -5,6 +5,7 @@
 
 import cbadmin.entity2.ListAirline;
 import cbadmin.entity2.ListCity;
+import cbadmin.entity2.ListCurrency;
 import cbadmin.entity2.Reservation;
 import cbadmin.entity2.ServicePrice;
 import cbadmin.entity2.VendorPreferred;
@@ -24,6 +25,7 @@
     public static final String WEBSHOW_PROPERTY = "webshow";
     public static final String LIST_AIRLINES_PROPERTY = "listAirlines";
     public static final String LIST_CITIES_PROPERTY = "listCities";
+    public static final String PREFERRED_CURRENCY_PROPERTY = "preferredCurrency";
     public static final String RESERVATIONS_PROPERTY = "reservations";
     public static final String SERVICE_PRICE_ARRAY_PROPERTY = "servicePriceArray";
     public static final String VENDOR_PREFERRED_ARRAY_PROPERTY = "vendorPreferredArray";
@@ -82,6 +84,15 @@
     }
 
 
+    public void setPreferredCurrency(ListCurrency preferredCurrency) {
+        setToOneTarget("preferredCurrency", preferredCurrency, true);
+    }
+
+    public ListCurrency getPreferredCurrency() {
+        return (ListCurrency)readProperty("preferredCurrency");
+    }
+
+
     public void addToReservations(Reservation obj) {
         addToManyTarget("reservations", obj, true);
     }

=== added file 'src/cbadmin/entity2/auto/_ListEmail.java'
--- src/cbadmin/entity2/auto/_ListEmail.java	1970-01-01 00:00:00 +0000
+++ src/cbadmin/entity2/auto/_ListEmail.java	2011-04-25 18:28:30 +0000
@@ -0,0 +1,67 @@
+package cbadmin.entity2.auto;
+
+import java.util.Date;
+
+import cbadmin.entity2.db_interface;
+
+/**
+ * Class _ListEmail was generated by Cayenne.
+ * It is probably a good idea to avoid changing this class manually,
+ * since it may be overwritten next time code is regenerated.
+ * If you need to make any customizations, please use subclass.
+ */
+public abstract class _ListEmail extends db_interface {
+
+    public static final String CLIENT_TYPE_PROPERTY = "clientType";
+    public static final String DELETEDATE_PROPERTY = "deletedate";
+    public static final String EMAIL_BODY_PROPERTY = "emailBody";
+    public static final String EMAIL_SUBJECT_PROPERTY = "emailSubject";
+    public static final String FROZEN_PROPERTY = "frozen";
+    public static final String NAME_PROPERTY = "name";
+
+    public static final String ID_PK_COLUMN = "id";
+
+    public void setClientType(int clientType) {
+        writeProperty("clientType", clientType);
+    }
+    public int getClientType() {
+        Object value = readProperty("clientType");
+        return (value != null) ? (Integer) value : 0;
+    }
+
+    public void setDeletedate(Date deletedate) {
+        writeProperty("deletedate", deletedate);
+    }
+    public Date getDeletedate() {
+        return (Date)readProperty("deletedate");
+    }
+
+    public void setEmailBody(String emailBody) {
+        writeProperty("emailBody", emailBody);
+    }
+    public String getEmailBody() {
+        return (String)readProperty("emailBody");
+    }
+
+    public void setEmailSubject(String emailSubject) {
+        writeProperty("emailSubject", emailSubject);
+    }
+    public String getEmailSubject() {
+        return (String)readProperty("emailSubject");
+    }
+
+    public void setFrozen(Byte frozen) {
+        writeProperty("frozen", frozen);
+    }
+    public Byte getFrozen() {
+        return (Byte)readProperty("frozen");
+    }
+
+    public void setName(String name) {
+        writeProperty("name", name);
+    }
+    public String getName() {
+        return (String)readProperty("name");
+    }
+
+}