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/invoice.py b/addons/account/invoice.py index 273d5255f90..d8205ababa7 100644 --- a/addons/account/invoice.py +++ b/addons/account/invoice.py @@ -951,14 +951,8 @@ class account_invoice(osv.osv): return taxes.values() def _log_event(self, cr, uid, ids, factor=1.0, name='Open Invoice'): - invs = self.read(cr, uid, ids, ['type','partner_id','amount_untaxed']) - for inv in invs: - part=inv['partner_id'] and inv['partner_id'][0] - pc = pr = 0.0 - cr.execute('select sum(quantity*price_unit) from account_invoice_line where invoice_id=%s', (inv['id'],)) - total = inv['amount_untaxed'] - self.pool.get('res.partner.event').create(cr, uid, {'name':'Invoice: ' + name, 'description':name+' '+str(inv['id']), 'partner_id':part, 'date':time.strftime('%Y-%m-%d %H:%M:%S'), 'user_id':uid}) - return len(invs) + #TODO: implement messages system + return True def name_get(self, cr, uid, ids, context=None): if not len(ids): 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/account_account_report_view.xml b/addons/account/report/account_account_report_view.xml index f2d6338c951..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 @@ -87,7 +88,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..157a08f8ca5 100644 --- a/addons/account/report/account_analytic_entries_report_view.xml +++ b/addons/account/report/account_analytic_entries_report_view.xml @@ -6,14 +6,14 @@ analytic.entries.report tree - + - + @@ -33,32 +33,31 @@ 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 @@ -107,7 +106,7 @@ - + diff --git a/addons/account/report/account_analytic_report_view.xml b/addons/account/report/account_analytic_report_view.xml index 9a60b8a7bd0..eba69e2785b 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,14 +115,14 @@ - Analytic Accounts + Analytic Accounts Analysis analytic.report form tree,graph {'search_default_This Month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]} - + diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml index 625d98fa9cb..f61348c290c 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 {'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..597e5f43675 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 - + @@ -21,9 +21,7 @@ - - @@ -42,7 +40,7 @@ account.invoice.report graph - + @@ -54,7 +52,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)]"/> + @@ -109,9 +108,7 @@ - - @@ -119,39 +116,39 @@ + + + - - + + - + - - - - 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':[]} - + diff --git a/addons/account/report/general_ledger.py b/addons/account/report/general_ledger.py index 00031a77ed8..e2c24fe96d2 100644 --- a/addons/account/report/general_ledger.py +++ b/addons/account/report/general_ledger.py @@ -33,8 +33,6 @@ import pooler 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']) @@ -42,6 +40,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']) @@ -70,39 +69,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 = %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): @@ -118,12 +84,17 @@ class general_ledger(rml_parse.rml_parse): 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,15 +103,17 @@ class general_ledger(rml_parse.rml_parse): 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'] @@ -167,9 +140,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, @@ -184,6 +154,8 @@ class general_ledger(rml_parse.rml_parse): 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'] @@ -224,8 +196,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: @@ -248,56 +220,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 @@ -306,7 +282,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 @@ -320,7 +296,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 @@ -334,7 +310,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 @@ -346,7 +322,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 @@ -355,7 +331,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 @@ -366,14 +342,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] @@ -392,6 +368,7 @@ 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) + # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account/report/general_ledger.rml b/addons/account/report/general_ledger.rml index 75cb086b343..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.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: diff --git a/addons/account/report/general_ledger_landscape.rml b/addons/account/report/general_ledger_landscape.rml index 9e937a72baf..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') ]] 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'] 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_action_rule/__openerp__.py b/addons/base_action_rule/__openerp__.py index 9d44fbc78eb..ab1ae6c965b 100644 --- a/addons/base_action_rule/__openerp__.py +++ b/addons/base_action_rule/__openerp__.py @@ -27,7 +27,7 @@ 'author': 'Tiny', 'website': 'http://www.openerp.com', 'depends': ['base'], - 'init_xml': ['base_action_rule_data.xml'], + 'init_xml': [], 'update_xml': [ 'base_action_rule_view.xml', 'security/ir.model.access.csv', diff --git a/addons/base_action_rule/base_action_rule.py b/addons/base_action_rule/base_action_rule.py index 764f3da63aa..a1213dd7542 100644 --- a/addons/base_action_rule/base_action_rule.py +++ b/addons/base_action_rule/base_action_rule.py @@ -19,16 +19,14 @@ # ############################################################################## -from datetime import datetime +import time +import mx.DateTime +import re + +import tools from osv import fields, osv, orm from osv.orm import except_orm -from osv.osv import osv_pool from tools.translate import _ -import mx.DateTime -import pooler -import re -import time -import tools class base_action_rule(osv.osv): """ Base Action Rules """ @@ -134,74 +132,6 @@ the rule to mark CC(mail to any other person defined in actions)."), _order = 'sequence' - def pre_action(self, cr, uid, ids, model, context=None): - # Searching for action rules - cr.execute("SELECT m.model, r.id from base_action_rule r left join ir_model m on (m.id = r.name)") - res = cr.fetchall() - # Check if any rule matching with current object - for obj_name, rule_id in res: - if not (model == obj_name): - continue - else: - obj = self.pool.get(obj_name) - self._action(cr, uid, [rule_id], obj.browse(cr, uid, ids, context=context)) - return True - - def new_create(self, old_create, model, context=None): - if not context: - context = {} - def make_call_old(cr, uid, vals, context=context): - new_id = old_create(cr, uid, vals, context=context) - if not context.get('action'): - self.pre_action(cr, uid, [new_id], model, context=context) - return new_id - return make_call_old - - def new_write(self, old_write, model, context=None): - if not context: - context = {} - def make_call_old(cr, uid, ids, vals, context=context): - if isinstance(ids, (str, int, long)): - ids = [ids] - if not context.get('action'): - self.pre_action(cr, uid, ids, model, context=context) - return old_write(cr, uid, ids, vals, context=context) - return make_call_old - - def create(self, cr, uid, vals, context=None): - if not context: - context = {} - res_id = super(base_action_rule, self).create(cr, uid, vals, context) - model_pool = self.pool.get('ir.model') - model = model_pool.browse(cr, uid, vals.get('name'), context=context).model - obj_pool = self.pool.get(model) - obj_pool.__setattr__('old_create', obj_pool.create) - obj_pool.__setattr__('old_write', obj_pool.write) - obj_pool.__setattr__('create', self.new_create(obj_pool.create, model, context=context)) - obj_pool.__setattr__('write', self.new_write(obj_pool.write, model, context=context)) - return res_id - - def write(self, cr, uid, ids, vals, context=None): - res = super(base_action_rule, self).write(cr, uid, ids, vals, context) - model_pool = self.pool.get('ir.model') - if not context: - context = {} - for rule in self.browse(cr, uid, ids, context=context): - model = model_pool.browse(cr, uid, rule.name.id, context=context).model - obj_pool = self.pool.get(model) - obj_pool.__setattr__('old_create', obj_pool.create) - obj_pool.__setattr__('old_write', obj_pool.write) - obj_pool.__setattr__('create', self.new_create(obj_pool.create, model, context=context)) - obj_pool.__setattr__('write', self.new_write(obj_pool.write, model, context=context)) - return res - - def _check(self, cr, uid, automatic=False, use_new_cursor=False, \ - context=None): - rule_pool= self.pool.get('base.action.rule') - rule_ids = rule_pool.search(cr, uid, [], context=context) - return rule_pool.write(cr, uid, rule_ids, {}, context=context) - - def format_body(self, body): """ Foramat Action rule's body @param self: The object pointer """ @@ -305,7 +235,6 @@ the rule to mark CC(mail to any other person defined in actions)."), context.update({'active_id':obj.id, 'active_ids':[obj.id]}) self.pool.get('ir.actions.server').run(cr, uid, [action.server_action_id.id], context) write = {} - if hasattr(obj, 'user_id') and action.act_user_id: obj.user_id = action.act_user_id write['user_id'] = action.act_user_id.id @@ -350,10 +279,12 @@ the rule to mark CC(mail to any other person defined in actions)."), @param ids: List of Basic Action Rule’s IDs, @param objects: pass objects @param context: A standard dictionary for contextual values """ - context.update({'action': True}) + if not scrit: scrit = [] - for action in self.browse(cr, uid, ids): + cr.execute("select id from base_action_rule order by sequence") + rule_ids = map(lambda x: x[0], cr.fetchall()) + for action in self.browse(cr, uid, rule_ids): level = action.max_level if not level: break @@ -402,7 +333,6 @@ the rule to mark CC(mail to any other person defined in actions)."), self.do_action(cr, uid, action, model_obj, obj, context) break level -= 1 - context.update({'action': False}) return True def _check_mail(self, cr, uid, ids, context=None): @@ -429,28 +359,4 @@ the rule to mark CC(mail to any other person defined in actions)."), base_action_rule() - -class ir_cron(osv.osv): - _inherit = 'ir.cron' - - def _poolJobs(self, db_name, check=False): - - try: - db, pool = pooler.get_db_and_pool(db_name) - except: - return False - cr = db.cursor() - try: - next = datetime.now().strftime('%Y-%m-%d %H:00:00') - # Putting nextcall always less than current time in order to call it every time - cr.execute('UPDATE ir_cron set nextcall = \'%s\' where numbercall<>0 and active and model=\'base.action.rule\' ' % (next)) - cr.commit() - res = super(ir_cron, self)._poolJobs(db_name, check=check) - finally: - cr.commit() - cr.close() - -ir_cron() - - # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/base_action_rule/base_action_rule_data.xml b/addons/base_action_rule/base_action_rule_data.xml deleted file mode 100644 index a7c2a994713..00000000000 --- a/addons/base_action_rule/base_action_rule_data.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - Run check action rule - - - 1 - minutes - -1 - - - - - - - - diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py index bf93c9c775d..8a9764bff63 100644 --- a/addons/base_calendar/base_calendar.py +++ b/addons/base_calendar/base_calendar.py @@ -410,7 +410,10 @@ property or property parameter."), event.add('location').value = event_obj.location if event_obj.rrule: event.add('rrule').value = event_obj.rrule - + if event_obj.user_id: + event_org = event.add('organizer') + event_org.params['CN'] = [event_obj.user_id.name] + event_org.value = 'MAILTO:' + (event_obj.user_id.user_email or event_obj.user_id.name) if event_obj.alarm_id: # computes alarm data valarm = event.add('valarm') @@ -440,7 +443,7 @@ property or property parameter."), attendee_add.params['CUTYPE'] = [str(attendee.cutype)] attendee_add.params['ROLE'] = [str(attendee.role)] attendee_add.params['RSVP'] = [str(attendee.rsvp)] - attendee_add.value = 'MAILTO:' + attendee.email + attendee_add.value = 'MAILTO:' + (attendee.email or '') res = cal.serialize() return res @@ -480,8 +483,8 @@ property or property parameter."), 'company': company } body = html_invitation % body_vals - attach = self.get_ics_file(cr, uid, res_obj, context=context) if mail_to and email_from: + attach = self.get_ics_file(cr, uid, res_obj, context=context) tools.email_send( email_from, mail_to, 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/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index e17916f6b57..31872e27ef4 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -48,8 +48,7 @@ string="Convert" help="Convert to Opportunity" icon="gtk-index" - type="object" - attrs="{'invisible':[('opportunity_id','!=',False)]}"/> + type="object"/> @@ -172,7 +171,7 @@