Browse Source

Merge 6db5a9894a into b1441bec33

pull/1/merge
Thibault Francois 8 years ago
parent
commit
445eebe301
  1. 2
      beescoop_pos/__init__.py
  2. 17
      beescoop_pos/__openerp__.py
  3. 33
      beescoop_pos/beescoop_pos.py
  4. 17
      beescoop_pos/beescoop_pos.xml
  5. 1
      beescoop_pos/models/__init__.py
  6. 26
      beescoop_pos/models/beescoop_pos.py
  7. 19
      beescoop_pos/views/beescoop_pos.xml
  8. 3
      beesdoo_base/__init__.py
  9. 23
      beesdoo_base/__openerp__.py
  10. 1
      beesdoo_base/models/__init__.py
  11. 14
      beesdoo_base/models/partner.py
  12. 8
      beesdoo_base/tools/__init__.py
  13. 15
      beesdoo_base/views/partner.xml
  14. 2
      beesdoo_product/__init__.py
  15. 33
      beesdoo_product/__openerp__.py
  16. 65
      beesdoo_product/data/product_label.xml
  17. 2
      beesdoo_product/models/__init__.py
  18. 18
      beesdoo_product/models/beesdoo_product.py
  19. 3
      beesdoo_product/security/ir.model.access.csv
  20. 30
      beesdoo_product/views/beesdoo_product.xml
  21. 2
      beesdoo_project/__openerp__.py

2
beescoop_pos/__init__.py

@ -1,2 +1,2 @@
# -*- coding: utf-8 -*-
import beescoop_pos
import models

17
beescoop_pos/__openerp__.py

@ -1,34 +1,31 @@
# -*- coding: utf-8 -*-
{
'name': "bees_member",
'name': "Beescoop Point of sale",
'summary': """
Module to manage bees members
Module that extends the pos for the beescoop
""",
'description': """
Long description of module's purpose
""",
'author': "My Company",
'website': "http://www.yourcompany.com",
'author': "Beescoop - Cellule IT",
'website': "https://github.com/beescoop/Obeesdoo",
# Categories can be used to filter modules in modules listing
# Check https://github.com/odoo/odoo/blob/master/openerp/addons/base/module/module_data.xml
# for the full list
'category': 'Uncategorized',
'category': 'Point Of Sale',
'version': '0.1',
# any module necessary for this one to work correctly
'depends': ['point_of_sale'],
'depends': ['point_of_sale', 'beesdoo_base'],
# always loaded
'data': [
# 'security/ir.model.access.csv',
'beescoop_pos.xml',
'views/beescoop_pos.xml',
],
# only loaded in demonstration mode
'demo': [
'demo.xml',
],
}

33
beescoop_pos/beescoop_pos.py

@ -1,33 +0,0 @@
# -*- coding: utf-8 -*-
from openerp import models, fields, api
from openerp.fields import One2many, Float, Many2one
class BeesPOS(models.Model):
_inherit = 'pos.config'
bill_value = One2many('bill_value', 'pos')
class BillValue(models.Model):
_name = 'bill_value'
_order = 'name asc'
name = fields.Float(string='Name')
pos = Many2one('pos.config')
class BeesAccountBankStatement(models.Model):
_inherit = 'account.bank.statement.cashbox'
def _get_default_line(self):
print "in _get_default_line", self.env.context['active_id']
if not self.env.context.get('active_id'):
return []
default_lines = []
pos_obj = self.env['pos.session']
pos_session_rec = pos_obj.browse(self.env.context['active_id'])
for bill_value_rec in pos_session_rec.config_id.bill_value:
default_lines.append((0, 0, {'coin_value' : bill_value_rec.name}))
return default_lines
cashbox_lines_ids = fields.One2many(default=_get_default_line)

17
beescoop_pos/beescoop_pos.xml

@ -1,17 +0,0 @@
<openerp>
<data>
<record model="ir.ui.view" id="beescoop_pos_inherit">
<field name="name">bees.pos.config.form.view</field>
<field name="model">pos.config</field>
<field name="inherit_id" ref="point_of_sale.view_pos_config_form" />
<field name="arch" type="xml">
<field name="iface_tax_included" position="after">
<field name="bill_value" />
</field>
</field>
</record>
</data>
</openerp>

1
beescoop_pos/models/__init__.py

@ -0,0 +1 @@
import beescoop_pos

26
beescoop_pos/models/beescoop_pos.py

