Merge branch 'pu/2013.10-invoices' into 2014.09
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 18 Nov 2014 13:30:41 +0000 (14:30 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 18 Nov 2014 13:30:41 +0000 (14:30 +0100)
commit5b6dba470a37f49d45efa5463da3873c39a5abc0
tree456142bfca8c51b1b139e3a861a35f3f8684b672
parent218955149e4cf09e48c689c4fbc50ed804adb23b
parentf214a03d335aaf6e1ff0d068d56dfd8da09333da
Merge branch 'pu/2013.10-invoices' into 2014.09

Conflicts:
tests/tine20/HumanResources/JsonTests.php
tests/tine20/Phone/JsonTest.php
tests/tine20/Sales/AllTests.php
tests/tine20/Sales/JsonTest.php
tests/tine20/Timetracker/JsonTest.php
tests/tine20/Tinebase/Relation/RelationTest.php
tine20/Addressbook/Convert/Contact/Json.php
tine20/Crm/translations/de.po
tine20/Crm/translations/template.pot
tine20/Sales/Acl/Rights.php
tine20/Sales/Config.php
tine20/Sales/Controller/Contract.php
tine20/Sales/Controller/Division.php
tine20/Sales/Controller/NumberableAbstract.php
tine20/Sales/Frontend/Json.php
tine20/Sales/Model/Contract.php
tine20/Sales/Model/CostCenter.php
tine20/Sales/Model/Product.php
tine20/Sales/Model/ProductFilter.php
tine20/Sales/Sales.jsb2
tine20/Sales/Setup/Initialize.php
tine20/Sales/Setup/setup.xml
tine20/Sales/css/Sales.css
tine20/Sales/js/ContractEditDialog.js
tine20/Sales/js/ContractGridPanel.js
tine20/Sales/js/CostCenterEditDialog.js
tine20/Sales/js/ProductEditDialog.js
tine20/Sales/js/Sales.js
tine20/Sales/translations/template.pot
tine20/Timetracker/translations/de.po
tine20/Timetracker/translations/template.pot
tine20/Tinebase/Controller/Record/Abstract.php
tine20/Tinebase/Convert/Json.php
tine20/Tinebase/Frontend/Json.php
tine20/Tinebase/Frontend/Json/Abstract.php
tine20/Tinebase/Model/Filter/Month.php
tine20/Tinebase/js/ux/grid/GroupingGridPlugin.js
tine20/Tinebase/translations/de.po
tine20/Tinebase/translations/template.pot
tine20/composer.json
tine20/composer.lock

Change-Id: I3499881c8723172e54da2dd780af5c5bae68c585
26 files changed:
tests/tine20/HumanResources/JsonTests.php
tests/tine20/HumanResources/TestCase.php
tests/tine20/Sales/AllTests.php
tests/tine20/Sales/JsonTest.php
tests/tine20/Timetracker/JsonTest.php
tests/tine20/Tinebase/Relation/RelationTest.php
tine20/Crm/translations/de.po
tine20/Crm/translations/template.pot
tine20/Sales/Acl/Rights.php
tine20/Sales/Controller/NumberableAbstract.php
tine20/Sales/Frontend/Json.php
tine20/Sales/Setup/Initialize.php
tine20/Sales/Setup/Update/Release8.php
tine20/Sales/js/ContractEditDialog.js
tine20/Sales/js/CostCenterEditDialog.js
tine20/Sales/js/Sales.js
tine20/Sales/translations/de.po
tine20/Sales/translations/template.pot
tine20/Timetracker/Frontend/Json.php
tine20/Timetracker/Setup/setup.xml
tine20/Timetracker/translations/de.po
tine20/Timetracker/translations/template.pot
tine20/Tinebase/Backend/Sql/Command/Mysql.php
tine20/Tinebase/js/ux/grid/GroupingGridPlugin.js
tine20/Tinebase/translations/de.po
tine20/Tinebase/translations/template.pot