Merge pull request #170 from oihane/8.0-event_track_assistant

[IMP] event_track_assistant: fix view and filter dates
avanzosc · Jan 16, 2017 · a73ee26 · a73ee26
2 parents a0950ee + 46986a4
commit a73ee26
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/event_track_assistant/views/event_event_view.xml b/event_track_assistant/views/event_event_view.xml
@@ -39,12 +39,22 @@
                          </group>
                     </page>
                 </notebook>
-                <xpath expr="//tree[@string='Registration']//button[@string='Confirm Registration']" position="attributes">
+                <xpath expr="//field[@name='registration_ids']/tree//button[@name='registration_open']"
+                       position="attributes">
                     <attribute name="name">button_registration_open</attribute>
                 </xpath>
-                <xpath expr="//form[@string='Registration']//button[@string='Confirm Registration']" position="attributes">
+                <xpath expr="//field[@name='registration_ids']/form//button[@name='registration_open']"
+                       position="attributes">
                     <attribute name="name">button_registration_open</attribute>
                 </xpath>
+                <xpath expr="//field[@name='registration_ids']/tree//button[@name='button_reg_cancel']"
+                       position="attributes">
+                    <attribute name="name">new_button_reg_cancel</attribute>
+                </xpath>
+                <xpath expr="//field[@name='registration_ids']/form//button[@name='button_reg_cancel']"
+                       position="attributes">
+                    <attribute name="name">new_button_reg_cancel</attribute>
+                </xpath>
             </field>
         </record>
         <record model="ir.ui.view" id="view_event_search_inh_assistant">

diff --git a/event_track_assistant/wizard/wiz_event_append_assistant.py b/event_track_assistant/wizard/wiz_event_append_assistant.py
@@ -247,8 +247,9 @@ def _prepare_registration_data(self, event):
 
     def _calc_dates_for_search_track(self, from_date, to_date):
         tz = self.env.user.tz
-        from_date = datetime2str(_convert_to_utc_date(from_date, tz=tz))
-        to_date = datetime2str(_convert_to_utc_date(to_date, tz=tz))
+        from_date = datetime2str(
+            _convert_to_utc_date(from_date, time=0.0, tz=tz))
+        to_date = datetime2str(_convert_to_utc_date(to_date, time=24.0, tz=tz))
         return from_date, to_date
 
     def _exit_from_append_wizard(self):