Merge branch 'pu/2013.03/modelconfig-hr'
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 9 Sep 2013 14:40:41 +0000 (16:40 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 9 Sep 2013 14:40:41 +0000 (16:40 +0200)
commita1f8e2d7a73f3ebf1d98ea17c03c0b82f46200b3
tree8d3a2f6c90b6b96070f87a1a8833630328f89dcc
parent5781542f7541ec3ae9f40bffba799211a2c9a294
parente825de5eb9bffd7dc29292a880501b2f3afacc8c
Merge branch 'pu/2013.03/modelconfig-hr'

Conflicts:
tine20/HumanResources/Setup/Update/Release7.php
tine20/Tinebase/js/widgets/relation/GenericPickerGridPanel.js
12 files changed:
tine20/HumanResources/Frontend/Json.php
tine20/HumanResources/Setup/Update/Release7.php
tine20/HumanResources/Setup/setup.xml
tine20/Sales/Model/Contract.php
tine20/Tinebase/Controller/Record/Abstract.php
tine20/Tinebase/Convert/Json.php
tine20/Tinebase/ModelConfiguration.php
tine20/Tinebase/Record/Abstract.php
tine20/Tinebase/js/ApplicationStarter.js
tine20/Tinebase/js/widgets/relation/GenericPickerGridPanel.js
tine20/Tinebase/translations/de.po
tine20/Tinebase/translations/template.pot