Index: modules/uoa-goldoa-service/branches/hibernate/src/main/java/eu/dnetlib/goldoa/service/dao/BudgetCommentDAO.java
===================================================================
--- modules/uoa-goldoa-service/branches/hibernate/src/main/java/eu/dnetlib/goldoa/service/dao/BudgetCommentDAO.java	(revision 45563)
+++ modules/uoa-goldoa-service/branches/hibernate/src/main/java/eu/dnetlib/goldoa/service/dao/BudgetCommentDAO.java	(nonexistent)
@@ -1,17 +0,0 @@
-/*
-package eu.dnetlib.goldoa.service.dao;
-
-
-import java.util.List;
-
-import eu.dnetlib.goldoa.domain.BudgetComment;
-import eu.dnetlib.goldoa.domain.Comment;
-
-public class BudgetCommentDAO  extends AbstractDao<String, BudgetComment>{
-	
-	List<Comment> getBudgetComments(String budgetId){
-		
-	}
-
-}
-*/
Index: modules/uoa-goldoa-service/branches/hibernate/.idea/workspace.xml
===================================================================
--- modules/uoa-goldoa-service/branches/hibernate/.idea/workspace.xml	(revision 45563)
+++ modules/uoa-goldoa-service/branches/hibernate/.idea/workspace.xml	(revision 45564)
@@ -29,36 +29,31 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="Journal.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/Journal.java">
+      <file leaf-file-name="JournalDAO.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/dao/JournalDAO.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="540">
-              <caret line="66" column="22" lean-forward="false" selection-start-line="66" selection-start-column="22" selection-end-line="66" selection-end-column="22" />
-              <folding>
-                <element signature="e#2934#2935#0" expanded="true" />
-                <element signature="e#2967#2968#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="301">
+              <caret line="34" column="27" lean-forward="false" selection-start-line="34" selection-start-column="27" selection-end-line="34" selection-end-column="27" />
+              <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="JournalManagerImpl.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/JournalManagerImpl.java">
+      <file leaf-file-name="BudgetDAO.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/dao/BudgetDAO.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="324">
-              <caret line="28" column="0" lean-forward="false" selection-start-line="28" selection-start-column="0" selection-end-line="28" selection-end-column="0" />
-              <folding>
-                <element signature="e#848#849#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="2034">
+              <caret line="205" column="26" lean-forward="false" selection-start-line="205" selection-start-column="26" selection-end-line="205" selection-end-column="26" />
+              <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="Publisher.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/Publisher.java">
+      <file leaf-file-name="ProjectDAO.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/dao/ProjectDAO.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="504">
-              <caret line="28" column="36" lean-forward="true" selection-start-line="28" selection-start-column="36" selection-end-line="28" selection-end-column="36" />
+            <state relative-caret-position="560">
+              <caret line="68" column="99" lean-forward="false" selection-start-line="68" selection-start-column="8" selection-end-line="68" selection-end-column="99" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -66,85 +61,69 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="hibernate-cfg.xml" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/test/resources/hibernate-cfg.xml">
+      <file leaf-file-name="BudgetTest.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/test/java/unitest/BudgetTest.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="106">
-              <caret line="32" column="68" lean-forward="false" selection-start-line="32" selection-start-column="68" selection-end-line="32" selection-end-column="68" />
+            <state relative-caret-position="430">
+              <caret line="44" column="0" lean-forward="true" selection-start-line="44" selection-start-column="0" selection-end-line="44" selection-end-column="0" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="JournalDiscount.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/JournalDiscount.java">
+      <file leaf-file-name="Journal.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/Journal.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="468">
-              <caret line="29" column="39" lean-forward="false" selection-start-line="29" selection-start-column="39" selection-end-line="29" selection-end-column="39" />
-              <folding>
-                <element signature="e#731#732#0" expanded="true" />
-                <element signature="e#750#751#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="432">
+              <caret line="66" column="22" lean-forward="false" selection-start-line="66" selection-start-column="22" selection-end-line="66" selection-end-column="22" />
+              <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="JournalDiscountPK.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/JournalDiscountPK.java">
+      <file leaf-file-name="JournalDiscount.java" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/JournalDiscount.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="448">
-              <caret line="34" column="37" lean-forward="false" selection-start-line="34" selection-start-column="37" selection-end-line="34" selection-end-column="37" />
+            <state relative-caret-position="304">
+              <caret line="29" column="39" lean-forward="false" selection-start-line="29" selection-start-column="39" selection-end-line="29" selection-end-column="39" />
               <folding>
-                <element signature="imports" expanded="true" />
+                <element signature="e#731#732#0" expanded="true" />
+                <element signature="e#750#751#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="JournalDAO.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/dao/JournalDAO.java">
+      <file leaf-file-name="PublisherManagerImpl.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/PublisherManagerImpl.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="250">
-              <caret line="34" column="0" lean-forward="false" selection-start-line="34" selection-start-column="0" selection-end-line="34" selection-end-column="0" />
+            <state relative-caret-position="160">
+              <caret line="48" column="0" lean-forward="false" selection-start-line="48" selection-start-column="0" selection-end-line="48" selection-end-column="0" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="BudgetTest.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/test/java/unitest/BudgetTest.java">
+      <file leaf-file-name="PublisherDAO.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/dao/PublisherDAO.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="378">
-              <caret line="41" column="25" lean-forward="false" selection-start-line="41" selection-start-column="25" selection-end-line="41" selection-end-column="25" />
+            <state relative-caret-position="234">
+              <caret line="18" column="34" lean-forward="false" selection-start-line="18" selection-start-column="34" selection-end-line="18" selection-end-column="34" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="BankAccount.java" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/BankAccount.java">
+      <file leaf-file-name="PublicationDAO.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/dao/PublicationDAO.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-304">
-              <caret line="14" column="7" lean-forward="true" selection-start-line="14" selection-start-column="7" selection-end-line="14" selection-end-column="7" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+            <state relative-caret-position="-232">
+              <caret line="24" column="67" lean-forward="false" selection-start-line="24" selection-start-column="28" selection-end-line="24" selection-end-column="67" />
+              <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="ProjectDAO.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/dao/ProjectDAO.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="290">
-              <caret line="68" column="99" lean-forward="true" selection-start-line="68" selection-start-column="8" selection-end-line="68" selection-end-column="99" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -172,9 +151,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/HelpManagerImpl.java" />
-        <option value="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/utils/Scheduler.java" />
-        <option value="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/UserRolePK.java" />
         <option value="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/PublicationAffiliation.java" />
         <option value="$PROJECT_DIR$/src/test/java/unitest/TestUserDAO.java" />
         <option value="$PROJECT_DIR$/src/test/java/unitest/TestUserSystemUtils.java" />
