[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9969 revid:dle@openerp.com-20140409162932-y5fxd5wbojing2t2
bzr revid: dle@openerp.com-20140409163132-n3apqh6nvfg2qof9
This commit is contained in:
commit
7715bf1823
|
@ -328,7 +328,7 @@ class account_asset_asset(osv.osv):
|
||||||
default = {}
|
default = {}
|
||||||
if context is None:
|
if context is None:
|
||||||
context = {}
|
context = {}
|
||||||
default.update({'depreciation_line_ids': [], 'state': 'draft'})
|
default.update({'depreciation_line_ids': [], 'account_move_line_ids': [], 'history_ids': [], 'state': 'draft'})
|
||||||
return super(account_asset_asset, self).copy(cr, uid, id, default, context=context)
|
return super(account_asset_asset, self).copy(cr, uid, id, default, context=context)
|
||||||
|
|
||||||
def _compute_entries(self, cr, uid, ids, period_id, context=None):
|
def _compute_entries(self, cr, uid, ids, period_id, context=None):
|
||||||
|
|
|
@ -26,6 +26,7 @@ import openerp.addons.decimal_precision as dp
|
||||||
class analytic_user_funct_grid(osv.osv):
|
class analytic_user_funct_grid(osv.osv):
|
||||||
_name="analytic.user.funct.grid"
|
_name="analytic.user.funct.grid"
|
||||||
_description= "Price per User"
|
_description= "Price per User"
|
||||||
|
_rec_name="user_id"
|
||||||
_columns={
|
_columns={
|
||||||
'user_id': fields.many2one("res.users", "User", required=True,),
|
'user_id': fields.many2one("res.users", "User", required=True,),
|
||||||
'product_id': fields.many2one("product.product", "Service", required=True,),
|
'product_id': fields.many2one("product.product", "Service", required=True,),
|
||||||
|
|
|
@ -13,6 +13,7 @@ openerp.pad = function(instance) {
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
self.set("configured", true);
|
self.set("configured", true);
|
||||||
});
|
});
|
||||||
|
this.pad_loading_request = null;
|
||||||
},
|
},
|
||||||
initialize_content: function() {
|
initialize_content: function() {
|
||||||
var self = this;
|
var self = this;
|
||||||
|
@ -30,14 +31,14 @@ openerp.pad = function(instance) {
|
||||||
},
|
},
|
||||||
render_value: function() {
|
render_value: function() {
|
||||||
var self = this;
|
var self = this;
|
||||||
this._configured_deferred.always(function() {
|
$.when(this._configured_deferred, this.pad_loading_request).always(function() {
|
||||||
if (! self.get('configured')) {
|
if (! self.get('configured')) {
|
||||||
return;
|
return;
|
||||||
};
|
};
|
||||||
var value = self.get('value');
|
var value = self.get('value');
|
||||||
if (self.get('effective_readonly')) {
|
if (self.get('effective_readonly')) {
|
||||||
if (_.str.startsWith(value, 'http')) {
|
if (_.str.startsWith(value, 'http')) {
|
||||||
this.pad_loading_request = self.view.dataset.call('pad_get_content', {url: value}).done(function(data) {
|
self.pad_loading_request = self.view.dataset.call('pad_get_content', {url: value}).done(function(data) {
|
||||||
self.$('.oe_pad_content').removeClass('oe_pad_loading').html('<div class="oe_pad_readonly"><div>');
|
self.$('.oe_pad_content').removeClass('oe_pad_loading').html('<div class="oe_pad_readonly"><div>');
|
||||||
self.$('.oe_pad_readonly').html(data);
|
self.$('.oe_pad_readonly').html(data);
|
||||||
}).fail(function() {
|
}).fail(function() {
|
||||||
|
|
|
@ -105,33 +105,8 @@
|
||||||
<images/>
|
<images/>
|
||||||
</stylesheet>
|
</stylesheet>
|
||||||
<story>
|
<story>
|
||||||
<pto>
|
|
||||||
<para style="terp_default_8">[[repeatIn(objects,'o')]]</para>
|
<para style="terp_default_8">[[repeatIn(objects,'o')]]</para>
|
||||||
<para style="terp_default_8">[[ setLang(o.partner_id.lang) ]]</para>
|
<para style="terp_default_8">[[ setLang(o.partner_id.lang) ]]</para>
|
||||||
<pto_header>
|
|
||||||
<blockTable colWidths="181.0,70.0,80.0,70.0,50.0,85.0" repeatRows="1" style="Table4">
|
|
||||||
<tr>
|
|
||||||
<td>
|
|
||||||
<para style="terp_tblheader_Details"><b>Description</b></para>
|
|
||||||
</td>
|
|
||||||
<td>
|
|
||||||
<para style="terp_tblheader_Details_Centre"><b>Tax</b></para>
|
|
||||||
</td>
|
|
||||||
<td>
|
|
||||||
<para style="terp_tblheader_Details_Right"><b>Quantity</b></para>
|
|
||||||
</td>
|
|
||||||
<td>
|
|
||||||
<para style="terp_tblheader_Details_Right"><b>Unit Price</b></para>
|
|
||||||
</td>
|
|
||||||
<td>
|
|
||||||
<para style="terp_tblheader_Details_Centre"><b>Disc.(%)</b></para>
|
|
||||||
</td>
|
|
||||||
<td>
|
|
||||||
<para style="terp_tblheader_Details_Right"><b>Price</b></para>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
</blockTable>
|
|
||||||
</pto_header>
|
|
||||||
<para style="terp_default_8">
|
<para style="terp_default_8">
|
||||||
<font color="white"> </font>
|
<font color="white"> </font>
|
||||||
</para>
|
</para>
|
||||||
|
@ -215,6 +190,31 @@
|
||||||
<para style="terp_default_8">
|
<para style="terp_default_8">
|
||||||
<font color="white"> </font>
|
<font color="white"> </font>
|
||||||
</para>
|
</para>
|
||||||
|
<pto>
|
||||||
|
<pto_header>
|
||||||
|
<blockTable colWidths="181.0,70.0,80.0,70.0,50.0,85.0" repeatRows="1" style="Table4">
|
||||||
|
<tr>
|
||||||
|
<td>
|
||||||
|
<para style="terp_tblheader_Details"><b>Description</b></para>
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
<para style="terp_tblheader_Details_Centre"><b>VAT</b></para>
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
<para style="terp_tblheader_Details_Right"><b>Quantity</b></para>
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
<para style="terp_tblheader_Details_Right"><b>Unit Price</b></para>
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
<para style="terp_tblheader_Details_Centre"><b>Disc.(%)</b></para>
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
<para style="terp_tblheader_Details_Right"><b>Price</b></para>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</blockTable>
|
||||||
|
</pto_header>
|
||||||
<blockTable colWidths="181.0,70.0,80.0,70.0,50.0,85.0" repeatRows="1" style="Table4">
|
<blockTable colWidths="181.0,70.0,80.0,70.0,50.0,85.0" repeatRows="1" style="Table4">
|
||||||
<tr>
|
<tr>
|
||||||
<td>
|
<td>
|
||||||
|
@ -262,6 +262,7 @@
|
||||||
</tr>
|
</tr>
|
||||||
</blockTable>
|
</blockTable>
|
||||||
</section>
|
</section>
|
||||||
|
</pto>
|
||||||
<blockTable colWidths="381.0,60.0,93.0" style="Table6">
|
<blockTable colWidths="381.0,60.0,93.0" style="Table6">
|
||||||
<tr>
|
<tr>
|
||||||
<td>
|
<td>
|
||||||
|
@ -317,6 +318,5 @@
|
||||||
<para style="terp_default_8">
|
<para style="terp_default_8">
|
||||||
<font color="white"> </font>
|
<font color="white"> </font>
|
||||||
</para>
|
</para>
|
||||||
</pto>
|
|
||||||
</story>
|
</story>
|
||||||
</document>
|
</document>
|
||||||
|
|
Loading…
Reference in New Issue