Fix MilkProduction and ButterProduction kcals regexes - see HEA-817

Author: rhunwicks

pipelines/assets/livelihood_activity_regexes.json

@@ -662,13 +662,19 @@
         "income"
     ],
     [
-        "lait\\+beurre/beurre clarifié kcals ?\\(%\\) ?- ?(?P<season>1è[m|r]e saison)",
+        "lait\\+beurre/(?:beurre )?clarifié kcals ?\\(%\\) ?- ?(?P<season>1ère saison)",
         "ButterProduction",
         false,
         "percentage_kcals"
     ],
     [
-        "lait\\+beurre/beurre clarifié kcals ?\\(%\\) ?- ?(?P<season>2è[m|r]e saison)",
+        "lait\\+beurre/(?:beurre )?clarifié kcals ?\\(%\\) ?- ?(?P<season>2è[m|r]e saison)",
+        "ButterProduction",
+        true,
+        "percentage_kcals"
+    ],
+    [
+        "lait\\+beurre/(?:beurre )?clarifié kcals ?\\(%\\) ?- ?(?P<season>1ème saison)",
         "ButterProduction",
         true,
         "percentage_kcals"

pipelines_tests/test_assets/test_livelihood_activity_regexes.json

@@ -468,17 +468,23 @@
         "season": "1ère saison",
         "attribute": "percentage_kcals"
     },
-    "lait+beurre/beurre clarifié kcals(%)-1ème saison": {
-        "strategy_type": "ButterProduction",
-        "season": "1ème saison",
-        "attribute": "percentage_kcals"
-    },
     "lait+beurre/beurre clarifié kcals(%)-2ème saison": {
         "strategy_type": "ButterProduction",
         "is_start": true,
         "season": "2ème saison",
         "attribute": "percentage_kcals"
     },
+    "lait+beurre/clarifié kcals (%)-1ère saison": {
+        "strategy_type": "ButterProduction",
+        "season": "1ère saison",
+        "attribute": "percentage_kcals"
+    },
+    "lait+beurre/clarifié kcals (%)-1ème saison": {
+        "strategy_type": "ButterProduction",
+        "is_start": true,
+        "season": "1ème saison",
+        "attribute": "percentage_kcals"
+    },        
     "poids de la carcasse (kg)": {
         "unit_of_measure_id": "kg",
         "attribute": "carcass_weight"