@@ -219,9 +195,13 @@
         <option value="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/JournalDiscountPK.java" />
         <option value="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/Organization.java" />
         <option value="$PROJECT_DIR$/src/test/resources/hibernate-cfg.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/Journal.java" />
+        <option value="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/dao/BudgetCommentDAO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/eligibility/AccountingEligibilityManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/stats/StatsManagerImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/stats/StatsManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/dao/JournalDAO.java" />
         <option value="$PROJECT_DIR$/src/test/java/unitest/BudgetTest.java" />
-        <option value="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/Journal.java" />
       </list>
     </option>
   </component>
@@ -299,9 +279,13 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="resources" />
+              <option name="myItemId" value="java" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="unitest" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
           </PATH>
           <PATH>
             <PATH_ELEMENT>
@@ -317,17 +301,9 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="test" />
+              <option name="myItemId" value="main" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="java" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="unitest" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
           </PATH>
           <PATH>
             <PATH_ELEMENT>
@@ -346,6 +322,10 @@
               <option name="myItemId" value="main" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
           </PATH>
           <PATH>
             <PATH_ELEMENT>
@@ -368,6 +348,14 @@
               <option name="myItemId" value="java" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="goldoa" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="service" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
           </PATH>
           <PATH>
             <PATH_ELEMENT>
@@ -394,6 +382,14 @@
               <option name="myItemId" value="goldoa" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="service" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="dao" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
           </PATH>
           <PATH>
             <PATH_ELEMENT>
@@ -453,6 +449,192 @@
       <recent name="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain" />
     </key>
   </component>
