Bhumi Thakkar (Open ERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-remove-warnings-server-installation-sale-procurement-bth
into
lp:~openerp-dev/openobject-addons/trunk-remove-warnings-server-installation.
Requested reviews:
OpenERP R&D Team (openerp-dev)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-remove-warnings-server-installation-sale-procurement-bth/+merge/120948
Hello,
Remove unsed statement from sale.order object. 'property_ids' field is not
created and value is assigned when creating record from sale.order. which is
not used anywhere so removed this statement of assigning value.
Remove type field from ir.ui.view model when creating record for res.partner.
Thanks.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-remove-warnings-server-installation-sale-procurement-bth/+merge/120948
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-dev/openobject-addons/trunk-remove-warnings-server-installation-sale-procurement-bth
into
lp:~openerp-dev/openobject-addons/trunk-remove-warnings-server-installation.
=== modified file 'portal/__openerp__.py'
--- portal/__openerp__.py 2012-08-18 16:49:32 +0000
+++ portal/__openerp__.py 2012-08-23 09:17:50 +0000
@@ -25,6 +25,7 @@
'depends' : [
'base',
'share',
+ 'auth_anonymous',
'auth_signup',
],
'author' : 'OpenERP SA',
@@ -45,8 +46,8 @@
'data': [
'security/portal_security.xml',
'security/ir.model.access.csv',
+ 'portal_data.xml',
'portal_view.xml',
- 'portal_data.xml',
'wizard/portal_wizard_view.xml',
'wizard/share_wizard_view.xml',
],
=== modified file 'portal/portal_data.xml'
--- portal/portal_data.xml 2012-08-13 15:26:04 +0000
+++ portal/portal_data.xml 2012-08-23 09:17:50 +0000
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
- <data>
+ <data noupdate="1">
<record id="portal" model="res.portal">
<field name="name">Portal</field>
@@ -10,7 +10,7 @@
<!-- Mail group for the company's news -->
<record id="company_news_feed" model="mail.group">
- <field name="name">Company's news feed</field>
+ <field name="name">Company's news</field>
</record>
<record id="action_news" model="ir.actions.act_window">
@@ -32,24 +32,5 @@
<field name="view_mode">form</field>
</record>
- <!-- Top menu item -->
- <menuitem name="Portal"
- id="portal_menu"
- groups="base.group_no_one,portal.group_portal_member,auth_anonymous.group_anonymous"
- sequence="20"/>
-
- <menuitem name="Our company" id="portal_company" parent="portal_menu" sequence="10"/>
- <menuitem name="News" id="portal_company_news" parent="portal_company" sequence="10" action="action_news"/>
- <menuitem name="Jobs" id="portal_jobs" parent="portal_company" sequence="20" action="action_jobs"/>
-
- <!--
- Create menu items that we'll leave empty for now - they'll be
- filled up by other portal modules.
- -->
- <menuitem name="Orders" id="portal_orders" parent="portal_menu" sequence="20"/>
- <menuitem name="Invoices and Payments" id="portal_invoices_payements" parent="portal_menu" sequence="30"/>
- <menuitem name="Projects" id="portal_projects" parent="portal_menu" sequence="40"/>
- <menuitem name="After Sale Services" id="portal_after_sales" parent="portal_menu" sequence="50"/>
-
</data>
</openerp>
=== modified file 'portal/portal_view.xml'
--- portal/portal_view.xml 2012-08-14 12:11:17 +0000
+++ portal/portal_view.xml 2012-08-23 09:17:50 +0000
@@ -2,6 +2,25 @@
<openerp>
<data>
+ <!-- Top menu item -->
+ <menuitem name="Portal"
+ id="portal_menu"
+ groups="base.group_no_one,portal.group_portal_member,auth_anonymous.group_anonymous"
+ sequence="20"/>
+
+ <menuitem name="Our company" id="portal_company" parent="portal_menu" sequence="10"/>
+ <menuitem name="News" id="portal_company_news" parent="portal_company" sequence="10" action="action_news"/>
+ <menuitem name="Jobs" id="portal_jobs" parent="portal_company" sequence="20" action="action_jobs"/>
+
+ <!--
+ Create menu items that we'll leave empty for now - they'll be
+ filled up by other portal modules.
+ -->
+ <menuitem name="Orders" id="portal_orders" parent="portal_menu" sequence="20"/>
+ <menuitem name="Invoices and Payments" id="portal_invoices_payements" parent="portal_menu" sequence="30"/>
+ <menuitem name="Projects" id="portal_projects" parent="portal_menu" sequence="40"/>
+ <menuitem name="After Sale Services" id="portal_after_sales" parent="portal_menu" sequence="50"/>
+
<!-- portal tree view -->
<record id="portal_list_view" model="ir.ui.view">
<field name="name">Portal List</field>
=== modified file 'sale/res_partner_view.xml'
--- sale/res_partner_view.xml 2012-08-14 12:11:17 +0000
+++ sale/res_partner_view.xml 2012-08-23 09:17:50 +0000
@@ -58,7 +58,6 @@
<record id="res_partner_address_type" model="ir.ui.view">
<field name="name">res.partner.view.address_type</field>
<field name="model">res.partner</field>
- <field name="type">form</field>
<field name="inherit_id" ref="base.view_partner_form" />
<field name="arch" type="xml">
<xpath expr="//label[@for='type']" position="attributes">
=== modified file 'sale/sale.py'
--- sale/sale.py 2012-08-15 20:13:20 +0000
+++ sale/sale.py 2012-08-23 09:17:50 +0000
@@ -845,8 +845,7 @@
'procure_method': line.type,
'move_id': move_id,
'company_id': order.company_id.id,
- 'note': '\n'.join(line.name.split('\n')[1:]),
- 'property_ids': [(6, 0, [x.id for x in line.property_ids])]
+ 'note': '\n'.join(line.name.split('\n')[1:])
}
def _prepare_order_line_move(self, cr, uid, order, line, picking_id, date_planned, context=None):
=== modified file 'web_linkedin/static/src/css/linkedin.css'
--- web_linkedin/static/src/css/linkedin.css 2012-08-03 14:41:50 +0000
+++ web_linkedin/static/src/css/linkedin.css 2012-08-23 09:17:50 +0000
@@ -32,4 +32,13 @@
.openerp .oe_linkedin_entity img {
max-width: 70px;
max-height: 70px;
-}
\ No newline at end of file
+}
+
+.openerp .oe_linkedin_entity h3 {
+ margin-bottom: 5px;
+}
+
+.openerp .oe_linkedin_entity .oe_linkedin_entity_headline {
+ color: grey;
+ margin-bottom: 10px;
+}
=== modified file 'web_linkedin/static/src/js/linkedin.js'
--- web_linkedin/static/src/js/linkedin.js 2012-08-14 15:30:53 +0000
+++ web_linkedin/static/src/js/linkedin.js 2012-08-23 09:17:50 +0000
@@ -102,11 +102,11 @@
if (entity.__type === "company") {
to_change.is_company = true;
to_change.name = entity.name;
- to_change.photo = false;
+ to_change.image = false;
if (entity.logoUrl) {
defs.push(self.rpc('/web_linkedin/binary/url2binary',
{'url': entity.logoUrl}).pipe(function(data){
- to_change.photo = data;
+ to_change.image = data;
}));
}
to_change.website = entity.websiteUrl;
@@ -138,11 +138,11 @@
} else { // people
to_change.is_company = false;
to_change.name = entity.formattedName;
- to_change.photo = false;
+ to_change.image = false;
if (entity.pictureUrl) {
defs.push(self.rpc('/web_linkedin/binary/url2binary',
{'url': entity.pictureUrl}).pipe(function(data){
- to_change.photo = data;
+ to_change.image = data;
}));
}
to_change.mobile = false;
@@ -154,7 +154,8 @@
to_change.phone = el.phoneNumber;
}
});
- to_change.function = entity.headline;
+ var positions = entity.positions.values || [];
+ to_change.function = positions ? positions[0].title : false;
/* TODO
to_change.linkedinUrl = entity.publicProfileUrl;
*/
@@ -169,7 +170,7 @@
var commonPeopleFields = ["id", "picture-url", "public-profile-url",
"formatted-name", "location", "phone-numbers", "im-accounts",
- "main-address", "headline"];
+ "main-address", "headline", "positions"];
instance.web_linkedin.LinkedinPopup = instance.web.Dialog.extend({
template: "Linkedin.popup",
@@ -261,6 +262,7 @@
} else { // people
this.$("h3").text(this.data.formattedName);
self.$("img").attr("src", this.data.pictureUrl);
+ self.$(".oe_linkedin_entity_headline").text(this.data.headline);
}
},
});
@@ -270,6 +272,7 @@
template: "LinkedIn.KeyWizard",
init: function(parent, text) {
this._super(parent, {title:_t("LinkedIn API Key")});
+ this.api_domain = window.location.origin;
},
start: function() {
this._super();
=== modified file 'web_linkedin/static/src/xml/linkedin.xml'
--- web_linkedin/static/src/xml/linkedin.xml 2012-08-08 10:39:59 +0000
+++ web_linkedin/static/src/xml/linkedin.xml 2012-08-23 09:17:50 +0000
@@ -21,6 +21,7 @@
</span>
</span>
<h3/>
+ <div class="oe_linkedin_entity_headline" />
</div>
</t>
<t t-name="LinkedIn.DisabledWarning">
@@ -41,8 +42,7 @@
<li>Log into LinkedIn.</li>
<li>Add a new application and fill the form:
<ul>
- <li>JavaScript API Domain is Your domain name (e.g. https://yourcompany.my.openerp.com)</li>
- <li>You can give multiple domain (e.g. yourcompany.my.openerp.com)</li>
+ <li>JavaScript API Domain: <t t-esc="widget.api_domain"/></li>
<li>The programming tool is Javascript</li>
</ul>
</li>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
