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

[IMP] views 

bzr revid: fp@tinyerp.com-20121115083400-i18b1yxfkq6j7y70
This commit is contained in:
Fabien Pinckaers 2012-11-15 09:34:00 +01:00
parent 9460e71cbe
commit 0cca84f1f7
13 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/account/account_invoice_view.xml
View File

@ -436,7 +436,7 @@
</sheet> </sheet>
<div class="oe_chatter"> <div class="oe_chatter">
<field name="message_follower_ids" widget="mail_followers"/> <field name="message_follower_ids" widget="mail_followers"/>
<field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/> <field name="message_ids" widget="mail_thread" placeholder="Share a note..."/>
</div> </div>
</form> </form>
</field> </field>

2
addons/base_calendar/crm_meeting_view.xml
View File

@ -221,7 +221,7 @@
</sheet> </sheet>
<div class="oe_chatter"> <div class="oe_chatter">
<field name="message_follower_ids" widget="mail_followers"/> <field name="message_follower_ids" widget="mail_followers"/>
<field name="message_ids" widget="mail_thread"/> <field name="message_ids" widget="mail_thread" placeholder="Share a message..."/>
</div> </div>
</form> </form>
</field> </field>

2
addons/crm_claim/crm_claim_view.xml
View File

@ -168,7 +168,7 @@
</sheet> </sheet>
<div class="oe_chatter"> <div class="oe_chatter">
<field name="message_follower_ids" widget="mail_followers"/> <field name="message_follower_ids" widget="mail_followers"/>
<field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/> <field name="message_ids" widget="mail_thread" placeholder="Share a note..."/>
</div> </div>
</form> </form>
</field> </field>

2
addons/crm_helpdesk/crm_helpdesk_view.xml
View File

@ -95,7 +95,7 @@
</notebook> </notebook>
</sheet> </sheet>
<div class="oe_chatter"> <div class="oe_chatter">
<field name="message_ids" widget="mail_thread"/> <field name="message_ids" widget="mail_thread" placeholder="Share a note..."/>
<field name="message_follower_ids" widget="mail_followers"/> <field name="message_follower_ids" widget="mail_followers"/>
</div> </div>
</form> </form>

4
addons/event/event_view.xml
View File

@ -205,7 +205,7 @@
</sheet> </sheet>
<div class="oe_chatter"> <div class="oe_chatter">
<field name="message_follower_ids" widget="mail_followers"/> <field name="message_follower_ids" widget="mail_followers"/>
<field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/> <field name="message_ids" widget="mail_thread" placeholder="Share a note..."/>
</div> </div>
</form> </form>
</field> </field>
@ -473,7 +473,7 @@
</sheet> </sheet>
<div class="oe_chatter"> <div class="oe_chatter">
<field name="message_follower_ids" widget="mail_followers"/> <field name="message_follower_ids" widget="mail_followers"/>
<field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/> <field name="message_ids" widget="mail_thread" placeholder="Share a note..."/>
</div> </div>
</form> </form>
</field> </field>

4
addons/hr_holidays/hr_holidays_view.xml
View File

@ -122,7 +122,7 @@
</sheet> </sheet>
<div class="oe_chatter"> <div class="oe_chatter">
<field name="message_follower_ids" widget="mail_followers"/> <field name="message_follower_ids" widget="mail_followers"/>
<field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/> <field name="message_ids" widget="mail_thread"/>
</div> </div>
</form> </form>
</field> </field>
@ -159,7 +159,7 @@
</sheet> </sheet>
<div class="oe_chatter"> <div class="oe_chatter">
<field name="message_follower_ids" widget="mail_followers"/> <field name="message_follower_ids" widget="mail_followers"/>
<field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/> <field name="message_ids" widget="mail_thread"/>
</div> </div>
</form> </form>
</field> </field>

2
addons/hr_recruitment/hr_recruitment_view.xml
View File

