pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] Merged with addons/trunk.

Browse Source 
bzr revid: tde@openerp.com-20120719143402-c1960p3gt863u07s
This commit is contained in:
Thibault Delavallée
2012-07-19 16:34:02 +02:00
parent 4b5bf16065 37f391a564
commit fa4653aecc
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/mail/mail_message_view.xml
+1
View File
@@ -76,6 +76,7 @@
<search string="Messages Search">
<field name="user_id"/>
<field name="body"/>
<field name="subject"/>
<field name="type"/>
<filter icon="terp-personal+" string="My Feeds"
name="my_feeds" help="My Feeds"
addons/mail/static/src/xml/mail.xml
+2 -2
View File
@@ -5,7 +5,7 @@
wall main template
Template used to display the communication history in the wall.
-->
<div t-name="mail.wall" class="oe_view_manager oe_mail_wall oe_view_manager_global">
<div t-name="mail.wall" class="oe_view_manager oe_mail_wall oe_view_manager_current">
<table class="oe_view_manager_header">
<colgroup>
<col width="33%"/>
@@ -13,7 +13,7 @@
<col width="34%"/>
</colgroup>
<tbody>
<tr class="oe_header_row">
<tr class="oe_header_row oe_header_row_top">
<td colspan="2">
<h2 class="oe_view_title">
<span class="oe_view_title_text">All Feeds</span>
addons/sale/sale_view.xml
+3 -3
View File
@@ -146,10 +146,10 @@
<button name="invoice_corrected" states="invoice_except" string="Ignore Exception"/>
<button name="ship_recreate" states="shipping_except" string="Recreate Delivery Order"/>
<button name="ship_corrected" states="shipping_except" string="Ignore Exception"/>
<button name="action_quotation_send" string="Send by Mail" type="object" states="draft,sent" class="oe_highlight"/>
<button name="action_quotation_send" string="Send by Mail" type="object" states="draft,sent"/>
<button name="manual_invoice" states="manual" string="Create Final Invoice" type="object" class="oe_highlight"/>
<button name="print_quotation" string="Send by Post" type="object" states="draft,sent" class="oe_highlight"/>
<button name="action_button_confirm" states="draft" string="Confirm" type="object"/>
<button name="print_quotation" string="Send by Post" type="object" states="draft,sent"/>
<button name="action_button_confirm" states="draft" string="Confirm" type="object" class="oe_highlight"/>
<button name="action_button_confirm" states="sent" string="Confirm" class="oe_highlight" type="object"/>
<button name="action_view_invoice" string="Open Invoice" type="object" class="oe_highlight"
attrs="{'invisible': ['|','|',('state', '!=','progress'), ('invoiced', '=', True),('order_policy','=','picking')]}"/>