+  <component name="RestoreUpdateTree" date="Moments ago" ActionInfo="_Update">
+    <UpdatedFiles>
+      <FILE-GROUP>
+        <option name="myUpdateName" value="Updated from server" />
+        <option name="myStatusName" value="Changed on server" />
+        <option name="mySupportsDeletion" value="false" />
+        <option name="myCanBeAbsent" value="false" />
+        <option name="myId" value="CHANGED_ON_SERVER" />
+        <FILE-GROUP>
+          <option name="myUpdateName" value="Updated" />
+          <option name="myStatusName" value="Changed" />
+          <option name="mySupportsDeletion" value="false" />
+          <option name="myCanBeAbsent" value="false" />
+          <option name="myId" value="UPDATED" />
+          <PATH vcs="svn" revision="45561">$PROJECT_DIR$/hibernate/src/test/java/unitest/BudgetTest.java</PATH>
+          <PATH vcs="svn" revision="45561">$PROJECT_DIR$/hibernate/src/test/resources/hibernate-cfg.xml</PATH>
+          <PATH vcs="svn" revision="45561">$PROJECT_DIR$/hibernate/src/main/java/eu/dnetlib/goldoa/service/PublisherManagerImpl.java</PATH>
+          <PATH vcs="svn" revision="45561">$PROJECT_DIR$/hibernate/src/main/java/eu/dnetlib/goldoa/service/dao/BudgetDAO.java</PATH>
+          <PATH vcs="svn" revision="45561">$PROJECT_DIR$/hibernate/src/main/java/eu/dnetlib/goldoa/service/dao/JournalDAO.java</PATH>
+          <PATH vcs="svn" revision="45561">$PROJECT_DIR$/hibernate/src/main/java/eu/dnetlib/goldoa/service/PublicationManagerImpl.java</PATH>
+          <PATH vcs="svn" revision="45561">$PROJECT_DIR$/hibernate/src/main/java/eu/dnetlib/goldoa/service/BudgetManagerImpl.java</PATH>
+          <PATH vcs="svn" revision="45561">$PROJECT_DIR$/hibernate/src/main/java/eu/dnetlib/goldoa/domain/Organization.java</PATH>
+          <PATH vcs="svn" revision="45561">$PROJECT_DIR$/hibernate/src/main/java/eu/dnetlib/goldoa/domain/PublisherDiscount.java</PATH>
+          <PATH vcs="svn" revision="45561">$PROJECT_DIR$/hibernate/src/main/java/eu/dnetlib/goldoa/domain/Journal.java</PATH>
+          <PATH vcs="svn" revision="45561">$PROJECT_DIR$/hibernate/src/main/java/eu/dnetlib/goldoa/domain/User.java</PATH>
+          <PATH vcs="svn" revision="45561">$PROJECT_DIR$/hibernate/src/main/java/eu/dnetlib/goldoa/domain/Publisher.java</PATH>
+          <PATH vcs="svn" revision="45561">$PROJECT_DIR$/hibernate/src/main/java/eu/dnetlib/goldoa/domain/Budget.java</PATH>
+          <PATH vcs="svn" revision="45561">$PROJECT_DIR$/hibernate/src/main/java/eu/dnetlib/goldoa/domain/JournalDiscount.java</PATH>
+          <PATH vcs="svn" revision="45561">$PROJECT_DIR$/hibernate</PATH>
+        </FILE-GROUP>
+        <FILE-GROUP>
+          <option name="myUpdateName" value="Created" />
+          <option name="myStatusName" value="Created" />
+          <option name="mySupportsDeletion" value="false" />
+          <option name="myCanBeAbsent" value="false" />
+          <option name="myId" value="CREATED" />
+          <PATH vcs="svn" revision="45561">$PROJECT_DIR$/hibernate/.idea</PATH>
+          <PATH vcs="svn" revision="45561">$PROJECT_DIR$/hibernate/.idea/modules.xml</PATH>
+          <PATH vcs="svn" revision="45561">$PROJECT_DIR$/hibernate/.idea/encodings.xml</PATH>
+          <PATH vcs="svn" revision="45561">$PROJECT_DIR$/hibernate/.idea/compiler.xml</PATH>
+          <PATH vcs="svn" revision="45561">$PROJECT_DIR$/hibernate/.idea/misc.xml</PATH>
+          <PATH vcs="svn" revision="45561">$PROJECT_DIR$/hibernate/.idea/vcs.xml</PATH>
+          <PATH vcs="svn" revision="45561">$PROJECT_DIR$/hibernate/.idea/libraries</PATH>
+          <PATH vcs="svn" revision="45561">$PROJECT_DIR$/hibernate/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_5_0.xml</PATH>
+          <PATH vcs="svn" revision="45561">$PROJECT_DIR$/hibernate/.idea/libraries/Maven__postgresql_postgresql_9_1_901_jdbc4.xml</PATH>
+          <PATH vcs="svn" revision="45561">$PROJECT_DIR$/hibernate/.idea/libraries/Maven__org_springframework_spring_context_4_0_0_RELEASE.xml</PATH>
+          <PATH vcs="svn" revision="45561">$PROJECT_DIR$/hibernate/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml</PATH>
+          <PATH vcs="svn" revision="45561">$PROJECT_DIR$/hibernate/.idea/libraries/Maven__org_springframework_spring_beans_4_0_0_RELEASE.xml</PATH>
+          <PATH vcs="svn" revision="45561">$PROJECT_DIR$/hibernate/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml</PATH>
+          <PATH vcs="svn" revision="45561">$PROJECT_DIR$/hibernate/.idea/libraries/Maven__org_springframework_spring_tx_4_0_0_RELEASE.xml</PATH>
+          <PATH vcs="svn" revision="45561">$PROJECT_DIR$/hibernate/.idea/libraries/Maven__com_google_gwt_gwt_servlet_2_7_0.xml</PATH>
+          <PATH vcs="svn" revision="45561">$PROJECT_DIR$/hibernate/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml</PATH>
+          <PATH vcs="svn" revision="45561">$PROJECT_DIR$/hibernate/.idea/libraries/Maven__org_hsqldb_hsqldb_2_2_9.xml</PATH>
+          <PATH vcs="svn" revision="45561">$PROJECT_DIR$/hibernate/.idea/libraries/Maven__javax_validation_validation_api_1_0_0_GA.xml</PATH>
+          <PATH vcs="svn" revision="45561">$PROJECT_DIR$/hibernate/.idea/libraries/Maven__javax_activation_activation_1_1.xml</PATH>
+          <PATH vcs="svn" revision="45561">$PROJECT_DIR$/hibernate/.idea/libraries/Maven__xml_apis_xml_apis_1_4_01.xml</PATH>
+          <PATH vcs="svn" revision="45561">$PROJECT_DIR$/hibernate/.idea/libraries/Maven__com_opencsv_opencsv_3_5.xml</PATH>
+          <PATH vcs="svn" revision="45561">$PROJECT_DIR$/hibernate/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml</PATH>
+          <PATH vcs="svn" revision="45561">$PROJECT_DIR$/hibernate/.idea/libraries/Maven__commons_codec_commons_codec_1_10.xml</PATH>
+          <PATH vcs="svn" revision="45561">$PROJECT_DIR$/hibernate/.idea/libraries/Maven__javax_mail_mail_1_4.xml</PATH>
+          <PATH vcs="svn" revision="45561">$PROJECT_DIR$/hibernate/.idea/libraries/Maven__xerces_xercesImpl_2_11_0.xml</PATH>
+          <PATH vcs="svn" revision="45561">$PROJECT_DIR$/hibernate/.idea/libraries/Maven__org_javassist_javassist_3_18_1_GA.xml</PATH>
+          <PATH vcs="svn" revision="45561">$PROJECT_DIR$/hibernate/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml</PATH>
+          <PATH vcs="svn" revision="45561">$PROJECT_DIR$/hibernate/.idea/libraries/Maven__junit_junit_4_12.xml</PATH>
+          <PATH vcs="svn" revision="45561">$PROJECT_DIR$/hibernate/.idea/libraries/Maven__commons_io_commons_io_2_4.xml</PATH>
+          <PATH vcs="svn" revision="45561">$PROJECT_DIR$/hibernate/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml</PATH>
+          <PATH vcs="svn" revision="45561">$PROJECT_DIR$/hibernate/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml</PATH>
+          <PATH vcs="svn" revision="45561">$PROJECT_DIR$/hibernate/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml</PATH>
+          <PATH vcs="svn" revision="45561">$PROJECT_DIR$/hibernate/.idea/libraries/Maven__com_google_gwt_gwt_user_2_7_0.xml</PATH>
+          <PATH vcs="svn" revision="45561">$PROJECT_DIR$/hibernate/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml</PATH>
+          <PATH vcs="svn" revision="45561">$PROJECT_DIR$/hibernate/.idea/libraries/Maven__commons_logging_commons_logging_1_1_1.xml</PATH>
+          <PATH vcs="svn" revision="45561">$PROJECT_DIR$/hibernate/.idea/libraries/Maven__org_springframework_spring_core_4_0_0_RELEASE.xml</PATH>
+          <PATH vcs="svn" revision="45561">$PROJECT_DIR$/hibernate/.idea/libraries/Maven__net_sf_ehcache_ehcache_2_9_0.xml</PATH>
+          <PATH vcs="svn" revision="45561">$PROJECT_DIR$/hibernate/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_5_1.xml</PATH>
+          <PATH vcs="svn" revision="45561">$PROJECT_DIR$/hibernate/.idea/libraries/Maven__org_springframework_spring_orm_4_0_0_RELEASE.xml</PATH>
+          <PATH vcs="svn" revision="45561">$PROJECT_DIR$/hibernate/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml</PATH>
+          <PATH vcs="svn" revision="45561">$PROJECT_DIR$/hibernate/.idea/libraries/Maven__org_springframework_spring_expression_4_0_0_RELEASE.xml</PATH>
+          <PATH vcs="svn" revision="45561">$PROJECT_DIR$/hibernate/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_7_3.xml</PATH>
+          <PATH vcs="svn" revision="45561">$PROJECT_DIR$/hibernate/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml</PATH>
+          <PATH vcs="svn" revision="45561">$PROJECT_DIR$/hibernate/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_0_RELEASE.xml</PATH>
+          <PATH vcs="svn" revision="45561">$PROJECT_DIR$/hibernate/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml</PATH>
+          <PATH vcs="svn" revision="45561">$PROJECT_DIR$/hibernate/.idea/libraries/Maven__antlr_antlr_2_7_7.xml</PATH>
+          <PATH vcs="svn" revision="45561">$PROJECT_DIR$/hibernate/.idea/libraries/Maven__javax_validation_validation_api_sources_1_0_0_GA.xml</PATH>
+          <PATH vcs="svn" revision="45561">$PROJECT_DIR$/hibernate/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml</PATH>
+          <PATH vcs="svn" revision="45561">$PROJECT_DIR$/hibernate/.idea/libraries/Maven__org_aspectj_aspectjtools_1_7_3.xml</PATH>
+          <PATH vcs="svn" revision="45561">$PROJECT_DIR$/hibernate/.idea/libraries/Maven__log4j_log4j_1_2_17.xml</PATH>
+          <PATH vcs="svn" revision="45561">$PROJECT_DIR$/hibernate/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_5_1.xml</PATH>
+          <PATH vcs="svn" revision="45561">$PROJECT_DIR$/hibernate/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml</PATH>
+          <PATH vcs="svn" revision="45561">$PROJECT_DIR$/hibernate/.idea/libraries/Maven__org_springframework_spring_aop_4_0_0_RELEASE.xml</PATH>
+          <PATH vcs="svn" revision="45561">$PROJECT_DIR$/hibernate/.idea/libraries/Maven__org_springframework_spring_test_4_0_0_RELEASE.xml</PATH>
+          <PATH vcs="svn" revision="45561">$PROJECT_DIR$/hibernate/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_0_RELEASE.xml</PATH>
+          <PATH vcs="svn" revision="45561">$PROJECT_DIR$/hibernate/.idea/workspace.xml</PATH>
+          <PATH vcs="svn" revision="45561">$PROJECT_DIR$/hibernate/target</PATH>
+          <PATH vcs="svn" revision="45561">$PROJECT_DIR$/hibernate/target/classes</PATH>
+          <PATH vcs="svn" revision="45561">$PROJECT_DIR$/hibernate/src/main/java/eu/dnetlib/goldoa/domain/BudgetContract.java</PATH>
+          <PATH vcs="svn" revision="45561">$PROJECT_DIR$/hibernate/src/main/java/eu/dnetlib/goldoa/domain/BankAccount.java</PATH>
+          <PATH vcs="svn" revision="45561">$PROJECT_DIR$/hibernate/src/main/java/eu/dnetlib/goldoa/domain/BankTransferReceipt.java</PATH>
+        </FILE-GROUP>
+        <FILE-GROUP>
+          <option name="myUpdateName" value="Deleted" />
+          <option name="myStatusName" value="Deleted" />
+          <option name="mySupportsDeletion" value="false" />
+          <option name="myCanBeAbsent" value="true" />
+          <option name="myId" value="REMOVED_FROM_REPOSITORY" />
+          <PATH vcs="svn" revision="45561">$PROJECT_DIR$/hibernate/src/main/java/eu/dnetlib/goldoa/domain/BudgetComment.java</PATH>
+        </FILE-GROUP>
+        <FILE-GROUP>
+          <option name="myUpdateName" value="Restored" />
+          <option name="myStatusName" value="Will be restored" />
+          <option name="mySupportsDeletion" value="false" />
+          <option name="myCanBeAbsent" value="false" />
+          <option name="myId" value="RESTORED" />
+        </FILE-GROUP>
+      </FILE-GROUP>
+      <FILE-GROUP>
+        <option name="myUpdateName" value="Modified" />
+        <option name="myStatusName" value="Modified" />
+        <option name="mySupportsDeletion" value="false" />
+        <option name="myCanBeAbsent" value="false" />
+        <option name="myId" value="MODIFIED" />
+      </FILE-GROUP>
+      <FILE-GROUP>
+        <option name="myUpdateName" value="Skipped" />
+        <option name="myStatusName" value="Skipped" />
+        <option name="mySupportsDeletion" value="false" />
+        <option name="myCanBeAbsent" value="false" />
+        <option name="myId" value="SKIPPED" />
+      </FILE-GROUP>
+      <FILE-GROUP>
+        <option name="myUpdateName" value="Merged with conflicts" />
+        <option name="myStatusName" value="Will be merged with conflicts" />
+        <option name="mySupportsDeletion" value="false" />
+        <option name="myCanBeAbsent" value="false" />
+        <option name="myId" value="MERGED_WITH_CONFLICTS" />
+      </FILE-GROUP>
+      <FILE-GROUP>
+        <option name="myUpdateName" value="Merged with tree conflicts" />
+        <option name="myStatusName" value="Merged with tree conflicts" />
+        <option name="mySupportsDeletion" value="false" />
+        <option name="myCanBeAbsent" value="false" />
+        <option name="myId" value="MERGED_WITH_TREE_CONFLICT" />
+      </FILE-GROUP>
+      <FILE-GROUP>
+        <option name="myUpdateName" value="Merged with property conflicts" />
+        <option name="myStatusName" value="Will be merged with property conflicts" />
+        <option name="mySupportsDeletion" value="false" />
+        <option name="myCanBeAbsent" value="false" />
+        <option name="myId" value="MERGED_WITH_PROPERTY_CONFLICT" />
+      </FILE-GROUP>
+      <FILE-GROUP>
+        <option name="myUpdateName" value="Merged" />
+        <option name="myStatusName" value="Will be merged" />
+        <option name="mySupportsDeletion" value="false" />
+        <option name="myCanBeAbsent" value="false" />
+        <option name="myId" value="MERGED" />
+      </FILE-GROUP>
+      <FILE-GROUP>
+        <option name="myUpdateName" value="Not in repository" />
+        <option name="myStatusName" value="Not in repository" />
+        <option name="mySupportsDeletion" value="true" />
+        <option name="myCanBeAbsent" value="false" />
+        <option name="myId" value="UNKNOWN" />
+      </FILE-GROUP>
+      <FILE-GROUP>
+        <option name="myUpdateName" value="Locally added" />
+        <option name="myStatusName" value="Locally added" />
+        <option name="mySupportsDeletion" value="false" />
+        <option name="myCanBeAbsent" value="false" />
+        <option name="myId" value="LOCALLY_ADDED" />
+      </FILE-GROUP>
+      <FILE-GROUP>
+        <option name="myUpdateName" value="Locally removed" />
+        <option name="myStatusName" value="Locally removed" />
+        <option name="mySupportsDeletion" value="false" />
+        <option name="myCanBeAbsent" value="false" />
+        <option name="myId" value="LOCALLY_REMOVED" />
+      </FILE-GROUP>
+      <FILE-GROUP>
+        <option name="myUpdateName" value="Switched" />
+        <option name="myStatusName" value="Switched" />
+        <option name="mySupportsDeletion" value="false" />
+        <option name="myCanBeAbsent" value="false" />
+        <option name="myId" value="SWITCHED" />
+      </FILE-GROUP>
+    </UpdatedFiles>
+  </component>
   <component name="RunManager" selected="JUnit.BudgetTest">
     <configuration default="false" name="UserActionsTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
