Merge branch 'pu/2013.03/modelconfig-hr'
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 25 Apr 2013 20:17:02 +0000 (22:17 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 25 Apr 2013 20:17:02 +0000 (22:17 +0200)
Conflicts:
tine20/Inventory/Model/InventoryItem.php

1  2 
tine20/Inventory/Model/InventoryItem.php
tine20/Tinebase/js/widgets/grid/GridPanel.js

@@@ -76,10 -76,9 +76,11 @@@ class Inventory_Model_InventoryItem ext
              'invoice_date' => array(
                  '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'
++                'type'       => 'datetime',
+                 'inputFilters' => array('Zend_Filter_Empty' => NULL),
              ),
              'total_number' => array(
                  'validators' => array(Zend_Filter_Input::ALLOW_EMPTY => true),