From 28678aa72b623d41c079193bfee94615f8bbafca Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Tue, 4 Oct 2016 00:41:33 +0200 Subject: [PATCH] Update README.rst Rename variables --- intrastat_base/README.rst | 44 +++++++++++---------- intrastat_product/README.rst | 30 +++++--------- intrastat_product/models/account_invoice.py | 6 +-- product_harmonized_system/README.rst | 20 +++++----- 4 files changed, 45 insertions(+), 55 deletions(-) diff --git a/intrastat_base/README.rst b/intrastat_base/README.rst index 1a5cc85..284f240 100644 --- a/intrastat_base/README.rst +++ b/intrastat_base/README.rst @@ -2,14 +2,14 @@ :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 +============== +Intrastat Base +============== -===================== -Intrastat Base Module -===================== - -This module contains common functions for the Intrastat reporting and -should be used in combination with country-specific reporting modules -such as: +This module contains common functions for the intrastat reporting and +should be used in combination with the generic reporting module +*intrastat_product* and with the country-specific reporting modules such +as: - *l10n_fr_intrastat_service*: the module for the *Déclaration Européenne des Services* (DES) for France @@ -31,25 +31,28 @@ you should uninstall it first before installing this module. Usage ===== -To create H.S. codes, go to the menu *Sales > Configuration > Product Categories and Attributes > H.S. Codes*. +This module adds an intrastat property on countries and activates this property +on the 28 countries of the European Union. -Then you will be able to set the H.S. code on an product (under the *Information* tab) or on a product category. On the product form, you will also be able to set the *Country of Origin* of a product (for example, if the product is *made in China*, select *China* as *Country of Origin*). +With this module, the country field on partners becomes a required field. + +It adds an option *Exclude invoice line from intrastat if this tax is present* +on taxes. + +It adds a tab *Intrastat* on the company form view. .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas :alt: Try me on Runbot :target: https://runbot.odoo-community.org/runbot/91/8.0 - Bug Tracker =========== -Bugs are tracked on `GitHub Issues `_. -In case of trouble, please check there if your issue has already been reported. -If you spotted it first, help us smashing it by providing a detailed and welcomed feedback `here `_. - +Bugs are tracked on `GitHub Issues +`_. In case +of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and +welcomed feedback. Credits ======= @@ -62,9 +65,10 @@ Contributors Maintainer ---------- -.. image:: http://odoo-community.org/logo.png + +.. image:: https://odoo-community.org/logo.png :alt: Odoo Community Association - :target: http://odoo-community.org + :target: https://odoo-community.org This module is maintained by the OCA. @@ -72,4 +76,4 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use. -To contribute to this module, please visit http://odoo-community.org. +To contribute to this module, please visit https://odoo-community.org. diff --git a/intrastat_product/README.rst b/intrastat_product/README.rst index 1ad1510..5959731 100644 --- a/intrastat_product/README.rst +++ b/intrastat_product/README.rst @@ -2,9 +2,9 @@ :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 -======================== -Intrastat Product Module -======================== +================= +Intrastat Product +================= This module contains common objects and fields for the Intrastat Product reporting, such as the *H.S. codes* (if you are not familiar with H.S. codes, read `Wikipedia `) and the *country of origin* on the products. @@ -27,7 +27,6 @@ This module conflicts with the module *report_intrastat* from the official addon If you have already installed the module *report_intrastat*, you should uninstall it before installing this module. - Usage ===== @@ -71,24 +70,14 @@ and adapt the code for the specific needs of your country. :alt: Try me on Runbot :target: https://runbot.odoo-community.org/runbot/91/8.0 - -Known issues / Roadmap -====================== - -Work is in progress to migrate the existing l10n_fr_intrastat_product module -to this new reporting framework, cf. Alexis de Lattre, Akretion . - - Bug Tracker =========== -Bugs are tracked on `GitHub Issues `_. -In case of trouble, please check there if your issue has already been reported. -If you spotted it first, help us smashing it by providing a detailed and welcomed feedback `here `_. - +Bugs are tracked on `GitHub Issues +`_. In case +of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed +and welcomed feedback. Credits ======= @@ -99,7 +88,6 @@ Contributors * Alexis de Lattre, Akretion * Luc De Meyer, Noviat - Maintainer ---------- @@ -113,4 +101,4 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use. -To contribute to this module, please visit http://odoo-community.org. +To contribute to this module, please visit https://odoo-community.org. diff --git a/intrastat_product/models/account_invoice.py b/intrastat_product/models/account_invoice.py index 42df8f4..b62d4db 100644 --- a/intrastat_product/models/account_invoice.py +++ b/intrastat_product/models/account_invoice.py @@ -83,9 +83,9 @@ class AccountInvoice(models.Model): @api.model def _default_src_dest_region_id(self): - company = self.env['res.company'] - company_id = company._company_default_get('account.invoice') - company = company.browse(company_id) + rco = self.env['res.company'] + company_id = rco._company_default_get('account.invoice') + company = rco.browse(company_id) return company.intrastat_region_id @api.multi diff --git a/product_harmonized_system/README.rst b/product_harmonized_system/README.rst index 12798c0..c855aaf 100644 --- a/product_harmonized_system/README.rst +++ b/product_harmonized_system/README.rst @@ -37,13 +37,11 @@ Then you will be able to set the H.S. code on an product (under the *Information Bug Tracker =========== -Bugs are tracked on `GitHub Issues `_. -In case of trouble, please check there if your issue has already been reported. -If you spotted it first, help us smashing it by providing a detailed and welcomed feedback `here `_. - +Bugs are tracked on `GitHub Issues +`_. In case +of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and +welcomed feedback. Credits ======= @@ -54,12 +52,12 @@ Contributors * Alexis de Lattre, Akretion * Luc De Meyer, Noviat - Maintainer ---------- -.. image:: http://odoo-community.org/logo.png + +.. image:: https://odoo-community.org/logo.png :alt: Odoo Community Association - :target: http://odoo-community.org + :target: https://odoo-community.org This module is maintained by the OCA. @@ -67,4 +65,4 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use. -To contribute to this module, please visit http://odoo-community.org. +To contribute to this module, please visit https://odoo-community.org.