12.0 polln#275

Open

tfrancoi wants to merge 31 commits into12.0from

Contributor

tfrancoi commented Feb 24, 2022

Do not merge just base for discussion

tfrancoi and others added 30 commits

August 21, 2021 01:19


          [FIX] beesdoo_shift: dynamic selection field

be3b007

Add lambda so there is no more need to redefine field states
Add parameter today to _get_irregular_worker_domain

Move specific constrains to beesdoo_worker_status


          [CLEAN] Remove beesdoo_base dependency

ad374d3

The module beesdoo_product does not need to depend on bessdoo base that introduce a lot of specific field (ie: for the beescard on res.partner)


          [FIX] beesdoo_product: do not raise in compute

9a03392

Don't raise an error in computed field, if the value does not allow
to compute the field properly fallbaclk on default value

raise an error may forbid the installation of the module


          [ADD] beesdoo_product: add label report

9748e5a

print label that take module specific field into account
with the different criteria: Geo, ethic, bio etc..


          [MIG] Migrate receipt sent by email

5ac77b5

- Migrate code from V9
- Replace deleted standard qweb report by a new one


          [TYPO] beesdoo_pos: err -> error

59289b7


          Unit price on ticket

de86038


          [FIX] beesdoo_shift: dynamic selection field

6ce287f

Add lambda so there is no more need to redefine field states
Add parameter today to _get_irregular_worker_domain

Move specific constrains to beesdoo_worker_status

[WIP]

[FIX] open instead as draft doesnt exist anymore

[ADD] send (un)subscribed mail when worker is
changed.

[WIP] 2

[FIX] can unsubscribe

delta is between date in the future and now not the opposite
To get the full timedelta in hours we should get the days number and the seconds

[WIP] final wip to clean

[WIP] 4

[FIX] prod fix


          [FIX] beesdoo_worker_status, import api

128ef94


          [ADD] polln_base, card members report.

0aac4cb


          [ADD] beesdoo_shift_welcome_screen on 12.0

50f9a7f


          [ADD] polln_shift: add new module polln shift

951cc26

Work in progress
View cleaning done


          [IMP] polln_base: improve layout polln card


          [FIX] polln_base: new log for polln card

547a3a5


          [IMP] poll_shift: various UI improvement + Label

2467f1e


          [FIX] beesdoo_product: finally fix total_with_vat with consignes

bc1c9c8


          [ADD] beesdoo_product: vertical label

f827ea1


          [IMP] create user at subscription + set super coop on shift + force w…

3bc7f19

…orker


          [IMP] beesdoo_base: need to print card for new eaters

61fd134


          [ADD] welcome_screen; eater see worker info + next shift

78a41f9


          [FIX] remove confusin field + fix access right issue

f894f1b


          [FIX] display weight decimal configurable + error of wizard subscribe

8b88aae


          [FIX] counter reset at each update + status computation

244770b


          [IMP]

4d619c1


          [IMP] beesdoo_pos_email_ticket: improve layout of ticket sentby email

ceeef4e


          [IMP] beesdoo_product: suggested price rounding can be configure on p…

f62ad0e

…roduct category


          [IMP] beesdoo_shift: add constraint on time of the shift + fix durati…

9e5dea9

…on when time is midnight


          [IMP] beesdoo_shift_welcome_screen: improve layout

632bee2


          [IMP] polln_shift: remove constraint on shift status, show shifts on …

d9c0829

…cooperator + portal


          [FIX] polln_shift: various fix

199f5a9

tfrancoi commented

View reviewed changes

beesdoo_base/models/partner.py

                           "lastname": name,
                           "firstname": surname,
-                          "is_customer": True,
+                          "customer": True,

Contributor Author

tfrancoi Feb 24, 2022

tfrancoi commented

View reviewed changes

