pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] view and resolve conflict

Browse Source 
bzr revid: rgaopenerp-20120717102634-qklib4p9j6lwahyx
This commit is contained in:
RGA(OpenERP)
2012-07-17 15:56:34 +05:30
parent c574671aa2
commit b6f1b50b34
2 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/static/src/css/account.css
+12 -1
View File
@@ -6,7 +6,11 @@
border-radius: 10px;
border:2px solid;
}
.openerp .oe_extended_form_view .oe_form_nosheet {
margin: 2px;
}
.openerp .oe_pager_m2o li {
display: inline-block;
height: 24px;
@@ -23,6 +27,13 @@
display: inline-block !important;
}
.openerp .oe_extended_form_view .oe_datepicker_root {
display: inline-block;
min-width: 100px;
}
.openerp .oe_extended_form_view .oe_form_field {
width: auto;
}
.openerp .oe_extended_form_view button {
margin-right: 10px
}
addons/account/static/src/js/account.js
+15 -10
View File
@@ -16,20 +16,23 @@ instance.account.extend_actionmanager = instance.web.ActionManager.include({
};
}
if (action.target === 'new') {
if (this.dialog == null) {
this.dialog = new instance.web.Dialog(this, { width: '80%' });
if (this.dialog === null) {
// These buttons will be overwrited by <footer> if any
this.dialog = new instance.web.Dialog(this, {
buttons: { "Close": function() { $(this).dialog("close"); }},
dialogClass: 'oe_act_window'
});
if(on_close)
this.dialog.on_close.add(on_close);
} else {
this.dialog_viewmanager.destroy();
this.dialog_widget.destroy();
}
this.dialog.dialog_title = action.name;
this.dialog_viewmanager = new instance.web.ViewManagerAction(this, action);
this.dialog_viewmanager.appendTo(this.dialog.$element);
this.dialog_widget = new instance.web.ViewManagerAction(this, action);
this.dialog_widget.appendTo(this.dialog.$element);
this.dialog.open();
} else {
this.dialog_stop();
this.content_stop();
if(action.menu_id) {
return this.getParent().do_action(action, function () {
instance.webclient.menu.open_menu(action.menu_id);
@@ -37,15 +40,17 @@ instance.account.extend_actionmanager = instance.web.ActionManager.include({
}
this.inner_action = action;
if (action.extended_form_view_id){
this.inner_viewmanager = new instance.account.extend_viewmanager(this, action);
var inner_widget = this.inner_widget = new instance.account.extend_viewmanager(this, action);
}else{
this.inner_viewmanager = new instance.web.ViewManagerAction(this, action);
var inner_widget = this.inner_widget = new instance.web.ViewManagerAction(this, action);
}
this.inner_viewmanager.appendTo(this.$element);
inner_widget.add_breadcrumb();
this.inner_widget.appendTo(this.$element);
}
},
}
})
instance.account.extend_viewmanager = instance.web.ViewManagerAction.extend({
init: function(parent, action) {
this._super.apply(this, arguments);