Merge branch 'pu/2013.03/modelconfig-hr'
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 17 Jul 2013 16:52:26 +0000 (18:52 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 17 Jul 2013 16:52:26 +0000 (18:52 +0200)
1  2 
tine20/HumanResources/Frontend/Json.php
tine20/HumanResources/translations/de.po
tine20/HumanResources/translations/template.pot
tine20/Inventory/Model/InventoryItem.php
tine20/Tinebase/ModelConfiguration.php

@@@ -74,12 -75,10 +75,12 @@@ class Inventory_Model_InventoryItem ext
                  'label'      => 'Location', // _('Location')
              ),
              'invoice_date' => array(
-                 'validators' => array(Zend_Filter_Input::ALLOW_EMPTY => true),
+                 'validators' => array(Zend_Filter_Input::ALLOW_EMPTY => TRUE),
                  'label'      => 'Invoice date', // _('Invoice date')
 +                'inputFilters' => array('Zend_Filter_Empty' => NULL),
                  'hidden'     => TRUE,
                  'default'    => NULL,
 +                'type'       => 'datetime',
                  'inputFilters' => array('Zend_Filter_Empty' => NULL),
              ),
              'total_number' => array(