From f7dc60e5bad55a23c5e224a33af30048a0cdf349 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Thu, 20 May 2010 11:05:34 +0200 Subject: [PATCH 01/48] account general ledger, landscape to use the same code as plain bzr revid: al@openerp.com-20100520090534-a8907qrm4ny9fv3v --- addons/account/report/__init__.py | 1 - addons/account/report/general_ledger.py | 3 + .../report/general_ledger_landscape.py | 396 ------------------ 3 files changed, 3 insertions(+), 397 deletions(-) delete mode 100644 addons/account/report/general_ledger_landscape.py diff --git a/addons/account/report/__init__.py b/addons/account/report/__init__.py index b411e404cac..5d1d7a33c97 100644 --- a/addons/account/report/__init__.py +++ b/addons/account/report/__init__.py @@ -30,7 +30,6 @@ import invoice import overdue import aged_trial_balance import tax_report -import general_ledger_landscape import account_tax_code import account_balance_landscape import compare_account_balance diff --git a/addons/account/report/general_ledger.py b/addons/account/report/general_ledger.py index 00031a77ed8..d1123263bdb 100644 --- a/addons/account/report/general_ledger.py +++ b/addons/account/report/general_ledger.py @@ -51,6 +51,7 @@ class general_ledger(rml_parse.rml_parse): def __init__(self, cr, uid, name, context): super(general_ledger, self).__init__(cr, uid, name, context=context) + cr.sql_log=1 self.date_borne = {} self.query = "" self.child_ids = "" @@ -394,4 +395,6 @@ class general_ledger(rml_parse.rml_parse): report_sxw.report_sxw('report.account.general.ledger', 'account.account', 'addons/account/report/general_ledger.rml', parser=general_ledger, header=False) +report_sxw.report_sxw('report.account.general.ledger_landscape', 'account.account', 'addons/account/report/general_ledger_landscape.rml', parser=general_ledger, header=False) + # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account/report/general_ledger_landscape.py b/addons/account/report/general_ledger_landscape.py deleted file mode 100644 index 472f0675519..00000000000 --- a/addons/account/report/general_ledger_landscape.py +++ /dev/null @@ -1,396 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# Copyright (c) 2005-2006 CamptoCamp -# -# WARNING: This program as such is intended to be used by professional -# programmers who take the whole responsability of assessing all potential -# consequences resulting from its eventual inadequacies and bugs -# End users who are looking for a ready-to-use solution with commercial -# garantees and support are strongly adviced to contract a Free Software -# Service Company -# -# This program is Free Software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -############################################################################## - -import time -from report import report_sxw -import xml -import rml_parse -import pooler - -class general_ledger_landscape(rml_parse.rml_parse): - _name = 'report.account.general.ledger_landscape' - - - def set_context(self, objects, data, ids, report_type = None): - ## - self.borne_date = self.get_min_date(data['form']) - ## - new_ids = [] - if (data['model'] == 'account.account'): - new_ids = 'active_ids' in data['form']['context'] and data['form']['context']['active_ids'] or [] - else: - new_ids.append(data['form']['Account_list']) - objects = self.pool.get('account.account').browse(self.cr, self.uid, new_ids) - super(general_ledger_landscape, self).set_context(objects, data, new_ids,report_type) - - def __init__(self, cr, uid, name, context): - super(general_ledger_landscape, self).__init__(cr, uid, name, context=context) - self.date_borne = {} - self.query = "" - self.child_ids = "" - self.tot_currency = 0.0 - self.period_sql = "" - self.sold_accounts = {} - self.localcontext.update( { - 'time': time, - 'lines': self.lines, - 'sum_debit_account': self._sum_debit_account, - 'sum_credit_account': self._sum_credit_account, - 'sum_solde_account': self._sum_solde_account, - 'sum_debit': self._sum_debit, - 'sum_credit': self._sum_credit, - 'sum_solde': self._sum_solde, - 'get_children_accounts': self.get_children_accounts, - 'sum_currency_amount_account': self._sum_currency_amount_account - }) - self.context = context - def _calc_contrepartie(self,cr,uid,ids, context={}): - result = {} - #for id in ids: - # result.setdefault(id, False) - - for account_line in self.pool.get('account.move.line').browse(cr, uid, ids, context): - # For avoid long text in the field we will limit it to 5 lines - # - # - # - result[account_line.id] = ' ' - num_id_move = account_line.move_id.id - num_id_line = account_line.id - account_id = account_line.account_id.id - # search the basic account - # We have the account ID we will search all account move line from now until this time - # We are in the case of we are on the top of the account move Line - cr.execute('SELECT distinct(ac.code) as code_rest,ac.name as name_rest from account_account AS ac, account_move_line mv\ - where ac.id = mv.account_id and mv.move_id = %s and mv.account_id <> %s' , (num_id_move,account_id,)) - res_mv = cr.dictfetchall() - # we need a result more than 2 line to make the test so we will made the the on 1 because we have exclude the current line - if (len(res_mv) >=1): - concat = '' - rup_id = 0 - for move_rest in res_mv: - concat = concat + move_rest['code_rest'] + '|' - result[account_line.id] = concat - if rup_id >5: - # we need to stop the computing and to escape but before we will add "..." - result[account_line.id] = concat + '...' - break - rup_id+=1 - return result - - def get_min_date(self,form): - - ## Get max born from account_fiscal year - # - sql = """ select min(fy.date_start) as start_date,max(fy.date_stop) as stop_date from account_fiscalyear - As fy where fy.state <> 'close' - """ - self.cr.execute(sql) - res = self.cr.dictfetchall() - borne_min = res[0]['start_date'] - borne_max = res[0]['stop_date'] - if form['state'] == 'byperiod': - ## This function will return the most aged date - periods = form['periods'] - if not periods: - self.cr.execute(""" - Select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.fiscalyear_id = %s""" ,(form['fiscalyear'],)) - else: - self.cr.execute(""" - Select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.id =ANY(%s)""",(periods,)) - - res = self.cr.dictfetchall() - borne_min = res[0]['start_date'] - borne_max = res[0]['stop_date'] - elif form['state'] == 'bydate': - borne_min = form['date_from'] - borne_max = form['date_to'] - elif form['state'] == 'all': - periods = form['periods'] - if not periods: - if form['fiscalyear'] == False: - fiscalyears = self.pool.get('account.fiscalyear').search(self.cr, self.uid, [('state', '=', 'draft')]) - else: - fiscalyears = [form['fiscalyear']] - self.cr.execute("select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.fiscalyear_id =ANY(%s)" ,(fiscalyears,)) - else: - self.cr.execute(""" - Select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.id =ANY(%s)""",(periods,)) - res = self.cr.dictfetchall() - period_min = res[0]['start_date'] - period_max = res[0]['stop_date'] - date_min = form['date_from'] - date_max = form['date_to'] - if period_min=',child_account.id)], - context=ctx)) <> 0 : - res.append(child_account) - ## - if not len(res): - - return [account] - else: - ## We will now compute solde initiaux - for move in res: - self.cr.execute("""SELECT sum(l.debit) AS sum_debit, sum(l.credit) AS sum_credit FROM account_move_line l \ - WHERE l.account_id = %s AND l.date < %s AND l.date > %s""",(move.id,self.borne_date['max_date'],self.borne_date['min_date'])) - resultat = self.cr.dictfetchall() - if resultat[0] : - if resultat[0]['sum_debit'] == None: - sum_debit = 0 - else: - sum_debit = resultat[0]['sum_debit'] - if resultat[0]['sum_credit'] == None: - sum_credit = 0 - else: - sum_credit = resultat[0]['sum_credit'] - - move.init_credit = sum_credit - move.init_debit = sum_debit - - else: - move.init_credit = 0 - move.init_debit = 0 - - - return res - - def lines(self, account, form): - inv_types = { - 'out_invoice': 'CI: ', - 'in_invoice': 'SI: ', - 'out_refund': 'OR: ', - 'in_refund': 'SR: ', - } - - if form['sortbydate'] == 'sort_date': - sorttag = 'l.date' - else: - sorttag = 'j.code' - sql = """ - SELECT l.id, l.date, j.code,c.code AS currency_code,l.amount_currency,l.ref, l.name , COALESCE(l.debit,0) as debit, COALESCE(l.credit,0) as credit, l.period_id - FROM account_move_line as l - LEFT JOIN res_currency c on (l.currency_id=c.id) - JOIN account_journal j on (l.journal_id=j.id) - AND account_id = %%s - AND %s - WHERE l.date<=%%s - AND l.date>=%%s - ORDER by %s""" % (self.query, sorttag) - - self.cr.execute(sql, (account.id, self.date_borne['max_date'], self.date_borne['min_date'],)) - - res = self.cr.dictfetchall() - sum = 0.0 - account_move_line_obj = pooler.get_pool(self.cr.dbname).get('account.move.line') - for l in res: - line = self.pool.get('account.move.line').browse(self.cr, self.uid, l['id']) - l['move'] = line.move_id.name - self.cr.execute('Select id from account_invoice where move_id =%s',(line.move_id.id,)) - tmpres = self.cr.dictfetchall() - if len(tmpres) > 0 : - inv = self.pool.get('account.invoice').browse(self.cr, self.uid, tmpres[0]['id']) - l['ref'] = inv_types[inv.type] + ': '+str(inv.number) - if line.partner_id : - l['partner'] = line.partner_id.name - else : - l['partner'] = '' - sum = l['debit'] - l ['credit'] -# c = time.strptime(l['date'],"%Y-%m-%d") -# l['date'] = time.strftime("%d-%m-%Y",c) - l['progress'] = sum - l['line_corresp'] = self._calc_contrepartie(self.cr,self.uid,[l['id']])[l['id']] - # Modification du amount Currency - if (l['credit'] > 0): - if l['amount_currency'] != None: - l['amount_currency'] = abs(l['amount_currency']) * -1 - - # - if l['amount_currency'] != None: - self.tot_currency = self.tot_currency + l['amount_currency'] - return res - - def _sum_debit_account(self, account, form): - - self.cr.execute("SELECT sum(debit) "\ - "FROM account_move_line l "\ - "WHERE l.account_id = %s AND "+self.query,(account.id,)) - ## Add solde init to the result - # - sum_debit = self.cr.fetchone()[0] or 0.0 - if form['soldeinit']: - sum_debit += account.init_debit - # - ## - return sum_debit - - def _sum_credit_account(self, account, form): - - self.cr.execute("SELECT sum(credit) "\ - "FROM account_move_line l "\ - "WHERE l.account_id = %s AND "+self.query,(account.id,)) - ## Add solde init to the result - # - sum_credit = self.cr.fetchone()[0] or 0.0 - if form['soldeinit']: - sum_credit += account.init_credit - # - ## - - return sum_credit - - def _sum_solde_account(self, account, form): - self.cr.execute("SELECT (sum(debit) - sum(credit)) as tot_solde "\ - "FROM account_move_line l "\ - "WHERE l.account_id = %s AND "+self.query,(account.id,)) - sum_solde = self.cr.fetchone()[0] or 0.0 - if form.get('soldeinit',False): - sum_solde += account.init_debit - account.init_credit - - return sum_solde - - def _sum_debit(self, form): - if not self.ids: - return 0.0 - self.cr.execute("SELECT sum(debit) "\ - "FROM account_move_line l "\ - "WHERE l.account_id =ANY(%s) AND "+self.query,(self.child_ids,)) - sum_debit = self.cr.fetchone()[0] or 0.0 - return sum_debit - - def _sum_credit(self, form): - if not self.ids: - return 0.0 - self.cr.execute("SELECT sum(credit) "\ - "FROM account_move_line l "\ - "WHERE l.account_id =ANY(%s) AND "+self.query,(self.child_ids,)) - ## Add solde init to the result - # - sum_credit = self.cr.fetchone()[0] or 0.0 - return sum_credit - - def _sum_solde(self, form): - if not self.ids: - return 0.0 - self.cr.execute("SELECT (sum(debit) - sum(credit)) as tot_solde "\ - "FROM account_move_line l "\ - "WHERE l.account_id =ANY(%s) AND "+self.query,(self.child_ids,)) - sum_solde = self.cr.fetchone()[0] or 0.0 - return sum_solde - - def _set_get_account_currency_code(self, account_id): - self.cr.execute("SELECT c.code as code "\ - "FROM res_currency c,account_account as ac "\ - "WHERE ac.id = %s AND ac.currency_id = c.id",(account_id,)) - result = self.cr.fetchone() - if result: - self.account_currency = result[0] - else: - self.account_currency = False - - def _sum_currency_amount_account(self, account, form): - self._set_get_account_currency_code(account.id) - self.cr.execute("SELECT sum(aml.amount_currency) FROM account_move_line as aml,res_currency as rc WHERE aml.currency_id = rc.id AND aml.account_id= %s ", (account.id,)) - total = self.cr.fetchone() - - if self.account_currency: - return_field = str(total[0]) + self.account_currency - return return_field - else: - currency_total = self.tot_currency = 0.0 - return currency_total - -report_sxw.report_sxw('report.account.general.ledger_landscape', 'account.account', 'addons/account/report/general_ledger_landscape.rml', parser=general_ledger_landscape, header=False) -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From 5356d960aa559315fedcca98a946c6710b99919e Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Thu, 20 May 2010 11:05:34 +0200 Subject: [PATCH 02/48] account general ledger, landscape to use the same code as plain bzr revid: al@openerp.com-20100520090534-2dx8cv5ha5f8nl97 --- addons/account/report/__init__.py | 1 - addons/account/report/general_ledger.py | 3 + .../report/general_ledger_landscape.py | 396 ------------------ 3 files changed, 3 insertions(+), 397 deletions(-) delete mode 100644 addons/account/report/general_ledger_landscape.py diff --git a/addons/account/report/__init__.py b/addons/account/report/__init__.py index 09ff866d1a8..37508b3d9a4 100644 --- a/addons/account/report/__init__.py +++ b/addons/account/report/__init__.py @@ -30,7 +30,6 @@ import invoice import overdue import aged_trial_balance import tax_report -import general_ledger_landscape import account_tax_code import account_balance_landscape import compare_account_balance diff --git a/addons/account/report/general_ledger.py b/addons/account/report/general_ledger.py index 00031a77ed8..d1123263bdb 100644 --- a/addons/account/report/general_ledger.py +++ b/addons/account/report/general_ledger.py @@ -51,6 +51,7 @@ class general_ledger(rml_parse.rml_parse): def __init__(self, cr, uid, name, context): super(general_ledger, self).__init__(cr, uid, name, context=context) + cr.sql_log=1 self.date_borne = {} self.query = "" self.child_ids = "" @@ -394,4 +395,6 @@ class general_ledger(rml_parse.rml_parse): report_sxw.report_sxw('report.account.general.ledger', 'account.account', 'addons/account/report/general_ledger.rml', parser=general_ledger, header=False) +report_sxw.report_sxw('report.account.general.ledger_landscape', 'account.account', 'addons/account/report/general_ledger_landscape.rml', parser=general_ledger, header=False) + # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account/report/general_ledger_landscape.py b/addons/account/report/general_ledger_landscape.py deleted file mode 100644 index 472f0675519..00000000000 --- a/addons/account/report/general_ledger_landscape.py +++ /dev/null @@ -1,396 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# Copyright (c) 2005-2006 CamptoCamp -# -# WARNING: This program as such is intended to be used by professional -# programmers who take the whole responsability of assessing all potential -# consequences resulting from its eventual inadequacies and bugs -# End users who are looking for a ready-to-use solution with commercial -# garantees and support are strongly adviced to contract a Free Software -# Service Company -# -# This program is Free Software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -############################################################################## - -import time -from report import report_sxw -import xml -import rml_parse -import pooler - -class general_ledger_landscape(rml_parse.rml_parse): - _name = 'report.account.general.ledger_landscape' - - - def set_context(self, objects, data, ids, report_type = None): - ## - self.borne_date = self.get_min_date(data['form']) - ## - new_ids = [] - if (data['model'] == 'account.account'): - new_ids = 'active_ids' in data['form']['context'] and data['form']['context']['active_ids'] or [] - else: - new_ids.append(data['form']['Account_list']) - objects = self.pool.get('account.account').browse(self.cr, self.uid, new_ids) - super(general_ledger_landscape, self).set_context(objects, data, new_ids,report_type) - - def __init__(self, cr, uid, name, context): - super(general_ledger_landscape, self).__init__(cr, uid, name, context=context) - self.date_borne = {} - self.query = "" - self.child_ids = "" - self.tot_currency = 0.0 - self.period_sql = "" - self.sold_accounts = {} - self.localcontext.update( { - 'time': time, - 'lines': self.lines, - 'sum_debit_account': self._sum_debit_account, - 'sum_credit_account': self._sum_credit_account, - 'sum_solde_account': self._sum_solde_account, - 'sum_debit': self._sum_debit, - 'sum_credit': self._sum_credit, - 'sum_solde': self._sum_solde, - 'get_children_accounts': self.get_children_accounts, - 'sum_currency_amount_account': self._sum_currency_amount_account - }) - self.context = context - def _calc_contrepartie(self,cr,uid,ids, context={}): - result = {} - #for id in ids: - # result.setdefault(id, False) - - for account_line in self.pool.get('account.move.line').browse(cr, uid, ids, context): - # For avoid long text in the field we will limit it to 5 lines - # - # - # - result[account_line.id] = ' ' - num_id_move = account_line.move_id.id - num_id_line = account_line.id - account_id = account_line.account_id.id - # search the basic account - # We have the account ID we will search all account move line from now until this time - # We are in the case of we are on the top of the account move Line - cr.execute('SELECT distinct(ac.code) as code_rest,ac.name as name_rest from account_account AS ac, account_move_line mv\ - where ac.id = mv.account_id and mv.move_id = %s and mv.account_id <> %s' , (num_id_move,account_id,)) - res_mv = cr.dictfetchall() - # we need a result more than 2 line to make the test so we will made the the on 1 because we have exclude the current line - if (len(res_mv) >=1): - concat = '' - rup_id = 0 - for move_rest in res_mv: - concat = concat + move_rest['code_rest'] + '|' - result[account_line.id] = concat - if rup_id >5: - # we need to stop the computing and to escape but before we will add "..." - result[account_line.id] = concat + '...' - break - rup_id+=1 - return result - - def get_min_date(self,form): - - ## Get max born from account_fiscal year - # - sql = """ select min(fy.date_start) as start_date,max(fy.date_stop) as stop_date from account_fiscalyear - As fy where fy.state <> 'close' - """ - self.cr.execute(sql) - res = self.cr.dictfetchall() - borne_min = res[0]['start_date'] - borne_max = res[0]['stop_date'] - if form['state'] == 'byperiod': - ## This function will return the most aged date - periods = form['periods'] - if not periods: - self.cr.execute(""" - Select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.fiscalyear_id = %s""" ,(form['fiscalyear'],)) - else: - self.cr.execute(""" - Select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.id =ANY(%s)""",(periods,)) - - res = self.cr.dictfetchall() - borne_min = res[0]['start_date'] - borne_max = res[0]['stop_date'] - elif form['state'] == 'bydate': - borne_min = form['date_from'] - borne_max = form['date_to'] - elif form['state'] == 'all': - periods = form['periods'] - if not periods: - if form['fiscalyear'] == False: - fiscalyears = self.pool.get('account.fiscalyear').search(self.cr, self.uid, [('state', '=', 'draft')]) - else: - fiscalyears = [form['fiscalyear']] - self.cr.execute("select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.fiscalyear_id =ANY(%s)" ,(fiscalyears,)) - else: - self.cr.execute(""" - Select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.id =ANY(%s)""",(periods,)) - res = self.cr.dictfetchall() - period_min = res[0]['start_date'] - period_max = res[0]['stop_date'] - date_min = form['date_from'] - date_max = form['date_to'] - if period_min=',child_account.id)], - context=ctx)) <> 0 : - res.append(child_account) - ## - if not len(res): - - return [account] - else: - ## We will now compute solde initiaux - for move in res: - self.cr.execute("""SELECT sum(l.debit) AS sum_debit, sum(l.credit) AS sum_credit FROM account_move_line l \ - WHERE l.account_id = %s AND l.date < %s AND l.date > %s""",(move.id,self.borne_date['max_date'],self.borne_date['min_date'])) - resultat = self.cr.dictfetchall() - if resultat[0] : - if resultat[0]['sum_debit'] == None: - sum_debit = 0 - else: - sum_debit = resultat[0]['sum_debit'] - if resultat[0]['sum_credit'] == None: - sum_credit = 0 - else: - sum_credit = resultat[0]['sum_credit'] - - move.init_credit = sum_credit - move.init_debit = sum_debit - - else: - move.init_credit = 0 - move.init_debit = 0 - - - return res - - def lines(self, account, form): - inv_types = { - 'out_invoice': 'CI: ', - 'in_invoice': 'SI: ', - 'out_refund': 'OR: ', - 'in_refund': 'SR: ', - } - - if form['sortbydate'] == 'sort_date': - sorttag = 'l.date' - else: - sorttag = 'j.code' - sql = """ - SELECT l.id, l.date, j.code,c.code AS currency_code,l.amount_currency,l.ref, l.name , COALESCE(l.debit,0) as debit, COALESCE(l.credit,0) as credit, l.period_id - FROM account_move_line as l - LEFT JOIN res_currency c on (l.currency_id=c.id) - JOIN account_journal j on (l.journal_id=j.id) - AND account_id = %%s - AND %s - WHERE l.date<=%%s - AND l.date>=%%s - ORDER by %s""" % (self.query, sorttag) - - self.cr.execute(sql, (account.id, self.date_borne['max_date'], self.date_borne['min_date'],)) - - res = self.cr.dictfetchall() - sum = 0.0 - account_move_line_obj = pooler.get_pool(self.cr.dbname).get('account.move.line') - for l in res: - line = self.pool.get('account.move.line').browse(self.cr, self.uid, l['id']) - l['move'] = line.move_id.name - self.cr.execute('Select id from account_invoice where move_id =%s',(line.move_id.id,)) - tmpres = self.cr.dictfetchall() - if len(tmpres) > 0 : - inv = self.pool.get('account.invoice').browse(self.cr, self.uid, tmpres[0]['id']) - l['ref'] = inv_types[inv.type] + ': '+str(inv.number) - if line.partner_id : - l['partner'] = line.partner_id.name - else : - l['partner'] = '' - sum = l['debit'] - l ['credit'] -# c = time.strptime(l['date'],"%Y-%m-%d") -# l['date'] = time.strftime("%d-%m-%Y",c) - l['progress'] = sum - l['line_corresp'] = self._calc_contrepartie(self.cr,self.uid,[l['id']])[l['id']] - # Modification du amount Currency - if (l['credit'] > 0): - if l['amount_currency'] != None: - l['amount_currency'] = abs(l['amount_currency']) * -1 - - # - if l['amount_currency'] != None: - self.tot_currency = self.tot_currency + l['amount_currency'] - return res - - def _sum_debit_account(self, account, form): - - self.cr.execute("SELECT sum(debit) "\ - "FROM account_move_line l "\ - "WHERE l.account_id = %s AND "+self.query,(account.id,)) - ## Add solde init to the result - # - sum_debit = self.cr.fetchone()[0] or 0.0 - if form['soldeinit']: - sum_debit += account.init_debit - # - ## - return sum_debit - - def _sum_credit_account(self, account, form): - - self.cr.execute("SELECT sum(credit) "\ - "FROM account_move_line l "\ - "WHERE l.account_id = %s AND "+self.query,(account.id,)) - ## Add solde init to the result - # - sum_credit = self.cr.fetchone()[0] or 0.0 - if form['soldeinit']: - sum_credit += account.init_credit - # - ## - - return sum_credit - - def _sum_solde_account(self, account, form): - self.cr.execute("SELECT (sum(debit) - sum(credit)) as tot_solde "\ - "FROM account_move_line l "\ - "WHERE l.account_id = %s AND "+self.query,(account.id,)) - sum_solde = self.cr.fetchone()[0] or 0.0 - if form.get('soldeinit',False): - sum_solde += account.init_debit - account.init_credit - - return sum_solde - - def _sum_debit(self, form): - if not self.ids: - return 0.0 - self.cr.execute("SELECT sum(debit) "\ - "FROM account_move_line l "\ - "WHERE l.account_id =ANY(%s) AND "+self.query,(self.child_ids,)) - sum_debit = self.cr.fetchone()[0] or 0.0 - return sum_debit - - def _sum_credit(self, form): - if not self.ids: - return 0.0 - self.cr.execute("SELECT sum(credit) "\ - "FROM account_move_line l "\ - "WHERE l.account_id =ANY(%s) AND "+self.query,(self.child_ids,)) - ## Add solde init to the result - # - sum_credit = self.cr.fetchone()[0] or 0.0 - return sum_credit - - def _sum_solde(self, form): - if not self.ids: - return 0.0 - self.cr.execute("SELECT (sum(debit) - sum(credit)) as tot_solde "\ - "FROM account_move_line l "\ - "WHERE l.account_id =ANY(%s) AND "+self.query,(self.child_ids,)) - sum_solde = self.cr.fetchone()[0] or 0.0 - return sum_solde - - def _set_get_account_currency_code(self, account_id): - self.cr.execute("SELECT c.code as code "\ - "FROM res_currency c,account_account as ac "\ - "WHERE ac.id = %s AND ac.currency_id = c.id",(account_id,)) - result = self.cr.fetchone() - if result: - self.account_currency = result[0] - else: - self.account_currency = False - - def _sum_currency_amount_account(self, account, form): - self._set_get_account_currency_code(account.id) - self.cr.execute("SELECT sum(aml.amount_currency) FROM account_move_line as aml,res_currency as rc WHERE aml.currency_id = rc.id AND aml.account_id= %s ", (account.id,)) - total = self.cr.fetchone() - - if self.account_currency: - return_field = str(total[0]) + self.account_currency - return return_field - else: - currency_total = self.tot_currency = 0.0 - return currency_total - -report_sxw.report_sxw('report.account.general.ledger_landscape', 'account.account', 'addons/account/report/general_ledger_landscape.rml', parser=general_ledger_landscape, header=False) -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From fa63a050c325f83b3300d79096cc1ebe884d934b Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Thu, 20 May 2010 11:20:05 +0200 Subject: [PATCH 03/48] merge 5.0.10 changes bzr revid: al@openerp.com-20100520092005-i288j8eycd0tudhp --- addons/account/report/general_ledger.py | 60 ++++++++++++++----------- 1 file changed, 33 insertions(+), 27 deletions(-) diff --git a/addons/account/report/general_ledger.py b/addons/account/report/general_ledger.py index d1123263bdb..747a643d598 100644 --- a/addons/account/report/general_ledger.py +++ b/addons/account/report/general_ledger.py @@ -30,6 +30,8 @@ import xml import rml_parse import pooler +from mx.DateTime import * + class general_ledger(rml_parse.rml_parse): _name = 'report.account.general.ledger' @@ -41,7 +43,7 @@ class general_ledger(rml_parse.rml_parse): ## new_ids = [] if (data['model'] == 'account.account'): - new_ids = 'active_ids' in data['form']['context'] and data['form']['context']['active_ids'] or [] + new_ids = ids else: new_ids.append(data['form']['Account_list']) @@ -89,7 +91,7 @@ class general_ledger(rml_parse.rml_parse): # We have the account ID we will search all account move line from now until this time # We are in the case of we are on the top of the account move Line cr.execute('SELECT distinct(ac.code) as code_rest,ac.name as name_rest from account_account AS ac, account_move_line mv\ - where ac.id = mv.account_id and mv.move_id = %s and mv.account_id <> %s' ,(num_id_move,account_id,)) + where ac.id = mv.account_id and mv.move_id = ' + num_id_move +' and mv.account_id <> ' + account_id ) res_mv = cr.dictfetchall() # we need a result more than 2 line to make the test so we will made the the on 1 because we have exclude the current line if (len(res_mv) >=1): @@ -118,13 +120,17 @@ class general_ledger(rml_parse.rml_parse): borne_max = res[0]['stop_date'] if form['state'] == 'byperiod': ## This function will return the most aged date - periods = form['periods'] + periods = form['periods'][0][2] if not periods: - self.cr.execute(""" - Select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.fiscalyear_id = %s""",(form['fiscalyear'],)) + sql = """ + Select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.fiscalyear_id = """ + str(form['fiscalyear']) + """ + """ else: - self.cr.execute(""" - Select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.id =ANY(%s)""",(periods,)) + periods_id = ','.join(map(str, periods)) + sql = """ + Select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.id in ( """ + periods_id + """) + """ + self.cr.execute(sql) res = self.cr.dictfetchall() borne_min = res[0]['start_date'] borne_max = res[0]['stop_date'] @@ -132,16 +138,17 @@ class general_ledger(rml_parse.rml_parse): borne_min = form['date_from'] borne_max = form['date_to'] elif form['state'] == 'all': - periods = form['periods'] + periods = form['periods'][0][2] if not periods: - if form['fiscalyear'] == False: - fiscalyears = self.pool.get('account.fiscalyear').search(self.cr, self.uid, [('state', '=', 'draft')]) - else: - fiscalyears = [form['fiscalyear']] - self.cr.execute("select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.fiscalyear_id =ANY(%s)" ,(fiscalyears,)) + sql = """ + Select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.fiscalyear_id = """ + str(form['fiscalyear']) + """ + """ else: - self.cr.execute(""" - Select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.id =ANY(%s)""",(periods,)) + periods_id = ','.join(map(str, periods)) + sql = """ + Select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.id in ( """ + periods_id + """) + """ + self.cr.execute(sql) res = self.cr.dictfetchall() period_min = res[0]['start_date'] period_max = res[0]['stop_date'] @@ -184,7 +191,7 @@ class general_ledger(rml_parse.rml_parse): ctx['state'] = form['context'].get('state','all') if form.has_key('fiscalyear'): ctx['fiscalyear'] = form['fiscalyear'] - ctx['periods'] = form['periods'] + ctx['periods'] = form['periods'][0][2] else: ctx['date_from'] = form['date_from'] ctx['date_to'] = form['date_to'] @@ -225,8 +232,8 @@ class general_ledger(rml_parse.rml_parse): else: ## We will now compute solde initiaux for move in res: - self.cr.execute("""SELECT sum(l.debit) AS sum_debit, sum(l.credit) AS sum_credit FROM account_move_line l \ - WHERE l.account_id = %s AND l.date < %s AND l.date > %s""",(move.id,self.borne_date['max_date'],self.borne_date['min_date'])) + SOLDEINIT = "SELECT sum(l.debit) AS sum_debit, sum(l.credit) AS sum_credit FROM account_move_line l WHERE l.account_id = " + str(move.id) + " AND l.date < '" + self.borne_date['max_date'] + "'" + " AND l.date > '" + self.borne_date['min_date'] + "'" + self.cr.execute(SOLDEINIT) resultat = self.cr.dictfetchall() if resultat[0] : if resultat[0]['sum_debit'] == None: @@ -279,7 +286,7 @@ class general_ledger(rml_parse.rml_parse): for l in res: line = self.pool.get('account.move.line').browse(self.cr, self.uid, l['id']) l['move'] = line.move_id.name - self.cr.execute('Select id from account_invoice where move_id =%s',(line.move_id.id,)) + self.cr.execute('Select id from account_invoice where move_id =%s'%(line.move_id.id)) tmpres = self.cr.dictfetchall() if len(tmpres) > 0 : inv = self.pool.get('account.invoice').browse(self.cr, self.uid, tmpres[0]['id']) @@ -307,7 +314,7 @@ class general_ledger(rml_parse.rml_parse): self.cr.execute("SELECT sum(debit) "\ "FROM account_move_line l "\ - "WHERE l.account_id = %s AND "+self.query,(account.id,)) + "WHERE l.account_id = %s AND %s "%(account.id, self.query)) ## Add solde init to the result # sum_debit = self.cr.fetchone()[0] or 0.0 @@ -321,7 +328,7 @@ class general_ledger(rml_parse.rml_parse): self.cr.execute("SELECT sum(credit) "\ "FROM account_move_line l "\ - "WHERE l.account_id = %s AND "+ self.query,(account.id,)) + "WHERE l.account_id = %s AND %s "%(account.id,self.query)) ## Add solde init to the result # sum_credit = self.cr.fetchone()[0] or 0.0 @@ -335,7 +342,7 @@ class general_ledger(rml_parse.rml_parse): def _sum_solde_account(self, account, form): self.cr.execute("SELECT (sum(debit) - sum(credit)) as tot_solde "\ "FROM account_move_line l "\ - "WHERE l.account_id = %s AND "+ self.query,(account.id,)) + "WHERE l.account_id = %s AND %s"%(account.id,self.query)) sum_solde = self.cr.fetchone()[0] or 0.0 if form.get('soldeinit', False): sum_solde += account.init_debit - account.init_credit @@ -347,7 +354,7 @@ class general_ledger(rml_parse.rml_parse): return 0.0 self.cr.execute("SELECT sum(debit) "\ "FROM account_move_line l "\ - "WHERE l.account_id =ANY(%s) AND "+ self.query,(self.child_ids,)) + "WHERE l.account_id in ("+','.join(map(str, self.child_ids))+") AND "+self.query) sum_debit = self.cr.fetchone()[0] or 0.0 return sum_debit @@ -356,7 +363,7 @@ class general_ledger(rml_parse.rml_parse): return 0.0 self.cr.execute("SELECT sum(credit) "\ "FROM account_move_line l "\ - "WHERE l.account_id =ANY(%s) AND "+ self.query,(self.child_ids,)) + "WHERE l.account_id in ("+','.join(map(str, self.child_ids))+") AND "+self.query) ## Add solde init to the result # sum_credit = self.cr.fetchone()[0] or 0.0 @@ -367,14 +374,14 @@ class general_ledger(rml_parse.rml_parse): return 0.0 self.cr.execute("SELECT (sum(debit) - sum(credit)) as tot_solde "\ "FROM account_move_line l "\ - "WHERE l.account_id =ANY(%s) AND "+ self.query,(self.child_ids,)) + "WHERE l.account_id in ("+','.join(map(str, self.child_ids))+") AND "+self.query) sum_solde = self.cr.fetchone()[0] or 0.0 return sum_solde def _set_get_account_currency_code(self, account_id): self.cr.execute("SELECT c.code as code "\ "FROM res_currency c,account_account as ac "\ - "WHERE ac.id = %s AND ac.currency_id = c.id",(account_id,)) + "WHERE ac.id = %s AND ac.currency_id = c.id"%(account_id)) result = self.cr.fetchone() if result: self.account_currency = result[0] @@ -393,7 +400,6 @@ class general_ledger(rml_parse.rml_parse): currency_total = self.tot_currency = 0.0 return currency_total - report_sxw.report_sxw('report.account.general.ledger', 'account.account', 'addons/account/report/general_ledger.rml', parser=general_ledger, header=False) report_sxw.report_sxw('report.account.general.ledger_landscape', 'account.account', 'addons/account/report/general_ledger_landscape.rml', parser=general_ledger, header=False) From 4a1964aeca77ac4a120e5920248ed724e2fb97e3 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Thu, 20 May 2010 11:20:05 +0200 Subject: [PATCH 04/48] merge 5.0.10 changes bzr revid: al@openerp.com-20100520092005-yw071p8gb3ejzr8b --- addons/account/report/general_ledger.py | 60 ++++++++++++++----------- 1 file changed, 33 insertions(+), 27 deletions(-) diff --git a/addons/account/report/general_ledger.py b/addons/account/report/general_ledger.py index d1123263bdb..747a643d598 100644 --- a/addons/account/report/general_ledger.py +++ b/addons/account/report/general_ledger.py @@ -30,6 +30,8 @@ import xml import rml_parse import pooler +from mx.DateTime import * + class general_ledger(rml_parse.rml_parse): _name = 'report.account.general.ledger' @@ -41,7 +43,7 @@ class general_ledger(rml_parse.rml_parse): ## new_ids = [] if (data['model'] == 'account.account'): - new_ids = 'active_ids' in data['form']['context'] and data['form']['context']['active_ids'] or [] + new_ids = ids else: new_ids.append(data['form']['Account_list']) @@ -89,7 +91,7 @@ class general_ledger(rml_parse.rml_parse): # We have the account ID we will search all account move line from now until this time # We are in the case of we are on the top of the account move Line cr.execute('SELECT distinct(ac.code) as code_rest,ac.name as name_rest from account_account AS ac, account_move_line mv\ - where ac.id = mv.account_id and mv.move_id = %s and mv.account_id <> %s' ,(num_id_move,account_id,)) + where ac.id = mv.account_id and mv.move_id = ' + num_id_move +' and mv.account_id <> ' + account_id ) res_mv = cr.dictfetchall() # we need a result more than 2 line to make the test so we will made the the on 1 because we have exclude the current line if (len(res_mv) >=1): @@ -118,13 +120,17 @@ class general_ledger(rml_parse.rml_parse): borne_max = res[0]['stop_date'] if form['state'] == 'byperiod': ## This function will return the most aged date - periods = form['periods'] + periods = form['periods'][0][2] if not periods: - self.cr.execute(""" - Select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.fiscalyear_id = %s""",(form['fiscalyear'],)) + sql = """ + Select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.fiscalyear_id = """ + str(form['fiscalyear']) + """ + """ else: - self.cr.execute(""" - Select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.id =ANY(%s)""",(periods,)) + periods_id = ','.join(map(str, periods)) + sql = """ + Select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.id in ( """ + periods_id + """) + """ + self.cr.execute(sql) res = self.cr.dictfetchall() borne_min = res[0]['start_date'] borne_max = res[0]['stop_date'] @@ -132,16 +138,17 @@ class general_ledger(rml_parse.rml_parse): borne_min = form['date_from'] borne_max = form['date_to'] elif form['state'] == 'all': - periods = form['periods'] + periods = form['periods'][0][2] if not periods: - if form['fiscalyear'] == False: - fiscalyears = self.pool.get('account.fiscalyear').search(self.cr, self.uid, [('state', '=', 'draft')]) - else: - fiscalyears = [form['fiscalyear']] - self.cr.execute("select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.fiscalyear_id =ANY(%s)" ,(fiscalyears,)) + sql = """ + Select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.fiscalyear_id = """ + str(form['fiscalyear']) + """ + """ else: - self.cr.execute(""" - Select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.id =ANY(%s)""",(periods,)) + periods_id = ','.join(map(str, periods)) + sql = """ + Select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.id in ( """ + periods_id + """) + """ + self.cr.execute(sql) res = self.cr.dictfetchall() period_min = res[0]['start_date'] period_max = res[0]['stop_date'] @@ -184,7 +191,7 @@ class general_ledger(rml_parse.rml_parse): ctx['state'] = form['context'].get('state','all') if form.has_key('fiscalyear'): ctx['fiscalyear'] = form['fiscalyear'] - ctx['periods'] = form['periods'] + ctx['periods'] = form['periods'][0][2] else: ctx['date_from'] = form['date_from'] ctx['date_to'] = form['date_to'] @@ -225,8 +232,8 @@ class general_ledger(rml_parse.rml_parse): else: ## We will now compute solde initiaux for move in res: - self.cr.execute("""SELECT sum(l.debit) AS sum_debit, sum(l.credit) AS sum_credit FROM account_move_line l \ - WHERE l.account_id = %s AND l.date < %s AND l.date > %s""",(move.id,self.borne_date['max_date'],self.borne_date['min_date'])) + SOLDEINIT = "SELECT sum(l.debit) AS sum_debit, sum(l.credit) AS sum_credit FROM account_move_line l WHERE l.account_id = " + str(move.id) + " AND l.date < '" + self.borne_date['max_date'] + "'" + " AND l.date > '" + self.borne_date['min_date'] + "'" + self.cr.execute(SOLDEINIT) resultat = self.cr.dictfetchall() if resultat[0] : if resultat[0]['sum_debit'] == None: @@ -279,7 +286,7 @@ class general_ledger(rml_parse.rml_parse): for l in res: line = self.pool.get('account.move.line').browse(self.cr, self.uid, l['id']) l['move'] = line.move_id.name - self.cr.execute('Select id from account_invoice where move_id =%s',(line.move_id.id,)) + self.cr.execute('Select id from account_invoice where move_id =%s'%(line.move_id.id)) tmpres = self.cr.dictfetchall() if len(tmpres) > 0 : inv = self.pool.get('account.invoice').browse(self.cr, self.uid, tmpres[0]['id']) @@ -307,7 +314,7 @@ class general_ledger(rml_parse.rml_parse): self.cr.execute("SELECT sum(debit) "\ "FROM account_move_line l "\ - "WHERE l.account_id = %s AND "+self.query,(account.id,)) + "WHERE l.account_id = %s AND %s "%(account.id, self.query)) ## Add solde init to the result # sum_debit = self.cr.fetchone()[0] or 0.0 @@ -321,7 +328,7 @@ class general_ledger(rml_parse.rml_parse): self.cr.execute("SELECT sum(credit) "\ "FROM account_move_line l "\ - "WHERE l.account_id = %s AND "+ self.query,(account.id,)) + "WHERE l.account_id = %s AND %s "%(account.id,self.query)) ## Add solde init to the result # sum_credit = self.cr.fetchone()[0] or 0.0 @@ -335,7 +342,7 @@ class general_ledger(rml_parse.rml_parse): def _sum_solde_account(self, account, form): self.cr.execute("SELECT (sum(debit) - sum(credit)) as tot_solde "\ "FROM account_move_line l "\ - "WHERE l.account_id = %s AND "+ self.query,(account.id,)) + "WHERE l.account_id = %s AND %s"%(account.id,self.query)) sum_solde = self.cr.fetchone()[0] or 0.0 if form.get('soldeinit', False): sum_solde += account.init_debit - account.init_credit @@ -347,7 +354,7 @@ class general_ledger(rml_parse.rml_parse): return 0.0 self.cr.execute("SELECT sum(debit) "\ "FROM account_move_line l "\ - "WHERE l.account_id =ANY(%s) AND "+ self.query,(self.child_ids,)) + "WHERE l.account_id in ("+','.join(map(str, self.child_ids))+") AND "+self.query) sum_debit = self.cr.fetchone()[0] or 0.0 return sum_debit @@ -356,7 +363,7 @@ class general_ledger(rml_parse.rml_parse): return 0.0 self.cr.execute("SELECT sum(credit) "\ "FROM account_move_line l "\ - "WHERE l.account_id =ANY(%s) AND "+ self.query,(self.child_ids,)) + "WHERE l.account_id in ("+','.join(map(str, self.child_ids))+") AND "+self.query) ## Add solde init to the result # sum_credit = self.cr.fetchone()[0] or 0.0 @@ -367,14 +374,14 @@ class general_ledger(rml_parse.rml_parse): return 0.0 self.cr.execute("SELECT (sum(debit) - sum(credit)) as tot_solde "\ "FROM account_move_line l "\ - "WHERE l.account_id =ANY(%s) AND "+ self.query,(self.child_ids,)) + "WHERE l.account_id in ("+','.join(map(str, self.child_ids))+") AND "+self.query) sum_solde = self.cr.fetchone()[0] or 0.0 return sum_solde def _set_get_account_currency_code(self, account_id): self.cr.execute("SELECT c.code as code "\ "FROM res_currency c,account_account as ac "\ - "WHERE ac.id = %s AND ac.currency_id = c.id",(account_id,)) + "WHERE ac.id = %s AND ac.currency_id = c.id"%(account_id)) result = self.cr.fetchone() if result: self.account_currency = result[0] @@ -393,7 +400,6 @@ class general_ledger(rml_parse.rml_parse): currency_total = self.tot_currency = 0.0 return currency_total - report_sxw.report_sxw('report.account.general.ledger', 'account.account', 'addons/account/report/general_ledger.rml', parser=general_ledger, header=False) report_sxw.report_sxw('report.account.general.ledger_landscape', 'account.account', 'addons/account/report/general_ledger_landscape.rml', parser=general_ledger, header=False) From e7249de2b14e1ec8c2076b79e37527088db1a180 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Thu, 20 May 2010 16:43:10 +0200 Subject: [PATCH 05/48] account general ledger, reduce complexity to O(account number) from O(move_line number) bzr revid: al@openerp.com-20100520144310-jbwd0887380qig79 --- addons/account/report/general_ledger.py | 134 +++++++++--------------- 1 file changed, 52 insertions(+), 82 deletions(-) diff --git a/addons/account/report/general_ledger.py b/addons/account/report/general_ledger.py index 747a643d598..d85d082423f 100644 --- a/addons/account/report/general_ledger.py +++ b/addons/account/report/general_ledger.py @@ -35,8 +35,6 @@ from mx.DateTime import * class general_ledger(rml_parse.rml_parse): _name = 'report.account.general.ledger' - - def set_context(self, objects, data, ids, report_type = None): ## self.borne_date = self.get_min_date(data['form']) @@ -73,39 +71,6 @@ class general_ledger(rml_parse.rml_parse): 'sum_currency_amount_account': self._sum_currency_amount_account }) self.context = context - def _calc_contrepartie(self,cr,uid,ids, context={}): - result = {} - #for id in ids: - # result.setdefault(id, False) - - for account_line in self.pool.get('account.move.line').browse(cr, uid, ids, context): - # For avoid long text in the field we will limit it to 5 lines - # - # - # - result[account_line.id] = ' ' - num_id_move = str(account_line.move_id.id) - num_id_line = str(account_line.id) - account_id = str(account_line.account_id.id) - # search the basic account - # We have the account ID we will search all account move line from now until this time - # We are in the case of we are on the top of the account move Line - cr.execute('SELECT distinct(ac.code) as code_rest,ac.name as name_rest from account_account AS ac, account_move_line mv\ - where ac.id = mv.account_id and mv.move_id = ' + num_id_move +' and mv.account_id <> ' + account_id ) - res_mv = cr.dictfetchall() - # we need a result more than 2 line to make the test so we will made the the on 1 because we have exclude the current line - if (len(res_mv) >=1): - concat = '' - rup_id = 0 - for move_rest in res_mv: - concat = concat + move_rest['code_rest'] + '|' - result[account_line.id] = concat - if rup_id >5: - # we need to stop the computing and to escape but before we will add "..." - result[account_line.id] = concat + '...' - break - rup_id+=1 - return result def get_min_date(self,form): @@ -120,7 +85,8 @@ class general_ledger(rml_parse.rml_parse): borne_max = res[0]['stop_date'] if form['state'] == 'byperiod': ## This function will return the most aged date - periods = form['periods'][0][2] + periods = form['periods'] + #periods = form['periods'][0][2] if not periods: sql = """ Select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.fiscalyear_id = """ + str(form['fiscalyear']) + """ @@ -138,7 +104,8 @@ class general_ledger(rml_parse.rml_parse): borne_min = form['date_from'] borne_max = form['date_to'] elif form['state'] == 'all': - periods = form['periods'][0][2] + periods = form['periods'] + #periods = form['periods'][0][2] if not periods: sql = """ Select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.fiscalyear_id = """ + str(form['fiscalyear']) + """ @@ -175,9 +142,6 @@ class general_ledger(rml_parse.rml_parse): } return self.date_borne - - - def get_children_accounts(self, account, form): self.child_ids = self.pool.get('account.account').search(self.cr, self.uid, @@ -191,7 +155,9 @@ class general_ledger(rml_parse.rml_parse): ctx['state'] = form['context'].get('state','all') if form.has_key('fiscalyear'): ctx['fiscalyear'] = form['fiscalyear'] - ctx['periods'] = form['periods'][0][2] + ctx['periods'] = form['periods'] + #ctx['periods'] = form['periods'][0][2] + else: ctx['date_from'] = form['date_from'] ctx['date_to'] = form['date_to'] @@ -256,56 +222,60 @@ class general_ledger(rml_parse.rml_parse): return res def lines(self, account, form): - inv_types = { - 'out_invoice': 'CI: ', - 'in_invoice': 'SI: ', - 'out_refund': 'OR: ', - 'in_refund': 'SR: ', - } + """ Return all the account_move_line of account with their account code counterparts """ - if form['sortbydate'] == 'sort_date': - sorttag = 'l.date' - else: - sorttag = 'j.code' + # First compute all counterpart strings for every move_id where this account appear sql = """ - SELECT l.id, l.date, j.code,c.code AS currency_code,l.amount_currency,l.ref, l.name , COALESCE(l.debit,0) as debit, COALESCE(l.credit,0) as credit, l.period_id - FROM account_move_line as l - LEFT JOIN res_currency c on (l.currency_id=c.id) - JOIN account_journal j on (l.journal_id=j.id) - AND account_id = %%s - AND %s - WHERE l.date<=%%s - AND l.date>=%%s - ORDER by %s""" % (self.query, sorttag) - - self.cr.execute(sql, (account.id, self.date_borne['max_date'], self.date_borne['min_date'],)) + SELECT m1.move_id, + array_to_string(ARRAY(SELECT DISTINCT a.code FROM account_move_line m2 LEFT JOIN account_account a ON (m2.account_id=a.id) WHERE m2.move_id = m1.move_id AND m2.account_id<>%%s), ', ') AS counterpart + FROM (SELECT move_id FROM account_move_line l WHERE %s AND l.account_id = %%s AND l.date<=%%s AND l.date>=%%s GROUP BY move_id) m1 + """ % self.query + self.cr.execute(sql, (account.id, account.id, self.date_borne['max_date'], self.date_borne['min_date'])) + counterpart_res = self.cr.dictfetchall() + counterpart_accounts = {} + for i in counterpart_res: + counterpart_accounts[i['move_id']]=i['counterpart'] + del counterpart_res + # Then select all account_move_line of this account + if form['sortbydate'] == 'sort_date': + sql_sort='l.date' + else: + sql_sort='j.code' + sql = """ + SELECT l.id, l.date, j.code, l.amount_currency,l.ref, l.name, COALESCE(l.debit,0) AS debit, COALESCE(l.credit,0) AS credit, l.period_id, l.partner_id, + m.name AS move_name, m.id AS move_id, + c.code AS currency_code, + i.id AS invoice_id, i.type AS invoice_type, i.number AS invoice_number, + p.name AS partner_name + FROM account_move_line l + LEFT JOIN account_move m on (l.move_id=m.id) + LEFT JOIN res_currency c on (l.currency_id=c.id) + LEFT JOIN res_partner p on (l.partner_id=p.id) + LEFT JOIN account_invoice i on (m.id =i.move_id) + JOIN account_journal j on (l.journal_id=j.id) + WHERE %s AND l.account_id = %%s AND l.date<=%%s AND l.date>=%%s ORDER by %s + """ % (self.query, sql_sort) + self.cr.execute(sql, (account.id, self.date_borne['max_date'], self.date_borne['min_date'])) res = self.cr.dictfetchall() - sum = 0.0 + account_sum = 0.0 account_move_line_obj = pooler.get_pool(self.cr.dbname).get('account.move.line') + inv_types = { 'out_invoice': 'CI', 'in_invoice': 'SI', 'out_refund': 'OR', 'in_refund': 'SR', } + for l in res: - line = self.pool.get('account.move.line').browse(self.cr, self.uid, l['id']) - l['move'] = line.move_id.name - self.cr.execute('Select id from account_invoice where move_id =%s'%(line.move_id.id)) - tmpres = self.cr.dictfetchall() - if len(tmpres) > 0 : - inv = self.pool.get('account.invoice').browse(self.cr, self.uid, tmpres[0]['id']) - l['ref'] = inv_types[inv.type] + ': '+str(inv.number) - if line.partner_id : - l['partner'] = line.partner_id.name - else : - l['partner'] = '' - sum = l['debit'] - l ['credit'] -# c = time.strptime(l['date'],"%Y-%m-%d") -# l['date'] = time.strftime("%d-%m-%Y",c) - l['progress'] = sum - l['line_corresp'] = self._calc_contrepartie(self.cr,self.uid,[l['id']])[l['id']] + l['move']=l['move_name'] + if l['invoice_id']: + l['ref'] = '%s: %s'%(inv_types[l['invoice_type']],l['invoice_number']) + l['partner'] = l['partner_name'] or '' + account_sum = l['debit'] - l ['credit'] + #c = time.strptime(l['date'],"%Y-%m-%d") + #l['date'] = time.strftime("%d-%m-%Y",c) + l['progress'] = account_sum + l['line_corresp'] = counterpart_accounts[l['move_id']] # Modification du amount Currency - if (l['credit'] > 0): + if l['credit'] > 0: if l['amount_currency'] != None: l['amount_currency'] = abs(l['amount_currency']) * -1 - - # if l['amount_currency'] != None: self.tot_currency = self.tot_currency + l['amount_currency'] return res From 99192e62de5a8853113029aee9c04d11dc03cb64 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Thu, 20 May 2010 16:43:10 +0200 Subject: [PATCH 06/48] account general ledger, reduce complexity to O(account number) from O(move_line number) bzr revid: al@openerp.com-20100520144310-vo270dkectxzu26z --- addons/account/report/general_ledger.py | 134 +++++++++--------------- 1 file changed, 52 insertions(+), 82 deletions(-) diff --git a/addons/account/report/general_ledger.py b/addons/account/report/general_ledger.py index 747a643d598..d85d082423f 100644 --- a/addons/account/report/general_ledger.py +++ b/addons/account/report/general_ledger.py @@ -35,8 +35,6 @@ from mx.DateTime import * class general_ledger(rml_parse.rml_parse): _name = 'report.account.general.ledger' - - def set_context(self, objects, data, ids, report_type = None): ## self.borne_date = self.get_min_date(data['form']) @@ -73,39 +71,6 @@ class general_ledger(rml_parse.rml_parse): 'sum_currency_amount_account': self._sum_currency_amount_account }) self.context = context - def _calc_contrepartie(self,cr,uid,ids, context={}): - result = {} - #for id in ids: - # result.setdefault(id, False) - - for account_line in self.pool.get('account.move.line').browse(cr, uid, ids, context): - # For avoid long text in the field we will limit it to 5 lines - # - # - # - result[account_line.id] = ' ' - num_id_move = str(account_line.move_id.id) - num_id_line = str(account_line.id) - account_id = str(account_line.account_id.id) - # search the basic account - # We have the account ID we will search all account move line from now until this time - # We are in the case of we are on the top of the account move Line - cr.execute('SELECT distinct(ac.code) as code_rest,ac.name as name_rest from account_account AS ac, account_move_line mv\ - where ac.id = mv.account_id and mv.move_id = ' + num_id_move +' and mv.account_id <> ' + account_id ) - res_mv = cr.dictfetchall() - # we need a result more than 2 line to make the test so we will made the the on 1 because we have exclude the current line - if (len(res_mv) >=1): - concat = '' - rup_id = 0 - for move_rest in res_mv: - concat = concat + move_rest['code_rest'] + '|' - result[account_line.id] = concat - if rup_id >5: - # we need to stop the computing and to escape but before we will add "..." - result[account_line.id] = concat + '...' - break - rup_id+=1 - return result def get_min_date(self,form): @@ -120,7 +85,8 @@ class general_ledger(rml_parse.rml_parse): borne_max = res[0]['stop_date'] if form['state'] == 'byperiod': ## This function will return the most aged date - periods = form['periods'][0][2] + periods = form['periods'] + #periods = form['periods'][0][2] if not periods: sql = """ Select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.fiscalyear_id = """ + str(form['fiscalyear']) + """ @@ -138,7 +104,8 @@ class general_ledger(rml_parse.rml_parse): borne_min = form['date_from'] borne_max = form['date_to'] elif form['state'] == 'all': - periods = form['periods'][0][2] + periods = form['periods'] + #periods = form['periods'][0][2] if not periods: sql = """ Select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.fiscalyear_id = """ + str(form['fiscalyear']) + """ @@ -175,9 +142,6 @@ class general_ledger(rml_parse.rml_parse): } return self.date_borne - - - def get_children_accounts(self, account, form): self.child_ids = self.pool.get('account.account').search(self.cr, self.uid, @@ -191,7 +155,9 @@ class general_ledger(rml_parse.rml_parse): ctx['state'] = form['context'].get('state','all') if form.has_key('fiscalyear'): ctx['fiscalyear'] = form['fiscalyear'] - ctx['periods'] = form['periods'][0][2] + ctx['periods'] = form['periods'] + #ctx['periods'] = form['periods'][0][2] + else: ctx['date_from'] = form['date_from'] ctx['date_to'] = form['date_to'] @@ -256,56 +222,60 @@ class general_ledger(rml_parse.rml_parse): return res def lines(self, account, form): - inv_types = { - 'out_invoice': 'CI: ', - 'in_invoice': 'SI: ', - 'out_refund': 'OR: ', - 'in_refund': 'SR: ', - } + """ Return all the account_move_line of account with their account code counterparts """ - if form['sortbydate'] == 'sort_date': - sorttag = 'l.date' - else: - sorttag = 'j.code' + # First compute all counterpart strings for every move_id where this account appear sql = """ - SELECT l.id, l.date, j.code,c.code AS currency_code,l.amount_currency,l.ref, l.name , COALESCE(l.debit,0) as debit, COALESCE(l.credit,0) as credit, l.period_id - FROM account_move_line as l - LEFT JOIN res_currency c on (l.currency_id=c.id) - JOIN account_journal j on (l.journal_id=j.id) - AND account_id = %%s - AND %s - WHERE l.date<=%%s - AND l.date>=%%s - ORDER by %s""" % (self.query, sorttag) - - self.cr.execute(sql, (account.id, self.date_borne['max_date'], self.date_borne['min_date'],)) + SELECT m1.move_id, + array_to_string(ARRAY(SELECT DISTINCT a.code FROM account_move_line m2 LEFT JOIN account_account a ON (m2.account_id=a.id) WHERE m2.move_id = m1.move_id AND m2.account_id<>%%s), ', ') AS counterpart + FROM (SELECT move_id FROM account_move_line l WHERE %s AND l.account_id = %%s AND l.date<=%%s AND l.date>=%%s GROUP BY move_id) m1 + """ % self.query + self.cr.execute(sql, (account.id, account.id, self.date_borne['max_date'], self.date_borne['min_date'])) + counterpart_res = self.cr.dictfetchall() + counterpart_accounts = {} + for i in counterpart_res: + counterpart_accounts[i['move_id']]=i['counterpart'] + del counterpart_res + # Then select all account_move_line of this account + if form['sortbydate'] == 'sort_date': + sql_sort='l.date' + else: + sql_sort='j.code' + sql = """ + SELECT l.id, l.date, j.code, l.amount_currency,l.ref, l.name, COALESCE(l.debit,0) AS debit, COALESCE(l.credit,0) AS credit, l.period_id, l.partner_id, + m.name AS move_name, m.id AS move_id, + c.code AS currency_code, + i.id AS invoice_id, i.type AS invoice_type, i.number AS invoice_number, + p.name AS partner_name + FROM account_move_line l + LEFT JOIN account_move m on (l.move_id=m.id) + LEFT JOIN res_currency c on (l.currency_id=c.id) + LEFT JOIN res_partner p on (l.partner_id=p.id) + LEFT JOIN account_invoice i on (m.id =i.move_id) + JOIN account_journal j on (l.journal_id=j.id) + WHERE %s AND l.account_id = %%s AND l.date<=%%s AND l.date>=%%s ORDER by %s + """ % (self.query, sql_sort) + self.cr.execute(sql, (account.id, self.date_borne['max_date'], self.date_borne['min_date'])) res = self.cr.dictfetchall() - sum = 0.0 + account_sum = 0.0 account_move_line_obj = pooler.get_pool(self.cr.dbname).get('account.move.line') + inv_types = { 'out_invoice': 'CI', 'in_invoice': 'SI', 'out_refund': 'OR', 'in_refund': 'SR', } + for l in res: - line = self.pool.get('account.move.line').browse(self.cr, self.uid, l['id']) - l['move'] = line.move_id.name - self.cr.execute('Select id from account_invoice where move_id =%s'%(line.move_id.id)) - tmpres = self.cr.dictfetchall() - if len(tmpres) > 0 : - inv = self.pool.get('account.invoice').browse(self.cr, self.uid, tmpres[0]['id']) - l['ref'] = inv_types[inv.type] + ': '+str(inv.number) - if line.partner_id : - l['partner'] = line.partner_id.name - else : - l['partner'] = '' - sum = l['debit'] - l ['credit'] -# c = time.strptime(l['date'],"%Y-%m-%d") -# l['date'] = time.strftime("%d-%m-%Y",c) - l['progress'] = sum - l['line_corresp'] = self._calc_contrepartie(self.cr,self.uid,[l['id']])[l['id']] + l['move']=l['move_name'] + if l['invoice_id']: + l['ref'] = '%s: %s'%(inv_types[l['invoice_type']],l['invoice_number']) + l['partner'] = l['partner_name'] or '' + account_sum = l['debit'] - l ['credit'] + #c = time.strptime(l['date'],"%Y-%m-%d") + #l['date'] = time.strftime("%d-%m-%Y",c) + l['progress'] = account_sum + l['line_corresp'] = counterpart_accounts[l['move_id']] # Modification du amount Currency - if (l['credit'] > 0): + if l['credit'] > 0: if l['amount_currency'] != None: l['amount_currency'] = abs(l['amount_currency']) * -1 - - # if l['amount_currency'] != None: self.tot_currency = self.tot_currency + l['amount_currency'] return res From 7bbc9e1d4daca5c96d5dc405bb02d2a925851e27 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Fri, 21 May 2010 15:14:19 +0200 Subject: [PATCH 07/48] fix the row height to avoid the computation by reportlab/platypus/tables.py _calc_height bzr revid: al@openerp.com-20100521131419-e7rj80zd84mlkxf5 --- addons/account/report/general_ledger.py | 6 ++---- addons/account/report/general_ledger.rml | 4 ++-- addons/account/report/general_ledger_landscape.rml | 4 ++-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/addons/account/report/general_ledger.py b/addons/account/report/general_ledger.py index d85d082423f..e2c24fe96d2 100644 --- a/addons/account/report/general_ledger.py +++ b/addons/account/report/general_ledger.py @@ -30,8 +30,6 @@ import xml import rml_parse import pooler -from mx.DateTime import * - class general_ledger(rml_parse.rml_parse): _name = 'report.account.general.ledger' @@ -41,7 +39,8 @@ class general_ledger(rml_parse.rml_parse): ## new_ids = [] if (data['model'] == 'account.account'): - new_ids = ids + new_ids = 'active_ids' in data['form']['context'] and data['form']['context']['active_ids'] or [] + #new_ids = ids else: new_ids.append(data['form']['Account_list']) @@ -51,7 +50,6 @@ class general_ledger(rml_parse.rml_parse): def __init__(self, cr, uid, name, context): super(general_ledger, self).__init__(cr, uid, name, context=context) - cr.sql_log=1 self.date_borne = {} self.query = "" self.child_ids = "" diff --git a/addons/account/report/general_ledger.rml b/addons/account/report/general_ledger.rml index 75cb086b343..c711934639d 100644 --- a/addons/account/report/general_ledger.rml +++ b/addons/account/report/general_ledger.rml @@ -105,7 +105,7 @@
[[ repeatIn(get_children_accounts(a,data['form']), 'o') ]] - [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] + [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] @@ -156,7 +156,7 @@
[[ repeatIn(get_children_accounts(a,data['form']), 'o') ]] - [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]] + [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]] diff --git a/addons/account/report/general_ledger_landscape.rml b/addons/account/report/general_ledger_landscape.rml index 9e937a72baf..ced60e69c8b 100644 --- a/addons/account/report/general_ledger_landscape.rml +++ b/addons/account/report/general_ledger_landscape.rml @@ -104,7 +104,7 @@ [[ repeatIn(get_children_accounts(a,data['form']), 'o') ]] - [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]] + [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]] @@ -165,7 +165,7 @@ [[ repeatIn(get_children_accounts(a,data['form']), 'o') ]] - [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] + [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] From 84830accf59d5cada276919684fe767f46a1eb70 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Fri, 21 May 2010 15:14:19 +0200 Subject: [PATCH 08/48] fix the row height to avoid the computation by reportlab/platypus/tables.py _calc_height bzr revid: al@openerp.com-20100521131419-alu3izs3v2oxf9eo --- addons/account/report/general_ledger.py | 6 ++---- addons/account/report/general_ledger.rml | 4 ++-- addons/account/report/general_ledger_landscape.rml | 4 ++-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/addons/account/report/general_ledger.py b/addons/account/report/general_ledger.py index d85d082423f..e2c24fe96d2 100644 --- a/addons/account/report/general_ledger.py +++ b/addons/account/report/general_ledger.py @@ -30,8 +30,6 @@ import xml import rml_parse import pooler -from mx.DateTime import * - class general_ledger(rml_parse.rml_parse): _name = 'report.account.general.ledger' @@ -41,7 +39,8 @@ class general_ledger(rml_parse.rml_parse): ## new_ids = [] if (data['model'] == 'account.account'): - new_ids = ids + new_ids = 'active_ids' in data['form']['context'] and data['form']['context']['active_ids'] or [] + #new_ids = ids else: new_ids.append(data['form']['Account_list']) @@ -51,7 +50,6 @@ class general_ledger(rml_parse.rml_parse): def __init__(self, cr, uid, name, context): super(general_ledger, self).__init__(cr, uid, name, context=context) - cr.sql_log=1 self.date_borne = {} self.query = "" self.child_ids = "" diff --git a/addons/account/report/general_ledger.rml b/addons/account/report/general_ledger.rml index 75cb086b343..c711934639d 100644 --- a/addons/account/report/general_ledger.rml +++ b/addons/account/report/general_ledger.rml @@ -105,7 +105,7 @@
[[ repeatIn(get_children_accounts(a,data['form']), 'o') ]] - [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] + [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] @@ -156,7 +156,7 @@
[[ repeatIn(get_children_accounts(a,data['form']), 'o') ]] - [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]] + [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]] diff --git a/addons/account/report/general_ledger_landscape.rml b/addons/account/report/general_ledger_landscape.rml index 9e937a72baf..ced60e69c8b 100644 --- a/addons/account/report/general_ledger_landscape.rml +++ b/addons/account/report/general_ledger_landscape.rml @@ -104,7 +104,7 @@ [[ repeatIn(get_children_accounts(a,data['form']), 'o') ]] - [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]] + [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]] @@ -165,7 +165,7 @@ [[ repeatIn(get_children_accounts(a,data['form']), 'o') ]] - [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] + [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] From 42dbaa3952e7d6c248fc98703526205366ca579b Mon Sep 17 00:00:00 2001 From: apa-tiny Date: Wed, 26 May 2010 12:24:21 +0530 Subject: [PATCH 09/48] [IMP]:hr_evaluation:improved the SQL report. bzr revid: apa@tinyerp.com-20100526065421-tuy6sw96apgkz22b --- .../report/hr_evaluation_report_view.xml | 54 ++++++++++--------- 1 file changed, 30 insertions(+), 24 deletions(-) diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml index 921d8b43a2b..6b2e6ead15f 100644 --- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml +++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml @@ -42,35 +42,42 @@ - - + + + string=" 7 Days " + separator="1" + domain="[('create_date','<=', time.strftime('%%Y-%%m-%%d')), ('create_date','>',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]" + help="Tasks during last 7 days"/> + icon="terp-hr" + domain="[('state','=','draft')]" + help = "Draft Evaluations"/> + icon="terp-hr" + domain="[('state', '=' ,'wait')]" + help = "In progress Evaluations"/> + icon="terp-hr" + domain="[('state','=','progress')]" + help = "Final Validation Evaluations"/> + + +<<<<<<< TREE + +======= @@ -91,13 +98,12 @@ string="Cancelled" domain="[('state','=','cancel')]"/> +>>>>>>> MERGE-SOURCE - - - - + + From 115b74cf8acfc303545196c59e4bc6ac7c0d13cf Mon Sep 17 00:00:00 2001 From: "Jni (Open ERP)" Date: Wed, 26 May 2010 16:15:44 +0530 Subject: [PATCH 10/48] [IMP]:account:Changed the spelling for statistic bzr revid: jni@tinyerp.co.in-20100526104544-nm2x5rujey8pp1ex --- addons/account/account_menuitem.xml | 2 +- addons/account/report/account_account_report_view.xml | 2 +- addons/account/report/account_analytic_entries_report_view.xml | 2 +- addons/account/report/account_entries_report_view.xml | 2 +- addons/account/report/account_invoice_report_view.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml index a2d18095618..4cdcb7787b6 100644 --- a/addons/account/account_menuitem.xml +++ b/addons/account/account_menuitem.xml @@ -22,7 +22,7 @@ groups="group_account_user"/> - + diff --git a/addons/account/report/account_account_report_view.xml b/addons/account/report/account_account_report_view.xml index f2d6338c951..efdb4567935 100644 --- a/addons/account/report/account_account_report_view.xml +++ b/addons/account/report/account_account_report_view.xml @@ -87,7 +87,7 @@ - + diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml index e1cd7967b8d..84dca63f440 100644 --- a/addons/account/report/account_analytic_entries_report_view.xml +++ b/addons/account/report/account_analytic_entries_report_view.xml @@ -107,7 +107,7 @@ - + diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml index 625d98fa9cb..f07de0cdf8d 100644 --- a/addons/account/report/account_entries_report_view.xml +++ b/addons/account/report/account_entries_report_view.xml @@ -122,6 +122,6 @@ {'search_default_This Month':1,'search_default_Journal':1,'group_by_no_leaf':1,'group_by':[]} - + diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml index ae00608b164..7acd0c332b1 100644 --- a/addons/account/report/account_invoice_report_view.xml +++ b/addons/account/report/account_invoice_report_view.xml @@ -151,7 +151,7 @@ - + From 0c9201fd9963f898afff18a8b6d01be957cb1d7f Mon Sep 17 00:00:00 2001 From: apa-tiny Date: Wed, 26 May 2010 18:21:05 +0530 Subject: [PATCH 11/48] [IMP]:sale:Reverted SQL report changes applied at Revision ID: hmo@hmo-20100525163303-0la5uyj7e23dgvk9 bzr revid: apa@tinyerp.com-20100526125105-za72ql0p1tdr5sd2 --- addons/sale/report/sale_report.py | 3 +++ addons/sale/report/sale_report_view.xml | 27 ++++++------------------- 2 files changed, 9 insertions(+), 21 deletions(-) diff --git a/addons/sale/report/sale_report.py b/addons/sale/report/sale_report.py index e713c479f72..ec8be2160a0 100644 --- a/addons/sale/report/sale_report.py +++ b/addons/sale/report/sale_report.py @@ -36,6 +36,7 @@ class sale_report(osv.osv): ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True), 'day': fields.char('Day', size=128, readonly=True), 'product_id':fields.many2one('product.product', 'Product', readonly=True), + 'uom_id': fields.many2one('product.uom', 'Default Unit Of Measure', readonly=True), 'product_qty':fields.float('# of Qty', readonly=True), 'partner_id':fields.many2one('res.partner', 'Partner', readonly=True), 'shop_id':fields.many2one('sale.shop', 'Shop', readonly=True), @@ -71,6 +72,7 @@ class sale_report(osv.osv): to_char(s.date_order, 'MM') as month, to_char(s.date_order, 'YYYY-MM-DD') as day, l.product_id as product_id, + pt.uom_id as uom_id, sum(l.product_uom_qty * u.factor) as product_qty, s.partner_id as partner_id, s.user_id as user_id, @@ -96,6 +98,7 @@ class sale_report(osv.osv): l.product_uom, s.user_id, pt.categ_id, + pt.uom_id, s.state, s.shop_id, s.company_id, diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml index 2fca6dedd5a..0891efee88b 100644 --- a/addons/sale/report/sale_report_view.xml +++ b/addons/sale/report/sale_report_view.xml @@ -17,6 +17,7 @@ + @@ -86,7 +87,7 @@ - + @@ -99,28 +100,12 @@ - - - + + - - - - - - - - - - - - - - - - - + + From 335d3ce95c0fa664ac35423a3b5aeaef267e0404 Mon Sep 17 00:00:00 2001 From: apa-tiny Date: Wed, 26 May 2010 18:26:38 +0530 Subject: [PATCH 12/48] [IMP]:account:improved menus. bzr revid: apa@tinyerp.com-20100526125638-rpcu5iyapi2imnli --- addons/account/report/account_analytic_report_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account/report/account_analytic_report_view.xml b/addons/account/report/account_analytic_report_view.xml index 0d05d5f0d76..9a7c02ff8e7 100644 --- a/addons/account/report/account_analytic_report_view.xml +++ b/addons/account/report/account_analytic_report_view.xml @@ -139,7 +139,7 @@ {'search_default_This Month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]} - + From 9be38e6ed277b2fda2540ee5afc21d4fd2dfacf7 Mon Sep 17 00:00:00 2001 From: apa-tiny Date: Wed, 26 May 2010 18:36:02 +0530 Subject: [PATCH 13/48] [IMP]:project:improved SQL report.(Tasks Analysis) bzr revid: apa@tinyerp.com-20100526130602-0o370fizfv0iy3od --- addons/project/report/project_report_view.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml index a978587e232..4eac32fb284 100644 --- a/addons/project/report/project_report_view.xml +++ b/addons/project/report/project_report_view.xml @@ -103,6 +103,7 @@ domain="[('project_id','=',context.get('project_id', False)]"/> + @@ -248,6 +249,6 @@ graph,tree - + From ee2637fe9ed07c7f0c295245f8658210bb136579 Mon Sep 17 00:00:00 2001 From: apa-tiny Date: Wed, 26 May 2010 18:51:37 +0530 Subject: [PATCH 14/48] [IMP]:hr_recruitment:Resolved conflicts bzr revid: apa@tinyerp.com-20100526132137-88wnjs0mog14xr69 --- .../report/hr_evaluation_report_view.xml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml index 6b2e6ead15f..44c20ebbe16 100644 --- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml +++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml @@ -75,9 +75,6 @@ -<<<<<<< TREE - -======= @@ -91,14 +88,6 @@ - - - ->>>>>>> MERGE-SOURCE From 7e47dbd1cdecfc2cec961fcc630ee7c21531efdf Mon Sep 17 00:00:00 2001 From: apa-tiny Date: Thu, 27 May 2010 11:52:02 +0530 Subject: [PATCH 15/48] [IMP]:account:Improved SQL reports(Invoice Analysis and Entries Analysis). bzr revid: apa@tinyerp.com-20100527062202-p926f650dwok9h9f --- .../report/account_entries_report_view.xml | 71 +++++++++---------- .../report/account_invoice_report_view.xml | 35 ++++----- 2 files changed, 54 insertions(+), 52 deletions(-) diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml index f07de0cdf8d..b31d3bbfd0a 100644 --- a/addons/account/report/account_entries_report_view.xml +++ b/addons/account/report/account_entries_report_view.xml @@ -6,7 +6,7 @@ account.entries.report tree - + @@ -37,7 +37,7 @@ account.entries.report graph - + @@ -48,15 +48,15 @@ account.entries.report search - + - - + + help="Entries of last 30 days"/> + help = "Draft entries"/> + - - - - + + + + + - - - - - + + + + + + + - - + - - - - - - - - - + + + + + + + - - + - - + - Entries + Entries Analysis account.entries.report form tree,graph diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml index 7acd0c332b1..b8b0b09490b 100644 --- a/addons/account/report/account_invoice_report_view.xml +++ b/addons/account/report/account_invoice_report_view.xml @@ -6,7 +6,7 @@ account.invoice.report tree - + @@ -42,7 +42,7 @@ account.invoice.report graph - + @@ -54,7 +54,7 @@ account.invoice.report search - + + help = "Draft Invoices"/> + help = "Pro-forma Invoices"/> + help = "open Invoices"/> + help = "Done Invoices"/> + string="My Invoices" + help="My Invoices" + domain="[('user_id','=',uid)]"/> + @@ -119,6 +120,9 @@ + + + @@ -127,27 +131,26 @@ + + - + - - - - Invoices + Invoices Analysis account.invoice.report form tree,graph - {'search_default_month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[],'search_default_user_id':uid} + {'search_default_month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]} From bebd1e65d0dd18bad051a59230447446dd1aef80 Mon Sep 17 00:00:00 2001 From: apa-tiny Date: Thu, 27 May 2010 15:52:38 +0530 Subject: [PATCH 16/48] [IMP]:sale:Improved SQL reports(Sales Analysis). bzr revid: apa@tinyerp.com-20100527102238-34qm76q6uxe1u21y --- addons/sale/report/sale_report.py | 6 +++--- addons/sale/report/sale_report_view.xml | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/addons/sale/report/sale_report.py b/addons/sale/report/sale_report.py index ec8be2160a0..4fef5fd2595 100644 --- a/addons/sale/report/sale_report.py +++ b/addons/sale/report/sale_report.py @@ -36,7 +36,7 @@ class sale_report(osv.osv): ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True), 'day': fields.char('Day', size=128, readonly=True), 'product_id':fields.many2one('product.product', 'Product', readonly=True), - 'uom_id': fields.many2one('product.uom', 'Default Unit Of Measure', readonly=True), + 'uom_name': fields.char('Default UoM', size=128, readonly=True), 'product_qty':fields.float('# of Qty', readonly=True), 'partner_id':fields.many2one('res.partner', 'Partner', readonly=True), 'shop_id':fields.many2one('sale.shop', 'Shop', readonly=True), @@ -72,7 +72,7 @@ class sale_report(osv.osv): to_char(s.date_order, 'MM') as month, to_char(s.date_order, 'YYYY-MM-DD') as day, l.product_id as product_id, - pt.uom_id as uom_id, + u.name as uom_name, sum(l.product_uom_qty * u.factor) as product_qty, s.partner_id as partner_id, s.user_id as user_id, @@ -98,7 +98,7 @@ class sale_report(osv.osv): l.product_uom, s.user_id, pt.categ_id, - pt.uom_id, + u.name, s.state, s.shop_id, s.company_id, diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml index 0891efee88b..2542257ddac 100644 --- a/addons/sale/report/sale_report_view.xml +++ b/addons/sale/report/sale_report_view.xml @@ -17,7 +17,7 @@ - + @@ -88,6 +88,7 @@ + From 0e86ee70b47eb3965d8413f42e737efe0d78bb3a Mon Sep 17 00:00:00 2001 From: "Jay (Open ERP)" Date: Thu, 27 May 2010 16:29:21 +0530 Subject: [PATCH 17/48] [FIX] Account : Partner ledger report - Correction Account type filtering bzr revid: jvo@tinyerp.com-20100527105921-bx14b19r8m67m3ww --- addons/account/report/third_party_ledger.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/account/report/third_party_ledger.py b/addons/account/report/third_party_ledger.py index 1dca4dfb64a..c10fcb33313 100644 --- a/addons/account/report/third_party_ledger.py +++ b/addons/account/report/third_party_ledger.py @@ -167,9 +167,9 @@ class third_party_ledger(rml_parse.rml_parse): # #new_ids = [id for (id,) in self.cr.fetchall()] if data['form']['result_selection'] == 'supplier': - self.ACCOUNT_TYPE = ['receivable'] - elif data['form']['result_selection'] == 'customer': self.ACCOUNT_TYPE = ['payable'] + elif data['form']['result_selection'] == 'customer': + self.ACCOUNT_TYPE = ['receivable'] elif data['form']['result_selection'] == 'all': self.ACCOUNT_TYPE = ['payable','receivable'] From 92cdfc41a45bdd3c64f18c77f42e4781249d90f7 Mon Sep 17 00:00:00 2001 From: apa-tiny Date: Thu, 27 May 2010 16:47:21 +0530 Subject: [PATCH 18/48] [IMP]:account,sale:Improved SQL reports(Sales Analysis and account's reports). bzr revid: apa@tinyerp.com-20100527111721-co6kddx5umt805hd --- .../report/account_account_report_view.xml | 13 ++-- .../account_analytic_entries_report_view.xml | 33 +++++---- .../report/account_analytic_report_view.xml | 71 +++++++------------ .../report/account_entries_report_view.xml | 2 +- addons/sale/report/sale_report_view.xml | 2 +- 5 files changed, 52 insertions(+), 69 deletions(-) diff --git a/addons/account/report/account_account_report_view.xml b/addons/account/report/account_account_report_view.xml index efdb4567935..137fa0c69ae 100644 --- a/addons/account/report/account_account_report_view.xml +++ b/addons/account/report/account_account_report_view.xml @@ -6,7 +6,7 @@ account.account.report tree - + @@ -29,7 +29,7 @@ account.account.report graph - + @@ -43,7 +43,7 @@ account.account.report search - + - @@ -69,9 +68,11 @@ + + - + @@ -79,7 +80,7 @@ - Accounts + Accounts Analysis account.account.report form tree,graph diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml index 84dca63f440..610cf14a1d8 100644 --- a/addons/account/report/account_analytic_entries_report_view.xml +++ b/addons/account/report/account_analytic_entries_report_view.xml @@ -6,7 +6,7 @@ analytic.entries.report tree - + @@ -33,26 +33,25 @@ analytic.entries.report search - + - - + + help="Analytic Entries of last 30 days"/> - + - + - @@ -73,15 +72,15 @@ - + - - - - + + + + + - @@ -90,7 +89,7 @@ analytic.entries.report graph - + @@ -99,7 +98,7 @@ - Analytic Entries + Analytic Entries Analysis analytic.entries.report form tree,graph diff --git a/addons/account/report/account_analytic_report_view.xml b/addons/account/report/account_analytic_report_view.xml index a013f8a7369..2864386f582 100644 --- a/addons/account/report/account_analytic_report_view.xml +++ b/addons/account/report/account_analytic_report_view.xml @@ -6,7 +6,7 @@ analytic.report tree - + @@ -19,9 +19,9 @@ - - - + + + @@ -34,20 +34,20 @@ analytic.report search - + - - - + + + + + - @@ -85,34 +86,16 @@ - - - - - - - - - - - - - - + + + + + + @@ -122,7 +105,7 @@ analytic.report graph - + @@ -132,7 +115,7 @@ - Analytic Accounts + Analytic Accounts Analysis analytic.report form tree,graph diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml index b31d3bbfd0a..f61348c290c 100644 --- a/addons/account/report/account_entries_report_view.xml +++ b/addons/account/report/account_entries_report_view.xml @@ -76,7 +76,6 @@ - @@ -105,6 +104,7 @@ + diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml index 2542257ddac..91cada4c858 100644 --- a/addons/sale/report/sale_report_view.xml +++ b/addons/sale/report/sale_report_view.xml @@ -79,7 +79,6 @@ help="My Sales" domain="[('user_id','=',uid)]"/> - @@ -107,6 +106,7 @@ + From 1aed90730d3115439303f580f155b94c533d1359 Mon Sep 17 00:00:00 2001 From: apa-tiny Date: Thu, 27 May 2010 16:57:13 +0530 Subject: [PATCH 19/48] [IMP]:account:Improved SQL reports(account's reports). bzr revid: apa@tinyerp.com-20100527112713-4g3umpeqekm7mp2e --- addons/account/report/account_analytic_report_view.xml | 2 +- addons/account/report/account_invoice_report_view.xml | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/addons/account/report/account_analytic_report_view.xml b/addons/account/report/account_analytic_report_view.xml index 2864386f582..eba69e2785b 100644 --- a/addons/account/report/account_analytic_report_view.xml +++ b/addons/account/report/account_analytic_report_view.xml @@ -40,7 +40,7 @@ domain="[('day','<=', time.strftime('%%Y-%%m-%%d')),('day','>',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]" help="Analytic Accounts of last 365 days"/> - - @@ -110,9 +108,7 @@ - - @@ -126,14 +122,12 @@ - - From d46d3ebdc36ad8586fe0db4f42de1aa69db6dd57 Mon Sep 17 00:00:00 2001 From: apa-tiny Date: Thu, 27 May 2010 17:18:36 +0530 Subject: [PATCH 20/48] [IMP]:crm:Improved SQL reports(Leads Analysis). bzr revid: apa@tinyerp.com-20100527114836-hxdrjv0c3p9sukwf --- addons/crm/report/crm_lead_report_view.xml | 96 +++++++--------------- 1 file changed, 31 insertions(+), 65 deletions(-) diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml index c65ee0fd285..da480d21dc0 100644 --- a/addons/crm/report/crm_lead_report_view.xml +++ b/addons/crm/report/crm_lead_report_view.xml @@ -9,7 +9,7 @@ crm.lead.report tree - + @@ -34,7 +34,7 @@ crm.lead.report form -
+ @@ -54,7 +54,7 @@ crm.lead.report graph - + @@ -69,103 +69,69 @@ crm.lead.report search - - - - + + - - - - - + - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + @@ -199,7 +165,7 @@ - Leads + Leads Analysis crm.lead.report form {"search_default_User":1,"search_default_This Month":1,'group_by_no_leaf':1,'group_by':[]} @@ -246,7 +212,7 @@ - From 834b3fcf2b4e3cf3a59f930c4df143c6eb3995a3 Mon Sep 17 00:00:00 2001 From: "Jni (Open ERP)" Date: Thu, 27 May 2010 18:01:25 +0530 Subject: [PATCH 21/48] [IMP]:account:Improved account reports bzr revid: jni@tinyerp.co.in-20100527123125-g2icffru6d7g9g3w --- .../account/report/account_analytic_entries_report_view.xml | 6 +++--- addons/sale/report/sale_report_view.xml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml index 610cf14a1d8..157a08f8ca5 100644 --- a/addons/account/report/account_analytic_entries_report_view.xml +++ b/addons/account/report/account_analytic_entries_report_view.xml @@ -13,7 +13,7 @@ - + @@ -57,7 +57,7 @@ - + @@ -76,10 +76,10 @@ - + diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml index 91cada4c858..98e74c363b9 100644 --- a/addons/sale/report/sale_report_view.xml +++ b/addons/sale/report/sale_report_view.xml @@ -17,10 +17,10 @@ - + From d861ea005f74d0050a256fd945ffc272f3891385 Mon Sep 17 00:00:00 2001 From: apa-tiny Date: Thu, 27 May 2010 18:23:47 +0530 Subject: [PATCH 22/48] [IMP]:sale:Improved SQL reports(Sales Analysis). bzr revid: apa@tinyerp.com-20100527125347-8i06sow31mmuy1aq --- addons/sale/report/sale_report.py | 4 ++-- addons/sale/report/sale_report_view.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/sale/report/sale_report.py b/addons/sale/report/sale_report.py index 4fef5fd2595..cad05c8dcc8 100644 --- a/addons/sale/report/sale_report.py +++ b/addons/sale/report/sale_report.py @@ -37,7 +37,7 @@ class sale_report(osv.osv): 'day': fields.char('Day', size=128, readonly=True), 'product_id':fields.many2one('product.product', 'Product', readonly=True), 'uom_name': fields.char('Default UoM', size=128, readonly=True), - 'product_qty':fields.float('# of Qty', readonly=True), + 'product_uom_qty':fields.float('# of Qty', readonly=True), 'partner_id':fields.many2one('res.partner', 'Partner', readonly=True), 'shop_id':fields.many2one('sale.shop', 'Shop', readonly=True), 'company_id':fields.many2one('res.company', 'Company', readonly=True), @@ -73,7 +73,7 @@ class sale_report(osv.osv): to_char(s.date_order, 'YYYY-MM-DD') as day, l.product_id as product_id, u.name as uom_name, - sum(l.product_uom_qty * u.factor) as product_qty, + sum(l.product_uom_qty * u.factor) as product_uom_qty, s.partner_id as partner_id, s.user_id as user_id, s.shop_id as shop_id, diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml index 98e74c363b9..117eedf7af3 100644 --- a/addons/sale/report/sale_report_view.xml +++ b/addons/sale/report/sale_report_view.xml @@ -19,7 +19,7 @@ - + From 8eb8507424bcb72b2f03de95e78561e68c149be5 Mon Sep 17 00:00:00 2001 From: "psi (Open ERP)" Date: Thu, 27 May 2010 18:55:40 +0530 Subject: [PATCH 23/48] [ADD] account: Add yml test files for invoices bzr revid: psi@tinyerp.co.in-20100527132540-2c1xitk3ue0ng36u --- addons/account/__openerp__.py | 4 + .../account/test/account_customer_invoice.yml | 143 ++++++++++++++++++ .../account/test/account_supplier_invoice.yml | 117 ++++++++++++++ 3 files changed, 264 insertions(+) create mode 100644 addons/account/test/account_customer_invoice.yml create mode 100644 addons/account/test/account_supplier_invoice.yml diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py index cea696f590f..51724f47d33 100644 --- a/addons/account/__openerp__.py +++ b/addons/account/__openerp__.py @@ -121,6 +121,10 @@ module named account_voucherss 'demo/account_minimal.xml', 'account_unit_test.xml', ], + 'test': [ + 'test/account_customer_invoice.yml', + 'test/account_supplier_invoice.yml', + ], 'installable': True, 'active': False, 'certificate': '0080331923549', diff --git a/addons/account/test/account_customer_invoice.yml b/addons/account/test/account_customer_invoice.yml new file mode 100644 index 00000000000..6e9ede4ca5b --- /dev/null +++ b/addons/account/test/account_customer_invoice.yml @@ -0,0 +1,143 @@ +- + In order to test account invoice i create a new customer invoice +- + Creating a account.invoice record +- + !record {model: account.invoice, id: account_invoice_0}: + account_id: account.a_recv + address_contact_id: base.res_partner_address_zen + address_invoice_id: base.res_partner_address_zen + company_id: base.main_company + currency_id: base.EUR + date_invoice: '2010-05-26' + invoice_line: + - account_id: account.a_sale + name: '[PC3] Medium PC' + price_unit: 900.0 + quantity: 10.0 + product_id: product.product_product_pc3 + uos_id: product.product_uom_unit + journal_id: account.sales_journal + partner_id: base.res_partner_3 + reference_type: none +- + I check that Initially customer invoice is in the draft state +- + !assert {model: account.invoice, id: account_invoice_0}: + - state == 'draft' +- + I change the state of invoice to proforma2 by clicking PRO-FORMA button +- + Performing a workflow action invoice_proforma2 on module account.invoice +- + !workflow {model: account.invoice, action: invoice_proforma2, ref: account_invoice_0} +- + I check that the invoice state is now proforma2 +- + !assert {model: account.invoice, id: account_invoice_0}: + - state == 'proforma2' +- + I create invoice by clicking on Create button +- + Performing a workflow action invoice_open on module account.invoice +- + !workflow {model: account.invoice, action: invoice_open, ref: account_invoice_0} +- + I check that the invoice state is now open +- + !assert {model: account.invoice, id: account_invoice_0}: + - state == 'open' +- + I make a partial payment of 1000 by clicking on Pay Invoice button +- + Creating a account.invoice.pay record +- + !record {model: account.invoice.pay, id: account_invoice_pay_first0}: + amount: 1000.0 + date: '2010-05-26' + journal_id: account.sales_journal + name: First payment for [PC3] Medium PC to Distrib PC + period_id: account.period_5 + + +- + Performing an osv_memory action pay_and_reconcile on module account.invoice.pay +- + !python {model: account.invoice.pay}: | + self.pay_and_reconcile(cr, uid, [ref("account_invoice_pay_first0")], {"lang": + 'en_US', "active_model": "account.invoice", "tz": False, "record_id": 3, "active_ids": + [ref("account_invoice_0")], "type": "out_invoice", "active_id": ref("account_invoice_0"), + }) +- + I check that the invoice state is still open +- + !assert {model: account.invoice, id: account_invoice_0}: + - state == 'open' +- + I make second partial payment of 6000 by clicking on Pay Invoice button +- + Creating a account.invoice.pay record +- + !record {model: account.invoice.pay, id: account_invoice_pay_second0}: + amount: 6000.0 + date: '2010-05-28' + journal_id: account.sales_journal + name: Second payment for [PC3] Medium PC to Distrib PC + period_id: account.period_5 + +- + Performing an osv_memory action pay_and_reconcile on module account.invoice.pay +- + !python {model: account.invoice.pay}: | + self.pay_and_reconcile(cr, uid, [ref("account_invoice_pay_second0")], {"lang": + 'en_US', "active_model": "account.invoice", "tz": False, "record_id": 3, "active_ids": + [ref("account_invoice_0")], "type": "out_invoice", "active_id": ref("account_invoice_0"), + }) +- + I make final partial payment of 2000 by clicking on Pay Invoice button +- + Creating a account.invoice.pay record +- + !record {model: account.invoice.pay, id: account_invoice_pay_final0}: + amount: 2000.0 + date: '2010-05-30' + journal_id: account.sales_journal + name: Final payment for [PC3] Medium PC to Distrib PC + period_id: account.period_5 + + +- + Performing an osv_memory action pay_and_reconcile on module account.invoice.pay +- + !python {model: account.invoice.pay}: | + self.pay_and_reconcile(cr, uid, [ref("account_invoice_pay_final0")], {"lang": + 'en_US', "active_model": "account.invoice", "tz": False, "record_id": 3, "active_ids": + [ref("account_invoice_0")], "type": "out_invoice", "active_id": ref("account_invoice_0"), + }) + +- + I check that the invoice state is now Done +- + !assert {model: account.invoice, id: account_invoice_0}: + - state == 'paid' +- + I check that an payment entry gets created in the account.move.line +- + !python {model: account.invoice}: | + acc_id=self.browse(cr, uid, ref("account_invoice_0")) + assert(acc_id.move_id) +#- +# I refund the invoice +#- +# Creating a account.invoice.refund record +#- +# !record {model: account.invoice.refund, id: account_invoice_refund_0}: +# description: Refund +# +#- +# Performing an osv_memory action invoice_refund on module account.invoice.refund +#- +# !python {model: account.invoice.refund}: | +# self.invoice_refund(cr, uid, [ref("account_invoice_refund_0")], {"lang": 'en_US', +# "tz": False, "active_model": "account.invoice", "active_ids": [ref("account.account_invoice_0")], +# "type": "out_invoice", "active_id": ref("account.account_invoice_0"), }) diff --git a/addons/account/test/account_supplier_invoice.yml b/addons/account/test/account_supplier_invoice.yml new file mode 100644 index 00000000000..62c77e3128d --- /dev/null +++ b/addons/account/test/account_supplier_invoice.yml @@ -0,0 +1,117 @@ +- + In order to test account invoice i create a new supplier invoice +- + Creating a account.invoice record +- + !record {model: account.invoice, id: account_invoice_0}: + account_id: account.a_pay + address_contact_id: base.res_partner_address_3000 + address_invoice_id: base.res_partner_address_3000 + check_total: 3000.0 + company_id: base.main_company + currency_id: base.EUR + invoice_line: + - account_id: account.a_expense + name: '[PC1] Basic PC' + price_unit: 300.0 + product_id: product.product_product_pc1 + quantity: 10.0 + uos_id: product.product_uom_unit + journal_id: account.expenses_journal + partner_id: base.res_partner_desertic_hispafuentes + reference_type: none + type: in_invoice +- + I check that Initially customer invoice is in the draft state +- + !assert {model: account.invoice, id: account_invoice_0}: + - state == 'draft' +- + I change the state of invoice to open by clicking Validate button +- + Performing a workflow action invoice_open on module account.invoice +- + !workflow {model: account.invoice, action: invoice_open, ref: account_invoice_0} +- + I check that the invoice state is now open +- + !assert {model: account.invoice, id: account_invoice_0}: + - state == 'open' +- + I make a partial payment of 2000 by clicking on Pay Invoice button +- + Creating a account.invoice.pay record +- + !record {model: account.invoice.pay, id: account_invoice_pay_firstpaymenttoaxelorforbasicpc0}: + amount: 2000.0 + date: '2010-05-29' + journal_id: account.sales_journal + name: First Payment to Axelor for Basic PC + period_id: account.period_5 + +- + Performing an osv_memory action pay_and_reconcile on module account.invoice.pay +- + !python {model: account.invoice.pay}: | + self.pay_and_reconcile(cr, uid, [ref("account_invoice_pay_firstpaymenttoaxelorforbasicpc0")], + {"lang": 'en_US', "active_model": "account.invoice", "tz": False, "record_id": + 25, "active_ids": [ref("account_invoice_0")], "type": "in_invoice", "active_id": + ref("account_invoice_0"), }) +- + I check that the invoice state is still open +- + !assert {model: account.invoice, id: account_invoice_0}: + - state == 'open' +- + I make final partial payment of 1000 by clicking on Pay Invoice button +- + Creating a account.invoice.pay record +- + !record {model: account.invoice.pay, id: account_invoice_pay_finalpaymenttoaxelorforbasicpc0}: + amount: 1000.0 + date: '2010-06-17' + journal_id: account.sales_journal + name: Final Payment to Axelor for Basic PC + period_id: account.period_5 + + +- + Performing an osv_memory action pay_and_reconcile on module account.invoice.pay +- + !python {model: account.invoice.pay}: | + self.pay_and_reconcile(cr, uid, [ref("account_invoice_pay_finalpaymenttoaxelorforbasicpc0")], + {"lang": 'en_US', "active_model": "account.invoice", "tz": False, "record_id": + 25, "active_ids": [ref("account_invoice_0")], "type": "in_invoice", "active_id": + ref("account_invoice_0"), }) + +- + I check that the invoice state is now Done +- + !assert {model: account.invoice, id: account_invoice_0}: + - state == 'paid' +- + I check that an payment entry gets created in the account.move.line +- + !python {model: account.invoice}: | + acc_id=self.browse(cr, uid, ref("account_invoice_0")) + assert(acc_id.move_id) +#- +# I refund the invoice +#- +# Creating a account.invoice.refund record +#- +# !record {model: account.invoice.refund, id: account_invoice_refund_0}: +# date: '2010-06-22' +# description: 'Refund By Axelor ' +# +# +#- +# Performing an osv_memory action invoice_refund on module account.invoice.refund +#- +# !python {model: account.invoice.refund}: | +# self.invoice_refund(cr, uid, [ref("account_invoice_refund_0")], {"lang": 'en_US', +# "tz": False, "active_model": "account.invoice", "active_ids": [ref("account_invoice_0")], +# "type": "in_invoice", "active_id": ref("account_invoice_0"), }) + + + From 9936ec6b22d92c2afaf33403041b05e31ea218ca Mon Sep 17 00:00:00 2001 From: apa-tiny Date: Thu, 27 May 2010 19:03:02 +0530 Subject: [PATCH 24/48] [IMP]:sale,project:Improved SQL reports(Sales Analysis,Tasks Analysis). bzr revid: apa@tinyerp.com-20100527133302-7s6ztbuw63yqdj90 --- addons/project/report/project_report_view.xml | 4 ++-- addons/sale/report/sale_report_view.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml index 4eac32fb284..9babb1655ef 100644 --- a/addons/project/report/project_report_view.xml +++ b/addons/project/report/project_report_view.xml @@ -55,10 +55,10 @@ - - diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml index 117eedf7af3..98ae326fc14 100644 --- a/addons/sale/report/sale_report_view.xml +++ b/addons/sale/report/sale_report_view.xml @@ -51,10 +51,10 @@ - - From a294f7166fa70c5f3f7574193b7f49101e006865 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Thu, 27 May 2010 15:45:13 +0200 Subject: [PATCH 25/48] account ledger reduce height bzr revid: al@openerp.com-20100527134513-7c2hob0ibtayh85m --- addons/account/report/general_ledger.rml | 4 ++-- addons/account/report/general_ledger_landscape.rml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/account/report/general_ledger.rml b/addons/account/report/general_ledger.rml index c711934639d..c69c981e35c 100644 --- a/addons/account/report/general_ledger.rml +++ b/addons/account/report/general_ledger.rml @@ -105,7 +105,7 @@
[[ repeatIn(get_children_accounts(a,data['form']), 'o') ]] - [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] + [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] @@ -156,7 +156,7 @@
[[ repeatIn(get_children_accounts(a,data['form']), 'o') ]] - [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]] + [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]] diff --git a/addons/account/report/general_ledger_landscape.rml b/addons/account/report/general_ledger_landscape.rml index ced60e69c8b..a707a47d0bd 100644 --- a/addons/account/report/general_ledger_landscape.rml +++ b/addons/account/report/general_ledger_landscape.rml @@ -104,7 +104,7 @@ [[ repeatIn(get_children_accounts(a,data['form']), 'o') ]] - [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]] + [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]] @@ -165,7 +165,7 @@ [[ repeatIn(get_children_accounts(a,data['form']), 'o') ]] - [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] + [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] From 5bfdd355b5b0e17cc12e789a77a5c0eaadc355f3 Mon Sep 17 00:00:00 2001 From: "Jay (Open ERP)" Date: Thu, 27 May 2010 19:48:54 +0530 Subject: [PATCH 26/48] [IMP] Project/Project_issue : Improvements for escalation and working hours to close/open the issue bzr revid: jvo@tinyerp.com-20100527141854-r66pf1bsihvdas4n --- addons/project/project.py | 14 ++++++-- addons/project/project_view.xml | 1 + addons/project_issue/project_issue.py | 37 +++++++++++++++++---- addons/project_issue/project_issue_view.xml | 5 +++ 4 files changed, 47 insertions(+), 10 deletions(-) diff --git a/addons/project/project.py b/addons/project/project.py index bdf7e30837e..61720675f49 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -135,6 +135,7 @@ class project(osv.osv): 'warn_header': fields.text('Mail Header', help="Header added at the beginning of the email for the warning message sent to the customer when a task is closed."), 'warn_footer': fields.text('Mail Footer', help="Footer added at the beginning of the email for the warning message sent to the customer when a task is closed."), 'type_ids': fields.many2many('project.task.type', 'project_task_type_rel', 'project_id', 'type_id', 'Tasks Stages'), + 'project_escalation_id' : fields.many2one('project.project','Project Escalation', help='If any issue is escalated from the current Project, it will be listed under the project selected here.'), } _order = "sequence" _defaults = { @@ -149,11 +150,18 @@ class project(osv.osv): if leave['date_start'] > leave['date']: return False return True - + + def _check_escalation(self, cr, uid, ids): + project_obj = self.browse(cr, uid, ids[0]) + if project_obj.project_escalation_id: + if project_obj.project_escalation_id.id == project_obj.id: + return False + return True + _constraints = [ - (_check_dates, 'Error! project start-date must be lower then project end-date.', ['date_start', 'date']) + (_check_dates, 'Error! project start-date must be lower then project end-date.', ['date_start', 'date']), + (_check_escalation, 'Error! You cannot assign escalation to the same project!', ['project_escalation_id']) ] - def set_template(self, cr, uid, ids, context={}): res = self.setActive(cr, uid, ids, value=False, context=context) return res diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 2228aa7aa11..fccf13c7a21 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -36,6 +36,7 @@ + diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py index b67ef6a849a..795c9883eca 100644 --- a/addons/project_issue/project_issue.py +++ b/addons/project_issue/project_issue.py @@ -112,16 +112,17 @@ class project_issue(osv.osv, crm.crm_case): _columns = { 'thread_id': fields.many2one('mailgate.thread', 'Thread', required=False), 'id': fields.integer('ID'), - 'name': fields.char('Name', size=128, required=True), - 'create_date': fields.datetime('Creation Date' , readonly=True), - 'write_date': fields.datetime('Update Date' , readonly=True), - 'date_deadline': fields.date('Deadline'), - 'date_closed': fields.datetime('Closed', readonly=True), + 'name': fields.char('Name', size=128, required=True), + 'active': fields.boolean('Active', required=False), + 'create_date': fields.datetime('Creation Date' , readonly=True), + 'write_date': fields.datetime('Update Date' , readonly=True), + 'date_deadline': fields.date('Deadline'), + 'date_closed': fields.datetime('Closed', readonly=True), 'section_id': fields.many2one('crm.case.section', 'Sales Team', \ select=True, help='Sales team to which Case belongs to.\ Define Responsible user and Email account for mail gateway.'), - 'user_id': fields.many2one('res.users', 'Responsible'), - 'partner_id': fields.many2one('res.partner', 'Partner'), + 'user_id': fields.many2one('res.users', 'Responsible'), + 'partner_id': fields.many2one('res.partner', 'Partner'), 'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', \ domain="[('partner_id','=',partner_id)]"), 'company_id': fields.many2one('res.company', 'Company'), @@ -163,6 +164,8 @@ class project_issue(osv.osv, crm.crm_case): 'day_close': fields.function(_compute_day, string='Days to Close', \ method=True, multi='day_close', type="float", store=True), 'assigned_to' : fields.many2one('res.users', 'Assigned to'), + 'working_hours_open': fields.float('Working Hours to Open the Issue'), + 'working_hours_close': fields.float('Working Hours to Close the Issue'), } def _get_project(self, cr, uid, context): @@ -172,6 +175,7 @@ class project_issue(osv.osv, crm.crm_case): return False _defaults = { + 'active': lambda *a: 1, 'user_id': crm.crm_case._get_default_user, 'partner_id': crm.crm_case._get_default_partner, 'partner_address_id': crm.crm_case._get_default_partner_address, @@ -260,6 +264,25 @@ class project_issue(osv.osv, crm.crm_case): if not stage.on_change: return {'value':{}} return {'value':{}} + + def case_escalate(self, cr, uid, ids, *args): + """Escalates case to top level + @param self: The object pointer + @param cr: the current row, from the database cursor, + @param uid: the current user’s ID for security checks, + @param ids: List of case Ids + @param *args: Tuple Value for additional Params + """ + res = super(project_issue, self).case_escalate(cr, uid, ids, args) + cases = self.browse(cr, uid, ids) + for case in cases: + data = {} + if case.project_id.project_escalation_id: + data['project_id'] = case.project_id.project_escalation_id.id + else: + raise osv.except_osv(_('Warning !'), _('You cannot escalate this case.\nThe relevant Project has not configured the Escalation Project!')) + self.write(cr, uid, [case.id], data) + return res project_issue() diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml index 27b72e459ef..9362e858b1e 100644 --- a/addons/project_issue/project_issue_view.xml +++ b/addons/project_issue/project_issue_view.xml @@ -82,8 +82,13 @@ + + + + + From 88c7f0dcf466bc796f1aec5e34473ac0369d0a12 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Thu, 27 May 2010 20:08:15 +0200 Subject: [PATCH 27/48] [IMP] marketing_campaign sentences bzr revid: fp@tinyerp.com-20100527180815-aoffbsih0ivot7d9 --- .../marketing_campaign_view.xml | 206 +++++++++--------- 1 file changed, 103 insertions(+), 103 deletions(-) diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml index 9c9d4e96c14..5a7f8529cc0 100755 --- a/addons/marketing_campaign/marketing_campaign_view.xml +++ b/addons/marketing_campaign/marketing_campaign_view.xml @@ -1,8 +1,8 @@ - - - + + id="menu_action_account_bank_reconcile_check_tree" + parent="account.next_id_30" /> ','view')]), @@ -139,43 +143,60 @@ class account_voucher(osv.osv): } _defaults = { - 'state': lambda *a: 'draft', - 'date' : lambda *a: time.strftime('%Y-%m-%d'), 'period_id': _get_period, 'type': _get_type, - 'reference_type': lambda *a: 'none', 'journal_id':_get_journal, - 'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.voucher', context=c), 'currency_id': _get_currency, + + 'state': lambda *a: 'draft', + 'date' : lambda *a: time.strftime('%Y-%m-%d'), + 'reference_type': lambda *a: "none", + 'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.voucher',context=c), } - def _get_analityc_lines(self, cr, uid, id): - inv = self.browse(cr, uid, [id])[0] - cur_obj = self.pool.get('res.currency') +# def _get_analityc_lines(self, cr, uid, id): +# inv = self.browse(cr, uid, [id])[0] +# cur_obj = self.pool.get('res.currency') def onchange_account(self, cr, uid, ids, account_id): + if not account_id: - return {'value':{'amount':False}} - account = self.pool.get('account.account').browse(cr,uid,account_id) + return { + 'value':{'amount':False} + } + + account = self.pool.get('account.account').browse(cr, uid, account_id) balance=account.balance - return {'value':{'amount':balance}} + return { + 'value':{'amount':balance} + } def onchange_journal(self, cr, uid, ids, journal_id, type): if not journal_id: - return {'value':{'account_id':False}} + return { + 'value':{'account_id':False} + } + journal = self.pool.get('account.journal') + if journal_id and (type in ('rec_voucher','bank_rec_voucher','journal_pur_voucher','journal_voucher')): account_id = journal.browse(cr, uid, journal_id).default_debit_account_id - return {'value':{'account_id':account_id.id}} + return { + 'value':{'account_id':account_id.id} + } elif journal_id and (type in ('pay_voucher','bank_pay_voucher','journal_sale_vou')) : account_id = journal.browse(cr, uid, journal_id).default_credit_account_id - return {'value':{'account_id':account_id.id}} + return { + 'value':{'account_id':account_id.id} + } else: account_id = journal.browse(cr, uid, journal_id).default_credit_account_id - return {'value':{'account_id':account_id.id}} + return { + 'value':{'account_id':account_id.id} + } def open_voucher(self, cr, uid, ids, context={}): - obj = self.pool.get('account.voucher').browse(cr,uid,ids) + obj = self.pool.get('account.voucher').browse(cr, uid, ids) total = 0 for i in obj[0].payment_ids: total += i.amount @@ -208,8 +229,7 @@ class account_voucher(osv.osv): unlink_ids.append(t['id']) else: raise osv.except_osv('Invalid action !', 'Cannot delete Voucher(s) which are already opened or paid !') - osv.osv.unlink(self, cr, uid, unlink_ids) - return True + return super(account_voucher, self).unlink(self, cr, uid, unlink_ids) def _get_analytic_lines(self, cr, uid, id): inv = self.browse(cr, uid, [id])[0] @@ -242,9 +262,12 @@ class account_voucher(osv.osv): return iml def action_move_line_create(self, cr, uid, ids, *args): + for inv in self.browse(cr, uid, ids): + if inv.move_id: continue + company_currency = inv.company_id.currency_id.id line_ids = self.read(cr, uid, [inv.id], ['payment_ids'])[0]['payment_ids'] @@ -312,7 +335,8 @@ class account_voucher(osv.osv): 'name' : name, 'journal_id': journal_id, 'type' : inv.type, - 'narration' : inv.narration + 'narration' : inv.narration, + 'date':inv.date } if inv.period_id: move['period_id'] = inv.period_id.id @@ -362,13 +386,14 @@ class account_voucher(osv.osv): elif line.type == 'cr': move_line['credit'] = line.amount or False amount=line.amount * (-1) - + + move_line['analytic_account_id'] = line.account_analytic_id.id or False ml_id=self.pool.get('account.move.line').create(cr, uid, move_line) if inv.narration: - line.name=inv.narration + line.name = inv.narration else: - line.name=line.name + line.name = line.name if line.account_analytic_id: an_line = { @@ -393,7 +418,6 @@ class account_voucher(osv.osv): def line_get_convert(self, cr, uid, x, date, context={}): - return { 'date':date, 'date_maturity': x.get('date_maturity', False), @@ -409,6 +433,7 @@ class account_voucher(osv.osv): 'tax_amount': x.get('tax_amount', False), 'ref':x.get('ref',False) } + def _convert_ref(self, cr, uid, ref): return (ref or '').replace('/','') @@ -547,7 +572,6 @@ class account_voucher_line(osv.osv): if not amount: return {'value' : {}} if partner_id: - obj = self.pool.get('res.partner') if type1 in ('rec_voucher', 'bank_rec_voucher', 'journal_voucher'): if amount < 0 : @@ -583,34 +607,23 @@ class account_voucher_line(osv.osv): else: if type1 in ('rec_voucher', 'bank_rec_voucher', 'journal_voucher'): if amount < 0 : - type = 'dr' else: - type = 'cr' - elif type1 in ('pay_voucher','bank_pay_voucher','cont_voucher') : if amount < 0 : - type = 'cr' else: - type = 'dr' - elif type1 in ('journal_sale_vou') : if amount < 0 : - type = 'cr' else: - type = 'dr' - elif type1 in ('journal_pur_voucher') : if amount< 0 : - type = 'dr' else: - type = 'cr' return { @@ -619,9 +632,7 @@ class account_voucher_line(osv.osv): def onchange_type(self, cr, uid, ids,partner_id,amount,type,type1): if partner_id: - obj = self.pool.get('res.partner') - if type1 in ('rec_voucher','bank_rec_voucher', 'journal_voucher'): if type == 'dr' : account_id = obj.browse(cr, uid, partner_id).property_account_payable @@ -645,7 +656,6 @@ class account_voucher_line(osv.osv): else: account_id = obj.browse(cr, uid, partner_id).property_account_receivable total=amount*(-1) - elif type1 in ('journal_pur_voucher') : if type == 'dr' : account_id = obj.browse(cr, uid, partner_id).property_account_receivable @@ -656,34 +666,25 @@ class account_voucher_line(osv.osv): else: if type1 in ('rec_voucher','bank_rec_voucher', 'journal_voucher'): if type == 'dr' : - total=amount*(-1) else: - total=amount*(-1) elif type1 in ('pay_voucher','bank_pay_voucher','cont_voucher') : if type == 'cr' : - total=amount*(-1) else: - total=amount*(-1) elif type1 in ('journal_sale_vou') : if type == 'cr' : - total=amount*(-1) else: - total=amount*(-1) - elif type1 in ('journal_pur_voucher') : if type == 'dr' : - total=amount*(-1) else: - total=amount*(-1) return { @@ -702,9 +703,3 @@ class account_voucher_line(osv.osv): } account_voucher_line() - - - - - - diff --git a/addons/account_voucher/voucher_sequence.xml b/addons/account_voucher/voucher_sequence.xml index a8e56728542..c7f56051014 100644 --- a/addons/account_voucher/voucher_sequence.xml +++ b/addons/account_voucher/voucher_sequence.xml @@ -1,110 +1,90 @@ + + + Voucher + account.voucher + + + + Cash Receipt + rec_voucher + + + + Cash Payment + pay_voucher + + + Bank Receipt + bank_rec_voucher + + + Bank Payment + bank_pay_voucher + + + Contra Entry + cont_voucher + + + Sales Entry + journal_sale_vou + + + Purchase Entry + journal_pur_vou + + + + + Cash Receipt + rec_voucher + + %(year)s/ + + + + Cash Payment + pay_voucher + + %(year)s/ + + + Bank Receipt + bank_rec_voucher + + %(year)s/ + + + Bank Payment + bank_pay_voucher + + %(year)s/ + + + Contra Entry + cont_voucher + + %(year)s/ + + + Sales Entry + journal_sale_vou + + %(year)s/ + + + Purchase Entry + journal_pur_vou + + %(year)s/ + - - - Voucher - account.voucher - - - - - Account Cash Received Voucher - rec_voucher - - - - Account Cash Payble Voucher - pay_voucher - - - Account Bank Received Voucher - bank_rec_voucher - - - Account Bank Payble Voucher - bank_pay_voucher - - - Account Contra Voucher - cont_voucher - - - Account Journal Voucher - journal_sale_vou - - - Account Journal Voucher - journal_pur_vou - - - - - Account Cash Received Voucher - rec_voucher - - %(year)s/ - - - - Account Cash Payble Voucher - pay_voucher - - %(year)s/ - - - Account Bank Received Voucher - bank_rec_voucher - - %(year)s/ - - - Account Bank Payble Voucher - bank_pay_voucher - - %(year)s/ - - - Account Contra Voucher - cont_voucher - - %(year)s/ - - - Account Journal Voucher - journal_sale_vou - - %(year)s/ - - - Account Journal Voucher - journal_pur_vou - - %(year)s/ - - - - + diff --git a/addons/account_voucher/voucher_view.xml b/addons/account_voucher/voucher_view.xml index 08262bb17df..6eb6988480d 100644 --- a/addons/account_voucher/voucher_view.xml +++ b/addons/account_voucher/voucher_view.xml @@ -28,12 +28,10 @@ + - - - @@ -100,147 +98,153 @@ + + + + + + - Receivable Entries + Voucher Entries account.voucher form tree,form - [('type','like','rec_voucher')] - {'type':'rec_voucher'} + + - - Cash Receipt - account.voucher - form - tree,form - - [('type','=','rec_voucher')] - {'type':'rec_voucher'} - - + + + + + + + + + + + - - Bank Receipt - account.voucher - form - tree,form - - [('type','=','bank_rec_voucher')] - {'type':'bank_rec_voucher'} - - + + + + + + + + + + + - - Payable Entries - account.voucher - form - tree,form - - [('type','like','pay_voucher')] - {'type':'pay_voucher'} - - + + + + + + + + + + + - - Cash Payment - account.voucher - form - tree,form - - [('type','=','pay_voucher')] - {'type':'pay_voucher'} - - + + + + + + + + + + + - - Bank Payment - account.voucher - form - tree,form - - [('type','=','bank_pay_voucher')] - {'type':'bank_pay_voucher'} - - + + + + + + + + + + + - + - - Other Entries - account.voucher - form - tree,form - - - + + + + + + + + + - - Contra Entries - account.voucher - form - tree,form - - [('type','=','cont_voucher')] - {'type':'cont_voucher'} - - + + + + + + + + + + + - - Journal Sale - account.voucher - form - tree,form - - [('type','=','journal_sale_vou')] - {'type':'journal_sale_vou'} - - + + + + + + + + + + + - - Journal Purchase - account.voucher - form - tree,form - - [('type','=','journal_pur_voucher')] - {'type':'journal_pur_voucher'} - - + + + + + + + + + + + - - Journal Voucher - account.voucher - form - tree,form - - [('type','=','journal_voucher')] - {'type':'journal_voucher'} - - + + + + + + + + + + + account.journal.form.inherit From ab1423b7f3a0860088715f85782ab9044241f25f Mon Sep 17 00:00:00 2001 From: Mantavya Gajjar Date: Fri, 28 May 2010 01:36:38 +0530 Subject: [PATCH 29/48] [FIX]: change a name of class bzr revid: mga@tinyerp.com-20100527200638-sdsoahor01kwsbpc --- .../account_voucher_payment.py | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/addons/account_voucher_payment/account_voucher_payment.py b/addons/account_voucher_payment/account_voucher_payment.py index 3d08ad9e1f3..1cd1da98208 100755 --- a/addons/account_voucher_payment/account_voucher_payment.py +++ b/addons/account_voucher_payment/account_voucher_payment.py @@ -205,11 +205,11 @@ class account_voucher(osv.osv): account_voucher() -class VoucherLine(osv.osv): +class account_voucher_line(osv.osv): _inherit = 'account.voucher.line' def default_get(self, cr, uid, fields, context={}): - data = super(VoucherLine, self).default_get(cr, uid, fields, context) + data = super(account_voucher_line, self).default_get(cr, uid, fields, context) self.voucher_context = context return data @@ -217,9 +217,8 @@ class VoucherLine(osv.osv): 'invoice_id' : fields.many2one('account.invoice','Invoice'), } - def move_line_get_item(self, cr, uid, line, context={}): - res = super(VoucherLine, self).move_line_get_item(cr, uid, line, context) + res = super(account_voucher_line, self).move_line_get_item(cr, uid, line, context) res['invoice'] = line.invoice_id or False return res @@ -262,18 +261,13 @@ class VoucherLine(osv.osv): return { 'value' : {'type' : type, 'amount':balance} } - -VoucherLine() - - +account_voucher_line() class account_invoice(osv.osv): _inherit = "account.invoice" def action_cancel(self, cr, uid, ids, *args): - res = super(account_invoice, self).action_cancel(cr, uid, ids, *args) - invoices = self.read(cr, uid, ids, ['move_id']) voucher_db = self.pool.get('account.voucher') voucher_ids = voucher_db.search(cr, uid, []) @@ -281,7 +275,6 @@ class account_invoice(osv.osv): move_db = self.pool.get('account.move') move_ids = move_db.search(cr, uid, []) move_obj = move_db.browse(cr, uid, move_ids) - return res account_invoice() From 96fb2d0688aa798fc890a4ba7d5273a7bad91a71 Mon Sep 17 00:00:00 2001 From: Launchpad Code Hosting Date: Fri, 28 May 2010 04:39:49 +0100 Subject: [PATCH 30/48] Launchpad automatic translations update. bzr revid: codehost@crowberry-20100528033949-p2any73ahsqhddca --- addons/account_analytic_plans/i18n/id.po | 44 +++---- addons/account_anglo_saxon/i18n/id.po | 64 +++++++++ addons/account_budget/i18n/id.po | 72 +++++----- addons/account_chart/i18n/id.po | 8 +- addons/account_date_check/i18n/id.po | 32 +++++ addons/account_followup/i18n/pt.po | 124 +++++++++++++----- .../analytic_journal_billing_rate/i18n/id.po | 13 +- addons/base_setup/i18n/id.po | 40 +++--- addons/crm_profiling/i18n/pt.po | 8 +- 9 files changed, 277 insertions(+), 128 deletions(-) create mode 100644 addons/account_anglo_saxon/i18n/id.po create mode 100644 addons/account_date_check/i18n/id.po diff --git a/addons/account_analytic_plans/i18n/id.po b/addons/account_analytic_plans/i18n/id.po index 778d68ecd7d..bb4edb18b29 100644 --- a/addons/account_analytic_plans/i18n/id.po +++ b/addons/account_analytic_plans/i18n/id.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-11-09 13:43+0000\n" -"Last-Translator: <>\n" +"PO-Revision-Date: 2010-05-28 02:33+0000\n" +"Last-Translator: Abdul Munif Hanafi \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n" +"X-Launchpad-Export-Date: 2010-05-28 03:39+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_analytic_plans @@ -41,7 +41,7 @@ msgstr "" #. module: account_analytic_plans #: wizard_field:wizard.crossovered.analytic,init,date2:0 msgid "End Date" -msgstr "" +msgstr "Tanggal Akhir" #. module: account_analytic_plans #: field:account.analytic.plan.instance.line,rate:0 @@ -70,7 +70,7 @@ msgstr "" #. module: account_analytic_plans #: wizard_button:wizard.crossovered.analytic,init,print:0 msgid "Print" -msgstr "" +msgstr "Cetak" #. module: account_analytic_plans #: rml:account.analytic.account.crossovered.analytic:0 @@ -90,7 +90,7 @@ msgstr "" #. module: account_analytic_plans #: rml:account.analytic.account.crossovered.analytic:0 msgid "Account Name" -msgstr "" +msgstr "Nama Akun" #. module: account_analytic_plans #: view:account.analytic.plan.instance.line:0 @@ -100,7 +100,7 @@ msgstr "" #. module: account_analytic_plans #: field:account.analytic.plan.instance,code:0 msgid "Distribution Code" -msgstr "" +msgstr "Kode Distribusi" #. module: account_analytic_plans #: constraint:ir.actions.act_window:0 @@ -115,17 +115,17 @@ msgstr "" #. module: account_analytic_plans #: rml:account.analytic.account.crossovered.analytic:0 msgid "Printing date" -msgstr "" +msgstr "Tanggal mencetak" #. module: account_analytic_plans #: rml:account.analytic.account.crossovered.analytic:0 msgid "Percentage" -msgstr "" +msgstr "Persentase" #. module: account_analytic_plans #: wizard_field:wizard.crossovered.analytic,init,empty_line:0 msgid "Dont show empty lines" -msgstr "" +msgstr "Jangan tampilkan baris kosong" #. module: account_analytic_plans #: wizard_view:wizard.crossovered.analytic,init:0 @@ -141,12 +141,12 @@ msgstr "" #: field:account.analytic.plan.instance,journal_id:0 #: wizard_field:wizard.crossovered.analytic,init,journal_ids:0 msgid "Analytic Journal" -msgstr "" +msgstr "Jurnal Analisis" #. module: account_analytic_plans #: rml:account.analytic.account.crossovered.analytic:0 msgid "100.00%" -msgstr "" +msgstr "100.00%" #. module: account_analytic_plans #: wizard_field:wizard.crossovered.analytic,init,ref:0 @@ -300,7 +300,7 @@ msgstr "" #. module: account_analytic_plans #: rml:account.analytic.account.crossovered.analytic:0 msgid "Quantity" -msgstr "" +msgstr "Kwantitas" #. module: account_analytic_plans #: field:account.analytic.plan.instance,account_ids:0 @@ -310,17 +310,17 @@ msgstr "" #. module: account_analytic_plans #: rml:account.analytic.account.crossovered.analytic:0 msgid "Code" -msgstr "" +msgstr "Kode" #. module: account_analytic_plans #: wizard_button:create.model,info,end:0 msgid "OK" -msgstr "" +msgstr "Setuju" #. module: account_analytic_plans #: field:account.analytic.plan.line,root_analytic_id:0 msgid "Root Account" -msgstr "" +msgstr "Akun Induk" #. module: account_analytic_plans #: wizard_view:create.model,info:0 @@ -331,12 +331,12 @@ msgstr "" #. module: account_analytic_plans #: field:account.analytic.plan.line,sequence:0 msgid "Sequence" -msgstr "" +msgstr "Berurutan" #. module: account_analytic_plans #: field:account.analytic.plan.instance.line,analytic_account_id:0 msgid "Analytic Account" -msgstr "" +msgstr "Akun Analisis" #. module: account_analytic_plans #: field:account.analytic.default,analytics_id:0 @@ -355,19 +355,19 @@ msgstr "" #. module: account_analytic_plans #: wizard_button:wizard.crossovered.analytic,init,end:0 msgid "Cancel" -msgstr "" +msgstr "Batal" #. module: account_analytic_plans #: wizard_field:wizard.crossovered.analytic,init,date1:0 msgid "Start Date" -msgstr "" +msgstr "Tanggal Mulai" #. module: account_analytic_plans #: rml:account.analytic.account.crossovered.analytic:0 msgid "at" -msgstr "" +msgstr "pada" #. module: account_analytic_plans #: rml:account.analytic.account.crossovered.analytic:0 msgid "From Date" -msgstr "" +msgstr "Dari Tanggal" diff --git a/addons/account_anglo_saxon/i18n/id.po b/addons/account_anglo_saxon/i18n/id.po new file mode 100644 index 00000000000..bf59eb13b73 --- /dev/null +++ b/addons/account_anglo_saxon/i18n/id.po @@ -0,0 +1,64 @@ +# Indonesian translation for openobject-addons +# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2009-11-24 12:50+0000\n" +"PO-Revision-Date: 2010-05-28 02:49+0000\n" +"Last-Translator: Abdul Munif Hanafi \n" +"Language-Team: Indonesian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2010-05-28 03:39+0000\n" +"X-Generator: Launchpad (build Unknown)\n" + +#. module: account_anglo_saxon +#: view:product.category:0 +msgid " Accounting Property" +msgstr "" + +#. module: account_anglo_saxon +#: model:ir.module.module,description:account_anglo_saxon.module_meta_information +msgid "" +"This module will support the Anglo-Saxons accounting methodology by \n" +" changing the accounting logic with stock transactions. The difference " +"between the Anglo-Saxon accounting countries \n" +" and the Rhine or also called Continental accounting countries is the " +"moment of taking the Cost of Goods Sold versus Cost of Sales. \n" +" Anglo-Saxons accounting does take the cost when sales invoice is " +"created, Continental accounting will take the cost at he moment the goods " +"are shipped.\n" +" This module will add this functionality by using a interim account, to " +"store the value of shipped goods and will contra book this interim account \n" +" when the invoice is created to transfer this amount to the debtor or " +"creditor account." +msgstr "" + +#. module: account_anglo_saxon +#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information +msgid "Stock Account" +msgstr "" + +#. module: account_anglo_saxon +#: constraint:ir.ui.view:0 +msgid "Invalid XML for View Architecture!" +msgstr "XML tidak sah untuk Menampilkan Arsitektur!" + +#. module: account_anglo_saxon +#: field:product.category,property_account_creditor_price_difference_categ:0 +#: field:product.template,property_account_creditor_price_difference:0 +msgid "Price Difference Account" +msgstr "" + +#. module: account_anglo_saxon +#: help:product.category,property_account_creditor_price_difference_categ:0 +#: help:product.template,property_account_creditor_price_difference:0 +msgid "" +"This account will be used to value price difference between purchase price " +"and cost price." +msgstr "" diff --git a/addons/account_budget/i18n/id.po b/addons/account_budget/i18n/id.po index 34ed713c9c3..2c3e8b90cca 100644 --- a/addons/account_budget/i18n/id.po +++ b/addons/account_budget/i18n/id.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-11-09 13:43+0000\n" -"Last-Translator: <>\n" +"PO-Revision-Date: 2010-05-28 02:58+0000\n" +"Last-Translator: Abdul Munif Hanafi \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-04-17 04:19+0000\n" +"X-Launchpad-Export-Date: 2010-05-28 03:39+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_budget @@ -24,7 +24,7 @@ msgstr "" #. module: account_budget #: rml:account.budget:0 msgid "% performance" -msgstr "" +msgstr "% performa" #. module: account_budget #: model:ir.actions.act_window,name:account_budget.open_budget_post_form @@ -35,18 +35,18 @@ msgstr "" #. module: account_budget #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "" +msgstr "Nama model tidak sah di definsi aksi" #. module: account_budget #: rml:account.analytic.account.budget:0 #: rml:crossovered.budget.report:0 msgid "Printed at:" -msgstr "" +msgstr "Dicetak pada:" #. module: account_budget #: view:crossovered.budget:0 msgid "Confirm" -msgstr "" +msgstr "Konfirmasi" #. module: account_budget #: field:crossovered.budget,validating_user_id:0 @@ -62,12 +62,12 @@ msgstr "" #. module: account_budget #: selection:crossovered.budget,state:0 msgid "Confirmed" -msgstr "" +msgstr "Dikonfirmasi" #. module: account_budget #: field:account.budget.post.dotation,period_id:0 msgid "Period" -msgstr "" +msgstr "Periode" #. module: account_budget #: wizard_field:account.budget.report,init,date2:0 @@ -80,7 +80,7 @@ msgstr "" #. module: account_budget #: rml:account.budget:0 msgid "Printing date:" -msgstr "" +msgstr "Tanggal dicetak :" #. module: account_budget #: selection:crossovered.budget,state:0 @@ -92,7 +92,7 @@ msgstr "" #: rml:account.budget:0 #: rml:crossovered.budget.report:0 msgid "at" -msgstr "" +msgstr "pada" #. module: account_budget #: view:account.budget.post:0 @@ -102,7 +102,7 @@ msgstr "" #. module: account_budget #: rml:account.budget:0 msgid "Performance" -msgstr "" +msgstr "Kinerja" #. module: account_budget #: rml:account.analytic.account.budget:0 @@ -114,22 +114,22 @@ msgstr "" #. module: account_budget #: rml:account.budget:0 msgid "From" -msgstr "" +msgstr "Dari" #. module: account_budget #: field:crossovered.budget.lines,percentage:0 msgid "Percentage" -msgstr "" +msgstr "Persentase" #. module: account_budget #: rml:account.budget:0 msgid "Results" -msgstr "" +msgstr "Hasil" #. module: account_budget #: field:crossovered.budget,state:0 msgid "Status" -msgstr "" +msgstr "Status" #. module: account_budget #: model:ir.module.module,description:account_budget.module_meta_information @@ -171,7 +171,7 @@ msgstr "" #: rml:account.analytic.account.budget:0 #: rml:crossovered.budget.report:0 msgid "Description" -msgstr "" +msgstr "Keterangan" #. module: account_budget #: rml:account.analytic.account.budget:0 @@ -184,7 +184,7 @@ msgstr "" #: wizard_button:wizard.crossovered.budget,init,report:0 #: wizard_button:wizard.crossovered.budget.summary,init,report:0 msgid "Print" -msgstr "" +msgstr "Cetak" #. module: account_budget #: rml:account.budget:0 @@ -203,7 +203,7 @@ msgstr "" #: rml:account.budget:0 #: rml:crossovered.budget.report:0 msgid "Total :" -msgstr "" +msgstr "Total :" #. module: account_budget #: rml:account.analytic.account.budget:0 @@ -232,7 +232,7 @@ msgstr "" #: view:crossovered.budget:0 #: selection:crossovered.budget,state:0 msgid "Done" -msgstr "" +msgstr "Selesai" #. module: account_budget #: view:crossovered.budget:0 @@ -256,12 +256,12 @@ msgstr "" #: field:crossovered.budget,date_to:0 #: field:crossovered.budget.lines,date_to:0 msgid "End Date" -msgstr "" +msgstr "Tanggal berakhir" #. module: account_budget #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" -msgstr "" +msgstr "XML tidak sah untuk Menampilkan Arsitektur!" #. module: account_budget #: field:crossovered.budget.lines,theoritical_amount:0 @@ -273,7 +273,7 @@ msgstr "" #: field:account.budget.post.dotation,name:0 #: field:crossovered.budget,name:0 msgid "Name" -msgstr "" +msgstr "Nama" #. module: account_budget #: model:ir.actions.wizard,name:account_budget.wizard_crossovered_budget_menu_1 @@ -300,12 +300,12 @@ msgstr "" #: model:ir.model,name:account_budget.model_crossovered_budget #: model:ir.ui.menu,name:account_budget.menu_act_crossovered_budget_view msgid "Budget" -msgstr "" +msgstr "Anggaran" #. module: account_budget #: field:account.budget.post.dotation,post_id:0 msgid "Item" -msgstr "" +msgstr "Item" #. module: account_budget #: field:account.budget.post.dotation,amount:0 @@ -316,19 +316,19 @@ msgstr "" #. module: account_budget #: field:crossovered.budget.lines,paid_date:0 msgid "Paid Date" -msgstr "" +msgstr "Tanggal Dibayar" #. module: account_budget #: model:ir.actions.act_window,name:account_budget.action_account_budget_post_tree #: model:ir.ui.menu,name:account_budget.menu_action_account_budget_post_tree #: model:ir.ui.menu,name:account_budget.next_id_31 msgid "Budgets" -msgstr "" +msgstr "Anggaran" #. module: account_budget #: selection:crossovered.budget,state:0 msgid "Cancelled" -msgstr "" +msgstr "Dibatalkan" #. module: account_budget #: view:account.budget.post.dotation:0 @@ -373,7 +373,7 @@ msgstr "" #: field:account.budget.post,code:0 #: field:crossovered.budget,code:0 msgid "Code" -msgstr "" +msgstr "Kode" #. module: account_budget #: field:account.budget.post.dotation,tot_planned:0 @@ -404,12 +404,12 @@ msgstr "" #. module: account_budget #: field:crossovered.budget.lines,analytic_account_id:0 msgid "Analytic Account" -msgstr "" +msgstr "Akun Analisis" #. module: account_budget #: rml:crossovered.budget.report:0 msgid "Budget :" -msgstr "" +msgstr "Anggaran :" #. module: account_budget #: rml:account.budget:0 @@ -423,12 +423,12 @@ msgstr "" #: view:account.budget.post:0 #: field:account.budget.post,account_ids:0 msgid "Accounts" -msgstr "" +msgstr "Akun" #. module: account_budget #: model:ir.actions.report.xml,name:account_budget.account_budget msgid "Print Budget" -msgstr "" +msgstr "Cetak Anggaran" #. module: account_budget #: view:account.analytic.account:0 @@ -453,7 +453,7 @@ msgstr "" #: wizard_button:wizard.crossovered.budget,init,end:0 #: wizard_button:wizard.crossovered.budget.summary,init,end:0 msgid "Cancel" -msgstr "" +msgstr "Batal" #. module: account_budget #: model:ir.module.module,shortdesc:account_budget.module_meta_information @@ -464,7 +464,7 @@ msgstr "" #: field:crossovered.budget,date_from:0 #: field:crossovered.budget.lines,date_from:0 msgid "Start Date" -msgstr "" +msgstr "Tanggal Mulai" #. module: account_budget #: rml:account.analytic.account.budget:0 @@ -480,4 +480,4 @@ msgstr "" #. module: account_budget #: wizard_view:account.budget.report,init:0 msgid "Select period" -msgstr "" +msgstr "Pilih periode" diff --git a/addons/account_chart/i18n/id.po b/addons/account_chart/i18n/id.po index ebc6cfb3d7b..058e3f8f5a2 100644 --- a/addons/account_chart/i18n/id.po +++ b/addons/account_chart/i18n/id.po @@ -7,16 +7,16 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-11-09 13:43+0000\n" -"Last-Translator: <>\n" +"PO-Revision-Date: 2010-05-28 02:43+0000\n" +"Last-Translator: Abdul Munif Hanafi \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n" +"X-Launchpad-Export-Date: 2010-05-28 03:39+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_chart #: model:ir.module.module,description:account_chart.module_meta_information msgid "Remove minimal account chart" -msgstr "" +msgstr "Buang grafik akun minimal" diff --git a/addons/account_date_check/i18n/id.po b/addons/account_date_check/i18n/id.po new file mode 100644 index 00000000000..79a166f2119 --- /dev/null +++ b/addons/account_date_check/i18n/id.po @@ -0,0 +1,32 @@ +# Translation of OpenERP Server. +# This file contains the translation of the following modules: +# * account_date_check +# +msgid "" +msgstr "" +"Project-Id-Version: OpenERP Server 5.0.4\n" +"Report-Msgid-Bugs-To: support@openerp.com\n" +"POT-Creation-Date: 2009-08-28 16:01+0000\n" +"PO-Revision-Date: 2010-05-28 02:46+0000\n" +"Last-Translator: Abdul Munif Hanafi \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2010-05-28 03:39+0000\n" +"X-Generator: Launchpad (build Unknown)\n" + +#. module: account_date_check +#: constraint:ir.ui.view:0 +msgid "Invalid XML for View Architecture!" +msgstr "XML tidak sah untuk Menampilkan Arsitektur!" + +#. module: account_date_check +#: field:account.journal,allow_date:0 +msgid "Allows date not in the period" +msgstr "" + +#. module: account_date_check +#: model:ir.module.module,shortdesc:account_date_check.module_meta_information +msgid "Account Date check" +msgstr "Tanggal periksa Akun" diff --git a/addons/account_followup/i18n/pt.po b/addons/account_followup/i18n/pt.po index 7246ad73a2e..11aa146ef83 100644 --- a/addons/account_followup/i18n/pt.po +++ b/addons/account_followup/i18n/pt.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-11-28 23:22+0000\n" -"Last-Translator: Paulino \n" +"PO-Revision-Date: 2010-05-28 02:17+0000\n" +"Last-Translator: cmsa \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n" +"X-Launchpad-Export-Date: 2010-05-28 03:39+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_followup @@ -35,7 +35,7 @@ msgstr "Ref. do Cliente:" #: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_payable_all #: model:ir.ui.menu,name:account_followup.menu_account_move_open_unreconcile_payable msgid "All payable entries" -msgstr "Todas os movimentos a pagar" +msgstr "Todos os movimentos a pagar" #. module: account_followup #: constraint:ir.actions.act_window:0 @@ -50,7 +50,7 @@ msgstr "Mensagem impressa" #. module: account_followup #: rml:account_followup.followup.print:0 msgid "Amount In Currency" -msgstr "Montante em Divisa" +msgstr "Montante em Numerário" #. module: account_followup #: rml:account_followup.followup.print:0 @@ -71,13 +71,13 @@ msgstr "%(user_signature)s: Nome de utilizador" #. module: account_followup #: wizard_view:account_followup.followup.print.all,next:0 msgid "Select partners" -msgstr "Seleccionar Terceiros" +msgstr "Seleccionar Parceiros" #. module: account_followup #: view:account_followup.followup:0 #: field:account_followup.followup,followup_line:0 msgid "Follow-Up" -msgstr "Continuação" +msgstr "Dar Seguimento" #. module: account_followup #: field:account_followup.stat,debit:0 @@ -87,7 +87,7 @@ msgstr "Débito" #. module: account_followup #: wizard_view:account_followup.followup.print.all,next:0 msgid "Email Settings" -msgstr "" +msgstr "Parâmetros de Email" #. module: account_followup #: field:account_followup.stat,account_type:0 @@ -97,34 +97,34 @@ msgstr "Tipo de Conta" #. module: account_followup #: rml:account_followup.followup.print:0 msgid "Ref" -msgstr "Referençia" +msgstr "Ref" #. module: account_followup #: wizard_view:account_followup.followup.print.all,next:0 msgid "%(followup_amount)s: Total Amount Due" -msgstr "% (montante_de_seguimentos)s: Quantidade total devido" +msgstr "%(followup_amount)s: Quantidade total devido" #. module: account_followup #: view:account_followup.followup.line:0 #: wizard_view:account_followup.followup.print.all,next:0 msgid "%(date)s: Current Date" -msgstr "%(data)s: Data actual" +msgstr "%(date)s: Data actual" #. module: account_followup #: field:account.move.line,followup_date:0 msgid "Latest Follow-up" -msgstr "Ultimos seguimentos" +msgstr "Últimos seguimentos" #. module: account_followup #: field:account_followup.followup.line,followup_id:0 #: field:account_followup.stat,followup_id:0 msgid "Follow Ups" -msgstr "Sguimentos" +msgstr "Seguimentos" #. module: account_followup #: wizard_field:account_followup.followup.print.all,init,date:0 msgid "Follow-up Sending Date" -msgstr "" +msgstr "Seguimento da data de envio" #. module: account_followup #: view:account_followup.followup:0 @@ -151,7 +151,7 @@ msgstr "Empresa" #. module: account_followup #: rml:account_followup.followup.print:0 msgid "Invoice Date" -msgstr "" +msgstr "Data da Factura" #. module: account_followup #: wizard_field:account_followup.followup.print.all,next,email_subject:0 @@ -166,17 +166,17 @@ msgstr "Pago" #. module: account_followup #: wizard_view:account_followup.followup.print.all,next:0 msgid "%(line)s: Account Move lines" -msgstr "%(linha)s: Linhas de movimento de contas" +msgstr "%(line)s: Linhas de movimento de contas" #. module: account_followup #: field:account_followup.stat,date_followup:0 msgid "Latest followup" -msgstr "Ultimos Seguimentos" +msgstr "Últimos Seguimentos" #. module: account_followup #: view:account.move.line:0 msgid "Partner entries" -msgstr "Entradas de terceiros" +msgstr "Entradas de parceiros" #. module: account_followup #: model:ir.model,name:account_followup.model_account_followup_followup_line @@ -186,7 +186,7 @@ msgstr "Critérios de seguimento" #. module: account_followup #: wizard_view:account_followup.followup.print.all,next:0 msgid "Partner Selection" -msgstr "" +msgstr "Selecção de Parceiros" #. module: account_followup #: constraint:ir.ui.view:0 @@ -201,12 +201,12 @@ msgstr "Tipo de termo" #. module: account_followup #: wizard_view:account_followup.followup.print.all,init:0 msgid "Follow-up and Date Selection" -msgstr "" +msgstr "Seguimento e Selecção da Data" #. module: account_followup #: wizard_view:account_followup.followup.print.all,next:0 msgid "Select partners to remind" -msgstr "Seleccionar terceiros para lembrar" +msgstr "Seleccionar parceiros para lembrar" #. module: account_followup #: rml:account_followup.followup.print:0 @@ -230,6 +230,19 @@ msgid "" "Best Regards,\n" "\t\t\t" msgstr "" +"\n" +"Caro %(partner_name)s,\n" +"\n" +"À excepção feita se houver um erro nosso, parece que o seguinte montante " +"ainda está por pagar. Por favor, tome as medidas adequadas a fim de efectuar " +"esse pagamento nos próximos oito dias.\n" +"\n" +"Se o seu pagamento tiver sido realizado após este e-mail ter sido enviado, " +"por favor, considere o presente como nulos. Não hesite em entrar em contato " +"com nosso departamento de contabilidade (+32) .10.68.94.39.\n" +"\n" +"Atenciosamente,\n" +"\t\t\t" #. module: account_followup #: constraint:ir.model:0 @@ -241,7 +254,7 @@ msgstr "" #. module: account_followup #: wizard_button:account_followup.followup.print.all,summary,end:0 msgid "Ok" -msgstr "" +msgstr "Ok" #. module: account_followup #: field:account_followup.followup,name:0 @@ -263,7 +276,7 @@ msgstr "Fim do mês" #: view:account_followup.followup.line:0 #: wizard_view:account_followup.followup.print.all,next:0 msgid "%(company_name)s: User's Company name" -msgstr "" +msgstr "%(company_name)s: Nome da empresa do utilizador" #. module: account_followup #: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_all @@ -305,23 +318,23 @@ msgstr "Continuar" #. module: account_followup #: model:ir.module.module,shortdesc:account_followup.module_meta_information msgid "Accounting follow-ups management" -msgstr "" +msgstr "Gestão do seguimento da conta" #. module: account_followup #: wizard_view:account_followup.followup.print.all,summary:0 #: wizard_field:account_followup.followup.print.all,summary,summary:0 msgid "Summary" -msgstr "" +msgstr "Resumo" #. module: account_followup #: view:account_followup.followup.line:0 msgid "Follow-Up Lines" -msgstr "" +msgstr "Linhas de Seguimento" #. module: account_followup #: rml:account_followup.followup.print:0 msgid "Document : Customer account statement" -msgstr "" +msgstr "Documento: Declaração da conta do cliente" #. module: account_followup #: view:account_followup.stat:0 @@ -331,7 +344,7 @@ msgstr "Linhas de seguimento" #. module: account_followup #: wizard_view:account_followup.followup.print.all,next:0 msgid "%(company_currency)s: User's Company Currency" -msgstr "" +msgstr "%(company_currency)s: Divisa da Companhia do Utilizador" #. module: account_followup #: field:account_followup.stat,balance:0 @@ -343,6 +356,8 @@ msgstr "Saldo" msgid "" "This field allow you to select a forecast date to plan your follow-ups" msgstr "" +"Este campo permite-lhe a selecção de uma data para programar os seus " +"seguimentos" #. module: account_followup #: view:account.move.line:0 @@ -373,6 +388,27 @@ msgid "" "Best Regards,\n" "\t\t\t" msgstr "" +"\n" +"Caro %(partner_name)s,\n" +"\n" +"Estamos desapontados em ver que apesar de o envio de um lembrete de que sua " +"conta está seriamente atrasada.\n" +"\n" +"É essencial que o pagamento seja feito, caso contrário, teremos que " +"considerar um stop em sua conta o que significa que não seremos mais capazes " +"de fornecer à sua empresa (produtos/serviços).\n" +"Por favor, tome as medidas adequadas a fim de efectuar esse pagamento nos " +"próximos 8 dias.\n" +"\n" +"Se houver um problema com o pagamento da factura que não temos conhecimento " +"de, não hesite em entrar em contato com o nosso departamento de " +"contabilidade (+32) .10.68.94.39. para que possamos resolver a questão " +"rapidamente.\n" +"\n" +"Detalhes dos pagamentos devidos é impresso abaixo.\n" +"\n" +"Atenciosamente,\n" +"\t\t\t" #. module: account_followup #: rml:account_followup.followup.print:0 @@ -382,7 +418,7 @@ msgstr "Sub-Total:" #. module: account_followup #: selection:account_followup.followup.line,start:0 msgid "Net Days" -msgstr "Dias líquidos" +msgstr "Dias Líquidos" #. module: account_followup #: model:ir.actions.act_window,name:account_followup.action_account_followup_definition_form @@ -402,7 +438,7 @@ msgstr "Corpo do e-mail" #. module: account_followup #: field:account_followup.stat,date_move_last:0 msgid "Last move" -msgstr "Ultimo movimento" +msgstr "Último movimento" #. module: account_followup #: rml:account_followup.followup.print:0 @@ -434,11 +470,27 @@ msgid "" "Best Regards,\n" "\t\t\t" msgstr "" +"\n" +"Caro %(partner_name)s,\n" +"\n" +"Apesar de várias insistências, a conta ainda não está resolvida.\n" +"\n" +"A não ser que o pagamento integral seja feita nos próximos oito dias, então " +"a ação legal para a cobrança da dívida, será tomada sem aviso prévio.\n" +"\n" +"Espero que não seja necessário tomar essa medida, os detalhes de pagamentos " +"estão impressos abaixo.\n" +"\n" +"Em caso de quaisquer dúvidas sobre esta questão, não hesite em entrar em " +"contato com nosso departamento de contabilidade (+32) .10.68.94.39.\n" +"\n" +"Atenciosamente,\n" +"\t\t\t" #. module: account_followup #: rml:account_followup.followup.print:0 msgid "Maturity Date" -msgstr "" +msgstr "Data de vencimento" #. module: account_followup #: view:account_followup.followup.line:0 @@ -454,13 +506,13 @@ msgstr "Sequência" #. module: account_followup #: wizard_view:account_followup.followup.print.all,next:0 msgid "%(heading)s: Move line header" -msgstr "%(cabeçalho)s: Mover linha de cabeçalho" +msgstr "%(heading)s: Mover linha de cabeçalho" #. module: account_followup #: view:account_followup.followup.line:0 #: wizard_view:account_followup.followup.print.all,next:0 msgid "%(partner_name)s: Partner name" -msgstr "%(nome_de_terceiro)s: Nome do terceiro" +msgstr "%(partner_name)s: Nome do terceiro" #. module: account_followup #: wizard_field:account_followup.followup.print.all,next,email_conf:0 @@ -470,12 +522,12 @@ msgstr "Enviar confirmação de e-mail" #. module: account_followup #: wizard_field:account_followup.followup.print.all,init,followup_id:0 msgid "Follow-up" -msgstr "" +msgstr "Seguimento" #. module: account_followup #: field:account_followup.stat,name:0 msgid "Partner" -msgstr "Terceiro" +msgstr "Parceiro" #. module: account_followup #: wizard_button:account_followup.followup.print.all,init,end:0 @@ -491,4 +543,4 @@ msgstr "Dias de atraso" #. module: account_followup #: wizard_button:account_followup.followup.print.all,next,print:0 msgid "Print Follow Ups & Send Mails" -msgstr "" +msgstr "Imprimir Segmentos e Enviar Mensagens" diff --git a/addons/analytic_journal_billing_rate/i18n/id.po b/addons/analytic_journal_billing_rate/i18n/id.po index 0ba7e87a53c..d8e269a7cb4 100644 --- a/addons/analytic_journal_billing_rate/i18n/id.po +++ b/addons/analytic_journal_billing_rate/i18n/id.po @@ -7,30 +7,31 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-11-09 13:44+0000\n" -"Last-Translator: <>\n" +"PO-Revision-Date: 2010-05-28 03:01+0000\n" +"Last-Translator: Abdul Munif Hanafi \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-04-17 04:18+0000\n" +"X-Launchpad-Export-Date: 2010-05-28 03:39+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: analytic_journal_billing_rate #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" -msgstr "" +msgstr "XML tidak sah untuk Menampilkan Arsitektur!" #. module: analytic_journal_billing_rate #: field:analytic_journal_rate_grid,journal_id:0 msgid "Analytic Journal" -msgstr "" +msgstr "Jurnal Analisis" #. module: analytic_journal_billing_rate #: constraint:ir.model:0 msgid "" "The Object name must start with x_ and not contain any special character !" msgstr "" +"Nama Objek harus berawalan dengan x_ dan tidak mengandung karakter khusus !" #. module: analytic_journal_billing_rate #: view:analytic_journal_rate_grid:0 @@ -40,7 +41,7 @@ msgstr "" #. module: analytic_journal_billing_rate #: field:analytic_journal_rate_grid,account_id:0 msgid "Analytic Account" -msgstr "" +msgstr "Akun Analisis" #. module: analytic_journal_billing_rate #: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid diff --git a/addons/base_setup/i18n/id.po b/addons/base_setup/i18n/id.po index 33b0888c25e..7c3ff6f08b5 100644 --- a/addons/base_setup/i18n/id.po +++ b/addons/base_setup/i18n/id.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.1\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-09-16 11:35+0000\n" -"Last-Translator: <>\n" +"PO-Revision-Date: 2010-05-28 02:39+0000\n" +"Last-Translator: Abdul Munif Hanafi \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n" +"X-Launchpad-Export-Date: 2010-05-28 03:39+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_setup @@ -21,7 +21,7 @@ msgstr "" #: wizard_field:base_setup.base_setup,init,city:0 #: wizard_field:base_setup.base_setup,update,city:0 msgid "City" -msgstr "" +msgstr "Kota" #. module: base_setup #: wizard_view:base_setup.base_setup,finish:0 @@ -35,12 +35,12 @@ msgstr "" #: wizard_field:base_setup.base_setup,init,zip:0 #: wizard_field:base_setup.base_setup,update,zip:0 msgid "Zip code" -msgstr "" +msgstr "Kode pos" #. module: base_setup #: wizard_view:base_setup.base_setup,init:0 msgid "Select a Profile" -msgstr "" +msgstr "Pilih sebuah profil" #. module: base_setup #: wizard_view:base_setup.base_setup,company:0 @@ -70,14 +70,14 @@ msgstr "" #: wizard_button:base_setup.base_setup,company,update:0 #: wizard_button:base_setup.base_setup,init,company:0 msgid "Next" -msgstr "" +msgstr "Berikutnya" #. module: base_setup #: wizard_field:base_setup.base_setup,company,email:0 #: wizard_field:base_setup.base_setup,init,email:0 #: wizard_field:base_setup.base_setup,update,email:0 msgid "E-mail" -msgstr "" +msgstr "E-mail" #. module: base_setup #: wizard_field:base_setup.base_setup,company,state_id:0 @@ -96,7 +96,7 @@ msgstr "" #: wizard_field:base_setup.base_setup,init,profile:0 #: wizard_field:base_setup.base_setup,update,profile:0 msgid "Profile" -msgstr "" +msgstr "Profil" #. module: base_setup #: wizard_field:base_setup.base_setup,company,rml_footer1:0 @@ -115,7 +115,7 @@ msgstr "" #. module: base_setup #: wizard_view:base_setup.base_setup,company:0 msgid "General Information" -msgstr "" +msgstr "Informasi Umum" #. module: base_setup #: wizard_field:base_setup.base_setup,company,street2:0 @@ -134,7 +134,7 @@ msgstr "" #: wizard_field:base_setup.base_setup,init,phone:0 #: wizard_field:base_setup.base_setup,update,phone:0 msgid "Phone" -msgstr "" +msgstr "Telepon" #. module: base_setup #: wizard_view:base_setup.base_setup,company:0 @@ -146,7 +146,7 @@ msgstr "" #: wizard_field:base_setup.base_setup,init,name:0 #: wizard_field:base_setup.base_setup,update,name:0 msgid "Company Name" -msgstr "" +msgstr "Nama Perusahaan" #. module: base_setup #: help:base_setup.base_setup,company,rml_footer2:0 @@ -163,7 +163,7 @@ msgstr "" #: wizard_field:base_setup.base_setup,init,country_id:0 #: wizard_field:base_setup.base_setup,update,country_id:0 msgid "Country" -msgstr "" +msgstr "Negara" #. module: base_setup #: wizard_view:base_setup.base_setup,company:0 @@ -173,7 +173,7 @@ msgstr "" #: model:ir.actions.wizard,name:base_setup.action_wizard_setup #: model:ir.actions.wizard,name:base_setup.wizard_base_setup msgid "Setup" -msgstr "" +msgstr "Atur" #. module: base_setup #: help:base_setup.base_setup,company,rml_footer1:0 @@ -193,12 +193,12 @@ msgstr "" #. module: base_setup #: wizard_button:base_setup.base_setup,update,finish:0 msgid "Install" -msgstr "" +msgstr "Pasang" #. module: base_setup #: wizard_view:base_setup.base_setup,finish:0 msgid "Installation Done" -msgstr "" +msgstr "Pemasangan Selesai" #. module: base_setup #: help:base_setup.base_setup,company,rml_header1:0 @@ -234,7 +234,7 @@ msgstr "" #: wizard_field:base_setup.base_setup,init,street:0 #: wizard_field:base_setup.base_setup,update,street:0 msgid "Street" -msgstr "" +msgstr "Jalan" #. module: base_setup #: wizard_button:base_setup.base_setup,finish,menu:0 @@ -244,14 +244,14 @@ msgstr "" #. module: base_setup #: wizard_button:base_setup.base_setup,init,menu:0 msgid "Cancel" -msgstr "" +msgstr "Batal" #. module: base_setup #: wizard_field:base_setup.base_setup,company,logo:0 #: wizard_field:base_setup.base_setup,init,logo:0 #: wizard_field:base_setup.base_setup,update,logo:0 msgid "Logo" -msgstr "" +msgstr "Lambang" #. module: base_setup #: model:ir.module.module,shortdesc:base_setup.module_meta_information @@ -262,4 +262,4 @@ msgstr "" #: wizard_button:base_setup.base_setup,company,init:0 #: wizard_button:base_setup.base_setup,update,company:0 msgid "Previous" -msgstr "" +msgstr "Sebelumnya" diff --git a/addons/crm_profiling/i18n/pt.po b/addons/crm_profiling/i18n/pt.po index 5c073f17dd1..90a457d5732 100644 --- a/addons/crm_profiling/i18n/pt.po +++ b/addons/crm_profiling/i18n/pt.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-12-04 22:45+0000\n" -"Last-Translator: Paulino \n" +"PO-Revision-Date: 2010-05-28 02:23+0000\n" +"Last-Translator: cmsa \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n" +"X-Launchpad-Export-Date: 2010-05-28 03:39+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: crm_profiling @@ -86,7 +86,7 @@ msgstr "Nome do questionário" #. module: crm_profiling #: view:res.partner:0 msgid "Use a questionnaire" -msgstr "Usar um que questionário" +msgstr "Usar um questionário" #. module: crm_profiling #: constraint:ir.ui.view:0 From 9701a4c3ad6aea6409c394018a8de30ee44d805f Mon Sep 17 00:00:00 2001 From: apa-tiny Date: Fri, 28 May 2010 09:58:45 +0530 Subject: [PATCH 31/48] [IMP]sale:Corrected conflict in SQL report. bzr revid: apa@tinyerp.com-20100528042845-m4n921d71mi3kfpf --- addons/sale/report/sale_report.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/addons/sale/report/sale_report.py b/addons/sale/report/sale_report.py index cad05c8dcc8..2301bd4c5a8 100644 --- a/addons/sale/report/sale_report.py +++ b/addons/sale/report/sale_report.py @@ -36,8 +36,13 @@ class sale_report(osv.osv): ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True), 'day': fields.char('Day', size=128, readonly=True), 'product_id':fields.many2one('product.product', 'Product', readonly=True), +<<<<<<< TREE + 'uom_id': fields.many2one('product.uom', 'Default Unit Of Measure', readonly=True), + 'product_qty':fields.float('# of Qty', readonly=True), +======= 'uom_name': fields.char('Default UoM', size=128, readonly=True), 'product_uom_qty':fields.float('# of Qty', readonly=True), +>>>>>>> MERGE-SOURCE 'partner_id':fields.many2one('res.partner', 'Partner', readonly=True), 'shop_id':fields.many2one('sale.shop', 'Shop', readonly=True), 'company_id':fields.many2one('res.company', 'Company', readonly=True), @@ -94,6 +99,7 @@ class sale_report(osv.osv): group by s.date_order, s.partner_id, + pt.uom_id, l.product_id, l.product_uom, s.user_id, From ccaa75b73b31d92227109638df9022b86b991ac4 Mon Sep 17 00:00:00 2001 From: apa-tiny Date: Fri, 28 May 2010 10:02:30 +0530 Subject: [PATCH 32/48] [IMP]sale:improved code in SQL report. bzr revid: apa@tinyerp.com-20100528043230-20hrsk7qe6f8czxh --- addons/sale/report/sale_report.py | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/sale/report/sale_report.py b/addons/sale/report/sale_report.py index 2301bd4c5a8..6bb34ea4472 100644 --- a/addons/sale/report/sale_report.py +++ b/addons/sale/report/sale_report.py @@ -99,7 +99,6 @@ class sale_report(osv.osv): group by s.date_order, s.partner_id, - pt.uom_id, l.product_id, l.product_uom, s.user_id, From 6efd32d8e5de775c7ca222b7cac9ea367524d3be Mon Sep 17 00:00:00 2001 From: apa-tiny Date: Fri, 28 May 2010 10:38:01 +0530 Subject: [PATCH 33/48] [IMP]sale:Corrected conflict in SQL report. bzr revid: apa@tinyerp.com-20100528050801-t6biri188t4dn8c5 --- addons/sale/report/sale_report.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/addons/sale/report/sale_report.py b/addons/sale/report/sale_report.py index 6bb34ea4472..cad05c8dcc8 100644 --- a/addons/sale/report/sale_report.py +++ b/addons/sale/report/sale_report.py @@ -36,13 +36,8 @@ class sale_report(osv.osv): ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True), 'day': fields.char('Day', size=128, readonly=True), 'product_id':fields.many2one('product.product', 'Product', readonly=True), -<<<<<<< TREE - 'uom_id': fields.many2one('product.uom', 'Default Unit Of Measure', readonly=True), - 'product_qty':fields.float('# of Qty', readonly=True), -======= 'uom_name': fields.char('Default UoM', size=128, readonly=True), 'product_uom_qty':fields.float('# of Qty', readonly=True), ->>>>>>> MERGE-SOURCE 'partner_id':fields.many2one('res.partner', 'Partner', readonly=True), 'shop_id':fields.many2one('sale.shop', 'Shop', readonly=True), 'company_id':fields.many2one('res.company', 'Company', readonly=True), From 9180d920aa05a9e1e00796293c91619d649d6afc Mon Sep 17 00:00:00 2001 From: apa-tiny Date: Fri, 28 May 2010 12:01:04 +0530 Subject: [PATCH 34/48] [IMP]:stock,account:rename the buttons name of the SQL reports. bzr revid: apa@tinyerp.com-20100528063104-fwka6w697en3na9n --- .../account/report/account_analytic_entries_report_view.xml | 4 ++-- addons/account/report/account_analytic_report_view.xml | 4 ++-- addons/account/report/account_entries_report_view.xml | 4 ++-- addons/account/report/account_invoice_report_view.xml | 4 ++-- addons/stock/report/report_stock_picking_view.xml | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml index 157a08f8ca5..82a063256c1 100644 --- a/addons/account/report/account_analytic_entries_report_view.xml +++ b/addons/account/report/account_analytic_entries_report_view.xml @@ -35,10 +35,10 @@ - - diff --git a/addons/account/report/account_analytic_report_view.xml b/addons/account/report/account_analytic_report_view.xml index eba69e2785b..f853b809867 100644 --- a/addons/account/report/account_analytic_report_view.xml +++ b/addons/account/report/account_analytic_report_view.xml @@ -36,10 +36,10 @@ - - diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml index f61348c290c..5d1b99b578e 100644 --- a/addons/account/report/account_entries_report_view.xml +++ b/addons/account/report/account_entries_report_view.xml @@ -50,10 +50,10 @@ - - diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml index 597e5f43675..94f181cd587 100644 --- a/addons/account/report/account_invoice_report_view.xml +++ b/addons/account/report/account_invoice_report_view.xml @@ -54,10 +54,10 @@ - - diff --git a/addons/stock/report/report_stock_picking_view.xml b/addons/stock/report/report_stock_picking_view.xml index c343b09931a..e570e2b55ea 100644 --- a/addons/stock/report/report_stock_picking_view.xml +++ b/addons/stock/report/report_stock_picking_view.xml @@ -54,10 +54,10 @@ - - From 948c9e8ae2fe92369cc247a65a02142ea0ab3a38 Mon Sep 17 00:00:00 2001 From: "ssi (Open ERP)" Date: Fri, 28 May 2010 12:29:50 +0530 Subject: [PATCH 35/48] [ADD] added new module marketing to manage menus bzr revid: ssi@tinyerp.com-20100528065950-ia7kz041py33m54k --- addons/marketing/__init__.py | 23 +++++++++++++++++ addons/marketing/__openerp__.py | 38 +++++++++++++++++++++++++++++ addons/marketing/marketing_view.xml | 6 +++++ 3 files changed, 67 insertions(+) create mode 100644 addons/marketing/__init__.py create mode 100644 addons/marketing/__openerp__.py create mode 100644 addons/marketing/marketing_view.xml diff --git a/addons/marketing/__init__.py b/addons/marketing/__init__.py new file mode 100644 index 00000000000..2aefd8b3c11 --- /dev/null +++ b/addons/marketing/__init__.py @@ -0,0 +1,23 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2010 Tiny SPRL (). +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: + diff --git a/addons/marketing/__openerp__.py b/addons/marketing/__openerp__.py new file mode 100644 index 00000000000..36cec655d15 --- /dev/null +++ b/addons/marketing/__openerp__.py @@ -0,0 +1,38 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2010 Tiny SPRL (). +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## + + +{ + "name" : "Marketing", + "version" : "1.1", + "depends" : ["base"], + "author" : "Tiny", + "category": 'Generic Modules/Marketing', + "description": "Menu for Marketing", + 'website': 'http://www.openerp.com', + 'init_xml': [], + 'demo_xml':[], + 'update_xml': ['marketing_view.xml'], + 'demo_xml': [], + 'installable': True, + 'active': False, +} +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/marketing/marketing_view.xml b/addons/marketing/marketing_view.xml new file mode 100644 index 00000000000..b920ce369fc --- /dev/null +++ b/addons/marketing/marketing_view.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file From e74b683ab5101ce1e495e097e6cfd87129a8eba5 Mon Sep 17 00:00:00 2001 From: "ssi (Open ERP)" Date: Fri, 28 May 2010 12:54:14 +0530 Subject: [PATCH 36/48] [IMP] marketing_campaign: modified menus and dependency bzr revid: ssi@tinyerp.com-20100528072414-8uatbvbl7g3rlrj4 --- addons/marketing_campaign/__openerp__.py | 5 ++++- addons/marketing_campaign/marketing_campaign_view.xml | 11 ++++++----- .../report/campaign_analysis_view.xml | 7 ++++--- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/addons/marketing_campaign/__openerp__.py b/addons/marketing_campaign/__openerp__.py index 9a10fdbaa3d..ad91466817c 100755 --- a/addons/marketing_campaign/__openerp__.py +++ b/addons/marketing_campaign/__openerp__.py @@ -23,7 +23,8 @@ { "name" : "", "version" : "1.1", - "depends" : ["crm", + "depends" : ["marketing", + "crm", "document", "poweremail" # need to get this module form the branch # lp:poweremail @@ -34,11 +35,13 @@ """, 'website': 'http://www.openerp.com', 'init_xml': [], + 'demo_xml':[], 'update_xml': [ 'marketing_campaign_view.xml', 'marketing_campaign_data.xml', 'marketing_campaign_workflow.xml', 'report/campaign_analysis_view.xml', + 'marketing_campaign_demo.xml' ], 'demo_xml': [ 'marketing_campaign_demo.xml', diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml index 5a7f8529cc0..fb88b6d283d 100755 --- a/addons/marketing_campaign/marketing_campaign_view.xml +++ b/addons/marketing_campaign/marketing_campaign_view.xml @@ -1,7 +1,7 @@ - + @@ -201,9 +201,9 @@ + - From 1d4290ff9d94b189fab866b285ee25acddf0c1e1 Mon Sep 17 00:00:00 2001 From: "DSH (Open ERP)" Date: Fri, 28 May 2010 17:17:13 +0530 Subject: [PATCH 44/48] [IMP] configuration wizard for marketing module : Done by PSO bzr revid: dsh@tinyerp.com-20100528114713-zgpkw2a6nfcxlhwj --- addons/marketing/__init__.py | 2 ++ addons/marketing/marketing_view.xml | 52 ++++++++++++++++++++++++++-- addons/marketing/marketing_wizard.py | 38 ++++++++++++++++++++ 3 files changed, 89 insertions(+), 3 deletions(-) create mode 100644 addons/marketing/marketing_wizard.py diff --git a/addons/marketing/__init__.py b/addons/marketing/__init__.py index 2aefd8b3c11..c83787a6ef7 100644 --- a/addons/marketing/__init__.py +++ b/addons/marketing/__init__.py @@ -19,5 +19,7 @@ # ############################################################################## +import marketing_wizard + # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/marketing/marketing_view.xml b/addons/marketing/marketing_view.xml index b920ce369fc..7a72f39c6eb 100644 --- a/addons/marketing/marketing_view.xml +++ b/addons/marketing/marketing_view.xml @@ -1,6 +1,52 @@ - - - \ No newline at end of file + + + + + marketing.installer.view + marketing.installer + form + + + + + Marketing Modules Installation + + + + Configure Your Marketing System + + + You can enhance OpenERP's basic Marketing support with a few additional OpenERP applications + + + + + + + + + + + + + + Marketing Modules Installation + ir.actions.act_window + marketing.installer + + form + form + new + + + + + 3 + + + + \ No newline at end of file diff --git a/addons/marketing/marketing_wizard.py b/addons/marketing/marketing_wizard.py new file mode 100644 index 00000000000..443fb09ed48 --- /dev/null +++ b/addons/marketing/marketing_wizard.py @@ -0,0 +1,38 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2010 Tiny SPRL (). +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## + +from osv import fields, osv + +class marketing_installer(osv.osv_memory): + _name = 'marketing.installer' + _inherit = 'res.config.installer' + + _columns = { + # Generic modules + 'marketing_campaign':fields.boolean('Marketing Campaign', + help="Helps you to manage your marketing campaigns step by step."), + 'crm_profiling':fields.boolean('Crm Profile', + help="Helps you to perform segmentation within partners.") + } + +marketing_installer() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From 850bb48ef46e8528f4ee6231294b737c7d6cbcb7 Mon Sep 17 00:00:00 2001 From: "mra (Open ERP)" Date: Fri, 28 May 2010 17:18:57 +0530 Subject: [PATCH 45/48] [IMP] hr_timesheet_sheet: View improve (Ref: PSI) bzr revid: mra@tinyerp.com-20100528114857-9fbov2scutngzhdo --- addons/hr/hr_view.xml | 42 ++++++++++--------- .../hr_timesheet_invoice_report_view.xml | 1 - .../hr_timesheet_sheet_view.xml | 3 +- 3 files changed, 24 insertions(+), 22 deletions(-) diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml index 210e83c11ad..978262bdffc 100644 --- a/addons/hr/hr_view.xml +++ b/addons/hr/hr_view.xml @@ -1,14 +1,21 @@ - - + - + - - - - - - - - diff --git a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml index cfe61e91dc5..eccdb721de0 100644 --- a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml +++ b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml @@ -454,7 +454,6 @@ - diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml index 61eaf4cc843..35c20fdce08 100644 --- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml +++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml @@ -101,7 +101,7 @@ - + @@ -192,7 +192,6 @@ - From 3648b428bd3d1cc83793c630b3ef8d819b4dbb36 Mon Sep 17 00:00:00 2001 From: "mra (Open ERP)" Date: Fri, 28 May 2010 17:34:47 +0530 Subject: [PATCH 46/48] [IMP] scrum: Replace date with create_date on backlog bzr revid: mra@tinyerp.com-20100528120447-fugp96q28gbfkv60 --- addons/scrum/scrum.py | 20 +++++++++++++++++++- addons/scrum/scrum_view.xml | 2 +- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/addons/scrum/scrum.py b/addons/scrum/scrum.py index e463ad2e4aa..bccc991565f 100644 --- a/addons/scrum/scrum.py +++ b/addons/scrum/scrum.py @@ -42,6 +42,7 @@ scrum_project() class scrum_sprint(osv.osv): _name = 'scrum.sprint' _description = 'Scrum Sprint' + def _calc_progress(self, cr, uid, ids, name, args, context): res = {} for sprint in self.browse(cr, uid, ids): @@ -54,6 +55,7 @@ class scrum_sprint(osv.osv): if tot>0: res[sprint.id] = round(prog/tot*100) return res + def _calc_effective(self, cr, uid, ids, name, args, context): res = {} for sprint in self.browse(cr, uid, ids): @@ -61,6 +63,7 @@ class scrum_sprint(osv.osv): for bl in sprint.backlog_ids: res[sprint.id] += bl.effective_hours return res + def _calc_planned(self, cr, uid, ids, name, args, context): res = {} for sprint in self.browse(cr, uid, ids): @@ -68,6 +71,7 @@ class scrum_sprint(osv.osv): for bl in sprint.backlog_ids: res[sprint.id] += bl.planned_hours return res + def _calc_expected(self, cr, uid, ids, name, args, context): res = {} for sprint in self.browse(cr, uid, ids): @@ -75,21 +79,27 @@ class scrum_sprint(osv.osv): for bl in sprint.backlog_ids: res[sprint.id] += bl.expected_hours return res + def button_cancel(self, cr, uid, ids, context={}): self.write(cr, uid, ids, {'state':'cancel'}, context=context) return True + def button_draft(self, cr, uid, ids, context={}): self.write(cr, uid, ids, {'state':'draft'}, context=context) return True + def button_open(self, cr, uid, ids, context={}): self.write(cr, uid, ids, {'state':'open'}, context=context) return True + def button_close(self, cr, uid, ids, context={}): self.write(cr, uid, ids, {'state':'done'}, context=context) return True + def button_pending(self, cr, uid, ids, context={}): self.write(cr, uid, ids, {'state':'pending'}, context=context) return True + _columns = { 'name' : fields.char('Sprint Name', required=True, size=64), 'date_start': fields.date('Starting Date', required=True), @@ -165,6 +175,7 @@ class scrum_product_backlog(osv.osv): if tot>0: res[bl.id] = round(prog/tot*100) return res + def _calc_effective(self, cr, uid, ids, name, args, context): res = {} for bl in self.browse(cr, uid, ids): @@ -172,6 +183,7 @@ class scrum_product_backlog(osv.osv): for task in bl.tasks_id: res[bl.id] += task.effective_hours return res + def _calc_planned(self, cr, uid, ids, name, args, context): res = {} for bl in self.browse(cr, uid, ids): @@ -185,17 +197,21 @@ class scrum_product_backlog(osv.osv): for backlog in self.browse(cr, uid, ids, context=context): self.pool.get('project.task').write(cr, uid, [i.id for i in backlog.tasks_id], {'state': 'cancelled'}) return True + def button_draft(self, cr, uid, ids, context={}): self.write(cr, uid, ids, {'state':'draft'}, context=context) return True + def button_open(self, cr, uid, ids, context={}): self.write(cr, uid, ids, {'state':'open'}, context=context) return True + def button_close(self, cr, uid, ids, context={}): self.write(cr, uid, ids, {'state':'done'}, context=context) for backlog in self.browse(cr, uid, ids, context=context): self.pool.get('project.task').write(cr, uid, [i.id for i in backlog.tasks_id], {'state': 'done'}) return True + def button_pending(self, cr, uid, ids, context={}): self.write(cr, uid, ids, {'state':'pending'}, context=context) return True @@ -214,7 +230,7 @@ class scrum_product_backlog(osv.osv): 'effective_hours': fields.function(_calc_effective, method=True, string='Effective hours', help="Computed using the sum of the task work done (Time spent on tasks)"), 'planned_hours': fields.function(_calc_planned, method=True, string='Planned Hours', help='Estimated time to do the task, usually set by the project manager when the task is in draft state.'), 'expected_hours': fields.float('Expected Hours', help='Estimated total time to do the Backlog'), - 'date':fields.datetime("Created Date"), + 'create_date': fields.datetime("Creation Date", readonly=True), } _defaults = { 'state': 'draft', @@ -227,6 +243,7 @@ scrum_product_backlog() class scrum_task(osv.osv): _name = 'project.task' _inherit = 'project.task' + def _get_task(self, cr, uid, ids, context={}): result = {} for line in self.pool.get('scrum.product.backlog').browse(cr, uid, ids, context=context): @@ -241,6 +258,7 @@ class scrum_task(osv.osv): 'scrum.product.backlog': (_get_task, ['sprint_id'], 10) }), } + def onchange_backlog_id(self, cr, uid, backlog_id): if not backlog_id: return {} diff --git a/addons/scrum/scrum_view.xml b/addons/scrum/scrum_view.xml index 107fa97b13c..61a2c3b35ed 100644 --- a/addons/scrum/scrum_view.xml +++ b/addons/scrum/scrum_view.xml @@ -63,7 +63,7 @@ - + From a8af6dbac5559b1ef1aaf6bd5dff50e26fd99e4f Mon Sep 17 00:00:00 2001 From: "mra (Open ERP)" Date: Fri, 28 May 2010 17:52:26 +0530 Subject: [PATCH 47/48] [IMP] hr: Employee view bzr revid: mra@tinyerp.com-20100528122226-k8sdtlb45sab5hk9 --- addons/hr/hr_view.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml index 978262bdffc..36524395355 100644 --- a/addons/hr/hr_view.xml +++ b/addons/hr/hr_view.xml @@ -34,6 +34,7 @@ + From 6fe84098675b31ced777a02cb330aaeadc483b0c Mon Sep 17 00:00:00 2001 From: "mra (Open ERP)" Date: Fri, 28 May 2010 19:19:54 +0530 Subject: [PATCH 48/48] [IMP] l10n_Be : improve wizards view ref:PAP bzr revid: mra@tinyerp.com-20100528134954-ucgvjtdjt7k3l7ib --- .../l10n_be_account_vat_declaration_view.xml | 39 ++++++++++--------- .../l10n_be/wizard/l10n_be_vat_intra_view.xml | 24 ++++++------ 2 files changed, 34 insertions(+), 29 deletions(-) diff --git a/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml b/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml index 94c16ccd201..342226930ce 100644 --- a/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml +++ b/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml @@ -12,26 +12,29 @@ l1on_be.vat.declaration form -
- - + + + + + + + +