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

[MERGE] forward port branch saas-14 up to 67cc7a7c26

Browse Source
This commit is contained in:
Christophe Simonis
2018-02-16 13:57:03 +01:00
parent d952e3678b 67cc7a7c26
commit 3a25ff6ccd
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/report/account_aged_partner_balance.py
+7 -7
View File
@@ -27,7 +27,7 @@ class ReportAgedPartnerBalance(models.AbstractModel):
res = [] res = []
total = [] total = []
cr = self.env.cr cr = self.env.cr
user_company = self.env.user.company_id.id company_ids = self.env.context.get('company_ids', (self.env.user.company_id.id,))
move_state = ['draft', 'posted'] move_state = ['draft', 'posted']
if target_move == 'posted': if target_move == 'posted':
move_state = ['posted'] move_state = ['posted']
@@ -41,7 +41,7 @@ class ReportAgedPartnerBalance(models.AbstractModel):
if reconciled_after_date: if reconciled_after_date:
reconciliation_clause = '(l.reconciled IS FALSE OR l.id IN %s)' reconciliation_clause = '(l.reconciled IS FALSE OR l.id IN %s)'
arg_list += (tuple(reconciled_after_date),) arg_list += (tuple(reconciled_after_date),)
arg_list += (date_from, user_company) arg_list += (date_from, tuple(company_ids))
query = ''' query = '''
SELECT DISTINCT l.partner_id, UPPER(res_partner.name) SELECT DISTINCT l.partner_id, UPPER(res_partner.name)
FROM account_move_line AS l left join res_partner on l.partner_id = res_partner.id, account_account, account_move am FROM account_move_line AS l left join res_partner on l.partner_id = res_partner.id, account_account, account_move am
@@ -51,7 +51,7 @@ class ReportAgedPartnerBalance(models.AbstractModel):
AND (account_account.internal_type IN %s) AND (account_account.internal_type IN %s)
AND ''' + reconciliation_clause + ''' AND ''' + reconciliation_clause + '''
AND (l.date <= %s) AND (l.date <= %s)
AND l.company_id = %s AND l.company_id IN %s
ORDER BY UPPER(res_partner.name)''' ORDER BY UPPER(res_partner.name)'''
cr.execute(query, arg_list) cr.execute(query, arg_list)
@@ -76,8 +76,8 @@ class ReportAgedPartnerBalance(models.AbstractModel):
AND (COALESCE(l.date_maturity,l.date) > %s)\ AND (COALESCE(l.date_maturity,l.date) > %s)\
AND ((l.partner_id IN %s) OR (l.partner_id IS NULL)) AND ((l.partner_id IN %s) OR (l.partner_id IS NULL))
AND (l.date <= %s) AND (l.date <= %s)
AND l.company_id = %s''' AND l.company_id IN %s'''
cr.execute(query, (tuple(move_state), tuple(account_type), date_from, tuple(partner_ids), date_from, user_company)) cr.execute(query, (tuple(move_state), tuple(account_type), date_from, tuple(partner_ids), date_from, tuple(company_ids)))
aml_ids = cr.fetchall() aml_ids = cr.fetchall()
aml_ids = aml_ids and [x[0] for x in aml_ids] or [] aml_ids = aml_ids and [x[0] for x in aml_ids] or []
for line in self.env['account.move.line'].browse(aml_ids): for line in self.env['account.move.line'].browse(aml_ids):
@@ -117,7 +117,7 @@ class ReportAgedPartnerBalance(models.AbstractModel):
else: else:
dates_query += ' <= %s)' dates_query += ' <= %s)'
args_list += (periods[str(i)]['stop'],) args_list += (periods[str(i)]['stop'],)
args_list += (date_from, user_company) args_list += (date_from, tuple(company_ids))
query = '''SELECT l.id query = '''SELECT l.id
FROM account_move_line AS l, account_account, account_move am FROM account_move_line AS l, account_account, account_move am
@@ -127,7 +127,7 @@ class ReportAgedPartnerBalance(models.AbstractModel):
AND ((l.partner_id IN %s) OR (l.partner_id IS NULL)) AND ((l.partner_id IN %s) OR (l.partner_id IS NULL))
AND ''' + dates_query + ''' AND ''' + dates_query + '''
AND (l.date <= %s) AND (l.date <= %s)
AND l.company_id = %s''' AND l.company_id IN %s'''
cr.execute(query, args_list) cr.execute(query, args_list)
partners_amount = {} partners_amount = {}
aml_ids = cr.fetchall() aml_ids = cr.fetchall()
addons/stock_account/models/product.py
+2 -2
View File
@@ -178,7 +178,7 @@ class ProductProduct(models.Model):
'product_id': product.id, 'product_id': product.id,
'uom_id': uom.id, 'uom_id': uom.id,
'account_analytic_id': account_analytic and account_analytic.id, 'account_analytic_id': account_analytic and account_analytic.id,
'analytic_tag_ids': analytic_tags and analytic_tag.ids and [(6, 0, analytic_tag.ids)] or False, 'analytic_tag_ids': analytic_tags and analytic_tags.ids and [(6, 0, analytic_tags.ids)] or False,
}, },
{ {
@@ -203,7 +203,7 @@ class ProductProduct(models.Model):
price = self.standard_price price = self.standard_price
if not uom or self.uom_id.id == uom.id: if not uom or self.uom_id.id == uom.id:
return price return price
return self.uom_id._compute_price(self.uom_id.id, price, to_uom_id=uom.id) return self.uom_id._compute_price(price, uom)
class ProductCategory(models.Model): class ProductCategory(models.Model):