[MERGE] merge with lp:openobject-addons
bzr revid: cha@tinyerp.com-20121109131930-evfh7lkjsis81hhv
This commit is contained in:
commit
ead292b95c
|
@ -28,10 +28,6 @@ class mrp_config_settings(osv.osv_memory):
|
|||
_inherit = 'res.config.settings'
|
||||
|
||||
_columns = {
|
||||
'module_stock_planning': fields.boolean('Manage master production shedule',
|
||||
help ="""This allows to create a manual procurement plan apart of the normal MRP scheduling,
|
||||
which works automatically based on minimum stock rules.
|
||||
This installs the module stock_planning."""),
|
||||
'module_mrp_repair': fields.boolean("Manage repairs of products ",
|
||||
help="""Allows to manage all product repairs.
|
||||
* Add/remove products in the reparation
|
||||
|
|
|
@ -56,10 +56,6 @@
|
|||
<field name="module_mrp_operations" class="oe_inline"/>
|
||||
<label for="module_mrp_operations" />
|
||||
</div>
|
||||
<div>
|
||||
<field name="module_stock_planning" class="oe_inline"/>
|
||||
<label for="module_stock_planning"/>
|
||||
</div>
|
||||
</div>
|
||||
</group>
|
||||
<separator string="Master Data"/>
|
||||
|
|
|
@ -941,8 +941,10 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
|
|||
var self = this;
|
||||
var x = new module.PaymentlineWidget(null, {
|
||||
payment_line: newPaymentLine
|
||||
});
|
||||
x.on('delete_payment_line', self, self.deleteLine);
|
||||
});
|
||||
x.on('delete_payment_line', self, function(r) {
|
||||
self.deleteLine(r);
|
||||
});
|
||||
x.appendTo(this.$('#paymentlines'));
|
||||
},
|
||||
renderElement: function() {
|
||||
|
|
|
@ -315,7 +315,7 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
|
|||
this._super();
|
||||
this.$('input').keyup(_.bind(this.changeAmount, this));
|
||||
this.$('.delete-payment-line').click(function() {
|
||||
self.trigger('delete_payment_line');
|
||||
self.trigger('delete_payment_line', self);
|
||||
});
|
||||
},
|
||||
});
|
||||
|
|
Loading…
Reference in New Issue