Conflicts:
	bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Base_viewPDMFieldLibrary.xml

- Optionally group by function
- Give higher priority to Order Report compared to Workflow Report
- Optionally filter by Quantity Unit and enable Stat Columns for Quantity

TODO: Quantity also for Thirs Party if filtered by quantity Unit

erp5_trade: Temporarly Revert "stop copying (deprecated) Payment Condition documents from Trade Condition to Order, and from Order to Packing List."

This reverts commit eb5fdbe3.

Conflicts:
	bt5/erp5_trade/bt/revision
	product/ERP5/tests/testTradeCondition.py

And merged with 5c09e2e2

1. upgrade epos-print
2: print with html5 canvas to support chinese characters

(cherry picked from commit eed6ff24799a73a63327152a662669ba3ecfc391)

Added aggregate item and item creations actions on new portal types.

(cherry picked from commit a32a565f2e4921c087803aa526bca8c853e18887)

Conflicts:
	bt5/erp5_item/bt/revision

 Introduce temp_object parameter on builder.build() and propagate it
 over until the newContent() calls. This change allow use create
 Temporary Documents intestead real ones, like a "preview".

(cherry picked from commit 959776ce50c2e7ee2b8f9945ec91a2e0fbe08619)

Conflicts:
	product/ERP5/Document/SimulatedDeliveryBuilder.py

When other nodes takes time to start they are not always registered
when the "main" node asserts that they are there.
We observed problems in an environment where resolving localhost (by
DNS) takes 10 seconds.

Also introduce getOtherZopeNodeList utility method that can be useful in
other ZEO tests in ProcessingNodeTestCase

When other zope nodes takes time to start this sometimes causes
conflict.

Reset mailhost before each test.

Commit changes created by portal_transforms.

This allows restoring the correct skin selection in ERP5JS.
Deferred reports can now be used in ERP5JS.

REQUEST is used to support direct form rendering, like: ./Base_viewHistory?deferred_portal_skin=ODS&portal_skin=Deferred

Thanks to Georgios Dagkakis for his work on this topic.
See nexedi/erp5!702

otherwise it loses too much precision.

Allow to sync opml event when some password are missing or broken (will only display public informations)

When adding opml from SlapOS interface, sync then show promise status.

Show Ressource consumption graph into separated graphs. Auto update of graph content is disabled by default, a new option is added to enable if needed.

Fix changes after merge with erp5 master which contains latests changes on renderjs

Intead of using opml software type, Hosting Subscription has now his own software type which simplify management.