[FIX] sale_timesheet: project task invoice wizard daterange #140874

dhda-odoo · 2023-11-03T09:05:22Z

saas-16.3

Steps To reproduce:

install project, sales, and timesheets
open the project module and select any project created from SO
click on any task
click on the Sales Order smart button
to set the end date hover beside the start date

Issue:

end date should not be optional to select.

Cause:

the unification of datetime, daterange, and date happened in task 3121497 where daterange widget has the end date by default optional.

Solution:

I have added attrs and Timesheets Period label to have the same behavior as it was in saas-16.2.

task-3506482

robodoo · 2023-11-03T09:06:01Z

ppr-odoo · 2023-11-03T12:30:27Z

addons/sale_timesheet/wizard/sale_make_invoice_advance_views.xml

@@ -15,11 +15,14 @@
                    name="timesheet_invoice_date_range"
                    attrs="{'invisible': ['|', ('invoicing_timesheet_enabled', '=', False), ('advance_payment_method', '!=', 'delivered')]}"
                >
+                    <label for="date_start_invoice_timesheet" string="Timesheets Period" attrs="{'invisible': [ '|', ('invoicing_timesheet_enabled', '=', False), ('advance_payment_method', '!=', 'delivered')]}"/>


We need to update the pot file otherwise translation is break.

yes, you are correct

pkyriakou

Thank you @dhda-odoo for your work 💯
I left one comment 😁

pkyriakou · 2023-11-17T14:14:04Z

addons/sale_timesheet/wizard/sale_make_invoice_advance_views.xml

                    <field
                        name="date_start_invoice_timesheet"
                        widget="daterange"
+                        attrs="{'required': ['|', ('date_start_invoice_timesheet', '!=', False), ('date_end_invoice_timesheet', '!=', False)]}"


is this really needed ? can't you just do this ?

Suggested change

attrs="{'required': ['|', ('date_start_invoice_timesheet', '!=', False), ('date_end_invoice_timesheet', '!=', False)]}"

required="1"

@pkyriakou Yes, we do need it to ensure the same behavior as in version 16.2.

@pkyriakou we cannot because the daterange should be only required when there is at least one date set. If the both fields are empty then the daterange should not be required. 🙂

I agree it is a bit strange to write the required condition like this but it does not seem we have another way to do that. 😅

pkyriakou

Thank you @dhda-odoo 💯
LGTM 🟢 🥳

xavierbol

Thanks for your work 🙂

xavierbol · 2023-12-05T09:49:16Z

addons/sale_timesheet/wizard/sale_make_invoice_advance_views.xml

                    <field
                        name="date_start_invoice_timesheet"
                        widget="daterange"
+                        attrs="{'required': ['|', ('date_start_invoice_timesheet', '!=', False), ('date_end_invoice_timesheet', '!=', False)]}"


@pkyriakou we cannot because the daterange should be only required when there is at least one date set. If the both fields are empty then the daterange should not be required. 🙂

I agree it is a bit strange to write the required condition like this but it does not seem we have another way to do that. 😅

xavierbol · 2023-12-05T09:49:32Z

addons/sale_timesheet/wizard/sale_make_invoice_advance_views.xml

@@ -15,13 +15,23 @@
                    name="timesheet_invoice_date_range"
                    attrs="{'invisible': ['|', ('invoicing_timesheet_enabled', '=', False), ('advance_payment_method', '!=', 'delivered')]}"
                >
+                    <label for="date_start_invoice_timesheet" string="Timesheets Period"/>


Could just be a string in the field

@xavierbol no that is not working.

it works, it is just because you added nolabel="1"... 😕

I will fix it

xavierbol · 2023-12-05T09:56:20Z

I applied my comment and rebased your branch. 🙂

robodoo r+

xavierbol · 2023-12-05T15:35:05Z

robodoo r-

saas-16.3 Steps To reproduce: - install project, sales, and timesheets - open the project module and select any project created from SO - click on any task - click on the Sales Order smart button - to set the end date hover beside the start date Issue: - end date should not be optional to select. Cause: - the unification of datetime, daterange, and date happened in task 3121497 where daterange widget has the end date by default optional. Solution: - I have added attrs and Timesheets Period label to have the same behavior as it was in saas-16.2. task-3506482

xavierbol · 2023-12-05T15:47:44Z

robodoo r+

