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

bugfixes 

bzr revid: fp@tinyerp.com-20081202101742-h36shmea0tex5nr5
This commit is contained in:
Fabien Pinckaers 2008-12-02 11:17:42 +01:00
parent 6207fbdcd4
commit 5e6452c881
4 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/account/account_view.xml
View File

@ -881,7 +881,7 @@
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_id" ref="view_move_tree"/> <field name="view_id" ref="view_move_tree"/>
</record> </record>
<menuitem id="next_id_29" name="Search Entries" parent="account.menu_finance_accounting"/> <menuitem id="next_id_29" name="Search Entries" parent="account.menu_finance_reporting"/>
<menuitem action="action_move_line_form" id="menu_action_move_line_form" parent="next_id_29"/> <menuitem action="action_move_line_form" id="menu_action_move_line_form" parent="next_id_29"/>
<record id="action_move_line_form_encode_by_move" model="ir.actions.act_window"> <record id="action_move_line_form_encode_by_move" model="ir.actions.act_window">

2
addons/sale/sale.py
View File

@ -363,7 +363,7 @@ class sale_order(osv.osv):
data = inv_obj.onchange_payment_term_date_invoice(cr, uid, [inv_id], data = inv_obj.onchange_payment_term_date_invoice(cr, uid, [inv_id],
pay_term,time.strftime('%Y-%m-%d')) pay_term,time.strftime('%Y-%m-%d'))
if data.get('value',False): if data.get('value',False):
inv_obj.write(cr, uid, [inv_id], inv.update(data['value']), context=context) inv_obj.write(cr, uid, [inv_id], data['value'], context=context)
inv_obj.button_compute(cr, uid, [inv_id]) inv_obj.button_compute(cr, uid, [inv_id])
return inv_id return inv_id

9
addons/stock/stock_view.xml
View File

@ -298,7 +298,7 @@
<field name="res_model">stock.move</field> <field name="res_model">stock.move</field>
<field name="domain">[('id','in',active_ids)]</field> <field name="domain">[('id','in',active_ids)]</field>
<field name="view_type">tree</field> <field name="view_type">tree</field>
<field eval="stock_move_tree" name="view_id"/> <field eval="stock_move_tree2" name="view_id"/>
</record> </record>
<record id="ir_move_traceability_upstream" model="ir.values"> <record id="ir_move_traceability_upstream" model="ir.values">
<field eval="'tree_but_action'" name="key2"/> <field eval="'tree_but_action'" name="key2"/>
@ -307,18 +307,13 @@
<field eval="'ir.actions.act_window,'+str(action3)" name="value"/> <field eval="'ir.actions.act_window,'+str(action3)" name="value"/>
<field eval="True" name="object"/> <field eval="True" name="object"/>
</record> </record>
#
# Composed lots
#
<record id="action5" model="ir.actions.act_window"> <record id="action5" model="ir.actions.act_window">
<field name="name">Upstream traceability</field> <field name="name">Upstream traceability</field>
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
<field name="res_model">stock.move</field> <field name="res_model">stock.move</field>
<field name="domain">[('id','in',active_ids)]</field> <field name="domain">[('id','in',active_ids)]</field>
<field name="view_type">tree</field> <field name="view_type">tree</field>
<field eval="stock_move_tree2" name="view_id"/> <field eval="stock_move_tree" name="view_id"/>
</record> </record>
<record id="ir_move_traceability_downstream" model="ir.values"> <record id="ir_move_traceability_downstream" model="ir.values">
<field eval="'tree_but_action'" name="key2"/> <field eval="'tree_but_action'" name="key2"/>

4
addons/stock/wizard/stock_traceability.py
View File

@ -49,7 +49,7 @@ class wiz_journal(wizard.interface):
states = { states = {
'init': { 'init': {
'actions': [], 'actions': [],
'result': {'type': 'action', 'action': action_traceability(), 'state':'end'} 'result': {'type': 'action', 'action': action_traceability('move_history_ids2'), 'state':'end'}
} }
} }
wiz_journal('stock.traceability.downstream') wiz_journal('stock.traceability.downstream')
@ -58,7 +58,7 @@ class wiz_journal2(wizard.interface):
states = { states = {
'init': { 'init': {
'actions': [], 'actions': [],
'result': {'type': 'action', 'action': action_traceability('move_history_ids2'), 'state':'end'} 'result': {'type': 'action', 'action': action_traceability(), 'state':'end'}
} }
} }
wiz_journal2('stock.traceability.upstream') wiz_journal2('stock.traceability.upstream')