@@ -506,7 +688,9 @@
       </option>
       <envs />
       <patterns />
-      <method />
+      <method>
+        <option name="Make" enabled="true" />
+      </method>
     </configuration>
     <configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
       <module name="" />
@@ -812,35 +996,35 @@
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="BudgetTest - 2017.01.24 at 15h 53m 54s.xml">
+    <history-entry file="BudgetTest - 2017.01.24 at 17h 01m 52s.xml">
       <configuration name="BudgetTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="BudgetTest - 2017.01.24 at 16h 01m 22s.xml">
+    <history-entry file="BudgetTest - 2017.01.24 at 17h 02m 07s.xml">
       <configuration name="BudgetTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="BudgetTest - 2017.01.24 at 16h 03m 25s.xml">
+    <history-entry file="BudgetTest - 2017.01.24 at 17h 03m 03s.xml">
       <configuration name="BudgetTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="BudgetTest - 2017.01.24 at 16h 03m 45s.xml">
+    <history-entry file="BudgetTest - 2017.01.24 at 17h 05m 13s.xml">
       <configuration name="BudgetTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="UserActionsTest - 2017.01.24 at 14h 58m 09s.xml">
-      <configuration name="UserActionsTest" configurationId="JUnit" />
+    <history-entry file="BudgetTest - 2017.01.24 at 17h 05m 35s.xml">
+      <configuration name="BudgetTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="UserActionsTest - 2017.01.24 at 14h 58m 49s.xml">
-      <configuration name="UserActionsTest" configurationId="JUnit" />
+    <history-entry file="BudgetTest - 2017.01.24 at 17h 05m 41s.xml">
+      <configuration name="BudgetTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="UserActionsTest - 2017.01.24 at 14h 59m 12s.xml">
-      <configuration name="UserActionsTest" configurationId="JUnit" />
+    <history-entry file="BudgetTest - 2017.01.24 at 17h 07m 39s.xml">
+      <configuration name="BudgetTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="UserActionsTest - 2017.01.24 at 15h 00m 04s.xml">
-      <configuration name="UserActionsTest" configurationId="JUnit" />
+    <history-entry file="BudgetTest - 2017.01.24 at 17h 08m 08s.xml">
+      <configuration name="BudgetTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="UserActionsTest - 2017.01.24 at 15h 03m 11s.xml">
-      <configuration name="UserActionsTest" configurationId="JUnit" />
+    <history-entry file="BudgetTest - 2017.01.24 at 17h 17m 28s.xml">
+      <configuration name="BudgetTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="UserActionsTest - 2017.01.24 at 15h 53m 05s.xml">
-      <configuration name="UserActionsTest" configurationId="JUnit" />
+    <history-entry file="BudgetTest - 2017.01.24 at 17h 19m 10s.xml">
+      <configuration name="BudgetTest" configurationId="JUnit" />
     </history-entry>
   </component>
   <component name="TodoView">