beesdoo_easy_my_coop/models/res_partner.py

                       """
                       self.ensure_one()
-                      share_type = None
+                      share_type = self.env['product.template']

Contributor Author

tfrancoi Feb 24, 2022

tfrancoi commented

View reviewed changes

beesdoo_easy_my_coop/models/res_partner.py

                       "share_ids.share_product_id.default_code",
                       "share_ids.share_product_id.allow_working",
                       "share_ids.share_number",
+                      "worker_store",

Contributor Author

tfrancoi Feb 24, 2022

beesdoo_easy_my_coop/models/res_partner.py

+                              is_worker = share_type.allow_working
                           else:
-                              rec.is_worker = False
+                              is_worker = False

Contributor Author

tfrancoi Feb 24, 2022

beesdoo_easy_my_coop/models/res_partner.py

                           [("share_product_id.allow_working", "=", "True")]
                       )
-                      partner_ids = lines.mapped("partner_id").ids
+                      partner_ids = lines.mapped("partner_id")

Contributor Author

tfrancoi Feb 24, 2022

tfrancoi commented

View reviewed changes

beesdoo_shift_welcome_screen/__init__.py

    
            @@ -0,0 +1,2 @@
          
              # -*- coding: utf-8 -*-

Contributor Author

tfrancoi Feb 24, 2022

tfrancoi commented

View reviewed changes

polln_base/report/pollncard.xml

		@@ -0,0 +1,48 @@
		<?xml version="1.0" encoding="utf-8"?>

Contributor Author

tfrancoi Feb 24, 2022

tfrancoi commented

View reviewed changes

beesdoo_worker_status/models/cooperative_status.py

-                  def _get_irregular_worker_domain(self, **kwargs):
-                      today = kwargs.get("today") or self.today
+                  def _get_irregular_worker_domain(self, today):

Contributor Author

tfrancoi Feb 24, 2022

beesdoo_shift/models/cooperative_status.py

                   )
                   status = fields.Selection(
-                      selection=_get_status,
+                      selection=lambda x: x._get_status(),

Contributor Author

tfrancoi Feb 24, 2022

beesdoo_shift/models/cooperative_status.py

                   # Specific to irregular
-                  irregular_start_date = fields.Date()  # TODO migration script
+                  irregular_start_date = fields.Date()

Contributor Author

tfrancoi Feb 24, 2022

discard

beesdoo_shift/models/cooperative_status.py

-                  irregular_absence_counter = (
-                      fields.Integer()
-                  )  # TODO unsubscribe when reach -2
+                  irregular_absence_counter = fields.Integer()

Contributor Author

tfrancoi Feb 24, 2022

discard

beesdoo_shift/models/cooperative_status.py

-                          Overwrite write to historize the change
-                      """
-                      for field in [
+                  def _get_watched_fields(self):

Contributor Author

tfrancoi Feb 24, 2022

beesdoo_shift/models/cooperative_status.py

                           journal = self.env["beesdoo.shift.journal"].create({"date": today})
-                      domain = self._get_irregular_worker_domain(today=today)
+                      domain = self._get_irregular_worker_domain(today)

Contributor Author

tfrancoi Feb 24, 2022

beesdoo_shift/models/cooperative_status.py

                   ###############################################
-                  def _get_irregular_worker_domain(self):
+                  def _get_irregular_worker_domain(self, today):

Contributor Author

tfrancoi Feb 24, 2022

tfrancoi commented

View reviewed changes

beesdoo_shift/models/task.py

                   end_time = fields.Datetime(track_visibility="always", required=True)
                   state = fields.Selection(
-                      selection=_get_selection_status,
+                      selection=lambda x: x._get_selection_status(),

Contributor Author

tfrancoi Feb 24, 2022

Done

tfrancoi commented

View reviewed changes

beesdoo_shift/models/planning.py

                                   )
                               )
+                  @api.constrains("start_time", "end_time")

Contributor Author

tfrancoi Feb 24, 2022

tfrancoi commented

View reviewed changes

beesdoo_shift/models/planning.py

                   def _get_duration(self):
-                      if self.start_time and self.end_time:
-                          self.duration = self.end_time - self.start_time
+                      self.duration = (self.end_time or 0.0) - (self.start_time or 0.0)

Contributor Author

tfrancoi Feb 24, 2022

tfrancoi commented

View reviewed changes

beesdoo_worker_status/models/task.py

		@@ -1,10 +1,50 @@
		from odoo import fields, models
		from odoo import api, fields, models

Contributor Author

tfrancoi Feb 24, 2022

tfrancoi commented

View reviewed changes

beesdoo_shift/models/task.py Outdated

                       for rec in self:
                           rec.color = self._get_color_mapping(rec.state)
-                  def _compensation_validation(self, task):

Contributor Author

tfrancoi Feb 24, 2022

tfrancoi commented

View reviewed changes

beesdoo_shift/views/cooperative_status.xml

    
                              <field name="alert_start_time" />

                              <field name="extension_start_time" />

                              <field name="status" widget="statusbar" />

                              <field name="cooperator_id"/>

Contributor Author

tfrancoi Feb 24, 2022

tfrancoi commented

View reviewed changes

beesdoo_shift/views/task_template.xml

-                              <field name="start_time" />
-                              <field name="end_time" />
-                              <field name="duration" />
+                              <field name="start_time" widget="float_time" />

Contributor Author

tfrancoi Feb 24, 2022

tfrancoi commented

View reviewed changes

beesdoo_shift/wizard/batch_template.xml

                           <form>
                               <group>
