Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

16.0 dev laetitia #308

Open
wants to merge 5 commits into
base: 16.0
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion l10n_fr_lcc_members/report/invoice_report_templates.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
Receipt</span>
<span t-if="o.move_type == 'out_refund'">Credit Note</span>
<span t-if="o.move_type == 'in_refund'">Vendor Credit Note</span>
<span t-if="o.move_type == 'in_invoice'">Vendor Bill</span>
<span t-if="o.move_type == 'in_invoice' and o.journal_id.is_receipt">Receipt</span>
<span t-if="o.name != '/'" t-field="o.name" />
</h2>
</xpath>
Expand Down
2 changes: 1 addition & 1 deletion l10n_fr_lcc_members/views/account_journal.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<field name="inherit_id" ref="account.view_account_journal_form" />
<field name="arch" type="xml">
<field name="type" position="after">
<field name="is_receipt" attrs="{'invisible': [('type', '!=', 'sale')]}"/>
<field name="is_receipt" attrs="{'invisible': [('type', '!=', 'sale'),('type', '!=', 'purchase')]}"/>
</field>
</field>
</record>
Expand Down
2 changes: 2 additions & 0 deletions lcc_journal_category/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
*.*~
*pyc
53 changes: 53 additions & 0 deletions lcc_journal_category/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
# lcc_journal_category

Module add categories in accounting journals for french lcc company

## Installation

Just install lcc_journal_category, all dependencies will be installed by default.

## Configuration

No configuration needed on this addon.

## Usage

Details TODO

## Known issues / Roadmap

## Bug Tracker

Bugs are tracked on `GitHub Issues
<https://github.com/Lokavaluto/lokavaluto-addons/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

### Images

* Lokavaluto: `Icon <https://lokavaluto.fr/web/image/res.company/1/logo?unique=f3db262>`_.

### Contributors

* Laetitia DACOSTA GALET <https://github.com/LaetitiaElabore>
* Boris GALET <https://github.com/b0g>
* Stéphan SAINLEGER <https://github.com/stephansainleger>
* Nicolas JEUDY <https://github.com/njeudy>
* Lokavaluto Teams

### Funders

The development of this module has been financially supported by:

* Lokavaluto (https://lokavaluto.fr)
* Mycéliandre (https://myceliandre.fr)
* Elabore (https://elabore.coop)

### Maintainer

This module is maintained by LOKAVALUTO.

LOKAVALUTO, is a nonprofit organization whose
mission is to support the collaborative development of Odoo features and ecosystem for local complementary currency organizations.
1 change: 1 addition & 0 deletions lcc_journal_category/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
from . import models
18 changes: 18 additions & 0 deletions lcc_journal_category/__manifest__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"name": "lcc_journal_category",
"summary": """
Journal categories for lcc
""",
"author": "Lokavaluto",
"website": "https://lokavaluto.fr",
"category": "Accounting",
"version": "16.0.1.0.0",
# any module necessary for this one to work correctly
"depends": ["base", "account"],
# always loaded
"data": [
"views/account_journal.xml",
],
# only loaded in demonstration mode
"demo": [],
}
1 change: 1 addition & 0 deletions lcc_journal_category/models/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
from . import account_journal
13 changes: 13 additions & 0 deletions lcc_journal_category/models/account_journal.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
from odoo import models, fields

class AccountJournal(models.Model):
_inherit = "account.journal"

category = fields.Selection(
[("asso", "compta fonctionnement asso"),
("coupon", "compta coupon/billets MLC"),
("num", "compta MLC numérique")],
string="Catégorie",
required=True,
default="asso",
)
34 changes: 34 additions & 0 deletions lcc_journal_category/views/account_journal.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
-->
<odoo>
<record model="ir.ui.view" id="view_account_journal_form">
<field name="name">account.journal.form</field>
<field name="model">account.journal</field>
<field name="inherit_id" ref="account.view_account_journal_form" />
<field name="arch" type="xml">
<field name="type" position="after">
<field name="category" />
</field>
</field>
</record>

<record id="view_account_journal_search_category_inherit" model="ir.ui.view">
<field name="name">account.journal.search.category.inherit</field>
<field name="model">account.journal</field>
<field name="inherit_id" ref="account.view_account_journal_search" />
<field name="arch" type="xml">
<filter name="inactive" position="after">
<separator />
<filter name="asso" string="Compta fonctionnement asso" domain="[('category', '=', 'asso')]" />
<filter name="coupon" string="Compta coupon/billets MLC" domain="[('category', '=', 'coupon')]" />
<filter name="num" string="Compta MLC numérique" domain="[('category', '=', 'num')]" />
<group name="groupby" string="Group By">
<filter name="type_groupby" string="Catégorie" context="{'group_by': 'category'}" />
</group>
</filter>
</field>
</record>

</odoo>
4 changes: 2 additions & 2 deletions lcc_members/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

{
"name": "lcc_members",
"version": "16.0.1.0.0",
"version": "16.0.1.0.1",
"author": "Lokavaluto",
"maintainer": "False",
"website": "False",
Expand All @@ -24,7 +24,7 @@
"complementary_contact_data",
# "base_address_city",
"base_geolocalize",
"base_location",
# "base_location",
"contract",
"event",
"website",
Expand Down
19 changes: 17 additions & 2 deletions lcc_members/i18n/fr.po
Original file line number Diff line number Diff line change
Expand Up @@ -655,7 +655,7 @@ msgstr "Certains contacts représentent des postes / fonctions et non des person
#. module: lcc_members
#: model_terms:ir.ui.view,arch_db:lcc_members.lcc_members_form_view
msgid "Subcription number"
msgstr "Numero d'adhésion"
msgstr "Numéro d'adhésion"

#. module: lcc_members
#: model_terms:ir.ui.view,arch_db:lcc_members.portal_my_details_profiles_lcc
Expand Down Expand Up @@ -786,4 +786,19 @@ msgstr "Statut de l'adhérent"
#. module: lcc_members
#: model:ir.model,name:lcc_members.model_member_type
msgid "member.type"
msgstr "Type d'adhérent"
msgstr "Type d'adhérent"

#. module: base
#: model:ir.model.fields,field_description:base.field_ir_model_data__reference
#: model:ir.model.fields,field_description:base.field_res_partner__ref
#: model:ir.model.fields,field_description:base.field_res_users__ref
#: model:ir.model.fields.selection,name:base.selection__ir_server_object_lines__evaluation_type__reference
#: model_terms:ir.ui.view,arch_db:base.view_partner_form
msgid "Reference"
msgstr "Numéro d'adhésion"

#. module: membership_extension
#: model:ir.model.fields,field_description:membership_extension.field_res_partner__membership_start_adhered
#: model:ir.model.fields,field_description:membership_extension.field_res_users__membership_start_adhered
msgid "Membership Adhered Start Date"
msgstr "Date de saisie de l'adhésion"