@@ -871,7 +1055,7 @@
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32952693" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2929985" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.27853882" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32626426" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
@@ -903,368 +1087,388 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/RequestManagerImpl.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/dao/AbstractDao.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding>
-            <element signature="e#0#24709#0" expanded="false" />
-          </folding>
+        <state relative-caret-position="90">
+          <caret line="11" column="22" lean-forward="false" selection-start-line="11" selection-start-column="22" selection-end-line="11" selection-end-column="22" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/ProjectManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/BudgetManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="126">
-          <caret line="10" column="17" lean-forward="false" selection-start-line="10" selection-start-column="17" selection-end-line="10" selection-end-column="17" />
+        <state relative-caret-position="666">
+          <caret line="40" column="72" lean-forward="false" selection-start-line="40" selection-start-column="72" selection-end-line="40" selection-end-column="72" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/ProjectOrganization.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/JournalManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/Comment.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="126">
-          <caret line="7" column="17" lean-forward="false" selection-start-line="7" selection-start-column="17" selection-end-line="7" selection-end-column="17" />
+        <state relative-caret-position="304">
+          <caret line="32" column="21" lean-forward="false" selection-start-line="32" selection-start-column="21" selection-end-line="32" selection-end-column="21" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/ProjectCoordinator.java" />
-    <entry file="file://$PROJECT_DIR$/src/test/java/unitest/UserSystemUtilsTest.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/BudgetComment.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="34">
-          <caret line="72" column="0" lean-forward="true" selection-start-line="72" selection-start-column="0" selection-end-line="72" selection-end-column="0" />
+        <state relative-caret-position="198">
+          <caret line="12" column="13" lean-forward="false" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/UserManagerImpl.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/Budgetfile.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-738">
-          <caret line="44" column="19" lean-forward="false" selection-start-line="44" selection-start-column="4" selection-end-line="44" selection-end-column="19" />
+        <state relative-caret-position="288">
+          <caret line="17" column="18" lean-forward="false" selection-start-line="17" selection-start-column="12" selection-end-line="17" selection-end-column="18" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/UserRolePK.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/Commenttemplate.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="90">
-          <caret line="9" column="13" lean-forward="false" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
+        <state relative-caret-position="88">
+          <caret line="11" column="13" lean-forward="false" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/Role.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/BudgetManagerImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="288">
-          <caret line="20" column="55" lean-forward="false" selection-start-line="20" selection-start-column="55" selection-end-line="20" selection-end-column="55" />
-          <folding />
+        <state relative-caret-position="270">
+          <caret line="15" column="22" lean-forward="false" selection-start-line="15" selection-start-column="22" selection-end-line="15" selection-end-column="22" />
+          <folding>
+            <marker date="1485259187133" expanded="true" signature="9613:9615" ph="//..." />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/Request.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/UserRole.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="198">
-          <caret line="16" column="13" lean-forward="false" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
-          <folding />
+        <state relative-caret-position="108">
+          <caret line="8" column="0" lean-forward="false" selection-start-line="8" selection-start-column="0" selection-end-line="37" selection-end-column="1" />
+          <folding>
+            <element signature="e#765#766#0" expanded="false" />
+            <element signature="e#796#797#0" expanded="false" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/OrganizationBudget.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/OrganizationManagerImpl.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/BudgetContract.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="178">
-          <caret line="48" column="60" lean-forward="false" selection-start-line="48" selection-start-column="60" selection-end-line="48" selection-end-column="60" />
-          <folding />
+        <state relative-caret-position="196">
+          <caret line="16" column="7" lean-forward="false" selection-start-line="16" selection-start-column="7" selection-end-line="16" selection-end-column="7" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/ProjectManagerImpl.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/BankTransferReceipt.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="34">
-          <caret line="55" column="0" lean-forward="true" selection-start-line="55" selection-start-column="0" selection-end-line="55" selection-end-column="0" />
+        <state relative-caret-position="252">
+          <caret line="19" column="22" lean-forward="false" selection-start-line="19" selection-start-column="22" selection-end-line="19" selection-end-column="22" />
           <folding>
