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

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

directly use portal_catalog on select methods instead, see
commit 5a0b9189

(cherry picked from commit eed6ff24799a73a63327152a662669ba3ecfc391)

(cherry picked from commit d9283f7b85720cbc4f5321dd6bff6e99d078ca2c)

Conflicts:
	bt5/erp5_trade/bt/revision

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

(cherry picked from commit a32a565f2e4921c087803aa526bca8c853e18887)

Conflicts:
	bt5/erp5_item/bt/revision

Implemented Returned Orders like any other Order.

(cherry picked from commit 4a6bc31363a86976d6d8eac8991568cf6f3cd0c9)

Conflicts:
	bt5/erp5_trade/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

python 2.7.9 validates certificates by default.

1: Resize gadget if it's declared in  iframe
2: Add getContent test