diff --git a/__manifest__.py b/__manifest__.py
index 787be351f2b3a15ffe021c1147e51cfeca647593..b5d5f55977d0319b04b39fd800a700eeebf6f53f 100644
--- a/__manifest__.py
+++ b/__manifest__.py
@@ -16,10 +16,9 @@
'datas/vracoop.time.csv',
"views/assets.xml",
"views/vracoop_retrait_views.xml",
- "views/vracoop_retrait_suivi_views.xml",
+ "views/vracoop_sale_retrait_views.xml",
"views/vracoop_templates.xml",
"views/sale_order.xml",
"views/delivery_views.xml"
- # "views/templates.xml"
]
}
diff --git a/views/vracoop_retrait_suivi_views.xml b/views/vracoop_retrait_suivi_views.xml
deleted file mode 100644
index 719b63deba4375e0722127959aac533130653271..0000000000000000000000000000000000000000
--- a/views/vracoop_retrait_suivi_views.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
- <data>
-
- <record id="vracoop_view_retrait_suivi_tree" model="ir.ui.view">
- <field name="name">vracoop.retrait.suivi.tree</field>
- <field name="model">vracoop.retrait.suivi</field>
- <field eval="8" name="priority"/>
- <field name="arch" type="xml">
- <tree string="Retraits">
- <field name="order_id"/>
- <field name="partner_id"/>
- <field name="vracoop_point_retrait_id"/>
- <field name="day_retrait"/>
- <field name="hour_retrait" widget="float_time"/>
- </tree>
- </field>
- </record>
-
- <record model="ir.ui.view" id="vracoop_view_retrait_suivi_form">
- <field name="name">vracoop.retrait.suivi.form</field>
- <field name="model">vracoop.retrait.suivi</field>
- <field name="arch" type="xml">
- <form string="Retrait">
- <sheet>
- <group>
- <group>
- <field name="order_id"/>
- <field name="partner_id"/>
- <field name="vracoop_point_retrait_id"/>
- <field name="day_retrait"/>
- <field name="hour_retrait" widget="float_time"/>
- </group>
- </group>
- </sheet>
- </form>
- </field>
- </record>
-
- <record id="action_retrait_suivi_view" model="ir.actions.act_window" >
- <field name="name">Suivi retrait</field>
- <field name="res_model">vracoop.retrait.suivi</field>
- <field name="view_type">form</field>
- <field name="view_mode">tree,form</field>
- <field name="view_id" ref="vracoop_view_retrait_suivi_tree"/>
- <field name="help" type="html">
- <p class="o_view_nocontent_smiling_face">
- Créer un nouveau Suivi
- </p>
- </field>
- </record>
-
- <menuitem id="menu_point_suivi" parent="menu_retrait" name="Suivi des retraits" action="action_retrait_suivi_view" sequence="20"/>
-
- </data>
-</odoo>
\ No newline at end of file
diff --git a/views/vracoop_retrait_views.xml b/views/vracoop_retrait_views.xml
index 26de969c93ce541045dbc222fb0bc4ada106c9c9..11b74f16f3bf7d0ee3b492978f617a2f9837c19f 100644
--- a/views/vracoop_retrait_views.xml
+++ b/views/vracoop_retrait_views.xml
@@ -103,7 +103,7 @@
<notebook>
<page string="Horaires" name="horaires">
<field name="vracoop_retrait_time_ids" mode="tree" >
- <tree editable='bottom' create="false" >
+ <tree editable='bottom' create="false" delete="false">
<field name="active_day"/>
<field name="name"/>
<field name="first_morning_heure" widget="float_time"/>
@@ -138,11 +138,16 @@
name="Retrait"
sequence="50"
parent="website.menu_website_configuration"
- groups="website.group_website_designer"/>
+ groups="website.group_website_publisher"/>
<menuitem id="menu_point_retrait" parent="menu_retrait" name="Points retrait" action="action_point_retrait_view" sequence="10"/>
- <menuitem id="menu_point_time" parent="menu_retrait" name="Configuration des temps retrait" action="action_time_view" sequence="20"/>
+ <menuitem
+ id="menu_point_time"
+ parent="website_sale.menu_ecommerce_settings"
+ name="Horaires retrait"
+ action="action_time_view"
+ sequence="20"/>
</data>
diff --git a/views/vracoop_sale_retrait_views.xml b/views/vracoop_sale_retrait_views.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5ed9144b92efce64807eb15cd72db4c926008f5e
--- /dev/null
+++ b/views/vracoop_sale_retrait_views.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+
+ <record id="vracoop_view_order_tree" model="ir.ui.view">
+ <field name="name">vracoop.sale.order.tree</field>
+ <field name="model">sale.order</field>
+ <field name="priority">1</field>
+ <field name="arch" type="xml">
+ <tree string="Commandes" decoration-bf="message_needaction==True" decoration-muted="state=='cancel'">
+ <field name="message_needaction" invisible="1"/>
+ <field name="name" string="Num de commande"/>
+ <field name="confirmation_date" string="Date de confirmation"/>
+ <field name="commitment_date" groups="sale.group_sale_order_dates"/>
+ <field name="expected_date" groups="sale.group_sale_order_dates"/>
+ <field name="partner_id"/>
+ <field name="vracoop_point_retrait_id"/>
+ <field name="day_retrait"/>
+ <field name="hour_retrait"/>
+ <field name="user_id"/>
+ <field name="amount_total" sum="Total Tax Included" widget="monetary"/>
+ <field name="currency_id" invisible="1"/>
+ <field name="invoice_status" invisible="1"/>
+ <field name="state" invisible="1"/>
+ </tree>
+ </field>
+ </record>
+
+ <record id="vracoop_view_sales_order_filter" model="ir.ui.view">
+ <field name="name">vracoop.sale.order.list.select</field>
+ <field name="model">sale.order</field>
+ <field name="priority" eval="15"/>
+ <field name="arch" type="xml">
+ <search string="Search Sales Order">
+ <field name="name" string="Sales Order" filter_domain="['|','|',('name','ilike',self),('client_order_ref','ilike',self),('partner_id','child_of',self)]"/>
+ <field name="partner_id" operator="child_of"/>
+ <field name="user_id"/>
+ <field name="team_id" string="Sales Team"/>
+ <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
+ <field name="order_line" string="Product" filter_domain="[('order_line.product_id', 'ilike', self)]"/>
+ <filter string="My Orders" domain="[('user_id','=',uid)]" name="my_sale_orders_filter"/>
+ <filter string="Commandes confirmées" name="order_confirmed" domain="[('state', 'in', ('sale', 'done'))]"/>
+ <filter string="Commandes non payées" name="order_unpaid" domain="[('state', '=', 'sent'), ('team_id.team_type', '=', 'website')]"/>
+ <filter string="Paniers abandonnés" name="order_abandoned" domain="[('is_abandoned_cart', '=', True)]"/>
+ <separator/>
+ <filter string="Order Date" name="order_date" date="date_order"/>
+ <separator/>
+ <filter string="Depuis le site web" name="from_website" domain="[('team_id.team_type', '=', 'website')]"/>
+ <filter string="En retrait" name="point_retrait" domain="[('carrier_point_retrait', '=', True)]"/>
+ <separator/>
+ <separator/>
+ <filter string="Mes activités" name="activities_my"
+ domain="[('activity_ids.user_id', '=', uid)]"/>
+ <separator/>
+ <filter string="Activités en retard" name="activities_overdue"
+ domain="[('activity_ids.date_deadline', '<', context_today().strftime('%Y-%m-%d'))]"
+ help="Show all records which has next action date is before today"/>
+ <filter string="Activités du jour" name="activities_today"
+ domain="[('activity_ids.date_deadline', '=', context_today().strftime('%Y-%m-%d'))]"/>
+ <filter string="Activités futures" name="activities_upcoming_all"
+ domain="[('activity_ids.date_deadline', '>', context_today().strftime('%Y-%m-%d'))
+ ]"/>
+ <group expand="0" string="Group By">
+ <filter string="Point retrait" name="order_retrait" domain="[]" context="{'group_by':'vracoop_point_retrait_id'}"/>
+ <filter string="Date Retrait" name="order_retrait_month" domain="[]" context="{'group_by':'day_retrait'}"/>
+ </group>
+ </search>
+ </field>
+ </record>
+
+ <record id="vracoop_action_orders" model="ir.actions.act_window">
+ <field name="name">Commandes en retrait</field>
+ <field name="type">ir.actions.act_window</field>
+ <field name="res_model">sale.order</field>
+ <field name="view_type">form</field>
+ <field name="view_mode">tree,form,activity</field>
+ <field name="search_view_id" ref="vracoop_view_sales_order_filter"/>
+ <field name="context">{'show_sale': True, 'search_default_point_retrait': 1}</field>
+ <field name="domain">[('state', 'not in', ('draft', 'sent', 'cancel'))]</field>
+ <field name="help" type="html">
+ <p class="o_view_nocontent_smiling_face">
+ Créer un nouveau bon de commande
+ </p>
+ </field>
+ </record>
+
+ <record id="vracoop_sale_order_action_view_order_tree" model="ir.actions.act_window.view">
+ <field name="sequence" eval="1"/>
+ <field name="view_mode">tree</field>
+ <field name="view_id" ref="vracoop_click_and_collect.vracoop_view_order_tree"/>
+ <field name="act_window_id" ref="vracoop_click_and_collect.vracoop_action_orders"/>
+ </record>
+
+ <menuitem id="vracoop_menu_sale_order"
+ name="Suivi des retraits"
+ action="vracoop_action_orders"
+ parent="vracoop_click_and_collect.menu_retrait"
+ sequence="20"
+ groups="sales_team.group_sale_salesman"/>
+
+
+</odoo>