-            <element signature="imports" expanded="false" />
-            <marker date="1484912435993" expanded="true" signature="954:1647" ph="{...}" />
+            <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/InvoiceManagerImpl.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/Publication.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+        <state relative-caret-position="-920">
+          <caret line="100" column="41" lean-forward="false" selection-start-line="100" selection-start-column="41" selection-end-line="100" selection-end-column="41" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/dao/AbstractDao.java">
+    <entry file="file://$PROJECT_DIR$/src/test/java/unitest/UserActionsTest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="90">
-          <caret line="11" column="22" lean-forward="false" selection-start-line="11" selection-start-column="22" selection-end-line="11" selection-end-column="22" />
+        <state relative-caret-position="372">
+          <caret line="65" column="0" lean-forward="false" selection-start-line="65" selection-start-column="0" selection-end-line="65" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/dao/PublicationDAO.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/Affiliation.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="108">
-          <caret line="24" column="67" lean-forward="false" selection-start-line="24" selection-start-column="28" selection-end-line="24" selection-end-column="67" />
+        <state relative-caret-position="198">
+          <caret line="15" column="68" lean-forward="true" selection-start-line="15" selection-start-column="68" selection-end-line="15" selection-end-column="68" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/dao/UserDAO.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/PublisherDiscount.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2673">
-          <caret line="178" column="0" lean-forward="true" selection-start-line="178" selection-start-column="0" selection-end-line="178" selection-end-column="0" />
+        <state relative-caret-position="115">
+          <caret line="9" column="49" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="37" selection-end-column="1" />
           <folding>
-            <element signature="imports" expanded="false" />
+            <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/dao/PublisherDAO.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/PublisherDiscountPK.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="198">
-          <caret line="16" column="24" lean-forward="false" selection-start-line="16" selection-start-column="24" selection-end-line="16" selection-end-column="24" />
-          <folding />
+        <state relative-caret-position="-2">
+          <caret line="22" column="29" lean-forward="true" selection-start-line="22" selection-start-column="29" selection-end-line="22" selection-end-column="29" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#386#387#0" expanded="true" />
+            <element signature="e#418#419#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/BudgetManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/Project.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="666">
-          <caret line="40" column="72" lean-forward="false" selection-start-line="40" selection-start-column="72" selection-end-line="40" selection-end-column="72" />
+        <state relative-caret-position="306">
+          <caret line="66" column="40" lean-forward="false" selection-start-line="66" selection-start-column="40" selection-end-line="66" selection-end-column="40" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/Comment.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/AffiliationPK.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="32" column="21" lean-forward="false" selection-start-line="32" selection-start-column="21" selection-end-line="32" selection-end-column="21" />
+        <state relative-caret-position="450">
+          <caret line="37" column="37" lean-forward="true" selection-start-line="37" selection-start-column="37" selection-end-line="37" selection-end-column="37" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/BudgetComment.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/Organization.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="198">
-          <caret line="12" column="13" lean-forward="false" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
+        <state relative-caret-position="194">
+          <caret line="29" column="45" lean-forward="true" selection-start-line="29" selection-start-column="45" selection-end-line="29" selection-end-column="45" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/Budgetfile.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/Budget.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="288">
-          <caret line="17" column="18" lean-forward="false" selection-start-line="17" selection-start-column="12" selection-end-line="17" selection-end-column="18" />
-          <folding />
+        <state relative-caret-position="-1332">
+          <caret line="13" column="43" lean-forward="false" selection-start-line="13" selection-start-column="20" selection-end-line="13" selection-end-column="43" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/Commenttemplate.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/Publisher.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="88">
-          <caret line="11" column="13" lean-forward="false" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/BudgetManagerImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="270">
-          <caret line="15" column="22" lean-forward="false" selection-start-line="15" selection-start-column="22" selection-end-line="15" selection-end-column="22" />
+        <state relative-caret-position="504">
+          <caret line="28" column="36" lean-forward="false" selection-start-line="28" selection-start-column="36" selection-end-line="28" selection-end-column="36" />
           <folding>
-            <marker date="1485259187133" expanded="true" signature="9613:9615" ph="//..." />
+            <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/dao/BudgetDAO.java">
+    <entry file="file://$PROJECT_DIR$/src/test/resources/hibernate-cfg.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="830">
-          <caret line="205" column="26" lean-forward="false" selection-start-line="205" selection-start-column="26" selection-end-line="205" selection-end-column="26" />
+        <state relative-caret-position="106">
+          <caret line="32" column="68" lean-forward="false" selection-start-line="32" selection-start-column="68" selection-end-line="32" selection-end-column="68" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/UserRole.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/User.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="108">
-          <caret line="8" column="0" lean-forward="false" selection-start-line="8" selection-start-column="0" selection-end-line="37" selection-end-column="1" />
+        <state relative-caret-position="-1294">
+          <caret line="35" column="27" lean-forward="true" selection-start-line="35" selection-start-column="27" selection-end-line="35" selection-end-column="27" />
           <folding>
-            <element signature="e#765#766#0" expanded="false" />
-            <element signature="e#796#797#0" expanded="false" />
+            <element signature="e#3489#3490#0" expanded="true" />
+            <element signature="e#3528#3529#0" expanded="true" />
+            <marker date="1485262981963" expanded="false" signature="3243:3248" ph=" { " />
+            <marker date="1485262981963" expanded="false" signature="3265:3268" ph=" }" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/PublicationManagerImpl.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/BankAccount.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2408">
-          <caret line="228" column="25" lean-forward="false" selection-start-line="228" selection-start-column="25" selection-end-line="228" selection-end-column="25" />
+        <state relative-caret-position="254">
+          <caret line="30" column="33" lean-forward="true" selection-start-line="30" selection-start-column="33" selection-end-line="30" selection-end-column="33" />
           <folding>
             <element signature="imports" expanded="true" />
-            <element signature="method#deletePublicationRelations#0;class#PublicationManagerImpl#0" expanded="false" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/BudgetContract.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/OrganizationManagerImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="196">
-          <caret line="16" column="7" lean-forward="false" selection-start-line="16" selection-start-column="7" selection-end-line="16" selection-end-column="7" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="594">
+          <caret line="48" column="60" lean-forward="false" selection-start-line="48" selection-start-column="60" selection-end-line="48" selection-end-column="60" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/BankTransferReceipt.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/PublicationManagerImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="252">
-          <caret line="19" column="22" lean-forward="false" selection-start-line="19" selection-start-column="22" selection-end-line="19" selection-end-column="22" />
+        <state relative-caret-position="-358">
+          <caret line="228" column="25" lean-forward="false" selection-start-line="228" selection-start-column="25" selection-end-line="228" selection-end-column="25" />
           <folding>
             <element signature="imports" expanded="true" />
