Conflicts:
	bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/transitions/confirm.xml
	bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/transitions/start.xml
	bt5/erp5_advanced_invoicing/WorkflowTemplateItem/portal_workflow/invoice_workflow/scripts/Delivery_Build.xml
	bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_postGeneration.xml
	bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/scripts/Order_buildPackingList.xml
	bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/scripts/Task_buildTaskReport.xml

Conflicts:
	bt5/erp5_crm/bt/revision

Conflicts:
	product/ERP5/Tool/CertificateAuthorityTool.py

Conflicts:
	product/ERP5/bootstrap/erp5_property_sheets/bt/revision

Set permission 'Access future portal content' and 'Private only accessible from trusted code' to Manager only

Conflicts:
	bt5/erp5_base/bt/revision

Thanks to this Computer Partitions can be in same category as Computers they
are contained in.

Conflicts:
	bt5/erp5_base/bt/revision

Conflicts:
	bt5/erp5_base/bt/revision

Merged commit from Lukasz Nowak <luke@nexedi.com>:
  - getLocalRolesGroupId does not exists on portal type. 183c69455e5b3c20d2ae9464859de09256b4c371
  - Follow accessor name change. 1632a67b7a19deaddfb40e2b79c772cdd144f0cf

Commis picked from:
  Jérome Perrn: Add more site dumping scripts. fb7d2155d98dab31f433cb664a0ba547bfd40852
  Lukasz Nowak : Yet another dump script. b5cbcc95a71c5ed5769bcbf7859106817d3728ed
  Lukasz Nowak : Add Order Builder dumper. 9768e64d2d2f4e25d5c4264bba81eecc0d82e0c2

Apply patch from Luke (2ccb5a9e): Allow to pass (optional) destination.

erp5_web_shadir override _getOb function in VirtualFolderMixin, but all parameters are not well propagated thereafter.
We add missing parameter 'default'.

The logic of assignments checking shall be easy to use by other plugins in
order to avoid code duplication and minimise risk of non fixed security issues.

  Permit user update promise file searching by bt5s name, and including its
 repository.

Conflicts:
	product/ERP5Type/tests/ERP5TypeTestCase.py

Display document as read only by default.
Ease navigation on small screen.

Thx to Sven Franck for the UI and Thierry Brettnacher for the UX.

Cherry picked from commits:
  cacea29b
  a4555829
  073e3e4b

Call upgradeSite with CATALOG_UPDATED to enable automatic catalog update
behaviour

TemplateTool.upgradeSite: allow to define automatic catalog updating while keeping standard behaviour.

fixes promises (full_text_table not available). Default behaviour of
upgradeSite is not changed. Updating catalog should be handled outside
upgradeSite. The update_catalog argument is only introduced in this
commit so that it can be propagated to updateBusinessTemplateFromUrl in
case one does not know which business templates need catalog updating.

CodeMirror API is much more cleaner (from code and design point of view) than
Ace Editor and include useful plugins, such as MergeView supported in ERP5 to
diff with previous versions.