Merge branch 'pu/2013.03/modelconfig-hr'
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 3 Jul 2013 12:30:28 +0000 (14:30 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 3 Jul 2013 12:30:28 +0000 (14:30 +0200)
Conflicts:
tine20/Sales/js/Models.js
tine20/Tinebase/ModelConfiguration.php

1  2 
tine20/Addressbook/js/ContactEditDialog.js
tine20/Inventory/Model/InventoryItem.php
tine20/Sales/Model/Contract.php
tine20/Sales/js/Models.js
tine20/Sales/translations/de.po
tine20/Tasks/js/TaskEditDialog.js
tine20/Timetracker/translations/de.po
tine20/Timetracker/translations/template.pot
tine20/Tinebase/ModelConfiguration.php
tine20/Tinebase/js/widgets/grid/GridPanel.js

Simple merge
@@@ -158,11 -157,8 +158,12 @@@ Tine.Sales.Model.Contract.getFilterMode
              keyfieldName: 'contractCleared'
          },
          {label: app.i18n._('Cleared in'), field: 'cleared_in' },
 -        {filtertype: 'tinebase.tag', app: app },
 -        {filtertype: 'sales.contract.costcenter' }
 +        {filtertype: 'tinebase.tag', app: app},
++        {filtertype: 'sales.contract.costcenter' },
 +        {label: _('Last Modified Time'), field: 'last_modified_time', valueType: 'date'},
 +        {label: _('Last Modified By'), field: 'last_modified_by',   valueType: 'user'},
 +        {label: _('Creation Time'), field: 'creation_time',      valueType: 'date'},
 +        {label: _('Created By'), field: 'created_by',         valueType: 'user'}
      ];
  };
  
Simple merge
Simple merge
Simple merge
@@@ -441,5 -441,8 +441,8 @@@ msgid_plural "timeaccount lists
  msgstr[0] ""
  msgstr[1] ""
  
+ msgid "Responsible person"
+ msgstr ""
  msgid "Cleared at"
 -msgstr ""
 +msgstr ""