odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] trunk-first_10_clicks_sale-rco 

bzr revid: rco@openerp.com-20120718141628-56sssoljh57alkhw
This commit is contained in:
Raphael Collet 2012-07-18 16:16:28 +02:00
parent 889236148b 8ac5c9c0ac
commit 5808220f2a
6 changed files with 38 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
addons/account/account.py
View File

@ -3351,15 +3351,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
# Create Bank journals
self._create_bank_journals_from_o2m(cr, uid, obj_wizard, company_id, acc_template_ref, context=context)
action = {
'type': 'ir.actions.act_window',
'view_type': 'form',
'view_mode': 'form',
'res_model': 'board.board',
'view_id': self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account', 'board_account_form')[1],
'menu_id': self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account', 'menu_finance')[1]
}
return action
return {}
def _prepare_bank_journal(self, cr, uid, line, current_num, default_account_id, company_id, context=None):
'''

1
addons/crm/res_partner_view.xml
View File

@ -123,6 +123,7 @@
<field name="model">res.partner</field>
<field name="type">form</field>
<field name="inherit_id" ref="base.view_partner_form" />
<field name="priority" eval="10">
<field name="arch" type="xml">
<xpath expr="//div[@name='buttons']" position="inside">
<button type="action"

2
addons/plugin_outlook/plugin_outlook.xml
View File

@ -14,7 +14,7 @@
<separator string="title" position="before">
<label string="This plug-in allows you to create and link outlook emails with openerp objects."/>
</separator>
<xpath expr="//header" position="replace"/>
<xpath expr="//footer" position="replace"/>
<xpath expr="//separator[@string='title']" position="after" version="7.0">
<group>
<field name="plugin32" widget="url"/>

2
addons/plugin_thunderbird/plugin_thunderbird.xml
View File

@ -14,7 +14,7 @@
<separator string="title" position="before">
<label string="This plug-in allows you to link your email to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one."/>
</separator>
<xpath expr="//header" position="replace"/>
<xpath expr="//footer" position="replace"/>
<xpath expr="//separator[@string='title']" position="after">
<group>
<field name="thunderbird" invisible="1"/>

35
addons/sale/res_partner_view.xml
View File

@ -1,7 +1,24 @@
<?xml version="1.0"?>
<openerp>
<data>
<!-- Partner kanban view inherte -->
<record id="act_res_partner_2_sale_order" model="ir.actions.act_window">
<field name="name">Quotations and Sales</field>
<field name="res_model">sale.order</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,graph</field>
<field name="context">{'search_default_partner_id': active_id}</field>
<field name="groups_id" eval="[(4, ref('base.group_sale_salesman'))]"/>
<field name="help">
This customer has no quotation or sale order.
Click here to create a new quotation.
&lt;p&gt;
The "Quotation" is the first step of the Sales flow. Manage your sales from quotation to invoice.
&lt;p&gt;
You will be able to sell products (manage deliveries) as well as services (create projects).
</field>
</record>
<!-- Partner kanban view inherte -->
<record model="ir.ui.view" id="crm_lead_partner_kanban_view">
<field name="name">res.partner.kanban.saleorder.inherit</field>
<field name="model">res.partner</field>
@ -18,6 +35,22 @@
</xpath>
</field>
</record>
<record id="res_partner_view_buttons" model="ir.ui.view">
<field name="name">res.partner.view.buttons</field>
<field name="model">res.partner</field>
<field name="type">form</field>
<field name="inherit_id" ref="base.view_partner_form" />
<field name="priority" eval="20">
<field name="arch" type="xml">
<xpath expr="//div[@name='buttons']" position="inside">
<button name="%(sale.act_res_partner_2_sale_order)d" type="action"
string="Quotations and Sales"
groups="base.group_sale_salesman"/>
</xpath>
</field>
</record>
</data>
</openerp>

8
addons/sale/sale_view.xml
View File

@ -569,14 +569,6 @@
<field name="filter" eval="True"/>
</record>
<act_window
context="{'search_default_partner_id': active_id, 'default_partner_id': active_id}"
id="act_res_partner_2_sale_order"
name="Quotations and Sales"
groups="base.group_sale_salesman"
res_model="sale.order"
src_model="res.partner"/>
<act_window
context="{'search_default_product_id': active_id, 'default_product_id': active_id}"
id="action_order_line_product_tree"