10.0 test name [rappel!]

product_configurator/__manifest__.py

@@ -24,6 +24,7 @@
         'demo/product_attribute.xml',
         'demo/product_config_domain.xml',
         'demo/product_config_lines.xml',
+        'demo/product_config_defaults.xml',
         'demo/product_config_step.xml',
         'demo/config_image_ids.xml',
     ],

product_configurator/demo/product_config_defaults.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+<record id="product_config_default_gasoline_engines" model="product.config.default">
+    <field name="product_tmpl_id" ref="bmw_2_series"/>
+    <field name="value_ids" eval="[(6, 0, [
+        ref('product_attribute_value_218i'),
+        ref('product_attribute_value_red'),
+        ])]"/>
+    <field name="domain_id" ref="product_config_domain_gasoline"/>
+</record>
+
+<record id="product_config_default_diesel_engines" model="product.config.default">
+    <field name="product_tmpl_id" ref="bmw_2_series"/>
+    <field name="value_ids" eval="[(6, 0, [
+        ref('product_attribute_value_218d'),
+        ref('product_attribute_value_black'),
+        ])]"/>
+    <field name="domain_id" ref="product_config_domain_diesel"/>
+</record>
+</odoo>

product_configurator/models/account.py

@@ -6,4 +6,4 @@
 class AccountInvoiceLine(models.Model):
     _inherit = 'account.invoice.line'
 
-    product_id = fields.Many2one(domain=[('config_ok', '=', False)])
+    product_id = fields.Many2one(domain=['|', ('reuse_variant', '=', True), ('config_ok', '=', False)])

product_configurator/models/product.py

@@ -11,12 +11,20 @@ class ProductTemplate(models.Model):
 
     config_ok = fields.Boolean(string='Can be Configured')
 
+    reuse_variant = fields.Boolean(string='Reuse variants if exists')
+
     config_line_ids = fields.One2many(
         comodel_name='product.config.line',
         inverse_name='product_tmpl_id',
         string="Attribute Dependencies"
     )
 