+            <element signature="method#deletePublicationRelations#0;class#PublicationManagerImpl#0" expanded="false" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/Publication.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/Searchable.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-920">
-          <caret line="100" column="41" lean-forward="false" selection-start-line="100" selection-start-column="41" selection-end-line="100" selection-end-column="41" />
+        <state relative-caret-position="126">
+          <caret line="9" column="17" lean-forward="false" selection-start-line="9" selection-start-column="17" selection-end-line="9" selection-end-column="17" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/test/java/unitest/UserActionsTest.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/SearchManagerImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="372">
-          <caret line="65" column="0" lean-forward="false" selection-start-line="65" selection-start-column="0" selection-end-line="65" selection-end-column="0" />
+        <state relative-caret-position="88">
+          <caret line="10" column="13" lean-forward="false" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/User.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/UserManagerImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="270">
-          <caret line="173" column="27" lean-forward="false" selection-start-line="173" selection-start-column="27" selection-end-line="173" selection-end-column="27" />
-          <folding>
-            <marker date="1485262981963" expanded="false" signature="3243:3248" ph=" { " />
-            <marker date="1485262981963" expanded="false" signature="3265:3268" ph=" }" />
-          </folding>
+        <state relative-caret-position="18">
+          <caret line="44" column="14" lean-forward="true" selection-start-line="44" selection-start-column="4" selection-end-line="44" selection-end-column="14" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/Affiliation.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/JournalManagerImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="198">
-          <caret line="15" column="68" lean-forward="true" selection-start-line="15" selection-start-column="68" selection-end-line="15" selection-end-column="68" />
-          <folding />
+        <state relative-caret-position="-38">
+          <caret line="24" column="37" lean-forward="false" selection-start-line="24" selection-start-column="25" selection-end-line="24" selection-end-column="37" />
+          <folding>
+            <element signature="e#811#812#0" expanded="true" />
+            <element signature="e#848#849#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/dao/OrganizationDAO.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/dao/BudgetCommentDAO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="218">
-          <caret line="84" column="0" lean-forward="false" selection-start-line="84" selection-start-column="0" selection-end-line="84" selection-end-column="0" />
+        <state relative-caret-position="90">
+          <caret line="5" column="39" lean-forward="false" selection-start-line="5" selection-start-column="39" selection-end-line="5" selection-end-column="39" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/PublisherManagerImpl.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/RequestManagerImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="178">
-          <caret line="26" column="14" lean-forward="true" selection-start-line="26" selection-start-column="14" selection-end-line="26" selection-end-column="14" />
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/PublisherDiscount.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/dao/HelpDAO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="115">
-          <caret line="9" column="49" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="37" selection-end-column="1" />
+        <state relative-caret-position="-614">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding>
-            <element signature="imports" expanded="true" />
+            <element signature="e#0#1982#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/PublisherDiscountPK.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/dao/UserDAO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-2">
-          <caret line="22" column="29" lean-forward="true" selection-start-line="22" selection-start-column="29" selection-end-line="22" selection-end-column="29" />
+        <state relative-caret-position="308">
+          <caret line="178" column="0" lean-forward="true" selection-start-line="178" selection-start-column="0" selection-end-line="178" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/eligibility/OrganizationEligibilityManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-432">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#386#387#0" expanded="true" />
-            <element signature="e#418#419#0" expanded="true" />
+            <element signature="e#0#1701#0" expanded="false" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/Project.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/eligibility/AccountingEligibilityManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="306">
-          <caret line="66" column="40" lean-forward="false" selection-start-line="66" selection-start-column="40" selection-end-line="66" selection-end-column="40" />
+        <state relative-caret-position="18">
+          <caret line="1" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="110" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/dao/ProjectDAO.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/stats/StatsManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="290">
-          <caret line="68" column="99" lean-forward="true" selection-start-line="68" selection-start-column="8" selection-end-line="68" selection-end-column="99" />
+        <state relative-caret-position="218">
+          <caret line="16" column="17" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="29" selection-end-column="0" />
           <folding>
-            <element signature="imports" expanded="true" />
+            <marker date="1485268509134" expanded="true" signature="52:345" ph="..." />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/AffiliationPK.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/stats/StatsManagerImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="450">
-          <caret line="37" column="37" lean-forward="true" selection-start-line="37" selection-start-column="37" selection-end-line="37" selection-end-column="37" />
+        <state relative-caret-position="160">
+          <caret line="11" column="58" lean-forward="true" selection-start-line="11" selection-start-column="58" selection-end-line="11" selection-end-column="58" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/JournalDiscountPK.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/eligibility/ProjectEligibiliyManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="448">
-          <caret line="34" column="37" lean-forward="false" selection-start-line="34" selection-start-column="37" selection-end-line="34" selection-end-column="37" />
+        <state relative-caret-position="-1372">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding>
-            <element signature="imports" expanded="true" />
+            <element signature="e#0#4558#0" expanded="false" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/JournalDiscount.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/dao/RequestDAO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="468">
-          <caret line="29" column="39" lean-forward="false" selection-start-line="29" selection-start-column="39" selection-end-line="29" selection-end-column="39" />
+        <state relative-caret-position="-2322">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding>
-            <element signature="e#731#732#0" expanded="true" />
-            <element signature="e#750#751#0" expanded="true" />
+            <element signature="e#0#35350#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/Organization.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/dao/PublicationDAO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="29" column="45" lean-forward="true" selection-start-line="29" selection-start-column="45" selection-end-line="29" selection-end-column="45" />
+        <state relative-caret-position="-232">
+          <caret line="24" column="67" lean-forward="false" selection-start-line="24" selection-start-column="28" selection-end-line="24" selection-end-column="67" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/Budget.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/dao/PublisherDAO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1332">
-          <caret line="13" column="43" lean-forward="false" selection-start-line="13" selection-start-column="20" selection-end-line="13" selection-end-column="43" />
+        <state relative-caret-position="234">
+          <caret line="18" column="34" lean-forward="false" selection-start-line="18" selection-start-column="34" selection-end-line="18" selection-end-column="34" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/PublisherManagerImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="160">
+          <caret line="48" column="0" lean-forward="false" selection-start-line="48" selection-start-column="0" selection-end-line="48" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/JournalDiscountPK.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="448">
+          <caret line="34" column="37" lean-forward="false" selection-start-line="34" selection-start-column="37" selection-end-line="34" selection-end-column="37" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
@@ -1271,67 +1475,73 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/test/java/unitest/BudgetTest.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/Journal.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="378">
-          <caret line="41" column="25" lean-forward="false" selection-start-line="41" selection-start-column="25" selection-end-line="41" selection-end-column="25" />
+        <state relative-caret-position="432">
+          <caret line="66" column="22" lean-forward="false" selection-start-line="66" selection-start-column="22" selection-end-line="66" selection-end-column="22" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/dao/JournalDAO.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/dao/BudgetDAO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="250">
-          <caret line="34" column="0" lean-forward="false" selection-start-line="34" selection-start-column="0" selection-end-line="34" selection-end-column="0" />
+        <state relative-caret-position="2034">
+          <caret line="205" column="26" lean-forward="false" selection-start-line="205" selection-start-column="26" selection-end-line="205" selection-end-column="26" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/JournalManagerImpl.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/dao/OrganizationDAO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="324">
-          <caret line="28" column="0" lean-forward="false" selection-start-line="28" selection-start-column="0" selection-end-line="28" selection-end-column="0" />
-          <folding>
-            <element signature="e#848#849#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="164">
+          <caret line="84" column="0" lean-forward="false" selection-start-line="84" selection-start-column="0" selection-end-line="84" selection-end-column="0" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/Journal.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/dao/JournalDAO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="540">
-          <caret line="66" column="22" lean-forward="false" selection-start-line="66" selection-start-column="22" selection-end-line="66" selection-end-column="22" />
+        <state relative-caret-position="301">
+          <caret line="34" column="27" lean-forward="false" selection-start-line="34" selection-start-column="27" selection-end-line="34" selection-end-column="27" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/dao/ProjectDAO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="560">
+          <caret line="68" column="99" lean-forward="false" selection-start-line="68" selection-start-column="8" selection-end-line="68" selection-end-column="99" />
           <folding>
