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

[MERGE] with branch lp:openobject-addons 

bzr revid: jam@tinyerp.com-20120608043320-7eypuupgregouh83
This commit is contained in:
Jigar Amin - OpenERP 2012-06-08 10:03:20 +05:30
parent ec9e434fca eb7b8c8fcb
commit 33200f280c
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/account_analytic_default/account_analytic_default_view.xml
View File

@ -6,7 +6,7 @@
<field name="model">account.analytic.default</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Analytic Defaults" colors="grey:date_stop and (date_stop &lt; datetime.date.today().strftime('%%Y-%%m-%%d'))" >
<tree string="Analytic Defaults">
<field name="sequence"/>
<field name="analytic_id" required="0" domain="[('parent_id','!=',False)]" groups="analytic.group_analytic_accounting"/>
<field name="product_id"/>

3
addons/mrp_repair/mrp_repair.py
View File

@ -230,10 +230,9 @@ class mrp_repair(osv.osv):
data['value']['location_id'] = move.location_dest_id.id
data['value']['location_dest_id'] = move.location_dest_id.id
if move.partner_id:
data['value']['partner_id'] = move.partner_id and move.partner_id.id
data['value']['partner_id'] = move.partner_id.id
else:
data['value']['partner_id'] = False
data['value']['partner_id'] = move.partner_id and move.partner_id.id
d = self.onchange_partner_id(cr, uid, ids, data['value']['partner_id'], data['value']['partner_id'])
data['value'].update(d['value'])
return data

6
addons/project/project_view.xml
View File

@ -479,9 +479,9 @@
<a name="action_close" states="draft,pending,open" string="Done" type="object" icon="terp-dialog-close"/>
</div>
<div class="oe_kanban_right">
<a name="set_kanban_state_blocked" string="Mark as Blocked" kanban_states="normal,done" type="object" icon="kanban-stop"/>
<a name="set_kanban_state_normal" string="Normal" kanban_states="blocked,done" type="object" icon="gtk-media-play"/>
<a name="set_kanban_state_done" string="Done" kanban_states="blocked,normal" type="object" icon="kanban-apply"/>
<a name="set_kanban_state_blocked" string="Mark as Blocked" attrs="{'invisible' : [('kanban_state', 'not in', ('normal', 'done'))]}" type="object" icon="kanban-stop"/>
<a name="set_kanban_state_normal" string="Normal" attrs="{'invisible' : [('kanban_state', 'not in', ('blocked', 'done'))]}" type="object" icon="gtk-media-play"/>
<a name="set_kanban_state_done" string="Done" attrs="{'invisible' : [('kanban_state', 'not in', ('blocked', 'normal'))]}" type="object" icon="kanban-apply"/>
</div>
<div class="oe_kanban_clear"/>
</div>