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

[MERGE]: Merge with latest trunk-addons 

bzr revid: rpa@tinyerp.com-20120808103917-0xxio0ugprx6y4r2
This commit is contained in:
Rucha (Open ERP) 2012-08-08 16:09:17 +05:30
parent 24f97099d3 71cd55490a
commit 1fd0cd8200
6 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/account/account_installer.xml
View File

@ -10,7 +10,9 @@
<attribute name="string">Accounting Application Configuration</attribute>
</form>
<footer position="replace">
<button name="action_next" type="object" string="Continue" class="oe_highlight"/>
<footer>
<button name="action_next" type="object" string="Continue" class="oe_highlight"/>
</footer>
</footer>
<separator string="title" position="replace">
<group>

11
addons/crm/crm_lead.py
View File

@ -293,8 +293,15 @@ class crm_lead(base_stage, osv.osv):
result = {}
if partner_id:
partner = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context)
result = {'partner_name' : partner.name}
return {'value' : result}
values = {
'partner_name' : partner.name,
'street' : partner.street,
'street2' : partner.street2,
'city' : partner.city,
'state_id' : partner.state_id and partner.state_id.id or False,
'country_id' : partner.country_id and partner.country_id.id or False,
}
return {'value' : values}
def _check(self, cr, uid, ids=False, context=None):

14
addons/crm/crm_lead_view.xml
View File

@ -162,12 +162,12 @@
<div>
<field name="street" placeholder="Street..."/>
<field name="street2"/>
<div>
<field name="zip" class="oe_inline" placeholder="ZIP"/>
<field name="city" class="oe_inline" placeholder="City"/>
<div class="address_format">
<field name="city" placeholder="City" style="width: 40%%"/>
<field name="state_id" options='{"no_open": true}' placeholder="State" style="width: 24%%"/>
<field name="zip" placeholder="ZIP" style="width: 34%%"/>
</div>
<field name="state_id" placeholder="State"/>
<field name="country_id" placeholder="Country"/>
<field name="country_id" placeholder="Country" options='{"no_open": true}'/>
</div>
</group>
<group>
@ -467,7 +467,7 @@
<h2>
<field name="planned_revenue" class="oe_inline"/>
<field name="company_currency" class="oe_inline"/> at
<field name="probability" class="oe_inline"/>%% success rate
<field name="probability" class="oe_inline" widget="integer"/>%% success rate
</h2>
</div>
<group>
@ -524,7 +524,7 @@
<field name="state_id" options='{"no_open": true}' placeholder="State" style="width: 24%%"/>
<field name="zip" placeholder="ZIP" style="width: 34%%"/>
</div>
<field name="country_id" placeholder="Country"/>
<field name="country_id" placeholder="Country" options='{"no_open": true}'/>
</div>
</group>

1
addons/email_template/email_template.py
View File

@ -317,6 +317,7 @@ class email_template(osv.osv):
'message_id': False,
'state': 'outgoing',
'content_subtype': 'plain',
'partner_ids': [],
}
if not template_id:
return values

2
addons/mail/static/src/js/mail.js
View File

@ -16,7 +16,7 @@ openerp.mail = function(session) {
session.web.FormView = session.web.FormView.extend({
do_action: function(action, on_close) {
if (action.res_model == 'mail.compose.message' && this.fields && this.fields.message_ids) {
if (action.res_model == 'mail.compose.message' && this.fields && this.fields.message_ids && this.fields.message_ids.view.get("actual_mode") != 'create') {
var record_thread = this.fields.message_ids;
var thread = record_thread.thread;
thread.instantiate_composition_form('comment', true, false, 0, action.context);

2
addons/sale/sale_view.xml
View File

@ -304,7 +304,7 @@
</group>
<div class="oe_clear"/>
<label for="note"/>
<field name="note"/>
<field name="note" class="oe_inline"/>
</page>
<page string="Other Information" groups="base.group_user">
<group>