diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py index 5ba019b5621..f06123487e2 100644 --- a/addons/account/__openerp__.py +++ b/addons/account/__openerp__.py @@ -114,8 +114,6 @@ module named account_voucher. 'report/account_invoice_report_view.xml', 'report/account_entries_report_view.xml', 'report/account_report_view.xml', - 'report/account_analytic_report_view.xml', - 'report/account_account_report_view.xml', 'report/account_analytic_entries_report_view.xml', 'board_account_view.xml', "wizard/account_report_profit_loss_view.xml", diff --git a/addons/account/account.py b/addons/account/account.py index 5fc97a13697..ff5e8d4db82 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -138,7 +138,6 @@ class account_payment_term_line(osv.osv): account_payment_term_line() - class account_account_type(osv.osv): _name = "account.account.type" _description = "Account Type" @@ -632,15 +631,15 @@ class account_journal(osv.osv): 'default_debit_account_id': fields.many2one('account.account', 'Default Debit Account', domain="[('type','!=','view')]", help="It acts as a default account for debit amount"), 'centralisation': fields.boolean('Centralised counterpart', help="Check this box to determine that each entry of this journal won't create a new counterpart but will share the same counterpart. This is used in fiscal year closing."), 'update_posted': fields.boolean('Allow Cancelling Entries', help="Check this box if you want to allow the cancellation the entries related to this journal or of the invoice related to this journal"), - 'group_invoice_lines': fields.boolean('Group invoice lines', help="If this box is checked, the system will try to group the accounting lines when generating them from invoices."), + 'group_invoice_lines': fields.boolean('Group Invoice Lines', help="If this box is checked, the system will try to group the accounting lines when generating them from invoices."), 'sequence_id': fields.many2one('ir.sequence', 'Entry Sequence', help="The sequence gives the display order for a list of journals", required=False), 'user_id': fields.many2one('res.users', 'User', help="The user responsible for this journal"), 'groups_id': fields.many2many('res.groups', 'account_journal_group_rel', 'journal_id', 'group_id', 'Groups'), 'currency': fields.many2one('res.currency', 'Currency', help='The currency used to enter statement'), 'entry_posted': fields.boolean('Skip \'Draft\' State for Created Entries', help='Check this box if you don\'t want new account moves to pass through the \'draft\' state and instead goes directly to the \'posted state\' without any manual validation.'), 'company_id': fields.many2one('res.company', 'Company', required=True, select=1, help="Company related to this journal"), - 'invoice_sequence_id': fields.many2one('ir.sequence', 'Invoice Sequence', \ - help="The sequence used for invoice numbers in this journal."), +# 'invoice_sequence_id': fields.many2one('ir.sequence', 'Invoice Sequence', \ +# help="The sequence used for invoice numbers in this journal."), 'allow_date':fields.boolean('Check Date not in the Period', help= 'If set to True then do not accept the entry if the entry date is not into the period dates'), } @@ -648,7 +647,7 @@ class account_journal(osv.osv): 'user_id': lambda self,cr,uid,context: uid, 'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id, } - + def write(self, cr, uid, ids, vals, context=None): obj=[] if 'company_id' in vals: @@ -674,21 +673,21 @@ class account_journal(osv.osv): 'purchase_refund':'seq_out_refund', 'sale_refund':'seq_in_refund' } - + seq_pool = self.pool.get('ir.sequence') seq_typ_pool = self.pool.get('ir.sequence.type') date_pool = self.pool.get('ir.model.data') - + result = True - + journal = self.browse(cr, uid, ids[0], context) - code = journal.code.lower() + code = journal.code.lower() types = { 'name':journal.name, 'code':code } type_id = seq_typ_pool.create(cr, uid, types) - + seq = { 'name':journal.name, 'code':code, @@ -698,25 +697,25 @@ class account_journal(osv.osv): 'number_increment':1 } seq_id = seq_pool.create(cr, uid, seq) - + res = {} if not journal.sequence_id: res.update({ 'sequence_id':seq_id }) - if journal.type in journal_type and not journal.invoice_sequence_id: - res_ids = date_pool.search(cr, uid, [('model','=','ir.sequence'), ('name','=',journal_seq.get(journal.type, 'sale'))]) - inv_seq_id = date_pool.browse(cr, uid, res_ids[0]).res_id - inv_seq_id - res.update({ - 'invoice_sequence_id':inv_seq_id - }) - +# if journal.type in journal_type and not journal.invoice_sequence_id: +# res_ids = date_pool.search(cr, uid, [('model','=','ir.sequence'), ('name','=',journal_seq.get(journal.type, 'sale'))]) +# inv_seq_id = date_pool.browse(cr, uid, res_ids[0]).res_id +# inv_seq_id +# res.update({ +# 'invoice_sequence_id':inv_seq_id +# }) + result = self.write(cr, uid, [journal.id], res) - + return result - + def create(self, cr, uid, vals, context={}): journal_id = super(account_journal, self).create(cr, uid, vals, context) self.create_sequence(cr, uid, [journal_id], context) @@ -732,20 +731,26 @@ class account_journal(osv.osv): # }) return journal_id - def name_search(self, cr, user, name, args=None, operator='ilike', context={}, limit=100): + def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=100): if not args: args = [] + if context is None: + context = {} ids = [] + if context.get('journal_type', False): + args += [('type','=',context.get('journal_type'))] if name: - ids = self.search(cr, user, [('code','ilike',name)]+ args, limit=limit, context=context) + ids = self.search(cr, user, [('code', 'ilike', name)]+ args, limit=limit, context=context) if not ids: - ids = self.search(cr, user, [('name',operator,name)]+ args, limit=limit, context=context) +# ids = self.search(cr, user, [('name', operator, name)]+ args, limit=limit, context=context) + ids = self.search(cr, user, [('name', 'ilike', name)]+ args, limit=limit, context=context)#fix it ilike should be replace with operator + return self.name_get(cr, user, ids, context=context) def onchange_type(self, cr, uid, ids, type, currency): data_pool = self.pool.get('ir.model.data') user_pool = self.pool.get('res.users') - + type_map = { 'sale':'account_sp_journal_view', 'sale_refund':'account_sp_refund_journal_view', @@ -757,23 +762,23 @@ class account_journal(osv.osv): 'general':'account_journal_view', 'situation':'account_journal_view' } - + res = {} - + view_id = type_map.get(type, 'general') - + user = user_pool.browse(cr, uid, uid) if type in ('cash', 'bank') and currency and user.company_id.currency_id.id != currency: view_id = 'account_journal_bank_view_multi' - + data_id = data_pool.search(cr, uid, [('model','=','account.journal.view'), ('name','=',view_id)]) data = data_pool.browse(cr, uid, data_id[0]) - + res.update({ 'centralisation':type == 'situation', 'view_id':data.res_id, }) - + return { 'value':res } @@ -850,9 +855,9 @@ class account_fiscalyear(osv.osv): context = {} ids = [] if name: - ids = self.search(cr, user, [('code','ilike',name)]+ args, limit=limit) + ids = self.search(cr, user, [('code', 'ilike', name)]+ args, limit=limit) if not ids: - ids = self.search(cr, user, [('name',operator,name)]+ args, limit=limit) + ids = self.search(cr, user, [('name', operator, name)]+ args, limit=limit) return self.name_get(cr, user, ids, context=context) account_fiscalyear() @@ -1031,29 +1036,34 @@ class account_move(osv.osv): """ Returns a list of tupples containing id, name, as internally it is called {def name_get} result format : {[(id, name), (id, name), ...]} - + @param cr: A database cursor @param user: ID of the user currently logged in - @param name: name to search + @param name: name to search @param args: other arguments @param operator: default operator is 'ilike', it can be changed @param context: context arguments, like lang, time zone @param limit: Returns first 'n' ids of complete result, default is 80. - + @return: Returns a list of tupples containing id and name """ - + if not args: args=[] if not context: context={} ids = [] - if name: - ids += self.search(cr, user, [('state','=','draft'), ('id','=',name)], limit=limit) + ids += self.search(cr, user, [('name','ilike',name)]+args, limit=limit, context=context) + + if not ids and name and type(name) == int: + ids += self.search(cr, user, [('id','=',name)]+args, limit=limit, context=context) + if not ids: + ids += self.search(cr, user, args, limit=limit, context=context) + return self.name_get(cr, user, ids, context=context) - + def name_get(self, cursor, user, ids, context=None): if not len(ids): return [] @@ -1153,18 +1163,24 @@ class account_move(osv.osv): 'You cannot create entries on different periods/journals in the same move', ['line_id']), ] - + def post(self, cr, uid, ids, context=None): + invoice = context.get('invoice', False) if self.validate(cr, uid, ids, context) and len(ids): for move in self.browse(cr, uid, ids): if move.name =='/': new_name = False journal = move.journal_id - if journal.sequence_id: - c = {'fiscalyear_id': move.period_id.fiscalyear_id.id} - new_name = self.pool.get('ir.sequence').get_id(cr, uid, journal.sequence_id.id, context=c) + + if invoice and invoice.internal_number: + new_name = invoice.internal_number else: - raise osv.except_osv(_('Error'), _('No sequence defined in the journal !')) + if journal.sequence_id: + c = {'fiscalyear_id': move.period_id.fiscalyear_id.id} + new_name = self.pool.get('ir.sequence').get_id(cr, uid, journal.sequence_id.id, context=c) + else: + raise osv.except_osv(_('Error'), _('No sequence defined in the journal !')) + if new_name: self.write(cr, uid, [move.id], {'name':new_name}) @@ -1212,7 +1228,7 @@ class account_move(osv.osv): 'balance':False, 'account_tax_id':False, }) - + if 'journal_id' in vals and vals.get('journal_id', False): for l in vals['line_id']: if not l[0]: @@ -1661,15 +1677,15 @@ class account_tax(osv.osv): """ Returns a list of tupples containing id, name, as internally it is called {def name_get} result format : {[(id, name), (id, name), ...]} - + @param cr: A database cursor @param user: ID of the user currently logged in - @param name: name to search + @param name: name to search @param args: other arguments @param operator: default operator is 'ilike', it can be changed @param context: context arguments, like lang, time zone @param limit: Returns first 'n' ids of complete result, default is 80. - + @return: Returns a list of tupples containing id and name """ if not args: @@ -1679,10 +1695,10 @@ class account_tax(osv.osv): ids = [] ids = self.search(cr, user, args, limit=limit, context=context) return self.name_get(cr, user, ids, context=context) - + def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False): journal_pool = self.pool.get('account.journal') - + if context and context.has_key('type'): if context.get('type') in ('out_invoice','out_refund'): args += [('type_tax_use','in',['sale','all'])] @@ -1693,7 +1709,7 @@ class account_tax(osv.osv): journal = journal_pool.browse(cr, uid, context.get('journal_id')) if journal.type in ('sale', 'purchase'): args += [('type_tax_use','in',[journal.type,'all'])] - + return super(account_tax, self).search(cr, uid, args, offset, limit, order, context, count) def name_get(self, cr, uid, ids, context={}): @@ -1710,7 +1726,7 @@ class account_tax(osv.osv): if user.company_id: return user.company_id.id return self.pool.get('res.company').search(cr, uid, [('parent_id', '=', False)])[0] - + _defaults = { 'python_compute': lambda *a: '''# price_unit\n# address : res.partner.address object or False\n# product : product.product object or None\n# partner : res.partner object or None\n\nresult = price_unit * 0.10''', 'python_compute_inv': lambda *a: '''# price_unit\n# address : res.partner.address object or False\n# product : product.product object or False\n\nresult = price_unit * 0.10''', @@ -1830,11 +1846,11 @@ class account_tax(osv.osv): tin = self.compute_inv(cr, uid, tin, price_unit, quantity, address_id=address_id, product=product, partner=partner) for r in tin: totalex -= r['amount'] - totlex_qty=0.0 + totlex_qty=0.0 try: totlex_qty=totalex/quantity except: - pass + pass tex = self._compute(cr, uid, tex, totlex_qty, quantity, address_id=address_id, product=product, partner=partner) for r in tex: totalin += r['amount'] @@ -2140,11 +2156,10 @@ class account_subscription_line(osv.osv): 'date': fields.date('Date', required=True), 'move_id': fields.many2one('account.move', 'Entry'), } - _defaults = { - } - def move_create(self, cr, uid, ids, context={}): + + def move_create(self, cr, uid, ids, context=None): tocheck = {} - for line in self.browse(cr, uid, ids, context): + for line in self.browse(cr, uid, ids, context=context): datas = { 'date': line.date, } @@ -2153,7 +2168,8 @@ class account_subscription_line(osv.osv): self.write(cr, uid, [line.id], {'move_id':ids[0]}) if tocheck: self.pool.get('account.subscription').check(cr, uid, tocheck.keys(), context) - return True + return ids + _rec_name = 'date' account_subscription_line() @@ -2335,6 +2351,7 @@ class account_chart_template(osv.osv): 'property_account_income_categ': fields.many2one('account.account.template','Income Category Account'), 'property_account_expense': fields.many2one('account.account.template','Expense Account on Product Template'), 'property_account_income': fields.many2one('account.account.template','Income Account on Product Template'), + 'property_reserve_and_surplus_account': fields.many2one('account.account.template', 'Reserve and Surplus Account', domain=[('type', '=', 'payable')] , help='This Account is used for transferring Profit/Loss(If It is Profit : Amount will be added, Loss : Amount will be deducted.), Which is calculated from Profilt & Loss Report'), } account_chart_template() @@ -2616,7 +2633,7 @@ class wizard_multi_charts_accounts(osv.osv_memory): data_id = data_pool.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_sp_journal_view')]) data = data_pool.browse(cr, uid, data_id[0]) view_id = data.res_id - + seq_id = obj_sequence.search(cr, uid, [('name','=','Account Journal')])[0] if obj_multi.seq_journal: @@ -2657,7 +2674,7 @@ class wizard_multi_charts_accounts(osv.osv_memory): data_id = data_pool.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_journal_bank_view')]) data = data_pool.browse(cr, uid, data_id[0]) view_id_cash = data.res_id - + data_id = data_pool.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_journal_bank_view_multi')]) data = data_pool.browse(cr, uid, data_id[0]) ref_acc_bank = data.res_id @@ -2718,7 +2735,8 @@ class wizard_multi_charts_accounts(osv.osv_memory): ('property_account_expense_categ','product.category','account.account'), ('property_account_income_categ','product.category','account.account'), ('property_account_expense','product.template','account.account'), - ('property_account_income','product.template','account.account') + ('property_account_income','product.template','account.account'), + ('property_reserve_and_surplus_account','res.company','account.account') ] for record in todo_list: r = [] @@ -2731,6 +2749,7 @@ class wizard_multi_charts_accounts(osv.osv_memory): 'fields_id': field[0], 'value': account and 'account.account,'+str(acc_template_ref[account.id]) or False, } + if r: #the property exist: modify it property_obj.write(cr, uid, r, vals) @@ -2767,15 +2786,15 @@ class wizard_multi_charts_accounts(osv.osv_memory): 'position_id' : new_fp, } obj_ac_fp.create(cr, uid, vals_acc) - + #fially inactive the demo chart of accounts data_id = data_pool.search(cr, uid, [('model','=','account.account'), ('name','=','chart0')]) if data_id: data = data_pool.browse(cr, uid, data_id[0]) account_id = data.res_id - if account_id: - cr.execute("update account_account set active='f' where id=%s" % (account_id)) - + acc_ids = obj_acc._get_children_and_consol(cr, uid, [account_id]) + if acc_ids: + cr.execute("update account_account set active='f' where id in " + str(tuple(acc_ids))) wizard_multi_charts_accounts() class account_bank_accounts_wizard(osv.osv_memory): diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py index 59637edb546..6ddea9645b4 100644 --- a/addons/account/account_bank_statement.py +++ b/addons/account/account_bank_statement.py @@ -20,9 +20,9 @@ ############################################################################## import time + import netsvc from osv import fields, osv - from tools.misc import currency from tools.translate import _ import decimal_precision as dp @@ -52,13 +52,13 @@ class account_bank_statement(osv.osv): journal_pool = self.pool.get('account.journal') journal_type = context.get('journal_type', False) journal_id = False - + if journal_type: ids = journal_pool.search(cr, uid, [('type', '=', journal_type)]) if ids: journal_id = ids[0] - - return journal_id + + return journal_id def _default_balance_start(self, cr, uid, context={}): cr.execute('select id from account_bank_statement where journal_id=%s order by date desc limit 1', (1,)) @@ -126,12 +126,12 @@ class account_bank_statement(osv.osv): currency_id = res[statement_id] res[statement_id] = (currency_id, currency_names[currency_id]) return res - + _order = "date desc" _name = "account.bank.statement" _description = "Bank Statement" _columns = { - 'name': fields.char('Name', size=64, required=True, states={'confirm': [('readonly', True)]}), + 'name': fields.char('Name', size=64, required=True, help='if you give the Name other then /, its created Accounting Entries Move will be with same name as statement name. This allows the statement entries to have the same references than the statement itself', states={'confirm': [('readonly', True)]}), 'date': fields.date('Date', required=True, states={'confirm': [('readonly', True)]}), 'journal_id': fields.many2one('account.journal', 'Journal', required=True, states={'confirm': [('readonly', True)]}, domain=[('type', '=', 'bank')]), @@ -185,7 +185,7 @@ class account_bank_statement(osv.osv): context.update({ 'period_id':pids[0] }) - + return { 'value':res, 'context':context, @@ -194,16 +194,18 @@ class account_bank_statement(osv.osv): def button_dummy(self, cr, uid, ids, context={}): self.write(cr, uid, ids, {}, context) return True - - def button_confirm_bank(self, cr, uid, ids, context={}): + + def button_confirm_bank(self, cr, uid, ids, context=None): done = [] res_currency_obj = self.pool.get('res.currency') res_users_obj = self.pool.get('res.users') account_move_obj = self.pool.get('account.move') account_move_line_obj = self.pool.get('account.move.line') - account_bank_statement_line_obj = \ - self.pool.get('account.bank.statement.line') + account_bank_statement_line_obj = self.pool.get('account.bank.statement.line') + obj_seq = self.pool.get('ir.sequence') + if context is None: + context = {} company_currency_id = res_users_obj.browse(cr, uid, uid, context=context).company_id.currency_id.id @@ -369,13 +371,16 @@ class account_bank_statement(osv.osv): # raise osv.except_osv(_('Error !'), _('Unable to reconcile entry "%s": %.2f') % (move.name, move.amount)) if st.journal_id.entry_posted: - account_move_obj.write(cr, uid, [move_id], {'state':'posted'}) - + account_move_obj.write(cr, uid, [move_id], {'state': 'posted'}) + self.log(cr, uid, st.id, 'Statement %s is confirmed and entries are created.' % st.name) done.append(st.id) - next_number = self.pool.get('ir.sequence').get(cr, uid, 'account.bank.statement') - self.write(cr, uid, [st.id], {'name':next_number}, context) + next_number = obj_seq.get(cr, uid, 'account.bank.statement') + if not st.name == '/': + next_number = st.name + '/' + next_number[-1:] + account_move_obj.write(cr, uid, [move_id], {'state': 'posted', 'name': next_number}) + self.write(cr, uid, [st.id], {'name': next_number}, context=context) self.write(cr, uid, done, {'state':'confirm'}, context=context) return True @@ -610,45 +615,22 @@ account_bank_statement_reconcile_line() class account_bank_statement_line(osv.osv): - def onchange_partner_id(self, cursor, user, line_id, partner_id, type, currency_id, context={}): + def onchange_partner_id(self, cursor, user, line_id, partner_id, type, currency_id, context=None): res = {'value': {}} - + obj_partner = self.pool.get('res.partner') + if context is None: + context = {} if not partner_id: return res + line = self.browse(cursor, user, line_id) - if not line or (line and not line[0].account_id): - part = self.pool.get('res.partner').browse(cursor, user, partner_id, - context=context) + part = obj_partner.browse(cursor, user, partner_id, context=context) if type == 'supplier': account_id = part.property_account_payable.id else: account_id = part.property_account_receivable.id res['value']['account_id'] = account_id - - if not line or (line and not line[0].amount): - res_users_obj = self.pool.get('res.users') - res_currency_obj = self.pool.get('res.currency') - company_currency_id = res_users_obj.browse(cursor, user, user, - context=context).company_id.currency_id.id - if not currency_id: - currency_id = company_currency_id - - cursor.execute('SELECT sum(debit-credit) \ - FROM account_move_line \ - WHERE (reconcile_id is null) \ - AND partner_id = %s \ - AND account_id=%s', (partner_id, account_id)) - pgres = cursor.fetchone() - balance = pgres and pgres[0] or 0.0 - - balance = res_currency_obj.compute(cursor, user, company_currency_id, - currency_id, balance, context=context) - res['value']['amount'] = balance - - if context.get('amount', 0) > 0: - res['value']['amount'] = context.get('amount') - return res def _reconcile_amount(self, cursor, user, ids, name, args, context=None): @@ -670,7 +652,7 @@ class account_bank_statement_line(osv.osv): res[line.id] = 0.0 return res - _order = "date,name desc" + _order = "statement_id desc, sequence" _name = "account.bank.statement.line" _description = "Bank Statement Line" _columns = { @@ -707,7 +689,4 @@ class account_bank_statement_line(osv.osv): account_bank_statement_line() - - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: - +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py index e5298fa2f9d..f08f9de2f8f 100644 --- a/addons/account/account_cash_statement.py +++ b/addons/account/account_cash_statement.py @@ -28,14 +28,14 @@ from tools.translate import _ import decimal_precision as dp class account_cashbox_line(osv.osv): - + """ Cash Box Details """ - + _name = 'account.cashbox.line' _description = 'CashBox Line' def _sub_total(self, cr, uid, ids, name, arg, context=None): - + """ Calculates Sub total @param name: Names of fields. @param arg: User defined arguments @@ -51,7 +51,7 @@ class account_cashbox_line(osv.osv): """ Calculates Sub total on change of number @param pieces: Names of fields. @param number: - """ + """ sub=pieces*number return {'value':{'subtotal': sub or 0.0}} @@ -65,9 +65,9 @@ class account_cashbox_line(osv.osv): account_cashbox_line() class account_cash_statement(osv.osv): - + _inherit = 'account.bank.statement' - + def _get_starting_balance(self, cr, uid, ids, context=None): """ Find starting balance @@ -78,23 +78,23 @@ class account_cash_statement(osv.osv): res ={} for statement in self.browse(cr, uid, ids): amount_total=0.0 - + if statement.journal_id.type not in('cash'): continue - + for line in statement.starting_details_ids: amount_total+= line.pieces * line.number res[statement.id] = { 'balance_start':amount_total } return res - + def _balance_end_cash(self, cr, uid, ids, name, arg, context=None): """ Find ending balance " @param name: Names of fields. @param arg: User defined arguments @return: Dictionary of values. - """ + """ res ={} for statement in self.browse(cr, uid, ids): amount_total=0.0 @@ -102,7 +102,7 @@ class account_cash_statement(osv.osv): amount_total+= line.pieces * line.number res[statement.id]=amount_total return res - + def _get_sum_entry_encoding(self, cr, uid, ids, name, arg, context=None): """ Find encoding total of statements " @@ -120,9 +120,9 @@ class account_cash_statement(osv.osv): # def _default_journal_id(self, cr, uid, context={}): -# """ To get default journal for the object" +# """ To get default journal for the object" # @param name: Names of fields. -# @return: journal +# @return: journal # """ # company_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.id # journal = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'cash'), ('company_id', '=', company_id)]) @@ -130,7 +130,7 @@ class account_cash_statement(osv.osv): # return journal[0] # else: # return False - + def _end_balance(self, cursor, user, ids, name, attr, context=None): res_currency_obj = self.pool.get('res.currency') res_users_obj = self.pool.get('res.users') @@ -163,7 +163,7 @@ class account_cash_statement(osv.osv): for r in res: res[r] = round(res[r], 2) return res - + def _get_company(self, cr, uid, ids, context={}): user_pool = self.pool.get('res.users') company_pool = self.pool.get('res.company') @@ -171,7 +171,7 @@ class account_cash_statement(osv.osv): company_id = user.company_id and user.company_id.id if not company_id: company_id = company_pool.search(cr, uid, [])[0] - + return company_id def _get_cash_open_box_lines(self, cr, uid, ids, context={}): @@ -195,14 +195,14 @@ class account_cash_statement(osv.osv): } res.append((0, 0, dct)) return res - + _columns = { 'company_id':fields.many2one('res.company', 'Company', required=False), 'journal_id': fields.many2one('account.journal', 'Journal', required=True, states={'confirm': [('readonly', True)]}, domain=[('type', '=', 'cash')]), 'balance_end_real': fields.float('Closing Balance', digits_compute=dp.get_precision('Account'), states={'confirm':[('readonly', True)]}, help="closing balance entered by the cashbox verifier"), 'state': fields.selection( [('draft', 'Draft'), - ('confirm', 'Confirm'), + ('confirm', 'Confirmed'), ('open','Open')], 'State', required=True, states={'confirm': [('readonly', True)]}, readonly="1"), 'total_entry_encoding':fields.function(_get_sum_entry_encoding, method=True, store=True, string="Cash Transaction", help="Total cash transactions"), 'closing_date':fields.datetime("Closed On"), @@ -210,7 +210,7 @@ class account_cash_statement(osv.osv): 'balance_end_cash': fields.function(_balance_end_cash, method=True, store=True, string='Balance', help="Closing balance based on cashBox"), 'starting_details_ids': fields.one2many('account.cashbox.line', 'starting_id', string='Opening Cashbox'), 'ending_details_ids': fields.one2many('account.cashbox.line', 'ending_id', string='Closing Cashbox'), - 'name': fields.char('Name', size=64, required=True, readonly=True), + 'name': fields.char('Name', size=64, required=True, readonly=False, help='if you give the Name other then / , its created Accounting Entries Move will be with same name as statement name. This allows the statement entries to have the same references than the statement itself'), 'user_id':fields.many2one('res.users', 'Responsible', required=False), } _defaults = { @@ -226,8 +226,8 @@ class account_cash_statement(osv.osv): company_id = vals and vals.get('company_id',False) if company_id: sql = [ - ('company_id', '=', vals['company_id']), - ('journal_id', '=', vals['journal_id']), + ('company_id', '=', vals['company_id']), + ('journal_id', '=', vals['journal_id']), ('state', '=', 'open') ] open_jrnl = self.search(cr, uid, sql) @@ -247,112 +247,112 @@ class account_cash_statement(osv.osv): res_id = super(account_cash_statement, self).create(cr, uid, vals, context=context) self.write(cr, uid, [res_id], {}) return res_id - + def write(self, cr, uid, ids, vals, context=None): """ Update redord(s) comes in {ids}, with new value comes as {vals} return True on success, False otherwise - + @param cr: cursor to database @param user: id of current user @param ids: list of record ids to be update @param vals: dict of new values to be set @param context: context arguments, like lang, time zone - + @return: True on success, False otherwise """ - + super(account_cash_statement, self).write(cr, uid, ids, vals) res = self._get_starting_balance(cr, uid, ids) for rs in res: super(account_cash_statement, self).write(cr, uid, rs, res.get(rs)) return True - + def onchange_journal_id(self, cr, uid, statement_id, journal_id, context={}): - """ Changes balance start and starting details if journal_id changes" + """ Changes balance start and starting details if journal_id changes" @param statement_id: Changed statement_id @param journal_id: Changed journal_id @return: Dictionary of changed values """ - + cash_pool = self.pool.get('account.cashbox.line') statement_pool = self.pool.get('account.bank.statement') res = {} balance_start = 0.0 - + if not journal_id: res.update({ 'balance_start': balance_start }) return res - - + + res = super(account_cash_statement, self).onchange_journal_id(cr, uid, statement_id, journal_id, context) return res - + def _equal_balance(self, cr, uid, ids, statement, context={}): if statement.balance_end != statement.balance_end_cash: return False else: return True - + def _user_allow(self, cr, uid, ids, statement, context={}): return True - + def button_open(self, cr, uid, ids, context=None): - + """ Changes statement state to Running. - @return: True + @return: True """ cash_pool = self.pool.get('account.cashbox.line') statement_pool = self.pool.get('account.bank.statement') statement = statement_pool.browse(cr, uid, ids[0]) vals = {} - + if not self._user_allow(cr, uid, ids, statement, context={}): raise osv.except_osv(_('Error !'), _('User %s does not have rights to access %s journal !' % (statement.user_id.name, statement.journal_id.name))) - + if statement.name and statement.name == '/': number = self.pool.get('ir.sequence').get(cr, uid, 'account.cash.statement') vals.update({ 'name':number }) - -# if len(statement.starting_details_ids) > 0: -# sid = [] -# for line in statement.starting_details_ids: -# sid.append(line.id) -# cash_pool.unlink(cr, uid, sid) -# -# cr.execute("select id from account_bank_statement where journal_id=%s and user_id=%s and state=%s order by id desc limit 1", (statement.journal_id.id, uid, 'confirm')) -# rs = cr.fetchone() -# rs = rs and rs[0] or None -# if rs: -# statement = statement_pool.browse(cr, uid, rs) -# balance_start = statement.balance_end_real or 0.0 -# open_ids = cash_pool.search(cr, uid, [('ending_id','=',statement.id)]) -# for sid in open_ids: -# default = { -# 'ending_id': False, -# 'starting_id':ids[0] -# } -# cash_pool.copy(cr, uid, sid, default) -# + + cr.execute("select id from account_bank_statement where journal_id=%s and user_id=%s and state=%s order by id desc limit 1", (statement.journal_id.id, uid, 'confirm')) + rs = cr.fetchone() + rs = rs and rs[0] or None + if rs: + if len(statement.starting_details_ids) > 0: + sid = [] + for line in statement.starting_details_ids: + sid.append(line.id) + cash_pool.unlink(cr, uid, sid) + + statement = statement_pool.browse(cr, uid, rs) + balance_start = statement.balance_end_real or 0.0 + open_ids = cash_pool.search(cr, uid, [('ending_id','=',statement.id)]) + for sid in open_ids: + default = { + 'ending_id': False, + 'starting_id':ids[0] + } + cash_pool.copy(cr, uid, sid, default) + vals.update({ - 'date':time.strftime("%Y-%m-%d %H:%M:%S"), + 'date':time.strftime("%Y-%m-%d %H:%M:%S"), 'state':'open', - + }) - + self.write(cr, uid, ids, vals) return True def button_confirm_cash(self, cr, uid, ids, context={}): - - """ Check the starting and ending detail of statement - @return: True + + """ Check the starting and ending detail of statement + @return: True """ done = [] res_currency_obj = self.pool.get('res.currency') @@ -360,20 +360,20 @@ class account_cash_statement(osv.osv): account_move_obj = self.pool.get('account.move') account_move_line_obj = self.pool.get('account.move.line') account_bank_statement_line_obj = self.pool.get('account.bank.statement.line') - + company_currency_id = res_users_obj.browse(cr, uid, uid, context=context).company_id.currency_id.id for st in self.browse(cr, uid, ids, context): - + self.write(cr, uid, [st.id], {'balance_end_real':st.balance_end}) st.balance_end_real = st.balance_end - + if not st.state == 'open': continue - + if not self._equal_balance(cr, uid, ids, st, context): raise osv.except_osv(_('Error !'), _('CashBox Balance is not matching with Calculated Balance !')) - + # if not (abs((st.balance_end or 0.0) - st.balance_end_real) < 0.0001): # raise osv.except_osv(_('Error !'), # _('The statement balance is incorrect !\n') + @@ -519,7 +519,7 @@ class account_cash_statement(osv.osv): if st.journal_id.entry_posted: account_move_obj.write(cr, uid, [move_id], {'state':'posted'}) done.append(st.id) - + vals = { 'state':'confirm', 'closing_date':time.strftime("%Y-%m-%d %H:%M:%S") diff --git a/addons/account/account_demo.xml b/addons/account/account_demo.xml index a8a1d1405cd..5ef0ee4992d 100644 --- a/addons/account/account_demo.xml +++ b/addons/account/account_demo.xml @@ -1,10 +1,10 @@ - + + Fiscal year + --> @@ -15,11 +15,12 @@ + Fiscal Periods + --> - + + @@ -27,7 +28,8 @@ - + + @@ -35,7 +37,8 @@ - + + @@ -43,7 +46,8 @@ - + + @@ -51,7 +55,8 @@ - + + @@ -59,7 +64,8 @@ - + + @@ -67,7 +73,8 @@ - + + @@ -75,7 +82,8 @@ - + + @@ -83,7 +91,8 @@ - + + @@ -91,7 +100,8 @@ - + + @@ -99,7 +109,8 @@ - + + @@ -107,7 +118,8 @@ - + + diff --git a/addons/account/account_end_fy.xml b/addons/account/account_end_fy.xml index fe7b6e682fe..a33544ffacc 100644 --- a/addons/account/account_end_fy.xml +++ b/addons/account/account_end_fy.xml @@ -14,7 +14,7 @@ action="action_account_period_tree" id="menu_action_account_period_close_tree" parent="account.menu_account_end_year_treatments" - sequence="0"/> + sequence="0" groups="base.group_extended"/> diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml index 5b57ab130fd..6d067a31a9f 100644 --- a/addons/account/account_installer.xml +++ b/addons/account/account_installer.xml @@ -1,143 +1,139 @@ - - - account.installer.form - account.installer - form - - - -
- Accounting System Configuration -
+ + + account.installer.form + account.installer + form + + + +
+ Accounting System Configuration +
+ + Configure Your Accounting System + + + From this screen, you can configure your accounting system. Choose a Chart of Account matched to your accounting system or the Generic Chart of Account which allows you to configure which suit your needs. + + + Configure + + + 23 + + + + + + + + + + + + + + +
+ + + + + + + + + + +
+ + + + + + + + + - - Configure Your Accounting System - - - From this screen, you can configure your accounting system. Choose a Chart of Account matched to your accounting system or the Generic Chart of Account which allows you to configure which suit your needs. - - - Configure - - - 23 - - - - - - - - - - - - - - -
- - - + + account.installer.modules.form + account.installer.modules + form + + + + + Extra Accounting Modules Installation - - - - - - -
- - - - - - - - - + + Install Extra Accounting Modules In Your Accounting System + + + From this screen, you can install extra accounting modules in your accounting system. Select the modules to directly install them. If you do not think you need any of these right now, you can easily install them later. + + + 23 + + + + + + + + + + + + + + + + - - account.installer.modules.form - account.installer.modules - form - - - -
- Extra Accounting Modules Installation -
- - Install Extra Accounting Modules In Your Accounting System - - - From this screen, you can install extra accounting modules in your accounting system. Select the modules to directly install them. If you do not think you need any of these right now, you can easily install them later. - - - 23 - - - - - - - - - - - - - - + + Accounting Chart Configuration + ir.actions.act_window + account.installer + + form + form + new + - - Accounting Chart Configuration - ir.actions.act_window - account.installer - - form - form - new - + + Accounting Modules Installation + ir.actions.act_window + account.installer.modules + + form + form + new + - - Accounting Modules Installation - ir.actions.act_window - account.installer.modules - - form - form - new - + + + 3 + onskip + - - - 3 - onskip - + + + 5 + always + - - - 5 - always - - - - ir.actions.todo - account_installer_action_replace - tree - - - - diff --git a/addons/account_voucher_payment/wizard/account_voucher_unreconcile.py b/addons/account_voucher_payment/wizard/account_voucher_unreconcile.py index ef30e1af69f..d12bee51894 100644 --- a/addons/account_voucher_payment/wizard/account_voucher_unreconcile.py +++ b/addons/account_voucher_payment/wizard/account_voucher_unreconcile.py @@ -52,8 +52,9 @@ class account_voucher_unreconcile(osv.osv_memory): reconcile_pool.unlink(cr, uid, rec) if res.remove: - wf_service = netsvc.LocalService("workflow") - wf_service.trg_validate(uid, 'account.voucher', context.get('active_id'), 'cancel_voucher', cr) + voucher_pool.cancel_voucher(cr, uid, [context.get('active_id')], context) +# wf_service = netsvc.LocalService("workflow") +# wf_service.trg_validate(uid, 'account.voucher', context.get('active_id'), 'cancel_voucher', cr) return {} diff --git a/addons/analytic/__openerp__.py b/addons/analytic/__openerp__.py index e0411506dd8..80585ee39da 100644 --- a/addons/analytic/__openerp__.py +++ b/addons/analytic/__openerp__.py @@ -19,7 +19,6 @@ # ############################################################################## - { "name" : "Analytic Account", "version": "1.1", @@ -37,4 +36,4 @@ 'installable': True, 'active': False, } -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py index 77a881744bc..e5dd9d52ce1 100644 --- a/addons/analytic/analytic.py +++ b/addons/analytic/analytic.py @@ -25,19 +25,15 @@ import operator from osv import fields, osv import decimal_precision as dp -# -# Object definition -# - class account_analytic_account(osv.osv): _name = 'account.analytic.account' _description = 'Analytic Account' - def _compute_currency_for_level_tree(self, cr, uid, ids, ids2, res, context={}): + def _compute_currency_for_level_tree(self, cr, uid, ids, ids2, res, context=None): # Handle multi-currency on each level of analytic account # This is a refactoring of _balance_calc computation cr.execute("SELECT a.id, r.currency_id FROM account_analytic_account a INNER JOIN res_company r ON (a.company_id = r.id) where a.id IN %s" , (tuple(ids2),)) - currency= dict(cr.fetchall()) + currency = dict(cr.fetchall()) res_currency= self.pool.get('res.currency') for id in ids: if id not in ids2: @@ -50,7 +46,7 @@ class account_analytic_account(osv.osv): else: res[id] += res.get(child, 0.0) - cur_obj = res_currency.browse(cr, uid, currency.values(), context) + cur_obj = res_currency.browse(cr, uid, currency.values(), context=context) cur_obj = dict([(o.id, o) for o in cur_obj]) for id in ids: if id in ids2: @@ -58,9 +54,10 @@ class account_analytic_account(osv.osv): return dict([(i, res[i]) for i in ids ]) - - def _credit_calc(self, cr, uid, ids, name, arg, context={}): + def _credit_calc(self, cr, uid, ids, name, arg, context=None): res = {} + if context is None: + context = {} parent_ids = tuple(self.search(cr, uid, [('parent_id', 'child_of', ids)])) for i in ids: res.setdefault(i,0.0) @@ -69,16 +66,18 @@ class account_analytic_account(osv.osv): return res where_date = '' - if context.get('from_date',False): + if context.get('from_date', False): where_date += " AND l.date >= '" + context['from_date'] + "'" - if context.get('to_date',False): + if context.get('to_date', False): where_date += " AND l.date <= '" + context['to_date'] + "'" cr.execute("SELECT a.id, COALESCE(SUM(l.amount_currency),0) FROM account_analytic_account a LEFT JOIN account_analytic_line l ON (a.id=l.account_id "+where_date+") WHERE l.amount_currency<0 and a.id IN %s GROUP BY a.id",(tuple(parent_ids),)) r = dict(cr.fetchall()) return self._compute_currency_for_level_tree(cr, uid, ids, parent_ids, r, context) - def _debit_calc(self, cr, uid, ids, name, arg, context={}): + def _debit_calc(self, cr, uid, ids, name, arg, context=None): res = {} + if context is None: + context = {} parent_ids = tuple(self.search(cr, uid, [('parent_id', 'child_of', ids)])) for i in ids: res.setdefault(i,0.0) @@ -92,11 +91,14 @@ class account_analytic_account(osv.osv): if context.get('to_date',False): where_date += " AND l.date <= '" + context['to_date'] + "'" cr.execute("SELECT a.id, COALESCE(SUM(l.amount_currency),0) FROM account_analytic_account a LEFT JOIN account_analytic_line l ON (a.id=l.account_id "+where_date+") WHERE l.amount_currency>0 and a.id IN %s GROUP BY a.id" ,(tuple(parent_ids),)) - r= dict(cr.fetchall()) - return self._compute_currency_for_level_tree(cr, uid, ids, parent_ids, r, context) + r = dict(cr.fetchall()) + return self._compute_currency_for_level_tree(cr, uid, ids, parent_ids, r, context=context) - def _balance_calc(self, cr, uid, ids, name, arg, context={}): + def _balance_calc(self, cr, uid, ids, name, arg, context=None): res = {} + if context is None: + context = {} + parent_ids = tuple(self.search(cr, uid, [('parent_id', 'child_of', ids)])) for i in ids: res.setdefault(i,0.0) @@ -114,11 +116,14 @@ class account_analytic_account(osv.osv): for account_id, sum in cr.fetchall(): res[account_id] = sum - return self._compute_currency_for_level_tree(cr, uid, ids, parent_ids, res, context) + return self._compute_currency_for_level_tree(cr, uid, ids, parent_ids, res, context=context) - def _quantity_calc(self, cr, uid, ids, name, arg, context={}): + def _quantity_calc(self, cr, uid, ids, name, arg, context=None): #XXX must convert into one uom res = {} + if context is None: + context = {} + parent_ids = tuple(self.search(cr, uid, [('parent_id', 'child_of', ids)])) for i in ids: @@ -150,7 +155,7 @@ class account_analytic_account(osv.osv): res[id] += res.get(child, 0.0) return dict([(i, res[i]) for i in ids]) - def name_get(self, cr, uid, ids, context={}): + def name_get(self, cr, uid, ids, context=None): if not len(ids): return [] res = [] @@ -168,13 +173,13 @@ class account_analytic_account(osv.osv): res = self.name_get(cr, uid, ids) return dict(res) - def _get_company_currency(self, cr, uid, ids, field_name, arg, context={}): + def _get_company_currency(self, cr, uid, ids, field_name, arg, context=None): result = {} for rec in self.browse(cr, uid, ids, context): result[rec.id] = (rec.company_id.currency_id.id,rec.company_id.currency_id.code) or False return result - def _get_account_currency(self, cr, uid, ids, field_name, arg, context={}): + def _get_account_currency(self, cr, uid, ids, field_name, arg, context=None): result=self._get_company_currency(cr, uid, ids, field_name, arg, context={}) return result @@ -209,19 +214,20 @@ class account_analytic_account(osv.osv): 'currency_id': fields.function(_get_account_currency, method=True, type='many2one', relation='res.currency', string='Account currency', store=True), } - def _default_company(self, cr, uid, context={}): + def _default_company(self, cr, uid, context=None): user = self.pool.get('res.users').browse(cr, uid, uid, context=context) if user.company_id: return user.company_id.id return self.pool.get('res.company').search(cr, uid, [('parent_id', '=', False)])[0] + _defaults = { - 'type' : lambda *a : 'normal', + 'type' : 'normal', 'company_id': _default_company, - 'state' : lambda *a : 'open', + 'state' : 'open', 'user_id' : lambda self, cr, uid, ctx : uid, 'partner_id': lambda self, cr, uid, ctx: ctx.get('partner_id', False), 'contact_id': lambda self, cr, uid, ctx: ctx.get('contact_id', False), - 'date_start': lambda *a: time.strftime('%Y-%m-%d') + 'date_start': time.strftime('%Y-%m-%d') } def check_recursion(self, cr, uid, ids, parent=None): @@ -238,14 +244,13 @@ class account_analytic_account(osv.osv): vals['code'] = self.pool.get('ir.sequence').get(cr, uid, 'account.analytic.account') return super(account_analytic_account, self).create(cr, uid, vals, context=context) - def copy(self, cr, uid, id, default=None, context={}): + def copy(self, cr, uid, id, default=None, context=None): if not default: default = {} default['code'] = False default['line_ids'] = [] return super(account_analytic_account, self).copy(cr, uid, id, default, context=context) - def on_change_parent(self, cr, uid, id, parent_id): if not parent_id: return {} @@ -281,9 +286,9 @@ account_analytic_account() class account_analytic_line(osv.osv): _name = 'account.analytic.line' _description = 'Analytic Line' - def _amount_currency(self, cr, uid, ids, field_name, arg, context={}): + def _amount_currency(self, cr, uid, ids, field_name, arg, context=None): result = {} - for rec in self.browse(cr, uid, ids, context): + for rec in self.browse(cr, uid, ids, context=context): cmp_cur_id=rec.company_id.currency_id.id aa_cur_id=rec.account_id.currency_id.id # Always provide the amount in currency @@ -298,14 +303,14 @@ class account_analytic_line(osv.osv): else: result[rec.id]=rec.amount return result - - def _get_account_currency(self, cr, uid, ids, field_name, arg, context={}): + + def _get_account_currency(self, cr, uid, ids, field_name, arg, context=None): result = {} for rec in self.browse(cr, uid, ids, context): # Always provide second currency result[rec.id] = (rec.account_id.currency_id.id,rec.account_id.currency_id.code) return result - def _get_account_line(self, cr, uid, ids, context={}): + def _get_account_line(self, cr, uid, ids, context=None): aac_ids = {} for acc in self.pool.get('account.analytic.account').browse(cr, uid, ids): aac_ids[acc.id] = True @@ -337,10 +342,12 @@ class account_analytic_line(osv.osv): } _defaults = { - 'date': lambda *a: time.strftime('%Y-%m-%d'), + 'date': time.strftime('%Y-%m-%d'), 'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.analytic.line', context=c), } + _order = 'date' + account_analytic_line() - +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file diff --git a/addons/analytic/i18n/it.po b/addons/analytic/i18n/it.po new file mode 100644 index 00000000000..7a5fd2b7c69 --- /dev/null +++ b/addons/analytic/i18n/it.po @@ -0,0 +1,284 @@ +# Italian 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: 2010-06-18 10:59+0000\n" +"PO-Revision-Date: 2010-08-16 12:38+0000\n" +"Last-Translator: Nicola Riolini - Micronaet \n" +"Language-Team: Italian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2010-08-17 07:01+0000\n" +"X-Generator: Launchpad (build Unknown)\n" + +#. module: analytic +#: field:account.analytic.account,child_ids:0 +msgid "Child Accounts" +msgstr "Conto figlio" + +#. module: analytic +#: help:account.analytic.line,amount_currency:0 +msgid "" +"The amount expressed in the related account currency if not equal to the " +"company one." +msgstr "" +"L'importo espresso nella valuta del conto non è uguale a quella della " +"Compagnia" + +#. module: analytic +#: constraint:ir.model:0 +msgid "" +"The Object name must start with x_ and not contain any special character !" +msgstr "" +"Il nome dell'oggetto deve iniziare per x_ e non deve contenere caratteri " +"speciali!" + +#. module: analytic +#: field:account.analytic.account,name:0 +msgid "Account Name" +msgstr "Nome del conto" + +#. module: analytic +#: help:account.analytic.line,unit_amount:0 +msgid "Specifies the amount of quantity to count." +msgstr "Specifica la quantità da sommare" + +#. module: analytic +#: help:account.analytic.line,currency_id:0 +msgid "The related account currency if not equal to the company one." +msgstr "La relativa valuta del conto non è uguale a quella della Compagnia" + +#. module: analytic +#: model:ir.module.module,description:analytic.module_meta_information +msgid "" +"Module for defining analytic accounting object.\n" +" " +msgstr "" +"Modulo per definire gli oggetti dei conti analitici\n" +" " + +#. module: analytic +#: field:account.analytic.account,state:0 +msgid "State" +msgstr "Stato" + +#. module: analytic +#: field:account.analytic.account,user_id:0 +msgid "Account Manager" +msgstr "Gestore Conti" + +#. module: analytic +#: selection:account.analytic.account,state:0 +msgid "Draft" +msgstr "Bozza" + +#. module: analytic +#: selection:account.analytic.account,state:0 +msgid "Closed" +msgstr "Chiuso" + +#. module: analytic +#: field:account.analytic.account,debit:0 +msgid "Debit" +msgstr "Debito" + +#. module: analytic +#: help:account.analytic.account,state:0 +msgid "" +"* When an account is created its in 'Draft' state. " +" \n" +"* If any associated partner is there, it can be in 'Open' state. " +" \n" +"* If any pending balance is there it can be in 'Pending'. " +" \n" +"* And finally when all the transactions are over, it can be in 'Close' " +"state. \n" +"* The project can be in either if the states 'Template' and 'Running'.\n" +" If it is template then we can make projects based on the template projects. " +"If its in 'Running' state it is a normal project. " +" \n" +" If it is to be reviewed then the state is 'Pending'.\n" +" When the project is completed the state is set to 'Done'." +msgstr "" +"* Quando un conto è creato è nello stato \"Draft\". " +" \n" +"* Se c'è qualche partner associato, puà essere nello stato \"Open\".\n" +"* Se c'è qualche pendenza può essere in \"Pending\".\n" +"* E, per conlcudere, quando tutte le transazioni sono finite, può essere " +"nello stato \"Closed\".\n" +"* Il progetto può essere in entrambe gli stati \"Template\" e \"Running\".\n" +"Se è nello stato template, allora possiamo creare progetti basati su di " +"esso. Se è in \"Running\" state è in progetto normale. Se deve essere " +"revisionato allora lo stato è \"Pending\".\n" +"Quando il progetto è completato lo stato è \"Done\"." + +#. module: analytic +#: field:account.analytic.account,type:0 +msgid "Account Type" +msgstr "Tipo di conto" + +#. module: analytic +#: selection:account.analytic.account,state:0 +msgid "Template" +msgstr "Modello" + +#. module: analytic +#: selection:account.analytic.account,state:0 +msgid "Pending" +msgstr "In sospeso" + +#. module: analytic +#: model:ir.model,name:analytic.model_account_analytic_line +msgid "Analytic Line" +msgstr "Linea conto analitico" + +#. module: analytic +#: field:account.analytic.account,description:0 +#: field:account.analytic.line,name:0 +msgid "Description" +msgstr "Descrizione" + +#. module: analytic +#: help:account.analytic.line,amount:0 +msgid "" +"Calculated by multiplying the quantity and the price given in the Product's " +"cost price." +msgstr "" +"Calcolato multiplicando la quantità e il prezzo dato nel campo " +"\"costo/prezzo del prodotto\"" + +#. module: analytic +#: field:account.analytic.account,company_id:0 +#: field:account.analytic.line,company_id:0 +msgid "Company" +msgstr "Compagnia" + +#. module: analytic +#: field:account.analytic.account,quantity_max:0 +msgid "Maximum Quantity" +msgstr "Quantità massima" + +#. module: analytic +#: field:account.analytic.line,user_id:0 +msgid "User" +msgstr "Utente" + +#. module: analytic +#: field:account.analytic.account,parent_id:0 +msgid "Parent Analytic Account" +msgstr "Conto Analitico padre" + +#. module: analytic +#: field:account.analytic.line,date:0 +msgid "Date" +msgstr "Data" + +#. module: analytic +#: field:account.analytic.account,currency_id:0 +#: field:account.analytic.line,currency_id:0 +msgid "Account currency" +msgstr "Valuta del Conto" + +#. module: analytic +#: selection:account.analytic.account,type:0 +msgid "View" +msgstr "Visualizza" + +#. module: analytic +#: help:account.analytic.account,quantity_max:0 +msgid "Sets the higher limit of quantity of hours." +msgstr "Imposta il limite superiore della quantità di ore" + +#. module: analytic +#: field:account.analytic.account,credit:0 +msgid "Credit" +msgstr "Credito" + +#. module: analytic +#: field:account.analytic.line,amount:0 +msgid "Amount" +msgstr "Importo" + +#. module: analytic +#: field:account.analytic.account,contact_id:0 +msgid "Contact" +msgstr "Contatto" + +#. module: analytic +#: selection:account.analytic.account,state:0 +msgid "Cancelled" +msgstr "Cancellato" + +#. module: analytic +#: field:account.analytic.account,balance:0 +msgid "Balance" +msgstr "Saldo" + +#. module: analytic +#: field:account.analytic.account,date_start:0 +msgid "Date Start" +msgstr "Data Inizio" + +#. module: analytic +#: field:account.analytic.account,quantity:0 +#: field:account.analytic.line,unit_amount:0 +msgid "Quantity" +msgstr "Quantità" + +#. module: analytic +#: field:account.analytic.account,date:0 +msgid "Date End" +msgstr "Data Fine" + +#. module: analytic +#: field:account.analytic.account,code:0 +msgid "Account Code" +msgstr "Codifica Conto" + +#. module: analytic +#: selection:account.analytic.account,type:0 +msgid "Normal" +msgstr "Normale" + +#. module: analytic +#: field:account.analytic.account,complete_name:0 +msgid "Full Account Name" +msgstr "Nome Conto completa" + +#. module: analytic +#: field:account.analytic.line,account_id:0 +#: model:ir.model,name:analytic.model_account_analytic_account +#: model:ir.module.module,shortdesc:analytic.module_meta_information +msgid "Analytic Account" +msgstr "Conto Analitico" + +#. module: analytic +#: field:account.analytic.account,company_currency_id:0 +msgid "Currency" +msgstr "Valuta" + +#. module: analytic +#: field:account.analytic.line,amount_currency:0 +msgid "Amount currency" +msgstr "Importo valuta" + +#. module: analytic +#: field:account.analytic.account,partner_id:0 +msgid "Associated Partner" +msgstr "Partner associato" + +#. module: analytic +#: selection:account.analytic.account,state:0 +msgid "Open" +msgstr "Aperto" + +#. module: analytic +#: field:account.analytic.account,line_ids:0 +msgid "Analytic Entries" +msgstr "Voci Conto Analitico" diff --git a/addons/analytic_journal_billing_rate/i18n/it.po b/addons/analytic_journal_billing_rate/i18n/it.po index 800c261112b..b718cf82988 100644 --- a/addons/analytic_journal_billing_rate/i18n/it.po +++ b/addons/analytic_journal_billing_rate/i18n/it.po @@ -7,24 +7,24 @@ 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-02-03 08:33+0000\n" -"Last-Translator: Fabien (Open ERP) \n" +"PO-Revision-Date: 2010-08-16 10:21+0000\n" +"Last-Translator: Nicola Riolini - Micronaet \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-08-12 04:04+0000\n" +"X-Launchpad-Export-Date: 2010-08-17 07:00+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 "XML non valido per Visualizzazione Architettura!" +msgstr "XML non valido per Visualizzare l'architettura!" #. module: analytic_journal_billing_rate #: field:analytic_journal_rate_grid,journal_id:0 msgid "Analytic Journal" -msgstr "" +msgstr "Giornale conti analitici" #. module: analytic_journal_billing_rate #: constraint:ir.model:0 @@ -37,29 +37,29 @@ msgstr "" #. module: analytic_journal_billing_rate #: view:analytic_journal_rate_grid:0 msgid "Billing Rate per Journal for this Analytic Account" -msgstr "" +msgstr "Tasso di fatturazione per Giornale per questo Conto Analitico" #. module: analytic_journal_billing_rate #: field:analytic_journal_rate_grid,account_id:0 msgid "Analytic Account" -msgstr "" +msgstr "Conto analitico" #. module: analytic_journal_billing_rate #: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid msgid "Relation table between journals and billing rates" -msgstr "" +msgstr "Tabella di relazione tra Giornali e tassi di fatturazione" #. module: analytic_journal_billing_rate #: field:account.analytic.account,journal_rate_ids:0 msgid "Invoicing Rate per Journal" -msgstr "" +msgstr "Tasso di fatturazione diviso per Giornale" #. module: analytic_journal_billing_rate #: model:ir.module.module,shortdesc:analytic_journal_billing_rate.module_meta_information msgid "Analytic Journal Billing Rate" -msgstr "" +msgstr "Giornale Conti Analitici Tasso di fatturazione" #. module: analytic_journal_billing_rate #: field:analytic_journal_rate_grid,rate_id:0 msgid "Invoicing Rate" -msgstr "" +msgstr "Tasso di fatturazione" diff --git a/addons/analytic_journal_billing_rate/i18n/tr.po b/addons/analytic_journal_billing_rate/i18n/tr.po index b850089e14c..e3dffbd8ad8 100644 --- a/addons/analytic_journal_billing_rate/i18n/tr.po +++ b/addons/analytic_journal_billing_rate/i18n/tr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-11 05:03+0000\n" +"PO-Revision-Date: 2010-08-16 09:25+0000\n" "Last-Translator: Fabien (Open ERP) \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-08-12 04:04+0000\n" +"X-Launchpad-Export-Date: 2010-08-17 07:00+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: analytic_journal_billing_rate diff --git a/addons/analytic_user_function/i18n/tr.po b/addons/analytic_user_function/i18n/tr.po index 15f03fe170c..6ed3c723ff4 100644 --- a/addons/analytic_user_function/i18n/tr.po +++ b/addons/analytic_user_function/i18n/tr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-11 05:46+0000\n" +"PO-Revision-Date: 2010-08-16 09:29+0000\n" "Last-Translator: Fabien (Open ERP) \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-08-12 04:05+0000\n" +"X-Launchpad-Export-Date: 2010-08-17 07:00+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: analytic_user_function diff --git a/addons/auction/auction.py b/addons/auction/auction.py index f6aebbb5077..0014edada56 100644 --- a/addons/auction/auction.py +++ b/addons/auction/auction.py @@ -618,7 +618,7 @@ class auction_lots(osv.osv): 'price_unit': lot.obj_price, } inv_line_obj.create(cr, uid, inv_line, context) - inv_ref.button_compute(cr, uid, invoice.values()) + inv_ref.button_compute(cr, uid, invoices.values()) wf_service.trg_validate(uid, 'account.invoice', inv_id, 'invoice_proforma2', cr) return invoices.values() diff --git a/addons/auction/board_auction_view.xml b/addons/auction/board_auction_view.xml index 7a233282f2c..8a183c267d8 100644 --- a/addons/auction/board_auction_view.xml +++ b/addons/auction/board_auction_view.xml @@ -111,6 +111,8 @@ action="open_board_auction" sequence="1" id="menu_board_auction_open" icon="terp-graph" parent="menu_board_auction"/> + + diff --git a/addons/auction/i18n/lt.po b/addons/auction/i18n/lt.po index 26171c7c78b..675f8a7f893 100644 --- a/addons/auction/i18n/lt.po +++ b/addons/auction/i18n/lt.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-11 05:33+0000\n" +"PO-Revision-Date: 2010-08-16 09:38+0000\n" "Last-Translator: Fabien (Open ERP) \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-08-12 04:00+0000\n" +"X-Launchpad-Export-Date: 2010-08-17 07:00+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: auction diff --git a/addons/auction/i18n/nl.po b/addons/auction/i18n/nl.po index be20a86033d..2eeb193b763 100644 --- a/addons/auction/i18n/nl.po +++ b/addons/auction/i18n/nl.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-11 05:29+0000\n" +"PO-Revision-Date: 2010-08-16 09:42+0000\n" "Last-Translator: OpenERP Administrators \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-08-12 04:00+0000\n" +"X-Launchpad-Export-Date: 2010-08-17 07:00+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: auction diff --git a/addons/auction/i18n/tr.po b/addons/auction/i18n/tr.po index 436336b41c0..029a2d4b4af 100644 --- a/addons/auction/i18n/tr.po +++ b/addons/auction/i18n/tr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-11 05:30+0000\n" +"PO-Revision-Date: 2010-08-16 09:41+0000\n" "Last-Translator: OpenERP Administrators \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-08-12 04:00+0000\n" +"X-Launchpad-Export-Date: 2010-08-17 07:00+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: auction diff --git a/addons/auction/report/lots_list_landscape.py b/addons/auction/report/lots_list_landscape.py index d85e375a8ef..84762fb8b05 100644 --- a/addons/auction/report/lots_list_landscape.py +++ b/addons/auction/report/lots_list_landscape.py @@ -23,7 +23,7 @@ import pooler import time from report import report_sxw -class lots_list_llandscape(report_sxw.rml_parse): +class lots_list_landscape(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): super(lots_list_landscape, self).__init__(cr, uid, name, context=context) self.localcontext.update({ diff --git a/addons/auction/wizard/auction_aie_send.py b/addons/auction/wizard/auction_aie_send.py index 238f9923677..8eb392210a9 100644 --- a/addons/auction/wizard/auction_aie_send.py +++ b/addons/auction/wizard/auction_aie_send.py @@ -22,12 +22,13 @@ # # Does not properly work concurrently !!! # -import base64 -import mimetypes -import httplib -import threading -from tools.translate import _ from osv import fields,osv +from tools.translate import _ +import base64 +import httplib +import mimetypes +import netsvc +import threading class auction_lots_send_aie(osv.osv_memory): _name = 'auction.lots.send.aie' @@ -146,7 +147,7 @@ class auction_lots_send_aie(osv.osv_memory): if len(datas): bin = base64.decodestring(datas[0]['image']) fname = datas[0]['name'] - _photo_bin_send(uname, passwd, ref, did, fname, bin) + self._photo_bin_send(uname, passwd, ref, did, fname, bin) def get_dates(self, cr, uid, ids, context={}): import httplib diff --git a/addons/auction/wizard/auction_lots_buyer_map.py b/addons/auction/wizard/auction_lots_buyer_map.py index c0d9e271e8e..23279942965 100644 --- a/addons/auction/wizard/auction_lots_buyer_map.py +++ b/addons/auction/wizard/auction_lots_buyer_map.py @@ -19,9 +19,10 @@ # ############################################################################## +from osv import osv,fields +from tools.translate import _ import netsvc import sql_db -from osv import osv,fields class wiz_auc_lots_buyer_map(osv.osv_memory): _name = 'auction.lots.buyer_map' diff --git a/addons/auction/wizard/auction_lots_sms_send.py b/addons/auction/wizard/auction_lots_sms_send.py index 09dabd291ab..094ecea1ca2 100644 --- a/addons/auction/wizard/auction_lots_sms_send.py +++ b/addons/auction/wizard/auction_lots_sms_send.py @@ -48,7 +48,7 @@ class auction_lots_sms_send(osv.osv_memory): lot_obj = self.pool.get('auction.lots') partner_obj = self.pool.get('res.partner') partner_address_obj = self.pool.get('res.partner.address') - for datas in self.read(cr, uid, ids): + for data in self.read(cr, uid, ids): lots = lot_obj.read(cr, uid, context['active_ids'], ['obj_num','obj_price','ach_uid']) res = partner_obj.read(cr, uid, [l['ach_uid'][0] for l in lots if l['ach_uid']], ['gsm'], context) diff --git a/addons/auction/wizard/auction_transfer_unsold_object.py b/addons/auction/wizard/auction_transfer_unsold_object.py index 73095b3433d..d2b38811daa 100644 --- a/addons/auction/wizard/auction_transfer_unsold_object.py +++ b/addons/auction/wizard/auction_transfer_unsold_object.py @@ -28,16 +28,7 @@ class auction_transfer_unsold_object(osv.osv): ''' _name = 'auction.transfer.unsold.object' _description = 'To transfer unsold objects' - - _columns = { - 'auction_id_from':fields.many2one('auction.dates', 'From Auction Date', required=True), - 'auction_id_to':fields.many2one('auction.dates', 'To Auction Date', required=True), - } - _defaults = { - 'auction_id_from': _start, - } - def _start(self, cr, uid, context): """ To initialize auction_id_from @@ -52,7 +43,16 @@ class auction_transfer_unsold_object(osv.osv): rec = lots_obj.browse(cr, uid, context['active_id'], context) auction_from = rec and rec.auction_id.id or False return auction_from + + _columns = { + 'auction_id_from':fields.many2one('auction.dates', 'From Auction Date', required=True), + 'auction_id_to':fields.many2one('auction.dates', 'To Auction Date', required=True), + } + _defaults = { + 'auction_id_from': _start, + } + def transfer_unsold_object(self, cr, uid, ids, context): """ To Transfer the unsold object diff --git a/addons/audittrail/i18n/lt.po b/addons/audittrail/i18n/lt.po index 6d9e098c56e..876ad4de4a0 100644 --- a/addons/audittrail/i18n/lt.po +++ b/addons/audittrail/i18n/lt.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-11 05:14+0000\n" +"PO-Revision-Date: 2010-08-16 09:47+0000\n" "Last-Translator: OpenERP Administrators \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-08-12 04:03+0000\n" +"X-Launchpad-Export-Date: 2010-08-17 07:00+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: audittrail diff --git a/addons/audittrail/i18n/tr.po b/addons/audittrail/i18n/tr.po index 4ae68c76bb9..e230156d640 100644 --- a/addons/audittrail/i18n/tr.po +++ b/addons/audittrail/i18n/tr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-11 05:39+0000\n" +"PO-Revision-Date: 2010-08-16 09:24+0000\n" "Last-Translator: Fabien (Open ERP) \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-08-12 04:03+0000\n" +"X-Launchpad-Export-Date: 2010-08-17 07:00+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: audittrail diff --git a/addons/audittrail/i18n/zh_CN.po b/addons/audittrail/i18n/zh_CN.po index 9380bfd0605..47adc2ecdcd 100644 --- a/addons/audittrail/i18n/zh_CN.po +++ b/addons/audittrail/i18n/zh_CN.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-11 04:39+0000\n" +"PO-Revision-Date: 2010-08-16 09:02+0000\n" "Last-Translator: Black Jack \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-08-12 04:04+0000\n" +"X-Launchpad-Export-Date: 2010-08-17 07:00+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: audittrail diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py index 7bb7d61d8ee..a0d578dffce 100644 --- a/addons/base_calendar/base_calendar.py +++ b/addons/base_calendar/base_calendar.py @@ -1441,13 +1441,14 @@ true, it will allow you to hide the event alarm information without removing it. data = self.read(cr, uid, event_id, ['date', 'date_deadline', \ 'rrule', 'duration']) if data.get('rrule'): - vals.update({ + data.update({ 'recurrent_uid': real_event_id, 'recurrent_id': data.get('date'), 'rrule_type': 'none', 'rrule': '' }) - new_id = self.copy(cr, uid, real_event_id, default=vals, context=context) + data.update(vals) + new_id = self.copy(cr, uid, real_event_id, default=data, context=context) context.update({'active_id': new_id, 'active_ids': [new_id]}) continue if not real_event_id in new_ids: diff --git a/addons/base_contact/i18n/it.po b/addons/base_contact/i18n/it.po index f2a311d22cd..078c85c0521 100644 --- a/addons/base_contact/i18n/it.po +++ b/addons/base_contact/i18n/it.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-03 01:02+0000\n" -"Last-Translator: mga (Open ERP) \n" +"PO-Revision-Date: 2010-08-16 08:49+0000\n" +"Last-Translator: Nicola Riolini - Micronaet \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-08-12 03:49+0000\n" +"X-Launchpad-Export-Date: 2010-08-17 06:58+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_contact @@ -137,7 +137,7 @@ msgstr "Fuinzioni Contatto" #. module: base_contact #: model:ir.module.module,shortdesc:base_contact.module_meta_information msgid "Base Contact" -msgstr "" +msgstr "Contatto base" #. module: base_contact #: help:res.partner.job,sequence_partner:0 @@ -199,7 +199,7 @@ msgstr "Categorie" #. module: base_contact #: field:res.partner.contact,function_id:0 msgid "Main Function" -msgstr "" +msgstr "Fuzione principale" #. module: base_contact #: model:process.transition,note:base_contact.process_transition_partnertoaddress0 @@ -214,7 +214,7 @@ msgstr "XML non valido per Visualizzazione Architettura!" #. module: base_contact #: model:process.process,name:base_contact.process_process_basecontactprocess0 msgid "Base Contact Process" -msgstr "" +msgstr "Processo Contatto base" #. module: base_contact #: view:res.partner.contact:0 @@ -234,7 +234,7 @@ msgstr "Cellulare" #. module: base_contact #: help:res.partner.job,extension:0 msgid "Internal/External extension phone number" -msgstr "" +msgstr "Estensione Interna/Esterna numero di telefono" #. module: base_contact #: model:process.node,note:base_contact.process_node_contacts0 diff --git a/addons/base_contact/i18n/lt.po b/addons/base_contact/i18n/lt.po index 9ed0cd4efd0..439154d10b2 100644 --- a/addons/base_contact/i18n/lt.po +++ b/addons/base_contact/i18n/lt.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-11 05:34+0000\n" +"PO-Revision-Date: 2010-08-16 09:38+0000\n" "Last-Translator: Giedrius Slavinskas \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-08-12 03:49+0000\n" +"X-Launchpad-Export-Date: 2010-08-17 06:58+0000\n" "X-Generator: Launchpad (build Unknown)\n" "Language: lt\n" diff --git a/addons/base_contact/i18n/tr.po b/addons/base_contact/i18n/tr.po index b9d65344b3a..30192c4a008 100644 --- a/addons/base_contact/i18n/tr.po +++ b/addons/base_contact/i18n/tr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-11 04:37+0000\n" +"PO-Revision-Date: 2010-08-16 09:47+0000\n" "Last-Translator: OpenERP Administrators \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-08-12 03:49+0000\n" +"X-Launchpad-Export-Date: 2010-08-17 06:58+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_contact diff --git a/addons/base_contact/i18n/zh_CN.po b/addons/base_contact/i18n/zh_CN.po index d9fc92b43c5..c6b091b5110 100644 --- a/addons/base_contact/i18n/zh_CN.po +++ b/addons/base_contact/i18n/zh_CN.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-11 05:21+0000\n" +"PO-Revision-Date: 2010-08-16 09:45+0000\n" "Last-Translator: Black Jack \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-08-12 03:49+0000\n" +"X-Launchpad-Export-Date: 2010-08-17 06:58+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_contact diff --git a/addons/base_iban/i18n/tr.po b/addons/base_iban/i18n/tr.po index cbb0a20ac8a..3579267a6a6 100644 --- a/addons/base_iban/i18n/tr.po +++ b/addons/base_iban/i18n/tr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-11 05:20+0000\n" +"PO-Revision-Date: 2010-08-16 09:45+0000\n" "Last-Translator: Fabien (Open ERP) \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-08-12 03:43+0000\n" +"X-Launchpad-Export-Date: 2010-08-17 06:57+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_iban diff --git a/addons/base_module_quality/i18n/tr.po b/addons/base_module_quality/i18n/tr.po index ac14476ca86..a6b4185126f 100644 --- a/addons/base_module_quality/i18n/tr.po +++ b/addons/base_module_quality/i18n/tr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev_rc3\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-11 05:33+0000\n" +"PO-Revision-Date: 2010-08-16 09:39+0000\n" "Last-Translator: Fabien (Open ERP) \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-08-12 04:06+0000\n" +"X-Launchpad-Export-Date: 2010-08-17 07:00+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_module_quality diff --git a/addons/base_module_record/base_module_record.py b/addons/base_module_record/base_module_record.py index 9eb3f2eda7f..e012bb79d9b 100644 --- a/addons/base_module_record/base_module_record.py +++ b/addons/base_module_record/base_module_record.py @@ -541,29 +541,28 @@ class base_module_record(osv.osv): else: continue if self.mode == "workflow": - record= self._generate_object_yaml(cr, uid, rec[1],rec[0]) - yaml_file+="!comment Performing a workflow action %s on module %s"%(record['action'], record['model']) + '''\n''' - object=yaml.load(unicode('''\n !workflow %s \n'''%record,'iso-8859-1')) - attrs=attrs.replace("''", '"') + record = self._generate_object_yaml(cr, uid, rec[1],rec[0]) + yaml_file += "!comment Performing a workflow action %s on module %s"%(record['action'], record['model']) + '''\n''' + object = yaml.load(unicode('''\n !workflow %s \n'''%record,'iso-8859-1')) yaml_file += str(object) + '''\n\n''' elif self.mode == 'osv_memory_action': - osv_action= self._generate_function_yaml(cr, uid, rec[1]) - yaml_file+="!comment Performing an osv_memory action %s on module %s"%(osv_action['action'], osv_action['model']) + '''\n''' - osv_action=yaml.load(unicode('''\n !python %s \n'''%osv_action,'iso-8859-1')) + osv_action = self._generate_function_yaml(cr, uid, rec[1]) + yaml_file += "!comment Performing an osv_memory action %s on module %s"%(osv_action['action'], osv_action['model']) + '''\n''' + osv_action = yaml.load(unicode('''\n !python %s \n'''%osv_action,'iso-8859-1')) yaml_file += str(osv_action) + '''\n''' - attrs=yaml.dump(osv_action.attrs, default_flow_style=False) - attrs=attrs.replace("''", '"') - attrs=attrs.replace("'", '') + attrs = yaml.dump(osv_action.attrs, default_flow_style=False) + attrs = attrs.replace("''", '"') + attrs = attrs.replace("'", '') yaml_file += attrs + '''\n\n''' else: - record= self._generate_object_yaml(cr, uid, rec[1], rec[3]) + record = self._generate_object_yaml(cr, uid, rec[1], rec[3]) if self.mode == "create" or self.mode == "copy": - yaml_file+="!comment Creating a %s record"%(record['model']) + '''\n''' + yaml_file += "!comment Creating a %s record"%(record['model']) + '''\n''' else: - yaml_file+="!comment Modifying a %s record"%(record['model']) + '''\n''' - object= yaml.load(unicode('''\n !record %s \n'''%record,'iso-8859-1')) + yaml_file += "!comment Modifying a %s record"%(record['model']) + '''\n''' + object = yaml.load(unicode('''\n !record %s \n'''%record,'iso-8859-1')) yaml_file += str(object) + '''\n''' - attrs=yaml.dump(object.attrs, default_flow_style=False) + attrs = yaml.dump(object.attrs, default_flow_style=False) yaml_file += attrs + '''\n\n''' yaml_result='''''' diff --git a/addons/base_module_record/i18n/tr.po b/addons/base_module_record/i18n/tr.po index 9f7645fb8d3..075701e5db4 100644 --- a/addons/base_module_record/i18n/tr.po +++ b/addons/base_module_record/i18n/tr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-11 05:39+0000\n" +"PO-Revision-Date: 2010-08-16 09:24+0000\n" "Last-Translator: OpenERP Administrators \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-08-12 03:49+0000\n" +"X-Launchpad-Export-Date: 2010-08-17 06:58+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_module_record diff --git a/addons/base_report_creator/i18n/tr.po b/addons/base_report_creator/i18n/tr.po index 741e6324e24..185851e6a0d 100644 --- a/addons/base_report_creator/i18n/tr.po +++ b/addons/base_report_creator/i18n/tr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-11 05:33+0000\n" +"PO-Revision-Date: 2010-08-16 09:39+0000\n" "Last-Translator: Fabien (Open ERP) \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-08-12 04:02+0000\n" +"X-Launchpad-Export-Date: 2010-08-17 07:00+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_report_creator diff --git a/addons/base_report_designer/i18n/it.po b/addons/base_report_designer/i18n/it.po index 5398de5985a..0361b89abed 100644 --- a/addons/base_report_designer/i18n/it.po +++ b/addons/base_report_designer/i18n/it.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-09-08 15:14+0000\n" -"Last-Translator: Fabien (Open ERP) \n" +"PO-Revision-Date: 2010-08-16 08:37+0000\n" +"Last-Translator: Nicola Riolini - Micronaet \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-08-12 03:59+0000\n" +"X-Launchpad-Export-Date: 2010-08-17 07:00+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_report_designer @@ -54,7 +54,7 @@ msgstr "Il tuo Report è stato modificato" #. module: base_report_designer #: model:ir.module.module,shortdesc:base_report_designer.module_meta_information msgid "Report designer interface module" -msgstr "" +msgstr "Modulo interfaccia di \"Report Designer\"" #. module: base_report_designer #: wizard_field:base_report_designer.modify,get_form,report_id:0 diff --git a/addons/base_report_designer/i18n/tr.po b/addons/base_report_designer/i18n/tr.po index d4a125e0415..9fa19d23c28 100644 --- a/addons/base_report_designer/i18n/tr.po +++ b/addons/base_report_designer/i18n/tr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-11 04:42+0000\n" +"PO-Revision-Date: 2010-08-16 09:28+0000\n" "Last-Translator: OpenERP Administrators \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-08-12 03:59+0000\n" +"X-Launchpad-Export-Date: 2010-08-17 07:00+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_report_designer diff --git a/addons/base_report_designer/wizard/tiny_sxw2rml/tiny_sxw2rml.py b/addons/base_report_designer/wizard/tiny_sxw2rml/tiny_sxw2rml.py index c534c5f2c5d..661ea44708a 100644 --- a/addons/base_report_designer/wizard/tiny_sxw2rml/tiny_sxw2rml.py +++ b/addons/base_report_designer/wizard/tiny_sxw2rml/tiny_sxw2rml.py @@ -44,6 +44,7 @@ import zipfile import xml.dom.minidom from reportlab.lib.units import toLength import base64 +import copy class DomApiGeneral: """General DOM API utilities.""" diff --git a/addons/base_setup/__init__.py b/addons/base_setup/__init__.py index 1fa2e7c6557..80680b6615e 100644 --- a/addons/base_setup/__init__.py +++ b/addons/base_setup/__init__.py @@ -47,7 +47,7 @@ class base_setup_config_choice(osv.osv_memory): user_obj = self.pool.get('res.users') user_ids = user_obj.search(cr, uid, []) users = user_obj.browse(cr, uid, user_ids) - user_str = '\n'.join(map(lambda x: ' - %s:\n\t\tLogin: %s \n\t\tPassword:%s' % (x.name, x.login, x.password), users)) + user_str = '\n'.join(map(lambda x: ' - %s :\n\t\tLogin : %s \n\t\tPassword : %s' % (x.name, x.login, x.password), users)) return _('The following users have been installed : \n')+ user_str _columns = { diff --git a/addons/base_setup/i18n/sv.po b/addons/base_setup/i18n/sv.po index 80506a88265..5571249d384 100644 --- a/addons/base_setup/i18n/sv.po +++ b/addons/base_setup/i18n/sv.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-03-09 16:10+0000\n" +"PO-Revision-Date: 2010-08-13 11:58+0000\n" "Last-Translator: Anders Wallenquist \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-08-12 03:50+0000\n" +"X-Launchpad-Export-Date: 2010-08-15 06:19+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_setup diff --git a/addons/base_setup/i18n/tr.po b/addons/base_setup/i18n/tr.po index dcc0442fb3e..3af9e68b714 100644 --- a/addons/base_setup/i18n/tr.po +++ b/addons/base_setup/i18n/tr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-11 05:31+0000\n" +"PO-Revision-Date: 2010-08-16 09:41+0000\n" "Last-Translator: OpenERP Administrators \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-08-12 03:50+0000\n" +"X-Launchpad-Export-Date: 2010-08-17 06:58+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_setup diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py index 25309ff512a..2886857a45d 100644 --- a/addons/base_setup/installer.py +++ b/addons/base_setup/installer.py @@ -28,6 +28,7 @@ class base_setup_installer(osv.osv_memory): _install_if = { ('sale','crm'): ['sale_crm'], ('sale','project'): ['project_mrp'], + ('sale',):['account_accountant'] } _columns = { # Generic modules diff --git a/addons/base_vat/i18n/it.po b/addons/base_vat/i18n/it.po index edd2a5e36d9..d15a7c98181 100644 --- a/addons/base_vat/i18n/it.po +++ b/addons/base_vat/i18n/it.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-03 03:16+0000\n" -"Last-Translator: eLBati - albatos.com \n" +"PO-Revision-Date: 2010-08-16 08:51+0000\n" +"Last-Translator: Nicola Riolini - Micronaet \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-08-12 03:49+0000\n" +"X-Launchpad-Export-Date: 2010-08-17 06:58+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_vat @@ -31,7 +31,7 @@ msgstr "XML non valido per Visualizzazione Architettura!" #. module: base_vat #: field:res.partner,vat_subjected:0 msgid "VAT Legal Statement" -msgstr "Soggetto a IVA" +msgstr "Soggetto a dichiarazione IVA" #. module: base_vat #: model:ir.module.module,shortdesc:base_vat.module_meta_information diff --git a/addons/base_vat/i18n/tr.po b/addons/base_vat/i18n/tr.po index 62b85c403b8..244898701aa 100644 --- a/addons/base_vat/i18n/tr.po +++ b/addons/base_vat/i18n/tr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-11 05:28+0000\n" +"PO-Revision-Date: 2010-08-16 09:43+0000\n" "Last-Translator: Fabien (Open ERP) \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-08-12 03:49+0000\n" +"X-Launchpad-Export-Date: 2010-08-17 06:58+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_vat diff --git a/addons/board/board_view.xml b/addons/board/board_view.xml index 62204969468..79e3ff5dd9d 100644 --- a/addons/board/board_view.xml +++ b/addons/board/board_view.xml @@ -1,10 +1,9 @@ - - board.note.search diff --git a/addons/board/i18n/it.po b/addons/board/i18n/it.po index a2845126519..a949be62f1e 100644 --- a/addons/board/i18n/it.po +++ b/addons/board/i18n/it.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-03 03:21+0000\n" -"Last-Translator: mga (Open ERP) \n" +"PO-Revision-Date: 2010-08-16 08:55+0000\n" +"Last-Translator: Nicola Riolini - Micronaet \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-08-12 04:02+0000\n" +"X-Launchpad-Export-Date: 2010-08-17 07:00+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: board @@ -32,7 +32,7 @@ msgstr "board.board" #. module: board #: field:board.note,user_id:0 msgid "Author" -msgstr "Autore" +msgstr "Mittente" #. module: board #: model:ir.module.module,shortdesc:board.module_meta_information @@ -43,7 +43,7 @@ msgstr "Modulo principale cruscotti" #: view:board.note:0 #: field:board.note,note:0 msgid "Note" -msgstr "Nota" +msgstr "Appunto" #. module: board #: field:board.board.line,width:0 @@ -53,7 +53,7 @@ msgstr "Larghezza" #. module: board #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "Nome del modulo non valido nella definizione dell'azione." +msgstr "" #. module: board #: field:board.board.line,name:0 diff --git a/addons/board/i18n/tr.po b/addons/board/i18n/tr.po index 7922b161219..78c9c57fd0a 100644 --- a/addons/board/i18n/tr.po +++ b/addons/board/i18n/tr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-11 05:31+0000\n" +"PO-Revision-Date: 2010-08-16 09:41+0000\n" "Last-Translator: OpenERP Administrators \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-08-12 04:02+0000\n" +"X-Launchpad-Export-Date: 2010-08-17 07:00+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: board diff --git a/addons/caldav/calendar.py b/addons/caldav/calendar.py index b4f7c03e5aa..07d12898684 100644 --- a/addons/caldav/calendar.py +++ b/addons/caldav/calendar.py @@ -75,9 +75,9 @@ def uid2openobjectid(cr, uidval, oomodel, rdate): return (False, None) def openobjectid2uid(cr, uidval, oomodel): - """ Open Object Id To UId + """ Gives the value of UID for VEVENT @param cr: the current row, from the database cursor, - @param uidval: Get USerId vale + @param uidval: Id value of the Event @oomodel: Open Object ModelName """ value = 'OpenObject-%s_%s@%s' % (oomodel, uidval, cr.dbname) @@ -322,11 +322,9 @@ class CalDAV(object): continue if cal_data.name.lower() in self.__attribute__: if cal_data.params.get('X-VOBJ-ORIGINAL-TZID'): - # since we do convert, do we also need to save the original tzid? - # self.ical_set('vtimezone', cal_data.params.get('X-VOBJ-ORIGINAL-TZID'), 'value') - - date_local = cal_data.value.astimezone(_server_tzinfo) - self.ical_set(cal_data.name.lower(), date_local, 'value') + self.ical_set('vtimezone', cal_data.params.get('X-VOBJ-ORIGINAL-TZID'), 'value') + date_utc = cal_data.value.astimezone(pytz.utc) + self.ical_set(cal_data.name.lower(), date_utc, 'value') continue self.ical_set(cal_data.name.lower(), cal_data.value, 'value') vals = map_data(cr, uid, self, context=context) @@ -456,9 +454,16 @@ class CalDAV(object): recur_pool = {} try: for val in vals: - exists, r_id = uid2openobjectid(cr, val['id'], context.get('model'), \ + # Compute value of duration + if 'date_deadline' in val and 'duration' not in val: + start = datetime.strptime(val['date'], '%Y-%m-%d %H:%M:%S') + end = datetime.strptime(val['date_deadline'], '%Y-%m-%d %H:%M:%S') + diff = end - start + val['duration'] = (diff.seconds/float(86400) + diff.days) * 24 + exists, r_id = calendar.uid2openobjectid(cr, val['id'], context.get('model'), \ val.get('recurrent_id')) - if val.has_key('create_date'): val.pop('create_date') + if val.has_key('create_date'): + val.pop('create_date') u_id = val.get('id', None) val.pop('id') if exists and r_id: @@ -474,6 +479,11 @@ class CalDAV(object): revent_id = model_obj.create(cr, uid, val) ids.append(revent_id) else: + __rege = re.compile(r'OpenObject-([\w|\.]+)_([0-9]+)@(\w+)$') + wematch = __rege.match(u_id.encode('utf8')) + if wematch: + model, recur_id, dbname = wematch.groups() + val.update({'recurrent_uid': recur_id}) event_id = model_obj.create(cr, uid, val) recur_pool[u_id] = event_id ids.append(event_id) diff --git a/addons/crm/board_crm_view.xml b/addons/crm/board_crm_view.xml index 9a5217a623a..f0cd7cfdefb 100644 --- a/addons/crm/board_crm_view.xml +++ b/addons/crm/board_crm_view.xml @@ -158,5 +158,6 @@ action="open_board_crm" sequence="1" id="menu_board_crm" icon="terp-graph"/> + diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml index 12a2f069cdc..423eba836b6 100644 --- a/addons/crm/crm_view.xml +++ b/addons/crm/crm_view.xml @@ -7,7 +7,10 @@ + parent="base.menu_base_config" sequence="1" groups="base.group_extended,base.group_system"/> + + @@ -91,7 +94,7 @@ + parent="base.menu_sale_config_sales" /> diff --git a/addons/crm/i18n/fi.po b/addons/crm/i18n/fi.po index 141c85bf59c..1d09c7b9eeb 100644 --- a/addons/crm/i18n/fi.po +++ b/addons/crm/i18n/fi.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2010-01-05 05:59+0000\n" -"PO-Revision-Date: 2010-08-12 05:43+0000\n" +"PO-Revision-Date: 2010-08-16 09:28+0000\n" "Last-Translator: OpenERP Administrators \n" "Language-Team: Finnish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-13 05:56+0000\n" +"X-Launchpad-Export-Date: 2010-08-17 06:57+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: crm diff --git a/addons/crm/i18n/hr.po b/addons/crm/i18n/hr.po index 2fa1cb9ac2e..91c9b1c72d9 100644 --- a/addons/crm/i18n/hr.po +++ b/addons/crm/i18n/hr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2010-01-05 05:59+0000\n" -"PO-Revision-Date: 2010-08-11 05:43+0000\n" +"PO-Revision-Date: 2010-08-16 09:31+0000\n" "Last-Translator: OpenERP Administrators \n" "Language-Team: Vinteh\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-12 03:48+0000\n" +"X-Launchpad-Export-Date: 2010-08-17 06:58+0000\n" "X-Generator: Launchpad (build Unknown)\n" "Language: hr\n" diff --git a/addons/crm/i18n/lt.po b/addons/crm/i18n/lt.po index a81ab97b349..326c4e32d28 100644 --- a/addons/crm/i18n/lt.po +++ b/addons/crm/i18n/lt.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2010-01-05 05:59+0000\n" -"PO-Revision-Date: 2010-08-11 04:39+0000\n" +"PO-Revision-Date: 2010-08-16 09:27+0000\n" "Last-Translator: Giedrius Slavinskas \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-08-12 03:48+0000\n" +"X-Launchpad-Export-Date: 2010-08-17 06:57+0000\n" "X-Generator: Launchpad (build Unknown)\n" "Language: lt\n" diff --git a/addons/crm/i18n/pl.po b/addons/crm/i18n/pl.po index c61c8754744..2f03ed5c418 100644 --- a/addons/crm/i18n/pl.po +++ b/addons/crm/i18n/pl.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2010-01-05 05:59+0000\n" -"PO-Revision-Date: 2010-08-12 05:43+0000\n" +"PO-Revision-Date: 2010-08-16 09:37+0000\n" "Last-Translator: OpenERP Administrators \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-08-13 05:56+0000\n" +"X-Launchpad-Export-Date: 2010-08-17 06:57+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: crm diff --git a/addons/crm/i18n/pt.po b/addons/crm/i18n/pt.po index 337e6f1d37a..9765e05f1d9 100644 --- a/addons/crm/i18n/pt.po +++ b/addons/crm/i18n/pt.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2010-01-05 05:59+0000\n" -"PO-Revision-Date: 2010-08-11 05:41+0000\n" +"PO-Revision-Date: 2010-08-16 09:26+0000\n" "Last-Translator: OpenERP Administrators \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-08-12 03:48+0000\n" +"X-Launchpad-Export-Date: 2010-08-17 06:58+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: crm diff --git a/addons/crm/i18n/sk.po b/addons/crm/i18n/sk.po index 520f36de46e..adbed246671 100644 --- a/addons/crm/i18n/sk.po +++ b/addons/crm/i18n/sk.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2010-01-05 05:59+0000\n" -"PO-Revision-Date: 2010-08-11 05:44+0000\n" +"PO-Revision-Date: 2010-08-16 09:29+0000\n" "Last-Translator: Radoslav Sloboda \n" "Language-Team: Slovak \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-12 03:48+0000\n" +"X-Launchpad-Export-Date: 2010-08-17 06:58+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: crm diff --git a/addons/crm/i18n/tr.po b/addons/crm/i18n/tr.po index b4112f3a5ee..43e2188a6f0 100644 --- a/addons/crm/i18n/tr.po +++ b/addons/crm/i18n/tr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2010-01-05 05:59+0000\n" -"PO-Revision-Date: 2010-08-11 04:43+0000\n" +"PO-Revision-Date: 2010-08-16 09:26+0000\n" "Last-Translator: OpenERP Administrators \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-08-12 03:48+0000\n" +"X-Launchpad-Export-Date: 2010-08-17 06:58+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: crm diff --git a/addons/crm/wizard/crm_partner_to_opportunity.py b/addons/crm/wizard/crm_partner_to_opportunity.py index 9e2847fb200..a1d15dcc732 100644 --- a/addons/crm/wizard/crm_partner_to_opportunity.py +++ b/addons/crm/wizard/crm_partner_to_opportunity.py @@ -59,8 +59,7 @@ class crm_partner2opportunity(osv.osv_memory): return res def _select_data(self, cr, uid, data, context): - pool = pooler.get_pool(cr.dbname) - part_obj = pool.get('res.partner') + part_obj = self.pool.get('res.partner') part = part_obj.read(cr, uid, data['id' ], ['name']) return {'partner_id' : data['id'], 'name' : part['name'] } @@ -120,4 +119,4 @@ class crm_partner2opportunity(osv.osv_memory): crm_partner2opportunity() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/crm_caldav/crm_caldav.py b/addons/crm_caldav/crm_caldav.py index a9430a47225..0d46a5429eb 100644 --- a/addons/crm_caldav/crm_caldav.py +++ b/addons/crm_caldav/crm_caldav.py @@ -23,6 +23,7 @@ from osv import fields, osv from crm import crm from caldav import calendar from datetime import datetime +import re class crm_meeting(osv.osv): _inherit = 'crm.meeting' @@ -74,9 +75,16 @@ class crm_meeting(osv.osv): recur_pool = {} try: for val in vals: + # Compute value of duration + if 'date_deadline' in val and 'duration' not in val: + start = datetime.strptime(val['date'], '%Y-%m-%d %H:%M:%S') + end = datetime.strptime(val['date_deadline'], '%Y-%m-%d %H:%M:%S') + diff = end - start + val['duration'] = (diff.seconds/float(86400) + diff.days) * 24 exists, r_id = calendar.uid2openobjectid(cr, val['id'], context.get('model'), \ val.get('recurrent_id')) - if val.has_key('create_date'): val.pop('create_date') + if val.has_key('create_date'): + val.pop('create_date') u_id = val.get('id', None) val.pop('id') if exists and r_id: @@ -84,12 +92,6 @@ class crm_meeting(osv.osv): model_obj.write(cr, uid, [r_id], val) ids.append(r_id) elif exists: - # Compute value of duration - if 'date_deadline' in val and 'duration' not in val: - start = datetime.strptime(val['date'], '%Y-%m-%d %H:%M:%S') - end = datetime.strptime(val['date_deadline'], '%Y-%m-%d %H:%M:%S') - diff = end - start - val['duration'] = (diff.seconds/float(86400) + diff.days) * 24 model_obj.write(cr, uid, [exists], val) ids.append(exists) else: @@ -98,6 +100,11 @@ class crm_meeting(osv.osv): revent_id = model_obj.create(cr, uid, val) ids.append(revent_id) else: + __rege = re.compile(r'OpenObject-([\w|\.]+)_([0-9]+)@(\w+)$') + wematch = __rege.match(u_id.encode('utf8')) + if wematch: + model, recur_id, dbname = wematch.groups() + val.update({'recurrent_uid': recur_id}) event_id = model_obj.create(cr, uid, val) recur_pool[u_id] = event_id ids.append(event_id) diff --git a/addons/crm_profiling/i18n/it.po b/addons/crm_profiling/i18n/it.po index 26f98c1004a..0240c299cca 100644 --- a/addons/crm_profiling/i18n/it.po +++ b/addons/crm_profiling/i18n/it.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-12-22 13:46+0000\n" -"Last-Translator: Carlo - didotech.com \n" +"PO-Revision-Date: 2010-08-16 08:38+0000\n" +"Last-Translator: Nicola Riolini - Micronaet \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-08-12 04:03+0000\n" +"X-Launchpad-Export-Date: 2010-08-17 07:00+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: crm_profiling @@ -39,7 +39,7 @@ msgstr "Questionario Aperto" #. module: crm_profiling #: field:crm.segmentation,child_ids:0 msgid "Child Profiles" -msgstr "" +msgstr "Profili figli" #. module: crm_profiling #: model:ir.module.module,shortdesc:crm_profiling.module_meta_information diff --git a/addons/crm_profiling/i18n/tr.po b/addons/crm_profiling/i18n/tr.po index d98eb0e0bbf..9e1a449e7e8 100644 --- a/addons/crm_profiling/i18n/tr.po +++ b/addons/crm_profiling/i18n/tr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-11 04:37+0000\n" +"PO-Revision-Date: 2010-08-16 09:46+0000\n" "Last-Translator: Fabien (Open ERP) \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-08-12 04:03+0000\n" +"X-Launchpad-Export-Date: 2010-08-17 07:00+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: crm_profiling diff --git a/addons/delivery/i18n/ru.po b/addons/delivery/i18n/ru.po index 4fed9b3e483..956fdd65a77 100644 --- a/addons/delivery/i18n/ru.po +++ b/addons/delivery/i18n/ru.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-11 05:39+0000\n" +"PO-Revision-Date: 2010-08-16 09:24+0000\n" "Last-Translator: OpenERP Administrators \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-08-12 03:44+0000\n" +"X-Launchpad-Export-Date: 2010-08-17 06:57+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: delivery diff --git a/addons/delivery/i18n/tr.po b/addons/delivery/i18n/tr.po index 564638dcf04..e795c840058 100644 --- a/addons/delivery/i18n/tr.po +++ b/addons/delivery/i18n/tr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-11 05:32+0000\n" +"PO-Revision-Date: 2010-08-16 09:39+0000\n" "Last-Translator: Fabien (Open ERP) \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-08-12 03:44+0000\n" +"X-Launchpad-Export-Date: 2010-08-17 06:57+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: delivery diff --git a/addons/document/board_document_view.xml b/addons/document/board_document_view.xml index 930d20a1b52..2bfc5a6f200 100644 --- a/addons/document/board_document_view.xml +++ b/addons/document/board_document_view.xml @@ -66,6 +66,9 @@ id="menu_reports_document_manager" icon="terp-graph"/> + + board.document.manager.form1 board.board diff --git a/addons/document/i18n/hi.po b/addons/document/i18n/hi.po index e2ad9ab2c38..50d8dff0ea6 100644 --- a/addons/document/i18n/hi.po +++ b/addons/document/i18n/hi.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-06-29 10:10+0000\n" +"PO-Revision-Date: 2010-08-13 09:58+0000\n" "Last-Translator: vir (Open ERP) \n" "Language-Team: Hindi \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-12 04:06+0000\n" +"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: document diff --git a/addons/document/i18n/mn.po b/addons/document/i18n/mn.po index 1664fab0eb9..225b007ca9f 100644 --- a/addons/document/i18n/mn.po +++ b/addons/document/i18n/mn.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-11 05:38+0000\n" +"PO-Revision-Date: 2010-08-16 09:28+0000\n" "Last-Translator: ub121 \n" "Language-Team: Mongolian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-12 04:06+0000\n" +"X-Launchpad-Export-Date: 2010-08-17 07:00+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: document diff --git a/addons/document/i18n/ru.po b/addons/document/i18n/ru.po index 0765f559c65..21f756ae60b 100644 --- a/addons/document/i18n/ru.po +++ b/addons/document/i18n/ru.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-11 04:37+0000\n" +"PO-Revision-Date: 2010-08-16 09:47+0000\n" "Last-Translator: devcode \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-08-12 04:06+0000\n" +"X-Launchpad-Export-Date: 2010-08-17 07:00+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: document diff --git a/addons/document/i18n/tr.po b/addons/document/i18n/tr.po index 2b88f502479..8e6c9825525 100644 --- a/addons/document/i18n/tr.po +++ b/addons/document/i18n/tr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-11 05:18+0000\n" +"PO-Revision-Date: 2010-08-16 09:46+0000\n" "Last-Translator: Fabien (Open ERP) \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-08-12 04:06+0000\n" +"X-Launchpad-Export-Date: 2010-08-17 07:00+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: document diff --git a/addons/document/i18n/zh_CN.po b/addons/document/i18n/zh_CN.po index 736716e836b..15e4a399cff 100644 --- a/addons/document/i18n/zh_CN.po +++ b/addons/document/i18n/zh_CN.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-11 04:36+0000\n" +"PO-Revision-Date: 2010-08-16 09:43+0000\n" "Last-Translator: Black Jack \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-08-12 04:06+0000\n" +"X-Launchpad-Export-Date: 2010-08-17 07:00+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: document diff --git a/addons/document_ics/i18n/tr.po b/addons/document_ics/i18n/tr.po index 43906829579..2f8a9146446 100644 --- a/addons/document_ics/i18n/tr.po +++ b/addons/document_ics/i18n/tr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-11 05:46+0000\n" +"PO-Revision-Date: 2010-08-16 09:27+0000\n" "Last-Translator: Fabien (Open ERP) \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-08-12 04:05+0000\n" +"X-Launchpad-Export-Date: 2010-08-17 07:00+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: document_ics diff --git a/addons/document_ics/i18n/zh_CN.po b/addons/document_ics/i18n/zh_CN.po index bac475d5fb3..1cd6941a22d 100644 --- a/addons/document_ics/i18n/zh_CN.po +++ b/addons/document_ics/i18n/zh_CN.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-11 04:39+0000\n" +"PO-Revision-Date: 2010-08-16 09:06+0000\n" "Last-Translator: Black Jack \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-08-12 04:05+0000\n" +"X-Launchpad-Export-Date: 2010-08-17 07:00+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: document_ics diff --git a/addons/event/board_association_view.xml b/addons/event/board_association_view.xml index 57b57ec30fb..2c483a0f9ae 100644 --- a/addons/event/board_association_view.xml +++ b/addons/event/board_association_view.xml @@ -91,6 +91,7 @@ sequence="1" id="menu_board_associations_manager" icon="terp-graph"/> + diff --git a/addons/event/event.py b/addons/event/event.py index bfc21544061..7a6e904f6e3 100644 --- a/addons/event/event.py +++ b/addons/event/event.py @@ -129,7 +129,7 @@ class event_event(osv.osv): 'target': 'new', 'context': context, 'nodestroy': True - } + } return res @@ -336,7 +336,7 @@ class event_registration(osv.osv): _defaults = { 'nb_register': 1, 'tobe_invoiced': True, - 'state': lambda *a: 'draft', + 'state': lambda *a: 'draft', 'active': lambda *a: 1, 'user_id': lambda self, cr, uid, ctx: uid, } @@ -526,7 +526,7 @@ class event_registration(osv.osv): registrations = self.browse(cr, uid, ids) self.history(cr, uid, registrations, _('Cancel')) self.write(cr, uid, ids, {'state': 'cancel'}) - return True + return True def mail_user(self, cr, uid, ids, confirm=False, context=None): """ @@ -543,7 +543,7 @@ class event_registration(osv.osv): email_to = regestration.email_from if regestration.email_cc: email_cc += [regestration.email_cc] - if not (email_to and email_cc): + if not (email_to or email_cc): continue subject = "" body = "" @@ -617,10 +617,10 @@ class event_registration(osv.osv): event_obj = self.pool.get('event.event') prod_obj = self.pool.get('product.product') - res_obj = self.pool.get('res.partner') + res_obj = self.pool.get('res.partner') data_event = event_obj.browse(cr, uid, event_id) - res = {'value': {'unit_price': False, 'event_product': False, 'user_id': False, + res = {'value': {'unit_price': False, 'event_product': False, 'user_id': False, 'date': data_event.date_begin, 'date_deadline': data_event.date_end, 'description': data_event.note, 'name': data_event.name, 'section_id': data_event.section_id and data_event.section_id.id or False, }} diff --git a/addons/hr/board_hr_view.xml b/addons/hr/board_hr_view.xml index fd4ddca0955..6408b11c799 100644 --- a/addons/hr/board_hr_view.xml +++ b/addons/hr/board_hr_view.xml @@ -33,12 +33,13 @@ - + + diff --git a/addons/hr/hr.py b/addons/hr/hr.py index 0ec2ddb3eae..95355d7c303 100644 --- a/addons/hr/hr.py +++ b/addons/hr/hr.py @@ -35,8 +35,6 @@ class hr_employee_category(osv.osv): } def _check_recursion(self, cr, uid, ids, context=None): - if context is None: - context = {} level = 100 while len(ids): cr.execute('select distinct parent_id from hr_employee_category where id IN %s', (tuple(ids), )) @@ -65,8 +63,6 @@ hr_employee_marital_status() class hr_job(osv.osv): def _no_of_employee(self, cr, uid, ids, name, args, context=None): - if context is None: - context = {} res = {} for emp in self.browse(cr, uid, ids): res[emp.id] = len(emp.employee_ids or []) @@ -136,8 +132,6 @@ class hr_employee(osv.osv): } def _get_photo(self, cr, uid, context=None): - if context is None: - context = {} return open(os.path.join( tools.config['addons_path'], 'hr/image', 'photo.png'), 'rb') .read().encode('base64') @@ -157,8 +151,15 @@ class hr_employee(osv.osv): level -= 1 return True + def _check_department_id(self, cr, uid, ids, context=None): + for emp in self.browse(cr, uid, ids, context=context): + if emp.department_id.manager_id and emp.id == emp.department_id.manager_id.id: + return False + return True + _constraints = [ - (_check_recursion, 'Error ! You cannot create recursive Hierarchy of Employees.', ['parent_id']) + (_check_recursion, 'Error ! You cannot create recursive Hierarchy of Employees.', ['parent_id']), + (_check_department_id, 'Error ! You cannot select a department for which the employee is the manager.', ['department_id']), ] hr_employee() @@ -168,9 +169,7 @@ class hr_department(osv.osv): _inherit = 'hr.department' _columns = { 'manager_id': fields.many2one('hr.employee', 'Manager'), -# 'member_ids': fields.many2many('hr.employee', 'hr_department_user_rel', 'department_id', 'user_id', 'Members'), 'member_ids': fields.one2many('hr.employee', 'department_id', 'Members'), -# finding problem to implement one2many field as "hr_departmen_user_rel" is used in another module query } hr_department() diff --git a/addons/hr/hr_department_demo.xml b/addons/hr/hr_department_demo.xml index 082aa010e76..433e77a6dd4 100644 --- a/addons/hr/hr_department_demo.xml +++ b/addons/hr/hr_department_demo.xml @@ -19,41 +19,37 @@ Technical department - + IT - Marketing - + Sales - Sales Europe - Sales America - @@ -110,7 +106,7 @@ - + diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml index 0b95ca073ef..9fa8c5640f0 100644 --- a/addons/hr/hr_view.xml +++ b/addons/hr/hr_view.xml @@ -2,7 +2,7 @@ - + @@ -390,7 +390,7 @@ tree,form - + diff --git a/addons/hr/i18n/it.po b/addons/hr/i18n/it.po index d3bd4e36c53..9156559da62 100644 --- a/addons/hr/i18n/it.po +++ b/addons/hr/i18n/it.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-03 04:56+0000\n" -"Last-Translator: Luca Mattiello \n" +"PO-Revision-Date: 2010-08-16 10:38+0000\n" +"Last-Translator: Nicola Riolini - Micronaet \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-08-12 04:03+0000\n" +"X-Launchpad-Export-Date: 2010-08-17 07:00+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: hr @@ -357,7 +357,7 @@ msgstr "Data Inizio" #. module: hr #: field:res.users,parent_id:0 msgid "Parent Users" -msgstr "" +msgstr "Utenti Padri" #. module: hr #: field:hr.employee,address_id:0 diff --git a/addons/hr/i18n/lt.po b/addons/hr/i18n/lt.po index 16b35654032..1c525ac9601 100644 --- a/addons/hr/i18n/lt.po +++ b/addons/hr/i18n/lt.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-11 05:44+0000\n" +"PO-Revision-Date: 2010-08-16 09:30+0000\n" "Last-Translator: Giedrius Slavinskas \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-08-12 04:03+0000\n" +"X-Launchpad-Export-Date: 2010-08-17 07:00+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: hr diff --git a/addons/hr/i18n/pt_BR.po b/addons/hr/i18n/pt_BR.po index 1b5006f6f70..7da6110a78b 100644 --- a/addons/hr/i18n/pt_BR.po +++ b/addons/hr/i18n/pt_BR.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-11 19:47+0000\n" -"Last-Translator: Roberto Higashi \n" +"PO-Revision-Date: 2010-08-16 09:18+0000\n" +"Last-Translator: OpenERP Administrators \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-08-12 04:03+0000\n" +"X-Launchpad-Export-Date: 2010-08-17 07:00+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: hr diff --git a/addons/hr/i18n/tr.po b/addons/hr/i18n/tr.po index 7a82cd7d70b..be0d5351fcc 100644 --- a/addons/hr/i18n/tr.po +++ b/addons/hr/i18n/tr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-12 05:30+0000\n" +"PO-Revision-Date: 2010-08-16 09:29+0000\n" "Last-Translator: adsiz_1029@hotmail.com \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-08-13 05:56+0000\n" +"X-Launchpad-Export-Date: 2010-08-17 07:00+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: hr diff --git a/addons/hr/i18n/zh_CN.po b/addons/hr/i18n/zh_CN.po index 11e46933149..605303f01d8 100644 --- a/addons/hr/i18n/zh_CN.po +++ b/addons/hr/i18n/zh_CN.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-11 05:41+0000\n" +"PO-Revision-Date: 2010-08-16 09:25+0000\n" "Last-Translator: Black Jack \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-08-12 04:03+0000\n" +"X-Launchpad-Export-Date: 2010-08-17 07:00+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: hr diff --git a/addons/hr/security/hr_security.xml b/addons/hr/security/hr_security.xml index 366744f22ff..4f7691f03e9 100644 --- a/addons/hr/security/hr_security.xml +++ b/addons/hr/security/hr_security.xml @@ -10,9 +10,5 @@ Human Resources / User - - Human Resources / Attendances User - - diff --git a/addons/hr/security/ir.model.access.csv b/addons/hr/security/ir.model.access.csv index e6e5c5c3c47..1a9331779df 100644 --- a/addons/hr/security/ir.model.access.csv +++ b/addons/hr/security/ir.model.access.csv @@ -1,17 +1,18 @@ "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" -"access_hr_employee_category","hr.employee.category","model_hr_employee_category","base.group_hr_user",1,0,0,0 -"access_hr_employee","hr.employee","model_hr_employee","base.group_hr_user",1,1,1,1 -"access_hr_employee_resource","resource.resource","resource.model_resource_resource","base.group_hr_user",1,1,1,1 -"access_hr_department","hr.department","model_hr_department","base.group_hr_user",1,0,0,0 +"access_hr_employee_category_user","hr.employee.category.user","model_hr_employee_category","base.group_hr_user",1,0,0,0 +"access_hr_employee_user","hr.employee user","model_hr_employee","base.group_hr_user",1,1,1,1 +"access_hr_employee_resource_user","resource.resource.user","resource.model_resource_resource","base.group_hr_user",1,1,1,1 +"access_hr_department_user","hr.department.user","model_hr_department","base.group_hr_user",1,1,1,1 "access_hr_employee_category_manager","hr.employee.category.manager","model_hr_employee_category","base.group_hr_manager",1,0,0,0 "access_hr_department_manager","hr.department.manager","model_hr_department","base.group_hr_manager",1,1,1,1 "access_hr_employee_marital_status","hr.employee.marital.status","model_hr_employee_marital_status","base.group_system",1,1,1,1 -"access_hr_job","hr.job","model_hr_job","base.group_hr_user",1,0,0,0 -"access_hr_employee_category_manager","hr.employee.category.manager","model_hr_employee_category","base.group_hr_manager",1,0,0,0 +"access_hr_job_user","hr.job user","model_hr_job","base.group_hr_user",1,0,0,0 +"access_hr_employee_category_system","hr.employee.category.system","model_hr_employee_category","base.group_system",1,0,0,0 "access_hr_employee_manager","hr.employee.manager","model_hr_employee","base.group_hr_manager",1,1,1,1 -"access_hr_employee_resource","resource.resource","resource.model_resource_resource","base.group_hr_manager",1,1,1,1 -"access_hr_department","hr.department","model_hr_department","base.group_hr_manager",1,1,1,1 +"access_hr_employee_resource_manager","resource.resource.manager","resource.model_resource_resource","base.group_hr_manager",1,1,1,1 +"access_hr_department_system","hr.department.system","model_hr_department","base.group_system",1,0,0,0 "access_hr_res_partner_address","res.partner.address","base.model_res_partner_address","base.group_hr_manager",1,1,1,1 -"access_hr_job","hr.job","model_hr_job","base.group_hr_manager",1,1,1,1 -"access_hr_employee","hr.employee","model_hr_employee_category","base.group_system",1,1,1,1 - +"access_hr_job_manager","hr.job.manager","model_hr_job","base.group_hr_manager",1,1,1,1 +"access_hr_employee_system","hr.employee.system","model_hr_employee","base.group_system",1,1,1,1 +"access_hr_job_system","hr.job system","model_hr_job","base.group_system",1,0,0,0 +"access_hr_employee_category_system","hr.employee.category.system","model_hr_employee_category","base.group_system",1,0,0,0 diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml index 659d27cec9a..fb6911a6656 100644 --- a/addons/hr_attendance/hr_attendance_view.xml +++ b/addons/hr_attendance/hr_attendance_view.xml @@ -75,7 +75,7 @@ - + hr.action.reason.form diff --git a/addons/hr_attendance/i18n/fi.po b/addons/hr_attendance/i18n/fi.po index b11b72f01f1..59df02033be 100644 --- a/addons/hr_attendance/i18n/fi.po +++ b/addons/hr_attendance/i18n/fi.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-11 04:44+0000\n" +"PO-Revision-Date: 2010-08-16 09:19+0000\n" "Last-Translator: OpenERP Administrators \n" "Language-Team: Finnish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-12 04:04+0000\n" +"X-Launchpad-Export-Date: 2010-08-17 07:00+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: hr_attendance diff --git a/addons/hr_attendance/i18n/pt_BR.po b/addons/hr_attendance/i18n/pt_BR.po index 3e7f5932c3d..7e7d088d930 100644 --- a/addons/hr_attendance/i18n/pt_BR.po +++ b/addons/hr_attendance/i18n/pt_BR.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-11 05:43+0000\n" +"PO-Revision-Date: 2010-08-16 09:30+0000\n" "Last-Translator: Fabien (Open ERP) \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-08-12 04:04+0000\n" +"X-Launchpad-Export-Date: 2010-08-17 07:00+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: hr_attendance diff --git a/addons/hr_attendance/i18n/tr.po b/addons/hr_attendance/i18n/tr.po index d7a5b5b220d..35d9e18f454 100644 --- a/addons/hr_attendance/i18n/tr.po +++ b/addons/hr_attendance/i18n/tr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-11 05:07+0000\n" +"PO-Revision-Date: 2010-08-16 09:47+0000\n" "Last-Translator: Angel Spy \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-08-12 04:04+0000\n" +"X-Launchpad-Export-Date: 2010-08-17 07:00+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: hr_attendance diff --git a/addons/hr_attendance/security/ir.model.access.csv b/addons/hr_attendance/security/ir.model.access.csv index a22d252448d..67c840a24f2 100644 --- a/addons/hr_attendance/security/ir.model.access.csv +++ b/addons/hr_attendance/security/ir.model.access.csv @@ -1,11 +1,12 @@ "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" -"access_hr_action_reason_employee","hr action reason employee","model_hr_action_reason","base.group_hr_attendance",1,0,0,0 -"access_hr_action_reason_employee","hr action reason employee","model_hr_action_reason","base.group_hr_manager",1,1,1,1 -"access_hr_action_reason_employee_user","hr action reason employee user","model_hr_attendance","base.group_hr_user",1,1,1,1 -"access_hr_action_reason_employee_manager","hr action reason employee manager","model_hr_attendance","base.group_hr_manager",1,1,1,1 -"access_hr_attendance_employee","hr attendance employee","model_hr_attendance","base.group_hr_attendance",1,1,1,1 -"access_hr_employee_attendance","hr employee attendance sign in out","hr.model_hr_employee","base.group_hr_attendance",1,1,1,1 -"access_hr_attendance_resource","hr resource attendance sign in out","resource.model_resource_resource","base.group_hr_attendance",1,1,1,1 -"access_hr_job_attendance","hr_job_attendance","hr.model_hr_job","base.group_hr_attendance",1,0,0,0 +"access_hr_action_reason_attendance","hr.action.reason.attendance","model_hr_action_reason","base.group_hr_attendance",1,0,0,0 +"access_hr_action_reason_manager","hr.action.reason.manager","model_hr_action_reason","base.group_hr_manager",1,1,1,1 +"access_hr_action_reason_employee_user","hr.action.reason.employee.user","model_hr_attendance","base.group_hr_user",1,1,1,1 +"access_hr_attendance_manager","hr.attendance.manager","model_hr_attendance","base.group_hr_manager",1,1,1,1 +"access_hr_attendance_attendance","hr.attendance.attendance","model_hr_attendance","base.group_hr_attendance",1,1,1,1 +"access_hr_employee_attendance","hr.employee.attendance","hr.model_hr_employee","base.group_hr_attendance",1,0,0,0 +"access_resource_resource_attendance","resource.resource.attendance","resource.model_resource_resource","base.group_hr_attendance",1,1,1,1 +"access_hr_job_attendance","hr.job.attendance","hr.model_hr_job","base.group_hr_attendance",1,0,0,0 "access_hr_department_attendance","hr.department attendance","hr.model_hr_department","base.group_hr_attendance",1,0,0,0 -"access_hr_action_reason","hr.action.reason","model_hr_action_reason","base.group_system",1,1,1,1 +"access_hr_action_reason_system","hr.action.reason.system","model_hr_action_reason","base.group_system",1,1,1,1 +"access_hr_attendance_system","hr.attendance.system","model_hr_attendance","base.group_system",1,0,0,0 diff --git a/addons/hr_contract/i18n/tr.po b/addons/hr_contract/i18n/tr.po index 2bd3f4032b1..8b7abf610f4 100644 --- a/addons/hr_contract/i18n/tr.po +++ b/addons/hr_contract/i18n/tr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-11 05:46+0000\n" +"PO-Revision-Date: 2010-08-16 09:29+0000\n" "Last-Translator: Fabien (Open ERP) \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-08-12 04:01+0000\n" +"X-Launchpad-Export-Date: 2010-08-17 07:00+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: hr_contract diff --git a/addons/hr_contract/security/ir.model.access.csv b/addons/hr_contract/security/ir.model.access.csv index 0df71fbd082..7db79a1de7f 100644 --- a/addons/hr_contract/security/ir.model.access.csv +++ b/addons/hr_contract/security/ir.model.access.csv @@ -1,17 +1,18 @@ "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" -"access_hr_contract_wage_type_period","hr.contract.wage.type.period","model_hr_contract_wage_type_period","base.group_hr_manager",1,1,1,1 -"access_hr_contract_wage_type","hr.contract.wage.type","model_hr_contract_wage_type","base.group_hr_manager",1,1,1,1 -"access_hr_contract_wage_type_contract","hr.contract.wage.type contract","model_hr_contract_wage_type","base.group_hr_contract",1,1,1,1 -"access_hr_contract_wage_type_period_contract","hr.contract.wage.type.period contract","model_hr_contract_wage_type_period","base.group_hr_contract",1,1,1,1 -"access_hr_contract","hr.contract","model_hr_contract","base.group_hr_contract",1,1,1,1 -"access_hr_employee_contract","hr.employee contract","hr.model_hr_employee","base.group_hr_contract",1,1,1,1 -"access_hr_resource_contract","hr.employee.resource contract","resource.model_resource_resource","base.group_hr_contract",1,1,1,1 -"access_hr_resource_calendar_contract","hr.employee.resource.calendar contract","resource.model_resource_calendar","base.group_hr_contract",1,1,1,1 -"access_hr_job_contract","hr.employee.job contract","hr.model_hr_job","base.group_hr_contract",1,1,1,1 -"access_hr_contract_type","hr.contract.type","model_hr_contract_type","base.group_hr_contract",1,1,1,1 -"access_hr_contract_wage_type","hr.contract.wage.type","model_hr_contract_wage_type","base.group_system",1,1,1,1 -"access_hr_contract_wage_type_period","hr.contract.wage.type.period","model_hr_contract_wage_type_period","base.group_system",1,1,1,1 -"access_hr_contract_type","hr.contract.type","model_hr_contract_type","base.group_system",1,1,1,1 -"access_hr_contract","hr.contract","model_hr_contract","base.group_system",1,1,1,1 -"access_hr_contract_type","hr.contract.type","model_hr_employee","base.group_system",1,1,1,1 - +"access_hr_contract_wage_type_period_manager","hr.contract.wage.type.period.manager","model_hr_contract_wage_type_period","base.group_hr_manager",1,1,1,1 +"access_hr_contract_wage_type_manager","hr.contract.wage.type.manager","model_hr_contract_wage_type","base.group_hr_manager",1,1,1,1 +"access_hr_contract_wage_type_contract","hr.contract.wage.type.contract","model_hr_contract_wage_type","base.group_hr_contract",1,1,1,1 +"access_hr_contract_wage_type_period_contract","hr.contract.wage.type.period.contract","model_hr_contract_wage_type_period","base.group_hr_contract",1,1,1,1 +"access_hr_contract_contract","hr.contract.contract","model_hr_contract","base.group_hr_contract",1,1,1,1 +"access_hr_employee_contract_contract","hr.employee.contract.contract","hr.model_hr_employee","base.group_hr_contract",1,1,1,1 +"access_hr_resource_contract","hr.employee.resource.contract","resource.model_resource_resource","base.group_hr_contract",1,1,1,1 +"access_hr_resource_calendar_contract","hr.employee.resource.calendar.contract","resource.model_resource_calendar","base.group_hr_contract",1,1,1,1 +"access_hr_job_contract","hr.job contract","hr.model_hr_job","base.group_hr_contract",1,1,1,1 +"access_hr_contract_type_contract","hr.contract.type.contract","model_hr_contract_type","base.group_hr_contract",1,1,1,1 +"access_hr_contract_wage_type_system","hr.contract.wage.type.system","model_hr_contract_wage_type","base.group_system",1,1,1,1 +"access_hr_contract_wage_type_period_system","hr.contract.wage.type.period.system","model_hr_contract_wage_type_period","base.group_system",1,1,1,1 +"access_hr_contract_type_system","hr.contract.type.system","model_hr_contract_type","base.group_system",1,1,1,1 +"access_hr_contract_system","hr.contract.system","model_hr_contract","base.group_system",1,0,0,0 +"access_hr_employee_category_contract","hr.employee.category.contract","hr.model_hr_employee_category","base.group_hr_contract",1,1,1,1 +"access_hr_department_contract","hr.department.contract","hr.model_hr_department","base.group_hr_contract",1,1,1,1 +"access_hr_contract_manager","hr.contract.manager","model_hr_contract","base.group_hr_manager",1,0,0,0 diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml index 44be7549dd3..1ce31942e45 100644 --- a/addons/hr_evaluation/hr_evaluation_view.xml +++ b/addons/hr_evaluation/hr_evaluation_view.xml @@ -62,7 +62,7 @@ tree,form - + @@ -349,9 +349,9 @@ - - diff --git a/addons/hr_evaluation/security/ir.model.access.csv b/addons/hr_evaluation/security/ir.model.access.csv index 89ed8f20099..4e37e74ca0f 100644 --- a/addons/hr_evaluation/security/ir.model.access.csv +++ b/addons/hr_evaluation/security/ir.model.access.csv @@ -1,11 +1,14 @@ "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" -"access_hr_evaluation_evaluation","hr_evaluation.evaluation","model_hr_evaluation_evaluation","base.group_hr_user",1,1,1,1 -"access_hr_evaluation_evaluation_manager","hr_evaluation.evaluation","model_hr_evaluation_evaluation","base.group_hr_manager",1,0,0,0 -"access_hr_evaluation_plan","hr_evaluation.plan","model_hr_evaluation_evaluation","base.group_hr_user",1,0,0,0 -"access_hr_evaluation_plan_manager","hr_evaluation.plan","model_hr_evaluation_plan","base.group_hr_manager",1,0,0,0 -"access_hr_evaluation_plan_phase","hr_evaluation.plan.phase","model_hr_evaluation_plan_phase","base.group_hr_user",1,0,0,0 -"access_hr_evaluation_plan_phase_manager","hr_evaluation.plan.phase","model_hr_evaluation_plan_phase","base.group_hr_manager",1,0,0,0 -"access_hr_evaluation_interview","hr.evaluation.interview","model_hr_evaluation_interview","base.group_hr_user",1,1,1,1 -"access_hr_evaluation_interview_manager","hr.evaluation.interview","model_hr_evaluation_interview","base.group_hr_manager",1,0,0,0 -"access_hr_evaluation_report","hr.evaluation.report","model_hr_evaluation_report","base.group_hr_manager",1,0,0,0 +"access_hr_evaluation_evaluation_user","hr_evaluation.evaluation.user","model_hr_evaluation_evaluation","base.group_hr_user",1,1,1,1 +"access_hr_evaluation_evaluation_manager","hr_evaluation.evaluation.manager","model_hr_evaluation_evaluation","base.group_hr_manager",1,1,1,1 +"access_hr_evaluation_plan_user","hr_evaluation.plan.user","model_hr_evaluation_evaluation","base.group_hr_user",1,0,0,0 +"access_hr_evaluation_plan_manager","hr_evaluation.plan.manager","model_hr_evaluation_plan","base.group_hr_manager",1,0,0,0 +"access_hr_evaluation_plan_phase_user","hr_evaluation.plan.phase.user","model_hr_evaluation_plan_phase","base.group_hr_user",1,0,0,0 +"access_hr_evaluation_plan_phase_manager","hr_evaluation.plan.phase.manager","model_hr_evaluation_plan_phase","base.group_hr_manager",1,0,0,0 +"access_hr_evaluation_interview_user","hr.evaluation.interview.user","model_hr_evaluation_interview","base.group_hr_user",1,1,1,1 +"access_hr_evaluation_interview_manager","hr.evaluation.interview.manager","model_hr_evaluation_interview","base.group_hr_manager",1,1,1,1 +"access_hr_evaluation_report","hr.evaluation.report","model_hr_evaluation_report","base.group_hr_manager",1,1,1,1 "access_hr_evaluation_plan","hr_evaluation.plan","model_hr_evaluation_plan","base.group_system",1,1,1,1 +"access_hr_evaluation_plan_phase_system","hr_evaluation.plan.phase.system","model_hr_evaluation_plan_phase","base.group_system",1,1,1,1 +"access_hr_evaluation_evaluation_system","hr_evaluation.evaluation.system","model_hr_evaluation_evaluation","base.group_system",1,0,0,0 +"access_hr_evaluation_interview_system","hr.evaluation.interview.system","model_hr_evaluation_interview","base.group_system",1,0,0,0 diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml index 06c33fe46f7..0c6fae435f1 100644 --- a/addons/hr_expense/hr_expense_view.xml +++ b/addons/hr_expense/hr_expense_view.xml @@ -161,8 +161,8 @@ - - + + product.product.expense.form diff --git a/addons/hr_expense/i18n/pt_BR.po b/addons/hr_expense/i18n/pt_BR.po index e9bfecc90c8..9a9456c4c89 100644 --- a/addons/hr_expense/i18n/pt_BR.po +++ b/addons/hr_expense/i18n/pt_BR.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-12 05:43+0000\n" +"PO-Revision-Date: 2010-08-16 09:31+0000\n" "Last-Translator: Fabien (Open ERP) \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-08-13 05:56+0000\n" +"X-Launchpad-Export-Date: 2010-08-17 07:00+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: hr_expense diff --git a/addons/hr_expense/i18n/tr.po b/addons/hr_expense/i18n/tr.po index f87fa7b0b6a..7be26dc2c10 100644 --- a/addons/hr_expense/i18n/tr.po +++ b/addons/hr_expense/i18n/tr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-11 05:42+0000\n" +"PO-Revision-Date: 2010-08-16 09:31+0000\n" "Last-Translator: Fabien (Open ERP) \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-08-12 04:01+0000\n" +"X-Launchpad-Export-Date: 2010-08-17 07:00+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: hr_expense diff --git a/addons/hr_expense/security/ir.model.access.csv b/addons/hr_expense/security/ir.model.access.csv index 7489959057a..83636da5257 100644 --- a/addons/hr_expense/security/ir.model.access.csv +++ b/addons/hr_expense/security/ir.model.access.csv @@ -1,8 +1,10 @@ "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" -"access_hr_expense_expense","hr.expense.expense","model_hr_expense_expense","base.group_hr_user",1,1,1,1 +"access_hr_expense_expense_user","hr.expense.expense.user","model_hr_expense_expense","base.group_hr_user",1,1,1,1 "access_hr_expense_line","hr.expense.line","model_hr_expense_line","base.group_hr_user",1,1,1,1 "access_hr_expense_report","hr.expense.report","model_hr_expense_report","base.group_hr_manager",1,0,0,0 "access_product_product_hr_expense","product.product.hr.expense","product.model_product_product","base.group_hr_user",1,0,0,0 "access_product_template_hr_expense","product.template.hr.expense","product.model_product_template","base.group_hr_user",1,0,0,0 "access_product_uom_hr_expense","product.uom.hr.expense","product.model_product_uom","base.group_hr_user",1,0,0,0 "access_product_price_type","product.price.type","product.model_product_price_type","base.group_hr_user",1,1,1,1 +"access_hr_expense_expense_manager","hr.expense.expense.manager","model_hr_expense_expense","base.group_hr_manager",1,0,0,0 +"access_hr_expense_expense_system","hr.expense.expense.system","model_hr_expense_expense","base.group_system",1,0,0,0 diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml index 9c6b48c651d..b29bf56bfb8 100644 --- a/addons/hr_holidays/hr_holidays_view.xml +++ b/addons/hr_holidays/hr_holidays_view.xml @@ -335,7 +335,6 @@ parent="menu_open_ask_holidays" id="menu_open_company_allocation" action="open_company_allocation" - groups="base.group_hr_manager" sequence="40"/> diff --git a/addons/hr_holidays/i18n/lt.po b/addons/hr_holidays/i18n/lt.po index 9b162ce6e1f..8fd15825786 100644 --- a/addons/hr_holidays/i18n/lt.po +++ b/addons/hr_holidays/i18n/lt.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-11 05:43+0000\n" +"PO-Revision-Date: 2010-08-16 09:31+0000\n" "Last-Translator: OpenERP Administrators \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-08-12 04:02+0000\n" +"X-Launchpad-Export-Date: 2010-08-17 07:00+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: hr_holidays diff --git a/addons/hr_holidays/i18n/tr.po b/addons/hr_holidays/i18n/tr.po index d6ffdad1e6f..96533e13b69 100644 --- a/addons/hr_holidays/i18n/tr.po +++ b/addons/hr_holidays/i18n/tr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-11 05:39+0000\n" +"PO-Revision-Date: 2010-08-16 09:25+0000\n" "Last-Translator: Fabien (Open ERP) \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-08-12 04:02+0000\n" +"X-Launchpad-Export-Date: 2010-08-17 07:00+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: hr_holidays diff --git a/addons/hr_holidays/i18n/zh_CN.po b/addons/hr_holidays/i18n/zh_CN.po index 9584b076841..e425555b121 100644 --- a/addons/hr_holidays/i18n/zh_CN.po +++ b/addons/hr_holidays/i18n/zh_CN.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-12 05:42+0000\n" +"PO-Revision-Date: 2010-08-16 09:31+0000\n" "Last-Translator: Black Jack \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-08-13 05:56+0000\n" +"X-Launchpad-Export-Date: 2010-08-17 07:00+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: hr_holidays diff --git a/addons/hr_holidays/security/ir.model.access.csv b/addons/hr_holidays/security/ir.model.access.csv index eedc4a78336..38334165a76 100644 --- a/addons/hr_holidays/security/ir.model.access.csv +++ b/addons/hr_holidays/security/ir.model.access.csv @@ -1,10 +1,11 @@ "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" "access_hr_holydays_status_user","hr.holidays.status user","model_hr_holidays_status","base.group_hr_user",1,0,0,0 -"access_hr_holidays_user","hr holidays user","model_hr_holidays","base.group_hr_user",1,1,1,0 -"access_hr_holydays_status_manager","hr.holidays.status manager","model_hr_holidays_status","base.group_hr_manager",1,0,0,0 -"access_hr_holidays_manager","hr holidays manager","model_hr_holidays","base.group_hr_manager",1,0,0,0 -"access_hr_holidays_remain","hr holidays user","model_hr_holidays_remaining_leaves_user","base.group_hr_user",1,0,0,0 +"access_hr_holidays_user","hr.holidays.user","model_hr_holidays","base.group_hr_user",1,1,1,0 +"access_hr_holydays_status_manager","hr.holidays.status.manager","model_hr_holidays_status","base.group_hr_manager",1,0,0,0 +"access_hr_holidays_manager","hr.holidays.manager","model_hr_holidays","base.group_hr_manager",1,0,0,0 +"access_hr_holidays_remain_user","hr.holidays.ramain.user","model_hr_holidays_remaining_leaves_user","base.group_hr_user",1,0,0,0 "access_hr_holidays_report","hr.holidays.report","model_hr_holidays_report","base.group_hr_manager",1,0,0,0 -"access_hr_holidays_remaining_leaves_user","hr.hr.holidays.remaining.leaves.user","model_hr_holidays_remaining_leaves_user","base.group_hr_manager",1,0,0,0 +"access_hr_holidays_remaining_leaves_manager","hr.hr.holidays.remaining.leaves.manager","model_hr_holidays_remaining_leaves_user","base.group_hr_manager",1,0,0,0 "access_available_holidays_report","hr.available.holidays.report","model_available_holidays_report","base.group_hr_manager",1,0,0,0 -"access_hr_holydays_status","hr.holidays.status","model_hr_holidays_status","base.group_system",1,1,1,1 +"access_hr_holydays_status_system","hr.holidays.status.system","model_hr_holidays_status","base.group_system",1,1,1,1 +"access_hr_holidays_system","hr.holidays.system","model_hr_holidays","base.group_system",1,0,0,0 diff --git a/addons/hr_holidays/test/test_hr_holiday.yml b/addons/hr_holidays/test/test_hr_holiday.yml index 720ca5e9e84..6a124be59c2 100644 --- a/addons/hr_holidays/test/test_hr_holiday.yml +++ b/addons/hr_holidays/test/test_hr_holiday.yml @@ -1,7 +1,7 @@ - In order to test the hr_holiday module in OpenERP, I will Allocate leaves for Employee and manage leaves and leaves requests. - - I create new user "user1" to who makes leave request. + I create new user "user1" who will make leave request. - !record {model: res.users, id: res_users_user0}: company_id: base.main_company diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml index d6f787dad22..c9d9dbc2d5e 100644 --- a/addons/hr_payroll/hr_payroll_view.xml +++ b/addons/hr_payroll/hr_payroll_view.xml @@ -4,7 +4,7 @@ - + diff --git a/addons/hr_payroll/security/ir.model.access.csv b/addons/hr_payroll/security/ir.model.access.csv index b887cae0651..c605e6f28c2 100644 --- a/addons/hr_payroll/security/ir.model.access.csv +++ b/addons/hr_payroll/security/ir.model.access.csv @@ -4,7 +4,7 @@ "aceess_hr_contract_wage_type","hr.contract.wage.type","model_hr_contract_wage_type","group_hr_payroll",1,1,1,1 "access_hr_passport","hr.passport","model_hr_passport","group_hr_payroll",1,1,1,1 "access_hr_payroll_structure","hr.payroll.structure","model_hr_payroll_structure","group_hr_payroll",1,1,1,1 -"access_hr_contract","hr.contract","model_hr_contract","group_hr_payroll",1,1,1,1 +"access_hr_contract","hr.contract","model_hr_contract","group_hr_payroll",1,0,0,0 "access_hr_payroll_register","hr.payroll.register","model_hr_payroll_register","group_hr_payroll",1,1,1,1 "access_hr_payroll_advice","hr.payroll.advice","model_hr_payroll_advice","group_hr_payroll",1,1,1,1 "access_hr_payroll_advice_line","hr.payroll.advice.line","model_hr_payroll_advice_line","group_hr_payroll",1,1,1,1 @@ -28,3 +28,7 @@ "access_hr_payroll_structure","hr.payroll.structure","model_hr_payroll_structure","base.group_system",1,1,1,1 "access_company_contribution","company.contribution","model_company_contribution","base.group_system",1,1,1,1 "access_hr_passport_sys","hr.passport","model_hr_passport","base.group_system",1,1,1,1 +"access_res_partner_payroll","res.partner.payroll","base.model_res_partner","group_hr_payroll",1,1,1,1 +"access_hr_contibution_register_system","hr.contibution.register.system","model_hr_contibution_register","base.group_system",1,1,1,1 +"access_hr_contibution_register_line_system","hr.contibution.register.line.system","model_hr_contibution_register_line","base.group_system",1,1,1,1 +"access_hr_allounce_deduction_category_system","hr.allounce.deduction.category.system","model_hr_allounce_deduction_categoty","base.group_system",1,1,1,1 diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml index 5056a0c741e..1a38b8d5a5b 100644 --- a/addons/hr_recruitment/hr_recruitment_view.xml +++ b/addons/hr_recruitment/hr_recruitment_view.xml @@ -96,8 +96,8 @@