+    config_default_ids = fields.One2many(
+        comodel_name='product.config.default',
+        inverse_name='product_tmpl_id',
+        string="Attribute Defaults"
+    )
+
     config_image_ids = fields.One2many(
         comodel_name='product.config.image',
         inverse_name='product_tmpl_id',
@@ -439,6 +447,44 @@ def values_available(self, attr_val_ids, sel_val_ids):
 
         return avail_val_ids
 
+    @api.multi
+    def find_default_value(self, selectable_value_ids, value_ids):
+        """Based on the current values, which of the available template value ids
+            is the best default value to use.
+
+            :param selectable_value_ids: list of product.attribute.value
+                object already trimmed down as selectable, for one
+                attribute line.
+            :param value_ids: list of attribute value ids already chosen
+
+            :returns: The first matched default id
+
+        """
+        self.ensure_one()
+
+        if not selectable_value_ids:
+            return False
+        # assume all values are from the same attribute line - they should be!
+        default_lines = self.config_default_ids.filtered(
+            lambda l: set(l.value_ids.ids) & set(selectable_value_ids)
+        )
+
+        for default_line in default_lines:
+            if not default_line.domain_id:
+                # No domain - always considered true. Use this.
+                break
+            domains = default_line.mapped('domain_id').compute_domain()
+            if self.validate_domains_against_sels(domains, value_ids):
+                # Domain OK, use this
+                break
+        else:
+            # parsed all lines without a match
+            return False
+        # pick one at random...
+        return (
+            set(default_line.value_ids.ids) & set(selectable_value_ids)
+        ).pop()
+
     @api.multi
     def validate_configuration(self, value_ids, custom_vals=None, final=True):
         """ Verifies if the configuration values passed via value_ids and custom_vals

product_configurator/models/product_attribute.py

@@ -90,6 +90,11 @@ def onchange_custom_type(self):
 
     image = fields.Binary(string='Image')
 
+    create_on_fly = fields.Boolean(
+        string='Can create value on the fly',
+        help='User can create new value with product configurator'
+    )
+
     # TODO prevent the same attribute from being defined twice on the
     # attribute lines
 
@@ -167,6 +172,27 @@ def onchange_attribute(self):
 class ProductAttributeValue(models.Model):
     _inherit = 'product.attribute.value'
 
+    @api.model
+    def create(self, vals):
+        if self.env.context.get('product_tmpl_id'):
+            # intercept already-created value
+            product_tmpl_id = self.env.context.get('product_tmpl_id')
+            attribute_id = vals.get('attribute_id')
+            line = self.env['product.attribute.line'].search([
+                ('product_tmpl_id', '=', product_tmpl_id),
+                ('attribute_id', '=', attribute_id)])
+            match = line.attribute_id.value_ids.filtered(lambda rec: rec.name == vals['name'])
+            if match:
+                record = match[0]
+            else:
+                # default behavior
+                record = super(ProductAttributeValue, self).create(vals)
+            # create related line
+            line.value_ids += record
+        else:
+            record = super(ProductAttributeValue, self).create(vals)
+        return record
+
     @api.multi
     def copy(self, default=None):
         default.update({'name': self.name + " (copy)"})

product_configurator/models/product_config.py

@@ -197,6 +197,59 @@ def check_value_attributes(self):
                 )
 
 
+class ProductConfigDefault(models.Model):
+    _name = 'product.config.default'
+
+    product_tmpl_id = fields.Many2one(
+        comodel_name='product.template',
+        string='Product Template',
+        ondelete='cascade',
+        required=True
+    )
+
+    # TODO: Find a more elegant way to restrict the value_ids
+    attr_line_val_ids = fields.Many2many(
+        comodel_name='product.attribute.value',
+        compute='_compute_attr_vals'
+    )
+
+    value_ids = fields.Many2many(
+        comodel_name='product.attribute.value',
+        id1="cfg_dflt_id",
+        id2="attr_val_id",
+        string="Values"
+    )
+
+    domain_id = fields.Many2one(
+        comodel_name='product.config.domain',
+        string='Applied If',
+        help='Default will be attempted if this rule passes, or leave blank '
+        'for a generic default'
+    )
+
+    sequence = fields.Integer(string='Sequence', default=10)
+
+    _order = 'product_tmpl_id, sequence, id'
+
+    @api.multi
+    def _compute_attr_vals(self):
+        for config_default in self:
+            config_default.attr_line_val_ids = \
+                config_default.product_tmpl_id.attribute_line_ids.mapped(
+                    'value_ids'
+                )
+
+    @api.model
+    def default_get(self, fields):
+        result = super(ProductConfigDefault, self).default_get(fields)
+        if self.env.context.get('for_template_id'):
+            result['attr_line_val_ids'] = \
+                self.env['product.template'].browse(
+                    self.env.context['for_template_id']
+                ).attribute_line_ids.mapped('value_ids').ids
+        return result
+
+
 class ProductConfigImage(models.Model):
     _name = 'product.config.image'
 

product_configurator/models/sale.py

@@ -20,4 +20,4 @@ class SaleOrderLine(models.Model):
         string="Custom Values"
     )
 
-    product_id = fields.Many2one(domain=[('config_ok', '=', False)])
+    product_id = fields.Many2one(domain=['|', ('reuse_variant', '=', True), ('config_ok', '=', False)])

product_configurator/models/stock.py

@@ -6,4 +6,4 @@
 class StockMove(models.Model):
     _inherit = 'stock.move'
 
-    product_id = fields.Many2one(domain=[('config_ok', '=', False)])
+    product_id = fields.Many2one(domain=['|', ('reuse_variant', '=', True), ('config_ok', '=', False)])

product_configurator/security/ir.model.access.csv

@@ -1,5 +1,6 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 product_configurator_config_line,Config Line,model_product_config_line,group_product_configurator,1,1,1,1
+product_configurator_config_default,Config Default,model_product_config_default,group_product_configurator,1,1,1,1
 product_configurator_config_image,Config Image,model_product_config_image,group_product_configurator,1,1,1,1
 product_configurator_config_step,Config Step,model_product_config_step,group_product_configurator,1,1,1,1
 product_configurator_config_step_line,Config Step Line,model_product_config_step_line,group_product_configurator,1,1,1,1
@@ -10,6 +11,7 @@ product_configurator_config_session,Config Session,model_product_config_session,
 product_configurator_config_session_custom_value,Config Session Custom Value,model_product_config_session_custom_value,group_product_configurator,1,1,1,1
 ,,,,,,,
 user_config_line,User Config Line,model_product_config_line,base.group_user,1,0,0,0
+user_config_default,User Config Default,model_product_config_default,base.group_user,1,0,0,0
 user_config_image,User Config Image,model_product_config_image,base.group_user,1,0,0,0
 user_config_step,User Config Step,model_product_config_step,base.group_user,1,0,0,0
 user_config_step_line,User Config Step Line,model_product_config_step_line,base.group_user,1,0,0,0
@@ -25,6 +27,7 @@ portal_config_step,Portal Config Step,model_product_config_step,base.group_porta
 portal_config_session,Portal Config Session,model_product_config_session,base.group_portal,1,0,0,0
 portal_config_session_custom_value,Portal Config Session Custom Value,model_product_config_session_custom_value,base.group_portal,1,0,0,0
 portal_configurator_config_line,Portal Config Line,model_product_config_line,base.group_portal,1,0,0,0
+portal_configurator_config_default,Portal Config Default,model_product_config_default,base.group_portal,1,0,0,0
 portal_configurator_config_step_line,Portal Config Step Line,model_product_config_step_line,base.group_portal,1,0,0,0
 portal_configurator_config_domain,Portal Config Domain,model_product_config_domain,base.group_portal,1,0,0,0
 portal_configurator_config_domain_line,Portal Config Domain Line,model_product_config_domain_line,base.group_portal,1,0,0,0

product_configurator/tests/test_configuration_rules.py

@@ -101,4 +101,41 @@ def test_invalid_custom_value_configuration(self):
         self.assertFalse(validation, "Custom value accepted for fixed "
                          "attribute color")
 
-    # TODO: Test configuration with disallowed custom type value
+    def test_configuration_defaults(self):
+        conf = ['gasoline', 'tapistry_black']
+        engine_selections = self.env.ref(
+            'product_configurator.product_config_line_gasoline_engines'
+        )
+        attr_val_ids = self.get_attr_val_ids(conf)
+        default_value_engine = self.cfg_tmpl.find_default_value(
+            engine_selections.value_ids.ids,
+            attr_val_ids,
+        )
+        self.assertEqual(
+            [default_value_engine], self.get_attr_val_ids(['218i']),
+            "Gasoline Engine default not set correctly"
+        )
+
+        color_selection_ids = self.get_attr_val_ids(['red', 'silver', 'black'])
+        attr_val_ids = self.get_attr_val_ids(conf)
+        default_value_color = self.cfg_tmpl.find_default_value(
+            color_selection_ids,
+            attr_val_ids,
+        )
+        self.assertEqual(
+            [default_value_color], self.get_attr_val_ids(['red']),
+            "Gasoline Color default not set correctly"
+        )
+
+        color_selection_ids = self.get_attr_val_ids(['silver', 'black'])
+        attr_val_ids = self.get_attr_val_ids(conf)
+        default_value_color = self.cfg_tmpl.find_default_value(
+            color_selection_ids,
+            attr_val_ids,
+        )
+        self.assertFalse(
+            default_value_color,
+            "Gasoline Color should not have been returned unselectable value"
+        )
+
+    # Test configuration with disallowed custom type value

product_configurator/views/product_attribute_view.xml

@@ -52,6 +52,7 @@
                             <group>
                                 <field name="custom_type"/>
                                 <field name="search_ok"/>
+                                <field name="create_on_fly" />
                             </group>
                             <group>
                                 <field name="min_val" attrs="{'invisible': [('custom_type','not in',['int','float'])]}"/>

product_configurator/views/product_view.xml

@@ -43,6 +43,9 @@
             <!-- TODO: Apply domains so only values from template are available -->
             <xpath expr="//notebook/page[@name='variants']" position="after">
                 <page string="Configurator" attrs="{'invisible': [('config_ok','=',False)]}">
+                <separator colspan="4" string="Configuration Options"/>
+                <field name="reuse_variant"/>
+                <label for="reuse_variant"/>
                 <separator colspan="4" string="Configuration Restrictions"/>
                 <field name="config_line_ids"
                        attrs="{'readonly': [('attribute_line_ids','=',[])]}"
@@ -65,6 +68,24 @@
                         <field name="domain_id"/>
                     </tree>
                 </field>
+                <separator colspan="4" string="Configuration Defaults"/>
+                <field name="config_default_ids"
+                       attrs="{'readonly': [('attribute_line_ids','=',[])]}"
+                       context="{'show_attribute': True, 'for_template_id': id}">
+                    <tree string="Attribute Value Defaults" editable="bottom">
+                        <field name="sequence" widget="handle"/>
+                        <field name="domain_id"/>
+                        <!-- # TODO: Find a more elegant way to restrict the value_ids -->
+                        <field name="attr_line_val_ids"
+                               widget="many2many_tags"
+                               invisible="True"/>
+                        <field name="value_ids"
+                               widget="many2many_tags"
+                               domain="[('id','in',attr_line_val_ids[0][2])]"
+                               options="{'no_create': True, 'no_create_edit': True}"
+                               context="{'show_attribute': True}"/>
+                    </tree>
+                </field>
                 <separator colspan="4" string="Configuration Steps"/>
                 <field name="config_step_line_ids"
                        attrs="{'readonly': [('attribute_line_ids','=',[])]}">

product_configurator_name/README.md

@@ -0,0 +1,14 @@
+#Odoo Product Configurator Name
+
+This module is an extension to product configurator to hide unnecessary attributes from product name
+and show the attribute name as label when ambiguities might arise.
+
+Features
+========
+
+- Add display mode to comfigurable templates attributes (under variants tab)
+
+Usage
+=====
+
+Change the display mode of the attribute to hide or with label as needed.

product_configurator_name/__init__.py

@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+
+from . import models
+from . import tests

product_configurator_name/__manifest__.py

@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+
+{
+    'name': 'Product Configurator Name',
+    'version': '10.0',
+    'category': 'Generic Modules/Base',
+    'summary': 'product configuration interface for name',
+    'description': """
+        Purchase Product Configurator
+    """,
+    'author': 'Microcom',
+    'license': 'AGPL-3',
+    'website': 'http://www.microcom.ca/',
+    'depends': [
+        'product_configurator',
+    ],
+    "data": [
+        'views/product_view.xml',
+    ],
+    'demo': [
+    ],
+    'images': [
+    ],
+    'test': [],
+    'installable': True,
+    'auto_install': False,
+}