Skip to content
Snippets Groups Projects
Commit ad03f090 authored by Eric Horvat's avatar Eric Horvat
Browse files

Merge branch '8.0-ehorvat' into '8.0-stage' 

Merge ehorvat

See merge request !12
parents 70036e94 22f1f822
No related branches found
No related tags found
1 merge request!12Merge ehorvat
Expand all Hide whitespace changes
Inline Side-by-side
data/res_groups_data.xml
+ 7
− 0
View file @ ad03f090
<openerp>
<data>
<record model="ir.module.category" id="module_category_routing_management">
<field name="name">Routing</field>
<field name="description">Helps you manage Routing module</field>
<field name="sequence">15</field>
</record>
<record model="res.groups" id="group_repositor">
<field name="name">Repositor</field>
<field name="category_id" ref="module_category_routing_management"/>
<field name="implied_ids" eval="[(4, ref('base.group_user'))]"/>
</record>
<record model="res.groups" id="group_routing_admin">
<field name="name">Routing Admin</field>
<field name="category_id" ref="module_category_routing_management"/>
</record>
</data>
</openerp>
i18n/es_AR.mo
+ 0
− 0
View file @ ad03f090
No preview for this file type
i18n/es_AR.po
+ 447
− 74
View file @ ad03f090
This diff is collapsed.
i18n/rafalim_route_calendar.pot
+ 436
− 56
View file @ ad03f090
This diff is collapsed.
views/route_period_view.xml
+ 35
− 34
View file @ ad03f090
......@@ -18,46 +18,47 @@
<field name="model">route.period</field>
<field name="arch" type="xml">
<form string="Route periods form" delete="0" create="0" edit="0">
<sheet>
<group>
<field name="name"/>
<field name="repositor_id"/>
</group>
<notebook>
<page string="Previous periods">
<field name="previous_period_point_ids">
<tree>
<field name="partner_id"/>
<field name="start_date"/>
<field name="end_date"/>
<field name="state"/>
<field name="route_type"/>
</tree>
</field>
<header>
<button name="authorize_all_previous" type="object"
string="Authorize all" class="oe_highlight" groups="supervisors_and_pools.group_salesman_supervisor,rafalim_route_calendar.group_routing_admin"/>
string="Authorize all previous" class="oe_highlight" groups="supervisors_and_pools.group_salesman_supervisor,rafalim_route_calendar.group_routing_admin"/>
<button name="confirm_all_previous" type="object"
string="Confirm all" class="oe_highlight" groups="rafalim_route_calendar.group_repositor"/>
</page>
<page string="Actual periods">
<field name="actual_period_point_ids">
<tree>
<field name="partner_id"/>
<field name="start_date"/>
<field name="end_date"/>
<field name="state"/>
<field name="route_type"/>
</tree>
</field>
string="Confirm all previous" class="oe_highlight" groups="rafalim_route_calendar.group_repositor"/>
<button name="confirm_all_actual" type="object"
string="Confirm all" class="oe_highlight" groups="rafalim_route_calendar.group_repositor, rafalim_route_calendar.group_routing_admin"/>
string="Confirm all actual" class="oe_highlight" groups="rafalim_route_calendar.group_repositor, rafalim_route_calendar.group_routing_admin"/>
<button name="authorize_all_actual" type="object"
string="Authorize all" class="oe_highlight" groups="rafalim_route_calendar.group_routing_admin"/>
string="Authorize all actual" class="oe_highlight" groups="rafalim_route_calendar.group_routing_admin"/>
</header>
<sheet>
<group>
<field name="name"/>
<field name="repositor_id"/>
</group>
<notebook>
<page string="Previous periods">
<field name="previous_period_point_ids">
<tree>
<field name="partner_id"/>
<field name="start_date"/>
<field name="end_date"/>
<field name="state"/>
<field name="route_type"/>
</tree>
</field>
</page>
<page string="Actual periods">
<field name="actual_period_point_ids">
<tree>
<field name="partner_id"/>
<field name="start_date"/>
<field name="end_date"/>
<field name="state"/>
<field name="route_type"/>
</tree>
</field>
</page>
</notebook>
</sheet>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment