Nimesh Contractor(Open ERP) has proposed merging
lp:~openerp-dev/openerp-web/trunk-addons15-kanban-stage-fix-nco into
lp:openerp-web.
Requested reviews:
Atul Patel(OpenERP) (atp-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openerp-web/trunk-addons15-kanban-stage-fix-nco/+merge/128936
Hello sir,
Fix the problem of create new column or stage.
Thanks,
NCO.
--
https://code.launchpad.net/~openerp-dev/openerp-web/trunk-addons15-kanban-stage-fix-nco/+merge/128936
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openerp-web/trunk-addons15-kanban-stage-fix-nco.
=== modified file 'addons/web_kanban/static/src/js/kanban.js'
--- addons/web_kanban/static/src/js/kanban.js 2012-10-10 13:25:43 +0000
+++ addons/web_kanban/static/src/js/kanban.js 2012-10-10 13:40:30 +0000
@@ -194,9 +194,15 @@
});
var am = instance.webclient.action_manager;
var form = am.dialog_widget.views.form.controller;
+<<<<<<< TREE
form.on("on_button_cancel", self, am.dialog.on_close);
form.on('record_created', self, function(r) {
(new instance.web.DataSet(self, self.group_by_field.relation)).name_get([r]).then(function(new_record) {
+=======
+ form.on_button_cancel.add_last(am.dialog.on_close);
+ form.on_created.add_last(function(r) {
+ (new instance.web.DataSet(self, self.group_by_field.relation)).name_get([r]).then(function(new_record) {
+>>>>>>> MERGE-SOURCE
am.dialog.on_close();
var domain = self.dataset.domain.slice(0);
domain.push([self.group_by, '=', new_record[0][0]]);
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
