diff options
| author | Simon Lejeune <sle@openerp.com> | 2017-02-21 11:46:57 +0100 |
|---|---|---|
| committer | Simon Lejeune <sle@openerp.com> | 2017-02-21 11:46:57 +0100 |
| commit | 68745f80411322e32bc33c9c2add5250f46ad507 (patch) | |
| tree | ff8642a265a109f7f947119fbd2ed3e87d15d281 | |
| parent | 80d26e26bba6cb3140e47eb4bb1933a5dfdbe144 (diff) | |
[REV] website_sale: Enable billing/delivery address on checkout process
This commit break the shipping form for public and portal user.
This reverts commit d3ff48533fb818ae9d87b72f3598ee85698105fa.
| -rw-r--r-- | addons/website_sale/security/website_sale.xml | 5 | ||||
| -rw-r--r-- | addons/website_sale/views/templates.xml | 16 |
2 files changed, 8 insertions, 13 deletions
diff --git a/addons/website_sale/security/website_sale.xml b/addons/website_sale/security/website_sale.xml index 8c6c7a64e51..77410d72f51 100644 --- a/addons/website_sale/security/website_sale.xml +++ b/addons/website_sale/security/website_sale.xml @@ -44,9 +44,4 @@ <record id="sales_team.group_sale_manager" model="res.groups"> <field name="implied_ids" eval="[(4, ref('website.group_website_publisher'))]"/> </record> - - <record id="base.group_user" model="res.groups"> - <field name="implied_ids" eval="[(4, ref('sale.group_delivery_invoice_address'))]"/> - </record> - </odoo> diff --git a/addons/website_sale/views/templates.xml b/addons/website_sale/views/templates.xml index 1da466ff0bc..d3fd6f92c3b 100644 --- a/addons/website_sale/views/templates.xml +++ b/addons/website_sale/views/templates.xml @@ -740,15 +740,15 @@ <t t-if="step>20 and step<50"> <a href="/shop/checkout" class="text-success"> <!-- billing if not loggedin - TODO --> - <t>Billing</t> - <t t-if="not website_sale_order or not website_sale_order.website_order_line or not website_sale_order.only_services" groups="sale.group_delivery_invoice_address"> & Shipping</t> - <span class="chevron"/> + <t t-if="not website_sale_order or not website_sale_order.website_order_line or not website_sale_order.only_services">Shipping &</t> + Billing<span class="chevron"/> </a> </t> <t t-if="not (step>20 and step<50)"> - <t>Billing</t> - <t t-if="not website_sale_order or not website_sale_order.website_order_line or not website_sale_order.only_services" groups="sale.group_delivery_invoice_address"> & Shipping</t> - <span class="chevron"/> + <!-- why website_sale_order is not set here ? --> + <t t-set="website_sale_order" t-value="website.sale_get_order()" /> + <t t-if="not website_sale_order or not website_sale_order.website_order_line or not website_sale_order.only_services">Shipping &</t> + Billing<span class="chevron"/> </t> </li> <li t-att-class="(step==40 and 'text-primary') or 'text-muted'" id="step40"> @@ -1076,7 +1076,7 @@ </t> </div> </div> - <t t-if="not only_services" groups="sale.group_delivery_invoice_address"> + <t t-if="not only_services"> <div class="row"> <div class="col-md-12"> <h3 class="page-header mt16">Shipping Address @@ -1739,7 +1739,7 @@ <div class='o_div_text_overflow' t-field="order.partner_invoice_id" t-options="{'widget': 'contact','fields': ['address', 'name', 'phone', 'email']}" /> </div> </div> - <t t-if="not order.only_services" groups="sale.group_delivery_invoice_address"> + <t t-if="not order.only_services"> <div class="panel panel-info break-word"> <div class="panel-heading">Ship To:</div> <div class="panel-body"> |