Skip to content
Extraits de code Groupes Projets

Comparer les révisions

Les modifications sont affichées comme si la révision source était fusionnée avec la révision cible. En savoir plus sur la comparaison des révisions.

Source

Sélectionner le projet cible
No results found
Sélectionner une révision Git
  • 14.0
1 résultat

Cible

Sélectionner le projet cible
  • lefilament/ap/ap_partner
1 résultat
Sélectionner une révision Git
  • 14.0
1 résultat
Afficher les modifications

Commits on Source 3

env:
browser: true
es6: true
# See https://github.com/OCA/odoo-community.org/issues/37#issuecomment-470686449
parserOptions:
ecmaVersion: 2017
ecmaVersion: 2019
overrides:
- files:
- "**/*.esm.js"
parserOptions:
sourceType: module
# Globals available in Odoo that shouldn't produce errorings
globals:
......@@ -14,7 +21,7 @@ globals:
moment: readonly
odoo: readonly
openerp: readonly
Promise: readonly
owl: readonly
# Styling is handled by Prettier, so we only need to enable AST rules;
# see https://github.com/OCA/maintainer-quality-tools/pull/618#issuecomment-558576890
......
......@@ -15,7 +15,6 @@ build/
develop-eggs/
dist/
eggs/
lib/
lib64/
parts/
sdist/
......
......@@ -5,7 +5,9 @@ exclude: |
# Files and folders generated by bots, to avoid loops
^setup/|/static/description/index\.html$|
# We don't want to mess with tool-generated files
.svg$|/tests/([^/]+/)?cassettes/|
.svg$|/tests/([^/]+/)?cassettes/|^.copier-answers.yml$|^.github/|
# Maybe reactivate this when all README files include prettier ignore tags?
^README\.md$|
# Library files can have extraneous formatting (even minimized)
/static/(src/)?lib/|
# Repos using Sphinx to generate docs don't need prettying
......@@ -25,11 +27,18 @@ repos:
entry: found forbidden files; remove them
language: fail
files: "\\.rej$"
- id: en-po-files
name: en.po files cannot exist
entry: found a en.po file
language: fail
files: '[a-zA-Z0-9_]*/i18n/en\.po$'
- repo: https://github.com/oca/maintainer-tools
rev: ab1d7f6
hooks:
# update the NOT INSTALLABLE ADDONS section above
- id: oca-update-pre-commit-excluded-addons
- id: oca-fix-manifest-website
args: ["https://le-filament.com"]
- repo: https://github.com/myint/autoflake
rev: v1.4
hooks:
......@@ -42,7 +51,7 @@ repos:
- --remove-duplicate-keys
- --remove-unused-variables
- repo: https://github.com/psf/black
rev: 20.8b1
rev: 22.3.0
hooks:
- id: black
- repo: https://github.com/pre-commit/mirrors-prettier
......@@ -92,32 +101,28 @@ repos:
- id: pyupgrade
args: ["--keep-percent-format"]
- repo: https://github.com/PyCQA/isort
rev: 5.5.1
rev: 5.12.0
hooks:
- id: isort
name: isort except __init__.py
args:
- --settings=.
exclude: /__init__\.py$
- repo: https://gitlab.com/PyCQA/flake8
- repo: https://github.com/PyCQA/flake8
rev: 3.8.3
hooks:
- id: flake8
name: flake8
additional_dependencies: ["flake8-bugbear==20.1.4"]
- repo: https://github.com/PyCQA/pylint
rev: pylint-2.5.3
- repo: https://github.com/OCA/pylint-odoo
rev: 7.0.2
hooks:
- id: pylint
- id: pylint_odoo
name: pylint with optional checks
args:
- --rcfile=.pylintrc
- --exit-zero
verbose: true
additional_dependencies: &pylint_deps
- pylint-odoo==3.5.0
- id: pylint
name: pylint with mandatory checks
- id: pylint_odoo
args:
- --rcfile=.pylintrc-mandatory
additional_dependencies: *pylint_deps
[MASTER]
load-plugins=pylint_odoo
score=n
......@@ -73,7 +75,7 @@ enable=anomalous-backslash-in-string,
invalid-commit,
missing-manifest-dependency,
missing-newline-extrafiles,
# missing-readme,
missing-readme,
no-utf8-coding-comment,
odoo-addons-relative-import,
old-api7-method-defined,
......
[MASTER]
load-plugins=pylint_odoo
score=n
......
......@@ -48,7 +48,7 @@ class ResPartner(models.Model):
geo_sector_id = fields.Many2one(
comodel_name="res.partner.geo.sector", string="Secteur géographique"
)
culture_type_id = fields.Many2one("culture.type", string="Type de culture")
# Champs pour la partie Adhésion
year_1st_membership = fields.Date("Date de première adhésion")
date_membership = fields.Date("Date de l'adhésion courante")
......@@ -157,3 +157,18 @@ class ResPartnerTypeMembership(models.Model):
_order = "name"
name = fields.Char("Type d'adhésion")
class CultureType(models.Model):
_name = "culture.type"
_description = "Type de culture"
name = fields.Char(string="Culture", required=True)
_sql_constraints = [
(
"name_id_unique",
"unique (name)",
"Ce type de culture existe déjà !",
)
]
......@@ -5,3 +5,5 @@ id,name,model_id/id,group_id/id,perm_read,perm_write,perm_create,perm_unlink
"access_res_partner_duration_membership_group_user","res_partner_duration_membership group_user","model_res_partner_duration_membership","base.group_user",1,0,0,0
"access_res_partner_type_membership_group_partner_manager","res_partner_type_membership group_partner_manager","model_res_partner_type_membership","base.group_partner_manager",1,1,1,1
"access_res_partner_type_membership_group_user","res_partner_type_membership group_user","model_res_partner_type_membership","base.group_user",1,0,0,0
"access_culture_type","culture_type","model_culture_type","base.group_user",1,0,0,0
"access_culture_type_admin","culture_type_admin","model_culture_type","base.group_partner_manager",1,1,1,1
......@@ -5,6 +5,7 @@
<record id="view_partner_tree" model="ir.ui.view">
<field name="name">res.partner.tree</field>
<field name="model">res.partner</field>
<field name="priority">100</field>
<field name="inherit_id" ref="base.view_partner_tree" />
<field name="arch" type="xml">
<field name="display_name" position="replace">
......@@ -25,6 +26,7 @@
optional="hide"
readonly="1"
/>
<field name="culture_type_id" optional="hide" readonly="1" />
</field>
</field>
</record>
......@@ -32,7 +34,7 @@
<record id="view_partner_form" model="ir.ui.view">
<field name="name">res.partner.form</field>
<field name="model">res.partner</field>
<field name="priority">22</field>
<field name="priority">100</field>
<field name="inherit_id" ref="base.view_partner_form" />
<field name="arch" type="xml">
<div name="button_box" position="inside">
......@@ -61,6 +63,10 @@
name="geo_sector_id"
options='{"no_open": True, "no_create": True}'
/>
<field
name="culture_type_id"
options='{"no_open": True, "no_create": True}'
/>
</field>
<field name="state_id" position="attributes">
<attribute name="invisible">1</attribute>
......@@ -143,6 +149,11 @@
string="Type de Société"
context="{'group_by': 'partner_company_type_id'}"
/>
<filter
name="group_culture_type"
string="Type de culture"
context="{'group_by': 'culture_type_id'}"
/>
</group>
</field>
</record>
......@@ -194,6 +205,16 @@
</field>
</record>
<record id="culture_type_tree" model="ir.ui.view">
<field name="name">Tree view for culture types</field>
<field name="model">culture.type</field>
<field name="arch" type="xml">
<tree string="Types de cultures" editable="top">
<field name="name" />
</tree>
</field>
</record>
<record id="action_view_res_partner_geo_sector" model="ir.actions.act_window">
<field name="name">Secteurs géographiques</field>
<field name="res_model">res.partner.geo.sector</field>
......@@ -218,6 +239,12 @@
<field name="view_mode">tree,form</field>
</record>
<record id="action_view_culture_type" model="ir.actions.act_window">
<field name="name">Type de culture</field>
<field name="res_model">culture.type</field>
<field name="view_mode">tree</field>
</record>
<menuitem
id="res_partner_ap_menu_config"
name="Configuration AP"
......@@ -252,5 +279,12 @@
parent="res_partner_ap_menu_config"
action="partner_company_type.res_partner_company_type_act_window"
/>
<menuitem
id="menu_culture_type"
name="Type de culture"
parent="res_partner_ap_menu_config"
action="action_view_culture_type"
/>
</data>
</odoo>