[MERGE] lunch, lunch_hr: automatize lunch flow #28442

RomainLibert · 2018-11-06T15:24:22Z

We would like to automatize lunch as currently all orders are manually ordered and validated, and a cash move has to be manually created each time you want to credit the wallet of some user.

In this commit we add a new widget that comes with the kanban view and will allow to take orders in a friendly manner.
We also add a lunch.supplier model and an integration with the hr module in order to filter what products you can order depending on your working location, this also allows you to configure an automatic ordering via email.

--
I confirm I have signed the CLA and read the PR guidelines at www.odoo.com/submit-pr

Yenthe666 · 2018-11-13T16:26:37Z

@RomainLibert awesome, really nice to see. @mart-e recently told me I was not allowed to split one Python file into multiple to preserve history. I'm curious if that is not the case here also then?

jem-odoo

Small review for some little things to change, some questions, and some renaming asked before continue building thing on it.

addons/lunch/models/lunch_supplier.py

jem-odoo · 2018-11-19T15:06:27Z

addons/lunch/models/lunch_supplier.py

+                    lines = orders.mapped('order_line_ids').filtered(lambda line: line.supplier == supplier)
+                    lines = [{'product': line.product_id.name, 'note': line.note, 'quantity': line.qty, 'price': line.price} for line in lines]
+
+                    order['amount_total'] = sum(l['price'] for l in lines)


Is there multi currency in lunch ? if not, then it's ok.
But you can use sum(lines.mapped('price'))

jem-odoo · 2018-11-19T15:06:55Z

addons/lunch/models/lunch_supplier.py

+    recurrency_saturday = fields.Boolean('Saturday')
+    recurrency_sunday = fields.Boolean('Sunday')
+
+    available_today = fields.Boolean('', compute='_compute_available_today', search='_search_available_today')


No label ? O_0

jem-odoo · 2018-11-19T15:09:17Z

addons/lunch/controllers/main.py

+        order = request.env['lunch.order'].search([('user_id', '=', user_id), ('date', '=', fields.Date.today())], limit=1)
+        return order
+
+    def _make_payment(self, order):


useless method IMHO

It will be used when doing the payments

jem-odoo · 2018-11-19T15:09:32Z

addons/lunch/controllers/main.py

+
+        return False
+
+    @http.route('/lunch/paymentMessage', type='json', auth='user')


Please, no camel case in URL :s

jem-odoo · 2018-11-19T15:28:19Z

addons/lunch/models/lunch_supplier.py

+    phone = fields.Char(related='partner_id.phone')
+    street = fields.Char(related='partner_id.street')
+    street2 = fields.Char(related='partner_id.street2')
+    zip = fields.Char(related='partner_id.zip')


Since we just have a commit renaming all the named type fields into machin_type (which break couple of things), maybe we can name this field zip_code directly to avoid having the same commit applied for 'zip' as it is also a reserved word in python.

jem-odoo · 2018-11-19T15:32:36Z

addons/lunch/models/lunch_order.py

-            self.cashmove.unlink()
-        else:
-            raise AccessError(_("Only your lunch manager cancels the orders."))
+    qty = fields.Float('Quantity', required=True, default=1)


Can you call it quantity ? pleaseeeeeeee :D

jem-odoo · 2018-11-19T15:35:56Z

addons/lunch/models/lunch_supplier.py

