From 1fd9ebcdf809e200ab2d9f56e1e21a5caca5bb51 Mon Sep 17 00:00:00 2001
From: mgh-odoo <mgh@odoo.com>
Date: Mon, 16 Jul 2018 17:53:31 +0530
Subject: [PATCH] [IMP] website_sale: Add a dependency to account_invoicing

Purpose
=======

Add account invoicing dependency and remove some duplicate options

Purpose of this commit is when ecommerce installed lots of invoicing
stuff still show up while account_invoicing is not yet installed
(like  (invoice button in sales order, invoicing policy of products etc..)
and most of customers not using ecommerce without invoicing so the split is
useless for now

Specification
=============

Add account_invoicing as a dependency of website_sale and remove
the duplicated options from settings

Related Task ID: 1866823
---
 addons/website_sale/__manifest__.py           |  2 +-
 .../models/res_config_settings.py             |  2 -
 .../views/res_config_settings_views.xml       | 47 +------------------
 3 files changed, 3 insertions(+), 48 deletions(-)

diff --git a/addons/website_sale/__manifest__.py b/addons/website_sale/__manifest__.py
index c4136d11a15..7c94f70f77b 100644
--- a/addons/website_sale/__manifest__.py
+++ b/addons/website_sale/__manifest__.py
@@ -6,7 +6,7 @@
     'website': 'https://www.odoo.com/page/e-commerce',
     'version': '1.0',
     'description': "",
-    'depends': ['website', 'sale_payment', 'website_payment', 'website_mail', 'website_form', 'website_rating', 'digest'],
+    'depends': ['website', 'sale_payment', 'website_payment', 'website_mail', 'website_form', 'website_rating', 'digest', 'account_invoicing'],
     'data': [
         'security/ir.model.access.csv',
         'security/website_sale.xml',
diff --git a/addons/website_sale/models/res_config_settings.py b/addons/website_sale/models/res_config_settings.py
index 79dd3516a91..c7c3540fd7c 100644
--- a/addons/website_sale/models/res_config_settings.py
+++ b/addons/website_sale/models/res_config_settings.py
@@ -41,8 +41,6 @@ class ResConfigSettings(models.TransientModel):
                                        "defined in the configuration of the payment acquirer.\n"
                                        "This mode is advised if you issue the final invoice at the order and not after the delivery.")
 
-    module_l10n_eu_service = fields.Boolean(string="EU Digital Goods VAT")
-
     cart_recovery_mail_template = fields.Many2one('mail.template', string='Cart Recovery Email',
         default=_default_recovery_mail_template, config_parameter='website_sale.cart_recovery_mail_template_id', domain="[('model', '=', 'sale.order')]")
     cart_abandoned_delay = fields.Float("Abandoned Delay", help="number of hours after which the cart is considered abandoned",
diff --git a/addons/website_sale/views/res_config_settings_views.xml b/addons/website_sale/views/res_config_settings_views.xml
index d9362110674..9d434d2fa14 100644
--- a/addons/website_sale/views/res_config_settings_views.xml
+++ b/addons/website_sale/views/res_config_settings_views.xml
@@ -103,25 +103,8 @@
                     </div>
                 </div>
 
-                <h2>Taxes</h2>
-                <field name="company_id" invisible="1"/>
-                <div class="row mt16 o_settings_container" id="website_taxes_settings">
-                    <div class="col-12 col-lg-6 o_setting_box" title="This tax is applied to any new product created in the catalog.">
-                        <div class="o_setting_right_pane">
-                            <span class="o_form_label">Default Sales Tax</span>
-                            <div class="text-muted">
-                                Default sales tax applied to local transactions
-                            </div>
-                            <div class="content-group">
-                                <div class="mt16">
-                                    <field name="sale_tax_id" domain="[('type_tax_use', 'in', ('sale', 'all')), ('company_id', '=', company_id)]"/>
-                                </div>
-                                <div>
-                                    <button type="action" name="%(account.action_tax_form)d" string="Taxes" class="btn-link" icon="fa-arrow-right"/>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
+                <h2>Pricing</h2>
+                <div class="row mt16 o_settings_container" id="sale_pricing_settings">
                     <div class="col-12 col-lg-6 o_setting_box" id="website_tax_inclusion_setting">
                         <div class="o_setting_right_pane">
                             <label string="Product Prices" for="show_line_subtotals_tax_selection"/>
@@ -137,32 +120,6 @@
                             </div>
                         </div>
                     </div>
-                    <div class="col-12 col-lg-6 o_setting_box" id="website_rounding_method" title="A rounding per line is advised if your prices are tax-included. That way, the sum of line subtotals equals the total with taxes.">
-                        <div class="o_setting_right_pane">
-                            <span class="o_form_label">Rounding Method</span>
-                            <div class="text-muted">
-                                How total tax amount is computed in orders and invoices
-                            </div>
-                             <div class="content-group">
-                                <field name="tax_calculation_rounding_method" class="o_light_label mt16" widget="radio"/>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="col-12 col-lg-6 o_setting_box" id="website_eu_service" title="If you're selling digital goods to customers in the EU, you must charge VAT based on your customers' locations. This rule applies regardless of you are located. Digital goods are defined in the legislation as broadcasting, telecommunications, and services that are electronically supplied instead of shipped. Gift cards sent online are not included in the definition.">
-                        <div class="o_setting_left_pane">
-                            <field name="module_l10n_eu_service"/>
-                        </div>
-                        <div class="o_setting_right_pane" name="l10n_eu_service_right_pane">
-                            <label for="module_l10n_eu_service"/>
-                            <div class="text-muted">
-                                Apply right VAT rates for digital products sold in EU
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-                <h2>Pricing</h2>
-                <div class="row mt16 o_settings_container" id="sale_pricing_settings">
                     <div class="col-12 col-lg-6 o_setting_box" id="pricelists_setting"  title="With the first mode you can set several prices in the product config form (from Sales tab). With the second one, you set prices and computation rules from Pricelists.">
                         <div class="o_setting_left_pane">
                             <field name="multi_sales_price"/>