[MERGE] typo

bzr revid: fp@openerp.com-20121024195939-2rvx2yrl7g1wkcx5
This commit is contained in:
Fabien Pinckaers 2012-10-24 21:59:39 +02:00
commit 76730531da
2 changed files with 4 additions and 4 deletions

View File

@ -45,7 +45,7 @@
sequence="10"/>
<!-- Left-side menu: Feeds -->
<menuitem id="mail.mail_feeds" name="Feeds &amp; Mailbox" parent="mail.mail_feeds_main" groups="base.group_user" sequence="10"/>
<menuitem id="mail.mail_feeds" name="Messages" parent="mail.mail_feeds_main" groups="base.group_user" sequence="10"/>
<menuitem id="mail_my_stuff" name="Organizer" parent="mail.mail_feeds_main"/>
<record id="mail_inboxfeeds" model="ir.ui.menu">
@ -79,4 +79,4 @@
<field name="parent_id" ref="mail.mail_feeds"/>
</record>
</data>
</openerp>
</openerp>

View File

@ -873,7 +873,7 @@
<field name="arch" type="xml">
<tree colors="blue:state == 'draft';grey:state == 'cancel';red:state not in ('cancel', 'done') and min_date &lt; current_date" string="Delivery Orders">
<field name="name"/>
<field name="partner_id"/>
<field name="partner_id" string="Customer"/>
<field name="origin"/>
<field name="min_date"/>
<field name="date"/>
@ -1004,7 +1004,7 @@
<field name="arch" type="xml">
<tree colors="blue:state == 'draft';grey:state == 'done';red:state not in ('cancel', 'done') and date &lt; current_date" string="Picking list">
<field name="name"/>
<field name="partner_id"/>
<field name="partner_id" string="Supplier"/>
<field name="backorder_id"/>
<field name="origin"/>
<field name="date"/>