saas-16.3 Steps To reproduce: - install project, sales, and timesheets - open the project module and select any project created from SO - click on any task - click on the Sales Order smart button - to set the end date hover beside the start date Issue: - end date should not be optional to select. Cause: - the unification of datetime, daterange, and date happened in task 3121497 where daterange widget has the end date by default optional. Solution: - I have added attrs and Timesheets Period label to have the same behavior as it was in saas-16.2. task-3506482 closes #140874 Signed-off-by: Xavier Bol (xbo) <xbo@odoo.com>

C3POdoo requested a review from a team November 3, 2023 09:07

C3POdoo added the RD research & development, internal work label Nov 3, 2023

ppr-odoo self-requested a review November 3, 2023 12:27

ppr-odoo marked this pull request as draft November 3, 2023 12:27

ppr-odoo reviewed Nov 3, 2023

View reviewed changes

dhda-odoo force-pushed the saas-16.3-project-task-invoice-wizard-daterange-dhda branch 2 times, most recently from 7212f09 to a2b5e91 Compare November 7, 2023 11:46

pkyriakou reviewed Nov 17, 2023

View reviewed changes

ppr-odoo force-pushed the saas-16.3-project-task-invoice-wizard-daterange-dhda branch from a2b5e91 to 058ad6e Compare November 17, 2023 14:38

pkyriakou reviewed Nov 17, 2023

View reviewed changes

dhda-odoo force-pushed the saas-16.3-project-task-invoice-wizard-daterange-dhda branch 2 times, most recently from ec34bd2 to 607d64f Compare November 24, 2023 06:00

xavierbol force-pushed the saas-16.3-project-task-invoice-wizard-daterange-dhda branch from 607d64f to c557199 Compare December 5, 2023 09:55

xavierbol reviewed Dec 5, 2023

View reviewed changes

xavierbol marked this pull request as ready for review December 5, 2023 09:55

C3POdoo requested a review from a team December 5, 2023 09:58

xavierbol force-pushed the saas-16.3-project-task-invoice-wizard-daterange-dhda branch from c557199 to 2223fbd Compare December 5, 2023 15:47

robodoo temporarily deployed to merge December 5, 2023 18:45 Inactive

robodoo closed this Dec 5, 2023

This was referenced Dec 5, 2023

[FW][FIX] sale_timesheet: project task invoice wizard daterange #145107

Closed

[FW][FIX] sale_timesheet: project task invoice wizard daterange #145115

Closed

[FW][FIX] sale_timesheet: project task invoice wizard daterange #145344

Closed

fw-bot deleted the saas-16.3-project-task-invoice-wizard-daterange-dhda branch December 19, 2023 18:46

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[FIX] sale_timesheet: project task invoice wizard daterange #140874

[FIX] sale_timesheet: project task invoice wizard daterange #140874

dhda-odoo commented Nov 3, 2023 •

edited by xavierbol

Loading

robodoo commented Nov 3, 2023 •

edited

Loading

ppr-odoo Nov 3, 2023

dhda-odoo Nov 6, 2023

pkyriakou left a comment

pkyriakou Nov 17, 2023

dhda-odoo Nov 27, 2023

xavierbol Dec 5, 2023

pkyriakou left a comment

xavierbol left a comment

xavierbol Dec 5, 2023

xavierbol Dec 5, 2023

dhda-odoo Dec 5, 2023

xavierbol Dec 5, 2023

xavierbol commented Dec 5, 2023

xavierbol commented Dec 5, 2023

xavierbol commented Dec 5, 2023

	attrs="{'required': ['\|', ('date_start_invoice_timesheet', '!=', False), ('date_end_invoice_timesheet', '!=', False)]}"
	required="1"

[FIX] sale_timesheet: project task invoice wizard daterange #140874

[FIX] sale_timesheet: project task invoice wizard daterange #140874

Conversation

dhda-odoo commented Nov 3, 2023 • edited by xavierbol Loading

robodoo commented Nov 3, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

pkyriakou 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

pkyriakou left a comment

Choose a reason for hiding this comment

xavierbol 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

xavierbol commented Dec 5, 2023

xavierbol commented Dec 5, 2023

xavierbol commented Dec 5, 2023

dhda-odoo commented Nov 3, 2023 •

edited by xavierbol

Loading

robodoo commented Nov 3, 2023 •

edited

Loading