Browse Source

Merge branch '9.0-res_partner_mails_count' of github.com:yelizariev/mail-addons into 9.0-res_partner_mais_count_fix_docs

Conflicts:
	res_partner_mails_count/static/src/js/res_partner_mails_count_tour.js
pull/16/head
ilyasProgrammer 9 years ago
parent
commit
9a95ad8792
  1. 1
      res_partner_mails_count/static/src/js/res_partner_mails_count_tour.js
  2. 6
      res_partner_mails_count/templates.xml

1
res_partner_mails_count/static/src/js/res_partner_mails_count_tour.js

@ -20,7 +20,6 @@ odoo.define('res_partner_mails_count.res_partner_mails_count_tour', function (re
content: _t("Here is new fields with mails counters. Press one of it."), content: _t("Here is new fields with mails counters. Press one of it."),
element: '.mails_to', element: '.mails_to',
waitFor: '.mails_to:visible', waitFor: '.mails_to:visible',
}, },
{ {
title: _t("Done"), title: _t("Done"),

6
res_partner_mails_count/templates.xml

@ -30,13 +30,13 @@
</div> </div>
</field> </field>
</record> </record>
</data>
<data noupdate="true">
<record id="res_partner_mails_count_tutorial" model="ir.actions.act_url"> <record id="res_partner_mails_count_tutorial" model="ir.actions.act_url">
<field name="name">res_partner_mails_count Tutorial</field> <field name="name">res_partner_mails_count Tutorial</field>
<field name="url" eval="'/web?debug=1&amp;res_partner_mails_count=tutorial#id='+str(ref('base.partner_root'))+'&amp;view_type=form&amp;model=res.partner&amp;/#tutorial_extra.mails_count_tour=true'"/>
<field name="url" eval="'/web?res_partner_mails_count=tutorial#id='+str(ref('base.partner_root'))+'&amp;view_type=form&amp;model=res.partner&amp;/#tutorial_extra.mails_count_tour=true'"/>
<field name="target">self</field> <field name="target">self</field>
</record> </record>
</data>
<data noupdate="1">
<record id="base.open_menu" model="ir.actions.todo"> <record id="base.open_menu" model="ir.actions.todo">
<field name="action_id" ref="res_partner_mails_count_tutorial"/> <field name="action_id" ref="res_partner_mails_count_tutorial"/>
<field name="state">open</field> <field name="state">open</field>

Loading…
Cancel
Save