@ -0,0 +1,26 @@
# -*- coding: utf-8 -*-
from openerp import models, fields
class BeesPOS(models.Model):
_inherit = 'pos.config'
bill_value = fields.One2many('bill_value', 'pos')
class BillValue(models.Model):
_name = 'bill_value'
_order = 'name asc'
name = fields.Float(string='Name')
pos = fields.Many2one('pos.config')
class BeesAccountBankStatement(models.Model):
_inherit = 'account.bank.statement.cashbox'
def _get_default_line(self):
if not self.env.context.get('active_id'):
return []
pos_session_rec = self.env['pos.session'].browse(self.env.context['active_id'])
return [(0, 0, {'coin_value' : bill_value_rec.name}) for bill_value_rec in pos_session_rec.config_id.bill_value]
cashbox_lines_ids = fields.One2many(default=_get_default_line)

19
beescoop_pos/views/beescoop_pos.xml

@ -0,0 +1,19 @@
<openerp>
<data>
<record model="ir.ui.view" id="beescoop_pos_inherit">
<field name="name">bees.pos.config.form.view</field>
<field name="model">pos.config</field>
<field name="inherit_id" ref="point_of_sale.view_pos_config_form" />
<field name="arch" type="xml">
<field name="iface_tax_included" position="after">
<separator string="Bill Value" colspan="2" />
<field name="bill_value" nolabel="1" colspan="2" >
<tree editable="bottom">
<field name="name" />
</tree>
</field>
</field>
</field>
</record>
</data>
</openerp>

3
beesdoo_base/__init__.py

@ -0,0 +1,3 @@
# -*- coding: utf-8 -*-
import models
import tools

23
beesdoo_base/__openerp__.py

@ -0,0 +1,23 @@
# -*- coding: utf-8 -*-
{
'name': "Beescoop Base Module",
'summary': """
Module that customize the base module and contains some python tools
""",
'description': """
""",
'author': "Beescoop - Cellule IT",
'website': "https://github.com/beescoop/Obeesdoo",
'category': 'Project Management',
'version': '0.1',
'depends': ['base'],
'data': [
'views/partner.xml',
],
}

1
beesdoo_base/models/__init__.py

@ -0,0 +1 @@
import partner

14
beesdoo_base/models/partner.py

@ -0,0 +1,14 @@
# -*- coding: utf-8 -*-
from openerp import models, fields, api
from openerp.addons.beesdoo_base.tools import concat_names
class Partner(models.Model):
_inherit = 'res.partner'
first_name = fields.Char('First Name')
last_name = fields.Char('Last Name', required=True)
@api.onchange('first_name', 'last_name')
def _on_change_name(self):
self.name = concat_names(self.first_name, self.last_name)

8
beesdoo_base/tools/__init__.py

@ -0,0 +1,8 @@
# -*- coding: utf-8 -*-
def concat_names(*args):
"""
Concatenate only args that are not empty
@param args: a list of string
"""
return ' '.join(filter(bool, args))

15
beesdoo_base/views/partner.xml

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<record model="ir.ui.view" id="beesdoo_partner_form_view">
<field name="name">beesdoo.partner.form.view</field>
<field name="model">res.partner</field>
<field name="inherit_id" ref="base.view_partner_form" />
<field name="arch" type="xml" >
<field name="name" position="replace">
<field name="name" class="oe_read_only" />
<field name="first_name" placeholder="First Name" class="oe_edit_only" attrs="{'invisible' : [('company_type', '=', 'company')]}"/>
<field name="last_name" placeholder="Last Name" class="oe_edit_only" default_focus="1"/>
</field>
</field>
</record>
</odoo>

2
beesdoo_product/__init__.py

@ -0,0 +1,2 @@
# -*- coding: utf-8 -*-
import models

33
beesdoo_product/__openerp__.py

@ -0,0 +1,33 @@
# -*- coding: utf-8 -*-
{
'name': "beesdoo_product",
'summary': """
Modification of product module for the needs of beescoop
- SOOO5 - Ajout de label bio/ethique/provenance""",
'description': """
""",
'author': "Beescoop - Cellule IT",
'website': "https://github.com/beescoop/Obeesdoo",
# Categories can be used to filter modules in modules listing
# Check https://github.com/odoo/odoo/blob/master/openerp/addons/base/module/module_data.xml
# for the full list
'category': 'Sales Management',
'version': '0.1',
# any module necessary for this one to work correctly
'depends': ['beesdoo_base', 'product'],
# always loaded
'data': [
'data/product_label.xml',
'views/beesdoo_product.xml',
'security/ir.model.access.csv',
],
# only loaded in demonstration mode
'demo': [],
}

65
beesdoo_product/data/product_label.xml

