Cherry pick of 81129f9 failed

stdout:
Auto-merging product_replenishment_cost/i18n/es.po
CONFLICT (content): Merge conflict in product_replenishment_cost/i18n/es.po

stderr:
15:23:55.325357 git.c:444               trace: built-in: git cherry-pick 81129f9
error: could not apply 81129f9... [FIX]product_replenishment_cost:fixes and improves
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
----------
status:

X-original-commit: 2a7b854

Author: jcadhoc

product_planned_price/data/ir_cron_data.xml

@@ -15,6 +15,7 @@ model.cron_update_prices_from_planned()
         <field name="interval_type">days</field>
         <field name="user_id" ref="base.user_root"/>
         <field name="state">code</field>
+        <field name="nextcall" eval="(DateTime.now().replace(hour=8, minute=0) + timedelta(days=1)).strftime('%Y-%m-%d %H:%M:%S')"/>
         <field name="priority" eval="5"/>
         <field name="active" eval="False"/>
         <field name="interval_number" eval="1"/>

product_planned_price/i18n/es.po

@@ -209,7 +209,7 @@ msgid ""
 " price."
 msgstr ""
 "Actualizar precio de lista con precio planificado para todos los productos "
-"seleccionados con precio planificado."
+"seleccionados con precio planificado diferente a 0."
 
 #. module: product_planned_price
 #: model:ir.actions.act_window,name:product_planned_price.action_update_from_planned_price_wizard

product_planned_price/models/product_template.py

@@ -84,7 +84,7 @@ def cron_update_prices_from_planned(self, batch_size=1000):
         records[:batch_size].with_context(bypass_base_automation=True)._update_prices_from_planned()
 
         if len(records) > batch_size:
-            last_updated_id = records[batch_size].id
+            last_updated_id = records[batch_size - 1].id
         else:
             last_updated_id = 0
 

product_replenishment_cost/data/ir_cron_data.xml

@@ -19,6 +19,7 @@ model.cron_update_cost_from_replenishment_cost(company_ids=None)
         <field name="interval_type">months</field>
         <field name="user_id" ref="base.user_root"/>
         <field name="state">code</field>
+        <field name="nextcall" eval="(DateTime.now().replace(hour=9, minute=0) + timedelta(days=1)).strftime('%Y-%m-%d %H:%M:%S')"/>
         <field name="priority" eval="5"/>
         <field name="active" eval="False"/>
         <field name="interval_number" eval="1"/>

product_replenishment_cost/i18n/es.po

@@ -450,10 +450,12 @@ msgid "Update Accounting Cost from Replenishment Cost"
 msgstr "Actualizar el costo contable desde el  costo de reposición."
 
 #. module: product_replenishment_cost
-#: model:ir.actions.server,name:product_replenishment_cost.ir_cron_update_cost_from_replenishment_cost_ir_actions_server
+#: model:ir.actions.server,name:product_replenishment_cost.ir_cron_update_cost_from_replenishment_cost
+#: model:ir.cron,cron_name:product_replenishment_cost.ir_cron_update_cost_from_replenishment_cost
 msgid "Update Cost from Replenishment Cost"
 msgstr "Actualización del costo desde el costo de reposición"
 
+
 #. module: product_replenishment_cost
 #. odoo-python
 #: code:addons/product_replenishment_cost/wizards/product_update_from_replenishment_cost_wizard.py:0

product_replenishment_cost/models/product_template.py

@@ -137,7 +137,7 @@ def cron_update_cost_from_replenishment_cost(self, limit=None, company_ids=None,
             )._update_cost_from_replenishment_cost()
 
         if len(records) > batch_size:
-            last_updated_id = records[batch_size].id
+            last_updated_id = records[batch_size - 1].id
         else:
             last_updated_id = 0
         self.env.cr.execute(