Fix

__init__.py

@@ -29,6 +29,7 @@ def register():
         crop.FarmingActivityShipmentInternal,
         crop.FarmingStage,
         crop.FarmingCrop,
+        crop.CropStage,
         crop.FarmingCropLot,
         crop.FarmingCropLotBed,
         crop.CropForecastStart,

crop.py

@@ -1,6 +1,5 @@
 # This file is part of Tryton.  The COPYRIGHT file at the top level of
 # this repository contains the full copyright notices and license terms.
-from __future__ import with_statement
 from decimal import Decimal
 from datetime import date
 
@@ -28,6 +27,7 @@ class FarmingVarietyCycle(ModelSQL, ModelView):
     "Farming Variety Cycle"
     __name__ = "farming.variety.cycle"
     variety = fields.Many2One('farming.variety', 'Variety', required=True)
+    sequence = fields.Integer('Sequence', required=True)
     stage = fields.Many2One('farming.stage', 'Stage', required=True)
     start_time = fields.Integer('Start Time',
         help='Harvest week',required=True)
@@ -57,6 +57,14 @@ class FarmingVarietyActivity(ModelSQL, ModelView):
         help='In weeks')
 
 
+class CropStage(ModelSQL, ModelView):
+    "Crop Stage"
+    __name__ = "farming.crop.stage"
+    crop = fields.Many2One('farming.crop', 'Crop', required=True)
+    stage = fields.Many2One('farming.stage', 'Stage', required=True)
+    activity_time = fields.Float('Act. Time', required=True)
+
+
 class Kind(ModelSQL, ModelView):
     "Kind"
     __name__ = "farming.activity.kind"
@@ -84,7 +92,8 @@ class FarmingCrop(Workflow, ModelSQL, ModelView):
         'get_quantity_produced_planned')
     quantity_produced = fields.Float('Quantity Produced', states=STATES)
     quantity_produced_uom = fields.Many2One('product.uom', 'Quantity UoM', states=STATES)
-    lots = fields.One2Many('farming.crop.lot', 'crop', 'Lots',
+    lots = fields.One2Many('farming.crop.lot', 'crop', 'Lots', states=STATES)
+    stages = fields.One2Many('farming.crop.stage', 'crop', 'Stages',
         states=STATES)
     # seed = fields.Char('Seed', states=STATES)
     seed = fields.Many2One('farming.seed', 'Seed', required=True)
@@ -386,7 +395,6 @@ class CropForecastReport(Report):
     __name__ = 'farming.crop_forecast.report'
     MAX_DAYS = 16
 
-
     @classmethod
     def get_context(cls, records, header, data):
         report_context = super().get_context(records, header, data)

crop.xml

@@ -18,23 +18,23 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.ui.view" id="farming_variety_cycle_view_tree">
             <field name="model">farming.variety.cycle</field>
             <field name="type">tree</field>
-            <field name="name">farming_variety_cycle_tree</field>
+            <field name="name">variety_cycle_tree</field>
         </record>
         <record model="ir.ui.view" id="farming_variety_cycle_view_form">
             <field name="model">farming.variety.cycle</field>
             <field name="type">form</field>
-            <field name="name">farming_variety_cycle_form</field>
+            <field name="name">variety_cycle_form</field>
         </record>
 
         <record model="ir.ui.view" id="farming_variety_view_tree">
             <field name="model">farming.variety</field>
             <field name="type">tree</field>
-            <field name="name">farming_variety_tree</field>
+            <field name="name">variety_tree</field>
         </record>
         <record model="ir.ui.view" id="farming_variety_view_form">
             <field name="model">farming.variety</field>
             <field name="type">form</field>
-            <field name="name">farming_variety_form</field>
+            <field name="name">variety_form</field>
         </record>
         <record model="ir.action.act_window" id="act_farming_variety_tree">
             <field name="name">Variety</field>

view/farming_crop_form.xml

@@ -28,6 +28,9 @@ this repository contains the full copyright notices and license terms. -->
         <page string="Lots" col="4" id="lots">
             <field name="lots" colspan="4"/>
         </page>
+        <page string="Stages" col="4" id="stages">
+            <field name="stages" colspan="4"/>
+        </page>
         <!-- <page string="Activities" col="4" id="activities">
             <field name="activities" colspan="4"/>
         </page> -->

view/variety_cycle_form.xml

@@ -4,6 +4,8 @@ this repository contains the full copyright notices and license terms. -->
 <form>
     <label name="stage"/>
     <field name="stage"/>
+    <label name="sequence"/>
+    <field name="sequence"/>
     <label name="start_time"/>
     <field name="start_time"/>
     <label name="production_rate"/>

view/variety_cycle_tree.xml

@@ -2,6 +2,7 @@
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
 this repository contains the full copyright notices and license terms. -->
 <tree>
+    <field name="sequence" expand="1"/>
     <field name="stage" expand="1"/>
     <field name="start_time" expand="1"/>
     <field name="production_rate" expand="1"/>