Merge branch '2013.03' into pu/2013.03/modelconfig-hr
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 28 May 2013 13:45:40 +0000 (15:45 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 28 May 2013 13:45:40 +0000 (15:45 +0200)
Conflicts:
tine20/Crm/Controller.php
tine20/HumanResources/Setup/Update/Release7.php
tine20/HumanResources/Setup/setup.xml
tine20/HumanResources/js/Models.js
tine20/Inventory/Model/InventoryItem.php
tine20/Tinebase/Frontend/Json.php
tine20/Tinebase/js/ApplicationStarter.js
tine20/Tinebase/js/widgets/dialog/EditDialog.js

17 files changed:
1  2 
tests/tine20/Tinebase/AllTests.php
tine20/Addressbook/js/Model.js
tine20/HumanResources/Setup/setup.xml
tine20/HumanResources/translations/de.po
tine20/HumanResources/translations/template.pot
tine20/Inventory/Model/InventoryItem.php
tine20/Tinebase/Controller/Record/Abstract.php
tine20/Tinebase/Frontend/Json.php
tine20/Tinebase/Frontend/Json/Abstract.php
tine20/Tinebase/Record/Abstract.php
tine20/Tinebase/js/widgets/ContentTypeTreePanel.js
tine20/Tinebase/js/widgets/dialog/DuplicateResolveGridPanel.js
tine20/Tinebase/js/widgets/dialog/EditDialog.js
tine20/Tinebase/js/widgets/grid/FilterToolbar.js
tine20/Tinebase/js/widgets/grid/GridPanel.js
tine20/Tinebase/js/widgets/mainscreen/WestPanel.js
tine20/Voipmanager/Controller/Snom/Phone.php

Simple merge
Simple merge
@@@ -10,7 -10,7 +10,7 @@@
      <tables>
          <table>
              <name>humanresources_employee</name>
-             <version>10</version>
 -            <version>11</version>
++            <version>12</version>
              <declaration>
                  <field>
                      <name>id</name>
                      <notnull>true</notnull>
                  </field>
                  <field>
-                     <type>text</type>
-                     <length>255</length>
-                     <notnull>false</notnull>
 +                    <name>description</name>
++                    <type>clob</type>
 +                </field>
 +                <field>
                      <name>account_id</name>
                      <type>text</type>
                      <length>40</length>
@@@ -519,108 -523,3 +519,108 @@@ msgstr "Kostenstelle
  #: js/CostCenterGridPanel.js:107
  msgid "Startdate"
  msgstr "Anfangsdatum"
- msgstr "Zusammenfassung"
 +
 +msgid "Sickness Day"
 +msgstr "Krankheitstag"
 +
 +msgid "Sickness Days"
 +msgstr "Krankheitstage"
 +
 +msgid "Vacation Day"
 +msgstr "Urlaubstag"
 +
 +msgid "Quick search"
 +msgstr "Schnellsuche"
 +
 +msgid "Free Times"
 +msgstr "Freie Tage"
 +
 +msgid "First Day"
 +msgstr "Erster Tag"
 +
 +msgid "Private Information"
 +msgstr "Private Informationen"
 +
 +msgid "Is employed"
 +msgstr "Ist angestellt"
 +
 +msgid "Germany"
 +msgstr "Deutschland"
 +
 +msgid "Street 2"
 +msgstr "Straße 2"
 +
 +msgid "Costcenters"
 +msgstr "Kostenstellen"
 +
 +msgid "Cost Centers"
 +msgstr "Kostenstellen"
 +
 +msgid "Workingtime"
 +msgstr "Arbeitszeit"
 +
 +msgid "Currently employed employees"
 +msgstr "Zur Zeit angestellt"
 +
 +msgid "All employees"
 +msgstr "Alle Mitarbeiter"
 +
 +msgid "Edit {0} for {1} - {2}"
 +msgstr "{0} von {1} des Jahres {2} bearbeiten"
 +
 +msgid "Personal account"
 +msgid_plural "Personal accounts"
 +msgstr[0] "Personalkonto"
 +msgstr[1] "Personalkonten"
 +
 +msgid "Extra free time"
 +msgid_plural "Extra free times"
 +msgstr[0] "Sonderurlaub"
 +msgstr[1] "Sonderurlaube"
 +
 +msgid "Extra free times"
 +msgstr "Sonderurlaub"
 +
 +
 +msgid "Possible vaction days"
 +msgstr "Mögliche Urlaubstage"
 +
 +msgid "Remaining vaction days"
 +msgstr "Übrige Urlaubstage"
 +
 +msgid "Taken vaction days"
 +msgstr "Verbrauchte Urlaubstage"
 +
 +msgid "Excused sickness days"
 +msgstr "Entschuldigte Krankheitstage"
 +
 +msgid "Unexcused sickness days"
 +msgstr "Unentschuldigte Krankheitstage"
 +
 +msgid "Days to work"
 +msgstr "Anzahl Arbeitstage"
 +
 +msgid "Hours to work"
 +msgstr "Anzahl der zu leistenden Stunden"
 +
 +msgid "HumanResources"
 +msgstr "Personal"
 +
 +msgid "Days"
 +msgstr "Tage"
 +
 +
 +msgid "Payed"
 +msgstr "Bezahlt"
 +
 +msgid "Not payed"
 +msgstr "Unbezahlt"
 +
 +msgid "Remaining"
 +msgstr "Übrig"
 +
 +msgid "Book as vacation"
 +msgstr "Als Urlaub buchen"
 +
 +msgid "Summary"
++msgstr "Zusammenfassung"
@@@ -516,138 -516,3 +516,138 @@@ msgstr "
  #: js/CostCenterGridPanel.js:107
  msgid "Startdate"
  msgstr ""
- msgid "Summary"
 +
 +
 +msgid "Excused"
 +msgstr ""
 +
 +msgid "Unexcused"
 +msgstr ""
 +
 +msgid "Currently employed"
 +msgstr ""
 +
 +msgid "Employees which are currently employed"
 +msgstr ""
 +
 +msgid "Sickness"
 +msgstr ""
 +
 +msgid "Vacation"
 +msgstr ""
 +
 +msgid "Remaining Vacation"
 +msgstr ""
 +
 +msgid "Extra Vacation"
 +msgstr ""
 +
 +msgid "Requested"
 +msgstr ""
 +
 +msgid "In process"
 +msgstr ""
 +
 +msgid "Accepted"
 +msgstr ""
 +
 +msgid "Declined"
 +msgstr ""
 +
 +msgid "No contract could be found."
 +msgid "Please create a contract for this employee!"
 +msgid "Contract"
 +msgid_plural "Contracts"
 +msgstr[0] ""
 +msgstr[1] ""
 +msgid "Sickness Day"
 +msgid "Sickness Days"
 +msgid "Vacation Day"
 +msgid "Vacation Days"
 +msgid "Add {0}"
 +msgid "CostCenter"
 +msgid_plural "CostCenters"
 +msgstr[0] ""
 +msgstr[1] ""
 +msgid "Cost Center"
 +msgid "Startdate"
 +msgid "Cancel"
 +msgid "OK"
 +msgid "Calendar"
 +msgid "Calendars"
 +msgid "WK"
 +msgid "Loading calendar data..."
 +msgid "Supervisor"
 +msgid "Division"
 +msgid "Employee"
 +msgid "Number"
 +msgid "Account"
 +msgid "Apply contact data on form"
 +msgid "Full Name"
 +msgid "Salutation"
 +msgid "Title"
 +msgid "First Name"
 +msgid "Last Name"
 +msgid "Employment begin"
 +msgstr ""
 +
 +msgid "Employment end"
 +msgstr ""
 +
 +msgid "Edit {0} \"{1}\""
 +msgid "Add {0} for {1}"
 +msgid "Edit {0} for {1}"
 +msgid "Working Time"
 +msgid_plural "Working Times"
 +msgstr[0] ""
 +msgstr[1] ""
 +msgid "Working Times"
 +msgid_plural "Working Times"
 +msgstr[0] ""
 +msgstr[1] ""
 +msgid "Quick search"
 +msgid "Feast Calendar"
 +msgid "Start Date"
 +msgid "End Date"
 +msgid "Free Time"
 +msgid "Free Times"
 +msgid "First Day"
 +msgid "Free Days"
 +msgid "Contracts"
 +msgid "Private Information"
 +msgid "Is employed"
 +msgid "Germany"
 +msgid "Street 2"
 +msgid "Employee name"
 +msgid "Costcenters"
 +msgstr ""
 +msgid "Cost Centers"
 +
 +msgid "Currently employed employees"
 +msgid "All employees"
 +
 +msgid 'Edit {0} for "{1}" - {2}'
 +msgid "Extra free time"
 +msgid_plural "Extra free times"
 +
 +msgid "Personal account"
 +msgid_plural "Personal accounts"
 +
 +msgid "Possible vaction days"
 +msgid "Remaining vaction days"
 +msgid "Taken vaction days 2013"
 +msgid "Excused sickness days"
 +msgid "Unexcused sickness days 2013"
 +msgid "Days to work"
 +msgid "Hours to work"
 +
 +msgid "HumanResources"
 +
 +msgid "Days"
 +msgid "Payed"
 +msgid "Not payed"
 +
 +msgid "Remaining"
 +msgid "Book as vacation"
 +
++msgid "Summary"
@@@ -113,19 -121,19 +113,22 @@@ class Inventory_Model_InventoryItem ext
                  'validators' => array(Zend_Filter_Input::ALLOW_EMPTY => true),
                  'label'      => 'Warranty', // _('Warranty')
                  'hidden'     => TRUE,
 +                'inputFilters' => array('Zend_Filter_Empty' => NULL),
+                 'type'       => 'datetime'
              ),
              'added_date' => array(
                  'validators' => array(Zend_Filter_Input::ALLOW_EMPTY => true),
                  'label'      => 'Item added', // _('Item added')
                  'hidden'     => TRUE,
 +                'inputFilters' => array('Zend_Filter_Empty' => NULL),
+                 'type'       => 'datetime'
              ),
              'removed_date' => array(
                  'validators' => array(Zend_Filter_Input::ALLOW_EMPTY => true),
                  'label'      => 'Item removed', // _('Item removed')
                  'hidden'     => TRUE,
 +                'inputFilters' => array('Zend_Filter_Empty' => NULL),
+                 'type'       => 'datetime'
              ),
              'active_number' => array(
                  'validators' => array(Zend_Filter_Input::ALLOW_EMPTY => true),
@@@ -641,14 -641,16 +641,18 @@@ class Tinebase_Frontend_Json extends Ti
                  $jsonAppName = $application->name . '_Frontend_Json';
                  
                  if (class_exists($jsonAppName)) {
 -                    if (Tinebase_Core::isLogLevel(Zend_Log::DEBUG)) Tinebase_Core::getLogger()->debug(__METHOD__ . '::' . __LINE__ . ' Getting registry data for app ' . $application->name);
 +                    if (Tinebase_Core::isLogLevel(Zend_Log::DEBUG)) {
 +                        Tinebase_Core::getLogger()->debug(__METHOD__ . '::' . __LINE__ . ' Getting registry data for app ' . $application->name);
 +                    }
                      
                      try {
 -                        $applicationJson = new $jsonAppName;
 +                        $applicationJson = new $jsonAppName();
+                         $registryData[$application->name] = (array_key_exists($application->name, $registryData))
+                             ? array_merge_recursive($registryData[$application->name], $applicationJson->getRegistryData()) 
+                             : $applicationJson->getRegistryData();
+                     
                      } catch (Exception $e) {
-                         Tinebase_Core::getLogger()->warn(__METHOD__ . '::' . __LINE__ . ' Disabling ' . $application->name . ': ' . $e->getMessage());
+                         Tinebase_Core::getLogger()->warn(__METHOD__ . '::' . __LINE__ . ' Disabling ' . $application->name . ': ' . $e);
                          Tinebase_Application::getInstance()->setApplicationState(array($application->getId()), Tinebase_Application::DISABLED);
                          unset($registryData[$application->name]);
                          continue;
Simple merge