@ -184,7 +184,7 @@
</sheet> </sheet>
<div class="oe_chatter"> <div class="oe_chatter">
<field name="message_follower_ids" widget="mail_followers"/> <field name="message_follower_ids" widget="mail_followers"/>
<field name="message_ids" widget="mail_thread"/> <field name="message_ids" widget="mail_thread" placeholder="Share a message..."/>
</div> </div>
</form> </form>
</field> </field>

2
addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
View File

@ -162,7 +162,7 @@
</notebook> </notebook>
</sheet> </sheet>
<div class="oe_chatter"> <div class="oe_chatter">
<field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/> <field name="message_ids" widget="mail_thread"/>
<field name="message_follower_ids" widget="mail_followers"/> <field name="message_follower_ids" widget="mail_followers"/>
</div> </div>
</form> </form>

2
addons/mail/mail_group_view.xml
View File

@ -84,7 +84,7 @@
</sheet> </sheet>
<div class="oe_chatter"> <div class="oe_chatter">
<field name="message_follower_ids" widget="mail_followers"/> <field name="message_follower_ids" widget="mail_followers"/>
<field name="message_ids" widget="mail_thread" options='{"thread_level": 1}'/> <field name="message_ids" widget="mail_thread" options='{"thread_level": 1}' placeholder="Send a message to the group..."/>
</div> </div>
</form> </form>
</field> </field>

6
addons/mail/res_users.py
View File

@ -91,8 +91,10 @@ class res_users(osv.Model):
return user_id return user_id
def _create_welcome_message(self, cr, uid, user, context=None): def _create_welcome_message(self, cr, uid, user, context=None):
company_name = user.company_id.name if user.company_id else _('the company') if not self.has_group(cr, uid, 'base.group_user'):
body = _('%s has joined %s.') % (user.name, company_name) return False
company_name = user.company_id.name if user.company_id else ''
body = _('%s has joined the %s network.') % (user.name, company_name)
# TODO change SUPERUSER_ID into user.id but catch errors # TODO change SUPERUSER_ID into user.id but catch errors
return self.pool.get('res.partner').message_post(cr, SUPERUSER_ID, [user.partner_id.id], return self.pool.get('res.partner').message_post(cr, SUPERUSER_ID, [user.partner_id.id],
body=body, context=context) body=body, context=context)

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

@ -115,7 +115,7 @@
padding-top:2px; padding-top:2px;
} }
.openerp .oe_mail .oe_msg.oe_msg_indented .oe_msg_footer{ .openerp .oe_mail .oe_msg.oe_msg_indented .oe_msg_footer{
margin-bottom: 0px; margin-bottom: 5px;
} }
/* b) Votes (likes) */ /* b) Votes (likes) */

2
addons/sale/sale_view.xml
View File

@ -311,7 +311,7 @@
</sheet> </sheet>
<div class="oe_chatter"> <div class="oe_chatter">
<field name="message_follower_ids" widget="mail_followers"/> <field name="message_follower_ids" widget="mail_followers"/>
<field name="message_ids" widget="mail_thread"/> <field name="message_ids" widget="mail_thread" placeholder="Share a message..."/>
</div> </div>
</form> </form>
</field> </field>

4
addons/stock/stock_view.xml
View File

@ -914,7 +914,7 @@
<xpath expr="/form/sheet" position="after"> <xpath expr="/form/sheet" position="after">
<div class="oe_chatter"> <div class="oe_chatter">
<field name="message_follower_ids" widget="mail_followers"/> <field name="message_follower_ids" widget="mail_followers"/>
<field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/> <field name="message_ids" widget="mail_thread"/>
</div> </div>
</xpath> </xpath>
</data> </data>
@ -1040,7 +1040,7 @@
<xpath expr="/form/sheet" position="after"> <xpath expr="/form/sheet" position="after">
<div class="oe_chatter"> <div class="oe_chatter">
<field name="message_follower_ids" widget="mail_followers"/> <field name="message_follower_ids" widget="mail_followers"/>
<field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/> <field name="message_ids" widget="mail_thread"/>
</div> </div>
</xpath> </xpath>
</data> </data>