+    tz = fields.Selection(_tz_get, string='Timezone', required=True, default='UTC')
+
+    _sql_constraints = [
+        ('automatic time', 'CHECK(automatic_email_time >= 0 AND automatic_email_time <= 24)', 'Automatic Email Sending Time should be between 0 and 24'),


use underscored notation for the technical name, and be more precise. Like "automatic_email_time_range"

addons/lunch/models/lunch_supplier.py

jem-odoo · 2018-11-19T15:40:55Z

addons/lunch/models/lunch_supplier.py

+    return float_round(t.hour + t.minute/60 + t.second/3600, precision_digits=2)
+
+class LunchSupplier(models.Model):
+    _name = 'lunch.supplier'


We should basically have one model per file, as this will facilitate the reading and maintenance of the code

We would like to automatize lunch as currently all orders are manually ordered and validated, and a cash move has to be manually created each time you want to credit the wallet of some user. In this commit we add a new widget that comes with the kanban view and will allow to take orders in a friendly manner. We also add a lunch.supplier model and an integration with the hr module in order to filter what products you can order depending on your working location, this also allows you to configure an automatic ordering via email. TaskID: 1856876

tivisse · 2018-12-04T10:57:22Z

@robodoo merge

Thanks JEM, changes applied.

tivisse · 2018-12-04T10:58:17Z

@robodoo r+

tivisse · 2018-12-04T10:58:23Z

@robodoo merge

tivisse · 2018-12-04T12:35:04Z

@robodoo merge

We would like to automatize lunch as currently all orders are manually ordered and validated, and a cash move has to be manually created each time you want to credit the wallet of some user. In this commit we add a new widget that comes with the kanban view and will allow to take orders in a friendly manner. We also add a lunch.supplier model and an integration with the hr module in order to filter what products you can order depending on your working location, this also allows you to configure an automatic ordering via email. -- I confirm I have signed the CLA and read the PR guidelines at www.odoo.com/submit-pr closes #28442

robodoo · 2018-12-04T15:56:25Z

Merged, thanks!

RomainLibert added the RD research & development, internal work label Nov 6, 2018

RomainLibert requested a review from tivisse November 6, 2018 15:24

robodoo added the seen 🙂 label Nov 6, 2018

RomainLibert force-pushed the master-automatize-lunch-rli branch 2 times, most recently from f105405 to 0b124dc Compare November 7, 2018 11:30

robodoo added the CI 🤖 Robodoo has seen passing statuses label Nov 7, 2018

RomainLibert force-pushed the master-automatize-lunch-rli branch from 0b124dc to b896ab3 Compare November 9, 2018 12:45

robodoo added CI 🤖 Robodoo has seen passing statuses and removed CI 🤖 Robodoo has seen passing statuses labels Nov 9, 2018

RomainLibert force-pushed the master-automatize-lunch-rli branch from b896ab3 to 1903bf2 Compare November 13, 2018 13:55

robodoo removed the CI 🤖 Robodoo has seen passing statuses label Nov 13, 2018

RomainLibert force-pushed the master-automatize-lunch-rli branch from 1903bf2 to 36a10db Compare November 14, 2018 10:47

robodoo added the CI 🤖 Robodoo has seen passing statuses label Nov 14, 2018

RomainLibert force-pushed the master-automatize-lunch-rli branch from 36a10db to aea9d6c Compare November 14, 2018 12:18

robodoo added CI 🤖 Robodoo has seen passing statuses and removed CI 🤖 Robodoo has seen passing statuses labels Nov 14, 2018

jem-odoo previously requested changes Nov 19, 2018

View reviewed changes

RomainLibert force-pushed the master-automatize-lunch-rli branch from aea9d6c to 2d75bed Compare November 19, 2018 16:22

robodoo removed the CI 🤖 Robodoo has seen passing statuses label Nov 19, 2018

RomainLibert force-pushed the master-automatize-lunch-rli branch from 2d75bed to 6de5e31 Compare November 19, 2018 16:38

robodoo added the CI 🤖 Robodoo has seen passing statuses label Nov 19, 2018

RomainLibert force-pushed the master-automatize-lunch-rli branch from 6de5e31 to fa0a5ad Compare November 20, 2018 09:37

robodoo added CI 🤖 Robodoo has seen passing statuses and removed CI 🤖 Robodoo has seen passing statuses labels Nov 20, 2018

RomainLibert force-pushed the master-automatize-lunch-rli branch from fa0a5ad to 61154c1 Compare November 20, 2018 11:51

robodoo added CI 🤖 Robodoo has seen passing statuses and removed CI 🤖 Robodoo has seen passing statuses labels Nov 20, 2018

RomainLibert force-pushed the master-automatize-lunch-rli branch from 61154c1 to ad726cf Compare November 26, 2018 09:26

robodoo removed the CI 🤖 Robodoo has seen passing statuses label Nov 26, 2018

RomainLibert force-pushed the master-automatize-lunch-rli branch from 398c208 to be701ce Compare November 30, 2018 10:36

robodoo added the CI 🤖 Robodoo has seen passing statuses label Nov 30, 2018

RomainLibert force-pushed the master-automatize-lunch-rli branch from be701ce to 9beae6b Compare December 3, 2018 09:33

robodoo removed the CI 🤖 Robodoo has seen passing statuses label Dec 3, 2018

RomainLibert force-pushed the master-automatize-lunch-rli branch from 9beae6b to c747aa2 Compare December 3, 2018 09:54

robodoo added the CI 🤖 Robodoo has seen passing statuses label Dec 3, 2018

RomainLibert force-pushed the master-automatize-lunch-rli branch from c747aa2 to 5b88fc4 Compare December 3, 2018 15:46

robodoo removed the CI 🤖 Robodoo has seen passing statuses label Dec 3, 2018

tivisse force-pushed the master-automatize-lunch-rli branch from 5b88fc4 to 3ad6b51 Compare December 4, 2018 08:53

robodoo added CI 🤖 Robodoo has seen passing statuses and removed CI 🤖 Robodoo has seen passing statuses labels Dec 4, 2018

RomainLibert added 2 commits December 4, 2018 11:55

[REF] lunch: split lunch.py into smaller files

ad99f09

We should basically have one model per file, as this will facilitate the reading and maintenance of the code

tivisse force-pushed the master-automatize-lunch-rli branch from 41bcc0d to f727b8f Compare December 4, 2018 10:56

robodoo added the r+ 👌 label Dec 4, 2018

robodoo added the CI 🤖 Robodoo has seen passing statuses label Dec 4, 2018

robodoo added the merging 👷 label Dec 4, 2018

robodoo added merged 🎉 and removed merging 👷 labels Dec 4, 2018

robodoo closed this Dec 4, 2018

robodoo merged commit f727b8f into odoo:master Dec 4, 2018

RomainLibert deleted the master-automatize-lunch-rli branch December 4, 2018 16:00

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[MERGE] lunch, lunch_hr: automatize lunch flow #28442

[MERGE] lunch, lunch_hr: automatize lunch flow #28442

RomainLibert commented Nov 6, 2018

Yenthe666 commented Nov 13, 2018

jem-odoo left a comment

jem-odoo Nov 19, 2018

jem-odoo Nov 19, 2018

jem-odoo Nov 19, 2018

RomainLibert Nov 19, 2018

jem-odoo Nov 19, 2018

jem-odoo Nov 19, 2018

jem-odoo Nov 19, 2018

jem-odoo Nov 19, 2018

jem-odoo Nov 19, 2018

tivisse commented Dec 4, 2018

tivisse commented Dec 4, 2018

tivisse commented Dec 4, 2018

tivisse commented Dec 4, 2018

robodoo commented Dec 4, 2018


		return False

		@http.route('/lunch/paymentMessage', type='json', auth='user')

[MERGE] lunch, lunch_hr: automatize lunch flow #28442

[MERGE] lunch, lunch_hr: automatize lunch flow #28442

Conversation

RomainLibert commented Nov 6, 2018

Yenthe666 commented Nov 13, 2018

jem-odoo left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tivisse commented Dec 4, 2018

tivisse commented Dec 4, 2018

tivisse commented Dec 4, 2018

tivisse commented Dec 4, 2018

robodoo commented Dec 4, 2018