← Back to branch summary

~unifield-team/unifield-wm/us-826

« back to all changes in this revision

Viewing changes to consumption_calculation/consumption_view.xml

  • Committer: Matthieu Dietrich
  • Date: 2012-07-10 14:12:40 UTC
  • mfrom: (913 unifield-wm)
  • mto: This revision was merged to the branch mainline in revision 935.
  • Revision ID: mdietrich@chloups211-20120710141240-celi3o016fqz7mj1
UF-881: [MERGE] merged with trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
consumption_calculation/consumption_view.xml
61
61
                                on_change="uom_onchange(product_id, parent.cons_location_id, uom_id, prodlot_id)"/>
62
62
                            <field name="product_qty" />
63
63
                            <field name="prodlot_id" 
64
 
                                on_change="change_prodlot(product_id, prodlot_id, expiry_date, parent.cons_location_id, uom_id)"
 
64
                                on_change="change_prodlot(product_id, prodlot_id, expiry_date, parent.cons_location_id, uom_id, remark)"
65
65
                                domain="[('product_id', '=', product_id), ('stock_available', '>', 0)]"
66
66
                                context="{'location_id': parent.cons_location_id, 'uom': uom_id, 'hidden_perishable_mandatory': date_mandatory}"
67
67
                                attrs="{'required': [('batch_mandatory', '=', True)], 'readonly': [('batch_mandatory', '=', False)]}" />
68
68
                            <field name="expiry_date"
69
 
                                on_change="change_expiry(expiry_date, product_id, parent.cons_location_id, uom_id)"
 
69
                                on_change="change_expiry(expiry_date, product_id, parent.cons_location_id, uom_id, remark)"
70
70
                                attrs="{'required': [('date_mandatory', '=', True)], 'readonly': [('date_mandatory', '=', False)]}"/>
71
71
                            <field name="consumed_qty" on_change="change_qty(consumed_qty, product_id, prodlot_id, parent.cons_location_id, uom_id)"/>
72
72
                            <field name="remark" />