Skip to content
This repository has been archived by the owner on Oct 16, 2023. It is now read-only.

Commit

Permalink
[REF]
Browse files Browse the repository at this point in the history
  • Loading branch information
legalsylvain committed Jul 13, 2018
1 parent d354844 commit 3a709b0
Show file tree
Hide file tree
Showing 52 changed files with 1,193 additions and 2,297 deletions.
2 changes: 1 addition & 1 deletion account_export_ebp/wizard/wizard_add_suffix.py
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ def _get_suffix(self, name, existing_suffixes):
suffix = unidecode(suffix)
if suffix and not(suffix in existing_suffixes):
return suffix
# fourth try: takes first 2 caracters and add a two digit number
# fourth try: takes first 2 caracters and add a two digit number
for x in range(10, 100):
suffix = name2[:min(2, len(name2))].upper() + str(x)
suffix = unidecode(suffix)
Expand Down
1 change: 1 addition & 0 deletions grap_change_views/models/account_bank_statement_line.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

from openerp import models


class AccountBankStatementLine(models.Model):
_inherit = 'account.bank.statement.line'
_order = 'date desc, journal_id'
1 change: 1 addition & 0 deletions grap_change_views/models/account_invoice.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

from openerp import models


class AccountInvoice(models.Model):
_inherit = 'account.invoice'
_order = 'date_invoice desc, state'
2 changes: 1 addition & 1 deletion grap_change_views/models/pos_category.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class PosCategory(models.Model):
# Columns Section
complete_name_order = fields.Char(
string='Complete Name Stored', store=True,
compute = '_compute_complete_name_order')
compute='_compute_complete_name_order')

product_ids = fields.One2many(
comodel_name='product.product', inverse_name='pos_categ_id',
Expand Down
2 changes: 1 addition & 1 deletion grap_change_views/models/sale_order_line.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ class SaleOrderLine(models.Model):
@api.depends('tax_id')
def _compute_tax_ids_description(self):
for line in self:
line.tax_ids_description =','.join(
line.tax_ids_description = ','.join(
[x.description and x.description or x.name
for x in line.tax_id])
25 changes: 25 additions & 0 deletions grap_cooperative/README.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg
:target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
:alt: License: AGPL-3


=========================================================
GRAP - Manage people and enterprise linked to the company
=========================================================

manage people, companies, members of the cooperative.

Credits
=======

Contributors
------------

* Sylvain Le Gal (https://twitter.com/legalsylvain)

Funders
-------

The development of this module has been financially supported by:

* GRAP, Groupement Régional Alimentaire de Proximité (http://www.grap.coop)
25 changes: 2 additions & 23 deletions grap_cooperative/__init__.py
Original file line number Diff line number Diff line change
@@ -1,23 +1,2 @@
# -*- encoding: utf-8 -*-
##############################################################################
#
# GRAP - Cooperative module for Odoo
# Copyright (C) 2014 GRAP (http://www.grap.coop)
# @author Sylvain LE GAL (https://twitter.com/legalsylvain)
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
# published by the Free Software Foundation, either version 3 of the
# License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################

from . import model
# coding: utf-8
from . import models
66 changes: 23 additions & 43 deletions grap_cooperative/__openerp__.py
Original file line number Diff line number Diff line change
@@ -1,53 +1,33 @@
# -*- encoding: utf-8 -*-
##############################################################################
#
# GRAP - Cooperative module for Odoo
# Copyright (C) 2014 GRAP (http://www.grap.coop)
# @author Sylvain LE GAL (https://twitter.com/legalsylvain)
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
# published by the Free Software Foundation, either version 3 of the
# License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
# coding: utf-8
# Copyright (C) 2014 - Today: GRAP (http://www.grap.coop)
# @author: Sylvain LE GAL (https://twitter.com/legalsylvain)
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).

{
'name': 'GRAP - Cooperative',
'version': '0.1',
'version': '8.0.2.0.0',
'category': 'GRAP - Custom',
'description': """
Manage people and enterprise linked to GRAP
===========================================
Features :
----------
* manage people, companies, members of the cooperative;
* provides a light tools to manage informatic tasks;
* provides a light tools to manage work time with an analytic depending"""
""" of the companies;
Copyright, Authors and Licence:
-------------------------------
* Copyright: 2014, GRAP: Groupement Régional Alimentaire de Proximité;
* Author: Sylvain LE GAL (https://twitter.com/legalsylvain);
* Licence: AGPL-3 (http://www.gnu.org/licenses/);""",
'author': 'GRAP',
'website': 'http://www.grap.coop',
'license': 'AGPL-3',
'depends': ['base'],
'depends': [
'base',
],
'data': [
'security/res_groups_data.yml',
'security/ir_model_access_data.yml',
'view/view.xml',
'view/action.xml',
'view/menu.xml',
'security/res_groups.xml',
'security/ir.model.access.csv',
'views/view_grap_activity.xml',
'views/view_grap_category.xml',
'views/view_grap_college.xml',
'views/view_grap_mandate.xml',
'views/view_grap_member.xml',
'views/view_grap_people.xml',
'views/view_grap_type.xml',
'views/menu.xml',
],
'demo': [
'demo/grap_activity.xml',
'demo/grap_people.xml',
'demo/grap_activity_people.xml',
],
}
18 changes: 18 additions & 0 deletions grap_cooperative/demo/grap_activity.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (C) 2018 - Today: GRAP (http://www.grap.coop)
@author: Sylvain LE GAL (https://twitter.com/legalsylvain)
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
-->
<openerp><data>

<record id="activity_1" model="grap.activity">
<field name="activity_name">Demo Activity 1</field>
</record>

<record id="internal_team" model="grap.activity">
<field name="activity_name">Internal Team</field>
<field name="state">validated</field>
</record>

</data></openerp>
15 changes: 15 additions & 0 deletions grap_cooperative/demo/grap_activity_people.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (C) 2018 - Today: GRAP (http://www.grap.coop)
@author: Sylvain LE GAL (https://twitter.com/legalsylvain)
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
-->
<openerp><data>

<record id="link_director_internal_team" model="grap.activity.people">
<field name="activity_id" ref="internal_team"/>
<field name="people_id" ref="director"/>
<field name="fte">0.5</field>
</record>

</data></openerp>
14 changes: 14 additions & 0 deletions grap_cooperative/demo/grap_people.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (C) 2018 - Today: GRAP (http://www.grap.coop)
@author: Sylvain LE GAL (https://twitter.com/legalsylvain)
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
-->
<openerp><data>

<record id="director" model="grap.people">
<field name="first_name">Director</field>
<field name="last_name">Demo</field>
</record>

</data></openerp>
35 changes: 0 additions & 35 deletions grap_cooperative/model/__init__.py

This file was deleted.

126 changes: 0 additions & 126 deletions grap_cooperative/model/grap_activity.py

This file was deleted.

Loading

0 comments on commit 3a709b0

Please sign in to comment.