diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-05-23 18:34:28 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-05-23 18:34:28 +0200 |
| commit | 1b81f1a5c9d7fbb88d0ffdf5fc342627161e71c3 (patch) | |
| tree | 743d848db44742ab1e9dd31a831a74f65bdde9c5 | |
| parent | 9622455f9e52be3201f9a912a7640b299eadd363 (diff) | |
| parent | 373a1c1128cd972630a26d4063e153ef6f7248fb (diff) | |
[MERGE] forward port branch saas-14 up to 373a1c1128c
| -rw-r--r-- | addons/stock/report/report_deliveryslip.xml | 4 | ||||
| -rw-r--r-- | addons/website_form/controllers/main.py | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/addons/stock/report/report_deliveryslip.xml b/addons/stock/report/report_deliveryslip.xml index e32f519c2d8..920f9004316 100644 --- a/addons/stock/report/report_deliveryslip.xml +++ b/addons/stock/report/report_deliveryslip.xml @@ -78,7 +78,9 @@ </tr> </thead> <tbody> - <tr t-foreach="o.pack_operation_ids" t-as="pack_operation"> + <t t-set="pack_operation_ids" t-value="o.pack_operation_ids"/> + <t groups="base.group_portal" t-set="pack_operation_ids" t-value="o.pack_operation_ids.sudo()"/> + <tr t-foreach="pack_operation_ids" t-as="pack_operation"> <td> <span t-field="pack_operation.product_id"/> <p t-if="o.picking_type_code == 'outgoing'"> diff --git a/addons/website_form/controllers/main.py b/addons/website_form/controllers/main.py index e7e48ba372f..551538e7765 100644 --- a/addons/website_form/controllers/main.py +++ b/addons/website_form/controllers/main.py @@ -111,6 +111,7 @@ class WebsiteForm(http.Controller): 'record': {}, # Values to create record 'attachments': [], # Attached files 'custom': '', # Custom fields values + 'meta': '', # Add metadata if enabled } authorized_fields = model.sudo()._get_form_writable_fields() |