Conflicts:
	bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/scripts/Delivery_localBuild.xml
	bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/transitions/confirm.xml
	bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/transitions/start.xml
	bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/Alarm_activateFixConsistency.xml
	bt5/erp5_advanced_invoicing/WorkflowTemplateItem/portal_workflow/invoice_workflow/scripts/Delivery_Build.xml
	bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_getODTDataDict.xml
	bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_simulation_interaction_workflow/scripts/Delivery_updateCausalityState.xml
	bt5/erp5_base/WorkflowTemplateItem/portal_workflow/simulation_movement_causality_interaction_workflow/interactions/calculate_causality.xml
	bt5/erp5_base/bt/revision
	bt5/erp5_computer_immobilisation/SkinTemplateItem/portal_skins/erp5_computer_immobilisation/Computer_applyComputerModel.xml
	bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_postGeneration.xml
	bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/Invoice_viewAsODT.xml
	bt5/erp5_invoicing/bt/revision
	bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/scripts/Order_buildPackingList.xml
	bt5/erp5_open_trade/SkinTemplateItem/portal_skins/erp5_open_trade/Alarm_updateOpenOrderSimulation.xml
	bt5/erp5_open_trade/SkinTemplateItem/portal_skins/erp5_open_trade/OpenOrderLine_updateSimulation.xml
	bt5/erp5_open_trade/SkinTemplateItem/portal_skins/erp5_open_trade/OpenOrder_updateSimulation.xml
	bt5/erp5_open_trade/bt/revision
	product/CMFActivity/skins/activity/SQLBase_reserveMessageList.zsql
	product/ERP5/Document/Delivery.py
	product/ERP5/Tool/CertificateAuthorityTool.py
	product/ERP5/bootstrap/erp5_core/bt/revision
	product/ERP5Configurator/Tool/ConfiguratorTool.py
	product/ERP5Type/ERP5Type.py

use by using "self" on transactional_cached decorator breaks ERP5Site creation due aq_base.

  If the list of bt5 is huge same dependencies are
  calculated several types due recursivity at the
  same transaction making this method useless

use by using "self" on transactional_cached decorator breaks ERP5Site creation due aq_base.

Do not raise exception if user is not allowed to access the Trade Condition

change the style of RATE to percentage and add the price_renderer to control the length of the price

  If the list of bt5 is huge same dependencies are
  calculated several types due recursivity at the
  same transaction making this method useless

extend code to pass firefox and xvfb binaries as parameter to runUnitTest. With this, is possible run functional tests using firefox and xvfb binaries from selenium testrunner

  - Simplify the code and Minor Optimization for sort

  - Now getDependencyList returns entire list of dependencies even
    if it is already installed.

Follow up changes:
  - Included erp5_full_text_myisam_catalog (dependency of erp5_base)
  - Reimplement sortBusinessTemplates for the new behaviour

This is a follow up change of 63c1f78

- when upgradeSite is called, it will delete orphaned bt is we set
  delete_orphaned to true
- when there is provider calculation in the dependency list, look
  at both installed bt and to all the dependency tree

* fix the state of bt (new, old, present)
* make resolveBusinessTemplateListDependency returning all
  dependencies, even installed ones
* add upgradeSite method to install everything from top level bt
* the code to check version restriction has been removed but
  it should be  moved to another method

change the style of RATE to percentage and add the price_renderer to control the length of the price

This fixes a regression introduced in
commit f36260d2
("Code clean up in ListBox & EditorField").

Make sure convert is not called in case resource is not convertible.

  - Simplify the code and Minor Optimization for sort

  - Now getDependencyList returns entire list of dependencies even
    if it is already installed.

Follow up changes:
  - Included erp5_full_text_myisam_catalog (dependency of erp5_base)
  - Reimplement sortBusinessTemplates for the new behaviour

This is a follow up change of 63c1f784

- when upgradeSite is called, it will delete orphaned bt is we set
  delete_orphaned to true
- when there is provider calculation in the dependency list, look
  at both installed bt and to all the dependency tree

* fix the state of bt (new, old, present)
* make resolveBusinessTemplateListDependency returning all
  dependencies, even installed ones
* add upgradeSite method to install everything from top level bt
* the code to check version restriction has been removed but
  it should be  moved to another method