@ -0,0 +1,65 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<data noupdate="1">
<record model="beesdoo.product.label" id="eco_green">
<field name="name">Label Bio ou Confiance</field>
<field name="type">eco</field>
<field name="color_code">#40ff00</field>
</record>
<record model="beesdoo.product.label" id="eco_orange">
<field name="name">Agriculture raisonnée</field>
<field name="type">eco</field>
<field name="color_code">#ffa200</field>
</record>
<record model="beesdoo.product.label" id="eco_red">
<field name="name">Conventionnel</field>
<field name="type">eco</field>
<field name="color_code">#ff4000</field>
</record>
<record model="beesdoo.product.label" id="local_green">
<field name="name">Belgique</field>
<field name="type">local</field>
<field name="color_code">#40ff00</field>
</record>
<record model="beesdoo.product.label" id="local_orange">
<field name="name">Europe</field>
<field name="type">local</field>
<field name="color_code">#ffa200</field>
</record>
<record model="beesdoo.product.label" id="local_red">
<field name="name">Monde</field>
<field name="type">local</field>
<field name="color_code">#ff4000</field>
</record>
<record model="beesdoo.product.label" id="fair_green">
<field name="name">Label par tiers</field>
<field name="type">fair</field>
<field name="color_code">#40ff00</field>
</record>
<record model="beesdoo.product.label" id="fair_orange">
<field name="name">Préserve l’intérêt</field>
<field name="type">fair</field>
<field name="color_code">#ffa200</field>
</record>
<record model="beesdoo.product.label" id="fair_red">
<field name="name">Aucune garantie</field>
<field name="type">fair</field>
<field name="color_code">#ff4000</field>
</record>
<record model="beesdoo.product.label" id="delivery_green">
<field name="name">Intermédiaire coopératif</field>
<field name="type">delivery</field>
<field name="color_code">#40ff00</field>
</record>
<record model="beesdoo.product.label" id="delivery_orange">
<field name="name">Grossiste biologique</field>
<field name="type">delivery</field>
<field name="color_code">#ffa200</field>
</record>
<record model="beesdoo.product.label" id="delivery_red">
<field name="name">Grossiste industriel</field>
<field name="type">delivery</field>
<field name="color_code">#ff4000</field>
</record>
</data>
</odoo>

2
beesdoo_product/models/__init__.py

@ -0,0 +1,2 @@
# -*- coding: utf-8 -*-
import beesdoo_product

18
beesdoo_product/models/beesdoo_product.py

@ -0,0 +1,18 @@
# -*- coding: utf-8 -*-
from openerp import models, fields, api
class BeesdooProduct(models.Model):
_inherit = "product.template"
eco_label = fields.Many2one('beesdoo.product.label', domain = [('type', '=', 'eco')])
local_label = fields.Many2one('beesdoo.product.label', domain = [('type', '=', 'local')])
fair_label = fields.Many2one('beesdoo.product.label', domain = [('type', '=', 'fair')])
origin_label = fields.Many2one('beesdoo.product.label', domain = [('type', '=', 'delivery')])
class BeesdooProductLabel(models.Model):
_name = "beesdoo.product.label"
name = fields.Char()
type = fields.Selection([('eco', 'Écologique'), ('local', 'Local'), ('fair', 'Équitable'), ('delivery', 'Distribution')])
color_code = fields.Char()

3
beesdoo_product/security/ir.model.access.csv

@ -0,0 +1,3 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
beesdoo_product_label_read_all,beesdoo.product.label Read All,model_beesdoo_product_label,,1,0,0,0
beesdoo_product_label_all_access_sale_manager,beesdoo.product.label All Access Sale Manager,model_beesdoo_product_label,base.group_sale_manager,1,1,1,1

30
beesdoo_product/views/beesdoo_product.xml

@ -0,0 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<record model="ir.ui.view" id="beesdoo_product_form">
<field name="name">bees.product.template.form</field>
<field name="model">product.template</field>
<field name="inherit_id" ref="product.product_template_only_form_view" />
<field name="arch" type="xml">
<field name="barcode" position="after">
<field name="eco_label" />
<field name="local_label" />
<field name="fair_label" />
<field name="origin_label" />
</field>
</field>
</record>
<record model="ir.ui.view" id="beesdoo_product_label_form">
<field name="name">bees.product.label.form</field>
<field name="model">beesdoo.product.label</field>
<field name="arch" type="xml">
<form>
<group>
<field name="name" />
<field name="type" />
<field name="color_code" />
</group>
</form>
</field>
</record>
</odoo>

2
beesdoo_project/__openerp__.py

@ -15,7 +15,7 @@
'category': 'Project Management',
'version': '0.1',
'depends': ['project'],
'depends': ['project', 'beesdoo_base'],
'data': [
'views/task.xml',

Loading…
Cancel
Save