Merge branch 'simulation'
authorJulien Muchembled <jm@nexedi.com>
Wed, 3 Oct 2012 09:05:55 +0000 (11:05 +0200)
committerJulien Muchembled <jm@nexedi.com>
Wed, 3 Oct 2012 09:05:55 +0000 (11:05 +0200)
commit19d4aa134f31c801085da3c696679fdeba8c020b
treec7be6a9e5688446df90cdd8ee0f914bd0ceb1733
parent410b6746086854bc19fb39d1858fa8243ae4a94c
parent7f0a3b61648336eb33cf0084b8168bc67e7e7b1a
Merge branch 'simulation'

- splitted expand, performance improvements and bugfixes
  (see commit 5c09e2e272003a32c584e7d2df9aa62d270ee2e6 for more information)
- Zope: monkey-patch 'transaction' to provide start time of transaction
- CMFActivity: new 'merge_parent=<path>' SQLDict parameter
- CMFActivity: try to reserve older messages first (ORDER BY priority, date)
  (see commit 275799fee81638c365e07303f7465421d7669cef to update existing
   activity tables)
- drop legacy simulation
24 files changed:
bt5/erp5_accounting/bt/revision
bt5/erp5_advanced_invoicing/bt/revision
bt5/erp5_base/bt/revision
bt5/erp5_configurator_standard/bt/revision
bt5/erp5_configurator_standard_invoicing_template/bt/revision
bt5/erp5_dummy_movement/bt/revision
bt5/erp5_forge/bt/revision
bt5/erp5_immobilisation/bt/revision
bt5/erp5_invoicing/bt/revision
bt5/erp5_mrp/bt/revision
bt5/erp5_open_trade/bt/revision
bt5/erp5_payroll/bt/revision
bt5/erp5_project/bt/revision
bt5/erp5_simulation/bt/revision
bt5/erp5_simulation_performance_test/bt/revision
bt5/erp5_simulation_test/SkinTemplateItem/portal_skins/erp5_simulation_test/Alarm_buildInvoice.xml
bt5/erp5_simulation_test/SkinTemplateItem/portal_skins/erp5_simulation_test/Alarm_buildPackingList.xml
bt5/erp5_simulation_test/bt/revision
bt5/erp5_tiosafe_oxatis_test/bt/revision
bt5/erp5_tiosafe_test/bt/revision
bt5/erp5_tiosafe_ubercart_test/bt/revision
bt5/erp5_tiosafe_virtuemart_test/bt/revision
bt5/erp5_trade/bt/revision
bt5/erp5_upgrader/bt/revision