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

[MERGE] forward port branch 9.0 up to c7b1712

Browse Source
This commit is contained in:
Christophe Simonis
2016-11-22 17:35:59 +01:00
parent dcf50bf242 c7b1712592
commit 2633bb4853
4 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/models/account_move.py
+1 -1
View File
@@ -54,7 +54,7 @@ class AccountMove(models.Model):
total_amount += amount total_amount += amount
for partial_line in (line.matched_debit_ids + line.matched_credit_ids): for partial_line in (line.matched_debit_ids + line.matched_credit_ids):
total_reconciled += partial_line.amount total_reconciled += partial_line.amount
if total_amount == 0.0: if float_is_zero(total_amount, precision_rounding=move.currency_id.rounding):
move.matched_percentage = 1.0 move.matched_percentage = 1.0
else: else:
move.matched_percentage = total_reconciled / total_amount move.matched_percentage = total_reconciled / total_amount
addons/account_tax_cash_basis/tax_cash_basis.py
+5 -5
View File
@@ -53,7 +53,7 @@ class AccountPartialReconcileCashBasis(models.Model):
#create reporting issues. Not sure of the behavior to implement in that case, though. #create reporting issues. Not sure of the behavior to implement in that case, though.
# amount to write is the current cash_basis amount minus the one before the reconciliation # amount to write is the current cash_basis amount minus the one before the reconciliation
matched_percentage = value_before_reconciliation[move.id] matched_percentage = value_before_reconciliation[move.id]
amount = (line.credit_cash_basis - line.debit_cash_basis) - (line.credit - line.debit) * matched_percentage amount = line.currency_id.round((line.credit_cash_basis - line.debit_cash_basis) - (line.credit - line.debit) * matched_percentage)
if not self._check_tax_exigible(line): if not self._check_tax_exigible(line):
if line.tax_line_id and line.tax_line_id.use_cash_basis: if line.tax_line_id and line.tax_line_id.use_cash_basis:
# group by line account # group by line account
@@ -73,15 +73,15 @@ class AccountPartialReconcileCashBasis(models.Model):
for tax in line.tax_ids: for tax in line.tax_ids:
line_to_create.append((0, 0, { line_to_create.append((0, 0, {
'name': '/', 'name': '/',
'debit': line.debit_cash_basis - line.debit * matched_percentage, 'debit': line.currency_id.round(line.debit_cash_basis - line.debit * matched_percentage),
'credit': line.credit_cash_basis - line.credit * matched_percentage, 'credit': line.currency_id.round(line.credit_cash_basis - line.credit * matched_percentage),
'account_id': line.account_id.id, 'account_id': line.account_id.id,
'tax_ids': [(6, 0, [tax.id])], 'tax_ids': [(6, 0, [tax.id])],
})) }))
line_to_create.append((0, 0, { line_to_create.append((0, 0, {
'name': '/', 'name': '/',
'credit': line.debit_cash_basis - line.debit * matched_percentage, 'credit': line.currency_id.round(line.debit_cash_basis - line.debit * matched_percentage),
'debit': line.credit_cash_basis - line.credit * matched_percentage, 'debit': line.currency_id.round(line.credit_cash_basis - line.credit * matched_percentage),
'account_id': line.account_id.id, 'account_id': line.account_id.id,
})) }))
addons/web_tip/static/src/js/tip.js
+2
View File
@@ -300,6 +300,8 @@ var Tip = Class.extend({
if (this.$element) { if (this.$element) {
this.$element.popover('destroy'); this.$element.popover('destroy');
this.$element.removeClass('oe_tip_show_element'); this.$element.removeClass('oe_tip_show_element');
}
if (this.$breathing) {
this.$breathing.off().remove(); this.$breathing.off().remove();
} }
if (this.$helper) { if (this.$helper) {
addons/website/models/website.py
+4 -4
View File
@@ -564,12 +564,12 @@ class website(osv.osv):
def search_pages(self, cr, uid, ids, needle=None, limit=None, context=None): def search_pages(self, cr, uid, ids, needle=None, limit=None, context=None):
name = re.sub(r"^/p(a(g(e(/(w(e(b(s(i(t(e(\.)?)?)?)?)?)?)?)?)?)?)?)?", "", needle or "") name = re.sub(r"^/p(a(g(e(/(w(e(b(s(i(t(e(\.)?)?)?)?)?)?)?)?)?)?)?)?", "", needle or "")
name = slugify(name, max_length=50)
res = [] res = []
for page in self.enumerate_pages(cr, uid, ids, query_string=name, context=context): for page in self.enumerate_pages(cr, uid, ids, query_string=name, context=context):
if needle in page['loc']: res.append(page)
res.append(page) if len(res) == limit:
if len(res) == limit: break
break
return res return res
def image_url(self, cr, uid, record, field, size=None, context=None): def image_url(self, cr, uid, record, field, size=None, context=None):