-            <element signature="e#2934#2935#0" expanded="true" />
-            <element signature="e#2967#2968#0" expanded="true" />
+            <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/Publisher.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/ProjectManagerImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="504">
-          <caret line="28" column="36" lean-forward="true" selection-start-line="28" selection-start-column="36" selection-end-line="28" selection-end-column="36" />
+        <state relative-caret-position="774">
+          <caret line="54" column="8" lean-forward="false" selection-start-line="54" selection-start-column="8" selection-end-line="54" selection-end-column="8" />
           <folding>
-            <element signature="imports" expanded="true" />
+            <marker date="1484912435993" expanded="true" signature="954:1647" ph="{...}" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/test/resources/hibernate-cfg.xml">
+    <entry file="file://$PROJECT_DIR$/src/test/java/unitest/BudgetTest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="106">
-          <caret line="32" column="68" lean-forward="false" selection-start-line="32" selection-start-column="68" selection-end-line="32" selection-end-column="68" />
+        <state relative-caret-position="430">
+          <caret line="44" column="0" lean-forward="true" selection-start-line="44" selection-start-column="0" selection-end-line="44" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/BankAccount.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/JournalDiscount.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-304">
-          <caret line="14" column="7" lean-forward="true" selection-start-line="14" selection-start-column="7" selection-end-line="14" selection-end-column="7" />
+        <state relative-caret-position="304">
+          <caret line="29" column="39" lean-forward="false" selection-start-line="29" selection-start-column="39" selection-end-line="29" selection-end-column="39" />
           <folding>
-            <element signature="imports" expanded="true" />
+            <element signature="e#731#732#0" expanded="true" />
+            <element signature="e#750#751#0" expanded="true" />
           </folding>
         </state>
       </provider>
Index: modules/uoa-goldoa-service/branches/hibernate/src/test/java/unitest/BudgetTest.java
===================================================================
--- modules/uoa-goldoa-service/branches/hibernate/src/test/java/unitest/BudgetTest.java	(revision 45563)
+++ modules/uoa-goldoa-service/branches/hibernate/src/test/java/unitest/BudgetTest.java	(revision 45564)
@@ -1,10 +1,11 @@
 package unitest;
 
-import eu.dnetlib.goldoa.domain.Budget;
-import eu.dnetlib.goldoa.domain.Journal;
+import eu.dnetlib.goldoa.domain.*;
 import eu.dnetlib.goldoa.service.BudgetManagerImpl;
 
 import eu.dnetlib.goldoa.service.JournalManagerImpl;
+import eu.dnetlib.goldoa.service.ProjectManagerImpl;
+import eu.dnetlib.goldoa.service.PublisherManagerImpl;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,6 +29,10 @@
     BudgetManagerImpl bg;
     @Autowired
     JournalManagerImpl jm;
+    @Autowired
+    PublisherManagerImpl pm;
+    @Autowired
+    ProjectManagerImpl prm;
 
     @Test
     @Transactional
@@ -38,10 +43,6 @@
         bg.saveBudget(b);
         bg.processingPayment(b.getId(),null,null);
 
-        Journal j = new Journal();
-        jm.search("djb");
-
-
         System.out.println(bg.getBudget(b.getId()).getStatus());
         assertEquals(bg.getBudget(b.getId()).getStatus(),Budget.Status.ACCOUNTING_PROCESSING);
     }
Index: modules/uoa-goldoa-service/branches/hibernate/src/main/java/eu/dnetlib/goldoa/service/stats/StatsManager.java
===================================================================
--- modules/uoa-goldoa-service/branches/hibernate/src/main/java/eu/dnetlib/goldoa/service/stats/StatsManager.java	(revision 45563)
+++ modules/uoa-goldoa-service/branches/hibernate/src/main/java/eu/dnetlib/goldoa/service/stats/StatsManager.java	(revision 45564)
@@ -10,11 +10,10 @@
 
 import java.util.Date;
 
-*/
-/**
+*
  * Created by antleb on 11/17/15.
- *//*
 
+
 public interface StatsManager {
 
 	public Numbers getNumbers(Numbers.Category[] categories);
Index: modules/uoa-goldoa-service/branches/hibernate/src/main/java/eu/dnetlib/goldoa/service/eligibility/AccountingEligibilityManager.java
===================================================================
--- modules/uoa-goldoa-service/branches/hibernate/src/main/java/eu/dnetlib/goldoa/service/eligibility/AccountingEligibilityManager.java	(revision 45563)
+++ modules/uoa-goldoa-service/branches/hibernate/src/main/java/eu/dnetlib/goldoa/service/eligibility/AccountingEligibilityManager.java	(revision 45564)
@@ -10,11 +10,10 @@
 import eu.dnetlib.goldoa.service.dao.PublicationDAO;
 import org.springframework.beans.factory.annotation.Autowired;
 
-*/
-/**
+*
  * Created by antleb on 3/25/15.
- *//*
 
+
 public class AccountingEligibilityManager implements EligibilityManager {
 
 	@Autowired