-                                  <field name="planning_id" />
+                                  <field name="planning_ids" widget="many2many_tags" />

Contributor Author

tfrancoi Feb 24, 2022

tfrancoi commented

View reviewed changes

beesdoo_shift/wizard/batch_template.py

    
                      column2="day_id",

                  )

                  planning_id = fields.Many2one("beesdoo.shift.planning", required=True)

                  planning_ids = fields.Many2many("beesdoo.shift.planning", 'generate_shift_planning_rel', 'planning_id', 'wizard_id', required=True)

Contributor Author

tfrancoi Feb 24, 2022

tfrancoi commented

View reviewed changes

beesdoo_shift/wizard/batch_template.py

-                                  shift_template_data
-                              )
-                              ids.append(new_rec.id)
+                      for planning_id in self.planning_ids:

Contributor Author

tfrancoi Feb 24, 2022

tfrancoi commented

View reviewed changes

beesdoo_shift/wizard/subscribe.py

+                      # Last step should be the shift subscription because we check working mode in shift
+                      # It may raise an error you subscribe to a creanu with already existing shift
+                      # and the coop is subscribed before have the proper working mode
+                      if self.shift_id and self.working_mode == "regular":

Contributor Author

tfrancoi Feb 24, 2022

Already Done

tfrancoi commented

View reviewed changes

beesdoo_shift/wizard/subscribe.py Outdated

                       #  when going to irregular.
                       if self.shift_id and self.shift_id.remaining_worker <= 0:
                           raise UserError(_("There is no remaining spot in this shift"))
-                      if self.shift_id:

Contributor Author

tfrancoi Feb 24, 2022

already done

tfrancoi commented

View reviewed changes

beesdoo_shift/wizard/subscribe.py

                   resigning = fields.Boolean(
                       default=False, help="Want to leave the beescoop"
                   )
+                  create_user = fields.Boolean(defaul=False, help="Create a portal user for the new worker")

Contributor Author

tfrancoi Feb 24, 2022

tfrancoi commented

View reviewed changes

beesdoo_shift/wizard/subscribe.py

                           # to a shift to keep information like "Worker mode, session info
                           # ,...
                           status_id.sudo().write(data)
+                      if self.create_user:

Contributor Author

tfrancoi Feb 24, 2022

tfrancoi commented

View reviewed changes

beesdoo_shift/wizard/subscribe.py

+                          self.cooperator_id.sudo().write({"subscribed_shift_ids": [(5,)]})
                       return True
+                  def _create_user(self):

Contributor Author

tfrancoi Feb 24, 2022

tfrancoi commented

View reviewed changes

beesdoo_shift/wizard/subscribe.xml

                                       name="irregular_start_date"
                                       attrs="{'invisible': [('working_mode', '!=', 'irregular')]}"
                                   />
+                                  <field name="create_user" />

Contributor Author

tfrancoi Feb 24, 2022

tfrancoi commented

View reviewed changes

beesdoo_website_shift/controllers/main.py

               class WebsiteShiftController(http.Controller):
                   def is_user_worker(self):
-                      user = request.env["res.users"].browse(request.uid)
+                      user = request.env["res.users"].browse(request.uid).sudo()

Contributor Author

tfrancoi Feb 24, 2022

tfrancoi commented

View reviewed changes

beesdoo_website_shift/views/my_shift_website_templates.xml

-                      <p>
-                          <label class="font-weight-bold">Working Mode:</label>
+                      <p id="working_mode">

Contributor Author

tfrancoi Feb 24, 2022

tfrancoi commented

View reviewed changes

beesdoo_website_shift/views/my_shift_website_templates.xml

                                       <div class="row">
-                                          <div class="col-12 col-md-6 text-justify">
+                                          <div class="col-12 col-md-12 text-justify">

Contributor Author

tfrancoi Feb 24, 2022

carmenbianca force-pushed the 12.0 branch 2 times, most recently from abc40d1 to fa7679b Compare

October 17, 2022 15:29

remytms force-pushed the 12.0 branch from 8923fb7 to 595668b Compare

January 29, 2023 23:31

Collaborator

polchampion commented Jan 31, 2023

@tfrancoi Salut Thibaut, pour te signaler que le refacto beesdoo_shift est en cours et sera mergé courant février. Pour info, on a vu un impact sur la surcharge de is_worker avec un conflit de priorité entre le module cooperator_worker et le module polln_shift, quand les deux sont installés (en tous cas si polln_shift est installé en dernier). On laisse comme ça pour le moment car on peut s'en sortir grâce au "force worker".

huguesdk force-pushed the 12.0 branch from f00f7b4 to 64684a6 Compare

April 25, 2025 15:15

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels