diff --git a/README.rst b/README.rst index 7f0f8a8abe1fb5747141c46f872d0e00a97222d9..6d385f3d9a5ba3454b32e65adc20332f7efd0c38 100644 --- a/README.rst +++ b/README.rst @@ -3,9 +3,9 @@ :alt: License: AGPL-3 -==================== +================================ Autrement Dit - Gestion Contacts -==================== +================================ Modifie le module Contact: - ajout des champs à la table res.partner diff --git a/__init__.py b/__init__.py index 9b4296142f475392fb090e036775e999aa8e4a27..f987065d30ea63fc9b3cd6e4c7c8474171d2cf18 100644 --- a/__init__.py +++ b/__init__.py @@ -1,2 +1,4 @@ +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + from . import models from . import wizard diff --git a/__manifest__.py b/__manifest__.py index 442fee46e513f1ecd7c5dadbf4787fc1747db214..a6eca0a94d477ac247b1ea0065e23f1f88fc8d26 100644 --- a/__manifest__.py +++ b/__manifest__.py @@ -1,24 +1,11 @@ { 'name': "Autrement dit - Contacts", - 'summary': """Gestion des contacts - Autrement dit""", - - 'description': """ - Modifie le module Contact: - - ajout des champs à la table res.partner - - modifie les vues associées (Gestion des types Contacts : Société / Contacts Société / Bénéficiaire) - - nouveaux modèles Aide / Communication / Rôle / Statuts Spé / Suivi - - ajout des Vues pour la gestion des nouveaux modèles dans Contacts -> Configuration - """, - 'author': "Le Filament", 'website': "https://www.le-filament.com", - - 'version': '12.0.1.0.0', + 'version': '12.0.1.0.1', 'license': "AGPL-3", - 'depends': ['l10n_fr', 'sale'], - 'data': [ 'security/ir.model.access.csv', 'views/res_partner_view.xml', diff --git a/models/__init__.py b/models/__init__.py index 1e55fea056d0f39d497c0b17290a4809fb2af884..248b300824e6123d88536ce778e4c720f5c5c0b2 100644 --- a/models/__init__.py +++ b/models/__init__.py @@ -1,3 +1,5 @@ +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + from . import res_partner from . import sale from . import account_invoice diff --git a/models/__pycache__/__init__.cpython-35.pyc b/models/__pycache__/__init__.cpython-35.pyc deleted file mode 100644 index e0212a7b87e679c4597c8a0edfb3363fa5b5ce5c..0000000000000000000000000000000000000000 Binary files a/models/__pycache__/__init__.cpython-35.pyc and /dev/null differ diff --git a/models/__pycache__/account_invoice.cpython-35.pyc b/models/__pycache__/account_invoice.cpython-35.pyc deleted file mode 100644 index 426141a51ad8929cfc7c210611a2c9affee186c0..0000000000000000000000000000000000000000 Binary files a/models/__pycache__/account_invoice.cpython-35.pyc and /dev/null differ diff --git a/models/__pycache__/product.cpython-35.pyc b/models/__pycache__/product.cpython-35.pyc deleted file mode 100644 index 8da60038f246442687c5ccbe567050a19c10e68e..0000000000000000000000000000000000000000 Binary files a/models/__pycache__/product.cpython-35.pyc and /dev/null differ diff --git a/models/__pycache__/res_partner.cpython-35.pyc b/models/__pycache__/res_partner.cpython-35.pyc deleted file mode 100644 index 93e3328bd663b94df42512d182a01da1e3147503..0000000000000000000000000000000000000000 Binary files a/models/__pycache__/res_partner.cpython-35.pyc and /dev/null differ diff --git a/models/__pycache__/sale.cpython-35.pyc b/models/__pycache__/sale.cpython-35.pyc deleted file mode 100644 index c0097e8a9a22c657a4b96cab038f9b1f60523461..0000000000000000000000000000000000000000 Binary files a/models/__pycache__/sale.cpython-35.pyc and /dev/null differ diff --git a/models/res_partner.py b/models/res_partner.py index 43db6c93236ff20a01543a565ecfa5bb99a32442..5949518a9ec5f86f8ad2753c0dbf8f3dd6ba4c06 100644 --- a/models/res_partner.py +++ b/models/res_partner.py @@ -9,7 +9,7 @@ class AutreResPartner(models.Model): _inherit = "res.partner" @api.multi - def _invoice_total_benef(self): + def _compute_invoice_total_benef(self): account_invoice = self.env['account.invoice'] if not self.ids: self.total_invoiced_benef = 0.0 @@ -90,7 +90,7 @@ class AutreResPartner(models.Model): email_fact = fields.Char('Email de facturation') ref_chorus = fields.Char('Références Chorus') total_invoiced_benef = fields.Monetary( - compute='_invoice_total_benef', + compute='_compute_invoice_total_benef', string="Total Invoiced bénéficiaire", groups='account.group_account_invoice') diff --git a/security/ir.model.access.csv b/security/ir.model.access.csv index 69acd0f60770eff7ef7dbd6f3b81c5166a7df758..008d39539396a69915387b6c867bcd8d13cce398 100644 --- a/security/ir.model.access.csv +++ b/security/ir.model.access.csv @@ -5,4 +5,4 @@ id,name,model_id/id,group_id/id,perm_read,perm_write,perm_create,perm_unlink "access_res_partner_com_group_user","res_partner_com group_user","model_res_partner_com","base.group_partner_manager",1,1,1,1 "access_res_partner_aide_group_user","res_partner_aide group_user","model_res_partner_aide","base.group_partner_manager",1,1,1,1 "access_res_partner_suivi_group_user","res_partner_suivi group_user","model_res_partner_suivi","base.group_partner_manager",1,1,1,1 -"access_res_partner_pref_group_user","res_partner_pref group_user","model_res_partner_pref","base.group_partner_manager",1,1,1,1 \ No newline at end of file +"access_res_partner_pref_group_user","res_partner_pref group_user","model_res_partner_pref","base.group_partner_manager",1,1,1,1 diff --git a/views/sale_view.xml b/views/sale_view.xml index 7eff4e6c86c321ff4e1a154cd3a2a6bb04062989..2f5d2ce05a8dd817e91f4176b9b590cd0b98c766 100644 --- a/views/sale_view.xml +++ b/views/sale_view.xml @@ -21,6 +21,10 @@ <xpath expr="//field[@name='partner_id']" position="after"> <field name="beneficiaire_id" operator="child_of" /> </xpath> + <xpath expr="//filter[@name='my_sale_orders_filter']" position="before"> + <filter string="Test" name="my_vente" + domain="['|',('parent_id','=',context.get('active_id',True)),('beneficiaire_id','=',context.get('active_id',True))]"/> + </xpath> </field> </record> @@ -45,18 +49,5 @@ </xpath> </field> </record> - - <record id="autrement_view_sales_order_filter" model="ir.ui.view"> - <field name="name">autrement.sale.order.list.select</field> - <field name="model">sale.order</field> - <field name="inherit_id" ref="sale.view_sales_order_filter"/> - <field name="priority" eval="15"/> - <field name="arch" type="xml"> - <xpath expr="//filter[@name='my_sale_orders_filter']" position="before"> - <filter string="Test" name="my_vente" - domain="['|',('parent_id','=',context.get('active_id',True)),('beneficiaire_id','=',context.get('active_id',True))]"/> - </xpath> - </field> - </record> </data> -</odoo> \ No newline at end of file +</odoo> diff --git a/wizard/__init__.py b/wizard/__init__.py index 1eb17ffa15c4f40b7a6793d10d3f8b620b113d8b..2714bdb3b3ea8e22214e4963075f42f4ea712f88 100644 --- a/wizard/__init__.py +++ b/wizard/__init__.py @@ -1,3 +1,3 @@ -# -*- coding: utf-8 -*- +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from . import sale_make_invoice_advance diff --git a/wizard/__pycache__/__init__.cpython-35.pyc b/wizard/__pycache__/__init__.cpython-35.pyc deleted file mode 100644 index 9662246d542f1799995d57281e83820fa51b1796..0000000000000000000000000000000000000000 Binary files a/wizard/__pycache__/__init__.cpython-35.pyc and /dev/null differ diff --git a/wizard/__pycache__/sale_make_invoice_advance.cpython-35.pyc b/wizard/__pycache__/sale_make_invoice_advance.cpython-35.pyc deleted file mode 100644 index 4e34e2970c1a16296546c531399778f46de5cf17..0000000000000000000000000000000000000000 Binary files a/wizard/__pycache__/sale_make_invoice_advance.cpython-35.pyc and /dev/null differ