Create branch 4.8.

__init__.py

@@ -8,6 +8,7 @@ from . import distribution
 def register():
     Pool.register(
         configuration.Configuration,
+        configuration.ConfigurationSequence,
         distribution.Distribution,
         distribution.DistributionLine,
         distribution.Move,

configuration.py

@@ -1,16 +1,39 @@
 from trytond.model import fields
 from trytond.pyson import Eval
-from trytond.pool import PoolMeta
+from trytond.pool import PoolMeta, Pool
+from trytond.modules.stock.configuration import default_func, default_sequence
 
-__all__ = ['Configuration']
+__all__ = ['Configuration', 'ConfigurationSequence']
 
 
 class Configuration:
     __name__ = 'stock.configuration'
     __metaclass__ = PoolMeta
-    distribution_in_sequence = fields.Property(fields.Many2One('ir.sequence',
+    distribution_in_sequence = fields.MultiValue(fields.Many2One('ir.sequence',
         'Supplier Distribution Sequence', domain=[
             ('company', 'in',
                 [Eval('context', {}).get('company', -1), None]),
             ('code', '=', 'stock.distribution.in'),
             ], required=True))
+
+    default_distribution_in_sequence = default_func('distribution_in_sequence')
+
+    @classmethod
+    def multivalue_model(cls, field):
+        if field == 'distribution_in_sequence':
+            return Pool().get('stock.configuration.sequence')
+        return super(Configuration, cls).multivalue_model(field)
+
+
+class ConfigurationSequence:
+    __name__ = 'stock.configuration.sequence'
+    __metaclass__ = PoolMeta
+
+    distribution_in_sequence = fields.Many2One('ir.sequence',
+        "Supplier Distribution Sequence", required=True,
+        domain=[
+            ('company', 'in', [Eval('company', -1), None]),
+            ('code', '=', 'stock.distribution.in'),
+            ],
+        depends=['company'])
+    default_shipment_in_sequence = default_sequence('sequence_distribution_in')

configuration.xml

@@ -8,11 +8,5 @@ this repository contains the full copyright notices and license terms. -->
             <field name="inherit" ref="stock.stock_configuration_view_form"/>
             <field name="name">configuration_form</field>
         </record>
-
-        <record model="ir.property" id="property_distribution_in_sequence">
-            <field name="field"
-                search="[('model.model', '=', 'stock.configuration'), ('name', '=', 'distribution_in_sequence')]"/>
-            <field name="value" eval="'ir.sequence,' + str(ref('sequence_distribution_in'))"/>
-        </record>
     </data>
 </tryton>

distribution.xml

@@ -50,6 +50,18 @@ this repository contains the full copyright notices and license terms. -->
             <field name="act_window" ref="act_distribution_in"/>
         </record>
 
+        <record model="ir.model.button" id="distribution_in_distribute_button">
+            <field name="name">distribute</field>
+            <field name="string">Distribute</field>
+            <field name="model" search="[('model', '=', 'stock.distribution.in')]"/>
+        </record>
+        <record model="ir.model.button" id="distribution_in_do_button">
+            <field name="name">do</field>
+            <field name="string">Do</field>
+            <field name="confirm">This process is irreversible. Are you sure you want to confirm this distribution?</field>
+            <field name="model" search="[('model', '=', 'stock.distribution.in')]"/>
+        </record>
+
         <menuitem parent="stock.menu_stock" sequence="10"
             action="act_distribution_in"
             id="menu_distribution_in"/>

tests/scenario_stock_distribution_in.rst

@@ -7,7 +7,8 @@ Imports::
     >>> import datetime
     >>> from dateutil.relativedelta import relativedelta
     >>> from decimal import Decimal
-    >>> from proteus import config, Model, Wizard
+    >>> from proteus import config, Model
+    >>> from trytond.tests.tools import activate_modules
     >>> from trytond.modules.company.tests.tools import create_company, \
     ...     get_company
     >>> from trytond.modules.account.tests.tools import create_fiscalyear, \
@@ -16,17 +17,9 @@ Imports::
     ...     set_fiscalyear_invoice_sequences, create_payment_term
     >>> today = datetime.date.today()
 
-Create database::
+Activate stock_distribution_in::
 
-    >>> config = config.set_trytond()
-    >>> config.pool.test = True
-
-Install stock Module::
-
-    >>> Module = Model.get('ir.module')
-    >>> module, = Module.find([('name', '=', 'stock_distribution_in')])
-    >>> module.click('install')
-    >>> Wizard('ir.module.install_upgrade').execute('upgrade')
+    >>> config = activate_modules('stock_distribution_in')
 
 Create company::
 
@@ -86,7 +79,6 @@ Create product::
     >>> template.default_uom = unit
     >>> template.type = 'goods'
     >>> template.list_price = Decimal('20')
-    >>> template.cost_price = Decimal('8')
     >>> template.purchasable = True
     >>> template.account_expense = expense
     >>> template.account_revenue = revenue

tryton.cfg

@@ -1,5 +1,5 @@
 [tryton]
-version=4.0.0
+version=4.8.0
 depends:
     production
     purchase

view/distribution_in_form.xml

@@ -24,6 +24,6 @@ this repository contains the full copyright notices and license terms. -->
     </notebook>
     <label name="state"/>
     <field name="state"/>
-    <button string="Distribute" name="distribute"/>
-    <button string="Do" name="do" confirm="This process is irreversible. Are you sure you want to confirm this distribution?"/>
+    <button name="distribute"/>
+    <button name="do"/>
 </form>