From 93d258fb0f01f71b8b9b703a6cafd253c10c0679 Mon Sep 17 00:00:00 2001 From: Juliana <juliana@le-filament.com> Date: Tue, 19 Jan 2021 10:29:02 +0100 Subject: [PATCH] Ajout configuration URL Mayam --- __manifest__.py | 1 + models/__init__.py | 4 ++- models/__pycache__/__init__.cpython-35.pyc | Bin 190 -> 0 bytes .../pos_transaction.cpython-35.pyc | Bin 2308 -> 0 bytes models/pos_transaction.py | 2 +- models/res_company.py | 9 ++++++ models/res_config_settings.py | 10 ++++++ views/res_config_setting_views.xml | 30 ++++++++++++++++++ 8 files changed, 54 insertions(+), 2 deletions(-) delete mode 100644 models/__pycache__/__init__.cpython-35.pyc delete mode 100644 models/__pycache__/pos_transaction.cpython-35.pyc create mode 100644 models/res_company.py create mode 100644 models/res_config_settings.py create mode 100644 views/res_config_setting_views.xml diff --git a/__manifest__.py b/__manifest__.py index 6587d17..ad4f532 100644 --- a/__manifest__.py +++ b/__manifest__.py @@ -14,6 +14,7 @@ ], "data": [ 'views/pos_transaction_views.xml', + 'views/res_config_setting_views.xml', 'data/service_cron_send_mayam.xml', ], 'qweb': [ diff --git a/models/__init__.py b/models/__init__.py index 390af60..2478562 100644 --- a/models/__init__.py +++ b/models/__init__.py @@ -1,4 +1,6 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. -from . import pos_transaction \ No newline at end of file +from . import pos_transaction +from . import res_config_settings +from . import res_company \ No newline at end of file diff --git a/models/__pycache__/__init__.cpython-35.pyc b/models/__pycache__/__init__.cpython-35.pyc deleted file mode 100644 index d2fb209f0101178887bfb26ba6581b7148401ae1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 190 zcmWgR<>h*xxi7Affq~&M0}^0jU|?`yU|=W~VPIfLVPHsMWXNG)$Yo@RVq{=UVPXi@ zWPZuWz`&r%c#FRvzc{|6C^4@%F}Wl&KhIB-=@vr~$bgj$MJx;q5aO4;enx(7s(yY- zem<BmG}2ElEiTE=)h{bbOwP|QfYI@Z1)2J}`6;P6#rpB_nR%Hd@$q^EmA5!-a`RJ4 Nb5iX<W)_3o3IKAcFxvnC diff --git a/models/__pycache__/pos_transaction.cpython-35.pyc b/models/__pycache__/pos_transaction.cpython-35.pyc deleted file mode 100644 index e9ed05179eeb37e87d3993d2159495a061cfcb2c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2308 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 diff --git a/models/pos_transaction.py b/models/pos_transaction.py index b8cbf42..9a98222 100644 --- a/models/pos_transaction.py +++ b/models/pos_transaction.py @@ -33,7 +33,7 @@ class PosTransaction(models.Model): def send_to_mayam(self): list_transaction = [] data_transaction = {} - url = "https://api.mayam.fr/transaction" + url = self.env.user.company_id.url_mayam key_vracoop = "VracoopAPI@2020" for transaction in self: diff --git a/models/res_company.py b/models/res_company.py new file mode 100644 index 0000000..d90953c --- /dev/null +++ b/models/res_company.py @@ -0,0 +1,9 @@ +# Copyright 2021 Le Filament (<http://www.le-filament.com>) +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from odoo import api, fields, models, _ + +class ResCompany(models.Model): + _inherit = "res.company" + + url_mayam = fields.Char("URL Mayam") \ No newline at end of file diff --git a/models/res_config_settings.py b/models/res_config_settings.py new file mode 100644 index 0000000..147936f --- /dev/null +++ b/models/res_config_settings.py @@ -0,0 +1,10 @@ +# Copyright 2020 Le Filament (<http://www.le-filament.com>) +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from odoo import api, fields, models + + +class ResConfigSettings(models.TransientModel): + _inherit = 'res.config.settings' + + url_mayam = fields.Char("URL Mayam", related='company_id.url_mayam', readonly=False) \ No newline at end of file diff --git a/views/res_config_setting_views.xml b/views/res_config_setting_views.xml new file mode 100644 index 0000000..6bb4e47 --- /dev/null +++ b/views/res_config_setting_views.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8"?> +<odoo> + <record id="res_config_settings_view_form" model="ir.ui.view"> + <field name="name">res.config.settings.view.form.inherit.vracoop</field> + <field name="model">res.config.settings</field> + <field name="priority" eval="100"/> + <field name="inherit_id" ref="base.res_config_settings_view_form" /> + <field name="arch" type="xml"> + <xpath expr="//div[@class='app_settings_block']" position="inside"> + <h2>Balance</h2> + <div class="row mt16 o_settings_container"> + <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"> + <div> + <label string="URL Mayam" for="url_mayam"/> + <div class="text-muted"> + URL Mayam pour l'envoi des transactions + </div> + <div class="content-group mt16"> + <field name="url_mayam" colspan="4" nolabel="1" /> + </div> + </div> + </div> + </div> + </div> + </xpath> + </field> + </record> + +</odoo> -- GitLab