diff options
Diffstat (limited to 'addons')
206 files changed, 14654 insertions, 8212 deletions
diff --git a/addons/account/account.py b/addons/account/account.py index ecadfaf37f9..50b922d723b 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -458,7 +458,7 @@ class account_account(osv.osv): ids = self.search(cr, user, [('name', operator, name)]+ args, limit=limit) if not ids and len(name.split()) >= 2: #Separating code and name of account for searching - operand1,operand2 = name.split(' ',1) #name can contain spaces e.g. OpenERP S.A. + operand1,operand2 = name.split(' ',1) #name can contain spaces e.g. OpenERP S.A. ids = self.search(cr, user, [('code', operator, operand1), ('name', operator, operand2)]+ args, limit=limit) else: ids = self.search(cr, user, args, context=context, limit=limit) @@ -2542,7 +2542,22 @@ class wizard_multi_charts_accounts(osv.osv_memory): 'bank_accounts_id': fields.one2many('account.bank.accounts.wizard', 'bank_account_id', 'Bank Accounts', required=True), 'code_digits':fields.integer('# of Digits', required=True, help="No. of Digits to use for account code"), 'seq_journal':fields.boolean('Separated Journal Sequences', help="Check this box if you want to use a different sequence for each created journal. Otherwise, all will use the same sequence."), + "sale_tax": fields.many2one("account.tax.template", "Sale Tax"), + "purchase_tax": fields.many2one("account.tax.template", "Purchase Tax"), } + def onchange_chart_template_id(self, cr, uid, ids, chart_template_id=False, context=None): + res = {} + res['value'] = {} + res['value']["sale_tax"] = False + res['value']["purchase_tax"] = False + if chart_template_id: + ids = self.pool.get('account.tax.template').search(cr, uid, [("chart_template_id" + , "=", chart_template_id)], order="sequence") + if len(ids) > 0: + id=ids[0] + res['value']["sale_tax"] = id + res['value']["purchase_tax"] = id + return res def _get_chart(self, cr, uid, context={}): ids = self.pool.get('account.chart.template').search(cr, uid, [], context=context) @@ -2604,6 +2619,7 @@ class wizard_multi_charts_accounts(osv.osv_memory): tax_code_template_ref[tax_code_template.id] = new_tax_code #create all the tax + tax_template_to_tax = {} for tax in obj_multi.chart_template_id.tax_template_ids: #create it vals_tax = { @@ -2632,6 +2648,7 @@ class wizard_multi_charts_accounts(osv.osv_memory): 'type_tax_use': tax.type_tax_use } new_tax = obj_acc_tax.create(cr, uid, vals_tax) + tax_template_to_tax[tax.id] = new_tax #as the accounts have not been created yet, we have to wait before filling these fields todo_dict[new_tax] = { 'account_collected_id': tax.account_collected_id and tax.account_collected_id.id or False, @@ -2856,6 +2873,14 @@ class wizard_multi_charts_accounts(osv.osv_memory): } obj_ac_fp.create(cr, uid, vals_acc) + ir_values = self.pool.get('ir.values') + if obj_multi.sale_tax: + ir_values.set(cr, uid, key='default', key2=False, name="taxes_id", company=obj_multi.company_id.id, + models =[('product.product',False)], value=[tax_template_to_tax[obj_multi.sale_tax.id]]) + if obj_multi.purchase_tax: + ir_values.set(cr, uid, key='default', key2=False, name="supplier_taxes_id", company=obj_multi.company_id.id, + models =[('product.product',False)], value=[tax_template_to_tax[obj_multi.purchase_tax.id]]) + 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 c6548a36872..ded29c27e89 100644 --- a/addons/account/account_bank_statement.py +++ b/addons/account/account_bank_statement.py @@ -38,12 +38,13 @@ class account_bank_statement(osv.osv): def write(self, cr, uid, ids, vals, context=None): res = super(account_bank_statement, self).write(cr, uid, ids, vals, context=context) + account_bank_statement_line_obj = self.pool.get('account.bank.statement.line') for statement in self.browse(cr, uid, ids, context): seq = 0 for line in statement.line_ids: seq += 1 if not line.sequence: - self.pool.get('account.bank.statement.line').write(cr, uid, [line.id], {'sequence': seq}, context=context) + account_bank_statement_line_obj.write(cr, uid, [line.id], {'sequence': seq}, context=context) return res def button_import_invoice(self, cr, uid, ids, context=None): @@ -381,13 +382,14 @@ class account_bank_statement(osv.osv): def button_cancel(self, cr, uid, ids, context=None): done = [] + account_move_obj = self.pool.get('account.move') for st in self.browse(cr, uid, ids, context): if st.state=='draft': continue ids = [] for line in st.line_ids: ids += [x.id for x in line.move_ids] - self.pool.get('account.move').unlink(cr, uid, ids, context) + account_move_obj.unlink(cr, uid, ids, context) done.append(st.id) return self.write(cr, uid, done, {'state':'draft'}, context=context) @@ -496,4 +498,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 f88d38734f2..13c6464f888 100644 --- a/addons/account/account_cash_statement.py +++ b/addons/account/account_cash_statement.py @@ -23,7 +23,6 @@ import time from osv import osv, fields -from decimal import Decimal from tools.translate import _ import decimal_precision as dp @@ -53,14 +52,14 @@ class account_cashbox_line(osv.osv): @param number: """ sub = pieces * number - return {'value':{'subtotal': sub or 0.0}} + return {'value': {'subtotal': sub or 0.0}} _columns = { 'pieces': fields.float('Values', digits_compute=dp.get_precision('Account')), 'number': fields.integer('Number'), 'subtotal': fields.function(_sub_total, method=True, string='Sub Total', type='float', digits_compute=dp.get_precision('Account')), - 'starting_id': fields.many2one('account.bank.statement',ondelete='cascade'), - 'ending_id': fields.many2one('account.bank.statement',ondelete='cascade'), + 'starting_id': fields.many2one('account.bank.statement', ondelete='cascade'), + 'ending_id': fields.many2one('account.bank.statement', ondelete='cascade'), } account_cashbox_line() @@ -86,7 +85,7 @@ class account_cash_statement(osv.osv): for line in statement.starting_details_ids: amount_total+= line.pieces * line.number res[statement.id] = { - 'balance_start':amount_total + 'balance_start': amount_total } return res @@ -166,13 +165,13 @@ class account_cash_statement(osv.osv): curr = [1, 2, 5, 10, 20, 50, 100, 500] for rs in curr: dct = { - 'pieces':rs, - 'number':0 + 'pieces': rs, + 'number': 0 } res.append(dct) - journal_ids = self.pool.get('account.journal').search(cr, uid, [('type','=','cash')], context=context) + journal_ids = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'cash')], context=context) if journal_ids: - results = self.search(cr, uid, [('journal_id','in',journal_ids),('state','=','confirm')],context=context) + results = self.search(cr, uid, [('journal_id', 'in', journal_ids),('state', '=', 'confirm')], context=context) if results: cash_st = self.browse(cr, uid, results, context)[0] for cash_line in cash_st.ending_details_ids: @@ -186,8 +185,8 @@ class account_cash_statement(osv.osv): curr = [1, 2, 5, 10, 20, 50, 100, 500] for rs in curr: dct = { - 'pieces':rs, - 'number':0 + 'pieces': rs, + 'number': 0 } res.append(dct) return res @@ -197,10 +196,10 @@ class account_cash_statement(osv.osv): curr = [1, 2, 5, 10, 20, 50, 100, 500] for rs in curr: dct = { - 'pieces':rs, - 'number':0 + 'pieces': rs, + 'number': 0 } - res.append((0,0,dct)) + res.append((0, 0, dct)) return res def _get_cash_open_close_box_lines(self, cr, uid, context={}): @@ -210,39 +209,39 @@ class account_cash_statement(osv.osv): starting_details = self._get_cash_open_box_lines(cr, uid, context) ending_details = self._get_default_cash_close_box_lines(cr, uid, context) for start in starting_details: - start_l.append((0,0,start)) + start_l.append((0, 0, start)) for end in ending_details: - end_l.append((0,0,end)) + end_l.append((0, 0, end)) res['start'] = start_l res['end'] = end_l return res _columns = { - '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"), + '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', 'Closed'), ('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"), + '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"), 'balance_end': fields.function(_end_balance, method=True, store=True, string='Balance', help="Closing balance based on Starting Balance and Cash Transactions"), '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, states={'draft': [('readonly', False)]}, readonly=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'), - 'user_id':fields.many2one('res.users', 'Responsible', required=False), + 'user_id': fields.many2one('res.users', 'Responsible', required=False), } _defaults = { 'state': 'draft', 'date': time.strftime("%Y-%m-%d %H:%M:%S"), 'user_id': lambda self, cr, uid, context=None: uid, - 'starting_details_ids':_get_cash_open_box_lines, - 'ending_details_ids':_get_default_cash_close_box_lines + 'starting_details_ids': _get_cash_open_box_lines, + 'ending_details_ids': _get_default_cash_close_box_lines } def create(self, cr, uid, vals, context=None): sql = [ - ('journal_id', '=', vals['journal_id']), + ('journal_id', '=', vals.get('journal_id', False)), ('state', '=', 'open') ] open_jrnl = self.search(cr, uid, sql) @@ -251,20 +250,20 @@ class account_cash_statement(osv.osv): if self.pool.get('account.journal').browse(cr, uid, vals['journal_id']).type == 'cash': open_close = self._get_cash_open_close_box_lines(cr, uid, context) - if vals.get('starting_details_ids',False): + if vals.get('starting_details_ids', False): for start in vals.get('starting_details_ids'): dict_val = start[2] for end in open_close['end']: if end[2]['pieces'] == dict_val['pieces']: end[2]['number'] += dict_val['number'] vals.update({ - 'ending_details_ids':open_close['start'], - 'starting_details_ids':open_close['end'] +# 'ending_details_ids': open_close['start'], + 'starting_details_ids': open_close['end'] }) else: vals.update({ - 'ending_details_ids':False, - 'starting_details_ids':False + 'ending_details_ids': False, + 'starting_details_ids': False }) res_id = super(account_cash_statement, self).create(cr, uid, vals, context=context) self.write(cr, uid, [res_id], {}) @@ -296,8 +295,6 @@ class account_cash_statement(osv.osv): @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 @@ -317,34 +314,35 @@ class account_cash_statement(osv.osv): else: return True - def _user_allow(self, cr, uid, ids, statement, context={}): + def _user_allow(self, cr, uid, statement_id, context=None): return True def button_open(self, cr, uid, ids, context=None): - """ Changes statement state to Running. @return: True """ - cash_pool = self.pool.get('account.cashbox.line') + if context is None: + context = {} statement_pool = self.pool.get('account.bank.statement') - statement = statement_pool.browse(cr, uid, ids[0]) - vals = {} + for statement in statement_pool.browse(cr, uid, ids, context=context): + 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 not self._user_allow(cr, uid, statement.id, context=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 statement.name and statement.name == '/': + number = self.pool.get('ir.sequence').get(cr, uid, 'account.cash.statement') + vals.update({ + 'name': number + }) - vals.update({ - 'date':time.strftime("%Y-%m-%d %H:%M:%S"), - 'state':'open', + vals.update({ + 'date': time.strftime("%Y-%m-%d %H:%M:%S"), + 'state': 'open', - }) - return self.write(cr, uid, ids, vals) + }) + self.write(cr, uid, [statement.id], vals) + return True def balance_check(self, cr, uid, cash_id, journal_type='bank', context=None): if journal_type == 'bank': @@ -369,16 +367,16 @@ class account_cash_statement(osv.osv): def button_confirm_cash(self, cr, uid, ids, context=None): super(account_cash_statement, self).button_confirm_bank(cr, uid, ids, context=context) - return self.write(cr, uid, ids, {'closing_date':time.strftime("%Y-%m-%d %H:%M:%S")}, context=context) + return self.write(cr, uid, ids, {'closing_date': time.strftime("%Y-%m-%d %H:%M:%S")}, context=context) def button_cancel(self, cr, uid, ids, context=None): cash_box_line_pool = self.pool.get('account.cashbox.line') super(account_cash_statement, self).button_cancel(cr, uid, ids, context=context) for st in self.browse(cr, uid, ids, context): for end in st.ending_details_ids: - cash_box_line_pool.write(cr, uid, [end.id], {'number':0}) + cash_box_line_pool.write(cr, uid, [end.id], {'number': 0}) return True account_cash_statement() -# 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/account/account_move_line.py b/addons/account/account_move_line.py index af7771eaeac..ffea12170a2 100644 --- a/addons/account/account_move_line.py +++ b/addons/account/account_move_line.py @@ -177,7 +177,7 @@ class account_move_line(osv.osv): for item in i[2]: data[item] = i[2][item] if context['journal']: - journal_data = obj_journal.browse(cr, uid, context['journal']) + journal_data = journal_obj.browse(cr, uid, context['journal']) if journal_data.type == 'purchase': if total_new > 0: account = journal_data.default_credit_account_id @@ -293,6 +293,8 @@ class account_move_line(osv.osv): return data def on_create_write(self, cr, uid, id, context={}): + if not id: + return [] ml = self.browse(cr, uid, id, context) return map(lambda x: x.id, ml.move_id.line_id) @@ -363,7 +365,7 @@ class account_move_line(osv.osv): return [('id', '=', '0')] return [('id', 'in', [x[0] for x in res])] - def _invoice_search(self, cursor, user, obj, name, args, context): + def _invoice_search(self, cursor, user, obj, name, args, context=None): if not args: return [] invoice_obj = self.pool.get('account.invoice') @@ -408,7 +410,7 @@ class account_move_line(osv.osv): return [('id', '=', '0')] return [('id', 'in', [x[0] for x in res])] - def _get_move_lines(self, cr, uid, ids, context={}): + def _get_move_lines(self, cr, uid, ids, context=None): result = [] for move in self.pool.get('account.move').browse(cr, uid, ids, context=context): for line in move.line_id: @@ -458,7 +460,7 @@ class account_move_line(osv.osv): 'company_id': fields.related('account_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True) } - def _get_date(self, cr, uid, context): + def _get_date(self, cr, uid, context=None): period_obj = self.pool.get('account.period') dt = time.strftime('%Y-%m-%d') if ('journal_id' in context) and ('period_id' in context): @@ -474,7 +476,9 @@ class account_move_line(osv.osv): dt = period.date_start return dt - def _get_currency(self, cr, uid, context={}): + def _get_currency(self, cr, uid, context=None): + if context is None: + context = {} if not context.get('journal_id', False): return False cur = self.pool.get('account.journal').browse(cr, uid, context['journal_id']).currency @@ -1126,6 +1130,8 @@ class account_move_line(osv.osv): 'period_id': context['period_id'], 'journal_id': context['journal_id'] } + if vals.get('ref', ''): + v.update({'ref': vals['ref']}) move_id = move_obj.create(cr, uid, v, context) vals['move_id'] = move_id else: @@ -1243,4 +1249,4 @@ class account_move_line(osv.osv): account_move_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_view.xml b/addons/account/account_view.xml index 9232a53addb..901fe2bc11d 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -198,7 +198,7 @@ <search string="Accounts"> <group col="10" colspan="4"> <filter icon="terp-sale" string="Receivable Accounts" domain="[('type','=','receivable')]"/> - <filter icon="terp-purchase" string="Purchase Accounts" domain="[('type','=','purchase')]"/> + <filter icon="terp-purchase" string="Payable Accounts" domain="[('type','=','payable')]"/> <separator orientation="vertical"/> <field name="code"/> <field name="name"/> @@ -1557,7 +1557,7 @@ <menuitem - name="Manual Reconcilication" icon="STOCK_EXECUTE" + name="Manual Reconciliation" icon="STOCK_EXECUTE" action="action_account_manual_reconcile" id="menu_manual_reconcile" parent="account.periodical_processing_reconciliation"/> @@ -2415,8 +2415,10 @@ <group string="res_config_contents" position="replace"> <field name="company_id" widget="selection"/> <field name ="code_digits" groups="base.group_extended"/> - <field name="chart_template_id" widget="selection"/> + <field name="chart_template_id" widget="selection" on_change="onchange_chart_template_id(chart_template_id)"/> <field name ="seq_journal" groups="base.group_extended"/> + <field name="sale_tax" domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False)]"/> + <field name="purchase_tax" domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False)]"/> <field colspan="4" mode="tree" name="bank_accounts_id" nolabel="1" widget="one2many_list"> <form string="Bank Information"> <field name="acc_name"/> diff --git a/addons/account/i18n/es.po b/addons/account/i18n/es.po index 34706585b02..1e4fdb2bc94 100644 --- a/addons/account/i18n/es.po +++ b/addons/account/i18n/es.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-10-24 21:56+0000\n" -"Last-Translator: Carlos @ smile.fr <Unknown>\n" +"PO-Revision-Date: 2010-10-25 07:09+0000\n" +"Last-Translator: Carlos-smile <Unknown>\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-10-25 04:39+0000\n" +"X-Launchpad-Export-Date: 2010-10-26 04:40+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account diff --git a/addons/account/i18n/es_EC.po b/addons/account/i18n/es_EC.po index d6551425629..9affb3cdd31 100644 --- a/addons/account/i18n/es_EC.po +++ b/addons/account/i18n/es_EC.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-10-25 04:39+0000\n" +"X-Launchpad-Export-Date: 2010-10-26 04:40+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account diff --git a/addons/account/i18n/it.po b/addons/account/i18n/it.po index 8f7225d973c..4a77a9b29c8 100644 --- a/addons/account/i18n/it.po +++ b/addons/account/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-10-20 07:22+0000\n" -"Last-Translator: Lorenzo Battistini <lorenzo.battistini@domsense.com>\n" +"PO-Revision-Date: 2010-10-26 08:27+0000\n" +"Last-Translator: Davide Corio - Domsense <davide.corio@domsense.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-10-21 05:02+0000\n" +"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account @@ -372,7 +372,7 @@ msgstr "Contabilità Analitica" #: field:account.tax,child_depend:0 #: field:account.tax.template,child_depend:0 msgid "Tax on Children" -msgstr "" +msgstr "Calcolo su tasse figlie" #. module: account #: rml:account.central.journal:0 @@ -416,7 +416,7 @@ msgstr "Riconciliazione dei pagamenti" #. module: account #: model:account.journal,name:account.expenses_journal msgid "Journal de frais" -msgstr "" +msgstr "Giornale Acquisti" #. module: account #: model:ir.actions.act_window,name:account.act_acc_analytic_acc_5_report_hr_timesheet_invoice_journal @@ -494,7 +494,7 @@ msgstr "Rif" #. module: account #: field:account.tax.template,type_tax_use:0 msgid "Tax Use In" -msgstr "" +msgstr "Tassa usata per" #. module: account #: help:account.tax.template,include_base_amount:0 @@ -572,7 +572,7 @@ msgstr "Linea" #. module: account #: rml:account.analytic.account.cost_ledger:0 msgid "J.C. or Move name" -msgstr "" +msgstr "J.C. o nome movimento" #. module: account #: selection:account.tax,applicable_type:0 @@ -634,7 +634,7 @@ msgstr "(Tenere vuoto per aprire la situazione corrente)" #. module: account #: model:ir.model,name:account.model_account_fiscal_position_account msgid "Accounts Fiscal Mapping" -msgstr "" +msgstr "Mappatura Posizioni Fiscali" #. module: account #: field:account.analytic.account,contact_id:0 @@ -666,7 +666,7 @@ msgstr "Sconto (%)" #: wizard_field:account.move.line.reconcile,init_full,writeoff:0 #: wizard_field:account.move.line.reconcile,init_partial,writeoff:0 msgid "Write-Off amount" -msgstr "" +msgstr "Conto per storno" #. module: account #: help:account.fiscalyear,company_id:0 diff --git a/addons/account/i18n/mn.po b/addons/account/i18n/mn.po index 63ac7694aec..36ccf56abb3 100644 --- a/addons/account/i18n/mn.po +++ b/addons/account/i18n/mn.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-10-21 09:08+0000\n" +"PO-Revision-Date: 2010-10-26 08:47+0000\n" "Last-Translator: OpenERP Administrators <Unknown>\n" "Language-Team: Mongolian <mn@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-10-22 04:40+0000\n" +"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account @@ -5204,7 +5204,7 @@ msgstr "Дансны татварын кодны загвар" #. module: account #: view:account.subscription:0 msgid "Subscription Periods" -msgstr "" +msgstr "Баталгааны мөчлөгүүд" #. module: account #: model:process.node,name:account.process_node_manually0 @@ -5484,7 +5484,7 @@ msgstr "Баримтын бичилт" #: model:ir.actions.act_window,name:account.action_invoice_tree6 #: model:ir.ui.menu,name:account.menu_action_invoice_tree6 msgid "PRO-FORMA Customer Invoices" -msgstr "" +msgstr "Үйлчлүүлэгчийн нэхэмжлэл PRO-FORMA" #. module: account #: field:account.subscription,period_total:0 @@ -5609,7 +5609,7 @@ msgstr "Ажил гүйлгээ" #. module: account #: selection:account.invoice,state:0 msgid "Pro-forma" -msgstr "" +msgstr "Pro-forma" #. module: account #: model:ir.actions.act_window,name:account.action_account_form @@ -5647,7 +5647,7 @@ msgstr "Баримтын дугаараар" #. module: account #: rml:account.overdue:0 msgid "Total amount due:" -msgstr "" +msgstr "Нийт товлосон хэмжээ" #. module: account #: wizard_field:account.analytic.account.chart,init,to_date:0 @@ -5701,7 +5701,7 @@ msgstr "Загварууд" #. module: account #: wizard_button:account.vat.declaration,init,report:0 msgid "Print VAT Decl." -msgstr "" +msgstr "НӨАТ хэвлэх" #. module: account #: model:ir.actions.report.xml,name:account.account_intracom diff --git a/addons/account/i18n/ro.po b/addons/account/i18n/ro.po index b213daacaa4..709deb3fd95 100644 --- a/addons/account/i18n/ro.po +++ b/addons/account/i18n/ro.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-09-29 09:51+0000\n" -"Last-Translator: OpenERP Administrators <Unknown>\n" +"PO-Revision-Date: 2010-10-26 17:49+0000\n" +"Last-Translator: OpenERP Romania <Unknown>\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-09-30 04:41+0000\n" +"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account @@ -1053,7 +1053,7 @@ msgstr "Descendenţi" #. module: account #: model:ir.model,name:account.model_account_fiscal_position_tax msgid "Taxes Fiscal Mapping" -msgstr "" +msgstr "Corespondență fiscală taxe" #. module: account #: model:ir.actions.act_window,name:account.action_invoice_tree2_new @@ -1142,7 +1142,7 @@ msgstr "Cont analitic nou" #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template msgid "Fiscal Mapping Templates" -msgstr "" +msgstr "ȘCorespondență fiscală" #. module: account #: rml:account.invoice:0 @@ -1174,7 +1174,7 @@ msgstr "Suma exprimată întro altă monedă opţională" #: view:account.fiscal.position.template:0 #: field:account.fiscal.position.template,name:0 msgid "Fiscal Mapping Template" -msgstr "" +msgstr "ȘCorespondență fiscală" #. module: account #: field:account.payment.term,line_ids:0 diff --git a/addons/account/i18n/ru.po b/addons/account/i18n/ru.po index cbc4a421440..e02d03971ec 100644 --- a/addons/account/i18n/ru.po +++ b/addons/account/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-10-24 09:01+0000\n" +"PO-Revision-Date: 2010-10-26 13:21+0000\n" "Last-Translator: Chertykov Denis <chertykov@gmail.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-10-25 04:39+0000\n" +"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account @@ -1108,7 +1108,7 @@ msgstr "Общий объем списания" #. module: account #: view:account.tax.template:0 msgid "Compute Code for Taxes included prices" -msgstr "" +msgstr "Код расчета для цен с налогами" #. module: account #: view:account.invoice.tax:0 @@ -1568,7 +1568,7 @@ msgstr "Основной план счетов на основе шаблона" #. module: account #: model:ir.ui.menu,name:account.menu_finance_legal_statement msgid "Legal Statements" -msgstr "" +msgstr "Правовые акты" #. module: account #: field:account.tax.code,parent_id:0 @@ -1745,7 +1745,7 @@ msgstr "Включить в базовую сумму" #. module: account #: rml:account.analytic.account.analytic.check:0 msgid "Delta Credit" -msgstr "" +msgstr "Дельта Кредит" #. module: account #: model:ir.actions.wizard,name:account.wizard_reconcile_unreconcile @@ -1786,7 +1786,7 @@ msgstr "Согласование проводок из счета (ов) и оп #: model:ir.actions.wizard,name:account.wizard_central_journal #: model:ir.ui.menu,name:account.menu_central_journal msgid "Print Central Journal" -msgstr "" +msgstr "Печать центрального журнала" #. module: account #: wizard_field:account.aged.trial.balance,init,period_length:0 @@ -2935,7 +2935,7 @@ msgstr "1см 27,7см 20см 27,7см" #: model:ir.actions.act_window,name:account.action_invoice_tree12 #: model:ir.ui.menu,name:account.menu_action_invoice_tree12 msgid "Draft Supplier Refunds" -msgstr "" +msgstr "Черновик возврата денег от поставщика" #. module: account #: model:process.node,name:account.process_node_accountingstatemententries0 diff --git a/addons/account/i18n/sr.po b/addons/account/i18n/sr.po index e49ea2c9c9e..56caceda12f 100644 --- a/addons/account/i18n/sr.po +++ b/addons/account/i18n/sr.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-10-18 12:12+0000\n" -"Last-Translator: qdp (OpenERP) <qdp-launchpad@tinyerp.com>\n" +"PO-Revision-Date: 2010-10-26 08:51+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\n" "Language-Team: Serbian <sr@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-10-20 04:55+0000\n" +"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account @@ -80,7 +80,7 @@ msgstr "" #. module: account #: help:account.invoice,period_id:0 msgid "Keep empty to use the period of the validation(invoice) date." -msgstr "" +msgstr "Ostavi prazno da bi koristio validacioni period ( racuna) datuma." #. module: account #: wizard_view:account.automatic.reconcile,reconcile:0 @@ -501,6 +501,8 @@ msgid "" "Set if the amount of tax must be included in the base amount before " "computing the next taxes." msgstr "" +"Postavi ovo ukoliko iznos ovog poreza mora biti ukljucen u osnovicu pre " +"izračuna sledećeg poreza." #. module: account #: model:ir.ui.menu,name:account.menu_finance_periodical_processing @@ -569,7 +571,7 @@ msgstr "Red" #. module: account #: rml:account.analytic.account.cost_ledger:0 msgid "J.C. or Move name" -msgstr "" +msgstr "J.C. ili pomeri ime" #. module: account #: selection:account.tax,applicable_type:0 @@ -589,7 +591,7 @@ msgstr "" #. module: account #: model:ir.model,name:account.model_account_tax msgid "account.tax" -msgstr "" +msgstr "account.tax" #. module: account #: rml:account.central.journal:0 @@ -599,13 +601,13 @@ msgstr "Datum štampe" #. module: account #: rml:account.general.ledger:0 msgid "Mvt" -msgstr "" +msgstr "Mvt" #. module: account #: model:ir.actions.wizard,name:account.wizard_aged_trial_balance #: model:ir.ui.menu,name:account.menu_aged_trial_balance msgid "Aged Partner Balance" -msgstr "" +msgstr "Godisnja potraživanja/obaveze partnera" #. module: account #: view:account.journal:0 @@ -618,6 +620,7 @@ msgid "" "The sequence field is used to order the resources from lower sequences to " "higher ones" msgstr "" +"Ovo polje se koristi da se odredi redosled resursa od najnizeg ka najvecem" #. module: account #: wizard_view:account.analytic.account.chart,init:0 @@ -726,12 +729,12 @@ msgstr "Ukupan iznos dugovanja kupca" #. module: account #: view:account.move.line:0 msgid "St." -msgstr "" +msgstr "St." #. module: account #: model:ir.actions.act_window,name:account.action_tax_code_line_open msgid "account.move.line" -msgstr "" +msgstr "account.move.line" #. module: account #: model:process.transition,name:account.process_transition_supplieranalyticcost0 @@ -773,7 +776,7 @@ msgstr "Delimično plaćanje" #. module: account #: wizard_view:account_use_models,create:0 msgid "Move Lines Created." -msgstr "" +msgstr "Kreirani redovi prenosa" #. module: account #: field:account.fiscalyear,state:0 @@ -920,6 +923,8 @@ msgid "" "If a default tax is given in the partner it only overrides taxes from " "accounts (or products) in the same group." msgstr "" +"Ako je dat podrazumevani porez partnera, on samo upisuje poreze iz naloga ( " +"ili proizvoda) iste grupe." #. module: account #: wizard_field:account.open_closed_fiscalyear,init,fyear_id:0 @@ -1024,7 +1029,7 @@ msgstr "Neto Ukupno" #: model:ir.model,name:account.model_account_fiscal_position #: field:res.partner,property_account_position:0 msgid "Fiscal Mapping" -msgstr "" +msgstr "Poreska mapiranja" #. module: account #: field:account.analytic.line,product_uom_id:0 @@ -1167,7 +1172,7 @@ msgstr "Iznos je predstavljen opciono u drugoj valuti" #: view:account.fiscal.position.template:0 #: field:account.fiscal.position.template,name:0 msgid "Fiscal Mapping Template" -msgstr "" +msgstr "Predlozak poreskog mapiranja" #. module: account #: field:account.payment.term,line_ids:0 @@ -1238,7 +1243,7 @@ msgstr "Valuta preduzeca" #. module: account #: model:ir.model,name:account.model_account_fiscal_position_account_template msgid "Template Account Fiscal Mapping" -msgstr "" +msgstr "Predlozak poreskog mapiranja konta" #. module: account #: field:account.analytic.account,parent_id:0 @@ -2023,7 +2028,7 @@ msgstr "Iznos poreza" #. module: account #: rml:account.analytic.account.quantity_cost_ledger:0 msgid "J.C./Move name" -msgstr "" +msgstr "J.C./Pomeri ime" #. module: account #: field:account.journal.period,name:0 @@ -2034,7 +2039,7 @@ msgstr "Naziv dnevnika-razdoblja" #: field:account.tax.code,name:0 #: field:account.tax.code.template,name:0 msgid "Tax Case Name" -msgstr "" +msgstr "Naziv pozicije PDV obrasca" #. module: account #: help:account.journal,entry_posted:0 @@ -2043,6 +2048,9 @@ msgid "" "'draft' state and instead goes directly to the 'posted state' without any " "manual validation." msgstr "" +"Cekirajte ovde ukoliko ne zelite da novi nalog ne prolazi \" pripremni " +"stadijum\" vec zelite da ode u \" zakljuceno stanje\" bez ikakve rucne " +"validacije" #. module: account #: field:account.bank.statement.line,partner_id:0 @@ -2104,7 +2112,7 @@ msgstr "Period početnog stanja" #: model:ir.actions.wizard,name:account.wizard_validate_account_moves_line #: model:ir.ui.menu,name:account.menu_validate_account_moves msgid "Validate Account Moves" -msgstr "" +msgstr "Potvrdi osnovice" #. module: account #: selection:account.subscription,period_type:0 @@ -2375,7 +2383,7 @@ msgstr "Predložak kontnog plana" #. module: account #: model:account.journal,name:account.refund_sales_journal msgid "Journal d'extourne" -msgstr "" +msgstr "Dnevnik povrata" #. module: account #: rml:account.journal.period.print:0 @@ -2469,7 +2477,7 @@ msgstr "Otvori dnevnik" #. module: account #: rml:account.analytic.account.journal:0 msgid "KI" -msgstr "" +msgstr "KI" #. module: account #: model:ir.actions.wizard,name:account.action_account_analytic_line @@ -3151,7 +3159,7 @@ msgstr "Osnova" #. module: account #: field:account.model,name:0 msgid "Model Name" -msgstr "" +msgstr "Naziv modela" #. module: account #: selection:account.account,type:0 @@ -3404,6 +3412,8 @@ msgid "" "This account will be used instead of the default one as the receivable " "account for the current partner" msgstr "" +"Ovaj ce se nalog koristiti umesto podrazumevanog kao prijemni nalog datog " +"partnera" #. module: account #: selection:account.tax,applicable_type:0 @@ -3490,6 +3500,7 @@ msgid "" "The amount expressed in an optional other currency if it is a multi-currency " "entry." msgstr "" +"Iznos troskova u drugoj opcionoj valuti ako je ovo multi-valutni sadrzaj" #. module: account #: field:account.tax,parent_id:0 @@ -3907,6 +3918,8 @@ msgid "" "This account will be used instead of the default one to value outgoing stock " "for the current product" msgstr "" +"Ovaj nalog ce se koristiti umesto podrazumevanog da potvrdi izlazni magacin " +"za dati prozivod" #. module: account #: model:process.node,note:account.process_node_manually0 @@ -4444,6 +4457,9 @@ msgid "" "to the higher ones. The order is important if you have a tax with several " "tax children. In this case, the evaluation order is important." msgstr "" +"Ovo polje se korosti da odredi redosled poreza od najmanjeg do najveceg. " +"Ovaj redosled je vazan ako imate porez sa nekoliko podporeza,\r\n" +"U tom slucaju, evolucioni poredak je jako vazan." #. module: account #: view:account.tax:0 @@ -4510,7 +4526,7 @@ msgstr "Opcione kolicine u stavkama" #: rml:account.third_party_ledger:0 #: rml:account.third_party_ledger_other:0 msgid "JNRL" -msgstr "" +msgstr "JNRL" #. module: account #: view:account.fiscalyear:0 @@ -5265,7 +5281,7 @@ msgstr "Predznak na izveštajima" #. module: account #: help:account.move.line,currency_id:0 msgid "The optional other currency if it is a multi-currency entry." -msgstr "" +msgstr "Opciona druga valuta ako je ovo multi-valutni sadrzaj" #. module: account #: view:account.invoice:0 @@ -5747,6 +5763,8 @@ msgid "" "This account will be used instead of the default one as the payable account " "for the current partner" msgstr "" +"Ovaj nalog ce se koristiti umesto podrazumevanog kao platni nalog za datog " +"partnera" #. module: account #: field:account.tax.code,code:0 @@ -6066,7 +6084,7 @@ msgstr "Dospela potraživanja" #. module: account #: model:ir.module.module,shortdesc:account.module_meta_information msgid "Board for accountant" -msgstr "" +msgstr "Tabla Naloga" #. module: account #: model:ir.actions.act_window,name:account.action_aged_income diff --git a/addons/account/installer.py b/addons/account/installer.py index 65c6738da12..83ddff6065d 100644 --- a/addons/account/installer.py +++ b/addons/account/installer.py @@ -35,19 +35,19 @@ class account_installer(osv.osv_memory): _inherit = 'res.config.installer' def _get_default_accounts(self, cr, uid, context=None): - accounts = [{'acc_name':'Current','account_type':'bank'}, - {'acc_name':'Deposit','account_type':'bank'}, - {'acc_name':'Cash','account_type':'cash'}] + accounts = [{'acc_name': 'Current', 'account_type': 'bank'}, + {'acc_name': 'Deposit', 'account_type': 'bank'}, + {'acc_name': 'Cash', 'account_type': 'cash'}] return accounts def _get_charts(self, cr, uid, context=None): modules = self.pool.get('ir.module.module') - ids = modules.search(cr, uid, [('category_id','=','Account Charts')]) + ids = modules.search(cr, uid, [('category_id', '=', 'Account Charts')], context=context) charts = list( sorted(((m.name, m.shortdesc) for m in modules.browse(cr, uid, ids)), key=itemgetter(1))) - charts.insert(0,('configurable','Generic Chart Of Account')) + charts.insert(0, ('configurable', 'Generic Chart Of Account')) return charts _columns = { @@ -59,7 +59,7 @@ class account_installer(osv.osv_memory): "country."), 'date_start': fields.date('Start Date', required=True), 'date_stop': fields.date('End Date', required=True), - 'period': fields.selection([('month','Monthly'), ('3months','3 Monthly')], 'Periods', required=True), + 'period': fields.selection([('month', 'Monthly'), ('3months','3 Monthly')], 'Periods', required=True), 'bank_accounts_id': fields.one2many('account.bank.accounts.wizard', 'bank_account_id', 'Your Bank and Cash Accounts'), 'sale_tax': fields.float('Sale Tax(%)'), 'purchase_tax': fields.float('Purchase Tax(%)'), @@ -68,28 +68,26 @@ class account_installer(osv.osv_memory): 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 False + return user.company_id and user.company_id.id or False def _get_default_charts(self, cr, uid, context=None): module_name = False company_id = self._default_company(cr, uid, context=context) - company = self.pool.get('res.company').browse(cr, uid, company_id) + company = self.pool.get('res.company').browse(cr, uid, company_id, context=context) address_id = self.pool.get('res.partner').address_get(cr, uid, [company.partner_id.id]) if address_id['default']: - address = self.pool.get('res.partner.address').browse(cr, uid, address_id['default']) + address = self.pool.get('res.partner.address').browse(cr, uid, address_id['default'], context=context) code = address.country_id.code module_name = (code and 'l10n_' + code.lower()) or False if module_name: - module_id = self.pool.get('ir.module.module').search(cr, uid, [('name', '=', module_name)]) + module_id = self.pool.get('ir.module.module').search(cr, uid, [('name', '=', module_name)], context=context) if module_id: return module_name return 'configurable' _defaults = { - 'date_start': lambda *a: time.strftime('%Y-01-01'), - 'date_stop': lambda *a: time.strftime('%Y-12-31'), + 'date_start': time.strftime('%Y-01-01'), + 'date_stop': time.strftime('%Y-12-31'), 'period': 'month', 'sale_tax': 0.0, 'purchase_tax': 0.0, @@ -105,29 +103,37 @@ class account_installer(osv.osv_memory): if start_date: start_date = datetime.datetime.strptime(start_date, "%Y-%m-%d") end_date = (start_date + relativedelta(months=12)) - relativedelta(days=1) - return {'value':{'date_stop':end_date.strftime('%Y-%m-%d')}} + return {'value': {'date_stop': end_date.strftime('%Y-%m-%d')}} return {} def generate_configurable_chart(self, cr, uid, ids, context=None): obj_acc = self.pool.get('account.account') obj_acc_tax = self.pool.get('account.tax') obj_journal = self.pool.get('account.journal') - obj_sequence = self.pool.get('ir.sequence') + obj_acc_tax_code = self.pool.get('account.tax.code') obj_acc_template = self.pool.get('account.account.template') + obj_acc_tax_template = self.pool.get('account.tax.code.template') obj_fiscal_position_template = self.pool.get('account.fiscal.position.template') obj_fiscal_position = self.pool.get('account.fiscal.position') - mod_obj = self.pool.get('ir.model.data') analytic_journal_obj = self.pool.get('account.analytic.journal') + obj_acc_chart_template = self.pool.get('account.chart.template') + obj_acc_journal_view = self.pool.get('account.journal.view') + mod_obj = self.pool.get('ir.model.data') + obj_sequence = self.pool.get('ir.sequence') + property_obj = self.pool.get('ir.property') + fields_obj = self.pool.get('ir.model.fields') + obj_tax_fp = self.pool.get('account.fiscal.position.tax') + obj_ac_fp = self.pool.get('account.fiscal.position.account') result = mod_obj._get_id(cr, uid, 'account', 'configurable_chart_template') - id = mod_obj.read(cr, uid, [result], ['res_id'])[0]['res_id'] - obj_multi = self.pool.get('account.chart.template').browse(cr, uid, id) + id = mod_obj.read(cr, uid, [result], ['res_id'], context=context)[0]['res_id'] + obj_multi = obj_acc_chart_template.browse(cr, uid, id, context=context) record = self.browse(cr, uid, ids, context=context)[0] if context is None: context = {} - company_id = self.browse(cr, uid, ids, context)[0].company_id + company_id = self.browse(cr, uid, ids, context=context)[0].company_id seq_journal = True # Creating Account @@ -141,10 +147,10 @@ class account_installer(osv.osv_memory): todo_dict = {} #create all the tax code - children_tax_code_template = self.pool.get('account.tax.code.template').search(cr, uid, [('parent_id','child_of',[tax_code_root_id])], order='id') + children_tax_code_template = obj_acc_tax_template.search(cr, uid, [('parent_id', 'child_of', [tax_code_root_id])], order='id') children_tax_code_template.sort() - for tax_code_template in self.pool.get('account.tax.code.template').browse(cr, uid, children_tax_code_template): - vals={ + for tax_code_template in obj_acc_tax_template.browse(cr, uid, children_tax_code_template, context=context): + vals = { 'name': (tax_code_root_id == tax_code_template.id) and company_id.name or tax_code_template.name, 'code': tax_code_template.code, 'info': tax_code_template.info, @@ -152,7 +158,7 @@ class account_installer(osv.osv_memory): 'company_id': company_id.id, 'sign': tax_code_template.sign, } - new_tax_code = self.pool.get('account.tax.code').create(cr, uid, vals) + new_tax_code = obj_acc_tax_code.create(cr, uid, vals, context=context) #recording the new tax code to do the mapping tax_code_template_ref[tax_code_template.id] = new_tax_code @@ -160,7 +166,7 @@ class account_installer(osv.osv_memory): for tax in obj_multi.tax_template_ids: #create it vals_tax = { - 'name':tax.name, + 'name': tax.name, 'sequence': tax.sequence, 'amount': tax.amount, 'type': tax.type, @@ -180,11 +186,11 @@ class account_installer(osv.osv_memory): 'ref_base_sign': tax.ref_base_sign, 'ref_tax_sign': tax.ref_tax_sign, 'include_base_amount': tax.include_base_amount, - 'description':tax.description, + 'description': tax.description, 'company_id': company_id.id, 'type_tax_use': tax.type_tax_use } - new_tax = obj_acc_tax.create(cr, uid, vals_tax) + new_tax = obj_acc_tax.create(cr, uid, vals_tax, context=context) #as the accounts have not been created yet, we have to wait before filling these fields todo_dict[new_tax] = { 'account_collected_id': tax.account_collected_id and tax.account_collected_id.id or False, @@ -195,9 +201,9 @@ class account_installer(osv.osv_memory): #deactivate the parent_store functionnality on account_account for rapidity purpose self.pool._init = True - children_acc_template = obj_acc_template.search(cr, uid, [('parent_id','child_of',[obj_acc_root.id]),('nocreate','!=',True)]) + children_acc_template = obj_acc_template.search(cr, uid, [('parent_id', 'child_of', [obj_acc_root.id]), ('nocreate', '!=', True)], context=context) children_acc_template.sort() - for account_template in obj_acc_template.browse(cr, uid, children_acc_template): + for account_template in obj_acc_template.browse(cr, uid, children_acc_template, context=context): tax_ids = [] for tax in account_template.tax_ids: tax_ids.append(tax_template_ref[tax.id]) @@ -206,9 +212,9 @@ class account_installer(osv.osv_memory): dig = 6 code_main = account_template.code and len(account_template.code) or 0 code_acc = account_template.code or '' - if code_main>0 and code_main<=dig and account_template.type != 'view': - code_acc=str(code_acc) + (str('0'*(dig-code_main))) - vals={ + if code_main > 0 and code_main <= dig and account_template.type != 'view': + code_acc = str(code_acc) + (str('0'*(dig-code_main))) + vals = { 'name': (obj_acc_root.id == account_template.id) and company_id.name or account_template.name, #'sign': account_template.sign, 'currency_id': account_template.currency_id and account_template.currency_id.id or False, @@ -222,10 +228,10 @@ class account_installer(osv.osv_memory): 'tax_ids': [(6, 0, tax_ids)], 'company_id': company_id.id, } - new_account = obj_acc.create(cr, uid, vals) + new_account = obj_acc.create(cr, uid, vals, context=context) acc_template_ref[account_template.id] = new_account if account_template.name == 'Bank Current Account': - b_vals={ + b_vals = { 'name': 'Bank Accounts', 'code': '110500', 'type': 'view', @@ -236,47 +242,52 @@ class account_installer(osv.osv_memory): 'tax_ids': [(6,0,tax_ids)], 'company_id': company_id.id, } - bank_account = obj_acc.create(cr, uid, b_vals) + bank_account = obj_acc.create(cr, uid, b_vals, context=context) - view_id_cash = self.pool.get('account.journal.view').search(cr, uid, [('name', '=', 'Bank/Cash Journal View')])[0] #why fixed name here? - view_id_cur = self.pool.get('account.journal.view').search(cr, uid, [('name', '=', 'Bank/Cash Journal (Multi-Currency) View')])[0] #Why Fixed name here? + view_id_cash = obj_acc_journal_view.search(cr, uid, [('name', '=', 'Bank/Cash Journal View')], context=context)[0] #why fixed name here? + view_id_cur = obj_acc_journal_view.search(cr, uid, [('name', '=', 'Bank/Cash Journal (Multi-Currency) View')], context=context)[0] #Why Fixed name here? cash_result = mod_obj._get_id(cr, uid, 'account', 'conf_account_type_cash') - cash_type_id = mod_obj.read(cr, uid, [cash_result], ['res_id'])[0]['res_id'] + cash_type_id = mod_obj.read(cr, uid, [cash_result], ['res_id'], context=context)[0]['res_id'] bank_result = mod_obj._get_id(cr, uid, 'account', 'conf_account_type_bnk') - bank_type_id = mod_obj.read(cr, uid, [bank_result], ['res_id'])[0]['res_id'] + bank_type_id = mod_obj.read(cr, uid, [bank_result], ['res_id'], context=context)[0]['res_id'] check_result = mod_obj._get_id(cr, uid, 'account', 'conf_account_type_chk') - check_type_id = mod_obj.read(cr, uid, [check_result], ['res_id'])[0]['res_id'] + check_type_id = mod_obj.read(cr, uid, [check_result], ['res_id'], context=context)[0]['res_id'] # record = self.browse(cr, uid, ids, context=context)[0] code_cnt = 1 vals_seq = { - 'name': _('Bank Journal '), - 'code': 'account.journal', - 'prefix': 'BNK/%(year)s/', - 'padding': 5 - } - seq_id = obj_sequence.create(cr, uid, vals_seq) + 'name': _('Bank Journal '), + 'code': 'account.journal', + 'prefix': 'BNK/%(year)s/', + 'padding': 5 + } + seq_id = obj_sequence.create(cr, uid, vals_seq, context=context) #create the bank journals - analitical_bank_ids = analytic_journal_obj.search(cr, uid, [('type','=','situation')]) + analitical_bank_ids = analytic_journal_obj.search(cr, uid, [('type', '=', 'situation')], context=context) analitical_journal_bank = analitical_bank_ids and analitical_bank_ids[0] or False - vals_journal = {} - vals_journal['name'] = _('Bank Journal ') - vals_journal['code'] = _('BNK') - vals_journal['sequence_id'] = seq_id - vals_journal['type'] = 'bank' - vals_journal['analytic_journal_id'] = analitical_journal_bank + vals_journal = { + 'name': _('Bank Journal '), + 'code': _('BNK'), + 'sequence_id': seq_id, + 'type': 'bank', + 'analytic_journal_id': analitical_journal_bank + } if vals.get('currency_id', False): - vals_journal['view_id'] = view_id_cur - vals_journal['currency'] = vals.get('currency_id', False) + vals_journal.update({ + 'view_id': view_id_cur, + 'currency': vals.get('currency_id', False) + }) else: - vals_journal['view_id'] = view_id_cash - vals_journal['default_credit_account_id'] = new_account - vals_journal['default_debit_account_id'] = new_account - obj_journal.create(cr, uid, vals_journal) + vals_journal.update({'view_id': view_id_cash}) + vals_journal.update({ + 'default_credit_account_id': new_account, + 'default_debit_account_id': new_account, + }) + obj_journal.create(cr, uid, vals_journal, context=context) for val in record.bank_accounts_id: seq_padding = 5 @@ -290,44 +301,52 @@ class account_installer(osv.osv_memory): type = check_type_id seq_padding = None - vals_bnk = {'name': val.acc_name or '', + vals_bnk = { + 'name': val.acc_name or '', 'currency_id': val.currency_id.id or False, 'code': str(110500 + code_cnt), 'type': 'liquidity', 'user_type': type, - 'parent_id':bank_account, - 'company_id': company_id.id } - child_bnk_acc = obj_acc.create(cr, uid, vals_bnk) + 'parent_id': bank_account, + 'company_id': company_id.id + } + child_bnk_acc = obj_acc.create(cr, uid, vals_bnk, context=context) vals_seq_child = { 'name': _(vals_bnk['name'] + ' ' + 'Journal'), 'code': 'account.journal', 'prefix': _((vals_bnk['name'][:3].upper()) + '/%(year)s/'), 'padding': seq_padding - } - seq_id = obj_sequence.create(cr, uid, vals_seq_child) + } + seq_id = obj_sequence.create(cr, uid, vals_seq_child, context=context) #create the bank journal vals_journal = {} - vals_journal['name'] = vals_bnk['name'] + ' Journal' - vals_journal['code'] = _(vals_bnk['name'][:3]).upper() - vals_journal['sequence_id'] = seq_id - vals_journal['type'] = 'cash' + vals_journal = { + 'name': vals_bnk['name'] + _(' Journal'), + 'code': _(vals_bnk['name'][:3]).upper(), + 'sequence_id': seq_id, + 'type': 'cash', + } if vals.get('currency_id', False): - vals_journal['view_id'] = view_id_cur - vals_journal['currency'] = vals_bnk.get('currency_id', False) + vals_journal.update({ + 'view_id': view_id_cur, + 'currency': vals_bnk.get('currency_id', False), + }) else: - vals_journal['view_id'] = view_id_cash - vals_journal['default_credit_account_id'] = child_bnk_acc - vals_journal['default_debit_account_id'] = child_bnk_acc - vals_journal['analytic_journal_id'] = analitical_journal_bank - obj_journal.create(cr,uid,vals_journal) + vals_journal.update({'view_id': view_id_cash}) + vals_journal.update({ + 'default_credit_account_id': child_bnk_acc, + 'default_debit_account_id': child_bnk_acc, + 'analytic_journal_id': analitical_journal_bank + }) + obj_journal.create(cr, uid, vals_journal, context=context) code_cnt += 1 #reactivate the parent_store functionality on account_account self.pool._init = False - self.pool.get('account.account')._parent_store_compute(cr) + obj_acc._parent_store_compute(cr) - for key,value in todo_dict.items(): + for key, value in todo_dict.items(): if value['account_collected_id'] or value['account_paid_id']: obj_acc_tax.write(cr, uid, [key], { 'account_collected_id': acc_template_ref[value['account_collected_id']], @@ -335,42 +354,41 @@ class account_installer(osv.osv_memory): }) # Creating Journals Sales and Purchase - vals_journal={} - data_id = mod_obj.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_sp_journal_view')]) - data = mod_obj.browse(cr, uid, data_id[0]) + vals_journal = {} + data_id = mod_obj.search(cr, uid, [('model', '=', 'account.journal.view'), ('name', '=', 'account_sp_journal_view')], context=context) + data = mod_obj.browse(cr, uid, data_id[0], context=context) view_id = data.res_id - - seq_id = obj_sequence.search(cr,uid,[('name','=','Account Journal')])[0] + seq_id = obj_sequence.search(cr,uid,[('name', '=', 'Account Journal')], context=context)[0] if seq_journal: seq_sale = { - 'name': 'Sale Journal', - 'code': 'account.journal', - 'prefix': 'SAJ/%(year)s/', - 'padding': 3 - } - seq_id_sale = obj_sequence.create(cr, uid, seq_sale) + 'name': 'Sale Journal', + 'code': 'account.journal', + 'prefix': 'SAJ/%(year)s/', + 'padding': 3 + } + seq_id_sale = obj_sequence.create(cr, uid, seq_sale, context=context) seq_purchase = { - 'name': 'Purchase Journal', - 'code': 'account.journal', - 'prefix': 'EXJ/%(year)s/', - 'padding': 3 - } - seq_id_purchase = obj_sequence.create(cr, uid, seq_purchase) + 'name': 'Purchase Journal', + 'code': 'account.journal', + 'prefix': 'EXJ/%(year)s/', + 'padding': 3 + } + seq_id_purchase = obj_sequence.create(cr, uid, seq_purchase, context=context) seq_refund_sale = { - 'name': 'Sales Refund Journal', - 'code': 'account.journal', - 'prefix': 'SCNJ/%(year)s/', - 'padding': 3 - } - seq_id_sale_refund = obj_sequence.create(cr, uid, seq_refund_sale) + 'name': 'Sales Refund Journal', + 'code': 'account.journal', + 'prefix': 'SCNJ/%(year)s/', + 'padding': 3 + } + seq_id_sale_refund = obj_sequence.create(cr, uid, seq_refund_sale, context=context) seq_refund_purchase = { - 'name': 'Purchase Refund Journal', - 'code': 'account.journal', - 'prefix': 'ECNJ/%(year)s/', - 'padding': 3 - } - seq_id_purchase_refund = obj_sequence.create(cr, uid, seq_refund_purchase) + 'name': 'Purchase Refund Journal', + 'code': 'account.journal', + 'prefix': 'ECNJ/%(year)s/', + 'padding': 3 + } + seq_id_purchase_refund = obj_sequence.create(cr, uid, seq_refund_purchase, context=context) else: seq_id_sale = seq_id seq_id_purchase = seq_id @@ -380,83 +398,90 @@ class account_installer(osv.osv_memory): vals_journal['view_id'] = view_id #Sales Journal - analitical_sale_ids = analytic_journal_obj.search(cr,uid,[('type','=','sale')]) + analitical_sale_ids = analytic_journal_obj.search(cr, uid, [('type','=','sale')], context=context) analitical_journal_sale = analitical_sale_ids and analitical_sale_ids[0] or False - vals_journal['name'] = _('Sales Journal') - vals_journal['type'] = 'sale' - vals_journal['code'] = _('SAJ') - vals_journal['sequence_id'] = seq_id_sale - vals_journal['analytic_journal_id'] = analitical_journal_sale - + vals_journal.update({ + 'name': _('Sales Journal'), + 'type': 'sale', + 'code': _('SAJ'), + 'sequence_id': seq_id_sale, + 'analytic_journal_id': analitical_journal_sale + }) if obj_multi.property_account_receivable: - vals_journal['default_credit_account_id'] = acc_template_ref[obj_multi.property_account_income_categ.id] - vals_journal['default_debit_account_id'] = acc_template_ref[obj_multi.property_account_income_categ.id] - - obj_journal.create(cr,uid,vals_journal) + vals_journal.update({ + 'default_credit_account_id': acc_template_ref[obj_multi.property_account_income_categ.id], + 'default_debit_account_id': acc_template_ref[obj_multi.property_account_income_categ.id], + }) + obj_journal.create(cr, uid, vals_journal, context=context) # Purchase Journal - analitical_purchase_ids = analytic_journal_obj.search(cr, uid, [('type','=','purchase')]) + analitical_purchase_ids = analytic_journal_obj.search(cr, uid, [('type', '=', 'purchase')], context=context) analitical_journal_purchase = analitical_purchase_ids and analitical_purchase_ids[0] or False - vals_journal['name'] = _('Purchase Journal') - vals_journal['type'] = 'purchase' - vals_journal['code'] = _('EXJ') - vals_journal['sequence_id'] = seq_id_purchase - vals_journal['analytic_journal_id'] = analitical_journal_purchase + vals_journal.update({ + 'name': _('Purchase Journal'), + 'type': 'purchase', + 'code': _('EXJ'), + 'sequence_id': seq_id_purchase, + 'analytic_journal_id': analitical_journal_purchase + }) if obj_multi.property_account_payable: - vals_journal['default_credit_account_id'] = acc_template_ref[obj_multi.property_account_expense_categ.id] - vals_journal['default_debit_account_id'] = acc_template_ref[obj_multi.property_account_expense_categ.id] - - obj_journal.create(cr,uid,vals_journal) + vals_journal.update({ + 'default_credit_account_id': acc_template_ref[obj_multi.property_account_expense_categ.id], + 'default_debit_account_id': acc_template_ref[obj_multi.property_account_expense_categ.id] + }) + obj_journal.create(cr, uid, vals_journal, context=context) # Creating Journals Sales Refund and Purchase Refund - vals_journal={} - data_id = mod_obj.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_sp_refund_journal_view')]) - data = mod_obj.browse(cr, uid, data_id[0]) + vals_journal = {} + data_id = mod_obj.search(cr, uid, [('model', '=', 'account.journal.view'), ('name', '=', 'account_sp_refund_journal_view')], context=context) + data = mod_obj.browse(cr, uid, data_id[0], context=context) view_id = data.res_id - vals_journal['view_id'] = view_id - #Sales Refund Journal - vals_journal['name'] = _('Sales Refund Journal') - vals_journal['type'] = 'sale_refund' - vals_journal['refund_journal'] = True - vals_journal['code'] = _('SCNJ') - vals_journal['sequence_id'] = seq_id_sale_refund - vals_journal['analytic_journal_id'] = analitical_journal_sale - + vals_journal = { + 'view_id': view_id, + 'name': _('Sales Refund Journal'), + 'type': 'sale_refund', + 'refund_journal': True, + 'code': _('SCNJ'), + 'sequence_id': seq_id_sale_refund, + 'analytic_journal_id': analitical_journal_sale + } if obj_multi.property_account_receivable: - vals_journal['default_credit_account_id'] = acc_template_ref[obj_multi.property_account_income_categ.id] - vals_journal['default_debit_account_id'] = acc_template_ref[obj_multi.property_account_income_categ.id] + vals_journal.update({ + 'default_credit_account_id': acc_template_ref[obj_multi.property_account_income_categ.id], + 'default_debit_account_id': acc_template_ref[obj_multi.property_account_income_categ.id] + }) - obj_journal.create(cr,uid,vals_journal) + obj_journal.create(cr, uid, vals_journal, context=context) # Purchase Refund Journal - vals_journal['name'] = _('Purchase Refund Journal') - vals_journal['type'] = 'purchase_refund' - vals_journal['refund_journal'] = True - vals_journal['code'] = _('ECNJ') - vals_journal['sequence_id'] = seq_id_purchase_refund - vals_journal['analytic_journal_id'] = analitical_journal_purchase + vals_journal = { + 'view_id': view_id, + 'name': _('Purchase Refund Journal'), + 'type': 'purchase_refund', + 'refund_journal': True, + 'code': _('ECNJ'), + 'sequence_id': seq_id_purchase_refund, + 'analytic_journal_id': analitical_journal_purchase + } if obj_multi.property_account_payable: - vals_journal['default_credit_account_id'] = acc_template_ref[obj_multi.property_account_expense_categ.id] - vals_journal['default_debit_account_id'] = acc_template_ref[obj_multi.property_account_expense_categ.id] - - obj_journal.create(cr, uid, vals_journal) + vals_journal.update({ + 'default_credit_account_id': acc_template_ref[obj_multi.property_account_expense_categ.id], + 'default_debit_account_id': acc_template_ref[obj_multi.property_account_expense_categ.id] + }) + obj_journal.create(cr, uid, vals_journal, context=context) # Bank Journals - view_id_cash = self.pool.get('account.journal.view').search(cr, uid, [('name','=','Bank/Cash Journal View')])[0] #TOFIX: Why put fixed name ? - view_id_cur = self.pool.get('account.journal.view').search(cr, uid, [('name','=','Bank/Cash Journal (Multi-Currency) View')])[0] #TOFIX: why put fixed name? - + view_id_cash = obj_acc_journal_view.search(cr, uid, [('name', '=', 'Bank/Cash Journal View')], context=context)[0] #TOFIX: Why put fixed name ? + view_id_cur = obj_acc_journal_view.search(cr, uid, [('name', '=', 'Bank/Cash Journal (Multi-Currency) View')], context=context)[0] #TOFIX: why put fixed name? #create the properties - property_obj = self.pool.get('ir.property') - fields_obj = self.pool.get('ir.model.fields') - todo_list = [ ('property_account_receivable', 'res.partner', 'account.account'), ('property_account_payable', 'res.partner', 'account.account'), @@ -469,52 +494,45 @@ class account_installer(osv.osv_memory): for record in todo_list: r = [] - r = property_obj.search(cr, uid, [('name', '=', record[0]), ('company_id', '=', company_id.id)]) + r = property_obj.search(cr, uid, [('name', '=', record[0]), ('company_id', '=', company_id.id)], context=context) account = getattr(obj_multi, record[0]) - field = fields_obj.search(cr, uid, [('name', '=', record[0]), ('model', '=', record[1]), ('relation', '=', record[2])]) + field = fields_obj.search(cr, uid, [('name', '=', record[0]), ('model', '=', record[1]), ('relation', '=', record[2])], context=context) vals = { 'name': record[0], 'company_id': company_id.id, 'fields_id': field[0], - 'value': account and 'account.account,'+str(acc_template_ref[account.id]) or False, + '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) + property_obj.write(cr, uid, r, vals, context=context) else: #create the property - property_obj.create(cr, uid, vals) - - fp_ids = obj_fiscal_position_template.search(cr, uid,[('chart_template_id', '=', obj_multi.id)]) + property_obj.create(cr, uid, vals, context=context) + fp_ids = obj_fiscal_position_template.search(cr, uid, [('chart_template_id', '=', obj_multi.id)], context=context) if fp_ids: - for position in obj_fiscal_position_template.browse(cr, uid, fp_ids): - + for position in obj_fiscal_position_template.browse(cr, uid, fp_ids, context=context): vals_fp = { - 'company_id': company_id.id, - 'name': position.name, - } - new_fp = obj_fiscal_position.create(cr, uid, vals_fp) - - obj_tax_fp = self.pool.get('account.fiscal.position.tax') - obj_ac_fp = self.pool.get('account.fiscal.position.account') - + 'company_id': company_id.id, + 'name': position.name, + } + new_fp = obj_fiscal_position.create(cr, uid, vals_fp, context=context) for tax in position.tax_ids: vals_tax = { - 'tax_src_id': tax_template_ref[tax.tax_src_id.id], - 'tax_dest_id': tax.tax_dest_id and tax_template_ref[tax.tax_dest_id.id] or False, - 'position_id': new_fp, - } - obj_tax_fp.create(cr, uid, vals_tax) + 'tax_src_id': tax_template_ref[tax.tax_src_id.id], + 'tax_dest_id': tax.tax_dest_id and tax_template_ref[tax.tax_dest_id.id] or False, + 'position_id': new_fp, + } + obj_tax_fp.create(cr, uid, vals_tax, context=context) for acc in position.account_ids: vals_acc = { - 'account_src_id': acc_template_ref[acc.account_src_id.id], - 'account_dest_id': acc_template_ref[acc.account_dest_id.id], - 'position_id': new_fp, - } - obj_ac_fp.create(cr, uid, vals_acc) + 'account_src_id': acc_template_ref[acc.account_src_id.id], + 'account_dest_id': acc_template_ref[acc.account_dest_id.id], + 'position_id': new_fp, + } + obj_ac_fp.create(cr, uid, vals_acc, context=context) def execute(self, cr, uid, ids, context=None): if context is None: @@ -524,58 +542,58 @@ class account_installer(osv.osv_memory): obj_acc = self.pool.get('account.account') obj_tax_code = self.pool.get('account.tax.code') obj_temp_tax_code = self.pool.get('account.tax.code.template') + obj_tax = self.pool.get('account.tax') + obj_product = self.pool.get('product.product') + ir_values = self.pool.get('ir.values') super(account_installer, self).execute(cr, uid, ids, context=context) record = self.browse(cr, uid, ids, context=context)[0] company_id = record.company_id - for res in self.read(cr, uid, ids): + for res in self.read(cr, uid, ids, context=context): if record.charts == 'configurable': - fp = tools.file_open(opj('account','configurable_account_chart.xml')) - tools.convert_xml_import(cr, 'account', fp, {}, 'init',True, None) + fp = tools.file_open(opj('account', 'configurable_account_chart.xml')) + tools.convert_xml_import(cr, 'account', fp, {}, 'init', True, None) fp.close() self.generate_configurable_chart(cr, uid, ids, context=context) - obj_tax = self.pool.get('account.tax') - obj_product = self.pool.get('product.product') - ir_values = self.pool.get('ir.values') s_tax = (res.get('sale_tax', 0.0))/100 p_tax = (res.get('purchase_tax', 0.0))/100 tax_val = {} default_tax = [] pur_temp_tax = mod_obj._get_id(cr, uid, 'account', 'tax_code_base_purchases') - pur_temp_tax_id = mod_obj.read(cr, uid, [pur_temp_tax], ['res_id'])[0]['res_id'] - pur_temp_tax_names = obj_temp_tax_code.read(cr, uid, [pur_temp_tax_id], ['name']) + pur_temp_tax_id = mod_obj.read(cr, uid, [pur_temp_tax], ['res_id'], context=context)[0]['res_id'] + pur_temp_tax_names = obj_temp_tax_code.read(cr, uid, [pur_temp_tax_id], ['name'], context=context) pur_tax_parent_name = pur_temp_tax_names and pur_temp_tax_names[0]['name'] or False - pur_taxcode_parent_id = obj_tax_code.search(cr, uid, [('name', 'ilike', pur_tax_parent_name)]) + pur_taxcode_parent_id = obj_tax_code.search(cr, uid, [('name', 'ilike', pur_tax_parent_name)], context=context) if pur_taxcode_parent_id: pur_taxcode_parent_id = pur_taxcode_parent_id[0] else: pur_taxcode_parent_id = False pur_temp_tax_paid = mod_obj._get_id(cr, uid, 'account', 'tax_code_input') - pur_temp_tax_paid_id = mod_obj.read(cr, uid, [pur_temp_tax_paid], ['res_id'])[0]['res_id'] - pur_temp_tax_paid_names = obj_temp_tax_code.read(cr, uid, [pur_temp_tax_paid_id], ['name']) + pur_temp_tax_paid_id = mod_obj.read(cr, uid, [pur_temp_tax_paid], ['res_id'], context=context)[0]['res_id'] + pur_temp_tax_paid_names = obj_temp_tax_code.read(cr, uid, [pur_temp_tax_paid_id], ['name'], context=context) pur_tax_paid_parent_name = pur_temp_tax_names and pur_temp_tax_paid_names[0]['name'] or False - pur_taxcode_paid_parent_id = obj_tax_code.search(cr, uid, [('name', 'ilike', pur_tax_paid_parent_name)]) + pur_taxcode_paid_parent_id = obj_tax_code.search(cr, uid, [('name', 'ilike', pur_tax_paid_parent_name)], context=context) if pur_taxcode_paid_parent_id: pur_taxcode_paid_parent_id = pur_taxcode_paid_parent_id[0] else: pur_taxcode_paid_parent_id = False sale_temp_tax = mod_obj._get_id(cr, uid, 'account', 'tax_code_base_sales') - sale_temp_tax_id = mod_obj.read(cr, uid, [sale_temp_tax], ['res_id'])[0]['res_id'] - sale_temp_tax_names = obj_temp_tax_code.read(cr, uid, [sale_temp_tax_id], ['name']) + sale_temp_tax_id = mod_obj.read(cr, uid, [sale_temp_tax], ['res_id'], context=context)[0]['res_id'] + sale_temp_tax_names = obj_temp_tax_code.read(cr, uid, [sale_temp_tax_id], ['name'], context=context) sale_tax_parent_name = sale_temp_tax_names and sale_temp_tax_names[0]['name'] or False - sale_taxcode_parent_id = obj_tax_code.search(cr, uid, [('name', 'ilike', sale_tax_parent_name)]) + sale_taxcode_parent_id = obj_tax_code.search(cr, uid, [('name', 'ilike', sale_tax_parent_name)], context=context) if sale_taxcode_parent_id: sale_taxcode_parent_id = sale_taxcode_parent_id[0] else: sale_taxcode_parent_id = False sale_temp_tax_paid = mod_obj._get_id(cr, uid, 'account', 'tax_code_output') - sale_temp_tax_paid_id = mod_obj.read(cr, uid, [sale_temp_tax_paid], ['res_id'])[0]['res_id'] - sale_temp_tax_paid_names = obj_temp_tax_code.read(cr, uid, [sale_temp_tax_paid_id], ['name']) + sale_temp_tax_paid_id = mod_obj.read(cr, uid, [sale_temp_tax_paid], ['res_id'], context=context)[0]['res_id'] + sale_temp_tax_paid_names = obj_temp_tax_code.read(cr, uid, [sale_temp_tax_paid_id], ['name'], context=context) sale_tax_paid_parent_name = sale_temp_tax_paid_names and sale_temp_tax_paid_names[0]['name'] or False - sale_taxcode_paid_parent_id = obj_tax_code.search(cr, uid, [('name', 'ilike', sale_tax_paid_parent_name)]) + sale_taxcode_paid_parent_id = obj_tax_code.search(cr, uid, [('name', 'ilike', sale_tax_paid_parent_name)], context=context) if sale_taxcode_paid_parent_id: sale_taxcode_paid_parent_id = sale_taxcode_paid_parent_id[0] else: @@ -590,8 +608,8 @@ class account_installer(osv.osv_memory): 'company_id': company_id.id, 'sign': 1, 'parent_id': sale_taxcode_parent_id - } - new_tax_code = self.pool.get('account.tax.code').create(cr, uid, vals_tax_code) + } + new_tax_code = obj_tax_code.create(cr, uid, vals_tax_code, context=context) vals_paid_tax_code = { 'name': 'TAX Received %s%%'%(s_tax*100), @@ -600,20 +618,20 @@ class account_installer(osv.osv_memory): 'sign': 1, 'parent_id': sale_taxcode_paid_parent_id } - new_paid_tax_code = self.pool.get('account.tax.code').create(cr, uid, vals_paid_tax_code) + new_paid_tax_code = obj_tax_code.create(cr, uid, vals_paid_tax_code, context=context) sales_tax = obj_tax.create(cr, uid, - {'name':'TAX %s%%'%(s_tax*100), - 'amount':s_tax, - 'base_code_id':new_tax_code, - 'tax_code_id':new_paid_tax_code, - 'type_tax_use':'sale', - 'account_collected_id':sales_tax_account_id, - 'account_paid_id':sales_tax_account_id - }) - default_account_ids = obj_acc.search(cr, uid, [('name', '=', 'Product Sales')],context=context) + {'name': 'TAX %s%%'%(s_tax*100), + 'amount': s_tax, + 'base_code_id': new_tax_code, + 'tax_code_id': new_paid_tax_code, + 'type_tax_use': 'sale', + 'account_collected_id': sales_tax_account_id, + 'account_paid_id': sales_tax_account_id + }, context=context) + default_account_ids = obj_acc.search(cr, uid, [('name', '=', 'Product Sales')], context=context) if default_account_ids: - obj_acc.write(cr, uid, default_account_ids, {'tax_ids': [(6, 0, [sales_tax])]}) + obj_acc.write(cr, uid, default_account_ids, {'tax_ids': [(6, 0, [sales_tax])]}, context=context) tax_val.update({'taxes_id': [(6, 0, [sales_tax])]}) default_tax.append(('taxes_id', sales_tax)) if p_tax*100 > 0.0: @@ -626,8 +644,7 @@ class account_installer(osv.osv_memory): 'sign': 1, 'parent_id': pur_taxcode_parent_id } - new_tax_code = self.pool.get('account.tax.code').create(cr, uid, vals_tax_code) - + new_tax_code = obj_tax_code.create(cr, uid, vals_tax_code, context=context) vals_paid_tax_code = { 'name': 'TAX Paid %s%%'%(p_tax*100), 'code': 'TAX Paid %s%%'%(p_tax*100), @@ -635,7 +652,7 @@ class account_installer(osv.osv_memory): 'sign': 1, 'parent_id': pur_taxcode_paid_parent_id } - new_paid_tax_code = self.pool.get('account.tax.code').create(cr, uid, vals_paid_tax_code) + new_paid_tax_code = obj_tax_code.create(cr, uid, vals_paid_tax_code, context=context) purchase_tax = obj_tax.create(cr, uid, {'name': 'TAX%s%%'%(p_tax*100), @@ -646,32 +663,33 @@ class account_installer(osv.osv_memory): 'type_tax_use': 'purchase', 'account_collected_id': purchase_tax_account_id, 'account_paid_id': purchase_tax_account_id - }) + }, context=context) default_account_ids = obj_acc.search(cr, uid, [('name', '=', 'Expenses')], context=context) if default_account_ids: - obj_acc.write(cr, uid, default_account_ids, {'tax_ids': [(6, 0, [purchase_tax])]}) + obj_acc.write(cr, uid, default_account_ids, {'tax_ids': [(6, 0, [purchase_tax])]}, context=context) tax_val.update({'supplier_taxes_id': [(6 ,0, [purchase_tax])]}) default_tax.append(('supplier_taxes_id', purchase_tax)) if tax_val: - product_ids = obj_product.search(cr, uid, []) - for product in obj_product.browse(cr, uid, product_ids): - obj_product.write(cr, uid, product.id, tax_val) + product_ids = obj_product.search(cr, uid, [], context=context) + for product in obj_product.browse(cr, uid, product_ids, context=context): + obj_product.write(cr, uid, product.id, tax_val, context=context) for name, value in default_tax: - ir_values.set(cr, uid, key='default', key2=False, name=name, models =[('product.product',False)], value=[value]) + ir_values.set(cr, uid, key='default', key2=False, name=name, models =[('product.product', False)], value=[value]) if 'date_start' in res and 'date_stop' in res: - f_ids = fy_obj.search(cr, uid, [('date_start', '<=', res['date_start']), ('date_stop', '>=', res['date_stop']), ('company_id', '=', res['company_id'])]) + f_ids = fy_obj.search(cr, uid, [('date_start', '<=', res['date_start']), ('date_stop', '>=', res['date_stop']), ('company_id', '=', res['company_id'])], context=context) if not f_ids: name = code = res['date_start'][:4] if int(name) != int(res['date_stop'][:4]): name = res['date_start'][:4] +'-'+ res['date_stop'][:4] code = res['date_start'][2:4] +'-'+ res['date_stop'][2:4] - vals = {'name': name, - 'code': code, - 'date_start': res['date_start'], - 'date_stop': res['date_stop'], - 'company_id': res['company_id'] - } + vals = { + 'name': name, + 'code': code, + 'date_start': res['date_start'], + 'date_stop': res['date_stop'], + 'company_id': res['company_id'] + } fiscal_id = fy_obj.create(cr, uid, vals, context=context) if res['period'] == 'month': fy_obj.create_period(cr, uid, [fiscal_id]) @@ -698,11 +716,8 @@ class account_bank_accounts_wizard(osv.osv_memory): 'acc_name': fields.char('Account Name.', size=64, required=True), 'bank_account_id': fields.many2one('account.installer', 'Bank Account', required=True), 'currency_id': fields.many2one('res.currency', 'Secondary Currency', help="Forces all moves for this account to have this secondary currency."), - 'account_type': fields.selection([('cash','Cash'),('check','Check'),('bank','Bank')], 'Account Type', size=32), + 'account_type': fields.selection([('cash','Cash'), ('check','Check'), ('bank','Bank')], 'Account Type', size=32), } -# _defaults = { -# 'currency_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.currency_id.id, -# } account_bank_accounts_wizard() @@ -710,7 +725,6 @@ class account_installer_modules(osv.osv_memory): _name = 'account.installer.modules' _inherit = 'res.config.installer' _columns = { - # Accounting 'account_analytic_plans': fields.boolean('Multiple Analytic Plans', help="Allows invoice lines to impact multiple analytic accounts " "simultaneously."), @@ -727,9 +741,6 @@ class account_installer_modules(osv.osv_memory): 'account_anglo_saxon': fields.boolean('Anglo-Saxon Accounting', help="This module will support the Anglo-Saxons accounting methodology by " "changing the accounting logic with stock transactions."), -# 'account_voucher_payment':fields.boolean('Voucher and Reconcile Management', -# help="Extension Account Voucher module includes allows to link payment / receipt " -# "entries with voucher, also automatically reconcile during the payment and receipt entries."), } _defaults = { @@ -738,4 +749,4 @@ class account_installer_modules(osv.osv_memory): account_installer_modules() -# 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/invoice.py b/addons/account/invoice.py index dbac0fdd745..44ebafb9bbd 100644 --- a/addons/account/invoice.py +++ b/addons/account/invoice.py @@ -24,8 +24,8 @@ from lxml import etree import decimal_precision as dp import netsvc -from osv import fields, osv, orm import pooler +from osv import fields, osv, orm from tools.translate import _ class account_invoice(osv.osv): @@ -57,17 +57,13 @@ class account_invoice(osv.osv): ('company_id', '=', company_id), ('refund_journal', '=', refund_journal.get(type_inv, False))], limit=1) - if res: - return res[0] - else: - return False + return res and res[0] or False def _get_currency(self, cr, uid, context=None): user = pooler.get_pool(cr.dbname).get('res.users').browse(cr, uid, [uid])[0] if user.company_id: return user.company_id.currency_id.id - else: - return pooler.get_pool(cr.dbname).get('res.currency').search(cr, uid, [('rate','=',1.0)])[0] + return pooler.get_pool(cr.dbname).get('res.currency').search(cr, uid, [('rate','=', 1.0)])[0] def _get_journal_analytic(self, cr, uid, type_inv, context=None): type2journal = {'out_invoice': 'sale', 'in_invoice': 'purchase', 'out_refund': 'sale', 'in_refund': 'purchase'} @@ -134,7 +130,6 @@ class account_invoice(osv.osv): result = inv.amount_total - amount # Use is_zero function to avoid rounding trouble => should be fixed into ORM res[inv.id] = not self.pool.get('res.currency').is_zero(cr, uid, inv.company_id.currency_id, result) and result or 0.0 - return res # Give Journal Items related to the payment reconciled to this invoice @@ -359,12 +354,26 @@ class account_invoice(osv.osv): res['arch'] = etree.tostring(doc) return res + def get_log_context(self, cr, uid, context=None): + if context is None: + context = {} + mob_obj = self.pool.get('ir.model.data') + res = mob_obj.get_object_reference(cr, uid, 'account', 'invoice_form') or False + view_id = res and res[1] or False + context.update({'view_id': view_id}) + return context + def create(self, cr, uid, vals, context=None): + if context is None: + context = {} try: res = super(account_invoice, self).create(cr, uid, vals, context) for inv_id, name in self.name_get(cr, uid, [res], context=context): + ctx = context.copy() + if vals.get('type', 'in_invoice') in ('out_invoice', 'out_refund'): + ctx = self.get_log_context(cr, uid, context=ctx) message = _("Invoice '%s' is waiting for validation.") % name - self.log(cr, uid, inv_id, message) + self.log(cr, uid, inv_id, message, context=ctx) return res except Exception, e: if '"journal_id" viol' in e.args[0]: @@ -491,7 +500,6 @@ class account_invoice(osv.osv): res = {'value':{'date_due': pterm_list[-1]}} else: raise osv.except_osv(_('Data Insufficient !'), _('The Payment Term of Supplier does not have Payment Term Lines(Computation) defined !')) - return res def onchange_invoice_line(self, cr, uid, ids, lines): @@ -504,6 +512,8 @@ class account_invoice(osv.osv): val = {} dom = {} obj_journal = self.pool.get('account.journal') + account_obj = self.pool.get('account.account') + inv_line_obj = self.pool.get('account.invoice.line') if company_id and part_id and type: acc_id = False partner_obj = self.pool.get('res.partner').browse(cr,uid,part_id) @@ -528,7 +538,6 @@ class account_invoice(osv.osv): else: acc_id = pay_res_id val= {'account_id': acc_id} - account_obj = self.pool.get('account.account') if ids: if company_id: inv_obj = self.browse(cr,uid,ids) @@ -539,7 +548,7 @@ class account_invoice(osv.osv): if not result_id: raise osv.except_osv(_('Configuration Error !'), _('Can not find account chart for this company in invoice line account, Please Create account.')) - self.pool.get('account.invoice.line').write(cr, uid, [line.id], {'account_id': result_id[0]}) + inv_line_obj.write(cr, uid, [line.id], {'account_id': result_id[0]}) else: if invoice_line: for inv_line in invoice_line: @@ -580,7 +589,7 @@ class account_invoice(osv.osv): else: val['currency_id'] = company.currency_id.id - return {'value': val, 'domain': dom } + return {'value': val, 'domain': dom} # go from canceled state to draft state def action_cancel_draft(self, cr, uid, ids, *args): @@ -792,7 +801,6 @@ class account_invoice(osv.osv): line = [] for key, val in line2.items(): line.append((0,0,val)) - return line def action_move_create(self, cr, uid, ids, *args): @@ -967,7 +975,9 @@ class account_invoice(osv.osv): 'analytic_account_id':x.get('account_analytic_id',False), } - def action_number(self, cr, uid, ids, *args): + def action_number(self, cr, uid, ids, context=None): + if context is None: + context = {} #TODO: not correct fix but required a frech values before reading it. self.write(cr, uid, ids, {}) @@ -981,7 +991,10 @@ class account_invoice(osv.osv): self.write(cr, uid, ids, {'internal_number':number}) if invtype in ('in_invoice', 'in_refund'): - ref = reference + if not reference: + ref = self._convert_ref(cr, uid, number) + else: + ref = reference else: ref = self._convert_ref(cr, uid, number) @@ -998,9 +1011,11 @@ class account_invoice(osv.osv): (ref, move_id)) for inv_id, name in self.name_get(cr, uid, [id]): + ctx = context.copy() + if obj_inv.type in ('out_invoice', 'out_refund'): + ctx = self.get_log_context(cr, uid, context=ctx) message = _('Invoice ') + " '" + name + "' "+ _("is validated.") - self.log(cr, uid, inv_id, message) - + self.log(cr, uid, inv_id, message, context=ctx) return True def action_cancel(self, cr, uid, ids, *args): @@ -1489,8 +1504,8 @@ class account_invoice_line(osv.osv): taxes = self.pool.get('account.account').browse(cr, uid, account_id).tax_ids fpos = fposition_id and self.pool.get('account.fiscal.position').browse(cr, uid, fposition_id) or False res = self.pool.get('account.fiscal.position').map_tax(cr, uid, fpos, taxes) - r = {'value':{'invoice_line_tax_id': res}} - return r + return {'value':{'invoice_line_tax_id': res}} + account_invoice_line() class account_invoice_tax(osv.osv): @@ -1522,7 +1537,6 @@ class account_invoice_tax(osv.osv): 'amount': fields.float('Amount', digits_compute=dp.get_precision('Account')), 'manual': fields.boolean('Manual'), 'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of invoice tax."), - 'base_code_id': fields.many2one('account.tax.code', 'Base Code', help="The account basis of the tax declaration."), 'base_amount': fields.float('Base Code Amount', digits_compute=dp.get_precision('Account')), 'tax_code_id': fields.many2one('account.tax.code', 'Tax Code', help="The tax basis of the tax declaration."), @@ -1560,9 +1574,9 @@ class account_invoice_tax(osv.osv): _order = 'sequence' _defaults = { - 'manual': lambda *a: 1, - 'base_amount': lambda *a: 0.0, - 'tax_amount': lambda *a: 0.0, + 'manual': 1, + 'base_amount': 0.0, + 'tax_amount': 0.0, } def compute(self, cr, uid, invoice_id, context={}): tax_grouped = {} diff --git a/addons/account/project/project.py b/addons/account/project/project.py index ee142903c87..27836d72a1e 100644 --- a/addons/account/project/project.py +++ b/addons/account/project/project.py @@ -44,7 +44,7 @@ class account_journal(osv.osv): _inherit="account.journal" _columns = { - 'analytic_journal_id':fields.many2one('account.analytic.journal','Analytic Journal',help="Journal for analytic entries"), + 'analytic_journal_id':fields.many2one('account.analytic.journal','Analytic Journal', help="Journal for analytic entries"), } account_journal() diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml index 02536fc184c..e2f0bdf5709 100644 --- a/addons/account/project/project_view.xml +++ b/addons/account/project/project_view.xml @@ -197,7 +197,7 @@ <group col='6' colspan='4'> <filter name="sales" string="Sales" domain="[('journal_id.type','=','sale')]" icon="terp-sale" help="Analytic Journal Items related to a sale journal."/> <filter name="purchases" string="Purchases" domain="[('journal_id.type','=','purchase')]" icon="terp-purchase" help="Analytic Journal Items related to a purchase journal."/> - <filter name="others" string="Others" domain="[('journal_id.type','in',('cash','general','situation')]" icon="terp-folder-orange"/> + <filter name="others" string="Others" domain="[('journal_id.type','in',('cash','general','situation'))]" icon="terp-folder-orange"/> <separator orientation="vertical"/> <field name="date"/> <field name="name"/> diff --git a/addons/account/report/account_balance_sheet.py b/addons/account/report/account_balance_sheet.py index 820ddfb473d..4d3e06dee05 100644 --- a/addons/account/report/account_balance_sheet.py +++ b/addons/account/report/account_balance_sheet.py @@ -26,6 +26,7 @@ import rml_parse from report import report_sxw from account.report import account_profit_loss from common_report_header import common_report_header +from tools.translate import _ class report_balancesheet_horizontal(rml_parse.rml_parse, common_report_header): def __init__(self, cr, uid, name, context=None): @@ -61,12 +62,12 @@ class report_balancesheet_horizontal(rml_parse.rml_parse, common_report_header): self.context = context def sum_dr(self): - if self.res_bl['type'] == 'Net Profit': + if self.res_bl['type'] == _('Net Profit'): self.result_sum_dr += self.res_bl['balance']*-1 return self.result_sum_dr def sum_cr(self): - if self.res_bl['type'] == 'Net Loss': + if self.res_bl['type'] == _('Net Loss'): self.result_sum_cr += self.res_bl['balance'] return self.result_sum_cr @@ -78,6 +79,7 @@ class report_balancesheet_horizontal(rml_parse.rml_parse, common_report_header): db_pool = pooler.get_pool(self.cr.dbname) #Getting Profit or Loss Balance from profit and Loss report + self.obj_pl.get_data(data) self.res_bl = self.obj_pl.final_result() account_pool = db_pool.get('account.account') @@ -103,10 +105,14 @@ class report_balancesheet_horizontal(rml_parse.rml_parse, common_report_header): account_ids = account_pool._get_children_and_consol(cr, uid, account_id, context=ctx) accounts = account_pool.browse(cr, uid, account_ids, context=ctx) - if self.res_bl['type'] == 'Net Profit C.F.B.L.': - self.res_bl['type'] = 'Net Profit' + if not self.res_bl: + self.res_bl['type'] = _('Net Profit') + self.res_bl['balance'] = 0.0 + + if self.res_bl['type'] == _('Net Profit'): + self.res_bl['type'] = _('Net Profit') else: - self.res_bl['type'] = 'Net Loss' + self.res_bl['type'] = _('Net Loss') pl_dict = { 'code': self.res_bl['type'], 'name': self.res_bl['type'], @@ -199,4 +205,4 @@ report_sxw.report_sxw('report.account.balancesheet', 'account.account', 'addons/account/report/account_balance_sheet.rml',parser=report_balancesheet_horizontal, header='internal') -# 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/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml index 839bfb2ed26..8f9e582c321 100644 --- a/addons/account/report/account_invoice_report_view.xml +++ b/addons/account/report/account_invoice_report_view.xml @@ -98,17 +98,6 @@ <field name="categ_id" /> </group> <newline/> - <group expand="0" string="Extended Filters..." groups="base.group_extended"> - <field name="product_id"/> - <separator orientation="vertical"/> - <field name="journal_id" widget="selection"/> - <field name="account_id"/> - <separator orientation="vertical"/> - <field name="date_due"/> - <separator orientation="vertical" groups="base.group_multi_company"/> - <field name="company_id" groups="base.group_multi_company" widget="selection"/> - </group> - <newline/> <group expand="1" string="Group By..."> <filter string="Partner" name="partner" icon="terp-partner" context="{'group_by':'partner_id','residual_visible':True}"/> <filter string="Salesman" name='user' icon="terp-personal" context="{'group_by':'user_id'}"/> @@ -130,6 +119,17 @@ <filter string="Month" name="month" icon="terp-go-month" context="{'group_by':'month'}" help="Group by month of Invoice Date"/> <filter string="Year" name="year" icon="terp-go-year" context="{'group_by':'year'}" help="Group by year of Invoice Date"/> </group> + <newline/> + <group expand="0" string="Extended Filters..." groups="base.group_extended"> + <field name="product_id"/> + <separator orientation="vertical"/> + <field name="journal_id" widget="selection"/> + <field name="account_id"/> + <separator orientation="vertical"/> + <field name="date_due"/> + <separator orientation="vertical" groups="base.group_multi_company"/> + <field name="company_id" groups="base.group_multi_company" widget="selection"/> + </group> </search> </field> </record> diff --git a/addons/account/report/account_partner_balance.py b/addons/account/report/account_partner_balance.py index c17de597e1c..ab3cfd70970 100644 --- a/addons/account/report/account_partner_balance.py +++ b/addons/account/report/account_partner_balance.py @@ -20,8 +20,6 @@ ############################################################################## import time -import re -import copy from tools.translate import _ from report import report_sxw @@ -81,7 +79,6 @@ class partner_balance(report_sxw.rml_parse, common_report_header): move_state = ['posted'] full_account = [] - result_tmp = 0.0 self.cr.execute( "SELECT p.ref,l.account_id,ac.name AS account_name,ac.code AS code,p.name, sum(debit) AS debit, sum(credit) AS credit, " \ "CASE WHEN sum(debit) > sum(credit) " \ diff --git a/addons/account/report/account_print_overdue.py b/addons/account/report/account_print_overdue.py index 3e1f0b54de1..0a03801d409 100644 --- a/addons/account/report/account_print_overdue.py +++ b/addons/account/report/account_print_overdue.py @@ -21,8 +21,6 @@ import time -import ir -from osv import osv from report import report_sxw import pooler diff --git a/addons/account/report/account_profit_horizontal.rml b/addons/account/report/account_profit_horizontal.rml index f92f9e07983..89cbc4f8502 100644 --- a/addons/account/report/account_profit_horizontal.rml +++ b/addons/account/report/account_profit_horizontal.rml @@ -199,7 +199,7 @@ <para style="terp_default_Bold_9">Code</para> </td> <td> - <para style="terp_default_Bold_9">Perticular</para> + <para style="terp_default_Bold_9">Particular</para> </td> <td> <para style="terp_tblheader_Details_Right">Balance</para> @@ -208,7 +208,7 @@ <para style="terp_default_Bold_9">Code</para> </td> <td> - <para style="terp_default_Bold_9">Perticular</para> + <para style="terp_default_Bold_9">Particular</para> </td> <td> <para style="P1">Balance</para> @@ -250,19 +250,19 @@ <para style="terp_default_Bold_9"></para> </td> <td> - <para style="terp_default_Bold_9">[[ final_result()['type'] == 'Net Profit C.F.B.L.' and final_result()['type'] or '' ]]</para> + <para style="terp_default_Bold_9">[[ final_result()['type'] == 'Net Profit' and final_result()['type'] or '' ]]</para> </td> <td> - <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Profit C.F.B.L.' and formatLang(abs(final_result()['balance'])) ]] [[ company.currency_id.symbol ]]</para> + <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Profit' and formatLang(abs(final_result()['balance'])) ]] [[ company.currency_id.symbol ]]</para> </td> <td> <para style="terp_default_Bold_9"></para> </td> <td> - <para style="terp_default_Bold_9">[[ final_result()['type'] == 'Net Loss C.F.B.L.' and final_result()['type'] or '' ]]</para> + <para style="terp_default_Bold_9">[[ final_result()['type'] == 'Net Loss' and final_result()['type'] or '' ]]</para> </td> <td> - <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Loss C.F.B.L.' and formatLang(abs(final_result()['balance'])) ]] [[ final_result()['balance'] and final_result()['type'] == 'Net Loss C.F.B.L.' and company.currency_id.symbol ]]</para> + <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Loss' and formatLang(abs(final_result()['balance'])) ]] [[ final_result()['balance'] and final_result()['type'] == 'Net Loss' and company.currency_id.symbol ]]</para> </td> </tr> </blockTable> diff --git a/addons/account/report/account_profit_loss.py b/addons/account/report/account_profit_loss.py index 792b88053a1..0bfaea7a570 100644 --- a/addons/account/report/account_profit_loss.py +++ b/addons/account/report/account_profit_loss.py @@ -24,6 +24,7 @@ import pooler import rml_parse from report import report_sxw from common_report_header import common_report_header +from tools.translate import _ class report_pl_account_horizontal(rml_parse.rml_parse, common_report_header): @@ -62,12 +63,12 @@ class report_pl_account_horizontal(rml_parse.rml_parse, common_report_header): return self.res_pl def sum_dr(self): - if self.res_pl['type'] == 'Net Profit C.F.B.L.': + if self.res_pl['type'] == _('Net Profit'): self.result_sum_dr += self.res_pl['balance'] return self.result_sum_dr def sum_cr(self): - if self.res_pl['type'] == 'Net Loss C.F.B.L.': + if self.res_pl['type'] == _('Net Loss'): self.result_sum_cr += self.res_pl['balance'] return self.result_sum_cr @@ -76,7 +77,6 @@ class report_pl_account_horizontal(rml_parse.rml_parse, common_report_header): db_pool = pooler.get_pool(self.cr.dbname) account_pool = db_pool.get('account.account') - year_pool = db_pool.get('account.fiscalyear') types = [ 'expense', @@ -114,10 +114,10 @@ class report_pl_account_horizontal(rml_parse.rml_parse, common_report_header): else: accounts_temp.append(account) if self.result_sum_dr > self.result_sum_cr: - self.res_pl['type'] = 'Net Loss C.F.B.L.' + self.res_pl['type'] = _('Net Loss') self.res_pl['balance'] = (self.result_sum_dr - self.result_sum_cr) else: - self.res_pl['type'] = 'Net Profit C.F.B.L.' + self.res_pl['type'] = _('Net Profit') self.res_pl['balance'] = (self.result_sum_cr - self.result_sum_dr) self.result[typ] = accounts_temp cal_list[typ] = self.result[typ] diff --git a/addons/account/report/account_profit_loss.rml b/addons/account/report/account_profit_loss.rml index 2d85dc590e6..c371ab4c638 100644 --- a/addons/account/report/account_profit_loss.rml +++ b/addons/account/report/account_profit_loss.rml @@ -228,10 +228,10 @@ <para style="terp_default_Bold_9"></para> </td> <td> - <para style="terp_default_Bold_9">[[ final_result()['type'] == 'Net Profit C.F.B.L.' and final_result()['type'] or removeParentNode('blockTable') ]]</para> + <para style="terp_default_Bold_9">[[ final_result()['type'] == 'Net Profit' and final_result()['type'] or removeParentNode('blockTable') ]]</para> </td> <td> - <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Loss C.F.B.L.' and formatLang(abs(final_result()['balance'])) ]] [[ final_result()['balance'] and final_result()['type'] == 'Net Loss C.F.B.L.' and company.currency_id.symbol ]]</para> + <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Loss' and formatLang(abs(final_result()['balance'])) ]] [[ final_result()['balance'] and final_result()['type'] == 'Net Loss' and company.currency_id.symbol ]]</para> </td> </tr> </blockTable> @@ -283,10 +283,10 @@ <para style="terp_default_Bold_9"></para> </td> <td> - <para style="terp_default_Bold_9">[[ final_result()['type'] == 'Net Loss C.F.B.L.' and final_result()['type'] or removeParentNode('blockTable') ]]</para> + <para style="terp_default_Bold_9">[[ final_result()['type'] == 'Net Loss' and final_result()['type'] or removeParentNode('blockTable') ]]</para> </td> <td> - <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Loss C.F.B.L.' and formatLang(abs(final_result()['balance'])) ]] [[ final_result()['balance'] and final_result()['type'] == 'Net Loss C.F.B.L.' and company.currency_id.symbol ]]</para> + <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Loss' and formatLang(abs(final_result()['balance'])) ]] [[ final_result()['balance'] and final_result()['type'] == 'Net Loss' and company.currency_id.symbol ]]</para> </td> </tr> </blockTable> diff --git a/addons/account/report/account_tax_code.py b/addons/account/report/account_tax_code.py index 2f123fd00be..42bbe305381 100644 --- a/addons/account/report/account_tax_code.py +++ b/addons/account/report/account_tax_code.py @@ -21,11 +21,9 @@ ############################################################################## import time -import pooler + import rml_parse -import copy from report import report_sxw -import re def _get_country(record): if record.partner_id \ diff --git a/addons/account/report/account_tax_report.py b/addons/account/report/account_tax_report.py index d968ee9029e..81778e12eb3 100644 --- a/addons/account/report/account_tax_report.py +++ b/addons/account/report/account_tax_report.py @@ -20,46 +20,54 @@ ############################################################################## import time -import copy import rml_parse +from common_report_header import common_report_header from report import report_sxw -class tax_report(rml_parse.rml_parse): +class tax_report(rml_parse.rml_parse, common_report_header): _name = 'report.account.vat.declaration' - def __init__(self, cr, uid, name, context={}): + + def set_context(self, objects, data, ids, report_type=None): + new_ids = ids + res = {} + self.period_ids = [] + period_obj = self.pool.get('account.period') + res['periods'] = '' + res['fiscalyear'] = data['form']['fiscalyear_id'] + + if data['form']['period_from'] and data['form']['period_to']: + self.period_ids = period_obj.build_ctx_periods(self.cr, self.uid, data['form']['period_from'], data['form']['period_to']) + periods_l = period_obj.read(self.cr, self.uid, self.period_ids, ['name']) + for period in periods_l: + if res['periods'] == '': + res['periods'] = period['name'] + else: + res['periods'] += ", "+ period['name'] + return super(tax_report, self).set_context(objects, data, new_ids, report_type=report_type) + + def __init__(self, cr, uid, name, context=None): super(tax_report, self).__init__(cr, uid, name, context=context) self.localcontext.update({ 'time': time, - 'get_period': self._get_period, 'get_codes': self._get_codes, 'get_general': self._get_general, - 'get_company': self._get_company, 'get_currency': self._get_currency, 'get_lines': self._get_lines, - 'get_years': self.get_years, + 'get_fiscalyear': self._get_fiscalyear, + 'get_account': self._get_account, + 'get_start_period': self.get_start_period, + 'get_end_period': self.get_end_period, + 'get_basedon': self._get_basedon, }) - def get_years(self,form): - res={} - fiscal_year_name = self.pool.get('account.fiscalyear').name_get(self.cr,self.uid,form['fiscalyear']) + def _get_basedon(self, form): + return form['form']['based_on'] - if fiscal_year_name: - res['fname'] = fiscal_year_name[0][1] - res['periods'] = '' - if form['periods']: - periods_l = self.pool.get('account.period').read(self.cr, self.uid, form['periods'], ['name']) - for period in periods_l: - if res['periods']=='': - res['periods'] = period['name'] - else: - res['periods'] += ", "+ period['name'] - return res - - def _get_lines(self, based_on, period_list, company_id=False, parent=False, level=0, context={}): + def _get_lines(self, based_on, company_id=False, parent=False, level=0, context=None): + period_list = self.period_ids res = self._get_codes(based_on, company_id, parent, level, period_list, context=context) - if period_list: res = self._add_codes(based_on, res, period_list, context=context) else: @@ -96,13 +104,9 @@ class tax_report(rml_parse.rml_parse): ind_general+=1 i+=1 return top_result - #return array_result - def _get_period(self, period_id, context={}): - return self.pool.get('account.period').browse(self.cr, self.uid, period_id, context=context).name - - def _get_general(self, tax_code_id, period_list,company_id, based_on, context={}): - res=[] + def _get_general(self, tax_code_id, period_list, company_id, based_on, context=None): + res = [] obj_account = self.pool.get('account.account') periods_ids = tuple(period_list) if based_on == 'payments': @@ -155,7 +159,7 @@ class tax_report(rml_parse.rml_parse): i+=1 return res - def _get_codes(self, based_on, company_id, parent=False, level=0, period_list=[], context={}): + def _get_codes(self, based_on, company_id, parent=False, level=0, period_list=[], context=None): obj_tc = self.pool.get('account.tax.code') ids = obj_tc.search(self.cr, self.uid, [('parent_id','=',parent),('company_id','=',company_id)], context=context) @@ -166,7 +170,7 @@ class tax_report(rml_parse.rml_parse): res += self._get_codes(based_on, company_id, code.id, level+1, context=context) return res - def _add_codes(self, based_on, account_list=[], period_list=[], context={}): + def _add_codes(self, based_on, account_list=[], period_list=[], context=None): res = [] obj_tc = self.pool.get('account.tax.code') for account in account_list: @@ -181,16 +185,10 @@ class tax_report(rml_parse.rml_parse): res.append((account[0], code)) return res + def _get_currency(self, form, context=None): + return self.pool.get('res.company').browse(self.cr, self.uid, form['company_id'], context=context).currency_id.name - def _get_company(self, form, context={}): - obj_company = self.pool.get('res.company') - return obj_company.browse(self.cr, self.uid, form['company_id'], context=context).name - - def _get_currency(self, form, context={}): - obj_company = self.pool.get('res.company') - return obj_company.browse(self.cr, self.uid, form['company_id'], context=context).currency_id.name - - def sort_result(self, accounts, context={}): + def sort_result(self, accounts, context=None): # On boucle sur notre rapport result_accounts = [] ind=0 @@ -233,4 +231,4 @@ class tax_report(rml_parse.rml_parse): report_sxw.report_sxw('report.account.vat.declaration', 'account.tax.code', 'addons/account/report/account_tax_report.rml', parser=tax_report, header="internal") -# 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/report/account_tax_report.rml b/addons/account/report/account_tax_report.rml index 47df92cc3bc..41790ea6f07 100644 --- a/addons/account/report/account_tax_report.rml +++ b/addons/account/report/account_tax_report.rml @@ -62,6 +62,42 @@ <blockValign value="TOP"/> </blockTableStyle> + <blockTableStyle id="Table4"> + <blockAlignment value="LEFT"/> + <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/> + </blockTableStyle> + <blockTableStyle id="Table3"> + <blockAlignment value="LEFT"/> + <blockValign value="TOP"/> + <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,0" stop="-1,0"/> + <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/> + <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/> + <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/> + <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/> + <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/> + <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/> + <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/> + <lineStyle kind="LINEAFTER" colorName="#cccccc" start="2,0" stop="2,-1"/> + <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/> + <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/> + <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/> + <lineStyle kind="LINEAFTER" colorName="#cccccc" start="3,0" stop="3,-1"/> + <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/> + <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/> + <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="4,0" stop="4,-1"/> + <lineStyle kind="LINEABOVE" colorName="#cccccc" start="4,0" stop="4,0"/> + <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/> + <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="5,0" stop="5,-1"/> + <lineStyle kind="LINEABOVE" colorName="#cccccc" start="5,0" stop="5,0"/> + <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/> + <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="6,0" stop="6,-1"/> + <lineStyle kind="LINEAFTER" colorName="#cccccc" start="6,0" stop="6,-1"/> + <lineStyle kind="LINEABOVE" colorName="#cccccc" start="6,0" stop="6,0"/> + <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/> + <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="7,0" stop="7,-1"/> + <lineStyle kind="LINEAFTER" colorName="#cccccc" start="7,0" stop="7,-1"/> + <lineStyle kind="LINEABOVE" colorName="#cccccc" start="7,0" stop="7,0"/> + </blockTableStyle> <blockTableStyle id="Tableau1"> <blockAlignment value="LEFT"/> <blockValign value="TOP"/> @@ -100,21 +136,39 @@ <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/> <paraStyle name="Caption" fontName="Helvetica" fontSize="1.0" leading="1" spaceBefore="0" spaceAfter="0"/> <paraStyle name="Index" fontName="Helvetica"/> - + <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> + <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> </stylesheet> <story> <para style="P2">Tax Statement</para> <para style="P2"><font color="white"> </font></para> - <blockTable colWidths="538" style="Tableau1"> - <tr> - <td><para style="P12">Year : [[ get_years(data['form'])['fname'] ]]</para></td> - </tr> + <blockTable colWidths="140.0,120.0,160.0,120.0" style="Table3"> <tr> - <td><para style="P12">Periods : [[ get_years(data['form'])['periods'] or removeParentNode('tr')]]</para></td> + <td><para style="terp_tblheader_General_Centre">Chart of Tax</para></td> + <td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td> + <td><para style="terp_tblheader_General_Centre">Periods</para></td> + <td><para style="terp_tblheader_General_Centre">Based On</para></td> </tr> - </blockTable> - <para style="P2"><font color="white"> </font></para> + <tr> + <td><para style="terp_default_Centre_8">[[ get_account(data) or removeParentNode('para') ]]</para></td> + <td><para style="terp_default_Centre_8">[[ get_fiscalyear(data) or '' ]]</para></td> + <td> + <blockTable colWidths="80.0,80.0" style="Table4"> + <tr> + <td><para style="terp_tblheader_General_Centre">Start Period</para></td> + <td><para style="terp_tblheader_General_Centre">End Period</para></td> + </tr> + <tr> + <td><para style="terp_default_Centre_8">[[ get_start_period(data) or '' ]]</para></td> + <td><para style="terp_default_Centre_8">[[ get_end_period(data) or '' ]]</para></td> + </tr> + </blockTable> + </td> + <td><para style="terp_default_Centre_8">[[ get_basedon(data) or '' ]]</para></td> + </tr> + </blockTable> + <para style="P2"><font color="white"> </font></para> <blockTable colWidths="340.0,55.0,55.0,90.0" style="Table2" repeatRows="1"> <tr> <td><para style="P12">Tax Name</para></td> @@ -123,7 +177,7 @@ <td><para style="P12a">Tax Amount</para></td> </tr> <tr> - <td><para style="P5"><font>[[ repeatIn(get_lines(data['form']['based_on'],data['form']['periods'],data['form']['company_id']), 'o') ]]</font><font color="white">[[ (o['level']) ]]</font> <font>[[ (len(o['level'])<5 and setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font><font>[[ o['code'] ]] [[ o['name'] ]] </font></para></td> + <td><para style="P5"><font>[[ repeatIn(get_lines(data['form']['based_on'], data['form']['company_id']), 'o') ]]</font><font color="white">[[ (o['level']) ]]</font> <font>[[ (len(o['level'])<5 and setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font><font>[[ o['code'] ]] [[ o['name'] ]] </font></para></td> <td><para style="P6"><font>[[ len(o['level'])<5 and setTag('para','para',{'fontName':"Helvetica-Bold"}) or removeParentNode('font')]]</font><font>[[ o['type']=='view' and removeParentNode('font') ]][[ formatLang(o['debit']) ]]</font><font>[[ o['type']<>'view' and removeParentNode('font') ]][[ formatLang(o['debit']) ]]</font></para></td> <td><para style="P6"><font>[[ len(o['level'])<5 and setTag('para','para',{'fontName':"Helvetica-Bold"}) or removeParentNode('font')]]</font><font>[[ o['type']=='view' and removeParentNode('font') ]][[ formatLang(o['credit']) ]]</font><font>[[ o['type']<>'view' and removeParentNode('font') ]][[ formatLang(o['credit'])]]</font></para></td> <td><para style="P6"><font>[[ len(o['level'])<5 and setTag('para','para',{'fontName':"Helvetica-Bold"}) or removeParentNode('font')]]</font><font>[[ o['type']=='view' and removeParentNode('font') ]][[ formatLang(o['tax_amount']) ]] [[ company.currency_id.symbol ]]</font><font>[[ o['type']<>'view' and removeParentNode('font') ]][[ formatLang(o['tax_amount']) ]] [[ company.currency_id.symbol ]]</font> </para></td> diff --git a/addons/account/report/rml_parse.py b/addons/account/report/rml_parse.py index 1d3cc629cfa..aab5e14c777 100644 --- a/addons/account/report/rml_parse.py +++ b/addons/account/report/rml_parse.py @@ -19,14 +19,10 @@ # ############################################################################## -from report import report_sxw -import xml.dom.minidom -import time -import osv import re -import pooler import sys +from report import report_sxw class rml_parse(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): @@ -58,15 +54,15 @@ class rml_parse(report_sxw.rml_parse): ellipsis = ellipsis or '' try: return string[:maxlen - len(ellipsis) ] + (ellipsis, '')[len(string) < maxlen] - except Exception, e: + except: return False def _strip_name(self, name, maxlen=50): return self._ellipsis(name, maxlen, '...') - def _get_and_change_date_format_for_swiss (self,date_to_format): + def _get_and_change_date_format_for_swiss(self,date_to_format): date_formatted='' if date_to_format: - date_formatted = strptime (date_to_format,'%Y-%m-%d').strftime('%d.%m.%Y') + date_formatted = strptime(date_to_format,'%Y-%m-%d').strftime('%d.%m.%Y') return date_formatted def _explode_name(self,chaine,length): @@ -112,15 +108,14 @@ class rml_parse(report_sxw.rml_parse): i = i + length chaine = str("".join(ast)) return chaine - def repair_string(self,chaine): + def repair_string(self, chaine): ast = list(chaine) UnicodeAst = [] - _previouslyfound = False i = 0 while i < len(ast): elem = ast[i] try: - Stringer = elem.encode("utf-8") + elem.encode("utf-8") except UnicodeDecodeError: to_reencode = elem + ast[i+1] print str(to_reencode) @@ -148,3 +143,4 @@ class rml_parse(report_sxw.rml_parse): else: return Stringer +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file diff --git a/addons/account/test/account_cash_statement.yml b/addons/account/test/account_cash_statement.yml index 0932e214560..03d0d54db83 100644 --- a/addons/account/test/account_cash_statement.yml +++ b/addons/account/test/account_cash_statement.yml @@ -1,5 +1,5 @@ - - In order to test Cash statement I create a Cash statement and and confirm it and check it's move created + In order to test Cash statement I create a Cash statement and confirm it and check it's move created - !record {model: account.bank.statement, id: account_bank_statement_1}: date: '2010-10-16' @@ -13,9 +13,9 @@ subtotal: 20.0 - pieces: 100.0 number: 1 - subtotal: 200.0 - balance_start: 220.0 - balance_end: 220.0 + subtotal: 100.0 + balance_start: 120.0 + balance_end: 120.0 - I check that Initially bank statement is in the "Draft" state - @@ -46,18 +46,18 @@ partner_id: base.res_partner_4 sequence: 0.0 type: general - balance_end: 1220.0 + balance_end: 1120.0 ending_details_ids: - pieces: 10.0 number: 2 subtotal: 20.0 - pieces: 100.0 number: 1 - subtotal: 200.0 + subtotal: 100.0 - pieces: 500.0 number: 2 subtotal: 1000.0 - balance_end_cash: 1220.0 + balance_end_cash: 1120.0 - I clicked on Close CashBox button to close the cashbox diff --git a/addons/account/test/account_report.yml b/addons/account/test/account_report.yml index 26888cc69c1..c780bf94682 100644 --- a/addons/account/test/account_report.yml +++ b/addons/account/test/account_report.yml @@ -1,9 +1,22 @@ - + In order to test the PDF reports defined on an invoice, we will create a Invoice Record +- + !record {model: account.invoice, id: test_invoice_1}: + currency_id: base.EUR + company_id: base.main_company + address_invoice_id: base.res_partner_address_tang + partner_id: base.res_partner_asus + state: draft + type: out_invoice + account_id: account.a_recv + name: Test invoice 1 + address_contact_id: base.res_partner_address_tang +- In order to test the PDF reports defined on an invoice, we will print an Invoice Report - !python {model: account.invoice}: | import netsvc, tools, os - (data, format) = netsvc.LocalService('report.account.invoice').create(cr, uid, [ref('account.test_invoice_1')], {}, {}) + (data, format) = netsvc.LocalService('report.account.invoice').create(cr, uid, [ref('test_invoice_1')], {}, {}) if tools.config['test_report_directory']: file(os.path.join(tools.config['test_report_directory'], 'account-invoice.'+format), 'wb+').write(data) @@ -56,7 +69,7 @@ - !python {model: account.invoice}: | import netsvc, tools, os - (data, format) = netsvc.LocalService('report.account.invoice').create(cr, uid, [ref('account.test_invoice_1')], {}, {}) + (data, format) = netsvc.LocalService('report.account.invoice').create(cr, uid, [ref('test_invoice_1')], {}, {}) if tools.config['test_report_directory']: file(os.path.join(tools.config['test_report_directory'], 'account-invoice.'+format), 'wb+').write(data) diff --git a/addons/account/wizard/account_chart.py b/addons/account/wizard/account_chart.py index b87c11f02f3..fdf684b2522 100644 --- a/addons/account/wizard/account_chart.py +++ b/addons/account/wizard/account_chart.py @@ -19,7 +19,6 @@ # ############################################################################## -import time from osv import fields, osv class account_chart(osv.osv_memory): diff --git a/addons/account/wizard/account_invoice_refund.py b/addons/account/wizard/account_invoice_refund.py index 0c866853594..4adc25a049d 100644 --- a/addons/account/wizard/account_invoice_refund.py +++ b/addons/account/wizard/account_invoice_refund.py @@ -36,7 +36,7 @@ class account_invoice_refund(osv.osv_memory): 'period': fields.many2one('account.period', 'Force period'), 'journal_id': fields.many2one('account.journal', 'Refund Journal', help='You can select here the journal to use for the refund invoice that will be created. If you leave that field empty, it will use the same journal as the current invoice.'), 'description': fields.char('Description', size=128, required=True), - 'filter_refund': fields.selection([('modify', 'Modify'), ('refund', 'Refund'), ('cancel', 'Cancel')], "Refund Type", required=True, help='Refund invoice base on this type. You can not Modify and Cancel if the invoice is already rencociled'), + 'filter_refund': fields.selection([('modify', 'Modify'), ('refund', 'Refund'), ('cancel', 'Cancel')], "Refund Type", required=True, help='Refund invoice base on this type. You can not Modify and Cancel if the invoice is already reconciled'), } def _get_journal(self, cr, uid, context=None): @@ -179,7 +179,6 @@ class account_invoice_refund(osv.osv_memory): invoice_lines = inv_obj._refund_cleanup_lines(cr, uid, invoice_lines) tax_lines = inv_tax_obj.read(cr, uid, invoice['tax_line'], context=context) tax_lines = inv_obj._refund_cleanup_lines(cr, uid, tax_lines) - invoice.update({ 'type': inv.type, 'date_invoice': date, @@ -190,33 +189,32 @@ class account_invoice_refund(osv.osv_memory): 'period_id': period, 'name': description }) - for field in ('address_contact_id', 'address_invoice_id', 'partner_id', 'account_id', 'currency_id', 'payment_term', 'journal_id'): invoice[field] = invoice[field] and invoice[field][0] - inv_id = inv_obj.create(cr, uid, invoice, {}) if inv.payment_term.id: data = inv_obj.onchange_payment_term_date_invoice(cr, uid, [inv_id], inv.payment_term.id, date) if 'value' in data and data['value']: inv_obj.write(cr, uid, [inv_id], data['value']) created_inv.append(inv_id) - if inv.type in ('out_invoice', 'out_refund'): xml_id = 'action_invoice_tree3' else: xml_id = 'action_invoice_tree4' - result = mod_obj._get_id(cr, uid, 'account', xml_id) id = mod_obj.read(cr, uid, result, ['res_id'], context=context)['res_id'] result = act_obj.read(cr, uid, id, context=context) - result['res_id'] = created_inv + invoice_domain = eval(result['domain']) + invoice_domain.append(('id', 'in', created_inv)) + result['domain'] = invoice_domain return result def invoice_refund(self, cr, uid, ids, context=None): data_refund = self.read(cr, uid, ids, [],context=context)[0]['filter_refund'] return self.compute_refund(cr, uid, ids, data_refund, context=context) + account_invoice_refund() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file diff --git a/addons/account/wizard/account_move_journal.py b/addons/account/wizard/account_move_journal.py index 5756fed4264..7f64f52c100 100644 --- a/addons/account/wizard/account_move_journal.py +++ b/addons/account/wizard/account_move_journal.py @@ -19,6 +19,8 @@ # ############################################################################## +from lxml import etree + from osv import osv from tools.translate import _ import tools @@ -103,8 +105,11 @@ class account_move_journal(osv.osv_memory): </group> </form>""" % (tools.ustr(journal), tools.ustr(period)) + view = etree.fromstring(view.encode('utf8')) + xarch, xfields = self._view_look_dom_arch(cr, uid, view, view_id, context=context) + view = xarch res.update({ - 'arch':view + 'arch': view }) return res diff --git a/addons/account/wizard/account_move_line_select.py b/addons/account/wizard/account_move_line_select.py index 86345703f6f..556a688f867 100644 --- a/addons/account/wizard/account_move_line_select.py +++ b/addons/account/wizard/account_move_line_select.py @@ -19,8 +19,7 @@ # ############################################################################## -from osv import fields, osv -from tools.translate import _ +from osv import osv class account_move_line_select(osv.osv_memory): """ diff --git a/addons/account/wizard/account_move_line_unreconcile_select.py b/addons/account/wizard/account_move_line_unreconcile_select.py index c445828d0ae..826a5a654b1 100644 --- a/addons/account/wizard/account_move_line_unreconcile_select.py +++ b/addons/account/wizard/account_move_line_unreconcile_select.py @@ -20,8 +20,6 @@ ############################################################################## from osv import fields, osv -from tools.translate import _ -import tools class account_move_line_unreconcile_select(osv.osv_memory): _name = "account.move.line.unreconcile.select" diff --git a/addons/account/wizard/account_state_open.py b/addons/account/wizard/account_state_open.py index 4703ea18c61..2a03a80aefa 100644 --- a/addons/account/wizard/account_state_open.py +++ b/addons/account/wizard/account_state_open.py @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # ############################################################################## -from osv import osv, fields +from osv import osv import netsvc from tools.translate import _ diff --git a/addons/account/wizard/account_tax_chart.py b/addons/account/wizard/account_tax_chart.py index 1595a603dd0..82925d1a53d 100644 --- a/addons/account/wizard/account_tax_chart.py +++ b/addons/account/wizard/account_tax_chart.py @@ -66,7 +66,8 @@ class account_tax_chart(osv.osv_memory): result['context'] = str({'state': data['target_move']}) if data['period_id']: - result['name'] += ':' + self.pool.get('account.period').read(cr, uid, [data['period_id']], context=context)[0]['code'] + period_code = period_obj.read(cr, uid, [data['period_id']], context=context)[0]['code'] + result['name'] += period_code and (':' + period_code) or '' return result _defaults = { diff --git a/addons/account/wizard/account_unreconcile.py b/addons/account/wizard/account_unreconcile.py index 2a77cd8fb66..88b58b68a1e 100644 --- a/addons/account/wizard/account_unreconcile.py +++ b/addons/account/wizard/account_unreconcile.py @@ -19,7 +19,7 @@ # ############################################################################## -from osv import fields, osv +from osv import osv class account_unreconcile(osv.osv_memory): _name = "account.unreconcile" diff --git a/addons/account/wizard/account_use_model.py b/addons/account/wizard/account_use_model.py index edac082f32e..baf09f5ac16 100644 --- a/addons/account/wizard/account_use_model.py +++ b/addons/account/wizard/account_use_model.py @@ -19,7 +19,6 @@ # ############################################################################## import time -import datetime from osv import fields, osv from tools.translate import _ diff --git a/addons/account/wizard/account_validate_account_move.py b/addons/account/wizard/account_validate_account_move.py index 0fac7387db9..0f963b44fa6 100644 --- a/addons/account/wizard/account_validate_account_move.py +++ b/addons/account/wizard/account_validate_account_move.py @@ -25,8 +25,8 @@ class validate_account_move(osv.osv_memory): _name = "validate.account.move" _description = "Validate Account Move" _columns = { - 'journal_id': fields.many2one('account.journal', 'Journal', required=True), - 'period_id': fields.many2one('account.period', 'Period', required=True, domain=[('state','<>','done')]), + 'journal_id': fields.many2one('account.journal', 'Journal', required=True), + 'period_id': fields.many2one('account.period', 'Period', required=True, domain=[('state','<>','done')]), } def validate_move(self, cr, uid, ids, context=None): diff --git a/addons/account/wizard/account_vat.py b/addons/account/wizard/account_vat.py index 0c33517d428..863ae055428 100644 --- a/addons/account/wizard/account_vat.py +++ b/addons/account/wizard/account_vat.py @@ -24,41 +24,36 @@ from osv import osv, fields class account_vat_declaration(osv.osv_memory): _name = 'account.vat.declaration' _description = 'Account Vat Declaration' - _inherit = "account.common.account.report" + _inherit = "account.common.report" _columns = { - 'based_on': fields.selection([('invoices','Invoices'), - ('payments','Payments'),], + 'based_on': fields.selection([('invoices', 'Invoices'), + ('payments', 'Payments'),], 'Based On', required=True), - 'company_id': fields.many2one('res.company', 'Company', required=True), - 'periods': fields.many2many('account.period', 'vat_period_rel', 'vat_id', 'period_id', 'Periods', help="All periods if empty"), - 'fiscalyear': fields.many2many('account.fiscalyear','vat_fiscal_rel','fiscal_id','Fiscal Year',required=True), - } + 'chart_tax_id': fields.many2one('account.tax.code', 'Chart of Tax', help='Select Charts of Taxes', required=True, domain = [('parent_id','=', False)]), + } - def _get_company(self, cr, uid, context={}): - user_obj = self.pool.get('res.users') - company_obj = self.pool.get('res.company') - user = user_obj.browse(cr, uid, uid, context=context) - if user.company_id: - return user.company_id.id - else: - return company_obj.search(cr, uid, [('parent_id', '=', False)])[0] + def _get_tax(self, cr, uid, context=None): + taxes = self.pool.get('account.tax.code').search(cr, uid, [('parent_id', '=', False)], limit=1) + return taxes and taxes[0] or False _defaults = { 'based_on': 'invoices', - 'company_id': _get_company - } + 'chart_tax_id': _get_tax + } - def create_vat(self, cr, uid, ids, context={}): + def create_vat(self, cr, uid, ids, context=None): if context is None: context = {} datas = {'ids': context.get('active_ids', [])} datas['model'] = 'account.tax.code' datas['form'] = self.read(cr, uid, ids)[0] + datas['form']['company_id'] = self.pool.get('account.tax.code').browse(cr, uid, [datas['form']['chart_tax_id']], context=context)[0].company_id.id return { 'type': 'ir.actions.report.xml', 'report_name': 'account.vat.declaration', 'datas': datas, } + account_vat_declaration() -#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/wizard/account_vat_view.xml b/addons/account/wizard/account_vat_view.xml index 41c0faa2c79..c6d0307fbaa 100644 --- a/addons/account/wizard/account_vat_view.xml +++ b/addons/account/wizard/account_vat_view.xml @@ -7,15 +7,13 @@ <field name="model">account.vat.declaration</field> <field name="type">form</field> <field name="arch" type="xml"> - <form string="Select Period"> - <field name="company_id" groups="base.group_multi_company" widget='selection'/> - <newline/> + <form string="Taxes Report"> + <field name="chart_tax_id" widget='selection'/> + <field name="fiscalyear_id"/> <field name="based_on"/> - <newline/> - <separator string="Select Period(s)" colspan="4"/> - <field name="periods" nolabel="1" colspan="4"/> - <separator string="Select FiscalYear(s)" colspan="4"/> - <field name="fiscalyear" nolabel="1" colspan="4"/> + <separator string="Periods" colspan="4"/> + <field name="period_from" domain="[('fiscalyear_id', '=', fiscalyear_id)]" attrs="{'readonly':[('filter','!=','filter_period')], 'required':[('filter', '=', 'filter_period')]}" /> + <field name="period_to" domain="[('fiscalyear_id', '=', fiscalyear_id)]" attrs="{'readonly':[('filter','!=','filter_period')], 'required':[('filter', '=', 'filter_period')]}" /> <group col="2" colspan="4"> <button icon='gtk-cancel' special="cancel" string="Cancel" /> <button name="create_vat" string="Print Tax Statement" colspan="1" type="object" icon="gtk-ok"/> @@ -42,4 +40,4 @@ icon="STOCK_PRINT"/> </data> -</openerp> +</openerp>
\ No newline at end of file diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py index b1b4ece2f64..90fc9f1fd6a 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis.py +++ b/addons/account_analytic_analysis/account_analytic_analysis.py @@ -250,33 +250,56 @@ class account_analytic_account(osv.osv): def _ca_invoiced_calc(self, cr, uid, ids, name, arg, context=None): res = {} - parent_ids = tuple(self.search(cr, uid, [('parent_id', 'child_of', ids)], context=context)) - if parent_ids: - cr.execute("SELECT account_analytic_line.account_id, COALESCE(SUM(amount_currency), 0.0) \ + res_final = {} + child_ids = tuple(self.search(cr, uid, [('parent_id', 'child_of', ids)], context=context)) + for i in child_ids: + res[i] = {} + for n in [name]: + res[i][n] = 0.0 + if not child_ids: + return res + + if child_ids: + cr.execute("SELECT account_analytic_line.account_id, COALESCE(SUM(amount), 0.0) \ FROM account_analytic_line \ JOIN account_analytic_journal \ ON account_analytic_line.journal_id = account_analytic_journal.id \ WHERE account_analytic_line.account_id IN %s \ AND account_analytic_journal.type = 'sale' \ - GROUP BY account_analytic_line.account_id", (parent_ids,)) + GROUP BY account_analytic_line.account_id", (child_ids,)) for account_id, sum in cr.fetchall(): - res[account_id] = round(sum,2) - return self._compute_currency_for_level_tree(cr, uid, ids, parent_ids, res, context=context) + res[account_id][name] = round(sum,2) + data = self._compute_level_tree(cr, uid, ids, child_ids, res, [name], context) + for i in data: + res_final[i] = data[i][name] + return res_final def _total_cost_calc(self, cr, uid, ids, name, arg, context=None): res = {} - parent_ids = tuple(self.search(cr, uid, [('parent_id', 'child_of', ids)], context=context)) - if parent_ids: - cr.execute("""SELECT account_analytic_line.account_id, COALESCE(SUM(amount_currency), 0.0) \ + res_final = {} + child_ids = tuple(self.search(cr, uid, [('parent_id', 'child_of', ids)], context=context)) + + for i in child_ids: + res[i] = {} + for n in [name]: + res[i][n] = 0.0 + if not child_ids: + return res + + if child_ids: + cr.execute("""SELECT account_analytic_line.account_id, COALESCE(SUM(amount), 0.0) \ FROM account_analytic_line \ JOIN account_analytic_journal \ ON account_analytic_line.journal_id = account_analytic_journal.id \ WHERE account_analytic_line.account_id IN %s \ AND amount<0 \ - GROUP BY account_analytic_line.account_id""",(parent_ids,)) + GROUP BY account_analytic_line.account_id""",(child_ids,)) for account_id, sum in cr.fetchall(): - res[account_id] = round(sum,2) - return self._compute_currency_for_level_tree(cr, uid, ids, parent_ids, res, context=context) + res[account_id][name] = round(sum,2) + data = self._compute_level_tree(cr, uid, ids, child_ids, res, [name], context) + for i in data: + res_final[i] = data[i][name] + return res_final def _remaining_hours_calc(self, cr, uid, ids, name, arg, context=None): res = {} diff --git a/addons/account_analytic_analysis/i18n/es.po b/addons/account_analytic_analysis/i18n/es.po index f3e8c2fd5c7..490c3722d37 100644 --- a/addons/account_analytic_analysis/i18n/es.po +++ b/addons/account_analytic_analysis/i18n/es.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: 2010-10-18 17:46+0000\n" -"PO-Revision-Date: 2010-10-24 21:58+0000\n" -"Last-Translator: Carlos @ smile.fr <Unknown>\n" +"PO-Revision-Date: 2010-10-25 07:12+0000\n" +"Last-Translator: Carlos-smile <Unknown>\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-10-25 04:39+0000\n" +"X-Launchpad-Export-Date: 2010-10-26 04:40+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_analytic_analysis diff --git a/addons/account_analytic_analysis/i18n/sr.po b/addons/account_analytic_analysis/i18n/sr.po index a80ba1aa2c1..355dc8fd0af 100644 --- a/addons/account_analytic_analysis/i18n/sr.po +++ b/addons/account_analytic_analysis/i18n/sr.po @@ -7,14 +7,14 @@ msgid "" msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" -"POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-10-14 07:30+0000\n" +"POT-Creation-Date: 2010-10-18 17:46+0000\n" +"PO-Revision-Date: 2010-10-26 08:25+0000\n" "Last-Translator: OpenERP Administrators <Unknown>\n" "Language-Team: Serbian <sr@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-10-15 04:42+0000\n" +"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_analytic_analysis @@ -26,14 +26,16 @@ msgstr "" "Broj sati koji mogu biti fakturirani zajedno s onima koji su već fakturisana." #. module: account_analytic_analysis -#: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_user -msgid "Hours summary by user" -msgstr "Sati sumarno od strane korisnika" +#: constraint:ir.model:0 +msgid "" +"The Object name must start with x_ and not contain any special character !" +msgstr "" +"Ime objekta mora da počne sa x_ i ne sme da sadrži specijalne karaktere !" #. module: account_analytic_analysis -#: field:account.analytic.account,last_invoice_date:0 -msgid "Last Invoice Date" -msgstr "Zadnji Datum fakture" +#: constraint:ir.actions.act_window:0 +msgid "Invalid model name in the action definition." +msgstr "Pogrešno ime modela u definiciji akcije." #. module: account_analytic_analysis #: help:account.analytic.account,remaining_ca:0 @@ -46,20 +48,20 @@ msgid "Computed using the formula: Maximum Quantity - Hours Tot." msgstr "Izračunato pomoću formule: Najveća količina - Ukupno vrijeme" #. module: account_analytic_analysis -#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_all -msgid "All Analytic Accounts" -msgstr "Svi analitički računi" +#: code:addons/account_analytic_analysis/account_analytic_analysis.py:0 +#, python-format +msgid "AccessError" +msgstr "Greška u pristupu" #. module: account_analytic_analysis -#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_open -#: model:ir.ui.menu,name:account_analytic_analysis.menu_analytic_account_to_valid_open -msgid "My Current Accounts" -msgstr "Moji tekući računi" +#: field:account.analytic.account,ca_theorical:0 +msgid "Theorical Revenue" +msgstr "Prihodi teoretski" #. module: account_analytic_analysis -#: constraint:ir.ui.view:0 -msgid "Invalid XML for View Architecture!" -msgstr "Nevažeći XML za pregled arhitekture" +#: field:account.analytic.account,last_invoice_date:0 +msgid "Last Invoice Date" +msgstr "Zadnji Datum fakture" #. module: account_analytic_analysis #: help:account.analytic.account,last_invoice_date:0 @@ -67,14 +69,9 @@ msgid "Date of the last invoice created for this analytic account." msgstr "Datum zadnje fakture kreirana za ovaj analitički račun." #. module: account_analytic_analysis -#: field:account.analytic.account,ca_theorical:0 -msgid "Theorical Revenue" -msgstr "Prihodi teoretski" - -#. module: account_analytic_analysis -#: constraint:ir.actions.act_window:0 -msgid "Invalid model name in the action definition." -msgstr "Pogrešno ime modela u definiciji akcije." +#: constraint:ir.ui.menu:0 +msgid "Error ! You can not create recursive Menu." +msgstr "Greska! Ne mozete kreirati rekursivni meni." #. module: account_analytic_analysis #: help:account.analytic.account,theorical_margin:0 @@ -82,19 +79,6 @@ msgid "Computed using the formula: Theorial Revenue - Total Costs" msgstr "Izračunato pomoću formule: Prihodi Teorijski - Ukupni troškovi" #. module: account_analytic_analysis -#: constraint:ir.model:0 -msgid "" -"The Object name must start with x_ and not contain any special character !" -msgstr "" -"Ime objekta mora da počne sa x_ i ne sme da sadrži specijalne karaktere !" - -#. module: account_analytic_analysis -#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_new -#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_new -msgid "New Analytic Account" -msgstr "Novi analitički račun" - -#. module: account_analytic_analysis #: field:account.analytic.account,theorical_margin:0 msgid "Theorical Margin" msgstr "Teoretska margina" @@ -105,17 +89,6 @@ msgid "Real Margin Rate (%)" msgstr "Realna Stopa Margine (%)" #. module: account_analytic_analysis -#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_all_open -#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_all_open -msgid "Current Analytic Accounts" -msgstr "Tekući analitički računi" - -#. module: account_analytic_analysis -#: help:account.analytic.account,last_worked_date:0 -msgid "Date of the latest work done on this account." -msgstr "Datum najnovijeg rada obavljenog na ovom računu." - -#. module: account_analytic_analysis #: help:account.analytic.account,last_worked_invoiced_date:0 msgid "" "If invoice from the costs, this is the date of the latest work or cost that " @@ -126,8 +99,8 @@ msgstr "" #. module: account_analytic_analysis #: model:ir.ui.menu,name:account_analytic_analysis.menu_invoicing -msgid "Invoicing" -msgstr "Fakturiranje" +msgid "Billing" +msgstr "Obracunavanje" #. module: account_analytic_analysis #: field:account.analytic.account,last_worked_date:0 @@ -171,16 +144,9 @@ msgid "User" msgstr "Korisnik" #. module: account_analytic_analysis -#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_pending -#: model:ir.ui.menu,name:account_analytic_analysis.menu_analytic_account_to_valid_pending -msgid "My Pending Accounts" -msgstr "Moji računi na čekanju" - -#. module: account_analytic_analysis -#: model:ir.actions.act_window,name:account_analytic_analysis.action_hr_tree_invoiced_my -#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_hr_tree_invoiced_my -msgid "My Uninvoiced Entries" -msgstr "Moji nefakturirani Ulazi" +#: field:account.analytic.account,ca_to_invoice:0 +msgid "Uninvoiced Amount" +msgstr "Nefakturirani iznos" #. module: account_analytic_analysis #: help:account.analytic.account,real_margin:0 @@ -188,36 +154,19 @@ msgid "Computed using the formula: Invoiced Amount - Total Costs." msgstr "Izračunato korištenjem formule: Fakturirani iznos - Ukupni troškovi." #. module: account_analytic_analysis -#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed -#: model:ir.ui.menu,name:account_analytic_analysis.menu_analytic_account_managed -msgid "My Accounts" -msgstr "Moji računi" - -#. module: account_analytic_analysis -#: model:ir.module.module,description:account_analytic_analysis.module_meta_information -msgid "" -"Modify account analytic view to show\n" -"important data for project manager of services companies.\n" -"Add menu to show relevant information for each manager." -msgstr "" -"Promeni prozor analitičkog prikaza računa da bi video\n" -"važne podatke za projekt menadžer od usluznih kompanija.\n" -"Dodaj meni da prikaze relevantne informacije za svakog menadžera." - -#. module: account_analytic_analysis #: field:account.analytic.account,hours_qtt_non_invoiced:0 msgid "Uninvoiced Hours" msgstr "Nefakturirani sati" #. module: account_analytic_analysis -#: field:account.analytic.account,hours_quantity:0 -msgid "Hours Tot" -msgstr "Ukupno sati" +#: help:account.analytic.account,last_worked_date:0 +msgid "Date of the latest work done on this account." +msgstr "Datum najnovijeg rada obavljenog na ovom računu." #. module: account_analytic_analysis -#: model:ir.ui.menu,name:account_analytic_analysis.menu_account -msgid "Analytic Accounts" -msgstr "Analitička konta" +#: constraint:ir.ui.view:0 +msgid "Invalid XML for View Architecture!" +msgstr "Nevažeći XML za pregled arhitekture" #. module: account_analytic_analysis #: model:ir.module.module,shortdesc:account_analytic_analysis.module_meta_information @@ -225,14 +174,20 @@ msgid "report_account_analytic" msgstr "izvestaj_analitickog_konta" #. module: account_analytic_analysis +#: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_user +msgid "Hours Summary by User" +msgstr "Ukupno sati po Korisniku" + +#. module: account_analytic_analysis #: field:account.analytic.account,ca_invoiced:0 msgid "Invoiced Amount" msgstr "Fakturirani iznos" #. module: account_analytic_analysis -#: model:ir.ui.menu,name:account_analytic_analysis.next_id_71 -msgid "Financial Project Management" -msgstr "Finansijski Projekt Menadzment" +#: code:addons/account_analytic_analysis/account_analytic_analysis.py:0 +#, python-format +msgid "You try to bypass an access rule (Document type: %s)." +msgstr "Pokušavate da zaobiđete pravilo za pristup (Dokument tipa: %s)." #. module: account_analytic_analysis #: field:account.analytic.account,last_worked_invoiced_date:0 @@ -240,17 +195,6 @@ msgid "Date of Last Invoiced Cost" msgstr "Datum zadnje fakturiranog troška" #. module: account_analytic_analysis -#: field:account.analytic.account,ca_to_invoice:0 -msgid "Uninvoiced Amount" -msgstr "Nefakturirani iznos" - -#. module: account_analytic_analysis -#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_all_pending -#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_all_pending -msgid "Pending Analytic Accounts" -msgstr "Analitički računi na čekanju" - -#. module: account_analytic_analysis #: field:account.analytic.account,hours_qtt_invoiced:0 msgid "Invoiced Hours" msgstr "Fakturirani sati" @@ -258,7 +202,7 @@ msgstr "Fakturirani sati" #. module: account_analytic_analysis #: field:account.analytic.account,real_margin:0 msgid "Real Margin" -msgstr "Realna margina" +msgstr "Realna marza" #. module: account_analytic_analysis #: help:account.analytic.account,ca_invoiced:0 @@ -312,37 +256,43 @@ msgstr "Izračunato korištenjem formule: Fakturirani iznos / Ukupno sati" #. module: account_analytic_analysis #: field:account.analytic.account,revenue_per_hour:0 msgid "Revenue per Hours (real)" -msgstr "" +msgstr "Prihod po satiima ( stvarni)" #. module: account_analytic_analysis #: field:account_analytic_analysis.summary.month,unit_amount:0 #: field:account_analytic_analysis.summary.user,unit_amount:0 msgid "Total Time" -msgstr "" +msgstr "Ukupno Vreme" #. module: account_analytic_analysis #: field:account.analytic.account,month_ids:0 #: field:account_analytic_analysis.summary.month,month:0 msgid "Month" -msgstr "" +msgstr "Mesec" #. module: account_analytic_analysis #: field:account_analytic_analysis.summary.month,account_id:0 #: field:account_analytic_analysis.summary.user,account_id:0 +#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account msgid "Analytic Account" -msgstr "" +msgstr "Analitički konto" #. module: account_analytic_analysis #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_overpassed #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_managed_overpassed msgid "Overpassed Accounts" -msgstr "" +msgstr "Prekoračeni računi" #. module: account_analytic_analysis #: model:ir.actions.act_window,name:account_analytic_analysis.action_hr_tree_invoiced_all #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_hr_tree_invoiced_all msgid "All Uninvoiced Entries" -msgstr "" +msgstr "Sve nefakturirane stavke" + +#. module: account_analytic_analysis +#: field:account.analytic.account,hours_quantity:0 +msgid "Hours Tot" +msgstr "Ukupno sati" #. module: account_analytic_analysis #: help:account.analytic.account,total_cost:0 @@ -350,3 +300,50 @@ msgid "" "Total of costs for this account. It includes real costs (from invoices) and " "indirect costs, like time spent on timesheets." msgstr "" +"Ukupno troškova za ovaj račun. Uključuje stvarne troškove (iz faktura) i " +"indirektne troškove, kao, npr,vrijeme potrošeno na timesheetovima." + +#~ msgid "My Current Accounts" +#~ msgstr "Moji tekući računi" + +#~ msgid "Hours summary by user" +#~ msgstr "Sati sumarno od strane korisnika" + +#~ msgid "All Analytic Accounts" +#~ msgstr "Svi analitički računi" + +#~ msgid "New Analytic Account" +#~ msgstr "Novi analitički račun" + +#~ msgid "Current Analytic Accounts" +#~ msgstr "Tekući analitički računi" + +#~ msgid "Invoicing" +#~ msgstr "Fakturiranje" + +#~ msgid "My Pending Accounts" +#~ msgstr "Moji računi na čekanju" + +#~ msgid "My Uninvoiced Entries" +#~ msgstr "Moji nefakturirani Ulazi" + +#~ msgid "My Accounts" +#~ msgstr "Moji računi" + +#~ msgid "" +#~ "Modify account analytic view to show\n" +#~ "important data for project manager of services companies.\n" +#~ "Add menu to show relevant information for each manager." +#~ msgstr "" +#~ "Promeni prozor analitičkog prikaza računa da bi video\n" +#~ "važne podatke za projekt menadžer od usluznih kompanija.\n" +#~ "Dodaj meni da prikaze relevantne informacije za svakog menadžera." + +#~ msgid "Financial Project Management" +#~ msgstr "Finansijski Projekt Menadzment" + +#~ msgid "Pending Analytic Accounts" +#~ msgstr "Analitički računi na čekanju" + +#~ msgid "Analytic Accounts" +#~ msgstr "Analitička konta" diff --git a/addons/account_analytic_default/i18n/et.po b/addons/account_analytic_default/i18n/et.po index c48c34d610c..07449bef42e 100644 --- a/addons/account_analytic_default/i18n/et.po +++ b/addons/account_analytic_default/i18n/et.po @@ -6,34 +6,22 @@ msgid "" 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-11-09 16:10+0000\n" -"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n" +"POT-Creation-Date: 2010-10-18 17:46+0000\n" +"PO-Revision-Date: 2010-10-26 17:31+0000\n" +"Last-Translator: Jalakas <Unknown>\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-09-29 05:09+0000\n" +"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_analytic_default -#: view:account.analytic.default:0 -#: model:ir.actions.act_window,name:account_analytic_default.action_analytic_default_form -#: model:ir.ui.menu,name:account_analytic_default.menu_analytic_defaul_form -msgid "Analytic Defaults" -msgstr "Analüütilised vaikeväärtused" - -#. module: account_analytic_default #: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information msgid "Account Analytic Default" msgstr "Vaikimisi analüütiline konto" #. module: account_analytic_default -#: constraint:ir.ui.view:0 -msgid "Invalid XML for View Architecture!" -msgstr "Vigane XML vaate arhitektuurile!" - -#. module: account_analytic_default #: constraint:ir.model:0 msgid "" "The Object name must start with x_ and not contain any special character !" @@ -41,56 +29,160 @@ msgstr "" "Objekti nimi peab algama x_'ga ja ei tohi sisaldada ühtegi erisümbolit !" #. module: account_analytic_default +#: constraint:ir.ui.menu:0 +msgid "Error ! You can not create recursive Menu." +msgstr "Viga! Te ei saa luua rekursiivset menüüd." + +#. module: account_analytic_default +#: help:account.analytic.default,partner_id:0 +msgid "" +"select a partner which will use analytical account specified in analytic " +"default (eg. create new cutomer invoice or Sale order if we select this " +"partner, it will automatically take this as an analytical account)" +msgstr "" + +#. module: account_analytic_default +#: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner +#: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_product +#: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_user +msgid "Analytic Rules" +msgstr "Analüütilised reeglid" + +#. module: account_analytic_default +#: help:account.analytic.default,analytic_id:0 +msgid "Analytical Account" +msgstr "Analüütiline Konto" + +#. module: account_analytic_default #: view:account.analytic.default:0 -msgid "Seq" -msgstr "Jrk" +msgid "Current" +msgstr "" #. module: account_analytic_default -#: field:account.analytic.default,date_stop:0 -msgid "End Date" -msgstr "Lõppkuupäev" +#: view:account.analytic.default:0 +msgid "Group By..." +msgstr "" #. module: account_analytic_default -#: field:account.analytic.default,company_id:0 -msgid "Company" -msgstr "Ettevõte" +#: help:account.analytic.default,date_stop:0 +msgid "Default end date for this Analytical Account" +msgstr "" #. module: account_analytic_default -#: field:account.analytic.default,sequence:0 -msgid "Sequence" -msgstr "Jada" +#: constraint:ir.actions.act_window:0 +msgid "Invalid model name in the action definition." +msgstr "Vigane mudeli nimi toimingu definitsioonis." + +#. module: account_analytic_default +#: model:ir.model,name:account_analytic_default.model_stock_picking +msgid "Picking List" +msgstr "" + +#. module: account_analytic_default +#: view:account.analytic.default:0 +msgid "Conditions" +msgstr "Tingimused" #. module: account_analytic_default +#: help:account.analytic.default,company_id:0 +msgid "" +"select a company which will use analytical account specified in analytic " +"default (eg. create new cutomer invoice or Sale order if we select this " +"company, it will automatically take this as an analytical account)" +msgstr "" + +#. module: account_analytic_default +#: model:ir.model,name:account_analytic_default.model_sale_order_line +msgid "Sale Order Line" +msgstr "" + +#. module: account_analytic_default +#: help:account.analytic.default,date_start:0 +msgid "Default start date for this Analytical Account" +msgstr "" + +#. module: account_analytic_default +#: view:account.analytic.default:0 #: field:account.analytic.default,product_id:0 msgid "Product" msgstr "Toode" #. module: account_analytic_default -#: field:account.analytic.default,analytic_id:0 -msgid "Analytic Account" -msgstr "Analüütiline konto" +#: model:ir.model,name:account_analytic_default.model_account_analytic_default +msgid "Analytic Distribution" +msgstr "" #. module: account_analytic_default -#: model:ir.model,name:account_analytic_default.model_account_analytic_default -msgid "Analytic Distributions" -msgstr "Analüütilised jaotused" +#: view:account.analytic.default:0 +#: field:account.analytic.default,company_id:0 +msgid "Company" +msgstr "Ettevõte" #. module: account_analytic_default +#: view:account.analytic.default:0 #: field:account.analytic.default,user_id:0 msgid "User" msgstr "Kasutaja" #. module: account_analytic_default -#: constraint:ir.actions.act_window:0 -msgid "Invalid model name in the action definition." -msgstr "Vigane mudeli nimi toimingu definitsioonis." - -#. module: account_analytic_default #: model:ir.actions.act_window,name:account_analytic_default.act_account_acount_move_line_open msgid "Entries" msgstr "Kirjed" #. module: account_analytic_default +#: field:account.analytic.default,date_stop:0 +msgid "End Date" +msgstr "Lõppkuupäev" + +#. module: account_analytic_default +#: constraint:ir.ui.view:0 +msgid "Invalid XML for View Architecture!" +msgstr "Vigane XML vaate arhitektuurile!" + +#. module: account_analytic_default +#: help:account.analytic.default,user_id:0 +msgid "" +"select a user which will use analytical account specified in analytic default" +msgstr "" + +#. module: account_analytic_default +#: view:account.analytic.default:0 +#: model:ir.actions.act_window,name:account_analytic_default.action_analytic_default_list +#: model:ir.ui.menu,name:account_analytic_default.menu_analytic_default_list +msgid "Analytic Defaults" +msgstr "Analüütilised vaikeväärtused" + +#. module: account_analytic_default +#: help:account.analytic.default,product_id:0 +msgid "" +"select a product which will use analytical account specified in analytic " +"default (eg. create new cutomer invoice or Sale order if we select this " +"product, it will automatically take this as an analytical account)" +msgstr "" + +#. module: account_analytic_default +#: field:account.analytic.default,sequence:0 +msgid "Sequence" +msgstr "Jada" + +#. module: account_analytic_default +#: model:ir.model,name:account_analytic_default.model_account_invoice_line +msgid "Invoice Line" +msgstr "" + +#. module: account_analytic_default +#: view:account.analytic.default:0 +#: field:account.analytic.default,analytic_id:0 +msgid "Analytic Account" +msgstr "Analüütiline konto" + +#. module: account_analytic_default +#: view:account.analytic.default:0 +msgid "Accounts" +msgstr "Kontod" + +#. module: account_analytic_default +#: view:account.analytic.default:0 #: field:account.analytic.default,partner_id:0 msgid "Partner" msgstr "Partner" @@ -101,13 +193,14 @@ msgid "Start Date" msgstr "Alguskuupäev" #. module: account_analytic_default -#: view:account.analytic.default:0 -msgid "Conditions" -msgstr "Tingimused" +#: help:account.analytic.default,sequence:0 +msgid "" +"Gives the sequence order when displaying a list of analytic distribution" +msgstr "" +"Annab sorteeritud järjestuse, kui näidatakse nimekirja analüütilist jaotust" -#. module: account_analytic_default -#: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner -#: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_product -#: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_user -msgid "Analytic Rules" -msgstr "Analüütilised reeglid" +#~ msgid "Seq" +#~ msgstr "Jrk" + +#~ msgid "Analytic Distributions" +#~ msgstr "Analüütilised jaotused" diff --git a/addons/account_analytic_default/i18n/sr.po b/addons/account_analytic_default/i18n/sr.po index a5aca6fe52a..0d0e0cffdf9 100644 --- a/addons/account_analytic_default/i18n/sr.po +++ b/addons/account_analytic_default/i18n/sr.po @@ -7,34 +7,22 @@ msgid "" msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" -"POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-10-14 07:31+0000\n" +"POT-Creation-Date: 2010-10-18 17:46+0000\n" +"PO-Revision-Date: 2010-10-26 08:45+0000\n" "Last-Translator: OpenERP Administrators <Unknown>\n" "Language-Team: Serbian <sr@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-10-15 04:42+0000\n" +"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_analytic_default -#: view:account.analytic.default:0 -#: model:ir.actions.act_window,name:account_analytic_default.action_analytic_default_form -#: model:ir.ui.menu,name:account_analytic_default.menu_analytic_defaul_form -msgid "Analytic Defaults" -msgstr "Uobičajene postavke analitike" - -#. module: account_analytic_default #: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information msgid "Account Analytic Default" msgstr "Uobičajene postavke analize računa" #. module: account_analytic_default -#: constraint:ir.ui.view:0 -msgid "Invalid XML for View Architecture!" -msgstr "Nevažeći XML za pregled arhitekture" - -#. module: account_analytic_default #: constraint:ir.model:0 msgid "" "The Object name must start with x_ and not contain any special character !" @@ -42,56 +30,169 @@ msgstr "" "Ime objekta mora da počne sa x_ i ne sme da sadrži specijalne karaktere !" #. module: account_analytic_default +#: constraint:ir.ui.menu:0 +msgid "Error ! You can not create recursive Menu." +msgstr "Greska! Ne mozete kreirati rekursivni meni." + +#. module: account_analytic_default +#: help:account.analytic.default,partner_id:0 +msgid "" +"select a partner which will use analytical account specified in analytic " +"default (eg. create new cutomer invoice or Sale order if we select this " +"partner, it will automatically take this as an analytical account)" +msgstr "" +"Selektuj partnera koji ce koristiti analiticki konto specificiran kao " +"analiticki podrazumevani konto ( npr, kreiras novu fakturu, ili nabavnu " +"fakturu, i ako sad selektujemo partnera, on ce automatski ova podesavanja " +"kao svoj analiticki konto)" + +#. module: account_analytic_default +#: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner +#: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_product +#: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_user +msgid "Analytic Rules" +msgstr "Pravila analitike" + +#. module: account_analytic_default +#: help:account.analytic.default,analytic_id:0 +msgid "Analytical Account" +msgstr "Analiticka Konta" + +#. module: account_analytic_default #: view:account.analytic.default:0 -msgid "Seq" -msgstr "Red" +msgid "Current" +msgstr "Trenutni" #. module: account_analytic_default -#: field:account.analytic.default,date_stop:0 -msgid "End Date" -msgstr "Završni Datum" +#: view:account.analytic.default:0 +msgid "Group By..." +msgstr "Grupirano po" #. module: account_analytic_default -#: field:account.analytic.default,company_id:0 -msgid "Company" -msgstr "Preduzeće" +#: help:account.analytic.default,date_stop:0 +msgid "Default end date for this Analytical Account" +msgstr "podrzaumevani Krajnji datum za ovaj Analiticki Konto" #. module: account_analytic_default -#: field:account.analytic.default,sequence:0 -msgid "Sequence" -msgstr "Sekvenca" +#: constraint:ir.actions.act_window:0 +msgid "Invalid model name in the action definition." +msgstr "Pogrešno ime modela u definiciji akcije." #. module: account_analytic_default +#: model:ir.model,name:account_analytic_default.model_stock_picking +msgid "Picking List" +msgstr "Izborna Lista" + +#. module: account_analytic_default +#: view:account.analytic.default:0 +msgid "Conditions" +msgstr "Uslovi" + +#. module: account_analytic_default +#: help:account.analytic.default,company_id:0 +msgid "" +"select a company which will use analytical account specified in analytic " +"default (eg. create new cutomer invoice or Sale order if we select this " +"company, it will automatically take this as an analytical account)" +msgstr "" + +#. module: account_analytic_default +#: model:ir.model,name:account_analytic_default.model_sale_order_line +msgid "Sale Order Line" +msgstr "Stavke naloga za prodaju" + +#. module: account_analytic_default +#: help:account.analytic.default,date_start:0 +msgid "Default start date for this Analytical Account" +msgstr "Podrazumevani Pocetni datum za ovaj Analiticki konto" + +#. module: account_analytic_default +#: view:account.analytic.default:0 #: field:account.analytic.default,product_id:0 msgid "Product" msgstr "Proizvod" #. module: account_analytic_default -#: field:account.analytic.default,analytic_id:0 -msgid "Analytic Account" -msgstr "Analitički nalog" +#: model:ir.model,name:account_analytic_default.model_account_analytic_default +msgid "Analytic Distribution" +msgstr "Analitička Distribucija" #. module: account_analytic_default -#: model:ir.model,name:account_analytic_default.model_account_analytic_default -msgid "Analytic Distributions" -msgstr "Distribucije analitike" +#: view:account.analytic.default:0 +#: field:account.analytic.default,company_id:0 +msgid "Company" +msgstr "Preduzeće" #. module: account_analytic_default +#: view:account.analytic.default:0 #: field:account.analytic.default,user_id:0 msgid "User" msgstr "Korisnik" #. module: account_analytic_default -#: constraint:ir.actions.act_window:0 -msgid "Invalid model name in the action definition." -msgstr "Pogrešno ime modela u definiciji akcije." - -#. module: account_analytic_default #: model:ir.actions.act_window,name:account_analytic_default.act_account_acount_move_line_open msgid "Entries" msgstr "Stavke" #. module: account_analytic_default +#: field:account.analytic.default,date_stop:0 +msgid "End Date" +msgstr "Datum završetka" + +#. module: account_analytic_default +#: constraint:ir.ui.view:0 +msgid "Invalid XML for View Architecture!" +msgstr "Nevažeći XML za pregled arhitekture" + +#. module: account_analytic_default +#: help:account.analytic.default,user_id:0 +msgid "" +"select a user which will use analytical account specified in analytic default" +msgstr "" +"Izaberi korisnika koji ce koristiti onaj analiticki konto koji je " +"specificiran kao podrazumevani." + +#. module: account_analytic_default +#: view:account.analytic.default:0 +#: model:ir.actions.act_window,name:account_analytic_default.action_analytic_default_list +#: model:ir.ui.menu,name:account_analytic_default.menu_analytic_default_list +msgid "Analytic Defaults" +msgstr "Uobičajene postavke analitike" + +#. module: account_analytic_default +#: help:account.analytic.default,product_id:0 +msgid "" +"select a product which will use analytical account specified in analytic " +"default (eg. create new cutomer invoice or Sale order if we select this " +"product, it will automatically take this as an analytical account)" +msgstr "" +"Izaberi proizvod koji ce koristiti Analiticki konto koji je specificiran kao " +"podrazumevani ( npr, kada kreiras racun, ili narudzbenicu, i ako selektujes " +"ovaj proizvod, on ce automatski preuzeti ovaj kao svoj Analiticki konto)" + +#. module: account_analytic_default +#: field:account.analytic.default,sequence:0 +msgid "Sequence" +msgstr "Sekvenca" + +#. module: account_analytic_default +#: model:ir.model,name:account_analytic_default.model_account_invoice_line +msgid "Invoice Line" +msgstr "Faktura" + +#. module: account_analytic_default +#: view:account.analytic.default:0 +#: field:account.analytic.default,analytic_id:0 +msgid "Analytic Account" +msgstr "Analitički konto" + +#. module: account_analytic_default +#: view:account.analytic.default:0 +msgid "Accounts" +msgstr "Nalozi" + +#. module: account_analytic_default +#: view:account.analytic.default:0 #: field:account.analytic.default,partner_id:0 msgid "Partner" msgstr "Partner" @@ -99,16 +200,17 @@ msgstr "Partner" #. module: account_analytic_default #: field:account.analytic.default,date_start:0 msgid "Start Date" -msgstr "Početni datum" +msgstr "Datum početka" #. module: account_analytic_default -#: view:account.analytic.default:0 -msgid "Conditions" -msgstr "Uslovi" +#: help:account.analytic.default,sequence:0 +msgid "" +"Gives the sequence order when displaying a list of analytic distribution" +msgstr "" +"Daje redosled sekvence pri prikazivanju liste analiticke distribucije" -#. module: account_analytic_default -#: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner -#: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_product -#: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_user -msgid "Analytic Rules" -msgstr "Pravila analitike" +#~ msgid "Seq" +#~ msgstr "Red" + +#~ msgid "Analytic Distributions" +#~ msgstr "Distribucije analitike" diff --git a/addons/account_analytic_plans/i18n/sr.po b/addons/account_analytic_plans/i18n/sr.po index fc4ee2ee586..6c3f26dc10c 100644 --- a/addons/account_analytic_plans/i18n/sr.po +++ b/addons/account_analytic_plans/i18n/sr.po @@ -7,14 +7,14 @@ msgid "" msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" -"POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-10-14 07:31+0000\n" +"POT-Creation-Date: 2010-10-18 17:46+0000\n" +"PO-Revision-Date: 2010-10-26 08:43+0000\n" "Last-Translator: OpenERP Administrators <Unknown>\n" "Language-Team: Serbian <sr@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-10-15 04:42+0000\n" +"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_analytic_plans @@ -23,6 +23,11 @@ msgid "Account4 Id" msgstr "Šifra računa4" #. module: account_analytic_plans +#: constraint:ir.ui.menu:0 +msgid "Error ! You can not create recursive Menu." +msgstr "Greska! Ne mozete kreirati rekursivni meni." + +#. module: account_analytic_plans #: constraint:ir.model:0 msgid "" "The Object name must start with x_ and not contain any special character !" @@ -30,8 +35,10 @@ msgstr "" "Ime objekta mora da počne sa x_ i ne sme da sadrži specijalne karaktere !" #. module: account_analytic_plans +#: report:account.analytic.account.crossovered.analytic:0 +#: view:account.crossovered.analytic:0 +#: model:ir.actions.act_window,name:account_analytic_plans.action_account_crossovered_analytic #: model:ir.actions.report.xml,name:account_analytic_plans.account_analytic_account_crossovered_analytic -#: model:ir.actions.wizard,name:account_analytic_plans.account_analytic_account_inverted_balance_report msgid "Crossovered Analytic" msgstr "Unakrsna analitika" @@ -41,11 +48,16 @@ msgid "Account5 Id" msgstr "Šifra računa5" #. module: account_analytic_plans -#: wizard_field:wizard.crossovered.analytic,init,date2:0 +#: field:account.crossovered.analytic,date2:0 msgid "End Date" msgstr "Završni Datum" #. module: account_analytic_plans +#: field:account.analytic.plan.instance,account3_ids:0 +msgid "Account3 Id" +msgstr "Šifra računa3" + +#. module: account_analytic_plans #: field:account.analytic.plan.instance.line,rate:0 msgid "Rate (%)" msgstr "Stopa (%)" @@ -55,27 +67,41 @@ msgstr "Stopa (%)" #: field:account.analytic.plan,name:0 #: field:account.analytic.plan.line,plan_id:0 #: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_form_action +#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan #: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_plan_action msgid "Analytic Plan" msgstr "Analiticki Plan" #. module: account_analytic_plans +#: view:analytic.plan.create.model:0 +msgid "" +"This distribution model has been saved.You will be able to reuse it later." +msgstr "" +"Distribucioni model je sacuvan. Bicete u mogucnosti da ga kasnije koristite." + +#. module: account_analytic_plans +#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:0 +#, python-format +msgid "Please put a name and a code before saving the model !" +msgstr "Molim postavite Ime i sadrzaj pre nego sacuvate model !" + +#. module: account_analytic_plans #: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance_line msgid "Analytic Instance Line" -msgstr "" +msgstr "Red Analiticke Instance" #. module: account_analytic_plans #: view:account.analytic.plan.instance.line:0 msgid "Analytic Distribution Lines" -msgstr "Red analitičke instance" +msgstr "Red Analiticke Distribucije" #. module: account_analytic_plans -#: wizard_button:wizard.crossovered.analytic,init,print:0 +#: view:account.crossovered.analytic:0 msgid "Print" msgstr "Štampaj" #. module: account_analytic_plans -#: rml:account.analytic.account.crossovered.analytic:0 +#: report:account.analytic.account.crossovered.analytic:0 msgid "To Date" msgstr "Do datuma" @@ -90,9 +116,9 @@ msgid "Analytic Distribution's Models" msgstr "Modeli analitičke distribucije" #. module: account_analytic_plans -#: rml:account.analytic.account.crossovered.analytic:0 +#: report:account.analytic.account.crossovered.analytic:0 msgid "Account Name" -msgstr "Naziv računa" +msgstr "Naziv Naloga" #. module: account_analytic_plans #: view:account.analytic.plan.instance.line:0 @@ -110,88 +136,114 @@ msgid "Invalid model name in the action definition." msgstr "Pogrešno ime modela u definiciji akcije." #. module: account_analytic_plans -#: field:account.analytic.plan.line,name:0 -msgid "Plan Name" -msgstr "Ime Plana" - -#. module: account_analytic_plans -#: rml:account.analytic.account.crossovered.analytic:0 +#: report:account.analytic.account.crossovered.analytic:0 msgid "Printing date" msgstr "Datum stampe" #. module: account_analytic_plans -#: rml:account.analytic.account.crossovered.analytic:0 +#: report:account.analytic.account.crossovered.analytic:0 msgid "Percentage" msgstr "Procenat" #. module: account_analytic_plans -#: wizard_field:wizard.crossovered.analytic,init,empty_line:0 +#: model:ir.model,name:account_analytic_plans.model_sale_order_line +msgid "Sale Order Line" +msgstr "Stavke naloga za prodaju" + +#. module: account_analytic_plans +#: field:account.crossovered.analytic,empty_line:0 msgid "Dont show empty lines" -msgstr "Ne prikazuj prazme redove" +msgstr "Ne prikazuj prazne redove" #. module: account_analytic_plans -#: wizard_view:wizard.crossovered.analytic,init:0 -msgid "Select Information" -msgstr "Selektuj informaciju" +#: model:ir.actions.act_window,name:account_analytic_plans.action_analytic_plan_create_model +msgid "analytic.plan.create.model.action" +msgstr "analytic.plan.create.model.action" #. module: account_analytic_plans -#: field:account.analytic.plan.instance,account3_ids:0 -msgid "Account3 Id" -msgstr "Šifra računa3" +#: code:addons/account_analytic_plans/account_analytic_plans.py:0 +#, python-format +msgid "A model having this name and code already exists !" +msgstr "Model sa ovim imenom i sadrzajem vec postoji !" #. module: account_analytic_plans #: field:account.analytic.plan.instance,journal_id:0 -#: wizard_field:wizard.crossovered.analytic,init,journal_ids:0 +#: view:account.crossovered.analytic:0 +#: field:account.crossovered.analytic,journal_ids:0 msgid "Analytic Journal" msgstr "Analiticki Dnevnik" #. module: account_analytic_plans -#: rml:account.analytic.account.crossovered.analytic:0 +#: report:account.analytic.account.crossovered.analytic:0 msgid "100.00%" msgstr "100.00%" #. module: account_analytic_plans -#: wizard_field:wizard.crossovered.analytic,init,ref:0 -msgid "Analytic Account Ref." -msgstr "Veza analitičkog konta" +#: report:account.analytic.account.crossovered.analytic:0 +msgid "Currency" +msgstr "Valuta" #. module: account_analytic_plans -#: rml:account.analytic.account.crossovered.analytic:0 +#: report:account.analytic.account.crossovered.analytic:0 msgid "Analytic Account :" msgstr "Analiticki konto :" #. module: account_analytic_plans #: view:account.analytic.plan.line:0 +#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_line msgid "Analytic Plan Line" msgstr "Red Analitickog Plana" #. module: account_analytic_plans -#: rml:account.analytic.account.crossovered.analytic:0 +#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:0 +#, python-format +msgid "No analytic plan defined !" +msgstr "Analiticki plan nije definisan !" + +#. module: account_analytic_plans +#: report:account.analytic.account.crossovered.analytic:0 msgid "Analytic Account Reference:" msgstr "Veza analitičkog konta:" #. module: account_analytic_plans -#: model:ir.actions.wizard,name:account_analytic_plans.create_model -msgid "Create Model" -msgstr "Kreiraj Model" +#: field:account.analytic.plan.line,name:0 +msgid "Plan Name" +msgstr "Ime Plana" #. module: account_analytic_plans #: field:account.analytic.plan,default_instance_id:0 msgid "Default Entries" -msgstr "Uobičajene stavke" +msgstr "Podrazumevane Stavke" + +#. module: account_analytic_plans +#: code:addons/account_analytic_plans/account_analytic_plans.py:0 +#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:0 +#, python-format +msgid "Error" +msgstr "Greška" #. module: account_analytic_plans #: view:account.analytic.plan:0 #: field:account.analytic.plan,plan_ids:0 #: field:account.journal,plan_id:0 -#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan msgid "Analytic Plans" msgstr "Analitički planovi" #. module: account_analytic_plans -#: field:account.analytic.plan.line,min_required:0 -msgid "Minimum Allowed (%)" -msgstr "Minimalno dozvoljeno (%)" +#: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:0 +#, python-format +msgid "User Error" +msgstr "Korisnicka Greska" + +#. module: account_analytic_plans +#: model:ir.model,name:account_analytic_plans.model_account_move_line +msgid "Journal Items" +msgstr "Sadrzaj Dnevnika" + +#. module: account_analytic_plans +#: model:ir.model,name:account_analytic_plans.model_analytic_plan_create_model +msgid "analytic.plan.create.model" +msgstr "analytic.plan.create.model" #. module: account_analytic_plans #: field:account.analytic.plan.instance,account1_ids:0 @@ -204,9 +256,16 @@ msgid "Maximum Allowed (%)" msgstr "Maksimalno dozvoljeno (%)" #. module: account_analytic_plans -#: wizard_view:create.model,info:0 +#: field:account.analytic.plan.line,root_analytic_id:0 +msgid "Root Account" +msgstr "Osnovni nalog (root)" + +#. module: account_analytic_plans +#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:0 +#: view:analytic.plan.create.model:0 +#, python-format msgid "Distribution Model Saved" -msgstr "Model distribucije je sacuvan" +msgstr "Distribucioni model je sacuvan" #. module: account_analytic_plans #: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance @@ -224,6 +283,62 @@ msgid "Distribution Models" msgstr "Dsitribucioni Modeli" #. module: account_analytic_plans +#: view:analytic.plan.create.model:0 +msgid "Ok" +msgstr "U redu" + +#. module: account_analytic_plans +#: model:ir.module.module,shortdesc:account_analytic_plans.module_meta_information +msgid "Multiple-plans management in Analytic Accounting" +msgstr "Visestruki-planovi menadzmenta u Analitickom racunovodstvu" + +#. module: account_analytic_plans +#: view:account.analytic.plan.line:0 +msgid "Analytic Plan Lines" +msgstr "Redovi analitičkog plana" + +#. module: account_analytic_plans +#: field:account.analytic.plan.line,min_required:0 +msgid "Minimum Allowed (%)" +msgstr "Minimalno dozvoljeno (%)" + +#. module: account_analytic_plans +#: field:account.analytic.plan.instance,plan_id:0 +msgid "Model's Plan" +msgstr "Plan modela" + +#. module: account_analytic_plans +#: field:account.analytic.plan.instance,account2_ids:0 +msgid "Account2 Id" +msgstr "Šifra računa2" + +#. module: account_analytic_plans +#: code:addons/account_analytic_plans/account_analytic_plans.py:0 +#, python-format +msgid "The Total Should be Between %s and %s" +msgstr "Ukupni iznos bi trebalo da se nalazi izmedju %s i %s" + +#. module: account_analytic_plans +#: model:ir.model,name:account_analytic_plans.model_account_bank_statement_line +msgid "Bank Statement Line" +msgstr "Red bankovnog izvoda" + +#. module: account_analytic_plans +#: report:account.analytic.account.crossovered.analytic:0 +msgid "Amount" +msgstr "Iznos" + +#. module: account_analytic_plans +#: model:ir.model,name:account_analytic_plans.model_account_crossovered_analytic +msgid "Print Crossovered Analytic" +msgstr "Stampa Unakrsne Analitike" + +#. module: account_analytic_plans +#: field:account.analytic.plan.instance,account6_ids:0 +msgid "Account6 Id" +msgstr "Šifra računa6" + +#. module: account_analytic_plans #: model:ir.module.module,description:account_analytic_plans.module_meta_information msgid "" "This module allows to use several analytic plans, according to the general " @@ -255,109 +370,53 @@ msgid "" "So when this line of invoice will be confirmed, it will generate 3 analytic " "lines,\n" "for one account entry.\n" +"The analytic plan validates the minimum and maximum percentage at the time " +"of creation\n" +"of distribution models.\n" " " msgstr "" -"Ovaj modul vam omogucava da koristite nekoliko analiticka plana, koji " -"odgovaraju osnovnom dnevniku,\n" -"i tako visestruko analizirate stavke kreirane kada je racun ili stavka\n" -"potvrdjena\n" -"\n" -"Na primer, mozete definisati sledecu analiticku strukturu:\n" -" Projekat\n" -" Projekat 1\n" -" SubProj 1.1\n" -" SubProj 1.2\n" -" Projekat 2\n" -" Prodavac\n" -" Janko\n" -" Marko\n" -"\n" -"Ovde imamo dva plana. Projekat i Prodavac. Red racuna mora da\n" -"moze da napise analiticke stavke u 2 plana: SubProj 1.1 i\n" -"Marko. Iznos se takodje deli. Sledeci primer je za racune koji \n" -"su zajednicko sa dva subprojekta i dodati su jednom prodavcu:\n" -"\n" -"Plan1:\n" -" SubProj 1.1 : 50%\n" -" SubProj 1.2 : 50%\n" -"PLan2:\n" -" Janko: 100%\n" -"\n" -"Tako da kad se ova linija racuna potvrdi, ona ce generisati 3 \n" -"analiticke linije za jednu stavku racuna.\n" -" " - -#. module: account_analytic_plans -#: model:ir.module.module,shortdesc:account_analytic_plans.module_meta_information -msgid "Multiple-plans management in Analytic Accounting" -msgstr "Visestruki-planovi menadzmenta u Analitickom racunovodstvu" - -#. module: account_analytic_plans -#: view:account.analytic.plan.line:0 -#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_line -msgid "Analytic Plan Lines" -msgstr "Redovi analitičkog plana" - -#. module: account_analytic_plans -#: rml:account.analytic.account.crossovered.analytic:0 -msgid "Crossovered Analytic -" -msgstr "Unakrsna Analitika-" - -#. module: account_analytic_plans -#: field:account.analytic.plan.instance,plan_id:0 -msgid "Model's Plan" -msgstr "Plan modela" - -#. module: account_analytic_plans -#: field:account.analytic.plan.instance,account2_ids:0 -msgid "Account2 Id" -msgstr "Šifra računa2" - -#. module: account_analytic_plans -#: rml:account.analytic.account.crossovered.analytic:0 -msgid "Amount" -msgstr "Iznos" #. module: account_analytic_plans -#: help:account.analytic.plan.line,root_analytic_id:0 -msgid "Root account of this plan." -msgstr "Osnovni konto ovog plana." +#: view:analytic.plan.create.model:0 +msgid "Save This Distribution as a Model" +msgstr "Sacuvaj Ovu Distribuciju kao Model" #. module: account_analytic_plans -#: field:account.analytic.plan.instance,account6_ids:0 -msgid "Account6 Id" -msgstr "Šifra računa6" - -#. module: account_analytic_plans -#: rml:account.analytic.account.crossovered.analytic:0 +#: report:account.analytic.account.crossovered.analytic:0 msgid "Quantity" msgstr "Količina" #. module: account_analytic_plans +#: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_multi_plan_action +msgid "Multi Plans" +msgstr "Multi-Planovi" + +#. module: account_analytic_plans #: field:account.analytic.plan.instance,account_ids:0 msgid "Account Id" msgstr "Šifra konta" #. module: account_analytic_plans -#: rml:account.analytic.account.crossovered.analytic:0 +#: report:account.analytic.account.crossovered.analytic:0 msgid "Code" msgstr "Kod" #. module: account_analytic_plans -#: wizard_button:create.model,info,end:0 -msgid "OK" -msgstr "U redu" +#: model:ir.model,name:account_analytic_plans.model_account_journal +msgid "Journal" +msgstr "Dnevnik" #. module: account_analytic_plans -#: field:account.analytic.plan.line,root_analytic_id:0 -msgid "Root Account" -msgstr "Osnovni nalog (root)" +#: code:addons/account_analytic_plans/account_analytic_plans.py:0 +#, python-format +msgid "You have to define an analytic journal on the '%s' journal!" +msgstr "TReba da definises analiticki dnevnik u '%s' dnevnika!" #. module: account_analytic_plans -#: wizard_view:create.model,info:0 -msgid "" -"This distribution model has been saved. You will be able to reuse it later." -msgstr "Distribucijski Model je sacuvan. Možete ga koristiti kasnije." +#: code:addons/account_analytic_plans/account_analytic_plans.py:0 +#, python-format +msgid "No Analytic Journal !" +msgstr "Nema Analitickog Dnevnika" #. module: account_analytic_plans #: field:account.analytic.plan.line,sequence:0 @@ -365,6 +424,16 @@ msgid "Sequence" msgstr "Sekvenca" #. module: account_analytic_plans +#: model:ir.model,name:account_analytic_plans.model_account_invoice_line +msgid "Invoice Line" +msgstr "Faktura" + +#. module: account_analytic_plans +#: model:ir.model,name:account_analytic_plans.model_account_bank_statement +msgid "Bank Statement" +msgstr "Izvod banke" + +#. module: account_analytic_plans #: field:account.analytic.plan.instance.line,analytic_account_id:0 msgid "Analytic Account" msgstr "Analitički nalog" @@ -373,32 +442,140 @@ msgstr "Analitički nalog" #: field:account.analytic.default,analytics_id:0 #: view:account.analytic.plan.instance:0 #: field:account.analytic.plan.instance,name:0 +#: field:account.bank.statement.line,analytics_id:0 #: field:account.invoice.line,analytics_id:0 #: field:account.move.line,analytics_id:0 +#: model:ir.model,name:account_analytic_plans.model_account_analytic_default msgid "Analytic Distribution" msgstr "Analitička Distribucija" #. module: account_analytic_plans -#: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_plan_instance_action -msgid "Analytic Distribution's models" -msgstr "Modeli Analitičkih Distribucija" +#: code:addons/account_analytic_plans/account_analytic_plans.py:0 +#, python-format +msgid "Value Error" +msgstr "Pogresna Vrednost" #. module: account_analytic_plans -#: wizard_button:wizard.crossovered.analytic,init,end:0 +#: help:account.analytic.plan.line,root_analytic_id:0 +msgid "Root account of this plan." +msgstr "Osnovni konto ovog plana." + +#. module: account_analytic_plans +#: field:account.crossovered.analytic,ref:0 +msgid "Analytic Account Reference" +msgstr "referenca Analitickjog naloga" + +#. module: account_analytic_plans +#: model:ir.model,name:account_analytic_plans.model_account_invoice +msgid "Invoice" +msgstr "Račun" + +#. module: account_analytic_plans +#: view:account.crossovered.analytic:0 +#: view:analytic.plan.create.model:0 msgid "Cancel" msgstr "Otkaži" #. module: account_analytic_plans -#: wizard_field:wizard.crossovered.analytic,init,date1:0 +#: field:account.crossovered.analytic,date1:0 msgid "Start Date" msgstr "Početni datum" #. module: account_analytic_plans -#: rml:account.analytic.account.crossovered.analytic:0 +#: report:account.analytic.account.crossovered.analytic:0 msgid "at" msgstr "u" #. module: account_analytic_plans -#: rml:account.analytic.account.crossovered.analytic:0 +#: report:account.analytic.account.crossovered.analytic:0 +msgid "Company" +msgstr "Preduzeće" + +#. module: account_analytic_plans +#: report:account.analytic.account.crossovered.analytic:0 msgid "From Date" msgstr "Od datuma" + +#~ msgid "Analytic Account Ref." +#~ msgstr "Veza analitičkog konta" + +#~ msgid "Select Information" +#~ msgstr "Selektuj informaciju" + +#~ msgid "Create Model" +#~ msgstr "Kreiraj Model" + +#~ msgid "" +#~ "This module allows to use several analytic plans, according to the general " +#~ "journal,\n" +#~ "so that multiple analytic lines are created when the invoice or the entries\n" +#~ "are confirmed.\n" +#~ "\n" +#~ "For example, you can define the following analytic structure:\n" +#~ " Projects\n" +#~ " Project 1\n" +#~ " SubProj 1.1\n" +#~ " SubProj 1.2\n" +#~ " Project 2\n" +#~ " Salesman\n" +#~ " Eric\n" +#~ " Fabien\n" +#~ "\n" +#~ "Here, we have two plans: Projects and Salesman. An invoice line must\n" +#~ "be able to write analytic entries in the 2 plans: SubProj 1.1 and\n" +#~ "Fabien. The amount can also be split. The following example is for\n" +#~ "an invoice that touches the two subproject and assigned to one salesman:\n" +#~ "\n" +#~ "Plan1:\n" +#~ " SubProject 1.1 : 50%\n" +#~ " SubProject 1.2 : 50%\n" +#~ "Plan2:\n" +#~ " Eric: 100%\n" +#~ "\n" +#~ "So when this line of invoice will be confirmed, it will generate 3 analytic " +#~ "lines,\n" +#~ "for one account entry.\n" +#~ " " +#~ msgstr "" +#~ "Ovaj modul vam omogucava da koristite nekoliko analiticka plana, koji " +#~ "odgovaraju osnovnom dnevniku,\n" +#~ "i tako visestruko analizirate stavke kreirane kada je racun ili stavka\n" +#~ "potvrdjena\n" +#~ "\n" +#~ "Na primer, mozete definisati sledecu analiticku strukturu:\n" +#~ " Projekat\n" +#~ " Projekat 1\n" +#~ " SubProj 1.1\n" +#~ " SubProj 1.2\n" +#~ " Projekat 2\n" +#~ " Prodavac\n" +#~ " Janko\n" +#~ " Marko\n" +#~ "\n" +#~ "Ovde imamo dva plana. Projekat i Prodavac. Red racuna mora da\n" +#~ "moze da napise analiticke stavke u 2 plana: SubProj 1.1 i\n" +#~ "Marko. Iznos se takodje deli. Sledeci primer je za racune koji \n" +#~ "su zajednicko sa dva subprojekta i dodati su jednom prodavcu:\n" +#~ "\n" +#~ "Plan1:\n" +#~ " SubProj 1.1 : 50%\n" +#~ " SubProj 1.2 : 50%\n" +#~ "PLan2:\n" +#~ " Janko: 100%\n" +#~ "\n" +#~ "Tako da kad se ova linija racuna potvrdi, ona ce generisati 3 \n" +#~ "analiticke linije za jednu stavku racuna.\n" +#~ " " + +#~ msgid "Crossovered Analytic -" +#~ msgstr "Unakrsna Analitika-" + +#~ msgid "Analytic Distribution's models" +#~ msgstr "Modeli Analitičkih Distribucija" + +#~ msgid "" +#~ "This distribution model has been saved. You will be able to reuse it later." +#~ msgstr "Distribucijski Model je sacuvan. Možete ga koristiti kasnije." + +#~ msgid "OK" +#~ msgstr "U redu" diff --git a/addons/account_anglo_saxon/i18n/de.po b/addons/account_anglo_saxon/i18n/de.po index 27439bf449d..ba1699e16c2 100644 --- a/addons/account_anglo_saxon/i18n/de.po +++ b/addons/account_anglo_saxon/i18n/de.po @@ -1,58 +1,91 @@ -# German 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 <EMAIL@ADDRESS>, 2010. +# Translation of OpenERP Server. +# This file contains the translation of the following modules: +# * account_anglo_saxon # msgid "" msgstr "" -"Project-Id-Version: openobject-addons\n" -"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" -"POT-Creation-Date: 2009-11-24 12:50+0000\n" -"PO-Revision-Date: 2010-10-05 13:15+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Project-Id-Version: OpenERP Server 6.0dev\n" +"Report-Msgid-Bugs-To: support@openerp.com\n" +"POT-Creation-Date: 2010-10-18 17:46+0000\n" +"PO-Revision-Date: 2010-10-26 18:09+0000\n" +"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-" +"consulting.net>\n" "Language-Team: German <de@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-10-08 04:39+0000\n" +"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_anglo_saxon -#: view:product.category:0 -msgid " Accounting Property" +#: constraint:ir.ui.view:0 +msgid "Invalid XML for View Architecture!" +msgstr "Fehler in XML Quellen für diese Ansicht" + +#. module: account_anglo_saxon +#: model:ir.model,name:account_anglo_saxon.model_product_category +msgid "Product Category" msgstr "" #. module: account_anglo_saxon -#: model:ir.module.module,description:account_anglo_saxon.module_meta_information +#: constraint:ir.model:0 msgid "" -"This module will support the Anglo-Saxons accounting methodology by \n" -" changing the accounting logic with stock transactions. The difference " -"between the Anglo-Saxon accounting countries \n" -" and the Rhine or also called Continental accounting countries is the " -"moment of taking the Cost of Goods Sold versus Cost of Sales. \n" -" Anglo-Saxons accounting does take the cost when sales invoice is " -"created, Continental accounting will take the cost at he moment the goods " -"are shipped.\n" -" This module will add this functionality by using a interim account, to " -"store the value of shipped goods and will contra book this interim account \n" -" when the invoice is created to transfer this amount to the debtor or " -"creditor account." +"The Object name must start with x_ and not contain any special character !" msgstr "" #. module: account_anglo_saxon -#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information -msgid "Stock Account" +#: model:ir.model,name:account_anglo_saxon.model_account_invoice_line +msgid "Invoice Line" msgstr "" #. module: account_anglo_saxon -#: constraint:ir.ui.view:0 -msgid "Invalid XML for View Architecture!" +#: model:ir.model,name:account_anglo_saxon.model_purchase_order +msgid "Purchase Order" +msgstr "" + +#. module: account_anglo_saxon +#: model:ir.model,name:account_anglo_saxon.model_product_template +msgid "Product Template" +msgstr "" + +#. module: account_anglo_saxon +#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information +msgid "Stock Accounting for Anglo Saxon countries" msgstr "" #. module: account_anglo_saxon #: field:product.category,property_account_creditor_price_difference_categ:0 #: field:product.template,property_account_creditor_price_difference:0 msgid "Price Difference Account" +msgstr "Konto Preisdifferenz" + +#. module: account_anglo_saxon +#: model:ir.model,name:account_anglo_saxon.model_account_invoice +msgid "Invoice" +msgstr "" + +#. module: account_anglo_saxon +#: model:ir.model,name:account_anglo_saxon.model_stock_picking +msgid "Picking List" +msgstr "" + +#. module: account_anglo_saxon +#: model:ir.module.module,description:account_anglo_saxon.module_meta_information +msgid "" +"This module will support the Anglo-Saxons accounting methodology by\n" +" changing the accounting logic with stock transactions. The difference " +"between the Anglo-Saxon accounting countries\n" +" and the Rhine or also called Continental accounting countries is the " +"moment of taking the Cost of Goods Sold versus Cost of Sales.\n" +" Anglo-Saxons accounting does take the cost when sales invoice is " +"created, Continental accounting will take the cost at the moment the goods " +"are shipped.\n" +" This module will add this functionality by using a interim account, to " +"store the value of shipped goods and will contra book this interim account\n" +" when the invoice is created to transfer this amount to the debtor or " +"creditor account.\n" +" Secondly, price differences between actual purchase price and fixed " +"product standard price are booked on a separate account" msgstr "" #. module: account_anglo_saxon @@ -62,3 +95,6 @@ msgid "" "This account will be used to value price difference between purchase price " "and cost price." msgstr "" +"Dieses Konto wird genutzt, um Unterschiede zwischen Einkaufs- und " +"Verkaufspreis der Rechnung und Durchschnittspreisen zum Zeitpunkt des " +"Warenzu- oder Warenabgangs als Preisdifferenz zu buchen." diff --git a/addons/account_budget/i18n/es.po b/addons/account_budget/i18n/es.po index 40fc2f92db2..73efedb2aa8 100644 --- a/addons/account_budget/i18n/es.po +++ b/addons/account_budget/i18n/es.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-10-18 17:46+0000\n" -"PO-Revision-Date: 2010-10-24 22:06+0000\n" -"Last-Translator: Carlos @ smile.fr <Unknown>\n" +"PO-Revision-Date: 2010-10-25 07:16+0000\n" +"Last-Translator: Carlos-smile <Unknown>\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-10-25 04:39+0000\n" +"X-Launchpad-Export-Date: 2010-10-26 04:40+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_budget diff --git a/addons/account_budget/i18n/sr.po b/addons/account_budget/i18n/sr.po index c98287d9e32..93406a03ca4 100644 --- a/addons/account_budget/i18n/sr.po +++ b/addons/account_budget/i18n/sr.po @@ -7,14 +7,14 @@ msgid "" msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" -"POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-10-15 08:22+0000\n" -"Last-Translator: OpenERP Administrators <Unknown>\n" +"POT-Creation-Date: 2010-10-18 17:46+0000\n" +"PO-Revision-Date: 2010-10-26 08:06+0000\n" +"Last-Translator: zmmaj <Unknown>\n" "Language-Team: Serbian <sr@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n" +"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_budget @@ -23,9 +23,9 @@ msgid "Responsible User" msgstr "Odgovorni korisnik" #. module: account_budget -#: rml:account.budget:0 -msgid "% performance" -msgstr "% performansa" +#: selection:crossovered.budget,state:0 +msgid "Confirmed" +msgstr "Potvrđeno" #. module: account_budget #: model:ir.actions.act_window,name:account_budget.open_budget_post_form @@ -39,8 +39,8 @@ msgid "Invalid model name in the action definition." msgstr "Pogrešno ime modela u definiciji akcije." #. module: account_budget -#: rml:account.analytic.account.budget:0 -#: rml:crossovered.budget.report:0 +#: report:account.budget:0 +#: report:crossovered.budget.report:0 msgid "Printed at:" msgstr "Ispisano na:" @@ -55,63 +55,62 @@ msgid "Validate User" msgstr "Potvrdi korisnika" #. module: account_budget -#: constraint:ir.model:0 -msgid "" -"The Object name must start with x_ and not contain any special character !" -msgstr "" -"Ime objekta mora da počne sa x_ i ne sme da sadrži specijalne karaktere !" +#: model:ir.actions.act_window,name:account_budget.action_account_budget_crossvered_summary_report +msgid "Print Summary" +msgstr "Stampa Suamrnog" #. module: account_budget -#: selection:crossovered.budget,state:0 -msgid "Confirmed" -msgstr "Potvrđeno" +#: field:crossovered.budget.lines,paid_date:0 +msgid "Paid Date" +msgstr "Datum plaćanja" #. module: account_budget -#: wizard_field:account.budget.report,init,date2:0 -#: wizard_field:wizard.analytic.account.budget.report,init,date_to:0 -#: wizard_field:wizard.crossovered.budget,init,date_to:0 -#: wizard_field:wizard.crossovered.budget.summary,init,date_to:0 +#: field:account.budget.analytic,date_to:0 +#: field:account.budget.crossvered.report,date_to:0 +#: field:account.budget.crossvered.summary.report,date_to:0 +#: field:account.budget.report,date_to:0 msgid "End of period" msgstr "Završetak perioda" #. module: account_budget -#: rml:account.budget:0 -msgid "Printing date:" -msgstr "Datum Stampe:" - -#. module: account_budget +#: view:crossovered.budget:0 #: selection:crossovered.budget,state:0 msgid "Draft" msgstr "Priprema" #. module: account_budget -#: rml:account.analytic.account.budget:0 -#: rml:account.budget:0 -#: rml:crossovered.budget.report:0 +#: report:account.budget:0 +#: report:crossovered.budget.report:0 msgid "at" msgstr "u" #. module: account_budget -#: view:account.budget.post:0 -msgid "Dotations" -msgstr "Dotacija" +#: constraint:ir.ui.menu:0 +msgid "Error ! You can not create recursive Menu." +msgstr "Greska! Ne mozete kreirati rekursivni meni." #. module: account_budget -#: rml:account.budget:0 -msgid "Performance" -msgstr "Performansa" - -#. module: account_budget -#: rml:account.analytic.account.budget:0 -#: rml:account.budget:0 -#: rml:crossovered.budget.report:0 +#: report:account.budget:0 +#: report:crossovered.budget.report:0 msgid "Currency:" msgstr "Valuta:" #. module: account_budget -#: rml:account.budget:0 -msgid "From" -msgstr "Od" +#: constraint:ir.model:0 +msgid "" +"The Object name must start with x_ and not contain any special character !" +msgstr "" +"Ime objekta mora da počne sa x_ i ne sme da sadrži specijalne karaktere !" + +#. module: account_budget +#: model:ir.model,name:account_budget.model_account_budget_crossvered_report +msgid "Account Budget crossvered report" +msgstr "Izvestaj Unakrsnog budzeta Naloga" + +#. module: account_budget +#: selection:crossovered.budget,state:0 +msgid "Validated" +msgstr "Potvrđeno" #. module: account_budget #: field:crossovered.budget.lines,percentage:0 @@ -119,133 +118,67 @@ msgid "Percentage" msgstr "Procenat" #. module: account_budget -#: rml:account.budget:0 -msgid "Results" -msgstr "Резултати" - -#. module: account_budget #: field:crossovered.budget,state:0 msgid "Status" msgstr "Status" #. module: account_budget -#: model:ir.module.module,description:account_budget.module_meta_information -msgid "" -"This module allows accountants to manage analytic and crossovered budgets.\n" -"\n" -"Once the Master Budgets and the Budgets defined (in Financial\n" -"Management/Budgets/), the Project Managers can set the planned amount on " -"each\n" -"Analytic Account.\n" -"\n" -"The accountant has the possibility to see the total of amount planned for " -"each\n" -"Budget and Master Budget in order to ensure the total planned is not\n" -"greater/lower than what he planned for this Budget/Master Budget. Each list " -"of\n" -"record can also be switched to a graphical view of it.\n" -"\n" -"Three reports are available:\n" -" 1. The first is available from a list of Budgets. It gives the " -"spreading, for these Budgets, of the Analytic Accounts per Master Budgets.\n" -"\n" -" 2. The second is a summary of the previous one, it only gives the " -"spreading, for the selected Budgets, of the Analytic Accounts.\n" -"\n" -" 3. The last one is available from the Analytic Chart of Accounts. It " -"gives the spreading, for the selected Analytic Accounts, of the Master " -"Budgets per Budgets.\n" -"\n" -msgstr "" +#: view:account.budget.crossvered.summary.report:0 +msgid "This wizard is used to print summary of budgets" +msgstr "Ovaj carobnjak je koriscen za prikaz sumarnog budzeta" #. module: account_budget -#: rml:account.budget:0 -#: rml:crossovered.budget.report:0 +#: report:crossovered.budget.report:0 msgid "%" msgstr "%" #. module: account_budget -#: rml:account.analytic.account.budget:0 -#: rml:crossovered.budget.report:0 +#: report:account.budget:0 +#: report:crossovered.budget.report:0 msgid "Description" msgstr "Opis" #. module: account_budget -#: rml:account.analytic.account.budget:0 -msgid "Analytic Account :" -msgstr "Analiticki konto :" - -#. module: account_budget -#: wizard_button:account.budget.report,init,report:0 -#: wizard_button:wizard.analytic.account.budget.report,init,report:0 -#: wizard_button:wizard.crossovered.budget,init,report:0 -#: wizard_button:wizard.crossovered.budget.summary,init,report:0 -msgid "Print" -msgstr "Štampaj" +#: field:account.budget.post,company_id:0 +#: field:crossovered.budget,company_id:0 +#: field:crossovered.budget.lines,company_id:0 +msgid "Company" +msgstr "Preduzeće" #. module: account_budget -#: rml:account.budget:0 -msgid "A/c No." -msgstr "Račun br." - -#. module: account_budget -#: rml:account.analytic.account.budget:0 -#: rml:account.budget:0 -#: rml:crossovered.budget.report:0 -msgid "to" -msgstr "do" - -#. module: account_budget -#: rml:account.analytic.account.budget:0 -#: rml:account.budget:0 -#: rml:crossovered.budget.report:0 -msgid "Total :" -msgstr "Ukupno:" +#: view:crossovered.budget:0 +msgid "Reset to Draft" +msgstr "Vrati na Pripremu" #. module: account_budget -#: rml:account.analytic.account.budget:0 +#: view:account.budget.post:0 +#: view:crossovered.budget:0 #: field:crossovered.budget.lines,planned_amount:0 -#: rml:crossovered.budget.report:0 msgid "Planned Amount" msgstr "Planirani iznos" #. module: account_budget -#: rml:account.analytic.account.budget:0 -#: rml:crossovered.budget.report:0 +#: report:account.budget:0 +#: report:crossovered.budget.report:0 msgid "Perc(%)" msgstr "Proc(%)" #. module: account_budget -#: rml:account.budget:0 -msgid "Period Budget" -msgstr "Budžetsko razdoblje" - -#. module: account_budget -#: rml:account.budget:0 -msgid "Budget Analysis" -msgstr "Analiza Budžeta" - -#. module: account_budget #: view:crossovered.budget:0 #: selection:crossovered.budget,state:0 msgid "Done" msgstr "Gotovo" #. module: account_budget -#: view:crossovered.budget:0 -msgid "Validate" -msgstr "Overi" - -#. module: account_budget -#: wizard_view:wizard.crossovered.budget,init:0 -#: wizard_view:wizard.crossovered.budget.summary,init:0 -msgid "Select Options" -msgstr "Selektuj Opciju" +#: report:account.budget:0 +#: report:crossovered.budget.report:0 +msgid "Practical Amt" +msgstr "" #. module: account_budget -#: rml:account.analytic.account.budget:0 +#: view:account.budget.post:0 +#: view:crossovered.budget:0 #: field:crossovered.budget.lines,practical_amount:0 -#: rml:crossovered.budget.report:0 msgid "Practical Amount" msgstr "Stvarni iznos" @@ -261,6 +194,14 @@ msgid "Invalid XML for View Architecture!" msgstr "Nevažeći XML za pregled arhitekture" #. module: account_budget +#: model:ir.model,name:account_budget.model_account_budget_analytic +#: model:ir.model,name:account_budget.model_account_budget_report +msgid "Account Budget report for analytic account" +msgstr "Izvestaj Budzeta Naloga za Analiticki Konto" + +#. module: account_budget +#: view:account.budget.post:0 +#: view:crossovered.budget:0 #: field:crossovered.budget.lines,theoritical_amount:0 msgid "Theoritical Amount" msgstr "Teoretski Iznos" @@ -272,14 +213,9 @@ msgid "Name" msgstr "Ime" #. module: account_budget -#: model:ir.actions.wizard,name:account_budget.wizard_crossovered_budget_menu_1 -msgid "Print Summary of Budgets" -msgstr "Ispis Sumarnog Budzeta" - -#. module: account_budget -#: model:ir.actions.wizard,name:account_budget.wizard_budget_spread -msgid "Spread amount" -msgstr "Iznos širenja" +#: model:ir.model,name:account_budget.model_crossovered_budget_lines +msgid "Budget Line" +msgstr "Lnija Budzeta" #. module: account_budget #: view:account.analytic.account:0 @@ -288,37 +224,65 @@ msgid "Lines" msgstr "redova" #. module: account_budget -#: rml:account.budget:0 +#: report:account.budget:0 #: view:crossovered.budget:0 #: field:crossovered.budget.lines,crossovered_budget_id:0 -#: model:ir.actions.act_window,name:account_budget.act_crossovered_budget_view -#: model:ir.actions.wizard,name:account_budget.wizard_budget_report +#: report:crossovered.budget.report:0 +#: model:ir.actions.report.xml,name:account_budget.account_budget #: model:ir.model,name:account_budget.model_crossovered_budget -#: model:ir.ui.menu,name:account_budget.menu_act_crossovered_budget_view msgid "Budget" msgstr "Budzet" #. module: account_budget -#: field:crossovered.budget.lines,paid_date:0 -msgid "Paid Date" -msgstr "Datum plaćanja" +#: code:addons/account_budget/account_budget.py:0 +#, python-format +msgid "Error!" +msgstr "Greška" + +#. module: account_budget +#: field:account.budget.post,code:0 +#: field:crossovered.budget,code:0 +msgid "Code" +msgstr "Kod" + +#. module: account_budget +#: view:account.budget.analytic:0 +#: view:account.budget.crossvered.report:0 +msgid "This wizard is used to print budget" +msgstr "Ovaj carobnjak je koristen za prikaz budzeta" #. module: account_budget +#: model:ir.actions.act_window,name:account_budget.act_crossovered_budget_view #: model:ir.actions.act_window,name:account_budget.action_account_budget_post_tree +#: model:ir.actions.act_window,name:account_budget.action_account_budget_report +#: model:ir.actions.report.xml,name:account_budget.report_crossovered_budget +#: model:ir.ui.menu,name:account_budget.menu_act_crossovered_budget_view #: model:ir.ui.menu,name:account_budget.menu_action_account_budget_post_tree #: model:ir.ui.menu,name:account_budget.next_id_31 +#: model:ir.ui.menu,name:account_budget.next_id_pos msgid "Budgets" msgstr "Budzeti" #. module: account_budget +#: code:addons/account_budget/account_budget.py:0 +#, python-format +msgid "The General Budget '%s' has no Accounts!" +msgstr "Osnovni Budzet '%s' nema Naloga !" + +#. module: account_budget #: selection:crossovered.budget,state:0 msgid "Cancelled" msgstr "Отказано" #. module: account_budget -#: rml:account.budget:0 -msgid "Budget Item Detail" -msgstr "Detalj Budzetske stavke" +#: view:crossovered.budget:0 +msgid "Approve" +msgstr "Odobri" + +#. module: account_budget +#: view:crossovered.budget:0 +msgid "To Approve" +msgstr "Za Odobravanje" #. module: account_budget #: view:account.budget.post:0 @@ -328,65 +292,98 @@ msgid "Budgetary Position" msgstr "Budzetska pozicija" #. module: account_budget -#: wizard_field:account.budget.report,init,date1:0 -#: wizard_field:wizard.analytic.account.budget.report,init,date_from:0 -#: wizard_field:wizard.crossovered.budget,init,date_from:0 -#: wizard_field:wizard.crossovered.budget.summary,init,date_from:0 +#: field:account.budget.analytic,date_from:0 +#: field:account.budget.crossvered.report,date_from:0 +#: field:account.budget.crossvered.summary.report,date_from:0 +#: field:account.budget.report,date_from:0 msgid "Start of period" msgstr "Početak razdoblja" #. module: account_budget -#: model:ir.actions.report.xml,name:account_budget.account_analytic_account_budget -#: model:ir.actions.report.xml,name:account_budget.report_crossovered_budget -#: model:ir.actions.wizard,name:account_budget.account_analytic_account_budget_report -#: model:ir.actions.wizard,name:account_budget.wizard_crossovered_budget_menu +#: view:account.budget.report:0 +#: model:ir.actions.act_window,name:account_budget.action_account_budget_analytic +#: model:ir.actions.act_window,name:account_budget.action_account_budget_crossvered_report msgid "Print Budgets" msgstr "Stampa Budzeta" #. module: account_budget -#: field:account.budget.post,code:0 -#: field:crossovered.budget,code:0 -msgid "Code" -msgstr "Kod" +#: model:ir.model,name:account_budget.model_account_budget_crossvered_summary_report +msgid "Account Budget crossvered summary report" +msgstr "Izvestaj unakrsnog budzeta naloga" #. module: account_budget -#: wizard_view:wizard.analytic.account.budget.report,init:0 -msgid "Select Dates Period" -msgstr "Selektuj Datume razdoblja" +#: report:account.budget:0 +#: report:crossovered.budget.report:0 +msgid "Theoretical Amt" +msgstr "" #. module: account_budget -#: field:account.budget.post,dotation_ids:0 -msgid "Spreading" -msgstr "Raspon" +#: constraint:ir.rule:0 +msgid "Rules are not supported for osv_memory objects !" +msgstr "Pravila nisu podrzana od strane osv_memory objekata !" #. module: account_budget -#: rml:account.analytic.account.budget:0 -#: rml:crossovered.budget.report:0 -msgid "Theoretical Amount" -msgstr "Teoretski Iznos" +#: view:account.budget.analytic:0 +#: view:account.budget.crossvered.report:0 +#: view:account.budget.crossvered.summary.report:0 +#: view:account.budget.report:0 +msgid "Select Dates Period" +msgstr "Selektuj Datume razdoblja" + +#. module: account_budget +#: view:account.budget.analytic:0 +#: view:account.budget.crossvered.report:0 +#: view:account.budget.crossvered.summary.report:0 +#: view:account.budget.report:0 +msgid "Print" +msgstr "Štampaj" #. module: account_budget -#: wizard_field:account.budget.spread,init,fiscalyear:0 -msgid "Fiscal Year" -msgstr "Fiskalna Godina" +#: model:ir.module.module,description:account_budget.module_meta_information +msgid "" +"This module allows accountants to manage analytic and crossovered budgets.\n" +"\n" +"Once the Master Budgets and the Budgets are defined (in " +"Accounting/Budgets/),\n" +"the Project Managers can set the planned amount on each Analytic Account.\n" +"\n" +"The accountant has the possibility to see the total of amount planned for " +"each\n" +"Budget and Master Budget in order to ensure the total planned is not\n" +"greater/lower than what he planned for this Budget/Master Budget. Each list " +"of\n" +"record can also be switched to a graphical view of it.\n" +"\n" +"Three reports are available:\n" +" 1. The first is available from a list of Budgets. It gives the " +"spreading, for these Budgets, of the Analytic Accounts per Master Budgets.\n" +"\n" +" 2. The second is a summary of the previous one, it only gives the " +"spreading, for the selected Budgets, of the Analytic Accounts.\n" +"\n" +" 3. The last one is available from the Analytic Chart of Accounts. It " +"gives the spreading, for the selected Analytic Accounts, of the Master " +"Budgets per Budgets.\n" +"\n" +msgstr "" #. module: account_budget #: field:crossovered.budget.lines,analytic_account_id:0 +#: model:ir.model,name:account_budget.model_account_analytic_account msgid "Analytic Account" msgstr "Analitički nalog" #. module: account_budget -#: rml:crossovered.budget.report:0 +#: report:account.budget:0 +#: report:crossovered.budget.report:0 msgid "Budget :" msgstr "Budzet" #. module: account_budget -#: rml:account.budget:0 -#: view:account.budget.post:0 -#: wizard_view:account.budget.spread,init:0 -#: wizard_button:account.budget.spread,init,spread:0 -msgid "Spread" -msgstr "Raspon" +#: report:account.budget:0 +#: report:crossovered.budget.report:0 +msgid "Planned Amt" +msgstr "" #. module: account_budget #: view:account.budget.post:0 @@ -395,11 +392,6 @@ msgid "Accounts" msgstr "Nalozi" #. module: account_budget -#: model:ir.actions.report.xml,name:account_budget.account_budget -msgid "Print Budget" -msgstr "" - -#. module: account_budget #: view:account.analytic.account:0 #: field:account.analytic.account,crossovered_budget_line:0 #: view:account.budget.post:0 @@ -409,18 +401,16 @@ msgstr "" #: view:crossovered.budget.lines:0 #: model:ir.actions.act_window,name:account_budget.act_account_analytic_account_cb_lines #: model:ir.actions.act_window,name:account_budget.act_crossovered_budget_lines_view -#: model:ir.model,name:account_budget.model_crossovered_budget_lines #: model:ir.ui.menu,name:account_budget.menu_act_crossovered_budget_lines_view msgid "Budget Lines" msgstr "Budzetski Redovi" #. module: account_budget -#: wizard_button:account.budget.report,init,end:0 -#: wizard_button:account.budget.spread,init,end:0 +#: view:account.budget.analytic:0 +#: view:account.budget.crossvered.report:0 +#: view:account.budget.crossvered.summary.report:0 +#: view:account.budget.report:0 #: view:crossovered.budget:0 -#: wizard_button:wizard.analytic.account.budget.report,init,end:0 -#: wizard_button:wizard.crossovered.budget,init,end:0 -#: wizard_button:wizard.crossovered.budget.summary,init,end:0 msgid "Cancel" msgstr "Otkaži" @@ -436,17 +426,73 @@ msgid "Start Date" msgstr "Početni datum" #. module: account_budget -#: rml:account.analytic.account.budget:0 -#: rml:crossovered.budget.report:0 +#: report:account.budget:0 +#: report:crossovered.budget.report:0 msgid "Analysis from" msgstr "Analiza od" -#. module: account_budget -#: selection:crossovered.budget,state:0 -msgid "Validated" -msgstr "Potvrđeno" +#~ msgid "% performance" +#~ msgstr "% performansa" -#. module: account_budget -#: wizard_view:account.budget.report,init:0 -msgid "Select period" -msgstr "Izaberi period" +#~ msgid "Results" +#~ msgstr "Резултати" + +#~ msgid "From" +#~ msgstr "Od" + +#~ msgid "Dotations" +#~ msgstr "Dotacija" + +#~ msgid "Performance" +#~ msgstr "Performansa" + +#~ msgid "Printing date:" +#~ msgstr "Datum Stampe:" + +#~ msgid "A/c No." +#~ msgstr "Račun br." + +#~ msgid "Analytic Account :" +#~ msgstr "Analiticki konto :" + +#~ msgid "to" +#~ msgstr "do" + +#~ msgid "Total :" +#~ msgstr "Ukupno:" + +#~ msgid "Period Budget" +#~ msgstr "Budžetsko razdoblje" + +#~ msgid "Budget Analysis" +#~ msgstr "Analiza Budžeta" + +#~ msgid "Select Options" +#~ msgstr "Selektuj Opciju" + +#~ msgid "Validate" +#~ msgstr "Overi" + +#~ msgid "Spread amount" +#~ msgstr "Iznos širenja" + +#~ msgid "Print Summary of Budgets" +#~ msgstr "Ispis Sumarnog Budzeta" + +#~ msgid "Spreading" +#~ msgstr "Raspon" + +#~ msgid "Budget Item Detail" +#~ msgstr "Detalj Budzetske stavke" + +#~ msgid "Spread" +#~ msgstr "Raspon" + +#~ msgid "Theoretical Amount" +#~ msgstr "Teoretski Iznos" + +#~ msgid "Fiscal Year" +#~ msgstr "Fiskalna Godina" + +#~ msgid "Select period" +#~ msgstr "Izaberi period" diff --git a/addons/account_coda/account_coda.py b/addons/account_coda/account_coda.py index 8dd4067c571..24d928a2fd0 100644 --- a/addons/account_coda/account_coda.py +++ b/addons/account_coda/account_coda.py @@ -22,6 +22,7 @@ import time from osv import osv,fields +from tools.translate import _ class account_coda(osv.osv): _name = "account.coda" @@ -41,6 +42,13 @@ class account_coda(osv.osv): 'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'account.coda', context=c), } + def search(self, cr, user, args, offset=0, limit=None, order=None, context=None, count=False): + res = super(account_coda, self).search(cr, user, args=args, offset=offset, limit=limit, order=order, + context=context, count=count) + if context.get('bank_statement', False) and not res: + raise osv.except_osv('Error', _('Coda file not found for bank statement !!')) + return res + account_coda() class account_bank_statement(osv.osv): diff --git a/addons/account_coda/account_coda_view.xml b/addons/account_coda/account_coda_view.xml index 7c7a10a05a3..a16e68d5ee0 100644 --- a/addons/account_coda/account_coda_view.xml +++ b/addons/account_coda/account_coda_view.xml @@ -80,12 +80,13 @@ id="menu_account_coda_import" sequence="20"/> <act_window name="Coda File" - domain="[('statement_ids', 'in', [active_id])]" - res_model="account.coda" - src_model="account.bank.statement" - view_type="form" - view_mode="tree,form" - id="act_account_payment_account_bank_statement"/> + domain="[('statement_ids', 'in', [active_id])]" + context="{'bank_statement': 1}" + res_model="account.coda" + src_model="account.bank.statement" + view_type="form" + view_mode="tree,form" + id="act_account_payment_account_bank_statement"/> </data> </openerp> diff --git a/addons/account_coda/i18n/de.po b/addons/account_coda/i18n/de.po index 41b4e0f2ef3..8750c022b80 100644 --- a/addons/account_coda/i18n/de.po +++ b/addons/account_coda/i18n/de.po @@ -1,166 +1,272 @@ -# German 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 <EMAIL@ADDRESS>, 2010. +# Translation of OpenERP Server. +# This file contains the translation of the following modules: +# * account_coda # msgid "" msgstr "" -"Project-Id-Version: openobject-addons\n" -"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" -"POT-Creation-Date: 2009-11-24 13:11+0000\n" -"PO-Revision-Date: 2010-10-05 13:15+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Project-Id-Version: OpenERP Server 6.0dev\n" +"Report-Msgid-Bugs-To: support@openerp.com\n" +"POT-Creation-Date: 2010-10-18 17:46+0000\n" +"PO-Revision-Date: 2010-10-26 18:11+0000\n" +"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-" +"consulting.net>\n" "Language-Team: German <de@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-10-08 04:39+0000\n" +"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_coda -#: field:account.coda,journal_id:0 -#: wizard_field:account.coda_import,init,journal_id:0 +#: help:account.coda,journal_id:0 +#: field:account.coda.import,journal_id:0 msgid "Bank Journal" -msgstr "" +msgstr "Bank Journal" #. module: account_coda #: constraint:ir.model:0 msgid "" "The Object name must start with x_ and not contain any special character !" msgstr "" +"Die Objektbezeichnung muss mit x_ beginnen und darf keine Sonderzeichen " +"beinhalten!" #. module: account_coda -#: wizard_field:account.coda_import,extraction,note:0 -msgid "Log" -msgstr "" - -#. module: account_coda -#: wizard_button:account.coda_import,extraction,open:0 -msgid "_Open Statement" -msgstr "" +#: constraint:ir.actions.act_window:0 +msgid "Invalid model name in the action definition." +msgstr "Fehler bei Modellbezeichnung der Aktion" #. module: account_coda -#: model:ir.module.module,shortdesc:account_coda.module_meta_information -msgid "Account CODA" +#: model:ir.model,name:account_coda.model_account_coda_import +msgid "Account Coda Import" msgstr "" #. module: account_coda #: field:account.coda,name:0 msgid "Coda file" -msgstr "" +msgstr "Datei CODA" #. module: account_coda -#: wizard_view:account.coda_import,init:0 -msgid "Clic on 'New' to select your file :" +#: view:account.coda:0 +msgid "Group By..." msgstr "" #. module: account_coda -#: model:ir.actions.wizard,name:account_coda.wizard_account_coda_import -msgid "Import Coda File" +#: field:account.coda.import,awaiting_account:0 +msgid "Default Account for Unrecognized Movement" msgstr "" #. module: account_coda -#: constraint:ir.actions.act_window:0 -msgid "Invalid model name in the action definition." +#: help:account.coda,date:0 +msgid "Import Date" +msgstr "Importiere Datum" + +#. module: account_coda +#: constraint:ir.ui.menu:0 +msgid "Error ! You can not create recursive Menu." msgstr "" #. module: account_coda #: field:account.coda,note:0 msgid "Import log" -msgstr "" +msgstr "Import Protokoll" #. module: account_coda -#: wizard_field:account.coda_import,init,def_receivable:0 -msgid "Default receivable Account" +#: view:account.coda.import:0 +msgid "Import" msgstr "" #. module: account_coda -#: model:ir.module.module,description:account_coda.module_meta_information +#: view:account.coda:0 +msgid "Coda import" +msgstr "CODA Import" + +#. module: account_coda +#: view:account.coda:0 +#: field:account.coda.import,note:0 +msgid "Log" +msgstr "Protokoll" + +#. module: account_coda +#: help:account.coda.import,awaiting_account:0 msgid "" -"Module provides functionality to import\n" -" bank statements from .csv file.\n" -" Import coda file wizard is used to import bank statements." +"Set here the default account that will be used, if the partner is found but " +"does not have the bank account, or if he is domiciled" msgstr "" #. module: account_coda -#: wizard_button:account.coda_import,extraction,end:0 -msgid "_Close" +#: view:account.coda:0 +#: field:account.coda,company_id:0 +msgid "Company" msgstr "" #. module: account_coda -#: field:account.coda,statement_id:0 -msgid "Generated Bank Statement" +#: help:account.coda.import,def_payable:0 +msgid "" +"Set here the payable account that will be used, by default, if the partner " +"is not found" msgstr "" #. module: account_coda #: view:account.coda:0 -#: model:ir.actions.act_window,name:account_coda.act_account_payment_account_bank_statement -#: model:ir.actions.act_window,name:account_coda.action_account_coda -msgid "Coda import" +msgid "Search Coda" msgstr "" #. module: account_coda +#: view:account.coda:0 #: field:account.coda,user_id:0 msgid "User" +msgstr "Benutzer" + +#. module: account_coda +#: view:account.coda:0 +#: field:account.coda,date:0 +msgid "Date" +msgstr "" + +#. module: account_coda +#: model:ir.ui.menu,name:account_coda.menu_account_coda_statement +msgid "Coda Import Logs" msgstr "" #. module: account_coda #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" -msgstr "" +msgstr "Fehlerhafter XML Quellcode für diese Ansicht" #. module: account_coda #: model:ir.model,name:account_coda.model_account_coda msgid "coda for an Account" -msgstr "" +msgstr "CODA für Konto" #. module: account_coda -#: wizard_field:account.coda_import,init,def_payable:0 +#: field:account.coda.import,def_payable:0 msgid "Default Payable Account" -msgstr "" +msgstr "Standard Kreditoren Konto" #. module: account_coda -#: model:ir.ui.menu,name:account_coda.menu_account_coda -msgid "Coda Statements" +#: help:account.coda,name:0 +msgid "Store the detail of bank statements" msgstr "" #. module: account_coda -#: model:ir.ui.menu,name:account_coda.menu_account_coda_wizard -msgid "Import Coda Statements" +#: view:account.coda.import:0 +msgid "Cancel" msgstr "" #. module: account_coda -#: wizard_button:account.coda_import,init,extraction:0 -msgid "_Ok" +#: view:account.coda.import:0 +msgid "Open Statements" msgstr "" #. module: account_coda -#: wizard_view:account.coda_import,extraction:0 -#: wizard_view:account.coda_import,init:0 +#: model:ir.ui.menu,name:account_coda.menu_account_coda_import +msgid "Import Coda Statements" +msgstr "Importiere CODA Bankauszüge" + +#. module: account_coda +#: view:account.coda.import:0 +#: model:ir.actions.act_window,name:account_coda.action_account_coda_import msgid "Import Coda Statement" +msgstr "Import CODA Bankauszug" + +#. module: account_coda +#: view:account.coda:0 +msgid "Statements" +msgstr "" + +#. module: account_coda +#: constraint:ir.rule:0 +msgid "Rules are not supported for osv_memory objects !" msgstr "" #. module: account_coda #: field:account.bank.statement,coda_id:0 msgid "Coda" -msgstr "" +msgstr "CODA" #. module: account_coda -#: wizard_view:account.coda_import,extraction:0 +#: view:account.coda.import:0 msgid "Results :" +msgstr "Ergebnis :" + +#. module: account_coda +#: view:account.coda.import:0 +msgid "Result of Imported Coda Statements" +msgstr "" + +#. module: account_coda +#: help:account.coda.import,def_receivable:0 +msgid "" +"Set here the receivable account that will be used, by default, if the " +"partner is not found" msgstr "" #. module: account_coda -#: wizard_field:account.coda_import,init,coda:0 +#: field:account.coda.import,coda:0 +#: model:ir.actions.act_window,name:account_coda.act_account_payment_account_bank_statement msgid "Coda File" +msgstr "CODA Datei" + +#. module: account_coda +#: model:ir.model,name:account_coda.model_account_bank_statement +msgid "Bank Statement" msgstr "" #. module: account_coda -#: field:account.coda,date:0 -msgid "Import Date" +#: model:ir.actions.act_window,name:account_coda.action_account_coda +msgid "Coda Logs" +msgstr "" + +#. module: account_coda +#: code:addons/account_coda/wizard/account_coda_import.py:0 +#, python-format +msgid "Result" +msgstr "" + +#. module: account_coda +#: view:account.coda.import:0 +msgid "Click on 'New' to select your file :" +msgstr "" + +#. module: account_coda +#: field:account.coda.import,def_receivable:0 +msgid "Default Receivable Account" +msgstr "" + +#. module: account_coda +#: view:account.coda.import:0 +msgid "Close" +msgstr "" + +#. module: account_coda +#: field:account.coda,statement_ids:0 +msgid "Generated Bank Statements" +msgstr "" + +#. module: account_coda +#: model:ir.module.module,shortdesc:account_coda.module_meta_information +msgid "Account CODA - import bank statements from coda file" msgstr "" #. module: account_coda -#: wizard_view:account.coda_import,init:0 -msgid "Select your bank journal :" +#: view:account.coda.import:0 +msgid "Configure Your Journal and Account :" +msgstr "" + +#. module: account_coda +#: view:account.coda:0 +msgid "Coda Import" +msgstr "" + +#. module: account_coda +#: code:addons/account_coda/wizard/account_coda_import.py:0 +#, python-format +msgid "The bank account %s is not defined for the partner %s.\n" +msgstr "" + +#. module: account_coda +#: view:account.coda:0 +#: field:account.coda,journal_id:0 +msgid "Journal" msgstr "" diff --git a/addons/account_followup/i18n/es.po b/addons/account_followup/i18n/es.po index 64d8204d602..595e8dcccec 100644 --- a/addons/account_followup/i18n/es.po +++ b/addons/account_followup/i18n/es.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-10-18 17:46+0000\n" -"PO-Revision-Date: 2010-10-24 22:16+0000\n" -"Last-Translator: Carlos @ smile.fr <Unknown>\n" +"PO-Revision-Date: 2010-10-25 07:09+0000\n" +"Last-Translator: Carlos-smile <Unknown>\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-10-25 04:39+0000\n" +"X-Launchpad-Export-Date: 2010-10-26 04:39+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_followup diff --git a/addons/account_followup/i18n/sr.po b/addons/account_followup/i18n/sr.po index d882a65d26a..313b6317eb3 100644 --- a/addons/account_followup/i18n/sr.po +++ b/addons/account_followup/i18n/sr.po @@ -7,167 +7,173 @@ msgid "" msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" -"POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-10-15 09:03+0000\n" -"Last-Translator: OpenERP Administrators <Unknown>\n" +"POT-Creation-Date: 2010-10-18 17:46+0000\n" +"PO-Revision-Date: 2010-10-26 08:00+0000\n" +"Last-Translator: zmmaj <Unknown>\n" "Language-Team: Serbian <sr@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-10-16 04:47+0000\n" +"X-Launchpad-Export-Date: 2010-10-27 04:58+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_followup -#: rml:account_followup.followup.print:0 -msgid "Date :" -msgstr "Datum :" +#: code:addons/account_followup/wizard/account_followup_print.py:0 +#, python-format +msgid "Follwoup Summary" +msgstr "Sumarno Pracenje" #. module: account_followup -#: wizard_field:account_followup.followup.print.all,next,partner_ids:0 -msgid "Partners" -msgstr "Partneri" +#: view:account_followup.followup:0 +msgid "Search Followup" +msgstr "Pretrazi Pracenja" #. module: account_followup -#: rml:account_followup.followup.print:0 -msgid "Customer Ref :" -msgstr "Poziv na broj" +#: view:account_followup.stat:0 +msgid "Group By..." +msgstr "Grupirano po" #. module: account_followup -#: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_payable_all -#: model:ir.ui.menu,name:account_followup.menu_account_move_open_unreconcile_payable -msgid "All payable entries" -msgstr "Sve stavke potraživanja" +#: view:res.company:0 +#: field:res.company,follow_up_msg:0 +msgid "Follow-up Message" +msgstr "Poruka Pracenja" #. module: account_followup -#: constraint:ir.actions.act_window:0 -msgid "Invalid model name in the action definition." -msgstr "Pogrešno ime modela u definiciji akcije." +#: view:account_followup.followup:0 +#: field:account_followup.followup,followup_line:0 +msgid "Follow-Up" +msgstr "Следи" #. module: account_followup -#: field:account_followup.followup.line,description:0 -msgid "Printed Message" -msgstr "Ispisana Poruka" +#: field:account_followup.followup,company_id:0 +#: view:account_followup.stat:0 +#: field:account_followup.stat,company_id:0 +msgid "Company" +msgstr "Preduzeće" #. module: account_followup -#: rml:account_followup.followup.print:0 -msgid "Amount In Currency" -msgstr "Iznos u valuti" +#: report:account_followup.followup.print:0 +msgid "Invoice Date" +msgstr "Datum računa" #. module: account_followup -#: rml:account_followup.followup.print:0 -msgid "Due" -msgstr "Dospeće" +#: field:account.followup.print.all,email_subject:0 +msgid "Email Subject" +msgstr "Tema Email-a" #. module: account_followup -#: view:account.move.line:0 -msgid "Total debit" -msgstr "Ukupno duguje" +#: view:account.followup.print.all:0 +#: view:account_followup.followup.line:0 +msgid "Legend" +msgstr "Legenda" #. module: account_followup -#: view:account_followup.followup.line:0 -#: wizard_view:account_followup.followup.print.all,next:0 -msgid "%(user_signature)s: User name" -msgstr "%(korisnicka_oznaka)e: Korisničko ime" +#: view:account.followup.print.all:0 +msgid "Ok" +msgstr "U redu" #. module: account_followup -#: wizard_view:account_followup.followup.print.all,next:0 -msgid "Select partners" -msgstr "Odaberi partnere" +#: field:account.followup.print,date:0 +msgid "Follow-up Sending Date" +msgstr "Datum Slanja Pracenja" #. module: account_followup -#: view:account_followup.followup:0 -#: field:account_followup.followup,followup_line:0 -msgid "Follow-Up" -msgstr "Следи" +#: selection:account_followup.followup.line,start:0 +msgid "Net Days" +msgstr "Neto dana" #. module: account_followup -#: field:account_followup.stat,debit:0 -msgid "Debit" -msgstr "Duguje" +#: model:ir.actions.act_window,name:account_followup.action_account_followup_definition_form +#: model:ir.ui.menu,name:account_followup.account_followup_menu +msgid "Follow-Ups" +msgstr "Pracenja" #. module: account_followup -#: wizard_view:account_followup.followup.print.all,next:0 -msgid "Email Settings" -msgstr "Email Postavke" +#: report:account_followup.followup.print:0 +msgid "VAT:" +msgstr "PDV:" #. module: account_followup -#: field:account_followup.stat,account_type:0 -msgid "Account Type" -msgstr "Vrsta konta" +#: view:account.move.line:0 +msgid "Total debit" +msgstr "Ukupno duguje" #. module: account_followup -#: rml:account_followup.followup.print:0 -msgid "Ref" -msgstr "Referenca" +#: view:account.followup.print.all:0 +msgid "%(heading)s: Move line header" +msgstr "%(heading): Zaglavlje reda prijenosa" #. module: account_followup -#: wizard_view:account_followup.followup.print.all,next:0 -msgid "%(followup_amount)s: Total Amount Due" -msgstr "%(iznos_pracenja): Ukupan iznos duga" +#: field:account.followup.print,followup_id:0 +msgid "Follow-up" +msgstr "Pracenje" #. module: account_followup -#: view:account_followup.followup.line:0 -#: wizard_view:account_followup.followup.print.all,next:0 -msgid "%(date)s: Current Date" -msgstr "%(datum)i: Trenutni Datum" +#: field:account_followup.stat,name:0 +msgid "Partner" +msgstr "Partner" #. module: account_followup -#: field:account.move.line,followup_date:0 -msgid "Latest Follow-up" -msgstr "Poslednje praćenje" +#: report:account_followup.followup.print:0 +msgid "Date :" +msgstr "Datum :" #. module: account_followup -#: field:account_followup.followup.line,followup_id:0 -#: field:account_followup.stat,followup_id:0 -msgid "Follow Ups" -msgstr "Praćenja" +#: field:account.followup.print.all,partner_ids:0 +msgid "Partners" +msgstr "Partneri" #. module: account_followup -#: wizard_field:account_followup.followup.print.all,init,date:0 -msgid "Follow-up Sending Date" -msgstr "Datum Slanja Pracenja" +#: model:ir.model,name:account_followup.model_account_followup_followup +msgid "Account Follow Up" +msgstr "Nalog Pracenja" #. module: account_followup -#: view:account_followup.followup:0 -#: field:account_followup.followup,description:0 -#: rml:account_followup.followup.print:0 -msgid "Description" -msgstr "Opis" +#: selection:account_followup.followup.line,start:0 +msgid "End of Month" +msgstr "Kraj Meseca" #. module: account_followup -#: rml:account_followup.followup.print:0 -msgid "Balance:" -msgstr "Saldo" +#: view:account_followup.stat:0 +msgid "Not Litigation" +msgstr "Nije Sporno" #. module: account_followup -#: rml:account_followup.followup.print:0 -msgid "VAT:" -msgstr "PDV:" +#: view:account.followup.print.all:0 +msgid "%(user_signature)s: User name" +msgstr "%(korisnicka_oznaka)e: Korisničko ime" #. module: account_followup -#: field:account_followup.followup,company_id:0 -msgid "Company" -msgstr "Preduzeće" +#: field:account_followup.stat,debit:0 +msgid "Debit" +msgstr "Duguje" #. module: account_followup -#: rml:account_followup.followup.print:0 -msgid "Invoice Date" -msgstr "Datum računa" +#: field:account_followup.stat,account_type:0 +msgid "Account Type" +msgstr "Vrsta konta" #. module: account_followup -#: wizard_field:account_followup.followup.print.all,next,email_subject:0 -msgid "Email Subject" -msgstr "Tema Email-a" +#: report:account_followup.followup.print:0 +msgid "Ref" +msgstr "Referenca" #. module: account_followup -#: rml:account_followup.followup.print:0 -msgid "Paid" -msgstr "Plaćeno" +#: help:account_followup.followup.line,sequence:0 +msgid "Gives the sequence order when displaying a list of follow-up lines." +msgstr "Daje redosled sekvenci pri prikazivanju linija pracenja" #. module: account_followup -#: wizard_view:account_followup.followup.print.all,next:0 -msgid "%(line)s: Account Move lines" -msgstr "%(red): redovi prenosa računa" +#: view:account.followup.print.all:0 +#: field:account.followup.print.all,email_body:0 +msgid "Email body" +msgstr "Sadrzaj Email-a" + +#. module: account_followup +#: field:account.move.line,followup_line_id:0 +msgid "Follow-up Level" +msgstr "Nivo praćenja" #. module: account_followup #: field:account_followup.stat,date_followup:0 @@ -175,44 +181,86 @@ msgid "Latest followup" msgstr "Poslednje praćenje" #. module: account_followup -#: view:account.move.line:0 -msgid "Partner entries" -msgstr "Stavke Partnera" +#: model:account_followup.followup.line,description:account_followup.demo_followup_line2 +msgid "" +"\n" +"Dear %(partner_name)s,\n" +"\n" +"We are disappointed to see that despite sending a reminder, that your " +"account is now seriously overdue.\n" +"\n" +"It is essential that immediate payment is made, otherwise we will have to " +"consider placing a stop on your account which means that we will no longer " +"be able to supply your company with (goods/services).\n" +"Please, take appropriate measures in order to carry out this payment in the " +"next 8 days\n" +"\n" +"If there is a problem with paying invoice that we are not aware of, do not " +"hesitate to contact our accounting department at (+32).10.68.94.39. so that " +"we can resolve the matter quickly.\n" +"\n" +"Details of due payments is printed below.\n" +"\n" +"Best Regards,\n" +msgstr "" +"\n" +"Postovani %(partner_name)\n" +"Razocarani smo sto vam se moramo obracati ovako, saljuci vam opomenu, ali " +"vas nalog je u ozbiljnom prekoracenju.\n" +"\n" +"Vrlo je vazno da ispunite vase obaveze ka nama, inace ce mo biti prisiljeni " +"da obustavimo vas nalog, sto u stvari znaci da necemo vise biti\n" +"u mogucnosti da vase preduzece nadalje snabdevamo ( robom / servisiranjem).\n" +"Molimo vas da preduzmete mere kako bi regulisali vasa dugovanja u sledecih 8 " +"dana.\n" +"\n" +"Ukoliko postoji problem, vezan za fakturu, sa kojim nismo upoznati, ne " +"ustrucavajte se da kontaktirate nase racunovodstvo na broj (+32) 20 555 666 " +"kako bi smo razmotrili problem sto je hitnije moguce.\n" +"\n" +"Detalji vase fakture su prikazani ispod.\n" +"\n" +"Uz svo postovanje.\n" #. module: account_followup -#: model:ir.model,name:account_followup.model_account_followup_followup_line -msgid "Follow-Ups Criteria" -msgstr "Kriterijumi Praćenja" +#: constraint:ir.ui.view:0 +msgid "Invalid XML for View Architecture!" +msgstr "Nevažeći XML za pregled arhitekture" #. module: account_followup -#: wizard_view:account_followup.followup.print.all,next:0 -msgid "Partner Selection" -msgstr "Selekcija Partnera" +#: field:account.followup.print.all,partner_lang:0 +msgid "Send Email in Partner Language" +msgstr "Posalji Email na jeziku Partnera" #. module: account_followup -#: constraint:ir.ui.view:0 -msgid "Invalid XML for View Architecture!" -msgstr "Nevažeći XML za pregled arhitekture" +#: view:account.followup.print.all:0 +msgid "Select partners to remind" +msgstr "Odaberite partnere za opomenu" #. module: account_followup -#: field:account_followup.followup.line,start:0 -msgid "Type of Term" -msgstr "Tip Uslova" +#: view:account.followup.print.all:0 +msgid "Partner Selection" +msgstr "Selekcija Partnera" #. module: account_followup -#: wizard_view:account_followup.followup.print.all,init:0 -msgid "Follow-up and Date Selection" -msgstr "Praćenja i Datum Selekcije" +#: field:account_followup.followup.line,description:0 +msgid "Printed Message" +msgstr "Ispisana Poruka" #. module: account_followup -#: wizard_view:account_followup.followup.print.all,next:0 -msgid "Select partners to remind" -msgstr "Odaberite partnere za opomenu" +#: view:account.followup.print:0 +#: view:account.followup.print.all:0 +#: model:ir.actions.act_window,name:account_followup.action_account_followup_print +#: model:ir.actions.act_window,name:account_followup.action_account_followup_print_all +#: model:ir.ui.menu,name:account_followup.account_followup_print_menu +msgid "Send followups" +msgstr "Pošalji praćenja" #. module: account_followup -#: rml:account_followup.followup.print:0 -msgid "Li." -msgstr "Li." +#: field:account_followup.followup.line,followup_id:0 +#: field:account_followup.stat,followup_id:0 +msgid "Follow Ups" +msgstr "Praćenja" #. module: account_followup #: model:account_followup.followup.line,description:account_followup.demo_followup_line1 @@ -229,113 +277,193 @@ msgid "" "department at (+32).10.68.94.39.\n" "\n" "Best Regards,\n" -"\t\t\t" msgstr "" "\n" -"Postovani %(partner_name)s,\n" +"postovani %(partner_name)\n" "\n" -"Izvinjavamo se unapred ako je greska nastala kod nas, cini se da su sledeci " -"iznosi ostali neplaceni. Molimo, preduzmite neophodne akcije u cilju isplate " -"ovih racuna u sledecih 8 dana.\n" +"Nacinjen je izuzetak ukoliko je ovo nasa greska, ali , cini se da je sledeci " +"iznos ostao neplacen. Molimo vas da preduzmete odgovarajuce mere kako bi se " +"ovo resilo u sledecih 8 dana.\n" "\n" -"Ukoliko uradite isplatu nakon ovog maila, molimo obavestite nas, Takodje se " -"nemojte ustrucavati da kontaktirate nasu\n" -"racunovodstvenu sluzbu na tel (032) 69 555 666\n" +"Ukoliko ste izvrsili uplatu u medjuvremenu, pre ovog Emaila, molimo " +"smatrajte ga nebitnim. Ne ustrucavajte se da kontaktirate nase racunovodstvo " +"na broj (+32) 555 666.\n" "\n" -"Srdacan pozdrav\n" -"\t\t\t" +"Svo Postovanje.\n" #. module: account_followup -#: constraint:ir.model:0 +#: code:addons/account_followup/wizard/account_followup_print.py:0 +#, python-format msgid "" -"The Object name must start with x_ and not contain any special character !" +"All E-mails have been successfully sent to Partners:.\n" +"\n" msgstr "" -"Ime objekta mora da počinje sa x_ i ne sme da sadrži specijalne karaktere !" +"Svi Email-ovi su uspeno poslati vasim partnerima:.\n" +"\n" #. module: account_followup -#: wizard_button:account_followup.followup.print.all,summary,end:0 -msgid "Ok" -msgstr "U redu" +#: model:account_followup.followup.line,description:account_followup.demo_followup_line3 +msgid "" +"\n" +"Dear %(partner_name)s,\n" +"\n" +"Despite several reminders, your account is still not settled.\n" +"\n" +"Unless full payment is made in next 8 days , then legal action for the " +"recovery of the debt, will be taken without further notice.\n" +"\n" +"I trust that this action will prove unnecessary and details of due payments " +"is printed below.\n" +"\n" +"In case of any queries concerning this matter, do not hesitate to contact " +"our accounting department at (+32).10.68.94.39.\n" +"\n" +"Best Regards,\n" +msgstr "" +"\n" +"Postovani %(partner_name),\n" +"\n" +"Uprkos nekoliko opomena, vas racun i dalje nije sravnjen.\n" +"\n" +"Ukoliko ne izvrsite punu uplatu u sledecih 8 dana, bicemo prinudjeni da se " +"obratimo nadleznim organima kako bi naplatili nasa potrazivanja,\n" +"\n" +"Mi verujemo da je takva akcija zaista nepotrebna, i da ce te vi izmiriti " +"vasa dugovanja koja su prikazana ispod.\n" +"\n" +"U slucaju bilo kakvih nejasnoca, ne ustrucavajte se da kontaktirate nase " +"racunovodstveno odelenje na broj ( +32) 555 666.\n" +"\n" +"Svo Postovanje.\n" #. module: account_followup -#: field:account_followup.followup,name:0 -#: field:account_followup.followup.line,name:0 -msgid "Name" -msgstr "Ime" +#: view:account.followup.print.all:0 +msgid "Send Mails" +msgstr "Slanje Emailova" #. module: account_followup -#: field:account_followup.stat,date_move:0 -msgid "First move" -msgstr "Prvi potez" +#: report:account_followup.followup.print:0 +msgid "Currency" +msgstr "Valuta" #. module: account_followup -#: selection:account_followup.followup.line,start:0 -msgid "End of Month" -msgstr "Kraj Meseca" +#: model:ir.module.module,shortdesc:account_followup.module_meta_information +msgid "Accounting follow-ups management" +msgstr "Menadzment naloga Praćenja" #. module: account_followup -#: view:account_followup.followup.line:0 -#: wizard_view:account_followup.followup.print.all,next:0 -msgid "%(company_name)s: User's Company name" -msgstr "%(company_name)s: Ime preduzeca Korisnika" +#: field:account_followup.stat,blocked:0 +msgid "Blocked" +msgstr "Blokiran" #. module: account_followup -#: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_all -#: model:ir.ui.menu,name:account_followup.menu_account_move_open_unreconcile -msgid "All receivable entries" -msgstr "Sve stavke potraživanja" +#: help:account.followup.print,date:0 +msgid "" +"This field allow you to select a forecast date to plan your follow-ups" +msgstr "" +"Ovo polje vam omogucava da selektujete udaljeni datum za planiranje vaseg " +"pracenja" #. module: account_followup -#: view:account_followup.followup:0 -msgid "Lines" -msgstr "redova" +#: report:account_followup.followup.print:0 +msgid "Due" +msgstr "Dospeće" #. module: account_followup -#: model:ir.actions.wizard,name:account_followup.action_account_followup_all_wizard -#: model:ir.ui.menu,name:account_followup.account_followup_wizard_menu -msgid "Send followups" -msgstr "Pošalji praćenja" +#: code:addons/account_followup/wizard/account_followup_print.py:0 +#, python-format +msgid "Select Partners" +msgstr "Selektuj Partnere" #. module: account_followup -#: field:account.move.line,followup_line_id:0 -msgid "Follow-up Level" -msgstr "Nivo praćenja" +#: constraint:ir.ui.menu:0 +msgid "Error ! You can not create recursive Menu." +msgstr "Greska! Ne mozete kreirati rekursivni meni." #. module: account_followup -#: field:account_followup.stat,credit:0 -msgid "Credit" -msgstr "Kredit" +#: view:account.followup.print.all:0 +msgid "Email Settings" +msgstr "Email Postavke" #. module: account_followup -#: model:ir.model,name:account_followup.model_account_followup_stat -msgid "Followup statistics" -msgstr "Statisktike Praćenja" +#: constraint:ir.actions.act_window:0 +msgid "Invalid model name in the action definition." +msgstr "Pogrešno ime modela u definiciji akcije." #. module: account_followup -#: wizard_button:account_followup.followup.print.all,init,next:0 -msgid "Continue" -msgstr "Nastavi" +#: view:account.followup.print.all:0 +msgid "Print Follow Ups" +msgstr "Stampaj Pracenja" #. module: account_followup -#: model:ir.module.module,shortdesc:account_followup.module_meta_information -msgid "Accounting follow-ups management" -msgstr "Menadzment naloga Praćenja" +#: field:account.move.line,followup_date:0 +msgid "Latest Follow-up" +msgstr "Poslednje praćenje" #. module: account_followup -#: wizard_view:account_followup.followup.print.all,summary:0 -#: wizard_field:account_followup.followup.print.all,summary,summary:0 -msgid "Summary" -msgstr "Sumarno" +#: report:account_followup.followup.print:0 +msgid "Sub-Total:" +msgstr "Subtotal" + +#. module: account_followup +#: report:account_followup.followup.print:0 +msgid "Balance:" +msgstr "Saldo" + +#. module: account_followup +#: model:ir.model,name:account_followup.model_account_followup_stat +msgid "Followup Statistics" +msgstr "Statistika Pracenja" + +#. module: account_followup +#: report:account_followup.followup.print:0 +msgid "Paid" +msgstr "Plaćeno" #. module: account_followup #: view:account_followup.followup.line:0 -msgid "Follow-Up Lines" -msgstr "Redovi Praćenja" +msgid "%(user_signature)s: User Name" +msgstr "%(user_signature): Korisnicko Ime" #. module: account_followup -#: rml:account_followup.followup.print:0 -msgid "Document : Customer account statement" -msgstr "Dokument:Korisnicka stavka naloga" +#: model:ir.model,name:account_followup.model_account_move_line +msgid "Journal Items" +msgstr "Sadrzaj Dnevnika" + +#. module: account_followup +#: field:account.followup.print.all,email_conf:0 +msgid "Send email confirmation" +msgstr "Pošalji Email potvrdu" + +#. module: account_followup +#: view:account.followup.print.all:0 +msgid "%(company_name)s: User's Company name" +msgstr "%(company_name)s: Ime preduzeca Korisnika" + +#. module: account_followup +#: model:ir.model,name:account_followup.model_res_company +msgid "Companies" +msgstr "Kompanije" + +#. module: account_followup +#: view:account_followup.followup:0 +msgid "Followup Lines" +msgstr "Linije Pracenja" + +#. module: account_followup +#: field:account_followup.stat,credit:0 +msgid "Credit" +msgstr "Kredit" + +#. module: account_followup +#: report:account_followup.followup.print:0 +msgid "Maturity Date" +msgstr "Datum Dospeća" + +#. module: account_followup +#: view:account_followup.followup.line:0 +msgid "%(partner_name)s: Partner Name" +msgstr "%(partner_name): Partnerovo Ime" #. module: account_followup #: view:account_followup.stat:0 @@ -343,198 +471,173 @@ msgid "Follow-Up lines" msgstr "Redovi Praćenja" #. module: account_followup -#: wizard_view:account_followup.followup.print.all,next:0 +#: view:account.followup.print.all:0 msgid "%(company_currency)s: User's Company Currency" msgstr "%(company_currency)s: Valuta Preduzeca Korisnika" #. module: account_followup +#: view:account_followup.stat:0 #: field:account_followup.stat,balance:0 msgid "Balance" msgstr "Saldo" #. module: account_followup -#: help:account_followup.followup.print.all,init,date:0 -msgid "" -"This field allow you to select a forecast date to plan your follow-ups" -msgstr "" -"Ovo polje vam omogucava da selektujete udaljeni datum za planiranje vaseg " -"pracenja" +#: field:account_followup.followup.line,start:0 +msgid "Type of Term" +msgstr "Tip Uslova" #. module: account_followup -#: view:account.move.line:0 -msgid "Total credit" -msgstr "Ukupno potražuje" +#: model:ir.model,name:account_followup.model_account_followup_print +#: model:ir.model,name:account_followup.model_account_followup_print_all +msgid "Print Followup & Send Mail to Customers" +msgstr "Stampaj Pracenje & Posalji Emailove Strankama" #. module: account_followup -#: model:account_followup.followup.line,description:account_followup.demo_followup_line2 +#: field:account_followup.stat,date_move_last:0 +msgid "Last move" +msgstr "Poslednji potez" + +#. module: account_followup +#: model:ir.actions.report.xml,name:account_followup.account_followup_followup_report +msgid "Followup Report" +msgstr "Izvestaj Pracenja" + +#. module: account_followup +#: field:account_followup.stat,period_id:0 +msgid "Period" +msgstr "Razdoblje" + +#. module: account_followup +#: code:addons/account_followup/wizard/account_followup_print.py:0 +#, python-format msgid "" +"E-Mail not sent to following Partners, Email not available !\n" "\n" -"Dear %(partner_name)s,\n" -"\n" -"We are disappointed to see that despite sending a reminder, that your " -"account is now seriously overdue.\n" -"\n" -"It is essential that immediate payment is made, otherwise we will have to " -"consider placing a stop on your account which means that we will no longer " -"be able to supply your company with (goods/services).\n" -"Please, take appropriate measures in order to carry out this payment in the " -"next 8 days\n" -"\n" -"If there is a problem with paying invoice that we are not aware of, do not " -"hesitate to contact our accounting department at (+32).10.68.94.39. so that " -"we can resolve the matter quickly.\n" -"\n" -"Details of due payments is printed below.\n" -"\n" -"Best Regards,\n" -"\t\t\t" msgstr "" +"E-mail NIJE poslat sledecim Partnerima, Email nije dostupan !\n" "\n" -"Postovani %(partner_name)s\n" + +#. module: account_followup +#: view:account.followup.print:0 +#: view:account.followup.print.all:0 +msgid "Cancel" +msgstr "Otkaži" + +#. module: account_followup +#: view:account_followup.followup.line:0 +msgid "Follow-Up Lines" +msgstr "Redovi Praćenja" + +#. module: account_followup +#: code:addons/account_followup/wizard/account_followup_print.py:0 +#, python-format +msgid "" "\n" -"Zao nam je sto vas moramo podsecati, ali vas je nalog sada u ozbiljnom " -"prekoracenju.\n" "\n" -"Vrlo je bitno da izmirite vase obaveze ka nama, u suprotnom ce mo morati " -"razmotriti dalju saradnju sa vama, sto znaci da necemo\n" -"vise biti u mogucnosti da vas snabdevamo ( servisiramo)\n" +"E-Mail sent to following Partners successfully. !\n" "\n" -"Molimo vas da preduzmete hitne mere kako bi se izvrsila ova uplata u roku od " -"8 dana.\n" +msgstr "" "\n" -"Ukoliko postoji problem vezan za vas racun, a mi nismo upoznati, ne " -"ustrucavajte se da kontaktirate nase racunovodstvo na (+32_69 555 666 kako " -"bi mogli resiti nastalu gresku sto pre.\n" "\n" -"Detalji vaseg racuna se nalaze ispod.\n" +"E-mail je USPESNO prosledjen sledecim Partnerima. !\n" "\n" -"Srdacan pozdrav.\n" -"\t\t\t" #. module: account_followup -#: rml:account_followup.followup.print:0 -msgid "Sub-Total:" -msgstr "Subtotal" +#: view:account_followup.stat:0 +msgid "Litigation" +msgstr "Sporno" #. module: account_followup -#: selection:account_followup.followup.line,start:0 -msgid "Net Days" -msgstr "Neto dana" +#: constraint:ir.model:0 +msgid "" +"The Object name must start with x_ and not contain any special character !" +msgstr "" +"Ime objekta mora da počinje sa x_ i ne sme da sadrži specijalne karaktere !" #. module: account_followup -#: model:ir.actions.act_window,name:account_followup.action_account_followup_definition_form -#: model:ir.actions.act_window,name:account_followup.action_followup_stat -#: model:ir.model,name:account_followup.model_account_followup_followup -#: model:ir.ui.menu,name:account_followup.account_followup_menu -#: model:ir.ui.menu,name:account_followup.menu_action_followup_stat -msgid "Follow-Ups" -msgstr "Pracenja" +#: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_payable_all +msgid "Payable Items" +msgstr "Stavke Placanja" #. module: account_followup -#: wizard_view:account_followup.followup.print.all,next:0 -#: wizard_field:account_followup.followup.print.all,next,email_body:0 -msgid "Email body" -msgstr "Sadrzaj Email-a" +#: view:account.followup.print.all:0 +msgid "%(followup_amount)s: Total Amount Due" +msgstr "%(iznos_pracenja): Ukupan iznos duga" #. module: account_followup -#: field:account_followup.stat,date_move_last:0 -msgid "Last move" -msgstr "Poslednji potez" +#: view:account.followup.print.all:0 +#: view:account_followup.followup.line:0 +msgid "%(date)s: Current Date" +msgstr "%(datum)i: Trenutni Datum" #. module: account_followup -#: rml:account_followup.followup.print:0 -msgid "Maturity" -msgstr "Dospeće" +#: view:account_followup.stat:0 +msgid "Followup Level" +msgstr "Nivo Pracenja" #. module: account_followup -#: model:ir.actions.report.xml,name:account_followup.account_followup_followup_report -msgid "Followup Report" -msgstr "Izvestaj Pracenja" +#: view:account_followup.followup:0 +#: field:account_followup.followup,description:0 +#: report:account_followup.followup.print:0 +msgid "Description" +msgstr "Opis" #. module: account_followup -#: model:account_followup.followup.line,description:account_followup.demo_followup_line3 -msgid "" -"\n" -"Dear %(partner_name)s,\n" -"\n" -"Despite several reminders, your account is still not settled.\n" -"\n" -"Unless full payment is made in next 8 days , then legal action for the " -"recovery of the debt, will be taken without further notice.\n" -"\n" -"I trust that this action will prove unnecessary and details of due payments " -"is printed below.\n" -"\n" -"In case of any queries concerning this matter, do not hesitate to contact " -"our accounting department at (+32).10.68.94.39.\n" -"\n" -"Best Regards,\n" -"\t\t\t" -msgstr "" -"\n" -"Postovani %(partner_name)s,\n" -"\n" -"Uprkos nekoliko opomena, vase dugovanje nije izmireno.\n" -"\n" -"Ukoliko ne izvrsite uplatu u sledecih 8 dana, bicemo prinudjeni da se " -"obratimo nadleznim organima za sravnjenje ovog duga.\n" -"\n" -"Verujem da ce se ova varijanta pokazati kao nepotrebna i da ce te vi " -"izvrsiti uplatu dugova opisanih ispod.\n" -"\n" -"U slucaju bilo kakve nedoumice, ili nase greske, nemojte se ustrucavati da " -"kontaktirate nase knjigovodstvo na (+32)69 555 666.\n" -"\n" -"Srdacan Pozdrav.\n" -"\t\t\t" +#: view:account_followup.stat:0 +msgid "This Fiscal year" +msgstr "Fiskalna Godina" #. module: account_followup -#: rml:account_followup.followup.print:0 -msgid "Maturity Date" -msgstr "Datum Dospeća" +#: view:account.move.line:0 +msgid "Partner entries" +msgstr "Stavke Partnera" #. module: account_followup -#: view:account_followup.followup.line:0 -#: wizard_view:account_followup.followup.print.all,next:0 -msgid "Legend" -msgstr "Legenda" +#: help:account.followup.print.all,partner_lang:0 +msgid "" +"Do not change message text, if you want to send email in partner language, " +"or configure from company" +msgstr "" +"Ne menjajte ovaj text ukoliko zelite da posaljete Email na jeziku Partnera, " +"ili ga konfigurisete po Preduzecu." #. module: account_followup -#: field:account_followup.followup.line,sequence:0 -msgid "Sequence" -msgstr "Sekvenca" +#: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_all +msgid "Receivable Items" +msgstr "Prijemne Stavke" #. module: account_followup -#: wizard_view:account_followup.followup.print.all,next:0 -msgid "%(heading)s: Move line header" -msgstr "%(heading): Zaglavlje reda prijenosa" +#: view:account_followup.stat:0 +#: model:ir.actions.act_window,name:account_followup.action_followup_stat +#: model:ir.ui.menu,name:account_followup.menu_action_followup_stat_follow +msgid "Follow-ups Sent" +msgstr "Pracenja Poslata" #. module: account_followup -#: view:account_followup.followup.line:0 -#: wizard_view:account_followup.followup.print.all,next:0 -msgid "%(partner_name)s: Partner name" -msgstr "%(partner_name)s: Partnerovo Ime" +#: field:account_followup.followup,name:0 +#: field:account_followup.followup.line,name:0 +msgid "Name" +msgstr "Ime" #. module: account_followup -#: wizard_field:account_followup.followup.print.all,next,email_conf:0 -msgid "Send email confirmation" -msgstr "Pošalji Email potvrdu" +#: field:account_followup.stat,date_move:0 +msgid "First move" +msgstr "Prvi potez" #. module: account_followup -#: wizard_field:account_followup.followup.print.all,init,followup_id:0 -msgid "Follow-up" -msgstr "Pracenje" +#: report:account_followup.followup.print:0 +msgid "Li." +msgstr "Li." #. module: account_followup -#: field:account_followup.stat,name:0 -msgid "Partner" -msgstr "Partner" +#: report:account_followup.followup.print:0 +msgid "Maturity" +msgstr "Dospeće" #. module: account_followup -#: wizard_button:account_followup.followup.print.all,init,end:0 -#: wizard_button:account_followup.followup.print.all,next,end:0 -msgid "Cancel" -msgstr "Otkaži" +#: view:account.followup.print:0 +msgid "Continue" +msgstr "Nastavi" #. module: account_followup #: field:account_followup.followup.line,delay:0 @@ -542,6 +645,190 @@ msgid "Days of delay" msgstr "Dana kašnjenja" #. module: account_followup -#: wizard_button:account_followup.followup.print.all,next,print:0 -msgid "Print Follow Ups & Send Mails" -msgstr "Odstampaj Pracenja & Posalji Meilove" +#: report:account_followup.followup.print:0 +msgid "Document : Customer account statement" +msgstr "Dokument:Korisnicka stavka naloga" + +#. module: account_followup +#: view:account.followup.print.all:0 +#: field:account.followup.print.all,summary:0 +msgid "Summary" +msgstr "Sumarno" + +#. module: account_followup +#: view:account.move.line:0 +msgid "Total credit" +msgstr "Ukupno potražuje" + +#. module: account_followup +#: view:account.followup.print.all:0 +msgid "%(line)s: Ledger Posting lines" +msgstr "%(line): Ledger Posting lines" + +#. module: account_followup +#: field:account_followup.followup.line,sequence:0 +msgid "Sequence" +msgstr "Sekvenca" + +#. module: account_followup +#: view:account_followup.followup.line:0 +msgid "%(company_name)s: User's Company Name" +msgstr "%(company_name): Strankino Ime Preduzeca" + +#. module: account_followup +#: report:account_followup.followup.print:0 +msgid "Customer Ref :" +msgstr "Poziv na broj" + +#. module: account_followup +#: view:account.followup.print.all:0 +msgid "%(partner_name)s: Partner name" +msgstr "%(partner_name)s: Partnerovo Ime" + +#. module: account_followup +#: view:account_followup.stat:0 +msgid "Latest Followup Date" +msgstr "Datum poslednjeg Pracenja" + +#. module: account_followup +#: model:ir.model,name:account_followup.model_account_followup_followup_line +msgid "Follow-Up Criteria" +msgstr "Kriterijum Pracenja" + +#~ msgid "All payable entries" +#~ msgstr "Sve stavke potraživanja" + +#~ msgid "Amount In Currency" +#~ msgstr "Iznos u valuti" + +#~ msgid "Select partners" +#~ msgstr "Odaberi partnere" + +#~ msgid "%(line)s: Account Move lines" +#~ msgstr "%(red): redovi prenosa računa" + +#~ msgid "Follow-Ups Criteria" +#~ msgstr "Kriterijumi Praćenja" + +#~ msgid "" +#~ "\n" +#~ "Dear %(partner_name)s,\n" +#~ "\n" +#~ "Exception made if there was a mistake of ours, it seems that the following " +#~ "amount staid unpaid. Please, take appropriate measures in order to carry out " +#~ "this payment in the next 8 days.\n" +#~ "\n" +#~ "Would your payment have been carried out after this mail was sent, please " +#~ "consider the present one as void. Do not hesitate to contact our accounting " +#~ "department at (+32).10.68.94.39.\n" +#~ "\n" +#~ "Best Regards,\n" +#~ "\t\t\t" +#~ msgstr "" +#~ "\n" +#~ "Postovani %(partner_name)s,\n" +#~ "\n" +#~ "Izvinjavamo se unapred ako je greska nastala kod nas, cini se da su sledeci " +#~ "iznosi ostali neplaceni. Molimo, preduzmite neophodne akcije u cilju isplate " +#~ "ovih racuna u sledecih 8 dana.\n" +#~ "\n" +#~ "Ukoliko uradite isplatu nakon ovog maila, molimo obavestite nas, Takodje se " +#~ "nemojte ustrucavati da kontaktirate nasu\n" +#~ "racunovodstvenu sluzbu na tel (032) 69 555 666\n" +#~ "\n" +#~ "Srdacan pozdrav\n" +#~ "\t\t\t" + +#~ msgid "Follow-up and Date Selection" +#~ msgstr "Praćenja i Datum Selekcije" + +#~ msgid "Lines" +#~ msgstr "redova" + +#~ msgid "All receivable entries" +#~ msgstr "Sve stavke potraživanja" + +#~ msgid "Followup statistics" +#~ msgstr "Statisktike Praćenja" + +#~ msgid "" +#~ "\n" +#~ "Dear %(partner_name)s,\n" +#~ "\n" +#~ "We are disappointed to see that despite sending a reminder, that your " +#~ "account is now seriously overdue.\n" +#~ "\n" +#~ "It is essential that immediate payment is made, otherwise we will have to " +#~ "consider placing a stop on your account which means that we will no longer " +#~ "be able to supply your company with (goods/services).\n" +#~ "Please, take appropriate measures in order to carry out this payment in the " +#~ "next 8 days\n" +#~ "\n" +#~ "If there is a problem with paying invoice that we are not aware of, do not " +#~ "hesitate to contact our accounting department at (+32).10.68.94.39. so that " +#~ "we can resolve the matter quickly.\n" +#~ "\n" +#~ "Details of due payments is printed below.\n" +#~ "\n" +#~ "Best Regards,\n" +#~ "\t\t\t" +#~ msgstr "" +#~ "\n" +#~ "Postovani %(partner_name)s\n" +#~ "\n" +#~ "Zao nam je sto vas moramo podsecati, ali vas je nalog sada u ozbiljnom " +#~ "prekoracenju.\n" +#~ "\n" +#~ "Vrlo je bitno da izmirite vase obaveze ka nama, u suprotnom ce mo morati " +#~ "razmotriti dalju saradnju sa vama, sto znaci da necemo\n" +#~ "vise biti u mogucnosti da vas snabdevamo ( servisiramo)\n" +#~ "\n" +#~ "Molimo vas da preduzmete hitne mere kako bi se izvrsila ova uplata u roku od " +#~ "8 dana.\n" +#~ "\n" +#~ "Ukoliko postoji problem vezan za vas racun, a mi nismo upoznati, ne " +#~ "ustrucavajte se da kontaktirate nase racunovodstvo na (+32_69 555 666 kako " +#~ "bi mogli resiti nastalu gresku sto pre.\n" +#~ "\n" +#~ "Detalji vaseg racuna se nalaze ispod.\n" +#~ "\n" +#~ "Srdacan pozdrav.\n" +#~ "\t\t\t" + +#~ msgid "" +#~ "\n" +#~ "Dear %(partner_name)s,\n" +#~ "\n" +#~ "Despite several reminders, your account is still not settled.\n" +#~ "\n" +#~ "Unless full payment is made in next 8 days , then legal action for the " +#~ "recovery of the debt, will be taken without further notice.\n" +#~ "\n" +#~ "I trust that this action will prove unnecessary and details of due payments " +#~ "is printed below.\n" +#~ "\n" +#~ "In case of any queries concerning this matter, do not hesitate to contact " +#~ "our accounting department at (+32).10.68.94.39.\n" +#~ "\n" +#~ "Best Regards,\n" +#~ "\t\t\t" +#~ msgstr "" +#~ "\n" +#~ "Postovani %(partner_name)s,\n" +#~ "\n" +#~ "Uprkos nekoliko opomena, vase dugovanje nije izmireno.\n" +#~ "\n" +#~ "Ukoliko ne izvrsite uplatu u sledecih 8 dana, bicemo prinudjeni da se " +#~ "obratimo nadleznim organima za sravnjenje ovog duga.\n" +#~ "\n" +#~ "Verujem da ce se ova varijanta pokazati kao nepotrebna i da ce te vi " +#~ "izvrsiti uplatu dugova opisanih ispod.\n" +#~ "\n" +#~ "U slucaju bilo kakve nedoumice, ili nase greske, nemojte se ustrucavati da " +#~ "kontaktirate nase knjigovodstvo na (+32)69 555 666.\n" +#~ "\n" +#~ "Srdacan Pozdrav.\n" +#~ "\t\t\t" + +#~ msgid "Print Follow Ups & Send Mails" +#~ msgstr "Odstampaj Pracenja & Posalji Meilove" diff --git a/addons/account_invoice_layout/i18n/sr.po b/addons/account_invoice_layout/i18n/sr.po index ae168dc498c..496f3bd8c19 100644 --- a/addons/account_invoice_layout/i18n/sr.po +++ b/addons/account_invoice_layout/i18n/sr.po @@ -7,14 +7,14 @@ msgid "" msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" -"POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-10-15 09:39+0000\n" -"Last-Translator: OpenERP Administrators <Unknown>\n" +"POT-Creation-Date: 2010-10-18 17:46+0000\n" +"PO-Revision-Date: 2010-10-26 07:25+0000\n" +"Last-Translator: zmmaj <Unknown>\n" "Language-Team: Serbian <sr@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n" +"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_invoice_layout @@ -23,9 +23,10 @@ msgid "Sub Total" msgstr "Subtotal" #. module: account_invoice_layout -#: rml:account.invoice.layout:0 -msgid "Invoice Date:" -msgstr "Datum fakture:" +#: report:account.invoice.layout:0 +#: report:notify_account.invoice:0 +msgid "Note:" +msgstr "Napomena:" #. module: account_invoice_layout #: constraint:ir.model:0 @@ -35,7 +36,8 @@ msgstr "" "Ime objekta mora da počinje sa x_ i ne sme da sadrži specijalne karaktere !" #. module: account_invoice_layout -#: rml:account.invoice.layout:0 +#: report:account.invoice.layout:0 +#: report:notify_account.invoice:0 msgid "Cancelled Invoice" msgstr "Otkazane Fakture" @@ -46,29 +48,26 @@ msgid "Title" msgstr "Naslov" #. module: account_invoice_layout -#: model:ir.actions.wizard,name:account_invoice_layout.wizard_notify_message +#: model:ir.actions.act_window,name:account_invoice_layout.action_account_invoice_special_msg +#: model:ir.actions.report.xml,name:account_invoice_layout.account_invoices_layout_message msgid "Invoices with Layout and Message" msgstr "Formatirana Faktura sa Porukom" #. module: account_invoice_layout -#: rml:account.invoice.layout:0 +#: report:account.invoice.layout:0 +#: report:notify_account.invoice:0 msgid "Disc. (%)" msgstr "Popust (%)" #. module: account_invoice_layout -#: rml:account.invoice.layout:0 -msgid "(Incl. taxes):" -msgstr "Urac.porezi" - -#. module: account_invoice_layout #: selection:account.invoice.line,state:0 msgid "Note" msgstr "Napomena" #. module: account_invoice_layout -#: wizard_button:wizard.notify_message,init,print:0 -msgid "Print" -msgstr "Štampaj" +#: model:ir.model,name:account_invoice_layout.model_notify_message +msgid "Notify By Messages" +msgstr "Napomena po porukama" #. module: account_invoice_layout #: help:notify.message,msg:0 @@ -77,22 +76,35 @@ msgid "" msgstr "Ova napomena ce se pojaviti na dnu fakture pri stampi" #. module: account_invoice_layout -#: rml:account.invoice.layout:0 +#: report:account.invoice.layout:0 +#: report:notify_account.invoice:0 msgid "Unit Price" msgstr "Jedinična cijena" #. module: account_invoice_layout +#: constraint:ir.ui.menu:0 +msgid "Error ! You can not create recursive Menu." +msgstr "Greska! Ne mozete kreirati rekursivni meni." + +#. module: account_invoice_layout +#: model:notify.message,msg:account_invoice_layout.demo_message1 +msgid "Be Expert with the Experts..." +msgstr "Budite Expert sa Expertima..." + +#. module: account_invoice_layout #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." msgstr "Pogrešno ime modela u definiciji akcije." #. module: account_invoice_layout -#: model:ir.model,name:account_invoice_layout.model_notify_message -msgid "Notify By Messages" -msgstr "Napomena po porukama" +#: report:account.invoice.layout:0 +#: report:notify_account.invoice:0 +msgid "Document" +msgstr "Dokument" #. module: account_invoice_layout -#: rml:account.invoice.layout:0 +#: report:account.invoice.layout:0 +#: report:notify_account.invoice:0 msgid "PRO-FORMA" msgstr "Predračun" @@ -112,32 +124,30 @@ msgid "Notification Message" msgstr "Poruka Napomene" #. module: account_invoice_layout -#: rml:account.invoice.layout:0 -msgid "Customer Ref:" -msgstr "Referenca kupca:" +#: selection:account.invoice.line,state:0 +msgid "Product" +msgstr "Proizvod" #. module: account_invoice_layout -#: rml:account.invoice.layout:0 -msgid ")" -msgstr ")" +#: help:account.invoice.line,sequence:0 +msgid "Gives the sequence order when displaying a list of invoice lines." +msgstr "poredja sekvence pri prikazu liste faktura." #. module: account_invoice_layout -#: field:account.invoice.line,state:0 -msgid "Type" -msgstr "Tip" - -#. module: account_invoice_layout -#: rml:account.invoice.layout:0 +#: report:account.invoice.layout:0 +#: report:notify_account.invoice:0 msgid "Price" msgstr "Cena" #. module: account_invoice_layout -#: rml:account.invoice.layout:0 -msgid "/ (" -msgstr "/(" +#: report:account.invoice.layout:0 +#: report:notify_account.invoice:0 +msgid "Invoice Date" +msgstr "Datum Fakture" #. module: account_invoice_layout -#: rml:account.invoice.layout:0 +#: report:account.invoice.layout:0 +#: report:notify_account.invoice:0 msgid "Taxes:" msgstr "Porezi:" @@ -152,29 +162,38 @@ msgid "Write Messages" msgstr "Napisi Poruke" #. module: account_invoice_layout -#: rml:account.invoice.layout:0 +#: report:account.invoice.layout:0 +#: report:notify_account.invoice:0 msgid "Base" msgstr "Osnova" #. module: account_invoice_layout -#: rml:account.invoice.layout:0 -msgid "Fax :" -msgstr "Fax :" +#: selection:account.invoice.line,state:0 +msgid "Page Break" +msgstr "Прелом стране" #. module: account_invoice_layout +#: view:notify.message:0 #: field:notify.message,msg:0 msgid "Special Message" msgstr "Specijalna Poruka" #. module: account_invoice_layout -#: view:notify.message:0 -msgid "Write a notification or a wishful message." -msgstr "Napisi napomenu ili celu poruku" +#: help:account.invoice.special.msg,message:0 +msgid "Message to Print at the bottom of report" +msgstr "Poruka koja se stampa pri dnu izvestaja" + +#. module: account_invoice_layout +#: report:account.invoice.layout:0 +#: report:notify_account.invoice:0 +msgid "Quantity" +msgstr "Količina" #. module: account_invoice_layout -#: rml:account.invoice.layout:0 -msgid "Tel. :" -msgstr "Tel. :" +#: report:account.invoice.layout:0 +#: report:notify_account.invoice:0 +msgid "Partner Ref." +msgstr "Vezani partner" #. module: account_invoice_layout #: constraint:ir.ui.view:0 @@ -182,17 +201,20 @@ msgid "Invalid XML for View Architecture!" msgstr "Nevažeći XML za pregled arhitekture" #. module: account_invoice_layout -#: selection:account.invoice.line,state:0 -msgid "Page Break" -msgstr "Прелом стране" +#: report:account.invoice.layout:0 +#: model:ir.model,name:account_invoice_layout.model_account_invoice +#: report:notify_account.invoice:0 +msgid "Invoice" +msgstr "Račun" #. module: account_invoice_layout -#: rml:account.invoice.layout:0 -msgid "Document:" -msgstr "Dokument" +#: report:account.invoice.layout:0 +#: report:notify_account.invoice:0 +msgid "Total:" +msgstr "Ukupno:" #. module: account_invoice_layout -#: wizard_view:wizard.notify_message,init:0 +#: view:account.invoice.special.msg:0 msgid "Select Message" msgstr "Odaberite poruku" @@ -202,32 +224,31 @@ msgid "Messages" msgstr "Poruke" #. module: account_invoice_layout -#: selection:account.invoice.line,state:0 -msgid "Product" -msgstr "Proizvod" - -#. module: account_invoice_layout #: model:ir.actions.report.xml,name:account_invoice_layout.account_invoices_1 msgid "Invoices with Layout" msgstr "Formatirana Faktura" #. module: account_invoice_layout -#: rml:account.invoice.layout:0 +#: report:account.invoice.layout:0 +#: report:notify_account.invoice:0 msgid "Description / Taxes" msgstr "Opis / Porezi" #. module: account_invoice_layout -#: rml:account.invoice.layout:0 +#: report:account.invoice.layout:0 +#: report:notify_account.invoice:0 msgid "Amount" msgstr "Iznos" #. module: account_invoice_layout -#: rml:account.invoice.layout:0 -msgid "Description/Taxes" -msgstr "Opis/Porezi" +#: report:account.invoice.layout:0 +#: report:notify_account.invoice:0 +msgid "Tel. :" +msgstr "Tel. :" #. module: account_invoice_layout -#: rml:account.invoice.layout:0 +#: report:account.invoice.layout:0 +#: report:notify_account.invoice:0 msgid "Draft Invoice" msgstr "Neodobreni računi" @@ -237,19 +258,20 @@ msgid "Sequence Number" msgstr "Broj Sekvence" #. module: account_invoice_layout -#: rml:account.invoice.layout:0 -msgid "Quantity" -msgstr "Količina" +#: model:ir.model,name:account_invoice_layout.model_account_invoice_special_msg +msgid "Account Invoice Special Message" +msgstr "Specijalna poruka naloga fakture" #. module: account_invoice_layout -#: rml:account.invoice.layout:0 +#: report:account.invoice.layout:0 +#: report:notify_account.invoice:0 msgid "Refund" msgstr "Refundiraj" #. module: account_invoice_layout -#: rml:account.invoice.layout:0 -msgid "VAT :" -msgstr "PDV :" +#: field:account.invoice.line,state:0 +msgid "Type" +msgstr "Tip" #. module: account_invoice_layout #: selection:account.invoice.line,state:0 @@ -257,56 +279,114 @@ msgid "Separator Line" msgstr "Linija za odvajanje" #. module: account_invoice_layout -#: rml:account.invoice.layout:0 +#: model:ir.module.module,shortdesc:account_invoice_layout.module_meta_information +msgid "Invoices Layout Improvement" +msgstr "Unapredjenje izgleda fakture" + +#. module: account_invoice_layout +#: report:account.invoice.layout:0 +#: report:notify_account.invoice:0 msgid "Supplier Invoice" msgstr "Račun dobavljača" #. module: account_invoice_layout -#: rml:account.invoice.layout:0 -msgid "Note :" -msgstr "Napomena :" +#: view:account.invoice.special.msg:0 +msgid "Print" +msgstr "Štampaj" + +#. module: account_invoice_layout +#: report:account.invoice.layout:0 +#: report:notify_account.invoice:0 +msgid "VAT :" +msgstr "PDV :" #. module: account_invoice_layout -#: rml:account.invoice.layout:0 +#: report:account.invoice.layout:0 +#: report:notify_account.invoice:0 msgid "Tax" msgstr "Porez" #. module: account_invoice_layout -#: model:ir.module.module,shortdesc:account_invoice_layout.module_meta_information -msgid "account_invoice_layout" -msgstr "izgled_fakture_naloga" +#: model:ir.model,name:account_invoice_layout.model_account_invoice_line +msgid "Invoice Line" +msgstr "Redak računa" #. module: account_invoice_layout -#: rml:account.invoice.layout:0 -msgid "Total (Excl. taxes):" -msgstr "Ukupno (bez poreza):" +#: report:account.invoice.layout:0 +#: report:notify_account.invoice:0 +msgid "Net Total:" +msgstr "Neto Ukupno" #. module: account_invoice_layout -#: rml:account.invoice.layout:0 -msgid "Invoice" -msgstr "Račun" +#: view:notify.message:0 +msgid "Write a notification or a wishful message." +msgstr "Napisi napomenu ili celu poruku" #. module: account_invoice_layout -#: wizard_button:wizard.notify_message,init,end:0 +#: report:account.invoice.layout:0 +#: report:notify_account.invoice:0 +msgid "Fax :" +msgstr "Faks :" + +#. module: account_invoice_layout +#: view:account.invoice.special.msg:0 msgid "Cancel" msgstr "Otkaži" #. module: account_invoice_layout -#: rml:account.invoice.layout:0 +#: report:account.invoice.layout:0 +#: report:notify_account.invoice:0 msgid "Supplier Refund" msgstr "Povrat Dobavljaču" #. module: account_invoice_layout -#: wizard_field:wizard.notify_message,init,message:0 +#: field:account.invoice.special.msg,message:0 msgid "Message" msgstr "Poruka" #. module: account_invoice_layout -#: rml:account.invoice.layout:0 -msgid "Total" -msgstr "Ukupno" - -#. module: account_invoice_layout #: model:ir.ui.menu,name:account_invoice_layout.menu_notify_mesage_tree_form msgid "All Notification Messages" msgstr "Sve Napomene" + +#~ msgid "Invoice Date:" +#~ msgstr "Datum fakture:" + +#~ msgid "(Incl. taxes):" +#~ msgstr "Urac.porezi" + +#~ msgid "Customer Ref:" +#~ msgstr "Referenca kupca:" + +#~ msgid ")" +#~ msgstr ")" + +#~ msgid "/ (" +#~ msgstr "/(" + +#~ msgid "Fax :" +#~ msgstr "Fax :" + +#~ msgid "Document:" +#~ msgstr "Dokument" + +#~ msgid "Tel. :" +#~ msgstr "Tel. :" + +#~ msgid "VAT :" +#~ msgstr "PDV :" + +#~ msgid "Note :" +#~ msgstr "Napomena :" + +#~ msgid "Description/Taxes" +#~ msgstr "Opis/Porezi" + +#~ msgid "Total" +#~ msgstr "Ukupno" + +#~ msgid "Total (Excl. taxes):" +#~ msgstr "Ukupno (bez poreza):" + +#~ msgid "account_invoice_layout" +#~ msgstr "izgled_fakture_naloga" diff --git a/addons/account_invoice_layout/test/account_invoice_layout_report.yml b/addons/account_invoice_layout/test/account_invoice_layout_report.yml index b7b1c1e76cc..0c1f2df7954 100644 --- a/addons/account_invoice_layout/test/account_invoice_layout_report.yml +++ b/addons/account_invoice_layout/test/account_invoice_layout_report.yml @@ -1,9 +1,22 @@ - + In order to Print the Invoice layout report in Normal Mode, we will create a invoice record +- + !record {model: account.invoice, id: test_invoice_1}: + currency_id: base.EUR + company_id: base.main_company + address_invoice_id: base.res_partner_address_tang + partner_id: base.res_partner_asus + state: draft + type: out_invoice + account_id: account.a_recv + name: Test invoice 1 + address_contact_id: base.res_partner_address_tang +- Print the Invoice layout report in Normal Mode -- +- !python {model: account.invoice}: | import netsvc, tools, os - (data, format) = netsvc.LocalService('report.account.invoice.layout').create(cr, uid, [ref('account.test_invoice_1')], {}, {}) + (data, format) = netsvc.LocalService('report.account.invoice.layout').create(cr, uid, [ref('test_invoice_1')], {}, {}) if tools.config['test_report_directory']: file(os.path.join(tools.config['test_report_directory'], 'account_invoice_layout.'+format), 'wb+').write(data) - @@ -11,7 +24,7 @@ - !python {model: account.invoice}: | import netsvc, tools, os, time - data_dict = {'model': 'account.invoice', 'form': {'message':ref('account_invoice_layout.demo_message1'),'id':ref('account.test_invoice_1'),'context':{}}} - (data, format) = netsvc.LocalService('report.notify_account.invoice').create(cr, uid, [ref('account.test_invoice_1')], data_dict, {}) + data_dict = {'model': 'account.invoice', 'form': {'message':ref('account_invoice_layout.demo_message1'),'id':ref('test_invoice_1'),'context':{}}} + (data, format) = netsvc.LocalService('report.notify_account.invoice').create(cr, uid, [ref('test_invoice_1')], data_dict, {}) if tools.config['test_report_directory']: - file(os.path.join(tools.config['test_report_directory'], 'account_invoice_layout_message_report.'+format), 'wb+').write(data)
\ No newline at end of file + file(os.path.join(tools.config['test_report_directory'], 'account_invoice_layout_message_report.'+format), 'wb+').write(data)
\ No newline at end of file diff --git a/addons/account_payment/__openerp__.py b/addons/account_payment/__openerp__.py index 7ccafd90eb4..c0579c19eec 100644 --- a/addons/account_payment/__openerp__.py +++ b/addons/account_payment/__openerp__.py @@ -19,7 +19,6 @@ # ############################################################################## - { "name": "Payment Management", "version": "1.1", @@ -56,4 +55,4 @@ This module provides : 'active': False, 'certificate': '0061703998541', } -# 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_payment/account_invoice.py b/addons/account_payment/account_invoice.py index c05721ce6dc..1f882b48421 100644 --- a/addons/account_payment/account_invoice.py +++ b/addons/account_payment/account_invoice.py @@ -20,6 +20,7 @@ ############################################################################## from datetime import datetime + from osv import fields, osv class Invoice(osv.osv): @@ -49,4 +50,4 @@ class Invoice(osv.osv): Invoice() -# 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_payment/account_move_line.py b/addons/account_payment/account_move_line.py index 2b9ea22d824..638b75dcaaa 100644 --- a/addons/account_payment/account_move_line.py +++ b/addons/account_payment/account_move_line.py @@ -18,6 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # ############################################################################## + from operator import itemgetter from osv import fields, osv from tools.translate import _ @@ -40,10 +41,10 @@ class account_move_line(osv.osv): INNER JOIN payment_order po ON (pl.order_id = po.id) WHERE move_line_id = ml.id - AND po.state != 'cancel') as amount + AND po.state != 'cancel') AS amount FROM account_move_line ml WHERE id IN %s""", (tuple(ids),)) - r=dict(cr.fetchall()) + r = dict(cr.fetchall()) return r def _to_pay_search(self, cr, uid, obj, name, args, context): @@ -74,8 +75,8 @@ class account_move_line(osv.osv): res = cr.fetchall() if not res: - return [('id','=','0')] - return [('id','in',map(lambda x:x[0], res))] + return [('id', '=', '0')] + return [('id', 'in', map(lambda x:x[0], res))] def line2bank(self, cr, uid, ids, payment_type=None, context=None): """ @@ -116,5 +117,4 @@ class account_move_line(osv.osv): account_move_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_payment/account_payment.py b/addons/account_payment/account_payment.py index a70e8fb75c3..750edccf389 100644 --- a/addons/account_payment/account_payment.py +++ b/addons/account_payment/account_payment.py @@ -27,7 +27,7 @@ import netsvc class payment_mode(osv.osv): _name= 'payment.mode' _description= 'Payment Mode' - _columns= { + _columns = { 'name': fields.char('Name', size=64, required=True, help='Mode of Payment'), 'bank_id': fields.many2one('res.partner.bank', "Bank account", required=True,help='Bank Account for the Payment Mode'), @@ -44,10 +44,10 @@ class payment_mode(osv.osv): for the given payment type code""" if not payment_code: return [] - cr.execute(""" select pb.state - from res_partner_bank pb - join payment_mode pm on (pm.bank_id = pb.id) - where pm.id = %s """, [payment_code]) + cr.execute(""" SELECT pb.state + FROM res_partner_bank pb + JOIN payment_mode pm ON (pm.bank_id = pb.id) + WHERE pm.id = %s """, [payment_code]) return [x[0] for x in cr.fetchall()] payment_mode() @@ -75,48 +75,49 @@ class payment_order(osv.osv): return res _columns = { - 'date_scheduled': fields.date('Scheduled date if fixed', states={'done':[('readonly',True)]}, help='Select a date if you have chosen Preferred Date to be fixed.'), - 'reference': fields.char('Reference', size=128, required=1, states={'done':[('readonly',True)]}), - 'mode': fields.many2one('payment.mode','Payment mode', select=True, required=1, states={'done':[('readonly',True)]}, help='Select the Payment Mode to be applied.'), + 'date_scheduled': fields.date('Scheduled date if fixed', states={'done':[('readonly', True)]}, help='Select a date if you have chosen Preferred Date to be fixed.'), + 'reference': fields.char('Reference', size=128, required=1, states={'done': [('readonly', True)]}), + 'mode': fields.many2one('payment.mode', 'Payment mode', select=True, required=1, states={'done': [('readonly', True)]}, help='Select the Payment Mode to be applied.'), 'state': fields.selection([ ('draft', 'Draft'), - ('open','Confirmed'), - ('cancel','Cancelled'), - ('done','Done')], 'State', select=True, + ('open', 'Confirmed'), + ('cancel', 'Cancelled'), + ('done', 'Done')], 'State', select=True, help='When an order is placed the state is \'Draft\'.\n Once the bank is confirmed the state is set to \'Confirmed\'.\n Then the order is paid the state is \'Done\'.'), - 'line_ids': fields.one2many('payment.line', 'order_id', 'Payment lines', states={'done':[('readonly',True)]}), - 'total': fields.function(_total, string="Total", method=True, - type='float'), - 'user_id': fields.many2one('res.users', 'User', required=True, states={'done':[('readonly',True)]}), + 'line_ids': fields.one2many('payment.line', 'order_id', 'Payment lines', states={'done': [('readonly', True)]}), + 'total': fields.function(_total, string="Total", method=True, type='float'), + 'user_id': fields.many2one('res.users', 'User', required=True, states={'done': [('readonly', True)]}), 'date_prefered': fields.selection([ ('now', 'Directly'), ('due', 'Due date'), ('fixed', 'Fixed date') - ], "Preferred date", change_default=True, required=True, states={'done':[('readonly', True)]}, help="Choose an option for the Payment Order:'Fixed' stands for a date specified by you.'Directly' stands for the direct execution.'Due date' stands for the scheduled date of execution."), + ], "Preferred date", change_default=True, required=True, states={'done': [('readonly', True)]}, help="Choose an option for the Payment Order:'Fixed' stands for a date specified by you.'Directly' stands for the direct execution.'Due date' stands for the scheduled date of execution."), 'date_created': fields.date('Creation date', readonly=True), 'date_done': fields.date('Execution date', readonly=True), } _defaults = { 'user_id': lambda self,cr,uid,context: uid, - 'state': lambda *a: 'draft', - 'date_prefered': lambda *a: 'due', - 'date_created': lambda *a: time.strftime('%Y-%m-%d'), + 'state': 'draft', + 'date_prefered': 'due', + 'date_created': time.strftime('%Y-%m-%d'), 'reference': lambda self,cr,uid,context: self.pool.get('ir.sequence').get(cr, uid, 'payment.order'), } def set_to_draft(self, cr, uid, ids, *args): - self.write(cr, uid, ids, {'state':'draft'}) + self.write(cr, uid, ids, {'state': 'draft'}) wf_service = netsvc.LocalService("workflow") for id in ids: wf_service.trg_create(uid, 'payment.order', id, cr) return True def action_open(self, cr, uid, ids, *args): + ir_seq_obj = self.pool.get('ir.sequence') + for order in self.read(cr, uid, ids, ['reference']): if not order['reference']: - reference = self.pool.get('ir.sequence').get(cr, uid, 'payment.order') - self.write(cr, uid, order['id'],{'reference':reference}) + reference = ir_seq_obj.get(cr, uid, 'payment.order') + self.write(cr, uid, order['id'], {'reference':reference}) return True def set_done(self, cr, uid, ids, *args): @@ -127,7 +128,7 @@ class payment_order(osv.osv): def copy(self, cr, uid, id, default={}, context=None): default.update({ - 'state':'draft', + 'state': 'draft', 'line_ids': [], 'reference': self.pool.get('ir.sequence').get(cr, uid, 'payment.order') }) @@ -138,18 +139,19 @@ class payment_order(osv.osv): context = {} payment_line_obj = self.pool.get('payment.line') payment_line_ids = [] + if (vals.get('date_prefered', False) == 'fixed' and not vals.get('date_scheduled', False)) or vals.get('date_scheduled', False): for order in self.browse(cr, uid, ids, context=context): for line in order.line_ids: payment_line_ids.append(line.id) - payment_line_obj.write(cr, uid, payment_line_ids, {'date':vals.get('date_scheduled', False)}, context=context) + payment_line_obj.write(cr, uid, payment_line_ids, {'date': vals.get('date_scheduled', False)}, context=context) elif vals.get('date_prefered', False) == 'due': - vals.update({'date_scheduled':False}) + vals.update({'date_scheduled': False}) for order in self.browse(cr, uid, ids, context=context): for line in order.line_ids: - payment_line_obj.write(cr, uid, [line.id], {'date':line.ml_maturity_date}, context=context) + payment_line_obj.write(cr, uid, [line.id], {'date': line.ml_maturity_date}, context=context) elif vals.get('date_prefered', False) == 'now': - vals.update({'date_scheduled':False}) + vals.update({'date_scheduled': False}) for order in self.browse(cr, uid, ids, context=context): for line in order.line_ids: payment_line_ids.append(line.id) @@ -169,63 +171,67 @@ class payment_line(osv.osv): def info_owner(self, cr, uid, ids, name=None, args=None, context=None): if not ids: return {} + partner_zip_obj = self.pool.get('res.partner.zip') + result = {} info='' for line in self.browse(cr, uid, ids, context=context): - owner=line.order_id.mode.bank_id.partner_id - result[line.id]=False + owner = line.order_id.mode.bank_id.partner_id + result[line.id] = False if owner.address: for ads in owner.address: - if ads.type=='default': - st=ads.street and ads.street or '' - st1=ads.street2 and ads.street2 or '' + if ads.type == 'default': + st = ads.street and ads.street or '' + st1 = ads.street2 and ads.street2 or '' if 'zip_id' in ads: - zip_city= ads.zip_id and self.pool.get('res.partner.zip').name_get(cr, uid, [ads.zip_id.id])[0][1] or '' + zip_city = ads.zip_id and partner_zip_obj.name_get(cr, uid, [ads.zip_id.id])[0][1] or '' else: - zip=ads.zip and ads.zip or '' - city= ads.city and ads.city or '' - zip_city= zip + ' ' + city - cntry= ads.country_id and ads.country_id.name or '' - info=owner.name + "\n" + st + " " + st1 + "\n" + zip_city + "\n" +cntry - result[line.id]=info + zip = ads.zip and ads.zip or '' + city = ads.city and ads.city or '' + zip_city = zip + ' ' + city + cntry = ads.country_id and ads.country_id.name or '' + info = owner.name + "\n" + st + " " + st1 + "\n" + zip_city + "\n" +cntry + result[line.id] = info break return result def info_partner(self, cr, uid, ids, name=None, args=None, context=None): if not ids: return {} + partner_zip_obj = self.pool.get('res.partner.zip') result = {} - info='' + info = '' + for line in self.browse(cr, uid, ids, context=context): - result[line.id]=False + result[line.id] = False if not line.partner_id: break partner = line.partner_id.name or '' if line.partner_id.address: for ads in line.partner_id.address: - if ads.type=='default': - st=ads.street and ads.street or '' - st1=ads.street2 and ads.street2 or '' + if ads.type == 'default': + st = ads.street and ads.street or '' + st1 = ads.street2 and ads.street2 or '' if 'zip_id' in ads: - zip_city= ads.zip_id and self.pool.get('res.partner.zip').name_get(cr, uid, [ads.zip_id.id])[0][1] or '' + zip_city = ads.zip_id and partner_zip_obj.name_get(cr, uid, [ads.zip_id.id])[0][1] or '' else: - zip=ads.zip and ads.zip or '' - city= ads.city and ads.city or '' - zip_city= zip + ' ' + city - cntry= ads.country_id and ads.country_id.name or '' - info=partner + "\n" + st + " " + st1 + "\n" + zip_city + "\n" +cntry - result[line.id]=info + zip = ads.zip and ads.zip or '' + city = ads.city and ads.city or '' + zip_city = zip + ' ' + city + cntry = ads.country_id and ads.country_id.name or '' + info = partner + "\n" + st + " " + st1 + "\n" + zip_city + "\n" +cntry + result[line.id] = info break return result def select_by_name(self, cr, uid, ids, name, args, context=None): if not ids: return {} - partner_obj = self.pool.get('res.partner') + cr.execute("""SELECT pl.id, ml.%s - from account_move_line ml - inner join payment_line pl - on (ml.id = pl.move_line_id) - where pl.id IN %%s"""% self.translate(name), + FROM account_move_line ml + INNER JOIN payment_line pl + ON (ml.id = pl.move_line_id) + WHERE pl.id IN %%s"""% self.translate(name), (tuple(ids),)) res = dict(cr.fetchall()) @@ -252,6 +258,7 @@ class payment_line(osv.osv): if context is None: context = {} res = {} + for line in self.browse(cursor, user, ids, context=context): ctx = context.copy() ctx['date'] = line.order_id.date_done or time.strftime('%Y-%m-%d') @@ -261,18 +268,23 @@ class payment_line(osv.osv): return res def _get_currency(self, cr, uid, context): - user = self.pool.get('res.users').browse(cr, uid, uid) + user_obj = self.pool.get('res.users') + currency_obj = self.pool.get('res.currency') + user = user_obj.browse(cr, uid, uid) + if user.company_id: return user.company_id.currency_id.id else: - return self.pool.get('res.currency').search(cr, uid, [('rate','=',1.0)])[0] + return currency_obj.search(cr, uid, [('rate', '=', 1.0)])[0] def _get_date(self, cr, uid, context=None): if context is None: context = {} + payment_order_obj = self.pool.get('payment.order') date = False + if context.get('order_id') and context['order_id']: - order = self.pool.get('payment.order').browse(cr, uid, context['order_id'], context) + order = payment_order_obj.browse(cr, uid, context['order_id'], context) if order.date_prefered == 'fixed': date = order.date_scheduled else: @@ -280,7 +292,7 @@ class payment_line(osv.osv): return date def _get_ml_inv_ref(self, cr, uid, ids, *a): - res={} + res = {} for id in self.browse(cr, uid, ids): res[id.id] = False if id.move_line_id: @@ -289,7 +301,7 @@ class payment_line(osv.osv): return res def _get_ml_maturity_date(self, cr, uid, ids, *a): - res={} + res = {} for id in self.browse(cr, uid, ids): if id.move_line_id: res[id.id] = id.move_line_id.date_maturity @@ -298,7 +310,7 @@ class payment_line(osv.osv): return res def _get_ml_created_date(self, cr, uid, ids, *a): - res={} + res = {} for id in self.browse(cr, uid, ids): if id.move_line_id: res[id.id] = id.move_line_id.date_created @@ -310,8 +322,8 @@ class payment_line(osv.osv): 'name': fields.char('Your Reference', size=64, required=True), 'communication': fields.char('Communication', size=64, required=True, help="Used as the message between ordering customer and current company. Depicts 'What do you want to say to the recipient about this order ?'"), 'communication2': fields.char('Communication 2', size=64, help='The successor message of Communication.'), - 'move_line_id': fields.many2one('account.move.line', 'Entry line', domain=[('reconcile_id','=', False), ('account_id.type', '=','payable')], help='This Entry Line will be referred for the information of the ordering customer.'), - 'amount_currency': fields.float('Amount in Partner Currency', digits=(16,2), + 'move_line_id': fields.many2one('account.move.line', 'Entry line', domain=[('reconcile_id', '=', False), ('account_id.type', '=', 'payable')], help='This Entry Line will be referred for the information of the ordering customer.'), + 'amount_currency': fields.float('Amount in Partner Currency', digits=(16, 2), required=True, help='Payment amount in the partner currency'), 'currency': fields.many2one('res.currency','Partner Currency', required=True), 'company_currency': fields.many2one('res.currency', 'Company Currency', readonly=True), @@ -346,19 +358,20 @@ class payment_line(osv.osv): ] def onchange_move_line(self, cr, uid, ids, move_line_id, payment_type, date_prefered, date_scheduled, currency=False, company_currency=False, context=None): - data={} + data = {} + move_line_obj = self.pool.get('account.move.line') - data['amount_currency']=data['communication']=data['partner_id']=data['reference']=data['date_created']=data['bank_id']=data['amount']=False + data['amount_currency'] = data['communication'] = data['partner_id'] = data['reference'] = data['date_created'] = data['bank_id'] = data['amount'] = False if move_line_id: - line = self.pool.get('account.move.line').browse(cr, uid, move_line_id) - data['amount_currency']=line.amount_to_pay + line = move_line_obj.browse(cr, uid, move_line_id) + data['amount_currency'] = line.amount_to_pay res = self.onchange_amount(cr, uid, ids, data['amount_currency'], currency, company_currency, context) if res: data['amount'] = res['value']['amount'] - data['partner_id']=line.partner_id.id + data['partner_id'] = line.partner_id.id temp = line.currency_id and line.currency_id.id or False if not temp: if line.invoice: @@ -367,12 +380,12 @@ class payment_line(osv.osv): data['currency'] = temp # calling onchange of partner and updating data dictionary - temp_dict=self.onchange_partner(cr, uid, ids, line.partner_id.id, payment_type) + temp_dict = self.onchange_partner(cr, uid, ids, line.partner_id.id, payment_type) data.update(temp_dict['value']) - data['reference']=line.ref + data['reference'] = line.ref data['date_created'] = line.date_created - data['communication']=line.ref + data['communication'] = line.ref if date_prefered == 'now': #no payment date => immediate payment @@ -385,7 +398,7 @@ class payment_line(osv.osv): def onchange_amount(self, cr, uid, ids, amount, currency, cmpny_currency, context=None): if (not amount) or (not cmpny_currency): - return {'value': {'amount':False}} + return {'value': {'amount': False}} res = {} currency_obj = self.pool.get('res.currency') company_amount = currency_obj.compute(cr, uid, currency, cmpny_currency, amount) @@ -393,33 +406,36 @@ class payment_line(osv.osv): return {'value': res} def onchange_partner(self, cr, uid, ids, partner_id, payment_type, context=None): - data={} - data['info_partner']=data['bank_id']=False + data = {} + partner_zip_obj = self.pool.get('res.partner.zip') + partner_obj = self.pool.get('res.partner') + payment_mode_obj = self.pool.get('payment.mode') + data['info_partner'] = data['bank_id'] = False if partner_id: - part_obj=self.pool.get('res.partner').browse(cr, uid, partner_id) - partner=part_obj.name or '' + part_obj = partner_obj.browse(cr, uid, partner_id) + partner = part_obj.name or '' if part_obj.address: for ads in part_obj.address: - if ads.type=='default': - st=ads.street and ads.street or '' - st1=ads.street2 and ads.street2 or '' + if ads.type == 'default': + st = ads.street and ads.street or '' + st1 = ads.street2 and ads.street2 or '' if 'zip_id' in ads: - zip_city= ads.zip_id and self.pool.get('res.partner.zip').name_get(cr, uid, [ads.zip_id.id])[0][1] or '' + zip_city = ads.zip_id and partner_zip_obj.name_get(cr, uid, [ads.zip_id.id])[0][1] or '' else: - zip=ads.zip and ads.zip or '' - city= ads.city and ads.city or '' - zip_city= zip + ' ' + city + zip = ads.zip and ads.zip or '' + city = ads.city and ads.city or '' + zip_city = zip + ' ' + city - cntry= ads.country_id and ads.country_id.name or '' - info=partner + "\n" + st + " " + st1 + "\n" + zip_city + "\n" +cntry + cntry = ads.country_id and ads.country_id.name or '' + info = partner + "\n" + st + " " + st1 + "\n" + zip_city + "\n" +cntry - data['info_partner']=info + data['info_partner'] = info if part_obj.bank_ids and payment_type: - bank_type = self.pool.get('payment.mode').suitable_bank_types(cr, uid, payment_type, context=context) + bank_type = payment_mode_obj.suitable_bank_types(cr, uid, payment_type, context=context) for bank in part_obj.bank_ids: if bank.state in bank_type: data['bank_id'] = bank.id @@ -432,7 +448,6 @@ class payment_line(osv.osv): res['communication2'].setdefault('states', {}) res['communication2']['states']['structured'] = [('readonly', True)] res['communication2']['states']['normal'] = [('readonly', False)] - return res payment_line() diff --git a/addons/account_payment/i18n/sr.po b/addons/account_payment/i18n/sr.po index 4fd733e9ea5..cf79de27525 100644 --- a/addons/account_payment/i18n/sr.po +++ b/addons/account_payment/i18n/sr.po @@ -7,14 +7,14 @@ msgid "" msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" -"POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-10-15 09:18+0000\n" -"Last-Translator: OpenERP Administrators <Unknown>\n" +"POT-Creation-Date: 2010-10-18 17:46+0000\n" +"PO-Revision-Date: 2010-10-26 07:34+0000\n" +"Last-Translator: zmmaj <Unknown>\n" "Language-Team: Serbian <sr@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n" +"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_payment @@ -38,6 +38,12 @@ msgid "Select the Payment Mode to be applied." msgstr "Odaberite način plaćanja koji će biti primenjen." #. module: account_payment +#: view:payment.mode:0 +#: view:payment.order:0 +msgid "Group By..." +msgstr "Grupirano po" + +#. module: account_payment #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." msgstr "Pogrešno ime modela u definiciji akcije." @@ -50,6 +56,17 @@ msgid "Owner Account" msgstr "Račun vlasnika" #. module: account_payment +#: help:payment.order,state:0 +msgid "" +"When an order is placed the state is 'Draft'.\n" +" Once the bank is confirmed the state is set to 'Confirmed'.\n" +" Then the order is paid the state is 'Done'." +msgstr "" +"Kada je narudzba postavljena stanje je 'Priprema'\n" +" Jednom kada je banka potvrdi, stanje je 'Potvrdjeno'.\n" +" Kada je narudzba placena stanje je 'Zavrseno'." + +#. module: account_payment #: help:account.invoice,amount_to_pay:0 msgid "" "The amount which should be paid at the current date\n" @@ -78,12 +95,18 @@ msgid "Free" msgstr "slobodno" #. module: account_payment -#: wizard_field:populate_payment,search,entries:0 +#: field:payment.order.create,entries:0 msgid "Entries" msgstr "Stavke" #. module: account_payment -#: wizard_field:populate_payment,init,duedate:0 +#: report:payment.order:0 +msgid "Used Account" +msgstr "Koristeni Nalog" + +#. module: account_payment +#: field:payment.line,ml_maturity_date:0 +#: field:payment.order.create,duedate:0 msgid "Due Date" msgstr "Datum dospeća" @@ -93,22 +116,23 @@ msgid "Account Entry Line" msgstr "Stavke knjiženja" #. module: account_payment -#: wizard_button:populate_payment,search,create:0 +#: view:payment.order.create:0 msgid "_Add to payment order" msgstr "_Dodaj u nalog za plaćanje" #. module: account_payment -#: rml:payment.order:0 +#: model:ir.actions.act_window,name:account_payment.action_account_payment_populate_statement +#: model:ir.actions.act_window,name:account_payment.action_account_populate_statement_confirm +msgid "Payment Populate statement" +msgstr "Ispuna sadrzaja fakture" + +#. module: account_payment +#: report:payment.order:0 #: view:payment.order:0 msgid "Amount" msgstr "Iznos" #. module: account_payment -#: rml:payment.order:0 -msgid "Execution date:" -msgstr "Datum izvršenja:" - -#. module: account_payment #: view:payment.order:0 msgid "Total in Company Currency" msgstr "Ukupno u valuti preduzeca" @@ -120,12 +144,11 @@ msgstr "Otkazano" #. module: account_payment #: model:ir.actions.act_window,name:account_payment.action_payment_order_tree_new -#: model:ir.ui.menu,name:account_payment.menu_action_payment_order_form_new msgid "New Payment Order" msgstr "Novi nalog za plaćanje" #. module: account_payment -#: rml:payment.order:0 +#: report:payment.order:0 #: field:payment.order,reference:0 msgid "Reference" msgstr "Referenca" @@ -142,17 +165,10 @@ msgid "Directly" msgstr "Direktno" #. module: account_payment -#: model:ir.actions.act_window,name:account_payment.action_payment_line_form -#: model:ir.model,name:account_payment.model_payment_line -#: view:payment.line:0 #: view:payment.order:0 -msgid "Payment Line" -msgstr "Red plaćanja" - -#. module: account_payment -#: field:payment.type,suitable_bank_types:0 -msgid "Suitable bank types" -msgstr "Pogodni tipovi banaka" +#: selection:payment.order,state:0 +msgid "Draft" +msgstr "Priprema" #. module: account_payment #: view:payment.line:0 @@ -160,6 +176,7 @@ msgid "Amount Total" msgstr "Ukupni iznos" #. module: account_payment +#: view:payment.order:0 #: selection:payment.order,state:0 msgid "Confirmed" msgstr "Potvrđeno" @@ -175,9 +192,9 @@ msgid "Payment lines" msgstr "Redovi plaćanja" #. module: account_payment -#: help:payment.order,date_scheduled:0 -msgid "Select a date if you have chosen Preferred Date to be fixed." -msgstr "Odaberite datum ako ste odabrali fiksni željeni datum" +#: report:payment.order:0 +msgid "Execution Type" +msgstr "Tip Izuzetka" #. module: account_payment #: selection:payment.line,state:0 @@ -185,6 +202,7 @@ msgid "Structured" msgstr "Strukturiran" #. module: account_payment +#: view:payment.order:0 #: field:payment.order,state:0 msgid "State" msgstr "Stanje" @@ -197,8 +215,10 @@ msgstr "Informacije Transakcije" #. module: account_payment #: model:ir.actions.act_window,name:account_payment.action_payment_mode_form +#: model:ir.model,name:account_payment.model_payment_mode #: model:ir.ui.menu,name:account_payment.menu_action_payment_mode_form #: view:payment.mode:0 +#: view:payment.order:0 msgid "Payment Mode" msgstr "Način plaćanja" @@ -224,6 +244,12 @@ msgstr "" "zakazan datum izvršenja." #. module: account_payment +#: code:addons/account_payment/account_move_line.py:0 +#, python-format +msgid "Error !" +msgstr "Greška !" + +#. module: account_payment #: view:account.move.line:0 msgid "Total debit" msgstr "Ukupno duguje" @@ -240,33 +266,36 @@ msgstr "Fiksni datum" #. module: account_payment #: field:payment.line,info_partner:0 +#: view:payment.order:0 msgid "Destination Account" msgstr "Ciljni račun" #. module: account_payment #: view:payment.line:0 -#: view:payment.order:0 msgid "Desitination Account" msgstr "Ciljni račun" #. module: account_payment +#: view:payment.order:0 +msgid "Search Payment Orders" +msgstr "Pretrazi naloge za placanje" + +#. module: account_payment #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" msgstr "Nevažeći XML za pregled arhitekture" #. module: account_payment -#: wizard_button:populate_payment,init,end:0 -#: wizard_button:populate_payment,search,end:0 -#: wizard_button:populate_statement,init,end:0 -msgid "_Cancel" -msgstr "_Odustani" - -#. module: account_payment #: field:payment.line,create_date:0 msgid "Created" msgstr "Kreirano" #. module: account_payment +#: view:payment.order:0 +msgid "Select Invoices to Pay" +msgstr "Odaberite fakture za plaćanje" + +#. module: account_payment #: view:payment.line:0 msgid "Currency Amount Total" msgstr "Ukupni iznos valute" @@ -287,9 +316,9 @@ msgid "Payment Management" msgstr "Menadzment Plaćanja" #. module: account_payment -#: field:payment.line,communication:0 -msgid "Communication" -msgstr "Komunikacija" +#: field:payment.line,bank_statement_line_id:0 +msgid "Bank statement line" +msgstr "Red Izvoda iz Banke" #. module: account_payment #: selection:payment.order,date_prefered:0 @@ -302,18 +331,42 @@ msgid "Amount to be paid" msgstr "Iznos za plaćanje" #. module: account_payment +#: report:payment.order:0 +msgid "Currency" +msgstr "Valuta" + +#. module: account_payment +#: view:account.payment.make.payment:0 +msgid "Yes" +msgstr "Da" + +#. module: account_payment #: help:payment.line,info_owner:0 msgid "Address of the Main Partner" msgstr "Adresa glavnog partnera" #. module: account_payment +#: field:payment.mode,company_id:0 +msgid "Company" +msgstr "Preduzeće" + +#. module: account_payment +#: model:ir.model,name:account_payment.model_account_payment_populate_statement +msgid "Account Payment Populate Statement" +msgstr "Popunjeni platni nalog" + +#. module: account_payment #: help:payment.mode,name:0 msgid "Mode of Payment" msgstr "Način plaćanja" #. module: account_payment -#: view:payment.type:0 -#: help:payment.type,name:0 +#: report:payment.order:0 +msgid "Value Date" +msgstr "Datum" + +#. module: account_payment +#: report:payment.order:0 msgid "Payment Type" msgstr "Tip plaćanja" @@ -323,15 +376,17 @@ msgid "Payment amount in the partner currency" msgstr "Iznos plaćanja u valuti partnera" #. module: account_payment -#: selection:payment.order,state:0 -msgid "Draft" -msgstr "Priprema" +#: model:ir.actions.act_window,name:account_payment.action_payment_line_form +#: model:ir.model,name:account_payment.model_payment_line +#: view:payment.line:0 +#: view:payment.order:0 +msgid "Payment Line" +msgstr "Red plaćanja" #. module: account_payment -#: field:payment.line,partner_id:0 -#: rml:payment.order:0 -msgid "Partner" -msgstr "Partner" +#: constraint:ir.ui.menu:0 +msgid "Error ! You can not create recursive Menu." +msgstr "Greska! Ne mozete kreirati rekursivni meni." #. module: account_payment #: help:payment.line,communication2:0 @@ -339,19 +394,30 @@ msgid "The successor message of Communication." msgstr "Nasljedna poruka komunikacije." #. module: account_payment +#: code:addons/account_payment/account_move_line.py:0 +#, python-format +msgid "No partner defined on entry line" +msgstr "Partner nije definisan" + +#. module: account_payment #: help:payment.line,info_partner:0 msgid "Address of the Ordering Customer." msgstr "Adresa kupca naručitelja." #. module: account_payment +#: view:account.payment.populate.statement:0 +msgid "Populate Statement:" +msgstr "Popuni sadrzaj:" + +#. module: account_payment #: view:account.move.line:0 msgid "Total credit" msgstr "Ukupno potražuje" #. module: account_payment -#: model:ir.actions.wizard,name:account_payment.wizard_populate_payment -msgid "Populate payment" -msgstr "Popuni plaćanje" +#: help:payment.order,date_scheduled:0 +msgid "Select a date if you have chosen Preferred Date to be fixed." +msgstr "Odaberite datum ako ste odabrali fiksni željeni datum" #. module: account_payment #: field:payment.order,user_id:0 @@ -359,20 +425,15 @@ msgid "User" msgstr "Korisnik" #. module: account_payment +#: field:account.payment.populate.statement,lines:0 #: model:ir.actions.act_window,name:account_payment.act_account_invoice_2_payment_line -#: wizard_field:populate_statement,init,lines:0 msgid "Payment Lines" msgstr "Redovi plaćanja" #. module: account_payment -#: rml:payment.order:0 -msgid "Date" -msgstr "Datum" - -#. module: account_payment -#: rml:payment.order:0 -msgid "Reference:" -msgstr "Referenca:" +#: model:ir.model,name:account_payment.model_account_move_line +msgid "Journal Items" +msgstr "Sadrzaj Dnevnika" #. module: account_payment #: help:payment.line,move_line_id:0 @@ -382,19 +443,29 @@ msgid "" msgstr "Ovaj red će biti određen za informaciju o naručitelju." #. module: account_payment +#: view:payment.order.create:0 +msgid "Search" +msgstr "Pretraga" + +#. module: account_payment #: field:payment.line,date:0 msgid "Payment Date" msgstr "Datum Isplate" #. module: account_payment +#: report:payment.order:0 +msgid "Total:" +msgstr "Ukupno:" + +#. module: account_payment #: field:payment.order,date_created:0 msgid "Creation date" msgstr "Datum kreiranja" #. module: account_payment -#: field:payment.line,ml_maturity_date:0 -msgid "Maturity Date" -msgstr "Datum Dospeća" +#: view:account.payment.populate.statement:0 +msgid "ADD" +msgstr "Dodaj" #. module: account_payment #: view:account.bank.statement:0 @@ -402,11 +473,6 @@ msgid "Import payment lines" msgstr "Uvezi redove plaćanja" #. module: account_payment -#: help:payment.type,code:0 -msgid "Specify the Code for Payment Type" -msgstr "Navedite šifru tipa plaćanja" - -#. module: account_payment #: field:account.move.line,amount_to_pay:0 msgid "Amount to pay" msgstr "Iznos za plaćanje" @@ -422,9 +488,14 @@ msgid "The Ordering Customer" msgstr "Kupac naručitelj" #. module: account_payment -#: field:payment.type,code:0 -msgid "Code" -msgstr "Šifra" +#: model:ir.model,name:account_payment.model_account_payment_make_payment +msgid "Account make payment" +msgstr "Izvrsi placanje naloga" + +#. module: account_payment +#: report:payment.order:0 +msgid "Invoice Ref" +msgstr "Referenca fakture" #. module: account_payment #: field:payment.line,name:0 @@ -432,6 +503,11 @@ msgid "Your Reference" msgstr "Vaše veze" #. module: account_payment +#: field:payment.order,mode:0 +msgid "Payment mode" +msgstr "Način plaćanja" + +#. module: account_payment #: view:payment.order:0 msgid "Payment order" msgstr "Nalog za plaćanje" @@ -443,17 +519,26 @@ msgid "General Information" msgstr "Opšte informacije" #. module: account_payment +#: view:payment.order:0 #: selection:payment.order,state:0 msgid "Done" msgstr "Gotovo" #. module: account_payment -#: view:payment.order:0 -msgid "Select Invoices to Pay" -msgstr "Odaberite fakture za plaćanje" +#: model:ir.model,name:account_payment.model_account_invoice +msgid "Invoice" +msgstr "Faktura" + +#. module: account_payment +#: field:payment.line,communication:0 +msgid "Communication" +msgstr "Komunikacija" #. module: account_payment +#: view:account.payment.make.payment:0 +#: view:account.payment.populate.statement:0 #: view:payment.order:0 +#: view:payment.order.create:0 msgid "Cancel" msgstr "Otkaži" @@ -471,29 +556,18 @@ msgstr "" "Ime objekta mora da počinje sa x_ i ne sme da sadrži specijalne karaktere !" #. module: account_payment -#: model:ir.actions.wizard,name:account_payment.wizard_pay_payment -msgid "Pay" -msgstr "Plati" - -#. module: account_payment #: model:ir.actions.report.xml,name:account_payment.payment_order1 #: model:ir.model,name:account_payment.model_payment_order msgid "Payment Order" msgstr "Nalog za plaćanje" #. module: account_payment -#: model:ir.actions.act_window,name:account_payment.action_payment_order_draft -#: model:ir.ui.menu,name:account_payment.menu_action_payment_order_draft -msgid "Draft Payment Order" -msgstr "Nalog za plaćanje u pripremi" - -#. module: account_payment #: help:payment.line,amount:0 msgid "Payment amount in the company currency" msgstr "Iznos plaćanja u valuti preduzeca" #. module: account_payment -#: wizard_view:populate_payment,init:0 +#: view:payment.order.create:0 msgid "Search Payment lines" msgstr "Traži redove plaćanja" @@ -513,13 +587,17 @@ msgid "Destination Bank account" msgstr "Destinacioni bankovni račun" #. module: account_payment +#: view:account.payment.make.payment:0 +msgid "Are you sure you want to make payment?" +msgstr "Jeste li sigurni da zelite da izvrsite isplatu?" + +#. module: account_payment #: help:payment.mode,journal:0 msgid "Cash Journal for the Payment Mode" msgstr "Gotovisnki Dnevnik za način plaćanja" #. module: account_payment #: field:payment.mode,bank_id:0 -#: rml:payment.order:0 msgid "Bank account" msgstr "Bankovni račun" @@ -530,18 +608,23 @@ msgstr "Potvrdi plaćanja" #. module: account_payment #: field:payment.line,company_currency:0 +#: report:payment.order:0 msgid "Company Currency" msgstr "Valuta preduzeca" #. module: account_payment -#: model:ir.ui.menu,name:account_payment.menu_main -#: model:ir.ui.menu,name:account_payment.next_id_44 +#: model:ir.ui.menu,name:account_payment.menu_main_payment #: view:payment.line:0 #: view:payment.order:0 msgid "Payment" msgstr "Isplata" #. module: account_payment +#: report:payment.order:0 +msgid "Payment Order / Payment" +msgstr "Isplata Faktura / Placanje" + +#. module: account_payment #: field:payment.line,move_line_id:0 msgid "Entry line" msgstr "Red unosa" @@ -557,14 +640,13 @@ msgstr "" #. module: account_payment #: field:payment.mode,name:0 -#: field:payment.type,name:0 msgid "Name" msgstr "Ime" #. module: account_payment -#: wizard_button:populate_payment,init,search:0 -msgid "_Search" -msgstr "_Traži" +#: report:payment.order:0 +msgid "Bank Account" +msgstr "Bankovni račun" #. module: account_payment #: view:payment.line:0 @@ -573,9 +655,9 @@ msgid "Entry Information" msgstr "Unos Informacije" #. module: account_payment -#: model:ir.actions.wizard,name:account_payment.wizard_populate_statement -msgid "Populate Statement with Payment lines" -msgstr "Popunite izvod sa redovima plaćanja" +#: model:ir.model,name:account_payment.model_payment_order_create +msgid "payment.order.create" +msgstr "payment.order.create" #. module: account_payment #: field:payment.line,order_id:0 @@ -583,37 +665,31 @@ msgid "Order" msgstr "Nalog" #. module: account_payment -#: model:ir.actions.act_window,name:account_payment.action_payment_order_open -#: model:ir.ui.menu,name:account_payment.menu_action_payment_order_open -msgid "Payment Orders to Validate" -msgstr "Nalozi za plaćanje za potvrdu" - -#. module: account_payment -#: model:ir.model,name:account_payment.model_payment_type -#: field:payment.mode,type:0 -msgid "Payment type" -msgstr "Tip plaćanja" - -#. module: account_payment #: field:payment.order,total:0 msgid "Total" msgstr "Ukupno" #. module: account_payment -#: wizard_button:populate_statement,init,add:0 -msgid "_Add" -msgstr "_Dodaj" +#: constraint:ir.rule:0 +msgid "Rules are not supported for osv_memory objects !" +msgstr "Pravila nisu podrzana od strane osv_memory objekata !" #. module: account_payment -#: help:payment.mode,type:0 -msgid "Select the Payment Type for the Payment Mode." -msgstr "Odaberite tip plaćanja za način plaćanja" +#: view:account.payment.make.payment:0 +#: model:ir.actions.act_window,name:account_payment.action_account_payment_make_payment +msgid "Make Payment" +msgstr "Izvrsi placanje" #. module: account_payment -#: model:ir.model,name:account_payment.model_payment_mode -#: field:payment.order,mode:0 -msgid "Payment mode" -msgstr "Način plaćanja" +#: field:payment.line,partner_id:0 +#: report:payment.order:0 +msgid "Partner" +msgstr "Partner" + +#. module: account_payment +#: model:ir.actions.act_window,name:account_payment.action_create_payment_order +msgid "Populate Payment" +msgstr "Popuni Placanje" #. module: account_payment #: help:payment.mode,bank_id:0 @@ -621,6 +697,58 @@ msgid "Bank Account for the Payment Mode" msgstr "Bankovni račun za način plaćanja" #. module: account_payment +#: view:payment.mode:0 #: field:payment.mode,journal:0 msgid "Journal" msgstr "Dnevnik" + +#~ msgid "Execution date:" +#~ msgstr "Datum izvršenja:" + +#~ msgid "Suitable bank types" +#~ msgstr "Pogodni tipovi banaka" + +#~ msgid "_Cancel" +#~ msgstr "_Odustani" + +#~ msgid "Reference:" +#~ msgstr "Referenca:" + +#~ msgid "Date" +#~ msgstr "Datum" + +#~ msgid "Maturity Date" +#~ msgstr "Datum Dospeća" + +#~ msgid "Populate payment" +#~ msgstr "Popuni plaćanje" + +#~ msgid "Code" +#~ msgstr "Šifra" + +#~ msgid "Specify the Code for Payment Type" +#~ msgstr "Navedite šifru tipa plaćanja" + +#~ msgid "Draft Payment Order" +#~ msgstr "Nalog za plaćanje u pripremi" + +#~ msgid "Pay" +#~ msgstr "Plati" + +#~ msgid "_Search" +#~ msgstr "_Traži" + +#~ msgid "_Add" +#~ msgstr "_Dodaj" + +#~ msgid "Payment type" +#~ msgstr "Tip plaćanja" + +#~ msgid "Populate Statement with Payment lines" +#~ msgstr "Popunite izvod sa redovima plaćanja" + +#~ msgid "Payment Orders to Validate" +#~ msgstr "Nalozi za plaćanje za potvrdu" + +#~ msgid "Select the Payment Type for the Payment Mode." +#~ msgstr "Odaberite tip plaćanja za način plaćanja" diff --git a/addons/account_payment/report/payment_order.py b/addons/account_payment/report/payment_order.py index f0f6030b0f3..0b2a8061906 100644 --- a/addons/account_payment/report/payment_order.py +++ b/addons/account_payment/report/payment_order.py @@ -20,13 +20,13 @@ ############################################################################## import time -import datetime + import pooler from report import report_sxw class payment_order(report_sxw.rml_parse): - def __init__(self, cr, uid, name, context): + def __init__(self, cr, uid, name, context=None): super(payment_order, self).__init__(cr, uid, name, context=context) self.localcontext.update( { 'time': time, @@ -36,8 +36,8 @@ class payment_order(report_sxw.rml_parse): 'get_amount_total_in_currency': self._get_amount_total_in_currency, 'get_amount_total': self._get_amount_total, 'get_account_name': self._get_account_name, - }) + def _get_invoice_name(self, invoice_id): if invoice_id: pool = pooler.get_pool(self.cr.dbname) diff --git a/addons/account_payment/wizard/__init__.py b/addons/account_payment/wizard/__init__.py index c5f7be51231..1c5aefacc78 100644 --- a/addons/account_payment/wizard/__init__.py +++ b/addons/account_payment/wizard/__init__.py @@ -18,6 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # ############################################################################## + import account_payment_order import account_payment_populate_statement import account_payment_pay diff --git a/addons/account_payment/wizard/account_payment_order.py b/addons/account_payment/wizard/account_payment_order.py index 4a070f05a27..8ef89beefb5 100644 --- a/addons/account_payment/wizard/account_payment_order.py +++ b/addons/account_payment/wizard/account_payment_order.py @@ -18,6 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # ############################################################################## + import time from lxml import etree @@ -39,10 +40,10 @@ class payment_order_create(osv.osv_memory): _columns = { 'duedate': fields.date('Due Date', required=True), 'entries': fields.many2many('account.move.line', 'line_pay_rel', 'pay_id', 'line_id', 'Entries') - } + } _defaults = { 'duedate': time.strftime('%Y-%m-%d'), - } + } def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False): res = super(payment_order_create, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=False) @@ -63,7 +64,8 @@ class payment_order_create(osv.osv_memory): context = {} data = self.read(cr, uid, ids, [])[0] line_ids = data['entries'] - if not line_ids: return {} + if not line_ids: + return {} payment = order_obj.browse(cr, uid, context['active_id'], context=context) t = None @@ -99,16 +101,13 @@ class payment_order_create(osv.osv_memory): data = self.read(cr, uid, ids, [], context=context)[0] search_due_date = data['duedate'] payment = order_obj.browse(cr, uid, context['active_id'], context=context) - ctx = '' - if payment.mode: - ctx = '''context="{'journal_id': %d}"''' % payment.mode.journal.id # Search for move line to pay: - domain = [('reconcile_id', '=', False),('account_id.type', '=', 'payable'),('amount_to_pay', '>', 0)] - domain = domain + ['|',('date_maturity','<=',search_due_date),('date_maturity','=',False)] + domain = [('reconcile_id', '=', False), ('account_id.type', '=', 'payable'), ('amount_to_pay', '>', 0)] + domain = domain + ['|', ('date_maturity', '<=', search_due_date), ('date_maturity', '=', False)] line_ids = line_obj.search(cr, uid, domain, context=context) context.update({'line_ids': line_ids}) - model_data_ids = mod_obj.search(cr, uid,[('model','=','ir.ui.view'),('name','=','view_create_payment_order_lines')], context=context) + model_data_ids = mod_obj.search(cr, uid,[('model', '=', 'ir.ui.view'), ('name', '=', 'view_create_payment_order_lines')], context=context) resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id'] return {'name': ('Entrie Lines'), 'context': context, @@ -118,7 +117,7 @@ class payment_order_create(osv.osv_memory): 'views': [(resource_id,'form')], 'type': 'ir.actions.act_window', 'target': 'new', - } + } payment_order_create() diff --git a/addons/account_payment/wizard/account_payment_pay.py b/addons/account_payment/wizard/account_payment_pay.py index 09ea68e7d30..8e524c78959 100644 --- a/addons/account_payment/wizard/account_payment_pay.py +++ b/addons/account_payment/wizard/account_payment_pay.py @@ -18,7 +18,8 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # ############################################################################## -from osv import fields, osv + +from osv import osv class account_payment_make_payment(osv.osv_memory): _name = "account.payment.make.payment" diff --git a/addons/account_payment/wizard/account_payment_populate_statement.py b/addons/account_payment/wizard/account_payment_populate_statement.py index 7697d4eea6d..bd61d58be3f 100644 --- a/addons/account_payment/wizard/account_payment_populate_statement.py +++ b/addons/account_payment/wizard/account_payment_populate_statement.py @@ -29,7 +29,7 @@ class account_payment_populate_statement(osv.osv_memory): _description = "Account Payment Populate Statement" _columns = { 'lines': fields.many2many('payment.line', 'payment_line_rel_', 'payment_id', 'line_id', 'Payment Lines') - } + } def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False): line_obj = self.pool.get('payment.line') @@ -56,6 +56,7 @@ class account_payment_populate_statement(osv.osv_memory): currency_obj = self.pool.get('res.currency') voucher_obj = self.pool.get('account.voucher') voucher_line_obj = self.pool.get('account.voucher.line') + move_line_obj = self.pool.get('account.move.line') if context is None: context = {} @@ -75,34 +76,28 @@ class account_payment_populate_statement(osv.osv_memory): context.update({'move_line_ids': [line.move_line_id.id]}) result = voucher_obj.onchange_partner_id(cr, uid, [], partner_id=line.partner_id.id, journal_id=statement.journal_id.id, price=abs(amount), currency_id= statement.currency.id, ttype='payment', context=context) - if line.partner_id: -# line['partner_id'] = mv.partner_id.id - if amount < 0: - account = line.partner_id.property_account_payable.id - else: - account = line.partner_id.property_account_receivable.id - if line.move_line_id: - voucher_res = { 'type': 'payment', - 'name': line.name, - 'partner_id': line.partner_id.id, - 'journal_id': statement.journal_id.id, - 'account_id': result.get('account_id', statement.journal_id.default_credit_account_id.id), - 'company_id': statement.company_id.id, - 'currency_id': statement.currency.id, - 'date': line.date or time.strftime('%Y-%m-%d'), - 'amount': abs(amount), - 'period_id': statement.period_id.id + voucher_res = { + 'type': 'payment', + 'name': line.name, + 'partner_id': line.partner_id.id, + 'journal_id': statement.journal_id.id, + 'account_id': result.get('account_id', statement.journal_id.default_credit_account_id.id), + 'company_id': statement.company_id.id, + 'currency_id': statement.currency.id, + 'date': line.date or time.strftime('%Y-%m-%d'), + 'amount': abs(amount), + 'period_id': statement.period_id.id } voucher_id = voucher_obj.create(cr, uid, voucher_res, context=context) voucher_line_dict = False if result['value']['line_ids']: for line_dict in result['value']['line_ids']: - move_line = self.pool.get('account.move.line').browse(cr, uid, line_dict['move_line_id'], context) + move_line = move_line_obj.browse(cr, uid, line_dict['move_line_id'], context) if line.move_line_id.move_id.id == move_line.move_id.id: voucher_line_dict = line_dict if voucher_line_dict: - voucher_line_dict.update({'voucher_id':voucher_id}) + voucher_line_dict.update({'voucher_id': voucher_id}) voucher_line_obj.create(cr, uid, voucher_line_dict, context=context) st_line_id = statement_line_obj.create(cr, uid, { diff --git a/addons/account_reporting/__init__.py b/addons/account_reporting/__init__.py index 65ca37b6d51..2e6645ed66e 100644 --- a/addons/account_reporting/__init__.py +++ b/addons/account_reporting/__init__.py @@ -20,7 +20,7 @@ ############################################################################## import report -import account +import account_reporting import wizard # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account_reporting/__openerp__.py b/addons/account_reporting/__openerp__.py index fb05e755ac2..b5bbaa3bf3f 100644 --- a/addons/account_reporting/__openerp__.py +++ b/addons/account_reporting/__openerp__.py @@ -31,9 +31,8 @@ 'init_xml': [], 'update_xml': [ 'security/ir.model.access.csv', - 'account_view.xml', - 'account_report.xml', - 'account_data.xml', + 'account_reporting_view.xml', + 'account_reporting_data.xml', 'wizard/account_reporting_balance_report_view.xml', ], 'demo_xml': ['account_reporting_demo.xml'], diff --git a/addons/account_reporting/account_report.xml b/addons/account_reporting/account_report.xml deleted file mode 100644 index ebfe70e4c50..00000000000 --- a/addons/account_reporting/account_report.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0"?> -<openerp> - <data> - - </data> -</openerp> diff --git a/addons/account_reporting/account.py b/addons/account_reporting/account_reporting.py index 7fc08401496..ec1f370e05b 100644 --- a/addons/account_reporting/account.py +++ b/addons/account_reporting/account_reporting.py @@ -18,19 +18,19 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # ############################################################################## + import time + import netsvc from osv import fields, osv - from tools.misc import currency - class color_rml(osv.osv): _name = "color.rml" _description = "Rml Color" _columns = { 'name': fields.char('Name', size=64, required=True), - 'code': fields.char('code',size=64,required=True), + 'code': fields.char('code', size=64, required=True), } color_rml() @@ -39,44 +39,44 @@ class account_report_bs(osv.osv): _name = "account.report.bs" _description = "Account reporting for Balance Sheet" _font = [ - ('',''), - ('Courier','Courier'), - ('Courier-Bold','Courier-Bold'), - ('Courier-BoldOblique','Courier-BoldOblique'), - ('Courier-Oblique','Courier-Oblique'), - ('Helvetica','Helvetica'), - ('Helvetica-Bold','Helvetica-Bold'), - ('Helvetica-Oblique','Helvetica-Oblique'), - ('Times-Bold','Times-Bold'), - ('Times-BoldItalic','Times-BoldItalic'), - ('Times-Italic','Times-Italic'), - ('Times-Roman','Times-Roman'), + ('', ''), + ('Courier', 'Courier'), + ('Courier-Bold', 'Courier-Bold'), + ('Courier-BoldOblique', 'Courier-BoldOblique'), + ('Courier-Oblique', 'Courier-Oblique'), + ('Helvetica', 'Helvetica'), + ('Helvetica-Bold', 'Helvetica-Bold'), + ('Helvetica-Oblique', 'Helvetica-Oblique'), + ('Times-Bold', 'Times-Bold'), + ('Times-BoldItalic', 'Times-BoldItalic'), + ('Times-Italic', 'Times-Italic'), + ('Times-Roman', 'Times-Roman'), ] _color = [ ('', ''), - ('green','Green'), - ('red','Red'), - ('pink','Pink'), - ('blue','Blue'), - ('yellow','Yellow'), - ('cyan','Cyan'), - ('lightblue','Light Blue'), - ('orange','Orange'), + ('green', 'Green'), + ('red', 'Red'), + ('pink', 'Pink'), + ('blue', 'Blue'), + ('yellow', 'Yellow'), + ('cyan', 'Cyan'), + ('lightblue', 'Light Blue'), + ('orange', 'Orange'), ] _style = [ ('', ''), - ('h1','Header 1'), - ('h2','Header 2'), - ('h3','Header 3'), + ('h1', 'Header 1'), + ('h2', 'Header 2'), + ('h3', 'Header 3'), ] def onchange_parent_id(self, cr, uid, ids, parent_id): - v={} + v = {} if parent_id: - acc=self.pool.get('account.report.report').browse(cr, uid, parent_id) - v['type']=acc.type + acc = self.pool.get('account.report.report').browse(cr, uid, parent_id) + v['type'] = acc.type if int(acc.style) < 6: - v['style'] = str(int(acc.style)+1) + v['style'] = str(int(acc.style) + 1) return {'value': v} _columns = { @@ -85,36 +85,35 @@ class account_report_bs(osv.osv): 'code': fields.char('Code', size=64, required=True), 'account_id': fields.many2many('account.account', 'account_report_rel', 'report_id', 'account_id', 'Accounts'), 'note': fields.text('Note'), - 'color_font' : fields.many2one('color.rml','Font Color'), - 'color_back' : fields.many2one('color.rml','Back Color'), - 'font_style' : fields.selection(_font, 'Font'), + 'color_font': fields.many2one('color.rml', 'Font Color'), + 'color_back': fields.many2one('color.rml', 'Back Color'), + 'font_style': fields.selection(_font, 'Font'), 'parent_id': fields.many2one('account.report.bs', 'Parent'), 'child_id': fields.one2many('account.report.bs', 'parent_id', 'Children'), - 'report_type' : fields.selection([('only_obj', 'Report Objects Only'),('with_account', 'Report Objects With Accounts'),('acc_with_child', 'Report Objects With Accounts and child of Accounts')],"Report Type") + 'report_type': fields.selection([('only_obj', 'Report Objects Only'), ('with_account', 'Report Objects With Accounts'), ('acc_with_child', 'Report Objects With Accounts and child of Accounts')], "Report Type") } _defaults = { - 'report_type': lambda *a :'only_obj', - 'color_font': lambda *a :'', - 'color_back': lambda *a :'', - 'font_style': lambda *a :'', + 'report_type': 'only_obj', + 'color_font': '', + 'color_back': '', + 'font_style': '', } def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=100): if not args: - args=[] + args = [] if not context: - context={} + context = {} ids = [] if name: - ids = self.search(cr, user, [('code','=',name)]+ args, limit=limit, context=context) + ids = self.search(cr, user, [('code', '=', 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) else: ids = self.search(cr, user, args, limit=limit, context=context) return self.name_get(cr, user, ids, context=context) account_report_bs() - # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account_reporting/account_data.xml b/addons/account_reporting/account_reporting_data.xml index c4e2dac819b..c4e2dac819b 100644 --- a/addons/account_reporting/account_data.xml +++ b/addons/account_reporting/account_reporting_data.xml diff --git a/addons/account_reporting/account_view.xml b/addons/account_reporting/account_reporting_view.xml index f02ed221e42..b12217f84e5 100644 --- a/addons/account_reporting/account_view.xml +++ b/addons/account_reporting/account_reporting_view.xml @@ -1,34 +1,34 @@ <?xml version="1.0"?> <openerp> -<data> + <data> - <record model="ir.ui.view" id="view_account_report_bs_form"> - <field name="name">account.report.bs.form</field> - <field name="model">account.report.bs</field> - <field name="type">form</field> - <field name="arch" type="xml"> - <form string="Account reporting"> - <notebook> - <page string="General"> - <field name="name" select="1"/> - <field name="code" select="1"/> - <field name="parent_id" select="1"/> - <field name="sequence"/> - <field name="color_font"/> - <field name="color_back"/> - <field name="font_style"/> - <field name="report_type"/> - <newline/> - <separator string="Accounts" colspan="4"/> - <field name="account_id" colspan="4" nolabel="1"/> - </page> - <page string="Notes"> - <field name="note" nolabel="1" colspan="4"/> - </page> - </notebook> - </form> - </field> - </record> + <record model="ir.ui.view" id="view_account_report_bs_form"> + <field name="name">account.report.bs.form</field> + <field name="model">account.report.bs</field> + <field name="type">form</field> + <field name="arch" type="xml"> + <form string="Account reporting"> + <notebook> + <page string="General"> + <field name="name" select="1"/> + <field name="code" select="1"/> + <field name="parent_id" select="1"/> + <field name="sequence"/> + <field name="color_font"/> + <field name="color_back"/> + <field name="font_style"/> + <field name="report_type"/> + <newline/> + <separator string="Accounts" colspan="4"/> + <field name="account_id" colspan="4" nolabel="1"/> + </page> + <page string="Notes"> + <field name="note" nolabel="1" colspan="4"/> + </page> + </notebook> + </form> + </field> + </record> <record model="ir.ui.view" id="view_account_report_tree_bs"> <field name="name">account.report.report.tree.bs</field> @@ -42,6 +42,7 @@ </tree> </field> </record> + <record model="ir.actions.act_window" id="action_account_tree_bs"> <field name="type">ir.actions.act_window</field> <field name="res_model">account.report.bs</field> @@ -49,6 +50,7 @@ <field name="view_type">tree</field> <field name="view_id" ref="view_account_report_tree_bs"/> </record> + <menuitem name="Balance Sheet Report" id="menu_finan_config_BSheet" parent="account.menu_finance_configuration"/> <menuitem name="Balance Sheet Report" id="action_account_report_bs_form" action="action_account_tree_bs" parent="menu_finan_config_BSheet"/> @@ -58,9 +60,8 @@ <field name="view_type">form</field> <field name="view_id" ref="view_account_report_bs_form"/> </record> - <menuitem name="Balance Sheet Report Form" id="bs_report_action_form" action="acc_bs_report_action_form" parent="menu_finan_config_BSheet"/> - + <menuitem name="Balance Sheet Report Form" id="bs_report_action_form" action="acc_bs_report_action_form" parent="menu_finan_config_BSheet"/> -</data> + </data> </openerp> diff --git a/addons/account_reporting/i18n/sr.po b/addons/account_reporting/i18n/sr.po index 38289723f44..733e84d3ca4 100644 --- a/addons/account_reporting/i18n/sr.po +++ b/addons/account_reporting/i18n/sr.po @@ -7,17 +7,22 @@ msgid "" msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" -"POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-10-15 09:23+0000\n" +"POT-Creation-Date: 2010-10-18 17:46+0000\n" +"PO-Revision-Date: 2010-10-26 08:38+0000\n" "Last-Translator: OpenERP Administrators <Unknown>\n" "Language-Team: Serbian <sr@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n" +"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_reporting +#: model:ir.model,name:account_reporting.model_color_rml +msgid "Rml Color" +msgstr "Rml Boja" + +#. module: account_reporting #: field:color.rml,code:0 msgid "code" msgstr "kod" @@ -56,11 +61,26 @@ msgid "Balance Sheet Report" msgstr "Izvještaj Liste Salda" #. module: account_reporting +#: constraint:ir.ui.menu:0 +msgid "Error ! You can not create recursive Menu." +msgstr "Greska! Ne mozete kreirati rekursivni meni." + +#. module: account_reporting +#: view:account.reporting.balance.report:0 +msgid "Print" +msgstr "Štampaj" + +#. module: account_reporting #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." msgstr "Pogrešno ime modela u definiciji akcije." #. module: account_reporting +#: field:account.report.bs,font_style:0 +msgid "Font" +msgstr "Font" + +#. module: account_reporting #: selection:account.report.bs,font_style:0 msgid "Courier" msgstr "Pošiljka" @@ -71,12 +91,7 @@ msgid "Courier-BoldOblique" msgstr "Courier-BoldOblique" #. module: account_reporting -#: wizard_button:account.account.balancesheet.report,init,report:0 -msgid "Print BalanceSheet" -msgstr "Ispis ListeSalda" - -#. module: account_reporting -#: help:account.account.balancesheet.report,init,periods:0 +#: help:account.reporting.balance.report,periods:0 msgid "All periods if empty" msgstr "Ako je prazno, sva razdoblja" @@ -161,11 +176,6 @@ msgid "Report Objects Only" msgstr "Izveštaj samo objekata" #. module: account_reporting -#: model:ir.model,name:account_reporting.model_color_rml -msgid "Rml Colors" -msgstr "Rml Boje" - -#. module: account_reporting #: model:ir.module.module,shortdesc:account_reporting.module_meta_information msgid "Reporting of Balancesheet for accounting" msgstr "Izveštavanje liste salda za računovostvo" @@ -181,6 +191,11 @@ msgid "Parent" msgstr "Roditelj" #. module: account_reporting +#: view:account.reporting.balance.report:0 +msgid "Select Dates Period" +msgstr "Selektuj Datume razdoblja" + +#. module: account_reporting #: field:account.report.bs,sequence:0 msgid "Sequence" msgstr "Sekvenca" @@ -191,12 +206,19 @@ msgid "Times-Bold" msgstr "Times-Bold" #. module: account_reporting +#: help:account.report.bs,sequence:0 +msgid "" +"Gives the sequence order when displaying a list of account reporting for " +"balance sheet." +msgstr "" + +#. module: account_reporting #: view:account.report.bs:0 msgid "General" msgstr "Opšte" #. module: account_reporting -#: wizard_field:account.account.balancesheet.report,init,fiscalyear:0 +#: field:account.reporting.balance.report,fiscalyear:0 msgid "Fiscal year" msgstr "Fiskalna Godina" @@ -207,7 +229,8 @@ msgid "Accounts" msgstr "Nalozi" #. module: account_reporting -#: wizard_field:account.account.balancesheet.report,init,periods:0 +#: view:account.reporting.balance.report:0 +#: field:account.reporting.balance.report,periods:0 msgid "Periods" msgstr "Razdoblja" @@ -217,12 +240,7 @@ msgid "Back Color" msgstr "Pozadinska Boja" #. module: account_reporting -#: field:account.report.bs,child_id:0 -msgid "Children" -msgstr "Podređeni" - -#. module: account_reporting -#: wizard_button:account.account.balancesheet.report,init,end:0 +#: view:account.reporting.balance.report:0 msgid "Cancel" msgstr "Otkaži" @@ -237,11 +255,20 @@ msgid "Helvetica-Oblique" msgstr "Helvetica-Oblique" #. module: account_reporting -#: field:account.report.bs,font_style:0 -msgid "Font" -msgstr "Font" +#: model:ir.model,name:account_reporting.model_account_reporting_balance_report +msgid "Account balance report" +msgstr "" #. module: account_reporting -#: wizard_view:account.account.balancesheet.report,init:0 -msgid "Customize Report" -msgstr "Prilagodi Izvestaj" +#: field:account.report.bs,child_id:0 +msgid "Children" +msgstr "Podređeni" + +#~ msgid "Print BalanceSheet" +#~ msgstr "Ispis ListeSalda" + +#~ msgid "Rml Colors" +#~ msgstr "Rml Boje" + +#~ msgid "Customize Report" +#~ msgstr "Prilagodi Izvestaj" diff --git a/addons/account_reporting/report/account_report_bs.py b/addons/account_reporting/report/account_report_bs.py index 22628224306..d21bfbf4f37 100644 --- a/addons/account_reporting/report/account_report_bs.py +++ b/addons/account_reporting/report/account_report_bs.py @@ -20,14 +20,12 @@ ############################################################################## import time -import pooler -import locale -from report import report_sxw +from report import report_sxw parents = { - 'tr':1, - 'li':1, + 'tr': 1, + 'li': 1, 'story': 0, 'section': 0 } @@ -42,18 +40,17 @@ class account_report_bs(report_sxw.rml_parse): self.context = context - def line_total(self,line_id,ctx): + def line_total(self, line_id, ctx): _total = 0 - bsline= self.pool.get('account.report.bs').browse(self.cr,self.uid,[line_id])[0] - bsline_accids = bsline.account_id - res =self.pool.get('account.report.bs').read(self.cr,self.uid,[line_id],['account_id','child_id'])[0] + bsline = self.pool.get('account.report.bs').browse(self.cr, self.uid, [line_id])[0] + res = self.pool.get('account.report.bs').read(self.cr, self.uid, [line_id], ['account_id', 'child_id'])[0] for acc_id in res['account_id']: - acc = self.pool.get('account.account').browse(self.cr,self.uid,[acc_id],ctx)[0] + acc = self.pool.get('account.account').browse(self.cr, self.uid, [acc_id], ctx)[0] _total += acc.balance bsline_reportbs = res['child_id'] for report in bsline_reportbs: - _total +=self.line_total(report,ctx) + _total += self.line_total(report,ctx) return _total def lines(self, form, ids={}, done=None, level=1, object=False): @@ -64,14 +61,14 @@ class account_report_bs(report_sxw.rml_parse): if not ids: return [] if not done: - done={} + done = {} result = [] ctx = self.context.copy() ctx['fiscalyear'] = form['fiscalyear'] ctx['periods'] = form['periods'] report_objs = self.pool.get('account.report.bs').browse(self.cr, self.uid, ids) title_name = False - if level==1: + if level == 1: title_name = report_objs[0].name def cmp_code(x, y): return cmp(x.code, y.code) @@ -92,41 +89,41 @@ class account_report_bs(report_sxw.rml_parse): 'name': report_obj.name, 'level': level, 'balance': self.line_total(report_obj.id,ctx), - 'parent_id':False, - 'color_font':color_font, - 'color_back':color_back, - 'font_style' : report_obj.font_style + 'parent_id': False, + 'color_font': color_font, + 'color_back': color_back, + 'font_style': report_obj.font_style } result.append(res) report_type = report_obj.report_type if report_type != 'only_obj': - account_ids = self.pool.get('account.report.bs').read(self.cr,self.uid,[report_obj.id],['account_id'])[0]['account_id'] + account_ids = self.pool.get('account.report.bs').read(self.cr, self.uid, [report_obj.id], ['account_id'])[0]['account_id'] if report_type == 'acc_with_child': - acc_ids = self.pool.get('account.account')._get_children_and_consol(self.cr, self.uid, account_ids ) + acc_ids = self.pool.get('account.account')._get_children_and_consol(self.cr, self.uid, account_ids) account_ids = acc_ids - account_objs = self.pool.get('account.account').browse(self.cr,self.uid,account_ids,ctx) + account_objs = self.pool.get('account.account').browse(self.cr, self.uid, account_ids, ctx) for acc_obj in account_objs: - res1={} + res1 = {} res1 = { 'code': acc_obj.code, 'name': acc_obj.name, 'level': level+1, 'balance': acc_obj.balance, - 'parent_id':acc_obj.parent_id, - 'color_font' : 'black', - 'color_back' :'white', - 'font_style' : 'Helvetica', + 'parent_id': acc_obj.parent_id, + 'color_font': 'black', + 'color_back': 'white', + 'font_style': 'Helvetica', } if acc_obj.parent_id: for r in result: - if r['name']== acc_obj.parent_id.name: + if r['name'] == acc_obj.parent_id.name: res1['level'] = r['level'] + 1 break result.append(res1) if report_obj.child_id: - ids2 = [(x.code,x.id) for x in report_obj.child_id] + ids2 = [(x.code, x.id) for x in report_obj.child_id] ids2.sort() - result += self.lines(form,[x[1] for x in ids2], done, level+1,object=False) + result += self.lines(form, [x[1] for x in ids2], done, level+1, object=False) return result diff --git a/addons/account_reporting/wizard/account_reporting_balance_report.py b/addons/account_reporting/wizard/account_reporting_balance_report.py index 3f67c64b64b..d6461a8b9dc 100644 --- a/addons/account_reporting/wizard/account_reporting_balance_report.py +++ b/addons/account_reporting/wizard/account_reporting_balance_report.py @@ -18,8 +18,8 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # ############################################################################## + from osv import fields, osv -from tools.translate import _ class account_reporting_balance_report(osv.osv_memory): @@ -33,7 +33,7 @@ class account_reporting_balance_report(osv.osv_memory): _description = 'Account balance report' _columns = { 'fiscalyear': fields.many2one('account.fiscalyear', 'Fiscal year', required=True), - 'periods': fields.many2many('account.period', 'acc_reporting_relation', 'acc_id','period_id', 'Periods', help='All periods if empty'), + 'periods': fields.many2many('account.period', 'acc_reporting_relation', 'acc_id', 'period_id', 'Periods', help='All periods if empty'), } _defaults = { 'fiscalyear' : _get_fiscalyear, @@ -45,7 +45,7 @@ class account_reporting_balance_report(osv.osv_memory): context = {} data = self.read(cr, uid, ids)[0] datas = { - 'ids': context.get('active_ids',[]), + 'ids': context.get('active_ids', []), 'model': 'account.report.bs', 'form': data } diff --git a/addons/account_reporting/wizard/account_reporting_balance_report_view.xml b/addons/account_reporting/wizard/account_reporting_balance_report_view.xml index 5d7ef7dfbdb..31444e17e4e 100644 --- a/addons/account_reporting/wizard/account_reporting_balance_report_view.xml +++ b/addons/account_reporting/wizard/account_reporting_balance_report_view.xml @@ -7,8 +7,8 @@ <field name="model">account.reporting.balance.report</field> <field name="type">form</field> <field name="arch" type="xml"> - <form string="Select Dates Period"> - <field name="fiscalyear" colspan="4"/> + <form string="Account Report Balance Sheet"> + <field name="fiscalyear" colspan="4" widget="selection"/> <newline/> <separator string="Periods" colspan="4"/> <field name="periods" nolabel="1" colspan="4"/> diff --git a/addons/account_voucher/__init__.py b/addons/account_voucher/__init__.py index 2b1478d9fa0..9796f81d5e5 100644 --- a/addons/account_voucher/__init__.py +++ b/addons/account_voucher/__init__.py @@ -24,4 +24,4 @@ import invoice import report import wizard -# 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_voucher/__openerp__.py b/addons/account_voucher/__openerp__.py index 76c05efbe6d..6d6203d3d69 100644 --- a/addons/account_voucher/__openerp__.py +++ b/addons/account_voucher/__openerp__.py @@ -51,10 +51,10 @@ "security/account_voucher_security.xml" ], "test" : [ -# "test/account_voucher.yml", - "test/sales_receipt.yml", - "test/sales_payment.yml", - "test/account_voucher_report.yml" + "test/account_voucher.yml", + "test/sales_receipt.yml", + "test/sales_payment.yml", + "test/account_voucher_report.yml" ], 'certificate': '0037580727101', "active": False, diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py index 1760978b8c2..a07e41ff000 100644 --- a/addons/account_voucher/account_voucher.py +++ b/addons/account_voucher/account_voucher.py @@ -573,22 +573,29 @@ class account_voucher(osv.osv): move_line_pool = self.pool.get('account.move.line') currency_pool = self.pool.get('res.currency') tax_obj = self.pool.get('account.tax') + seq_obj = self.pool.get('ir.sequence') for inv in self.browse(cr, uid, ids): + if not inv.line_ids: + raise osv.except_osv(_('No Lines !'), _('Please create some lines')) if inv.move_id: continue if inv.number: name = inv.number elif inv.journal_id.sequence_id: - name = self.pool.get('ir.sequence').get_id(cr, uid, inv.journal_id.sequence_id.id) + name = seq_obj.get_id(cr, uid, inv.journal_id.sequence_id.id) else: raise osv.except_osv(_('Error !'), _('Please define a sequence on the journal !')) + if not inv.reference: + ref = name.replace('/','') + else: + ref = inv.reference move = { 'name': name, 'journal_id': inv.journal_id.id, 'narration': inv.narration, - 'date':inv.date, - 'ref':inv.reference, + 'date': inv.date, + 'ref': ref, 'period_id': inv.period_id and inv.period_id.id or False } move_id = move_pool.create(cr, uid, move) @@ -681,7 +688,7 @@ class account_voucher(osv.osv): rec_ids = [master_line, line.move_line_id.id] rec_list_ids.append(rec_ids) - if not self.pool.get('res.currency').is_zero(cr, uid, inv.currency_id, line_total): + if not currency_pool.is_zero(cr, uid, inv.currency_id, line_total): diff = line_total move_line = { 'name': name, @@ -848,17 +855,19 @@ class account_bank_statement(osv.osv): _inherit = 'account.bank.statement' def button_cancel(self, cr, uid, ids, context=None): + voucher_obj = self.pool.get('account.voucher') for st in self.browse(cr, uid, ids, context): voucher_ids = [] for line in st.line_ids: if line.voucher_id: voucher_ids.append(line.voucher_id.id) - self.pool.get('account.voucher').cancel_voucher(cr, uid, voucher_ids, context) + voucher_obj.cancel_voucher(cr, uid, voucher_ids, context) return super(account_bank_statement, self).button_cancel(cr, uid, ids, context=context) def create_move_from_st_line(self, cr, uid, st_line_id, company_currency_id, next_number, context=None): voucher_obj = self.pool.get('account.voucher') wf_service = netsvc.LocalService("workflow") + move_line_obj = self.pool.get('account.move.line') bank_st_line_obj = self.pool.get('account.bank.statement.line') st_line = bank_st_line_obj.browse(cr, uid, st_line_id, context=context) if st_line.voucher_id: @@ -872,7 +881,7 @@ class account_bank_statement(osv.osv): 'move_ids': [(4, v.move_id.id, False)] }) - return self.pool.get('account.move.line').write(cr, uid, [x.id for x in v.move_ids], {'statement_id': st_line.statement_id.id}, context=context) + return move_line_obj.write(cr, uid, [x.id for x in v.move_ids], {'statement_id': st_line.statement_id.id}, context=context) return super(account_bank_statement, self).create_move_from_st_line(cr, uid, st_line.id, company_currency_id, next_number, context=context) account_bank_statement() @@ -906,14 +915,15 @@ class account_bank_statement_line(osv.osv): } def unlink(self, cr, uid, ids, context=None): + voucher_obj = self.pool.get('account.voucher') statement_line = self.browse(cr, uid, ids, context) unlink_ids = [] for st_line in statement_line: if st_line.voucher_id: unlink_ids.append(st_line.voucher_id.id) - self.pool.get('account.voucher').unlink(cr, uid, unlink_ids, context=context) + voucher_obj.unlink(cr, uid, unlink_ids, context=context) return super(account_bank_statement_line, self).unlink(cr, uid, ids, context=context) 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_voucher/i18n/ru.po b/addons/account_voucher/i18n/ru.po index 3a57fdc7327..de25b05f4fe 100644 --- a/addons/account_voucher/i18n/ru.po +++ b/addons/account_voucher/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: 2010-10-18 17:46+0000\n" -"PO-Revision-Date: 2010-10-24 09:02+0000\n" +"PO-Revision-Date: 2010-10-25 07:11+0000\n" "Last-Translator: Chertykov Denis <chertykov@gmail.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-10-25 04:39+0000\n" +"X-Launchpad-Export-Date: 2010-10-26 04:40+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_voucher diff --git a/addons/account_voucher/i18n/sr.po b/addons/account_voucher/i18n/sr.po index 5c134d5bd0e..dc3823a2aae 100644 --- a/addons/account_voucher/i18n/sr.po +++ b/addons/account_voucher/i18n/sr.po @@ -7,37 +7,52 @@ msgid "" msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" -"POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-10-17 17:33+0000\n" -"Last-Translator: zmmaj <Unknown>\n" +"POT-Creation-Date: 2010-10-18 17:46+0000\n" +"PO-Revision-Date: 2010-10-26 08:39+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\n" "Language-Team: Serbian <sr@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-10-18 04:55+0000\n" +"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_voucher -#: model:ir.actions.act_window,name:account_voucher.act_account_acount_move_line_open1 -msgid "Opening Balance Entry" -msgstr "Otvaranje sadrzaja salda" +#: view:account.voucher.unreconcile:0 +msgid "Unreconciliation transactions" +msgstr "Neponistene transakcije" #. module: account_voucher -#: model:ir.ui.menu,name:account_voucher.menu_action_receipt_bakreceipt_voucher_list -msgid "Bank Receipts" -msgstr "Bankovni primitci" +#: view:account.voucher:0 +msgid "Form view not available for Payment Lines" +msgstr "Pregled Forme nije dostupan za linije Placanja" + +#. module: account_voucher +#: view:account.voucher:0 +msgid "Payment Ref" +msgstr "Referentna Placanja" + +#. module: account_voucher +#: view:account.voucher:0 +msgid "Open Customer Journal Entries" +msgstr "Otvori stavke Korisnikove Knjige" #. module: account_voucher -#: rml:voucher.cash_amount:0 -#: rml:voucher.cash_receipt.drcr:0 +#: report:voucher.cash_receipt.drcr:0 +#: report:voucher.print:0 msgid "Particulars" msgstr "Pojedinosti" #. module: account_voucher -#: rml:voucher.cash_amount:0 -#: rml:voucher.cash_receipt.drcr:0 -msgid "State :" -msgstr "Stanje :" +#: view:account.voucher:0 +msgid "Group By..." +msgstr "Grupirano po" + +#. module: account_voucher +#: code:addons/account_voucher/account_voucher.py:0 +#, python-format +msgid "Cannot delete Voucher(s) which are already opened or paid !" +msgstr "Ne mozes obrisati vaucer(e) koji su vec otvoreni ili placeni !" #. module: account_voucher #: constraint:ir.actions.act_window:0 @@ -45,106 +60,196 @@ msgid "Invalid model name in the action definition." msgstr "Pogrešno ime modela u definiciji akcije." #. module: account_voucher -#: rml:voucher.cash_amount:0 -#: rml:voucher.cash_receipt.drcr:0 +#: report:voucher.cash_receipt.drcr:0 msgid "Ref. :" msgstr "Ref. :" #. module: account_voucher -#: selection:account.move,voucher_type:0 -#: selection:account.voucher,type:0 -#: selection:account.voucher.open,init,type:0 -#: model:ir.actions.act_window,name:account_voucher.action_view_cont_voucher_form -#: model:ir.ui.menu,name:account_voucher.menu_action_view_cont_voucher_form -msgid "Contra Voucher" -msgstr "Suprotna priznanica" +#: view:account.voucher:0 +msgid "Supplier" +msgstr "Dobavljač" + +#. module: account_voucher +#: model:ir.actions.report.xml,name:account_voucher.report_account_voucher_print +msgid "Voucher Print" +msgstr "Stampa Vaucera" + +#. module: account_voucher +#: model:ir.module.module,description:account_voucher.module_meta_information +msgid "" +"Account Voucher module includes all the basic requirements of\n" +" Voucher Entries for Bank, Cash, Sales, Purchase, Expanse, Contra, " +"etc...\n" +" * Voucher Entry\n" +" * Voucher Receipt\n" +" * Cheque Register\n" +" " +msgstr "" +"Modul naloga VAucera sadrzi sve bazne predispozicije za\n" +" Vaucer za Banke, Kes, Prodaju, Kupovinu, Prosirenja, Contre, itd\n" +" *Sadrzaj Vaucera\n" +" *Prijem Vaucera\n" +" *Cek Registar\n" +" " + +#. module: account_voucher +#: view:account.voucher:0 +#: model:ir.actions.act_window,name:account_voucher.act_pay_bills +msgid "Bill Payment" +msgstr "Isplate racuna" + +#. module: account_voucher +#: field:account.voucher.line,amount_original:0 +msgid "Originial Amount" +msgstr "Originalna Suma" + +#. module: account_voucher +#: view:account.statement.from.invoice.lines:0 +#: code:addons/account_voucher/wizard/account_statement_from_invoice.py:0 +#: model:ir.actions.act_window,name:account_voucher.action_view_account_statement_from_invoice_lines +#, python-format +msgid "Import Entries" +msgstr "Uvezi stavke" + +#. module: account_voucher +#: model:ir.model,name:account_voucher.model_account_voucher_unreconcile +msgid "Account voucher unreconcile" +msgstr "Ponisteni Nalozi Vaucera" + +#. module: account_voucher +#: view:account.voucher:0 +msgid "Pay Bill" +msgstr "Isplata Racuna" #. module: account_voucher #: field:account.voucher,company_id:0 +#: field:account.voucher.line,company_id:0 msgid "Company" msgstr "Preduzeće" #. module: account_voucher -#: selection:account.move,voucher_type:0 -#: selection:account.voucher,type:0 -#: model:ir.actions.act_window,name:account_voucher.action_view_jour_voucher_form -#: model:ir.ui.menu,name:account_voucher.menu_action_view_jour_voucher_form -msgid "Journal Voucher" -msgstr "Nalog za knjiženje" +#: view:account.voucher:0 +msgid "Set to Draft" +msgstr "Postavi u pripremu" #. module: account_voucher -#: rml:voucher.cash_receipt.drcr:0 -msgid "," -msgstr "," +#: model:ir.actions.act_window,name:account_voucher.action_view_account_voucher_unreconcile +msgid "Unreconcile entries" +msgstr "Ponisti stavke" #. module: account_voucher #: view:account.voucher:0 -msgid "Set to Draft" -msgstr "Postavi u pripremu" +msgid "Voucher Statistics" +msgstr "Statistike Vaucera" #. module: account_voucher -#: wizard_button:account.voucher.open,init,open:0 -msgid "Open Voucher Entries" -msgstr "Otvori Stavke Priznanice" +#: view:account.voucher:0 +msgid "Validate" +msgstr "Overi" #. module: account_voucher -#: model:ir.model,name:account_voucher.model_account_voucher_line -msgid "Voucher Line" -msgstr "Red Priznanice" +#: view:account.voucher:0 +msgid "Search Vouchers" +msgstr "Pretrazi Vaucere" #. module: account_voucher -#: view:account.move:0 -msgid "Total Credit" -msgstr "Ukupno potrazuje" +#: selection:account.voucher,type:0 +msgid "Purchase" +msgstr "Kupovina" #. module: account_voucher #: field:account.voucher,account_id:0 #: field:account.voucher.line,account_id:0 msgid "Account" -msgstr "Konto" +msgstr "Nalog" #. module: account_voucher -#: rml:voucher.cash_amount:0 -msgid "D" -msgstr "D" +#: field:account.voucher,line_dr_ids:0 +msgid "Debits" +msgstr "Dugovanja" #. module: account_voucher -#: field:account.account,level:0 -msgid "Level" -msgstr "Nivo" +#: view:account.statement.from.invoice.lines:0 +msgid "Ok" +msgstr "U redu" #. module: account_voucher -#: view:account.move:0 -msgid "Account Entry Line" -msgstr "Stavke knjiženja" +#: field:account.voucher,date_due:0 +#: field:account.voucher.line,date_due:0 +msgid "Due Date" +msgstr "Datum dospeća" #. module: account_voucher -#: view:account.move:0 -msgid "Total Debit" -msgstr "Ukupno duguje" +#: field:account.voucher,narration:0 +msgid "Notes" +msgstr "Napomene" + +#. module: account_voucher +#: selection:account.voucher,type:0 +msgid "Sale" +msgstr "Prodaja" + +#. module: account_voucher +#: field:account.voucher.line,move_line_id:0 +msgid "Journal Item" +msgstr "Stavka Dnevnika" + +#. module: account_voucher +#: field:account.voucher,reference:0 +msgid "Ref #" +msgstr "Ref #" #. module: account_voucher -#: field:account.voucher,amount:0 #: field:account.voucher.line,amount:0 -#: rml:voucher.cash_amount:0 +#: report:voucher.print:0 msgid "Amount" msgstr "Iznos" #. module: account_voucher -#: rml:voucher.cash_amount:0 -#: rml:voucher.cash_receipt.drcr:0 +#: view:account.voucher:0 +msgid "Payment Options" +msgstr "Opcije Placanja" + +#. module: account_voucher +#: view:account.voucher:0 +msgid "Bill Information" +msgstr "Informacije Racuna" + +#. module: account_voucher +#: selection:account.voucher,state:0 +msgid "Cancelled" +msgstr "Otkazano" + +#. module: account_voucher +#: field:account.statement.from.invoice,date:0 +msgid "Date payment" +msgstr "Datum plaćanja" + +#. module: account_voucher +#: report:voucher.cash_receipt.drcr:0 +#: report:voucher.print:0 msgid "Receiver's Signature" msgstr "Potpis Primaoca" #. module: account_voucher -#: rml:voucher.cash_amount:0 -#: rml:voucher.cash_receipt.drcr:0 -msgid "No." -msgstr "Br." +#: model:ir.model,name:account_voucher.model_account_bank_statement_line +msgid "Bank Statement Line" +msgstr "Red bankovnog izvoda" #. module: account_voucher -#: rml:voucher.cash_amount:0 -#: rml:voucher.cash_receipt.drcr:0 +#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt +#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt +msgid "Supplier Vouchers" +msgstr "Vauceri Dobavljaca" + +#. module: account_voucher +#: field:account.voucher,tax_id:0 +msgid "Tax" +msgstr "Porez" + +#. module: account_voucher +#: report:voucher.cash_receipt.drcr:0 +#: report:voucher.print:0 msgid "Amount (in words) :" msgstr "Iznos ( napisano slovima )" @@ -154,446 +259,642 @@ msgid "Analytic Account" msgstr "Analitički konto" #. module: account_voucher -#: selection:account.move,voucher_type:0 -#: selection:account.voucher,type:0 -#: selection:account.voucher.open,init,type:0 -#: model:ir.actions.act_window,name:account_voucher.action_view_jour_sale_voucher_form -#: model:ir.ui.menu,name:account_voucher.menu_action_view_jour_sale_voucher_form -msgid "Journal Sale Voucher" -msgstr "Dnevnik prodaje priznanicama" +#: report:voucher.cash_receipt.drcr:0 +msgid "Journal:" +msgstr "Dnevnik:" #. module: account_voucher -#: model:ir.actions.act_window,name:account_voucher.action_receipt_vou_voucher_list -#: model:ir.ui.menu,name:account_voucher.menu_action_receipt_vou_voucher_list -msgid "Receipt Vouchers" -msgstr "Priznanice prijema" +#: view:account.voucher:0 +msgid "Payment Information" +msgstr "Informacije Placanja" + +#. module: account_voucher +#: view:account.statement.from.invoice:0 +msgid "Go" +msgstr "Kreni" #. module: account_voucher -#: rml:voucher.cash_amount:0 +#: view:account.voucher:0 +#: field:account.voucher,partner_id:0 +#: field:account.voucher.line,partner_id:0 +msgid "Partner" +msgstr "Partner" + +#. module: account_voucher +#: view:account.bank.statement:0 +msgid "Import Invoices" +msgstr "Uvezi Racune" + +#. module: account_voucher +#: code:addons/account_voucher/account_voucher.py:0 +#, python-format +msgid "" +"You have to configure account base code and account tax code on the '%s' tax!" +msgstr "" + +#. module: account_voucher +#: report:voucher.print:0 msgid "Account :" msgstr "Nalog :" #. module: account_voucher -#: rml:voucher.cash_amount:0 -#: rml:voucher.cash_receipt.drcr:0 -msgid "On Account of :" -msgstr "Na Nalogu od:" +#: selection:account.voucher,type:0 +msgid "Receipt" +msgstr "Racun" #. module: account_voucher -#: model:ir.actions.act_window,name:account_voucher.action_payments_bankpay_voucher_list -#: model:ir.actions.act_window,name:account_voucher.action_payments_cashpay_voucher_list -#: model:ir.actions.act_window,name:account_voucher.action_payments_voucher_list -#: model:ir.ui.menu,name:account_voucher.menu_action_payments_voucher_list -msgid "Payment Vouchers" -msgstr "Priznanice plaćanja" +#: report:voucher.cash_receipt.drcr:0 +#: report:voucher.print:0 +msgid "On Account of :" +msgstr "Na Nalogu od:" #. module: account_voucher #: view:account.voucher:0 -msgid "Create" -msgstr "Kreiraj" +msgid "Sales Lines" +msgstr "" #. module: account_voucher -#: selection:account.account,type1:0 -#: selection:account.account.template,type1:0 -msgid "None" -msgstr "" +#: report:voucher.cash_receipt.drcr:0 +#: report:voucher.print:0 +msgid "Date:" +msgstr "Datum:" #. module: account_voucher -#: field:account.voucher,number:0 -msgid "Number" -msgstr "" +#: view:account.voucher:0 +#: field:account.voucher,period_id:0 +msgid "Period" +msgstr "Razdoblje" #. module: account_voucher -#: view:account.move:0 +#: view:account.voucher:0 #: field:account.voucher,state:0 -#: wizard_field:account.voucher.open,init,state:0 msgid "State" -msgstr "" +msgstr "Stanje" #. module: account_voucher -#: selection:account.account,type1:0 -#: selection:account.account.template,type1:0 -#: selection:account.voucher.line,type:0 -#: rml:voucher.cash_receipt.drcr:0 -msgid "Debit" -msgstr "" +#: model:ir.module.module,shortdesc:account_voucher.module_meta_information +msgid "Accounting Voucher Entries" +msgstr "Knjigovodstveni Sadrzaj Vaucera" #. module: account_voucher -#: field:account.voucher,type:0 -#: field:account.voucher.line,type:0 -msgid "Type" -msgstr "" +#: view:account.voucher:0 +#: model:ir.actions.act_window,name:account_voucher.act_journal_voucher_open +msgid "Voucher Entries" +msgstr "Sadrzaj Vaucera" #. module: account_voucher -#: model:ir.ui.menu,name:account_voucher.menu_action_voucher_list -msgid "Voucher Entries" -msgstr "" +#: code:addons/account_voucher/account_voucher.py:0 +#, python-format +msgid "Error !" +msgstr "Greška !" #. module: account_voucher -#: rml:voucher.cash_amount:0 -#: rml:voucher.cash_receipt.drcr:0 +#: view:account.voucher:0 +msgid "Supplier Voucher" +msgstr "Vaucer Dobavljaca" + +#. module: account_voucher +#: model:ir.actions.act_window,name:account_voucher.action_review_voucher_list +msgid "Vouchers Entries" +msgstr "Sadrzaji Vaucera" + +#. module: account_voucher +#: report:voucher.cash_receipt.drcr:0 +#: report:voucher.print:0 msgid "Authorised Signatory" -msgstr "" +msgstr "Autorizovanj Potpis" #. module: account_voucher #: view:account.voucher:0 -#: model:ir.actions.act_window,name:account_voucher.action_voucher_list -msgid "Vouchers" -msgstr "" +#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt +#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt +msgid "Sales Receipt" +msgstr "Racun Prodaje" + +#. module: account_voucher +#: code:addons/account_voucher/account_voucher.py:0 +#, python-format +msgid "Invalid action !" +msgstr "Neispravna akcija!" #. module: account_voucher #: view:account.voucher:0 -#: field:account.voucher.line,voucher_id:0 -#: model:res.request.link,name:account_voucher.req_link_voucher -msgid "Voucher" -msgstr "" +msgid "Other Information" +msgstr "Ostale informacije" #. module: account_voucher -#: wizard_view:account.voucher.open,init:0 -#: model:ir.ui.menu,name:account_voucher.menu_wizard_account_voucher_open -msgid "Open Vouchers" -msgstr "" +#: view:account.voucher.unreconcile:0 +msgid "Unreconciliation" +msgstr "Poništavanje zatvaranja" #. module: account_voucher #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" -msgstr "" +msgstr "Nevažeći XML za pregled arhitekture" #. module: account_voucher -#: rml:voucher.cash_amount:0 -#: rml:voucher.cash_receipt.drcr:0 -msgid "Dated :" -msgstr "" +#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment +#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment +msgid "Vendor Payment" +msgstr "Placanja Proizvodjaca" #. module: account_voucher -#: model:ir.ui.menu,name:account_voucher.menu_action_receipt_cashreceipt_voucher_list -msgid "Cash Receipts" -msgstr "" +#: view:account.invoice:0 +#: code:addons/account_voucher/invoice.py:0 +#, python-format +msgid "Pay Invoice" +msgstr "Racun" #. module: account_voucher -#: field:account.voucher,partner_id:0 -#: field:account.voucher.line,partner_id:0 -msgid "Partner" -msgstr "" +#: code:addons/account_voucher/account_voucher.py:0 +#, python-format +msgid "No Account Base Code and Account Tax Code!" +msgstr "Nema bazne postavke naloga kao ni poreza za isti." #. module: account_voucher -#: model:ir.ui.menu,name:account_voucher.menu_action_view_bank_pay_voucher_form -msgid "New Bank Payment" -msgstr "" +#: field:account.voucher,tax_amount:0 +msgid "Tax Amount" +msgstr "Iznos poreza" + +#. module: account_voucher +#: view:account.voucher:0 +msgid "Voucher Entry" +msgstr "Sadrzaj Vaucera" #. module: account_voucher #: view:account.voucher:0 +msgid "Paid Amount" +msgstr "Suma Isplate" + +#. module: account_voucher +#: selection:account.voucher,pay_now:0 +msgid "Pay Directly" +msgstr "Direktna Isplata" + +#. module: account_voucher +#: field:account.statement.from.invoice,line_ids:0 +#: field:account.statement.from.invoice.lines,line_ids:0 +msgid "Invoices" +msgstr "Računi" + +#. module: account_voucher +#: field:account.voucher.unreconcile,remove:0 +msgid "Want to remove accounting entries too ?" +msgstr "Zelis da uklonis i sadrzaj racuna ?" + +#. module: account_voucher #: field:account.voucher,line_ids:0 +#: model:ir.model,name:account_voucher.model_account_voucher_line msgid "Voucher Lines" -msgstr "" +msgstr "Linije Vaucera" #. module: account_voucher #: field:account.voucher,currency_id:0 msgid "Currency" -msgstr "" +msgstr "Valuta" #. module: account_voucher -#: view:account.move:0 -#: field:account.move,narration:0 -#: view:account.voucher:0 -#: field:account.voucher,narration:0 -msgid "Narration" +#: view:account.statement.from.invoice.lines:0 +msgid "Payable and Receivables" msgstr "" #. module: account_voucher -#: field:account.voucher,reference:0 -msgid "Voucher Reference" +#: selection:account.voucher,pay_now:0 +msgid "Pay Later or Group Funds" msgstr "" #. module: account_voucher -#: model:ir.ui.menu,name:account_voucher.menu_action_view_cash_rec_voucher_form -msgid "New Cash Receipt" -msgstr "" +#: view:account.voucher:0 +#: selection:account.voucher,state:0 +#: report:voucher.cash_receipt.drcr:0 +#: report:voucher.print:0 +msgid "Draft" +msgstr "Priprema" #. module: account_voucher -#: model:ir.actions.report.xml,name:account_voucher.report_account_voucher_amt -msgid "Voucher Report" -msgstr "" +#: constraint:ir.ui.menu:0 +msgid "Error ! You can not create recursive Menu." +msgstr "Greska! Ne mozete kreirati rekursivni meni." #. module: account_voucher -#: field:account.account,open_bal:0 -msgid "Opening Balance" -msgstr "" +#: report:voucher.print:0 +msgid "Currency:" +msgstr "Valuta:" #. module: account_voucher -#: selection:account.voucher,state:0 -#: selection:account.voucher.open,init,state:0 -#: rml:voucher.cash_amount:0 -#: rml:voucher.cash_receipt.drcr:0 -msgid "Draft" -msgstr "" +#: field:account.move.line,amount_unreconciled:0 +msgid "Unreconciled Amount" +msgstr "Stornirana Suma" #. module: account_voucher -#: rml:voucher.cash_amount:0 -#: rml:voucher.cash_receipt.drcr:0 +#: report:voucher.cash_receipt.drcr:0 +#: report:voucher.print:0 msgid "PRO-FORMA" -msgstr "" +msgstr "Predračun" #. module: account_voucher -#: model:ir.actions.act_window,name:account_voucher.action_receipt_cashreceipt_voucher_list -msgid "Cash Receipt" -msgstr "" +#: view:account.voucher:0 +msgid "Total Amount" +msgstr "Ukupni iznos" #. module: account_voucher -#: model:ir.ui.menu,name:account_voucher.menu_action_view_cash_pay_voucher_form -msgid "New Cash Payment" -msgstr "" +#: field:account.voucher.line,type:0 +msgid "Cr/Dr" +msgstr "Cr/Dr" #. module: account_voucher -#: view:account.move:0 -msgid "Optional Information" -msgstr "" +#: field:account.voucher,audit:0 +msgid "Audit Complete ?" +msgstr "Pregled KOmpletan?" #. module: account_voucher #: view:account.voucher:0 -msgid "General Entries" -msgstr "" +msgid "Vendor" +msgstr "proizvođač" + +#. module: account_voucher +#: view:account.voucher:0 +msgid "Payment Terms" +msgstr "Uslovi plaćanja" + +#. module: account_voucher +#: view:account.voucher:0 +msgid "Compute Tax" +msgstr "Izracunaj Porez" #. module: account_voucher #: field:account.voucher,date:0 +#: field:account.voucher.line,date_original:0 msgid "Date" -msgstr "" +msgstr "Datum" #. module: account_voucher -#: rml:voucher.cash_amount:0 -#: rml:voucher.cash_receipt.drcr:0 -msgid ":" -msgstr "" +#: view:account.voucher:0 +msgid "Post" +msgstr "Пошаљи" #. module: account_voucher -#: field:account.account,type1:0 -#: field:account.account.template,type1:0 -msgid "Dr/Cr" -msgstr "" +#: report:voucher.cash_receipt.drcr:0 +#: report:voucher.print:0 +msgid "Number:" +msgstr "Broj:" #. module: account_voucher -#: model:ir.actions.report.xml,name:account_voucher.report_account_voucher -msgid "Voucher Report (Cr/Dr)" -msgstr "" +#: field:account.bank.statement.line,amount_reconciled:0 +msgid "Amount reconciled" +msgstr "Zatvoreni iznos" #. module: account_voucher -#: field:account.move,voucher_type:0 -#: wizard_field:account.voucher.open,init,type:0 -msgid "Voucher Type" -msgstr "" +#: view:account.voucher:0 +msgid "Expense Lines" +msgstr "Troskovi" + +#. module: account_voucher +#: field:account.voucher,pre_line:0 +msgid "Previous Payments ?" +msgstr "Predhodne Isplate" + +#. module: account_voucher +#: model:ir.actions.act_window,name:account_voucher.action_voucher_list +#: model:ir.ui.menu,name:account_voucher.menu_encode_entries_by_voucher +msgid "Journal Vouchers" +msgstr "Dnevnik Vaucera" #. module: account_voucher -#: selection:account.account,type1:0 -#: selection:account.account.template,type1:0 #: selection:account.voucher.line,type:0 -#: rml:voucher.cash_receipt.drcr:0 +#: report:voucher.cash_receipt.drcr:0 msgid "Credit" -msgstr "" +msgstr "Kredit" + +#. module: account_voucher +#: view:account.voucher:0 +msgid "Extended options..." +msgstr "Dodatne Opcije" + +#. module: account_voucher +#: code:addons/account_voucher/account_voucher.py:0 +#, python-format +msgid "Please define a sequence on the journal !" +msgstr "Molim definisite sekvencu Knjige" #. module: account_voucher -#: rml:voucher.cash_amount:0 -#: rml:voucher.cash_receipt.drcr:0 +#: report:voucher.cash_receipt.drcr:0 +#: report:voucher.print:0 msgid "Through :" -msgstr "" +msgstr "Kroz:" #. module: account_voucher -#: field:account.voucher,reference_type:0 -msgid "Reference Type" +#: help:account.voucher,reference:0 +msgid "Transaction reference number." +msgstr "referentni broj Transakcije" + +#. module: account_voucher +#: view:account.voucher:0 +msgid "Invoices and outstanding transactions" msgstr "" #. module: account_voucher +#: view:account.voucher:0 +msgid "Bill Date" +msgstr "Datum Racuna" + +#. module: account_voucher +#: view:account.voucher:0 +#: view:account.voucher.unreconcile:0 +msgid "Unreconcile" +msgstr "Poništi zatvaranje" + +#. module: account_voucher +#: view:account.voucher:0 #: model:ir.model,name:account_voucher.model_account_voucher msgid "Accounting Voucher" msgstr "" #. module: account_voucher -#: field:account.voucher,period_id:0 -msgid "Period" -msgstr "" +#: field:account.voucher,number:0 +msgid "Number" +msgstr "Broj" #. module: account_voucher -#: model:ir.ui.menu,name:account_voucher.menu_action_payments_bankpay_voucher_list -msgid "Bank Payments" -msgstr "" +#: model:ir.model,name:account_voucher.model_account_bank_statement +msgid "Bank Statement" +msgstr "Izvod banke" #. module: account_voucher -#: view:account.move:0 -msgid "General Information" -msgstr "" +#: view:account.voucher:0 +msgid "To Review" +msgstr "Pregledati" #. module: account_voucher -#: wizard_field:account.voucher.open,init,period_ids:0 -msgid "Periods" -msgstr "" +#: view:account.voucher:0 +msgid "Sales Information" +msgstr "Informacije Prodaje" #. module: account_voucher #: view:account.voucher:0 -#: selection:account.voucher,state:0 -#: wizard_button:account.voucher.open,init,end:0 -#: selection:account.voucher.open,init,state:0 -msgid "Cancel" -msgstr "" +msgid "Open Vendor Journal Entries" +msgstr "Otvori Dnevnik Proizvodjaca" #. module: account_voucher +#: field:account.voucher.line,voucher_id:0 +#: model:ir.actions.report.xml,name:account_voucher.report_account_voucher +#: model:res.request.link,name:account_voucher.req_link_voucher +msgid "Voucher" +msgstr "Vaucer" + +#. module: account_voucher +#: model:ir.model,name:account_voucher.model_account_invoice +msgid "Invoice" +msgstr "Račun" + +#. module: account_voucher +#: view:account.voucher:0 +msgid "Voucher Items" +msgstr "Sadrzaj Vaucera" + +#. module: account_voucher +#: view:account.statement.from.invoice:0 +#: view:account.statement.from.invoice.lines:0 #: view:account.voucher:0 +#: view:account.voucher.unreconcile:0 +msgid "Cancel" +msgstr "Otkaži" + +#. module: account_voucher #: selection:account.voucher,state:0 -#: selection:account.voucher.open,init,state:0 msgid "Pro-forma" -msgstr "" +msgstr "Predračun" + +#. module: account_voucher +#: view:account.voucher:0 +#: field:account.voucher,move_ids:0 +#: model:ir.model,name:account_voucher.model_account_move_line +msgid "Journal Items" +msgstr "Sadrzaj Dnevnika" + +#. module: account_voucher +#: view:account.voucher:0 +#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher +#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt +#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt +msgid "Customer Payment" +msgstr "Placanja Stranki" #. module: account_voucher #: constraint:ir.model:0 msgid "" "The Object name must start with x_ and not contain any special character !" msgstr "" +"Ime objekta mora da počinje sa x_ i ne sme da sadrži specijalne karaktere !" #. module: account_voucher -#: view:account.voucher:0 -msgid "Other Info" -msgstr "" +#: view:account.statement.from.invoice:0 +#: model:ir.actions.act_window,name:account_voucher.action_view_account_statement_from_invoice +msgid "Import Invoices in Statement" +msgstr "Uvezi račune u izvod" #. module: account_voucher -#: model:ir.module.module,shortdesc:account_voucher.module_meta_information -msgid "Accounting Voucher Entries" -msgstr "" +#: view:account.voucher:0 +msgid "Pay" +msgstr "Plati" #. module: account_voucher -#: field:res.currency,sub_name:0 -msgid "Sub Currency" -msgstr "" +#: selection:account.voucher.line,type:0 +#: report:voucher.cash_receipt.drcr:0 +msgid "Debit" +msgstr "Duguje" #. module: account_voucher -#: model:ir.actions.act_window,name:account_voucher.action_other_voucher_list -#: model:ir.ui.menu,name:account_voucher.menu_action_other_voucher_list -msgid "Other Vouchers" -msgstr "" +#: view:account.voucher:0 +msgid "Payment Method" +msgstr "Nacin Placanja" #. module: account_voucher #: field:account.voucher.line,name:0 msgid "Description" -msgstr "" +msgstr "Opis" #. module: account_voucher -#: rml:voucher.cash_amount:0 -#: rml:voucher.cash_receipt.drcr:0 +#: report:voucher.cash_receipt.drcr:0 +#: report:voucher.print:0 msgid "Canceled" -msgstr "" +msgstr "Otkazano" #. module: account_voucher -#: selection:account.move,voucher_type:0 -#: selection:account.voucher,type:0 -#: selection:account.voucher.open,init,type:0 -#: model:ir.actions.act_window,name:account_voucher.action_view_cash_pay_voucher_form -#: rml:voucher.cash_amount:0 -#: rml:voucher.cash_receipt.drcr:0 -msgid "Cash Payment Voucher" -msgstr "" +#: code:addons/account_voucher/account_voucher.py:0 +#, python-format +msgid "Please change partner and try again !" +msgstr "Molim p;romenite partnera i probajte ponovo !" #. module: account_voucher -#: model:ir.actions.act_window,name:account_voucher.action_receipt_bakreceipt_voucher_list -msgid "Bank Receipt" -msgstr "" +#: field:account.statement.from.invoice,journal_ids:0 +#: view:account.voucher:0 +#: field:account.voucher,journal_id:0 +msgid "Journal" +msgstr "Dnevnik" #. module: account_voucher -#: rml:voucher.cash_amount:0 -#: rml:voucher.cash_receipt.drcr:0 +#: report:voucher.cash_receipt.drcr:0 msgid "-" -msgstr "" +msgstr "-" #. module: account_voucher -#: selection:account.move,voucher_type:0 -#: selection:account.voucher,type:0 -#: selection:account.voucher.open,init,type:0 -#: model:ir.actions.act_window,name:account_voucher.action_view_jour_pur_voucher_form -#: model:ir.ui.menu,name:account_voucher.menu_action_view_jour_pur_voucher_form -msgid "Journal Purchase Voucher" -msgstr "" +#: view:account.voucher:0 +msgid "Internal Notes" +msgstr "Interne Napomene" #. module: account_voucher -#: view:account.account:0 -msgid "Closing Balance" -msgstr "" +#: view:account.voucher:0 +#: field:account.voucher,line_cr_ids:0 +msgid "Credits" +msgstr "Krediti" #. module: account_voucher -#: field:account.voucher.line,ref:0 -msgid "Ref." -msgstr "" +#: report:voucher.cash_receipt.drcr:0 +#: report:voucher.print:0 +msgid "State:" +msgstr "Stanje:" + +#. module: account_voucher +#: field:account.bank.statement.line,voucher_id:0 +#: view:account.invoice:0 +#: view:account.voucher:0 +#: field:account.voucher,pay_now:0 +#: selection:account.voucher,type:0 +msgid "Payment" +msgstr "Isplata" #. module: account_voucher +#: view:account.voucher:0 #: selection:account.voucher,state:0 -#: selection:account.voucher.open,init,state:0 -#: rml:voucher.cash_amount:0 -#: rml:voucher.cash_receipt.drcr:0 +#: report:voucher.cash_receipt.drcr:0 +#: report:voucher.print:0 msgid "Posted" -msgstr "" +msgstr "Proknjiženo" #. module: account_voucher -#: field:account.voucher,name:0 -msgid "Name" -msgstr "" +#: view:account.voucher:0 +msgid "Customer" +msgstr "Kupac" #. module: account_voucher -#: field:account.voucher,move_ids:0 -msgid "Real Entry" -msgstr "" +#: field:account.voucher,type:0 +msgid "Default Type" +msgstr "Podrazumevani Tip" #. module: account_voucher -#: model:ir.actions.wizard,name:account_voucher.wizard_account_voucher_open -msgid "Open a Voucher Entry" -msgstr "" +#: model:ir.model,name:account_voucher.model_account_statement_from_invoice +#: model:ir.model,name:account_voucher.model_account_statement_from_invoice_lines +msgid "Entries by Statement from Invoices" +msgstr "Sadrzaj po stavkama iz Racuna" #. module: account_voucher #: field:account.voucher,move_id:0 msgid "Account Entry" -msgstr "" +msgstr "Sadrzaj Naloga" #. module: account_voucher -#: view:account.voucher:0 -msgid "Entry Lines" -msgstr "" +#: constraint:ir.rule:0 +msgid "Rules are not supported for osv_memory objects !" +msgstr "Pravila nisu podrzana od strane osv_memory objekata !" #. module: account_voucher -#: model:ir.ui.menu,name:account_voucher.menu_action_view_bank_rec_voucher_form -msgid "New Bank Receipt" -msgstr "" +#: code:addons/account_voucher/account_voucher.py:0 +#, python-format +msgid "Invalid Error !" +msgstr "Nedefinisana Greska !" #. module: account_voucher -#: model:ir.ui.menu,name:account_voucher.menu_action_payments_cashpay_voucher_list -msgid "Cash Payments" -msgstr "" +#: help:account.voucher,date:0 +msgid "Effective date for accounting entries" +msgstr "Efektivni datum za sadrzaj racuna" #. module: account_voucher -#: selection:account.move,voucher_type:0 -#: selection:account.voucher,type:0 -#: selection:account.voucher.open,init,type:0 -#: model:ir.actions.act_window,name:account_voucher.action_view_cash_rec_voucher_form -#: rml:voucher.cash_amount:0 -#: rml:voucher.cash_receipt.drcr:0 -msgid "Cash Receipt Voucher" +#: view:account.voucher.unreconcile:0 +msgid "" +"If you unreconciliate transactions, you must also verify all the actions " +"that are linked to those transactions because they will not be disable" msgstr "" +"Ako želite poništiti zatvaranja transakcija, morate također provjeriti sve " +"radnje koje su povezane sa tim transakcijama jer neće biti onemogućene" #. module: account_voucher -#: selection:account.move,voucher_type:0 -#: selection:account.voucher,type:0 -#: selection:account.voucher.open,init,type:0 -#: model:ir.actions.act_window,name:account_voucher.action_view_bank_pay_voucher_form -#: rml:voucher.cash_amount:0 -#: rml:voucher.cash_receipt.drcr:0 -msgid "Bank Payment Voucher" -msgstr "" +#: view:account.voucher:0 +msgid "Vendor Invoices and Outstanding transactions" +msgstr "Proizvodjacevi racuni i neobradjene transakcije" #. module: account_voucher -#: selection:account.move,voucher_type:0 -#: selection:account.voucher,type:0 -#: selection:account.voucher.open,init,type:0 -#: model:ir.actions.act_window,name:account_voucher.action_view_bank_rec_voucher_form -#: rml:voucher.cash_amount:0 -#: rml:voucher.cash_receipt.drcr:0 -msgid "Bank Receipt Voucher" -msgstr "" +#: field:account.voucher.line,untax_amount:0 +msgid "Untax Amount" +msgstr "Neporezovan Iznos" #. module: account_voucher -#: field:account.account,journal_id:0 -#: field:account.voucher,journal_id:0 -msgid "Journal" -msgstr "" +#: view:account.voucher:0 +#: field:account.voucher.line,amount_unreconciled:0 +msgid "Open Balance" +msgstr "Otvori Stanje" + +#. module: account_voucher +#: view:account.voucher:0 +#: field:account.voucher,amount:0 +msgid "Total" +msgstr "Ukupno" + +#. module: account_voucher +#: field:account.voucher,name:0 +msgid "Memo" +msgstr "Memo" + +#~ msgid "Journal Voucher" +#~ msgstr "Nalog za knjiženje" + +#~ msgid "Opening Balance Entry" +#~ msgstr "Otvaranje sadrzaja salda" + +#~ msgid "Contra Voucher" +#~ msgstr "Suprotna priznanica" + +#~ msgid "," +#~ msgstr "," + +#~ msgid "State :" +#~ msgstr "Stanje :" + +#~ msgid "Bank Receipts" +#~ msgstr "Bankovni primitci" + +#~ msgid "Total Credit" +#~ msgstr "Ukupno potrazuje" + +#~ msgid "D" +#~ msgstr "D" + +#~ msgid "Open Voucher Entries" +#~ msgstr "Otvori Stavke Priznanice" + +#~ msgid "Total Debit" +#~ msgstr "Ukupno duguje" + +#~ msgid "Level" +#~ msgstr "Nivo" + +#~ msgid "Account Entry Line" +#~ msgstr "Stavke knjiženja" + +#~ msgid "Voucher Line" +#~ msgstr "Red Priznanice" + +#~ msgid "Journal Sale Voucher" +#~ msgstr "Dnevnik prodaje priznanicama" + +#~ msgid "Receipt Vouchers" +#~ msgstr "Priznanice prijema" + +#~ msgid "No." +#~ msgstr "Br." + +#~ msgid "Create" +#~ msgstr "Kreiraj" + +#~ msgid "Payment Vouchers" +#~ msgstr "Priznanice plaćanja" diff --git a/addons/account_voucher/invoice.py b/addons/account_voucher/invoice.py index 5560f57ce81..0230cac1009 100644 --- a/addons/account_voucher/invoice.py +++ b/addons/account_voucher/invoice.py @@ -24,8 +24,8 @@ from tools.translate import _ class invoice(osv.osv): _inherit = 'account.invoice' - - def invoice_pay_customer(self, cr, uid, ids, context={}): + + def invoice_pay_customer(self, cr, uid, ids, context=None): if not ids: return [] inv = self.browse(cr, uid, ids[0], context=context) return { @@ -46,7 +46,7 @@ class invoice(osv.osv): 'invoice_type':inv.type, 'invoice_id':inv.id, 'default_type': inv.type in ('out_invoice','out_refund') and 'receipt' or 'payment' - } + } } invoice() diff --git a/addons/account_voucher/report/account_voucher.py b/addons/account_voucher/report/account_voucher.py index 7931daffbac..e44adee974e 100644 --- a/addons/account_voucher/report/account_voucher.py +++ b/addons/account_voucher/report/account_voucher.py @@ -32,7 +32,7 @@ class report_voucher(report_sxw.rml_parse): 'get_title': self.get_title, 'debit':self.debit, 'credit':self.credit, - 'get_ref' : self._get_ref + 'get_ref': self._get_ref }) def convert(self, amount, cur): @@ -58,9 +58,10 @@ class report_voucher(report_sxw.rml_parse): return credit def _get_ref(self, voucher_id, move_ids): - voucher_line = self.pool.get('account.voucher.line').search(self.cr, self.uid, [('partner_id', '=', move_ids.partner_id.id), ('voucher_id', '=', voucher_id)]) + voucher_line_obj = self.pool.get('account.voucher.line') + voucher_line = voucher_line_obj.search(self.cr, self.uid, [('partner_id', '=', move_ids.partner_id.id), ('voucher_id', '=', voucher_id)]) if voucher_line: - voucher = self.pool.get('account.voucher.line').browse(self.cr, self.uid, voucher_line)[0] + voucher = voucher_line_obj.browse(self.cr, self.uid, voucher_line)[0] return voucher.name else: return diff --git a/addons/account_voucher/test/account_voucher.yml b/addons/account_voucher/test/account_voucher.yml index 424ec0e5cc7..ce34733dda7 100644 --- a/addons/account_voucher/test/account_voucher.yml +++ b/addons/account_voucher/test/account_voucher.yml @@ -1,21 +1,21 @@ - - In order to check account voucher module in OpenERP I create a customer voucher - !record {model: account.voucher, id: account_voucher_voucherforaxelor0}: account_id: account.cash + amount: 1000.0 company_id: base.main_company currency_id: base.EUR journal_id: account.bank_journal name: Voucher for Axelor narration: Basic Pc - line_ids: + line_cr_ids: - account_id: account.a_recv amount: 1000.0 name: Voucher for Axelor - partner_id: base.res_partner_desertic_hispafuentes + partner_id: base.res_partner_desertic_hispafuentes period_id: account.period_6 - reference_type: none + reference: none - I check that Initially customer voucher is in the "Draft" state @@ -26,11 +26,7 @@ I compute the voucher to calculate the taxes by clicking Compute button - !workflow {model: account.voucher, action: proforma_voucher, ref: account_voucher_voucherforaxelor0} -- - I check that the voucher state is now "proforma" -- - !assert {model: account.voucher, id: account_voucher_voucherforaxelor0}: - - state == 'proforma' + - I create voucher by clicking on Create button - @@ -54,17 +50,19 @@ - !record {model: account.voucher, id: account_voucher_voucheraxelor0}: account_id: account.cash + amount: 1000.0 company_id: base.main_company currency_id: base.EUR journal_id: account.bank_journal name: Voucher Axelor narration: Basic PC - line_ids: + line_dr_ids: - account_id: account.cash amount: 1000.0 name: Voucher Axelor + partner_id: base.res_partner_desertic_hispafuentes period_id: account.period_6 - reference_type: none + reference: none - I check that Initially vendor voucher is in the "Draft" state @@ -72,15 +70,6 @@ !assert {model: account.voucher, id: account_voucher_voucheraxelor0}: - state == 'draft' - - I change the state of voucher to "proforma" by clicking PRO-FORMA button -- - !workflow {model: account.voucher, action: proforma_voucher, ref: account_voucher_voucheraxelor0} -- - I check that the voucher state is now "proforma" -- - !assert {model: account.voucher, id: account_voucher_voucheraxelor0}: - - state == 'proforma' -- I create voucher by clicking on Create button - !workflow {model: account.voucher, action: proforma_voucher, ref: account_voucher_voucheraxelor0} diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml index ed6e98ad17d..46db5747f94 100644 --- a/addons/account_voucher/voucher_sales_purchase_view.xml +++ b/addons/account_voucher/voucher_sales_purchase_view.xml @@ -153,9 +153,9 @@ <button name="cancel_voucher" string="Cancel" states="draft,proforma" icon="gtk-cancel"/> <button name="cancel_voucher" string="Cancel" type="object" states="posted" icon="terp-stock_effects-object-colorize" confirm="Are you sure to confirm this record ?"/> <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward"/> - <group colspan="2" attrs="{'invisible':[('pay_now','!=','pay_now')]}"> - <button icon="terp-dolar_ok!" name="%(act_pay_voucher)d" context="{'narration':narration, 'title':'Customer Payment', 'type':'receipt', 'partner_id': partner_id, 'reference':reference}" type="action" string="Pay" attrs="{'invisible':[('state','!=','posted')]}"/> - </group> + <group attrs="{'invisible':[('state','!=','posted')]}"> + <button icon="terp-dolar_ok!" name="%(act_pay_voucher)d" context="{'narration':narration, 'title':'Customer Payment', 'type':'receipt', 'partner_id': partner_id, 'reference':reference}" type="action" string="Pay" attrs="{'invisible':[('pay_now','!=','pay_now')]}"/> + </group> <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/> </group> </form> diff --git a/addons/account_voucher/wizard/account_statement_from_invoice.py b/addons/account_voucher/wizard/account_statement_from_invoice.py index 507fdcabffa..b4671ae208a 100644 --- a/addons/account_voucher/wizard/account_statement_from_invoice.py +++ b/addons/account_voucher/wizard/account_statement_from_invoice.py @@ -18,6 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # ############################################################################## + import time from osv import fields, osv diff --git a/addons/account_voucher/wizard/account_voucher_unreconcile.py b/addons/account_voucher/wizard/account_voucher_unreconcile.py index 71b4fbc8fb5..69aa6e1181d 100644 --- a/addons/account_voucher/wizard/account_voucher_unreconcile.py +++ b/addons/account_voucher/wizard/account_voucher_unreconcile.py @@ -25,15 +25,15 @@ from osv import fields class account_voucher_unreconcile(osv.osv_memory): _name = "account.voucher.unreconcile" _description = "Account voucher unreconcile" - + _columns = { 'remove':fields.boolean('Want to remove accounting entries too ?', required=False), } - + _defaults = { 'remove': True, } - + def trans_unrec(self, cr, uid, ids, context=None): # res = self.browse(cr, uid, ids[0]) if context is None: @@ -54,9 +54,9 @@ class account_voucher_unreconcile(osv.osv_memory): 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 {} account_voucher_unreconcile() -# 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 f6263bfeb0d..1eb904e59d7 100644 --- a/addons/analytic/analytic.py +++ b/addons/analytic/analytic.py @@ -28,130 +28,65 @@ 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=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()) - res_currency= self.pool.get('res.currency') + def _compute_level_tree(self, cr, uid, ids, child_ids, res, field_names, context=None): + def recursive_computation(account_id, res): + account = self.browse(cr, uid, account_id) + for son in account.child_ids: + res = recursive_computation(son.id, res) + for field in field_names: + res[account.id][field] += res[son.id][field] + return res for account in self.browse(cr, uid, ids, context=context): - if account.id not in ids2: + if account.id not in child_ids: continue - for child in account.child_ids: - if child.id != account.id: - res.setdefault(account.id, 0.0) - if currency[child.id] != currency[account.id]: - res[account.id] += res_currency.compute(cr, uid, currency[child.id], currency[account.id], res.get(child.id, 0.0), context=context) - else: - res[account.id] += res.get(child.id, 0.0) - - 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: - res[id] = res_currency.round(cr, uid, cur_obj[currency[id]], res.get(id,0.0)) - - return dict([(i, res[i]) for i in ids ]) + res = recursive_computation(account.id, res) + return res - def _credit_calc(self, cr, uid, ids, name, arg, context=None): + def _debit_credit_bal_qtty(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) + child_ids = tuple(self.search(cr, uid, [('parent_id', 'child_of', ids)])) + for i in child_ids: + res[i] = {} + for n in name: + res[i][n] = 0.0 - if not parent_ids: + if not child_ids: return res where_date = '' + where_clause_args = [tuple(child_ids)] if context.get('from_date', False): - where_date += " AND l.date >= '" + context['from_date'] + "'" + where_date += " AND l.date >= %s" + where_clause_args += [context['from_date']] if context.get('to_date', False): - where_date += " AND l.date <= '" + context['to_date'] + "'" - cr.execute("SELECT a.id, COALESCE(SUM(l.amount),0) FROM account_analytic_account a LEFT JOIN account_analytic_line l ON (a.id=l.account_id "+where_date+") WHERE l.amount<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=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) - - if not parent_ids: - return res - - where_date = '' - if context.get('from_date',False): - where_date += " AND l.date >= '" + context['from_date'] + "'" - if context.get('to_date',False): - where_date += " AND l.date <= '" + context['to_date'] + "'" - cr.execute("SELECT a.id, COALESCE(SUM(l.amount),0) FROM account_analytic_account a LEFT JOIN account_analytic_line l ON (a.id=l.account_id "+where_date+") WHERE l.amount>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=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) - - if not parent_ids: - return res - - where_date = '' - if context.get('from_date',False): - where_date += " AND l.date >= '" + context['from_date'] + "'" - if context.get('to_date',False): - where_date += " AND l.date <= '" + context['to_date'] + "'" - cr.execute("SELECT a.id, COALESCE(SUM(l.amount),0) FROM account_analytic_account a LEFT JOIN account_analytic_line l ON (a.id=l.account_id "+where_date+") WHERE a.id IN %s GROUP BY a.id",(tuple(parent_ids),)) - - 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=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: - res.setdefault(i,0.0) - - if not parent_ids: - return res - - where_date = '' - if context.get('from_date',False): - where_date += " AND l.date >= '" + context['from_date'] + "'" - if context.get('to_date',False): - where_date += " AND l.date <= '" + context['to_date'] + "'" - - cr.execute('SELECT a.id, COALESCE(SUM(l.unit_amount), 0) \ - FROM account_analytic_account a \ - LEFT JOIN account_analytic_line l ON (a.id = l.account_id ' + where_date + ') \ - WHERE a.id IN %s GROUP BY a.id',(tuple(parent_ids),)) - - for account_id, sum in cr.fetchall(): - res[account_id] = sum - - for account in self.browse(cr, uid, ids, context=context): - if account.id not in parent_ids: - continue - for child in account.child_ids: - if child.id != account.id: - res.setdefault(account.id, 0.0) - res[account.id] += res.get(child.id, 0.0) - return dict([(i, res[i]) for i in ids]) + where_date += " AND l.date <= %s" + where_clause_args += [context['to_date']] + cr.execute(""" + SELECT a.id, + sum( + CASE WHEN l.amount > 0 + THEN l.amount + ELSE 0.0 + END + ) as debit, + sum( + CASE WHEN l.amount < 0 + THEN -l.amount + ELSE 0.0 + END + ) as credit, + COALESCE(SUM(l.amount),0) AS balance, + COALESCE(SUM(l.unit_amount),0) AS quantity + FROM account_analytic_account a + LEFT JOIN account_analytic_line l ON (a.id = l.account_id) + WHERE a.id IN %s + """ + where_date + """ + GROUP BY a.id""", where_clause_args) + for ac_id, debit, credit, balance, quantity in cr.fetchall(): + res[ac_id] = {'debit': debit, 'credit': credit, 'balance': balance, 'quantity': quantity} + return self._compute_level_tree(cr, uid, ids, child_ids, res, ['debit', 'credit', 'balance', 'quantity'], context) def name_get(self, cr, uid, ids, context=None): if not ids: @@ -180,10 +115,10 @@ class account_analytic_account(osv.osv): 'parent_id': fields.many2one('account.analytic.account', 'Parent Analytic Account', select=2), 'child_ids': fields.one2many('account.analytic.account', 'parent_id', 'Child Accounts'), 'line_ids': fields.one2many('account.analytic.line', 'account_id', 'Analytic Entries'), - 'balance': fields.function(_balance_calc, method=True, type='float', string='Balance'), - 'debit': fields.function(_debit_calc, method=True, type='float', string='Debit'), - 'credit': fields.function(_credit_calc, method=True, type='float', string='Credit'), - 'quantity': fields.function(_quantity_calc, method=True, type='float', string='Quantity'), + 'balance': fields.function(_debit_credit_bal_qtty, method=True, type='float', string='Balance', multi='debit_credit_bal_qtty', digits_compute=dp.get_precision('Account')), + 'debit': fields.function(_debit_credit_bal_qtty, method=True, type='float', string='Debit', multi='debit_credit_bal_qtty', digits_compute=dp.get_precision('Account')), + 'credit': fields.function(_debit_credit_bal_qtty, method=True, type='float', string='Credit', multi='debit_credit_bal_qtty', digits_compute=dp.get_precision('Account')), + 'quantity': fields.function(_debit_credit_bal_qtty, method=True, type='float', string='Quantity', multi='debit_credit_bal_qtty'), 'quantity_max': fields.float('Maximum Quantity', help='Sets the higher limit of quantity of hours.'), 'partner_id': fields.many2one('res.partner', 'Partner'), 'contact_id': fields.many2one('res.partner.address', 'Contact'), diff --git a/addons/analytic/i18n/sr.po b/addons/analytic/i18n/sr.po index 77fb1553933..ed287335040 100644 --- a/addons/analytic/i18n/sr.po +++ b/addons/analytic/i18n/sr.po @@ -7,14 +7,14 @@ msgid "" msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" -"POT-Creation-Date: 2010-06-18 10:59+0000\n" -"PO-Revision-Date: 2010-10-15 08:47+0000\n" +"POT-Creation-Date: 2010-10-18 17:46+0000\n" +"PO-Revision-Date: 2010-10-26 08:24+0000\n" "Last-Translator: OpenERP Administrators <Unknown>\n" "Language-Team: Serbian <sr@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n" +"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: analytic @@ -23,14 +23,6 @@ msgid "Child Accounts" msgstr "Podređeni Nalozi" #. 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 "" -"Vrednost izrazena u datom iznosu valute ako nije jednaka valuti preduzeca" - -#. module: analytic #: constraint:ir.model:0 msgid "" "The Object name must start with x_ and not contain any special character !" @@ -40,7 +32,7 @@ msgstr "" #. module: analytic #: field:account.analytic.account,name:0 msgid "Account Name" -msgstr "Naziv računa" +msgstr "Naziv Naloga" #. module: analytic #: help:account.analytic.line,unit_amount:0 @@ -48,11 +40,6 @@ msgid "Specifies the amount of quantity to count." msgstr "Specificira koju kolicinu iznosa da broji" #. module: analytic -#: help:account.analytic.line,currency_id:0 -msgid "The related account currency if not equal to the company one." -msgstr "Dati iznos valute ako nije jednaka valuti preduzeca" - -#. module: analytic #: model:ir.module.module,description:analytic.module_meta_information msgid "" "Module for defining analytic accounting object.\n" @@ -87,40 +74,6 @@ msgid "Debit" msgstr "Duguje" #. 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 "" -"*Kada je neka faktura kreirana a nalazi se u ' U Toku'. " -" \n" -"*Ako je bilo koji asocirani partner tamo, on mora biti u stanju ' Otvoren'. " -" \n" -"*Ako je bilo koji Saldo u stanju 'U izvrsenju' on mora i biti tamo. " -" " -"\n" -"*I , na kraju kada su sve transakcije gotove, mora se naci u stanju ' " -"Zatvoreno'. " -" \n" -" Ako je ovo shema(obrazac) onda mi mozemo napraviri projekat baziran na " -"istom. Ako je u stanju ' U izvrsenju' to je normalnan\n" -"projekat.\n" -" Ako zelimo da ga pregledamo, stanje mora biti ' U Toku'.\n" -" Kada je projekat zavrsen stanje je postavljeno na ' Zavrseno'." - -#. module: analytic #: field:account.analytic.account,type:0 msgid "Account Type" msgstr "Vrsta konta" @@ -147,12 +100,9 @@ msgid "Description" msgstr "Opis" #. 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 "" -"Izracunato mnozenjem kolicine i cene dobijene iz Proizvodove cene kostanja" +#: selection:account.analytic.account,type:0 +msgid "Normal" +msgstr "Normalan" #. module: analytic #: field:account.analytic.account,company_id:0 @@ -182,14 +132,23 @@ msgstr "Datum" #. module: analytic #: field:account.analytic.account,currency_id:0 -#: field:account.analytic.line,currency_id:0 msgid "Account currency" msgstr "Valuta Naloga" #. module: analytic -#: selection:account.analytic.account,type:0 -msgid "View" -msgstr "Pregled" +#: field:account.analytic.account,quantity:0 +#: field:account.analytic.line,unit_amount:0 +msgid "Quantity" +msgstr "Količina" + +#. module: analytic +#: help:account.analytic.line,amount:0 +msgid "" +"Calculated by multiplying the quantity and the price given in the Product's " +"cost price. Always expressed in the company main currency." +msgstr "" +"Izracunato mnozenjem kolicine i cene date u proizvodovom cenovniku. Uvek " +"prikazano u osnovnoj valuti preduzeca." #. module: analytic #: help:account.analytic.account,quantity_max:0 @@ -222,15 +181,13 @@ msgid "Balance" msgstr "Saldo" #. module: analytic -#: field:account.analytic.account,date_start:0 -msgid "Date Start" -msgstr "Početni datum" - -#. module: analytic -#: field:account.analytic.account,quantity:0 -#: field:account.analytic.line,unit_amount:0 -msgid "Quantity" -msgstr "Količina" +#: help:account.analytic.account,type:0 +msgid "" +"If you select the View Type, it means you won't allow to create journal " +"entries using that account." +msgstr "" +"Ukoliko izaberete PREGLED, to znaci da ne zelite da kreirate sadrzaj " +"dnevnika, koristeci taj nalog." #. module: analytic #: field:account.analytic.account,date:0 @@ -238,16 +195,16 @@ msgid "Date End" msgstr "Završni datum" #. module: analytic +#: constraint:ir.rule:0 +msgid "Rules are not supported for osv_memory objects !" +msgstr "Pravila nisu podrzana od strane osv_memory objekata !" + +#. module: analytic #: field:account.analytic.account,code:0 msgid "Account Code" msgstr "Sifra Naloga" #. module: analytic -#: selection:account.analytic.account,type:0 -msgid "Normal" -msgstr "Normalan" - -#. module: analytic #: field:account.analytic.account,complete_name:0 msgid "Full Account Name" msgstr "Puni naziv konta" @@ -260,19 +217,19 @@ msgid "Analytic Account" msgstr "Analitički konto" #. module: analytic -#: field:account.analytic.account,company_currency_id:0 -msgid "Currency" -msgstr "Valuta" +#: selection:account.analytic.account,type:0 +msgid "View" +msgstr "Pregled" #. module: analytic -#: field:account.analytic.line,amount_currency:0 -msgid "Amount currency" -msgstr "Iznos valute" +#: field:account.analytic.account,partner_id:0 +msgid "Partner" +msgstr "Partner" #. module: analytic -#: field:account.analytic.account,partner_id:0 -msgid "Associated Partner" -msgstr "Povezani partner" +#: field:account.analytic.account,date_start:0 +msgid "Date Start" +msgstr "Početni datum" #. module: analytic #: selection:account.analytic.account,state:0 @@ -283,3 +240,59 @@ msgstr "Otvori" #: field:account.analytic.account,line_ids:0 msgid "Analytic Entries" msgstr "Analitičke stavke" + +#~ msgid "" +#~ "The amount expressed in the related account currency if not equal to the " +#~ "company one." +#~ msgstr "" +#~ "Vrednost izrazena u datom iznosu valute ako nije jednaka valuti preduzeca" + +#~ msgid "The related account currency if not equal to the company one." +#~ msgstr "Dati iznos valute ako nije jednaka valuti preduzeca" + +#~ 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 "" +#~ "*Kada je neka faktura kreirana a nalazi se u ' U Toku'. " +#~ " \n" +#~ "*Ako je bilo koji asocirani partner tamo, on mora biti u stanju ' Otvoren'. " +#~ " \n" +#~ "*Ako je bilo koji Saldo u stanju 'U izvrsenju' on mora i biti tamo. " +#~ " " +#~ "\n" +#~ "*I , na kraju kada su sve transakcije gotove, mora se naci u stanju ' " +#~ "Zatvoreno'. " +#~ " \n" +#~ " Ako je ovo shema(obrazac) onda mi mozemo napraviri projekat baziran na " +#~ "istom. Ako je u stanju ' U izvrsenju' to je normalnan\n" +#~ "projekat.\n" +#~ " Ako zelimo da ga pregledamo, stanje mora biti ' U Toku'.\n" +#~ " Kada je projekat zavrsen stanje je postavljeno na ' Zavrseno'." + +#~ msgid "" +#~ "Calculated by multiplying the quantity and the price given in the Product's " +#~ "cost price." +#~ msgstr "" +#~ "Izracunato mnozenjem kolicine i cene dobijene iz Proizvodove cene kostanja" + +#~ msgid "Currency" +#~ msgstr "Valuta" + +#~ msgid "Associated Partner" +#~ msgstr "Povezani partner" + +#~ msgid "Amount currency" +#~ msgstr "Iznos valute" diff --git a/addons/analytic_journal_billing_rate/i18n/sr.po b/addons/analytic_journal_billing_rate/i18n/sr.po index cad00d3772c..3d45e16db2b 100644 --- a/addons/analytic_journal_billing_rate/i18n/sr.po +++ b/addons/analytic_journal_billing_rate/i18n/sr.po @@ -7,14 +7,14 @@ msgid "" msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" -"POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-10-15 09:19+0000\n" -"Last-Translator: OpenERP Administrators <Unknown>\n" +"POT-Creation-Date: 2010-10-18 17:46+0000\n" +"PO-Revision-Date: 2010-10-26 11:45+0000\n" +"Last-Translator: zmmaj <Unknown>\n" "Language-Team: Serbian <sr@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n" +"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: analytic_journal_billing_rate @@ -41,6 +41,7 @@ msgstr "Stepen naplate po Dnevniku za ovaj Analiticki Konto" #. module: analytic_journal_billing_rate #: field:analytic_journal_rate_grid,account_id:0 +#: model:ir.model,name:analytic_journal_billing_rate.model_account_analytic_account msgid "Analytic Account" msgstr "Analitički konto" @@ -56,10 +57,27 @@ msgstr "Stepen fakturiranja po Dnevniku" #. module: analytic_journal_billing_rate #: model:ir.module.module,shortdesc:analytic_journal_billing_rate.module_meta_information -msgid "Analytic Journal Billing Rate" -msgstr "Analiticki Dnevnik obracunate cene" +msgid "" +"Analytic Journal Billing Rate, Define the default invoicing rate for a " +"specific journal" +msgstr "" +"Analiticki Dnevnik Obracunate rate, definise podrazumevanu fakturnu vrednost " +"za specificni dnevnik" + +#. module: analytic_journal_billing_rate +#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice +msgid "Invoice" +msgstr "Faktura" #. module: analytic_journal_billing_rate #: field:analytic_journal_rate_grid,rate_id:0 msgid "Invoicing Rate" msgstr "Fakturisanje cene" + +#. module: analytic_journal_billing_rate +#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet +msgid "Timesheet Line" +msgstr "Timesheet Linija" + +#~ msgid "Analytic Journal Billing Rate" +#~ msgstr "Analiticki Dnevnik obracunate cene" diff --git a/addons/analytic_user_function/i18n/sr.po b/addons/analytic_user_function/i18n/sr.po index 846409dd53d..1344e26bd8b 100644 --- a/addons/analytic_user_function/i18n/sr.po +++ b/addons/analytic_user_function/i18n/sr.po @@ -7,14 +7,14 @@ msgid "" msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" -"POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-10-15 09:40+0000\n" -"Last-Translator: OpenERP Administrators <Unknown>\n" +"POT-Creation-Date: 2010-10-18 17:46+0000\n" +"PO-Revision-Date: 2010-10-26 07:36+0000\n" +"Last-Translator: zmmaj <Unknown>\n" "Language-Team: Serbian <sr@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n" +"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: analytic_user_function @@ -23,9 +23,22 @@ msgid "Invalid XML for View Architecture!" msgstr "Nevažeći XML za pregled arhitekture" #. module: analytic_user_function -#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid -msgid "Relation table between users and products on a analytic account" -msgstr "Relaciona tabela izmedju korisnika i proizvoda u analitickom kontu" +#: code:addons/analytic_user_function/analytic_user_function.py:0 +#, python-format +msgid "Error !" +msgstr "Greška !" + +#. module: analytic_user_function +#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet +msgid "Timesheet Line" +msgstr "Niz Kontrolne kartice" + +#. module: analytic_user_function +#: constraint:ir.model:0 +msgid "" +"The Object name must start with x_ and not contain any special character !" +msgstr "" +"Ime objekta mora da počinje sa x_ i ne sme da sadrži specijalne karaktere !" #. module: analytic_user_function #: field:analytic_user_funct_grid,product_id:0 @@ -34,10 +47,20 @@ msgstr "Proizvod" #. module: analytic_user_function #: field:analytic_user_funct_grid,account_id:0 +#: model:ir.model,name:analytic_user_function.model_account_analytic_account msgid "Analytic Account" msgstr "Analitički konto" #. module: analytic_user_function +#: code:addons/analytic_user_function/analytic_user_function.py:0 +#, python-format +msgid "" +"There is no expense account define ' \\n " +"'for this product: \"%s\" (id:%d)" +msgstr "" +"Nisu definisani troskovi naloga '\\n' za ovaj proizvod \"%s\" (sifra:%d)" + +#. module: analytic_user_function #: view:account.analytic.account:0 #: field:account.analytic.account,user_product_ids:0 msgid "Users/Products Rel." @@ -49,11 +72,9 @@ msgid "User" msgstr "Korisnik" #. module: analytic_user_function -#: constraint:ir.model:0 -msgid "" -"The Object name must start with x_ and not contain any special character !" -msgstr "" -"Ime objekta mora da počinje sa x_ i ne sme da sadrži specijalne karaktere !" +#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid +msgid "Relation table between users and products on a analytic account" +msgstr "Relaciona tabela izmedju korisnika i proizvoda u analitickom kontu" #. module: analytic_user_function #: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information @@ -61,6 +82,15 @@ msgid "Analytic User Function" msgstr "Korisnicka Funkcija Analitike" #. module: analytic_user_function +#: code:addons/analytic_user_function/analytic_user_function.py:0 +#, python-format +msgid "" +"There is no expense account define ' \\n 'for " +"this product: \"%s\" (id:%d)" +msgstr "" +"Nisu definisani troskovi naloga '\\n' za ovaj proizvod \"%s\" (sifra:%d)" + +#. module: analytic_user_function #: view:analytic_user_funct_grid:0 msgid "User's Product for this Analytic Account" msgstr "Korisnicki Proizvod za ovaj Analiticki Konto" diff --git a/addons/auction/i18n/sr.po b/addons/auction/i18n/sr.po new file mode 100644 index 00000000000..68852dbd188 --- /dev/null +++ b/addons/auction/i18n/sr.po @@ -0,0 +1,2282 @@ +# Serbian 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 <EMAIL@ADDRESS>, 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2010-10-18 17:46+0000\n" +"PO-Revision-Date: 2010-10-26 14:42+0000\n" +"Last-Translator: zmmaj <Unknown>\n" +"Language-Team: Serbian <sr@li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n" +"X-Generator: Launchpad (build Unknown)\n" + +#. module: auction +#: model:ir.ui.menu,name:auction.auction_report_menu +msgid "Reporting" +msgstr "Izvestavanje" + +#. module: auction +#: model:ir.model,name:auction.model_auction_taken +msgid "Auction taken" +msgstr "Aukcija zahvata" + +#. module: auction +#: view:auction.lots:0 +msgid "Set to draft" +msgstr "Posalji na priporemu" + +#. module: auction +#: view:auction.deposit:0 +#: field:auction.deposit,partner_id:0 +#: field:auction.lots,seller_id:0 +#: view:report.auction:0 +#: field:report.auction,seller:0 +msgid "Seller" +msgstr "Prodavac" + +#. module: auction +#: constraint:ir.actions.act_window:0 +msgid "Invalid model name in the action definition." +msgstr "Neispravno ime modula u definiciji akcije." + +#. module: auction +#: field:auction.lots,name:0 +msgid "Title" +msgstr "Naslov" + +#. module: auction +#: field:auction.lots.sms.send,text:0 +msgid "SMS Message" +msgstr "SMS Poruka" + +#. module: auction +#: view:auction.catalog.flagey:0 +#: view:auction.lots.auction.move:0 +#: view:auction.lots.make.invoice.buyer:0 +msgid " " +msgstr " " + +#. module: auction +#: view:auction.lots.auction.move:0 +msgid "Warning, Erase The Object Adjudication Price and Its Buyer!" +msgstr "Upozorenje, Brisanje objekta cene i kupca !" + +#. module: auction +#: help:auction.pay.buy,statement_id1:0 +msgid "First Bank Statement For Buyer" +msgstr "Prva Bancina Stavka za Kupca" + +#. module: auction +#: field:auction.bid_line,lot_id:0 +#: field:auction.lot.history,lot_id:0 +msgid "Object" +msgstr "Objekt" + +#. module: auction +#: field:report.auction.object.date,obj_num:0 +msgid "# of Objects" +msgstr "# Objekata" + +#. module: auction +#: view:auction.lots:0 +msgid "Authors" +msgstr "Autori" + +#. module: auction +#: view:auction.bid:0 +#: report:auction.bids:0 +#: view:auction.lots:0 +#: field:auction.lots,ach_uid:0 +#: field:auction.lots.buyer_map,ach_uid:0 +#: field:auction.lots.make.invoice.buyer,buyer_id:0 +#: field:auction.pay.buy,buyer_id:0 +#: report:buyer.list:0 +#: view:report.auction:0 +#: field:report.auction,buyer:0 +#: report:report.auction.buyer.result:0 +msgid "Buyer" +msgstr "Kupac" + +#. module: auction +#: field:report.auction,object:0 +msgid "No of objects" +msgstr "Br.Objekata" + +#. module: auction +#: help:auction.lots,paid_vnd:0 +msgid "" +"When state of Seller Invoice is 'Paid', this field is selected as True." +msgstr "" +"Kada je stanje Prodajne Fakture \"Placeno\", ovo je polje selektovano." + +#. module: auction +#: report:auction.total.rml:0 +msgid "# of paid items (based on invoices):" +msgstr "# placenih stavki ( bazirano na fakturama)" + +#. module: auction +#: view:auction.deposit:0 +msgid "Deposit Border" +msgstr "Granice Depozita" + +#. module: auction +#: field:auction.lots.make.invoice,amount:0 +#: field:auction.lots.make.invoice.buyer,amount:0 +msgid "Invoiced Amount" +msgstr "Iznos Fakture" + +#. module: auction +#: help:auction.lots,name:0 +msgid "Auction object name" +msgstr "Naziv Objekta Aukcije" + +#. module: auction +#: model:ir.model,name:auction.model_aie_category +msgid "aie.category" +msgstr "aie.category" + +#. module: auction +#: field:auction.deposit.cost,amount:0 +#: field:auction.pay.buy,amount:0 +#: field:auction.pay.buy,amount2:0 +#: field:auction.pay.buy,amount3:0 +msgid "Amount" +msgstr "Iznos" + +#. module: auction +#: model:ir.actions.act_window,name:auction.action_deposit_border +#: model:ir.ui.menu,name:auction.menu_auction_deposit_border +msgid "Deposit border" +msgstr "Granica Depozita" + +#. module: auction +#: view:auction.deposit:0 +msgid "Reference" +msgstr "Referenca" + +#. module: auction +#: help:auction.dates,state:0 +msgid "" +"When auction starts the state is 'Draft'.\n" +" At the end of auction, the state becomes 'Closed'." +msgstr "" +"Kada Aukcija startuje stanje je 'U Pripremi'.\n" +" Kada se aukcija zavrsi, stanje postaje ' Zatvoreno'." + +#. module: auction +#: field:auction.dates,account_analytic_id:0 +msgid "Analytic Account" +msgstr "Analiticki Konto" + +#. module: auction +#: help:auction.pay.buy,amount3:0 +msgid "Amount For Third Bank Statement" +msgstr "Iznos izvestaja trece Banke" + +#. module: auction +#: field:auction.lots,lot_num:0 +msgid "List Number" +msgstr "Broj Liste" + +#. module: auction +#: report:buyer.list:0 +msgid "Date:" +msgstr "Datum:" + +#. module: auction +#: field:auction.deposit.cost,name:0 +msgid "Cost Name" +msgstr "" + +#. module: auction +#: view:auction.dates:0 +#: field:auction.dates,state:0 +#: view:auction.lots:0 +#: field:auction.lots,state:0 +#: view:report.auction:0 +#: field:report.auction,state:0 +msgid "State" +msgstr "Stanje" + +#. module: auction +#: view:auction.dates:0 +msgid "First Auction Date" +msgstr "Datum prve Akukcije" + +#. module: auction +#: selection:report.auction,month:0 +msgid "January" +msgstr "Januar" + +#. module: auction +#: view:auction.lots:0 +msgid "Ref" +msgstr "Ref" + +#. module: auction +#: field:report.auction,total_price:0 +msgid "Total Price" +msgstr "Ukupna Cena" + +#. module: auction +#: constraint:hr.attendance:0 +msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)" +msgstr "" +"Greska: Prijava ((resp. Sign out) mora da prati Odjavu (resp. Sign in)" + +#. module: auction +#: view:auction.lots:0 +msgid "Total Adj." +msgstr "" + +#. module: auction +#: view:auction.lots.sms.send:0 +msgid "SMS - Gateway: clickatell','Bulk SMS send" +msgstr "SMS - Gateway: clickatell','Bulk SMS send" + +#. module: auction +#: help:auction.lots,costs:0 +msgid "Deposit cost" +msgstr "Iznos Depozita" + +#. module: auction +#: selection:auction.lots,state:0 +#: selection:report.auction,state:0 +#: selection:report.object.encoded,state:0 +msgid "Unsold" +msgstr "Ne Prodato" + +#. module: auction +#: view:auction.deposit:0 +msgid "Search Auction deposit" +msgstr "Pretrazi Aukcioni Depozit" + +#. module: auction +#: help:auction.lots,lot_num:0 +msgid "List number in depositer inventory" +msgstr "" + +#. module: auction +#: constraint:product.template:0 +msgid "Error: UOS must be in a different category than the UOM" +msgstr "" + +#. module: auction +#: report:auction.total.rml:0 +msgid "Items" +msgstr "Artikli" + +#. module: auction +#: model:account.tax,name:auction.auction_tax5 +#: field:auction.dates,seller_costs:0 +msgid "Seller Costs" +msgstr "Prodajna Cena" + +#. module: auction +#: view:auction.bid:0 +#: view:auction.bid_line:0 +#: view:auction.lots:0 +#: field:auction.lots,bid_lines:0 +#: model:ir.actions.report.xml,name:auction.bid_auction +#: model:ir.ui.menu,name:auction.menu_action_bid_open +msgid "Bids" +msgstr "Ponude" + +#. module: auction +#: view:auction.lots.buyer_map:0 +msgid "Buyer Map" +msgstr "Mapa Kupca" + +#. module: auction +#: field:report.object.encoded,obj_ret:0 +msgid "# obj ret" +msgstr "" + +#. module: auction +#: model:ir.model,name:auction.model_auction_bid +msgid "Bid Auctions" +msgstr "Ponude Aukcije" + +#. module: auction +#: help:auction.lots,image:0 +msgid "Object Image" +msgstr "Slika Objekta" + +#. module: auction +#: code:addons/auction/auction.py:0 +#, python-format +msgid "The Buyer \"%s\" has no Invoice Address." +msgstr "Kupac \"%s\" nema Adresu Fakture" + +#. module: auction +#: view:auction.dates:0 +msgid "Commissions" +msgstr "Komisije" + +#. module: auction +#: model:ir.model,name:auction.model_auction_deposit_cost +msgid "Auction Deposit Cost" +msgstr "Cena Aukcionog Depozita" + +#. module: auction +#: view:auction.deposit:0 +msgid "Deposit Border Form" +msgstr "Forma Granice depozita" + +#. module: auction +#: help:auction.lots,statement_id:0 +msgid "Bank statement line for given buyer" +msgstr "Bancin IZvestaj za datog kupca" + +#. module: auction +#: field:auction.lot.category,aie_categ:0 +msgid "Category" +msgstr "Kategorija" + +#. module: auction +#: help:auction.lot.category,active:0 +msgid "" +"If the active field is set to true, it will allow you to hide the auction " +"lot category without removing it." +msgstr "" + +#. module: auction +#: model:ir.actions.act_window,name:auction.action_view_auction_buyer_map +msgid "Map buyer username to Partners" +msgstr "" + +#. module: auction +#: view:auction.lots:0 +msgid "Search Auction Lots" +msgstr "" + +#. module: auction +#: field:report.auction,net_revenue:0 +msgid "Net Revenue" +msgstr "" + +#. module: auction +#: field:report.auction.adjudication,state:0 +#: field:report.object.encoded,state:0 +msgid "Status" +msgstr "" + +#. module: auction +#: model:ir.actions.act_window,name:auction.action_auction_lots_sms_send +msgid "SMS Send" +msgstr "" + +#. module: auction +#: selection:report.auction,month:0 +msgid "August" +msgstr "" + +#. module: auction +#: view:auction.lots:0 +#: selection:auction.lots,state:0 +#: view:report.auction:0 +#: selection:report.auction,state:0 +msgid "Sold" +msgstr "" + +#. module: auction +#: selection:report.auction,month:0 +msgid "June" +msgstr "" + +#. module: auction +#: constraint:hr.employee:0 +msgid "Error ! You cannot create recursive Hierarchy of Employees." +msgstr "" + +#. module: auction +#: selection:report.auction,month:0 +msgid "October" +msgstr "" + +#. module: auction +#: field:auction.bid_line,name:0 +msgid "Bid date" +msgstr "" + +#. module: auction +#: field:auction.dates,acc_expense:0 +msgid "Expense Account" +msgstr "" + +#. module: auction +#: model:ir.ui.menu,name:auction.menu_wizard_emporte +msgid "Deliveries Management" +msgstr "" + +#. module: auction +#: field:auction.lots,obj_desc:0 +msgid "Object Description" +msgstr "" + +#. module: auction +#: field:auction.lots,artist2_id:0 +msgid "Artist/Author2" +msgstr "" + +#. module: auction +#: view:auction.pay.buy:0 +msgid "Line1" +msgstr "" + +#. module: auction +#: model:ir.model,name:auction.model_auction_lots_make_invoice_buyer +msgid "Make Invoice for Buyer" +msgstr "" + +#. module: auction +#: code:addons/auction/wizard/auction_lots_invoice.py:0 +#, python-format +msgid "" +"Two different buyers for the same invoice !\n" +"Please correct this problem before invoicing" +msgstr "" + +#. module: auction +#: field:auction.lots,gross_revenue:0 +#: field:report.object.encoded,gross_revenue:0 +msgid "Gross revenue" +msgstr "" + +#. module: auction +#: model:ir.actions.act_window,name:auction.action_auction_pay_buy +msgid "Pay objects of the buyer" +msgstr "" + +#. module: auction +#: help:auction.dates,auction2:0 +msgid "End date of auction" +msgstr "" + +#. module: auction +#: view:auction.lots.sms.send:0 +msgid "Send SMS" +msgstr "" + +#. module: auction +#: field:auction.lots,name2:0 +msgid "Short Description (2)" +msgstr "" + +#. module: auction +#: report:auction.total.rml:0 +#: model:ir.ui.menu,name:auction.auction_buyers_menu +msgid "Buyers" +msgstr "" + +#. module: auction +#: model:account.tax.code,name:auction.account_tax_code_id4 +msgid "VAT 12%" +msgstr "" + +#. module: auction +#: view:auction.dates:0 +msgid "Buyer Invoices" +msgstr "" + +#. module: auction +#: model:ir.actions.report.xml,name:auction.res_w_buyer +msgid "Results with buyer" +msgstr "" + +#. module: auction +#: field:auction.bid_line,price:0 +msgid "Maximum Price" +msgstr "" + +#. module: auction +#: help:auction.dates,auction1:0 +msgid "Start date of auction" +msgstr "" + +#. module: auction +#: model:ir.model,name:auction.model_auction_lots_auction_move +msgid "Auction Move" +msgstr "" + +#. module: auction +#: help:auction.dates,buyer_costs:0 +msgid "Account tax for buyer" +msgstr "" + +#. module: auction +#: view:auction.dates:0 +msgid "Next Auction" +msgstr "" + +#. module: auction +#: view:auction.taken:0 +msgid "Select lots which are Sold" +msgstr "" + +#. module: auction +#: field:auction.lots,statement_id:0 +msgid "Payment" +msgstr "" + +#. module: auction +#: code:addons/auction/auction.py:0 +#, python-format +msgid "The object \"%s\" has no buyer assigned." +msgstr "" + +#. module: auction +#: selection:auction.deposit,method:0 +msgid "Keep until sold" +msgstr "" + +#. module: auction +#: view:auction.dates:0 +msgid "Last Auction Date" +msgstr "" + +#. module: auction +#: field:report.object.encoded,obj_num:0 +msgid "# of Encoded obj." +msgstr "" + +#. module: auction +#: field:auction.lots,paid_vnd:0 +msgid "Seller Paid" +msgstr "" + +#. module: auction +#: view:board.board:0 +#: view:report.object.encoded:0 +msgid "Objects statistics" +msgstr "" + +#. module: auction +#: report:auction.total.rml:0 +msgid "# of sellers:" +msgstr "" + +#. module: auction +#: field:report.auction,date:0 +#: field:report.object.encoded,date:0 +msgid "Create Date" +msgstr "" + +#. module: auction +#: view:auction.dates:0 +#: selection:report.object.encoded,state:0 +msgid "Invoiced" +msgstr "" + +#. module: auction +#: report:auction.total.rml:0 +msgid "# of items taken away:" +msgstr "" + +#. module: auction +#: model:ir.model,name:auction.model_report_auction +#: view:report.auction:0 +msgid "Auction's Summary" +msgstr "" + +#. module: auction +#: report:buyer.list:0 +msgid "%)" +msgstr "" + +#. module: auction +#: view:auction.lots:0 +msgid "Buyer Information" +msgstr "" + +#. module: auction +#: help:auction.lots,gross_revenue:0 +msgid "Buyer Price - Seller Price" +msgstr "" + +#. module: auction +#: field:auction.lots.make.invoice,objects:0 +#: field:auction.lots.make.invoice.buyer,objects:0 +msgid "# of objects" +msgstr "" + +#. module: auction +#: field:auction.lots,lot_est2:0 +msgid "Maximum Estimation" +msgstr "" + +#. module: auction +#: field:auction.lots,buyer_price:0 +msgid "Buyer price" +msgstr "" + +#. module: auction +#: view:auction.lots:0 +msgid "Bids Details" +msgstr "" + +#. module: auction +#: field:auction.lots,is_ok:0 +msgid "Buyer's payment" +msgstr "" + +#. module: auction +#: view:auction.dates:0 +msgid "End of auction" +msgstr "" + +#. module: auction +#: model:ir.actions.act_window,name:auction.action_auction_catalog_flagey_wizard +#: model:ir.model,name:auction.model_auction_catalog_flagey +msgid "Auction Catalog Flagey" +msgstr "" + +#. module: auction +#: selection:report.auction,month:0 +msgid "March" +msgstr "" + +#. module: auction +#: model:account.tax,name:auction.auction_tax4 +msgid "Seller Costs1" +msgstr "" + +#. module: auction +#: field:auction.deposit,create_uid:0 +#: field:auction.lots,create_uid:0 +msgid "Created by" +msgstr "" + +#. module: auction +#: report:auction.total.rml:0 +msgid "# of buyers:" +msgstr "" + +#. module: auction +#: field:auction.lots,costs:0 +msgid "Indirect costs" +msgstr "" + +#. module: auction +#: help:auction.dates,seller_costs:0 +msgid "Account tax for seller" +msgstr "" + +#. module: auction +#: code:addons/auction/wizard/auction_lots_invoice.py:0 +#, python-format +msgid "UserError" +msgstr "" + +#. module: auction +#: constraint:account.account:0 +#: constraint:account.tax.code:0 +msgid "Error ! You can not create recursive accounts." +msgstr "" + +#. module: auction +#: model:ir.module.module,shortdesc:auction.module_meta_information +msgid "Auction Management" +msgstr "" + +#. module: auction +#: field:auction.dates,journal_seller_id:0 +msgid "Seller Journal" +msgstr "" + +#. module: auction +#: view:auction.dates:0 +#: selection:auction.dates,state:0 +#: view:auction.lots:0 +#: selection:auction.lots,state:0 +#: view:report.auction:0 +#: selection:report.auction,state:0 +#: selection:report.auction.adjudication,state:0 +#: selection:report.object.encoded,state:0 +msgid "Draft" +msgstr "" + +#. module: auction +#: help:auction.lots,state:0 +msgid "" +" * The 'Draft' state is used when a object is encoding as a new object. " +" \n" +"* The 'Unsold' state is used when object does not sold for long time, user " +"can also set it as draft state after unsold. \n" +"* The 'Paid' state is used when user pay for the object \n" +"* The 'Sold' state is used when user buy the object." +msgstr "" + +#. module: auction +#: view:auction.catalog.flagey:0 +msgid "Print" +msgstr "" + +#. module: auction +#: view:auction.lots:0 +#: view:report.auction:0 +msgid "Type" +msgstr "" + +#. module: auction +#: help:auction.lots,ach_emp:0 +msgid "When state is Taken Away, this field is marked as True" +msgstr "" + +#. module: auction +#: model:ir.actions.act_window,name:auction.action_auction_taken +msgid "Gestion emporte" +msgstr "" + +#. module: auction +#: view:auction.bid:0 +#: report:auction.bids:0 +#: view:auction.dates:0 +#: view:auction.lots:0 +#: field:auction.lots,auction_id:0 +#: report:auction.total.rml:0 +#: model:ir.ui.menu,name:auction.auction_menu_root +#: view:report.auction:0 +msgid "Auction" +msgstr "" + +#. module: auction +#: view:auction.lot.category:0 +#: model:ir.ui.menu,name:auction.menu_auction_object_cat +msgid "Object Categories" +msgstr "" + +#. module: auction +#: constraint:ir.ui.view:0 +msgid "Invalid XML for View Architecture!" +msgstr "" + +#. module: auction +#: field:auction.lots.sms.send,app_id:0 +msgid "API ID" +msgstr "" + +#. module: auction +#: field:auction.bid,name:0 +#: field:auction.bid_line,bid_id:0 +msgid "Bid ID" +msgstr "" + +#. module: auction +#: report:auction.total.rml:0 +msgid "Min Estimate:" +msgstr "" + +#. module: auction +#: selection:report.auction,month:0 +msgid "September" +msgstr "" + +#. module: auction +#: field:report.auction,net_margin:0 +msgid "Net Margin" +msgstr "" + +#. module: auction +#: field:auction.lots,vnd_lim_net:0 +msgid "Net limit ?" +msgstr "" + +#. module: auction +#: report:auction.total.rml:0 +msgid "# of commissions:" +msgstr "" + +#. module: auction +#: field:auction.bid_line,auction:0 +#: field:auction.dates,name:0 +msgid "Auction Name" +msgstr "" + +#. module: auction +#: model:account.tax,name:auction.tax_seller +msgid "Seller Costs (12%)" +msgstr "" + +#. module: auction +#: field:aie.category,parent_id:0 +msgid "Parent aie Category" +msgstr "" + +#. module: auction +#: view:report.auction:0 +msgid "Auction Summary" +msgstr "" + +#. module: auction +#: view:auction.lots.make.invoice:0 +#: view:auction.lots.make.invoice.buyer:0 +msgid "(Keep empty for automatic number)" +msgstr "" + +#. module: auction +#: code:addons/auction/auction.py:0 +#, python-format +msgid "No Invoice Address" +msgstr "" + +#. module: auction +#: model:ir.actions.report.xml,name:auction.v_huissier +msgid "Bailiffs Listing" +msgstr "" + +#. module: auction +#: field:aie.category,child_ids:0 +msgid "unknown" +msgstr "" + +#. module: auction +#: field:auction.pay.buy,total:0 +msgid "Total Amount" +msgstr "" + +#. module: auction +#: help:auction.pay.buy,amount:0 +msgid "Amount For First Bank Statement" +msgstr "" + +#. module: auction +#: model:ir.model,name:auction.model_report_auction_object_date +#: view:report.auction.object.date:0 +msgid "Objects per day" +msgstr "" + +#. module: auction +#: help:auction.lots,author_right:0 +msgid "Account tax for author commission" +msgstr "" + +#. module: auction +#: model:product.template,name:auction.monproduit_product_template +msgid "Oeuvres a 21%" +msgstr "" + +#. module: auction +#: field:report.object.encoded,adj:0 +msgid "Adj." +msgstr "" + +#. module: auction +#: field:auction.lot.history,name:0 +#: field:report.auction.adjudication,date:0 +msgid "Date" +msgstr "" + +#. module: auction +#: field:auction.lots,obj_ret:0 +msgid "Price retired" +msgstr "" + +#. module: auction +#: view:auction.deposit:0 +msgid "Extra Costs" +msgstr "" + +#. module: auction +#: view:auction.lots.buyer_map:0 +msgid "Map " +msgstr "" + +#. module: auction +#: field:auction.lots,paid_ach:0 +msgid "Buyer Invoice Reconciled" +msgstr "" + +#. module: auction +#: field:auction.deposit,date_dep:0 +msgid "Deposit date" +msgstr "" + +#. module: auction +#: model:ir.actions.report.xml,name:auction.id_deposit +msgid "Deposits" +msgstr "" + +#. module: auction +#: field:auction.deposit,specific_cost_ids:0 +msgid "Specific Costs" +msgstr "" + +#. module: auction +#: report:buyer.list:0 +msgid "To pay (" +msgstr "" + +#. module: auction +#: model:account.tax,name:auction.tax_buyer +msgid "Buyer Costs (20%)" +msgstr "" + +#. module: auction +#: model:ir.ui.menu,name:auction.menu_board_auction +msgid "Dashboard" +msgstr "" + +#. module: auction +#: view:auction.dates:0 +#: model:ir.actions.act_window,name:auction.action_auction_dates_next +#: model:ir.ui.menu,name:auction.auction_date_menu +#: model:ir.ui.menu,name:auction.menu_auction_dates_next1 +msgid "Auctions" +msgstr "" + +#. module: auction +#: view:board.board:0 +msgid "Total Adjudications" +msgstr "" + +#. module: auction +#: model:ir.model,name:auction.model_auction_lots_make_invoice +msgid "Make invoice" +msgstr "" + +#. module: auction +#: selection:report.auction,month:0 +msgid "November" +msgstr "" + +#. module: auction +#: view:auction.dates:0 +#: view:auction.lots:0 +msgid "History" +msgstr "" + +#. module: auction +#: field:aie.category,code:0 +msgid "Code" +msgstr "" + +#. module: auction +#: report:auction.code_bar_lot:0 +msgid "Nr." +msgstr "" + +#. module: auction +#: model:ir.actions.report.xml,name:auction.v_report_barcode_lot +msgid "Barcode batch" +msgstr "" + +#. module: auction +#: report:report.auction.buyer.result:0 +msgid "Num" +msgstr "" + +#. module: auction +#: view:auction.catalog.flagey:0 +msgid "Cancel" +msgstr "" + +#. module: auction +#: view:auction.lots:0 +msgid "Buyer's Payment History" +msgstr "" + +#. module: auction +#: view:auction.artists:0 +#: field:auction.artists,biography:0 +msgid "Biography" +msgstr "" + +#. module: auction +#: view:auction.lots:0 +msgid "Inventory" +msgstr "" + +#. module: auction +#: view:auction.pay.buy:0 +msgid "Pay" +msgstr "" + +#. module: auction +#: view:auction.lots.make.invoice:0 +msgid "Create Invoices For Seller" +msgstr "" + +#. module: auction +#: field:report.object.encoded,obj_margin:0 +msgid "Net margin" +msgstr "" + +#. module: auction +#: help:auction.lots,lot_local:0 +msgid "Auction Location" +msgstr "" + +#. module: auction +#: view:auction.dates:0 +msgid "Analytic" +msgstr "" + +#. module: auction +#: help:auction.lots,paid_ach:0 +msgid "" +"When state of Buyer Invoice is 'Paid', this field is selected as True." +msgstr "" + +#. module: auction +#: report:bids.lots:0 +#: report:bids.phones.details:0 +msgid "Cat.N" +msgstr "" + +#. module: auction +#: selection:auction.deposit,method:0 +msgid "Decrease limit of 10%" +msgstr "" + +#. module: auction +#: field:auction.dates,adj_total:0 +#: field:report.auction.adjudication,adj_total:0 +msgid "Total Adjudication" +msgstr "" + +#. module: auction +#: model:ir.actions.act_window,name:auction.action_auction_lots_make_invoice_buyer +msgid "Invoice Buyer objects" +msgstr "" + +#. module: auction +#: view:report.auction:0 +msgid "My Auction" +msgstr "" + +#. module: auction +#: help:auction.lots,gross_margin:0 +msgid "(Gross Revenue*100.0)/ Object Price" +msgstr "" + +#. module: auction +#: field:auction.bid,contact_tel:0 +msgid "Contact Number" +msgstr "" + +#. module: auction +#: view:auction.lots:0 +msgid "Price" +msgstr "" + +#. module: auction +#: report:bids.phones.details:0 +msgid "-" +msgstr "" + +#. module: auction +#: view:auction.deposit:0 +msgid "Photos" +msgstr "" + +#. module: auction +#: field:auction.lots.make.invoice,number:0 +#: field:auction.lots.make.invoice.buyer,number:0 +msgid "Invoice Number" +msgstr "" + +#. module: auction +#: constraint:product.product:0 +msgid "Error: Invalid ean code" +msgstr "" + +#. module: auction +#: code:addons/auction/wizard/auction_aie_send.py:0 +#: code:addons/auction/wizard/auction_aie_send_result.py:0 +#, python-format +msgid "Connection to WWW.Auction-in-Europe.com failed !" +msgstr "" + +#. module: auction +#: field:report.auction,gross_revenue:0 +msgid "Gross Revenue" +msgstr "" + +#. module: auction +#: model:ir.actions.act_window,name:auction.open_board_auction +msgid "Auction board" +msgstr "" + +#. module: auction +#: field:aie.category,name:0 +#: view:auction.artists:0 +#: report:bids.lots:0 +msgid "Name" +msgstr "" + +#. module: auction +#: field:auction.deposit,name:0 +#: field:auction.lots,bord_vnd_id:0 +msgid "Depositer Inventory" +msgstr "" + +#. module: auction +#: code:addons/auction/auction.py:0 +#, python-format +msgid "The Buyer has no Invoice Address." +msgstr "" + +#. module: auction +#: view:report.object.encoded:0 +msgid "Total adj." +msgstr "" + +#. module: auction +#: field:auction.lots.sms.send,user:0 +msgid "Login" +msgstr "" + +#. module: auction +#: model:ir.model,name:auction.model_report_auction_adjudication +msgid "report_auction_adjudication" +msgstr "" + +#. module: auction +#: model:ir.actions.report.xml,name:auction.seller_lots_3 +msgid "Seller Form" +msgstr "" + +#. module: auction +#: field:auction.lots,lot_type:0 +#: field:report.auction,lot_type:0 +msgid "Object category" +msgstr "" + +#. module: auction +#: view:auction.taken:0 +msgid "Mark Lots" +msgstr "" + +#. module: auction +#: model:ir.model,name:auction.model_auction_lots +msgid "Auction Object" +msgstr "" + +#. module: auction +#: field:auction.lots,obj_num:0 +#: field:auction.lots.enable,confirm_en:0 +msgid "Catalog Number" +msgstr "" + +#. module: auction +#: view:auction.dates:0 +msgid "Accounting" +msgstr "" + +#. module: auction +#: model:ir.actions.report.xml,name:auction.bid_phone +msgid "Bids phones" +msgstr "" + +#. module: auction +#: field:report.auction,avg_estimation:0 +msgid "Avg estimation" +msgstr "" + +#. module: auction +#: report:auction.total.rml:0 +msgid "Debit:" +msgstr "" + +#. module: auction +#: field:auction.lots,author_right:0 +msgid "Author rights" +msgstr "" + +#. module: auction +#: view:auction.bid:0 +#: view:auction.dates:0 +#: view:auction.deposit:0 +#: view:auction.lots:0 +#: view:report.auction:0 +msgid "Group By..." +msgstr "" + +#. module: auction +#: help:auction.dates,journal_id:0 +msgid "Account journal for buyer" +msgstr "" + +#. module: auction +#: field:auction.bid,bid_lines:0 +#: report:auction.bids:0 +#: report:bids.lots:0 +#: model:ir.model,name:auction.model_auction_bid_line +msgid "Bid" +msgstr "" + +#. module: auction +#: view:report.object.encoded:0 +msgid "Total net rev." +msgstr "" + +#. module: auction +#: view:auction.lots.buyer_map:0 +msgid "Update" +msgstr "" + +#. module: auction +#: report:auction.total.rml:0 +#: model:ir.ui.menu,name:auction.auction_seller_menu +msgid "Sellers" +msgstr "" + +#. module: auction +#: help:auction.lots,lot_est2:0 +msgid "Maximum Estimate Price" +msgstr "" + +#. module: auction +#: view:auction.lots:0 +msgid "Notes" +msgstr "" + +#. module: auction +#: constraint:hr.employee:0 +msgid "" +"Error ! You cannot select a department for which the employee is the manager." +msgstr "" + +#. module: auction +#: view:auction.lots.auction.move:0 +msgid "Move to Auction date" +msgstr "" + +#. module: auction +#: report:auction.total.rml:0 +msgid "# of unsold items:" +msgstr "" + +#. module: auction +#: view:auction.dates:0 +msgid "Create Invoices" +msgstr "" + +#. module: auction +#: field:auction.bid,auction_id:0 +#: view:auction.dates:0 +#: field:auction.lots.auction.move,auction_id:0 +msgid "Auction Date" +msgstr "" + +#. module: auction +#: report:auction.code_bar_lot:0 +msgid ", ID" +msgstr "" + +#. module: auction +#: report:buyer.list:0 +msgid "Adj.(" +msgstr "" + +#. module: auction +#: model:ir.actions.report.xml,name:auction.lot_list_inv +msgid "Lots List - Landscape" +msgstr "" + +#. module: auction +#: view:auction.artists:0 +msgid "Author/Artist" +msgstr "" + +#. module: auction +#: field:auction.lots,ach_login:0 +#: field:auction.lots.buyer_map,ach_login:0 +msgid "Buyer Username" +msgstr "" + +#. module: auction +#: field:auction.lot.category,priority:0 +msgid "Priority" +msgstr "" + +#. module: auction +#: view:board.board:0 +msgid "Latest objects" +msgstr "" + +#. module: auction +#: field:auction.lots,lot_local:0 +msgid "Location" +msgstr "" + +#. module: auction +#: view:report.auction:0 +msgid "Month -1" +msgstr "" + +#. module: auction +#: help:auction.lots,is_ok:0 +msgid "When buyer pay for bank statement', this field is marked" +msgstr "" + +#. module: auction +#: field:auction.lots,ach_emp:0 +msgid "Taken Away" +msgstr "" + +#. module: auction +#: view:report.object.encoded:0 +msgid "Total gross rev." +msgstr "" + +#. module: auction +#: help:auction.lots,lot_est1:0 +msgid "Minimum Estimate Price" +msgstr "" + +#. module: auction +#: view:auction.deposit:0 +msgid "Deposit Date" +msgstr "" + +#. module: auction +#: selection:report.auction,month:0 +msgid "July" +msgstr "" + +#. module: auction +#: field:auction.bid_line,call:0 +msgid "To be Called" +msgstr "" + +#. module: auction +#: view:auction.lots:0 +#: model:ir.actions.act_window,name:auction.action_report_auction_lots_estimation_adj_category_tree +msgid "Min est/Adj/Max est" +msgstr "" + +#. module: auction +#: field:auction.lots,lot_est1:0 +msgid "Minimum Estimation" +msgstr "" + +#. module: auction +#: selection:auction.dates,state:0 +#: selection:report.auction.adjudication,state:0 +msgid "Closed" +msgstr "" + +#. module: auction +#: model:ir.model,name:auction.model_auction_lots_sms_send +msgid "Sms send " +msgstr "" + +#. module: auction +#: view:auction.lots.auction.move:0 +#: model:ir.actions.act_window,name:auction.action_auction_lots_auction_move +msgid "Change Auction Date" +msgstr "" + +#. module: auction +#: field:auction.artists,birth_death_dates:0 +msgid "Lifespan" +msgstr "" + +#. module: auction +#: view:auction.deposit:0 +#: field:auction.deposit,method:0 +msgid "Withdrawned method" +msgstr "" + +#. module: auction +#: view:auction.dates:0 +msgid "Buyer Commissions" +msgstr "" + +#. module: auction +#: model:ir.actions.act_window,name:auction.action_report_auction +#: model:ir.ui.menu,name:auction.menu_report_auction +msgid "Auction Analysis" +msgstr "" + +#. module: auction +#: field:auction.lot.history,price:0 +msgid "Withdrawn price" +msgstr "" + +#. module: auction +#: view:auction.dates:0 +msgid "Beginning of the auction" +msgstr "" + +#. module: auction +#: help:auction.pay.buy,statement_id3:0 +msgid "Third Bank Statement For Buyer" +msgstr "" + +#. module: auction +#: view:report.auction:0 +#: field:report.auction,month:0 +#: field:report.auction.object.date,month:0 +msgid "Month" +msgstr "" + +#. module: auction +#: report:auction.total.rml:0 +msgid "Max Estimate:" +msgstr "" + +#. module: auction +#: view:auction.lots:0 +msgid "Statistical" +msgstr "" + +#. module: auction +#: model:ir.model,name:auction.model_auction_deposit +msgid "Auction Deposit Border" +msgstr "" + +#. module: auction +#: model:ir.actions.act_window,name:auction.action_report_object_encoded_tree +msgid "Object statistics" +msgstr "" + +#. module: auction +#: help:auction.lots,net_margin:0 +msgid "(Net Revenue * 100)/ Object Price" +msgstr "" + +#. module: auction +#: model:ir.model,name:auction.model_auction_lot_history +msgid "Lot History" +msgstr "" + +#. module: auction +#: view:auction.lots.make.invoice:0 +#: view:auction.lots.make.invoice.buyer:0 +msgid "Create invoices" +msgstr "" + +#. module: auction +#: constraint:product.template:0 +msgid "" +"Error: The default UOM and the purchase UOM must be in the same category." +msgstr "" + +#. module: auction +#: model:account.tax.code,name:auction.account_tax_code_id5 +msgid "VAT 5%" +msgstr "" + +#. module: auction +#: field:auction.dates,expo1:0 +msgid "First Exposition Day" +msgstr "" + +#. module: auction +#: report:buyer.list:0 +msgid "Lot" +msgstr "" + +#. module: auction +#: help:aie.category,child_ids:0 +msgid "Childs aie category" +msgstr "" + +#. module: auction +#: model:ir.model,name:auction.model_auction_artists +msgid "auction.artists" +msgstr "" + +#. module: auction +#: field:report.auction,avg_price:0 +msgid "Avg Price." +msgstr "" + +#. module: auction +#: help:auction.pay.buy,statement_id2:0 +msgid "Second Bank Statement For Buyer" +msgstr "" + +#. module: auction +#: field:auction.dates,journal_id:0 +msgid "Buyer Journal" +msgstr "" + +#. module: auction +#: selection:auction.lots,state:0 +#: selection:report.object.encoded,state:0 +msgid "Paid" +msgstr "" + +#. module: auction +#: report:bids.lots:0 +#: report:bids.phones.details:0 +msgid "Phone" +msgstr "" + +#. module: auction +#: field:auction.lot.category,active:0 +msgid "Active" +msgstr "" + +#. module: auction +#: view:auction.dates:0 +msgid "Exposition Dates" +msgstr "" + +#. module: auction +#: model:account.tax,name:auction.auction_tax1 +msgid "TVA" +msgstr "" + +#. module: auction +#: field:auction.lots,important:0 +msgid "To be Emphatized" +msgstr "" + +#. module: auction +#: report:buyer.list:0 +msgid "Total:" +msgstr "" + +#. module: auction +#: model:account.tax,name:auction.auction_tax2 +msgid "TVA1" +msgstr "" + +#. module: auction +#: view:report.auction.object.date:0 +msgid "Objects per Day" +msgstr "" + +#. module: auction +#: field:auction.dates,seller_invoice_history:0 +#: field:auction.lots,sel_inv_id:0 +#: view:auction.lots.make.invoice:0 +msgid "Seller Invoice" +msgstr "" + +#. module: auction +#: view:board.board:0 +msgid "Objects by day" +msgstr "" + +#. module: auction +#: help:auction.dates,expo2:0 +msgid "Last exposition date for auction" +msgstr "" + +#. module: auction +#: code:addons/auction/auction.py:0 +#, python-format +msgid "Missed buyer !" +msgstr "" + +#. module: auction +#: report:auction.code_bar_lot:0 +msgid "Flagey" +msgstr "" + +#. module: auction +#: view:board.board:0 +msgid "Auction manager " +msgstr "" + +#. module: auction +#: view:auction.dates:0 +msgid "Invoice" +msgstr "" + +#. module: auction +#: field:auction.lots,vnd_lim:0 +msgid "Seller limit" +msgstr "" + +#. module: auction +#: constraint:ir.model:0 +msgid "" +"The Object name must start with x_ and not contain any special character !" +msgstr "" + +#. module: auction +#: field:auction.deposit,transfer:0 +msgid "Transfer" +msgstr "" + +#. module: auction +#: view:auction.pay.buy:0 +msgid "Line3" +msgstr "" + +#. module: auction +#: view:auction.pay.buy:0 +msgid "Line2" +msgstr "" + +#. module: auction +#: help:auction.lots,obj_ret:0 +msgid "Object Ret" +msgstr "" + +#. module: auction +#: view:report.auction.adjudication:0 +msgid "Total adjudication" +msgstr "" + +#. module: auction +#: selection:auction.deposit,method:0 +msgid "Contact the Seller" +msgstr "" + +#. module: auction +#: field:auction.taken,lot_ids:0 +msgid "Lots Emportes" +msgstr "" + +#. module: auction +#: field:auction.lots,net_margin:0 +msgid "Net Margin (%)" +msgstr "" + +#. module: auction +#: field:auction.lots,product_id:0 +msgid "Product" +msgstr "" + +#. module: auction +#: report:buyer.list:0 +msgid ")" +msgstr "" + +#. module: auction +#: view:auction.lots:0 +msgid "Seller Information" +msgstr "" + +#. module: auction +#: view:auction.deposit:0 +#: field:auction.deposit,lot_id:0 +#: view:auction.lots:0 +#: model:ir.actions.act_window,name:auction.action_all_objects +#: model:ir.ui.menu,name:auction.auction_all_objects_menu +msgid "Objects" +msgstr "" + +#. module: auction +#: view:auction.dates:0 +msgid "Seller Invoices" +msgstr "" + +#. module: auction +#: report:auction.total.rml:0 +msgid "Paid:" +msgstr "" + +#. module: auction +#: field:auction.deposit,total_neg:0 +msgid "Allow Negative Amount" +msgstr "" + +#. module: auction +#: help:auction.pay.buy,amount2:0 +msgid "Amount For Second Bank Statement" +msgstr "" + +#. module: auction +#: field:auction.lot.history,auction_id:0 +#: field:report.auction,auction:0 +#: field:report.auction.adjudication,name:0 +msgid "Auction date" +msgstr "" + +#. module: auction +#: view:auction.lots.sms.send:0 +msgid "SMS Text" +msgstr "" + +#. module: auction +#: field:auction.dates,auction1:0 +msgid "First Auction Day" +msgstr "" + +#. module: auction +#: view:auction.lots.make.invoice.buyer:0 +msgid "Create Invoices For Buyer" +msgstr "" + +#. module: auction +#: view:auction.dates:0 +msgid "Names" +msgstr "" + +#. module: auction +#: code:addons/auction/wizard/auction_lots_buyer_map.py:0 +#: code:addons/auction/wizard/auction_lots_numerotate.py:0 +#, python-format +msgid "Active IDs not Found" +msgstr "" + +#. module: auction +#: view:auction.artists:0 +#: model:ir.ui.menu,name:auction.menu_auction_artist +msgid "Artists" +msgstr "" + +#. module: auction +#: view:auction.pay.buy:0 +msgid "Pay Objects" +msgstr "" + +#. module: auction +#: help:auction.dates,expo1:0 +msgid "Beginning exposition date for auction" +msgstr "" + +#. module: auction +#: model:ir.actions.act_window,name:auction.act_auction_lot_line_open +msgid "Open lots" +msgstr "" + +#. module: auction +#: model:ir.actions.act_window,name:auction.act_auction_lot_open_deposit +msgid "Deposit slip" +msgstr "" + +#. module: auction +#: model:ir.model,name:auction.model_auction_lots_enable +msgid "Lots Enable" +msgstr "" + +#. module: auction +#: view:auction.lots:0 +msgid "Lots" +msgstr "" + +#. module: auction +#: field:auction.lots,seller_price:0 +msgid "Seller price" +msgstr "" + +#. module: auction +#: model:ir.actions.report.xml,name:auction.buy_id_list +msgid "Buyer List" +msgstr "" + +#. module: auction +#: report:buyer.list:0 +msgid "Buyer costs(" +msgstr "" + +#. module: auction +#: field:auction.pay.buy,statement_id1:0 +#: field:auction.pay.buy,statement_id2:0 +#: field:auction.pay.buy,statement_id3:0 +msgid "Statement" +msgstr "" + +#. module: auction +#: help:auction.lots,seller_price:0 +#: help:auction.lots.make.invoice,amount:0 +msgid "Seller Price" +msgstr "" + +#. module: auction +#: model:account.tax,name:auction.auction_tax20 +#: model:account.tax,name:auction.auction_tax6 +msgid "Frais de vente" +msgstr "" + +#. module: auction +#: model:account.tax.code,name:auction.account_tax_code_id1 +msgid "VAT 1%" +msgstr "" + +#. module: auction +#: model:account.tax,name:auction.auction_tax +msgid "Droit d'auteur" +msgstr "" + +#. module: auction +#: model:ir.model,name:auction.model_auction_lots_buyer_map +msgid "Map Buyer" +msgstr "" + +#. module: auction +#: field:report.auction.object.date,name:0 +msgid "Created date" +msgstr "" + +#. module: auction +#: help:auction.lots,bord_vnd_id:0 +msgid "" +"Provide deposit information: seller, Withdrawned Method, Object, Deposit " +"Costs" +msgstr "" + +#. module: auction +#: field:auction.lots,net_revenue:0 +#: field:report.object.encoded,net_revenue:0 +msgid "Net revenue" +msgstr "" + +#. module: auction +#: report:auction.total.rml:0 +msgid "# of items:" +msgstr "" + +#. module: auction +#: model:account.tax,name:auction.tax_buyer_author +msgid "Author rights (4%)" +msgstr "" + +#. module: auction +#: field:report.object.encoded,estimation:0 +msgid "Estimation" +msgstr "" + +#. module: auction +#: view:auction.taken:0 +msgid "OK" +msgstr "" + +#. module: auction +#: model:ir.actions.report.xml,name:auction.buyer_form_id +msgid "Buyer Form" +msgstr "" + +#. module: auction +#: field:auction.bid,partner_id:0 +msgid "Buyer Name" +msgstr "" + +#. module: auction +#: view:report.auction:0 +#: field:report.auction,day:0 +msgid "Day" +msgstr "" + +#. module: auction +#: model:ir.actions.act_window,name:auction.action_auction_lots_make_invoice +msgid "Invoice Seller objects" +msgstr "" + +#. module: auction +#: field:auction.lots,gross_margin:0 +msgid "Gross Margin (%)" +msgstr "" + +#. module: auction +#: constraint:ir.ui.menu:0 +msgid "Error ! You can not create recursive Menu." +msgstr "" + +#. module: auction +#: view:auction.dates:0 +msgid "Search Next Auction Dates" +msgstr "" + +#. module: auction +#: view:auction.catalog.flagey:0 +msgid "Print Auction Catalog Flagey Report..." +msgstr "" + +#. module: auction +#: field:auction.lots,ach_avance:0 +msgid "Buyer Advance" +msgstr "" + +#. module: auction +#: field:auction.lots,obj_comm:0 +msgid "Commission" +msgstr "" + +#. module: auction +#: view:board.board:0 +msgid "Min/Adj/Max" +msgstr "" + +#. module: auction +#: view:auction.catalog.flagey:0 +msgid "Catalog Flagey Report" +msgstr "" + +#. module: auction +#: help:auction.lots,obj_price:0 +msgid "Object Price" +msgstr "" + +#. module: auction +#: view:auction.bid:0 +msgid "Bids Lines" +msgstr "" + +#. module: auction +#: view:auction.lots:0 +msgid "Catalog" +msgstr "" + +#. module: auction +#: help:auction.lots,auction_id:0 +msgid "Auction for object" +msgstr "" + +#. module: auction +#: field:auction.deposit.cost,account:0 +msgid "Destination Account" +msgstr "" + +#. module: auction +#: model:ir.ui.menu,name:auction.auction_config_menu +msgid "Configuration" +msgstr "" + +#. module: auction +#: model:ir.model,name:auction.model_auction_pay_buy +msgid "Pay buy" +msgstr "" + +#. module: auction +#: model:ir.ui.menu,name:auction.auction_outils_menu +msgid "Tools Bar Codes" +msgstr "" + +#. module: auction +#: field:auction.deposit.cost,deposit_id:0 +msgid "Deposit" +msgstr "" + +#. module: auction +#: field:auction.dates,expo2:0 +msgid "Last Exposition Day" +msgstr "" + +#. module: auction +#: model:ir.model,name:auction.model_auction_lots_able +msgid "Lots able" +msgstr "" + +#. module: auction +#: model:account.tax.code,name:auction.account_tax_code_id3 +msgid "VAT 10%" +msgstr "" + +#. module: auction +#: field:auction.artists,name:0 +msgid "Artist/Author Name" +msgstr "" + +#. module: auction +#: selection:report.auction,month:0 +msgid "December" +msgstr "" + +#. module: auction +#: field:auction.lots,image:0 +msgid "Image" +msgstr "" + +#. module: auction +#: help:auction.lots,buyer_price:0 +#: help:auction.lots.make.invoice.buyer,amount:0 +msgid "Buyer Price" +msgstr "" + +#. module: auction +#: model:ir.model,name:auction.model_auction_lot_category +msgid "Auction Lots Category" +msgstr "" + +#. module: auction +#: model:account.tax.code,name:auction.account_tax_code_id2 +msgid "VAT 20%" +msgstr "" + +#. module: auction +#: model:ir.model,name:auction.model_auction_payer_sel +msgid "Auction payment for seller" +msgstr "" + +#. module: auction +#: view:auction.lots:0 +#: selection:auction.lots,state:0 +msgid "Taken away" +msgstr "" + +#. module: auction +#: model:ir.actions.report.xml,name:auction.seller_form_id +msgid "Seller List" +msgstr "" + +#. module: auction +#: view:auction.deposit:0 +msgid "Deposit Costs" +msgstr "" + +#. module: auction +#: constraint:res.partner:0 +msgid "Error ! You can not create recursive associated members." +msgstr "" + +#. module: auction +#: field:auction.lot.category,name:0 +msgid "Category Name" +msgstr "" + +#. module: auction +#: report:buyer.list:0 +msgid "........." +msgstr "" + +#. module: auction +#: view:report.auction:0 +msgid "Auction Summary tree view" +msgstr "" + +#. module: auction +#: report:report.auction.buyer.result:0 +msgid "Adj" +msgstr "" + +#. module: auction +#: view:auction.dates:0 +#: model:ir.model,name:auction.model_auction_dates +msgid "Auction Dates" +msgstr "" + +#. module: auction +#: model:ir.ui.menu,name:auction.menu_board_auction_open +msgid "Auction DashBoard" +msgstr "" + +#. module: auction +#: view:report.auction:0 +#: field:report.auction,user_id:0 +#: field:report.auction.adjudication,user_id:0 +#: field:report.auction.object.date,user_id:0 +#: field:report.object.encoded,user_id:0 +msgid "User" +msgstr "" + +#. module: auction +#: view:auction.pay.buy:0 +msgid "Payment Lines" +msgstr "" + +#. module: auction +#: code:addons/auction/auction.py:0 +#, python-format +msgid "Missed Address !" +msgstr "" + +#. module: auction +#: help:auction.lots,net_revenue:0 +msgid "Buyer Price - Seller Price - Indirect Cost" +msgstr "" + +#. module: auction +#: model:ir.actions.act_window,name:auction.act_auction_lot_open_bid +msgid "Open Bids" +msgstr "" + +#. module: auction +#: field:auction.artists,pseudo:0 +msgid "Pseudo" +msgstr "" + +#. module: auction +#: view:auction.lots:0 +msgid "Not sold" +msgstr "" + +#. module: auction +#: model:account.tax,name:auction.auction_tax3 +#: field:auction.dates,buyer_costs:0 +msgid "Buyer Costs" +msgstr "" + +#. module: auction +#: report:auction.total.rml:0 +msgid "Auction Date:" +msgstr "" + +#. module: auction +#: code:addons/auction/wizard/auction_aie_send.py:0 +#: code:addons/auction/wizard/auction_aie_send_result.py:0 +#, python-format +msgid "Error" +msgstr "" + +#. module: auction +#: field:auction.dates,buyer_invoice_history:0 +#: field:auction.lots,ach_inv_id:0 +#: view:auction.lots.make.invoice.buyer:0 +msgid "Buyer Invoice" +msgstr "" + +#. module: auction +#: report:auction.bids:0 +msgid "Tel" +msgstr "" + +#. module: auction +#: field:auction.lots,artist_id:0 +msgid "Artist/Author" +msgstr "" + +#. module: auction +#: model:ir.actions.report.xml,name:auction.total_result1 +msgid "Auction Totals with lists" +msgstr "" + +#. module: auction +#: view:auction.deposit:0 +msgid "General Information" +msgstr "" + +#. module: auction +#: view:auction.lots.auction.move:0 +#: view:auction.lots.buyer_map:0 +#: view:auction.lots.make.invoice:0 +#: view:auction.lots.make.invoice.buyer:0 +#: view:auction.lots.sms.send:0 +#: view:auction.pay.buy:0 +msgid "Close" +msgstr "" + +#. module: auction +#: model:ir.model,name:auction.model_report_object_encoded +msgid "Object encoded" +msgstr "" + +#. module: auction +#: view:auction.bid:0 +msgid "Search Auction Bid" +msgstr "" + +#. module: auction +#: report:bids.phones.details:0 +msgid "Est" +msgstr "" + +#. module: auction +#: view:auction.dates:0 +msgid "Seller Commissions" +msgstr "" + +#. module: auction +#: view:report.object.encoded:0 +msgid "Object statistic" +msgstr "" + +#. module: auction +#: help:auction.dates,journal_seller_id:0 +msgid "Account journal for seller" +msgstr "" + +#. module: auction +#: field:auction.dates,auction2:0 +msgid "Last Auction Day" +msgstr "" + +#. module: auction +#: view:auction.deposit:0 +msgid "Objects Description" +msgstr "" + +#. module: auction +#: view:auction.deposit:0 +#: field:auction.deposit,info:0 +#: report:bids.phones.details:0 +msgid "Description" +msgstr "" + +#. module: auction +#: selection:report.auction,month:0 +msgid "May" +msgstr "" + +#. module: auction +#: field:auction.lots,obj_price:0 +msgid "Adjudication price" +msgstr "" + +#. module: auction +#: field:auction.dates,acc_income:0 +msgid "Income Account" +msgstr "" + +#. module: auction +#: field:auction.lots.sms.send,password:0 +msgid "Password" +msgstr "" + +#. module: auction +#: selection:report.auction,month:0 +msgid "February" +msgstr "" + +#. module: auction +#: selection:report.auction,month:0 +msgid "April" +msgstr "" + +#. module: auction +#: view:auction.pay.buy:0 +msgid "Pay objects" +msgstr "" + +#. module: auction +#: view:report.object.encoded:0 +msgid "# objects" +msgstr "" + +#. module: auction +#: report:auction.total.rml:0 +msgid "Adjudication:" +msgstr "" + +#. module: auction +#: model:ir.actions.report.xml,name:auction.details_bids_phones +msgid "Bids per lot (phone)" +msgstr "" + +#. module: auction +#: field:report.auction,buyer_login:0 +msgid "Buyer Login" +msgstr "" + +#. module: auction +#: field:auction.deposit,tax_id:0 +msgid "Expenses" +msgstr "" + +#. module: auction +#: model:ir.model,name:auction.model_auction_payer +msgid "Auction payer" +msgstr "" + +#. module: auction +#: report:auction.total.rml:0 +msgid "Auction name:" +msgstr "" + +#. module: auction +#: view:board.board:0 +msgid "Latest deposits" +msgstr "" + +#. module: auction +#: model:ir.actions.report.xml,name:auction.art2 +msgid "Artists Biography" +msgstr "" + +#. module: auction +#: view:report.auction:0 +#: field:report.auction,year:0 +msgid "Year" +msgstr "" + +#. module: auction +#: field:auction.lots,history_ids:0 +msgid "Auction history" +msgstr "" diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py index 326ed33b83d..dfbdc745613 100644 --- a/addons/base_calendar/base_calendar.py +++ b/addons/base_calendar/base_calendar.py @@ -1292,8 +1292,8 @@ true, it will allow you to hide the event alarm information without removing it. count = 0 for data in cr.dictfetchall(): - start_date = base_start_date and datetime.strptime(base_start_date[:10], "%Y-%m-%d") or False - until_date = base_until_date and datetime.strptime(base_until_date[:10], "%Y-%m-%d") or False + start_date = base_start_date and datetime.strptime(base_start_date[:10]+ ' 00:00:00' , "%Y-%m-%d %H:%M:%S") or False + until_date = base_until_date and datetime.strptime(base_until_date[:10]+ ' 23:59:59', "%Y-%m-%d %H:%M:%S") or False if count > limit: break event_date = datetime.strptime(data['date'], "%Y-%m-%d %H:%M:%S") @@ -1426,8 +1426,9 @@ true, it will allow you to hide the event alarm information without removing it. args_without_date = [] start_date = False until_date = False + for arg in args: - if arg[0] not in ('date', unicode('date')): + if arg[0] not in ('date', unicode('date'), 'date_deadline', unicode('date_deadline')): args_without_date.append(arg) else: if arg[1] in ('>', '>='): diff --git a/addons/base_contact/i18n/ru.po b/addons/base_contact/i18n/ru.po index 7d9c14ffa43..b9ee50ddf08 100644 --- a/addons/base_contact/i18n/ru.po +++ b/addons/base_contact/i18n/ru.po @@ -6,48 +6,193 @@ msgid "" 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-09-29 08:45+0000\n" +"POT-Creation-Date: 2010-10-18 17:46+0000\n" +"PO-Revision-Date: 2010-10-26 17:03+0000\n" "Last-Translator: Chertykov Denis <chertykov@gmail.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-09-30 04:39+0000\n" +"X-Launchpad-Export-Date: 2010-10-27 04:58+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_contact -#: field:res.partner.job,sequence_contact:0 -msgid "Contact Seq." -msgstr "Последовательность контакта" +#: field:res.partner.contact,title:0 +msgid "Title" +msgstr "Название" #. module: base_contact -#: model:ir.model,name:base_contact.model_res_partner_contact -msgid "res.partner.contact" -msgstr "Контакт партнера" +#: constraint:ir.actions.act_window:0 +msgid "Invalid model name in the action definition." +msgstr "Недопустимое имя модели в определении действия." #. module: base_contact -#: constraint:ir.model:0 +#: view:res.partner.address:0 +msgid "# of Contacts" +msgstr "Кол-во контактных лиц" + +#. module: base_contact +#: field:res.partner.job,fax:0 +msgid "Fax" +msgstr "Факс" + +#. module: base_contact +#: view:base.contact.installer:0 +msgid "title" +msgstr "" + +#. module: base_contact +#: help:res.partner.job,date_start:0 +msgid "Start date of job(Joining Date)" +msgstr "" + +#. module: base_contact +#: help:res.partner.job,function:0 +msgid "Function of this contact with this partner" +msgstr "Должность этого контакта в фирме-партнере" + +#. module: base_contact +#: help:res.partner.job,state:0 +msgid "Status of Address" +msgstr "Статус адреса" + +#. module: base_contact +#: help:res.partner.job,name:0 msgid "" -"The Object name must start with x_ and not contain any special character !" +"You may enter Address first,Partner will be linked " +"automatically if any." msgstr "" -"Название объекта должно начинаться с x_ и не должно содержать специальных " -"символов !" +"Вы можете сначала ввести адрес, партнер будет привязан автоматически, если " +"он есть." + +#. module: base_contact +#: help:res.partner.job,fax:0 +msgid "Job FAX no." +msgstr "" + +#. module: base_contact +#: field:res.partner.contact,mobile:0 +msgid "Mobile" +msgstr "Моб. тел." + +#. module: base_contact +#: view:res.partner.contact:0 +#: field:res.partner.contact,comment:0 +msgid "Notes" +msgstr "Примечания" + +#. module: base_contact +#: model:process.node,note:base_contact.process_node_contacts0 +msgid "People you work with." +msgstr "Люди с которыми вы работает" + +#. module: base_contact +#: model:process.transition,note:base_contact.process_transition_functiontoaddress0 +msgid "Define functions and address." +msgstr "Определить функции и адреса." + +#. module: base_contact +#: help:res.partner.job,date_stop:0 +msgid "Last date of job" +msgstr "" + +#. module: base_contact +#: view:base.contact.installer:0 +#: field:base.contact.installer,migrate:0 +msgid "Migrate" +msgstr "Переместить" #. module: base_contact -#: field:res.partner.job,function_id:0 +#: view:res.partner.contact:0 +#: field:res.partner.job,name:0 +msgid "Partner" +msgstr "Партнер" + +#. module: base_contact +#: model:process.node,note:base_contact.process_node_function0 +msgid "Jobs at a same partner address." +msgstr "Должности с таким же адресом партнера" + +#. module: base_contact +#: model:process.node,name:base_contact.process_node_partners0 +msgid "Partners" +msgstr "Партнеры" + +#. module: base_contact +#: field:res.partner.job,function:0 msgid "Partner Function" msgstr "Функции партнера" #. module: base_contact -#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form -#: model:ir.ui.menu,name:base_contact.menu_partner_contact_form -#: model:process.node,name:base_contact.process_node_contacts0 +#: field:res.partner.job,state:0 +msgid "State" +msgstr "Состояние" + +#. module: base_contact +#: model:ir.module.module,shortdesc:base_contact.module_meta_information +#: model:process.process,name:base_contact.process_process_basecontactprocess0 +msgid "Base Contact" +msgstr "Основной контакт" + +#. module: base_contact +#: field:res.partner.job,date_stop:0 +msgid "Date Stop" +msgstr "Дата Остановки" + +#. module: base_contact +#: model:ir.actions.act_window,name:base_contact.action_res_partner_job +msgid "Contact's Jobs" +msgstr "Должность контакта" + +#. module: base_contact #: view:res.partner:0 -#: view:res.partner.address:0 -#: field:res.partner.address,job_ids:0 -msgid "Contacts" -msgstr "Контакты" +msgid "Categories" +msgstr "Категории" + +#. module: base_contact +#: help:res.partner.job,sequence_partner:0 +msgid "" +"Order of importance of this job title in the list of job " +"title of the linked partner" +msgstr "" +"Порядок важности этой должности в списке должностей связанного партнера" + +#. module: base_contact +#: constraint:ir.ui.view:0 +msgid "Invalid XML for View Architecture!" +msgstr "Неправильный XML для просмотра архитектуры!" + +#. module: base_contact +#: field:res.partner.job,extension:0 +msgid "Extension" +msgstr "Расширение" + +#. module: base_contact +#: help:res.partner.job,extension:0 +msgid "Internal/External extension phone number" +msgstr "Внутренний / внешний расширение телефонного номера" + +#. module: base_contact +#: help:res.partner.job,phone:0 +msgid "Job Phone no." +msgstr "" + +#. module: base_contact +#: view:res.partner.contact:0 +#: field:res.partner.contact,job_ids:0 +msgid "Functions and Addresses" +msgstr "Функции и Адреса" + +#. module: base_contact +#: model:ir.model,name:base_contact.model_res_partner_contact +#: field:res.partner.job,contact_id:0 +msgid "Contact" +msgstr "Контакт" + +#. module: base_contact +#: help:res.partner.job,email:0 +msgid "Job E-Mail" +msgstr "" #. module: base_contact #: field:res.partner.job,sequence_partner:0 @@ -55,97 +200,108 @@ msgid "Partner Seq." msgstr "Последовательность партнеров" #. module: base_contact -#: selection:res.partner.job,state:0 -msgid "Current" -msgstr "Текущий" +#: model:process.transition,name:base_contact.process_transition_functiontoaddress0 +msgid "Function to address" +msgstr "Адрес функции" #. module: base_contact -#: field:res.partner.contact,first_name:0 -msgid "First Name" -msgstr "Имя" +#: field:res.partner.contact,name:0 +msgid "Last Name" +msgstr "Фамилия" #. module: base_contact -#: model:ir.model,name:base_contact.model_res_partner_job -msgid "Contact Partner Function" -msgstr "Функции сотрудника партнера" +#: view:res.partner:0 +#: view:res.partner.contact:0 +msgid "Communication" +msgstr "" #. module: base_contact -#: field:res.partner.job,other:0 -msgid "Other" -msgstr "Другое" +#: field:base.contact.installer,config_logo:0 +#: field:res.partner.contact,photo:0 +msgid "Image" +msgstr "Изображение" #. module: base_contact -#: model:process.transition,name:base_contact.process_transition_contacttofunction0 -msgid "Contact to function" -msgstr "Функции контакта" +#: selection:res.partner.job,state:0 +msgid "Past" +msgstr "Прошлые" #. module: base_contact -#: constraint:ir.actions.act_window:0 -msgid "Invalid model name in the action definition." -msgstr "Недопустимое имя модели в определении действия." +#: model:ir.model,name:base_contact.model_res_partner_address +msgid "Partner Addresses" +msgstr "Адреса партнера" #. module: base_contact -#: model:process.transition,name:base_contact.process_transition_partnertoaddress0 -msgid "Partner to address" -msgstr "Адрес партнера" +#: field:res.partner.job,sequence_contact:0 +msgid "Contact Seq." +msgstr "Последовательность контакта" #. module: base_contact #: view:res.partner.address:0 -msgid "# of Contacts" -msgstr "Кол-во контактных лиц" +msgid "Search Contact" +msgstr "Искать контакт" #. module: base_contact -#: help:res.partner.job,other:0 -msgid "Additional phone field" -msgstr "Дополнительное поле телефона" +#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form +#: model:ir.ui.menu,name:base_contact.menu_partner_contact_form +#: model:ir.ui.menu,name:base_contact.menu_purchases_partner_contact_form +#: model:process.node,name:base_contact.process_node_contacts0 +#: view:res.partner:0 +#: field:res.partner.address,job_ids:0 +msgid "Contacts" +msgstr "Контакты" #. module: base_contact -#: model:process.node,name:base_contact.process_node_function0 -msgid "Function" -msgstr "Функция" +#: view:base.contact.installer:0 +msgid "" +"Due to changes in Address and Partner's relation, some of the details from " +"address are needed to be migrated into contact information." +msgstr "" +"В связи с изменениями в отношениях адресов и партнеров, некоторые данные из " +"адреса необходимо перенести в контакт." #. module: base_contact -#: field:res.partner.job,fax:0 -msgid "Fax" -msgstr "Факс" +#: model:process.node,note:base_contact.process_node_addresses0 +msgid "Working and private addresses." +msgstr "Рабочие и дополнительные адреса." #. module: base_contact -#: field:res.partner.contact,lang_id:0 -msgid "Language" -msgstr "Язык" +#: help:res.partner.job,address_id:0 +msgid "Address which is linked to the Partner" +msgstr "Адрес который связан с партнером" #. module: base_contact -#: field:res.partner.job,phone:0 -msgid "Phone" -msgstr "Телефон" +#: constraint:ir.ui.menu:0 +msgid "Error ! You can not create recursive Menu." +msgstr "Ошибка ! Нельзя создать зацикленные меню." #. module: base_contact -#: model:process.transition,note:base_contact.process_transition_contacttofunction0 -msgid "Defines contacts and functions." -msgstr "Определить контакты и функции" +#: constraint:ir.model:0 +msgid "" +"The Object name must start with x_ and not contain any special character !" +msgstr "" +"Название объекта должно начинаться с x_ и не должно содержать специальных " +"символов !" #. module: base_contact -#: field:res.partner.contact,title:0 -msgid "Title" -msgstr "Название" +#: help:res.partner.job,other:0 +msgid "Additional phone field" +msgstr "Дополнительное поле телефона" #. module: base_contact -#: view:res.partner.job:0 -msgid "Contact Functions" -msgstr "Функции контакта" +#: field:res.partner.contact,website:0 +msgid "Website" +msgstr "Сайт" #. module: base_contact -#: model:ir.module.module,shortdesc:base_contact.module_meta_information -msgid "Base Contact" -msgstr "Основной контакт" +#: view:base.contact.installer:0 +msgid "Otherwise these details will not be visible from address/contact." +msgstr "Иначе эти подробности не будут видны в адресе/контакте." #. module: base_contact -#: help:res.partner.job,sequence_partner:0 -msgid "" -"Order of importance of this job title in the list of job title of the linked " -"partner" -msgstr "" -"С учетом важности этой работы названия в списке Должность связанного партнера" +#: field:base.contact.installer,progress:0 +msgid "Configuration Progress" +msgstr "Настройка выполняется" #. module: base_contact #: field:res.partner.contact,email:0 @@ -154,47 +310,41 @@ msgid "E-Mail" msgstr "Эл. почта" #. module: base_contact -#: field:res.partner.job,date_stop:0 -msgid "Date Stop" -msgstr "Дата Остановки" - -#. module: base_contact -#: view:res.partner:0 -#: field:res.partner.job,address_id:0 -msgid "Address" -msgstr "Адрес" +#: model:ir.model,name:base_contact.model_base_contact_installer +msgid "base.contact.installer" +msgstr "" #. module: base_contact -#: model:ir.actions.act_window,name:base_contact.action_res_partner_job -#: model:ir.ui.menu,name:base_contact.menu_action_res_partner_job -msgid "Contact's Jobs" -msgstr "Должность контакта" +#: help:res.partner.contact,active:0 +msgid "" +"If the active field is set to true, it will allow you to " +"hide the partner contact without removing it." +msgstr "" +"если поле \"Активно\" установлено в \"истина\", то это позволит вам скрыть " +"контакт партнера без его удаления." #. module: base_contact -#: field:res.partner.contact,country_id:0 -msgid "Nationality" -msgstr "Национальность" +#: view:res.partner.job:0 +msgid "Contact Functions" +msgstr "Функции контакта" #. module: base_contact -#: help:res.partner.job,sequence_contact:0 -msgid "" -"Order of importance of this address in the list of addresses of the linked " -"contact" -msgstr "Уровень важности этого адреса в списке адресов связанного контакта" +#: field:res.partner.job,phone:0 +msgid "Phone" +msgstr "Телефон" #. module: base_contact -#: field:res.partner.address,job_id:0 -#: field:res.partner.contact,job_id:0 -msgid "Main Job" -msgstr "Основная должность" +#: view:base.contact.installer:0 +msgid "Do you want to migrate your Address data in Contact Data?" +msgstr "Вы хотите перенести данные вашего адреса в данные контакта ?" #. module: base_contact -#: view:res.partner:0 -msgid "Categories" -msgstr "Категории" +#: field:res.partner.contact,active:0 +msgid "Active" +msgstr "Активен" #. module: base_contact -#: field:res.partner.contact,function_id:0 +#: field:res.partner.contact,function:0 msgid "Main Function" msgstr "Личная функция" @@ -204,137 +354,137 @@ msgid "Define partners and their addresses." msgstr "Определить партнеров и их адреса." #. module: base_contact -#: constraint:ir.ui.view:0 -msgid "Invalid XML for View Architecture!" -msgstr "Неправильный XML для просмотра архитектуры!" - -#. module: base_contact -#: model:process.process,name:base_contact.process_process_basecontactprocess0 -msgid "Base Contact Process" -msgstr "Основной контакт" - -#. module: base_contact #: view:res.partner.contact:0 msgid "Seq." msgstr "Посл-ть" #. module: base_contact -#: field:res.partner.job,extension:0 -msgid "Extension" -msgstr "Расширение" +#: field:res.partner.contact,lang_id:0 +msgid "Language" +msgstr "Язык" #. module: base_contact -#: field:res.partner.contact,mobile:0 -msgid "Mobile" -msgstr "Моб. тел." +#: view:res.partner.contact:0 +msgid "Extra Information" +msgstr "Доп. информация" #. module: base_contact -#: help:res.partner.job,extension:0 -msgid "Internal/External extension phone number" -msgstr "Внутренний / внешний расширение телефонного номера" +#: model:process.node,note:base_contact.process_node_partners0 +msgid "Companies you work with." +msgstr "Организации с которыми вы работаете" #. module: base_contact -#: model:process.node,note:base_contact.process_node_contacts0 -msgid "People you work with." -msgstr "Люди с которыми вы работает" +#: view:res.partner.contact:0 +msgid "Partner Contact" +msgstr "Контакт партнера" #. module: base_contact #: view:res.partner.contact:0 -msgid "Extra Information" -msgstr "Доп. информация" +msgid "General" +msgstr "Основной" #. module: base_contact #: view:res.partner.contact:0 -#: field:res.partner.contact,job_ids:0 -msgid "Functions and Addresses" -msgstr "Функции и Адреса" +msgid "Photo" +msgstr "Фото" #. module: base_contact -#: field:res.partner.contact,active:0 -msgid "Active" -msgstr "Активен" +#: field:res.partner.contact,birthdate:0 +msgid "Birth Date" +msgstr "Дата рождения" #. module: base_contact -#: field:res.partner.job,contact_id:0 -msgid "Contact" -msgstr "Контакт" +#: help:base.contact.installer,migrate:0 +msgid "If you select this, all addresses will be migrated." +msgstr "Если вы выберете это, все адреса будут перенесены." #. module: base_contact -#: model:process.node,note:base_contact.process_node_partners0 -msgid "Companies you work with." -msgstr "Организации с которыми вы работаете" +#: selection:res.partner.job,state:0 +msgid "Current" +msgstr "Текущий" #. module: base_contact -#: field:res.partner.contact,partner_id:0 -msgid "Main Employer" -msgstr "Основной работодатель" +#: field:res.partner.contact,first_name:0 +msgid "First Name" +msgstr "Имя" #. module: base_contact -#: model:process.transition,name:base_contact.process_transition_functiontoaddress0 -msgid "Function to address" -msgstr "Адрес функции" +#: model:ir.model,name:base_contact.model_res_partner_job +msgid "Contact Partner Function" +msgstr "Функции сотрудника партнера" #. module: base_contact -#: model:ir.actions.act_window,name:base_contact.act_res_partner_jobs -msgid "Partner Contacts" -msgstr "Контакты партнера" +#: field:res.partner.job,other:0 +msgid "Other" +msgstr "Другое" #. module: base_contact -#: view:res.partner.contact:0 -msgid "Partner Contact" -msgstr "Контакт партнера" +#: model:process.node,name:base_contact.process_node_function0 +msgid "Function" +msgstr "Функция" #. module: base_contact -#: model:process.node,name:base_contact.process_node_partners0 -msgid "Partners" -msgstr "Партнеры" +#: field:res.partner.address,job_id:0 +#: field:res.partner.contact,job_id:0 +msgid "Main Job" +msgstr "Основная должность" + +#. module: base_contact +#: model:process.transition,note:base_contact.process_transition_contacttofunction0 +msgid "Defines contacts and functions." +msgstr "Определить контакты и функции" + +#. module: base_contact +#: model:process.transition,name:base_contact.process_transition_contacttofunction0 +msgid "Contact to function" +msgstr "Функции контакта" #. module: base_contact -#: model:process.node,name:base_contact.process_node_addresses0 #: view:res.partner:0 -msgid "Addresses" -msgstr "Адреса" +#: field:res.partner.job,address_id:0 +msgid "Address" +msgstr "Адрес" #. module: base_contact -#: model:process.node,note:base_contact.process_node_addresses0 -msgid "Working and private addresses." -msgstr "Рабочие и дополнительные адреса." +#: field:res.partner.contact,country_id:0 +msgid "Nationality" +msgstr "Национальность" #. module: base_contact -#: field:res.partner.contact,name:0 -msgid "Last Name" -msgstr "Фамилия" +#: model:ir.actions.act_window,name:base_contact.act_res_partner_jobs +msgid "Open Jobs" +msgstr "Открытые вакансии" #. module: base_contact -#: field:res.partner.job,state:0 -msgid "State" -msgstr "Состояние" +#: field:base.contact.installer,name:0 +msgid "Name" +msgstr "Имя" #. module: base_contact -#: view:res.partner.contact:0 -#: view:res.partner.job:0 -msgid "General" -msgstr "Основной" +#: field:res.partner.contact,partner_id:0 +msgid "Main Employer" +msgstr "Основной работодатель" #. module: base_contact -#: selection:res.partner.job,state:0 -msgid "Past" -msgstr "Прошлые" +#: model:ir.actions.act_window,name:base_contact.action_base_contact_installer +msgid "Address Migration" +msgstr "Перенос адресов" #. module: base_contact -#: view:res.partner.contact:0 -msgid "General Information" -msgstr "Общая информация" +#: view:res.partner:0 +msgid "Postal Address" +msgstr "Почтовый адрес" #. module: base_contact -#: model:process.node,note:base_contact.process_node_function0 -msgid "Jobs at a same partner address." -msgstr "Должности с таким же адресом партнера" +#: model:process.node,name:base_contact.process_node_addresses0 +#: view:res.partner:0 +msgid "Addresses" +msgstr "Адреса" #. module: base_contact -#: field:res.partner.job,name:0 -msgid "Partner" -msgstr "Партнер" +#: model:process.transition,name:base_contact.process_transition_partnertoaddress0 +msgid "Partner to address" +msgstr "Адрес партнера" #. module: base_contact #: field:res.partner.job,date_start:0 @@ -342,16 +492,31 @@ msgid "Date Start" msgstr "Дата начала" #. module: base_contact -#: model:process.transition,note:base_contact.process_transition_functiontoaddress0 -msgid "Define functions and address." -msgstr "Определить функции и адреса." +#: help:res.partner.job,sequence_contact:0 +msgid "" +"Order of importance of this address in the list of " +"addresses of the linked contact" +msgstr "Порядок важности этого адреса в списке адресов связанного контакта" -#. module: base_contact -#: field:res.partner.contact,website:0 -msgid "Website" -msgstr "Сайт" +#~ msgid "General Information" +#~ msgstr "Общая информация" -#. module: base_contact -#: field:res.partner.contact,birthdate:0 -msgid "Birth Date" -msgstr "Дата рождения" +#~ msgid "res.partner.contact" +#~ msgstr "Контакт партнера" + +#~ msgid "" +#~ "Order of importance of this job title in the list of job title of the linked " +#~ "partner" +#~ msgstr "" +#~ "С учетом важности этой работы названия в списке Должность связанного партнера" + +#~ msgid "Base Contact Process" +#~ msgstr "Основной контакт" + +#~ msgid "Partner Contacts" +#~ msgstr "Контакты партнера" + +#~ msgid "" +#~ "Order of importance of this address in the list of addresses of the linked " +#~ "contact" +#~ msgstr "Уровень важности этого адреса в списке адресов связанного контакта" diff --git a/addons/base_iban/i18n/et.po b/addons/base_iban/i18n/et.po index 2c83f61c59c..83b3ba6c13d 100644 --- a/addons/base_iban/i18n/et.po +++ b/addons/base_iban/i18n/et.po @@ -6,14 +6,14 @@ msgid "" 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-11-09 16:41+0000\n" -"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n" +"POT-Creation-Date: 2010-10-18 17:46+0000\n" +"PO-Revision-Date: 2010-10-26 17:25+0000\n" +"Last-Translator: Jalakas <Unknown>\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-09-29 04:52+0000\n" +"X-Launchpad-Export-Date: 2010-10-27 04:58+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_iban @@ -22,6 +22,26 @@ msgid "Invalid XML for View Architecture!" msgstr "Vigane XML vaate arhitektuurile!" #. module: base_iban +#: model:ir.module.module,shortdesc:base_iban.module_meta_information +msgid "Create IBAN bank accounts" +msgstr "Loo IBAN pangakontosid" + +#. module: base_iban +#: constraint:ir.model:0 +msgid "" +"The Object name must start with x_ and not contain any special character !" +msgstr "Objekti nimi peab algama x_ ja ei tohi sisaldada erimärke!" + +#. module: base_iban +#: code:addons/base_iban/base_iban.py:0 +#, python-format +msgid "" +"The IBAN does not seems to be correct. You should have entered something " +"like this %s" +msgstr "" +"IBAN ei tundu olevat õige. Sul peaks olema sisestatud midagi sellist %s" + +#. module: base_iban #: model:res.partner.bank.type.field,name:base_iban.bank_zip_field msgid "zip" msgstr "zip" @@ -32,6 +52,11 @@ msgid "International Bank Account Number" msgstr "Rahvusvaheline konto number (IBAN)" #. module: base_iban +#: model:ir.model,name:base_iban.model_res_partner_bank +msgid "Bank Accounts" +msgstr "Pangakontod" + +#. module: base_iban #: model:res.partner.bank.type.field,name:base_iban.bank_country_field msgid "country_id" msgstr "country_id" @@ -47,7 +72,12 @@ msgid "iban" msgstr "iban" #. module: base_iban -#: model:ir.module.module,shortdesc:base_iban.module_meta_information +#: code:addons/base_iban/base_iban.py:0 +#, python-format +msgid "The IBAN is invalid, It should begin with the country code" +msgstr "IBAN on vigane. See peaks algama riigi koodiga" + +#. module: base_iban #: field:res.partner.bank,iban:0 msgid "IBAN" msgstr "IBAN" diff --git a/addons/base_setup/i18n/ru.po b/addons/base_setup/i18n/ru.po index 8ed8df84629..54a2a285cd9 100644 --- a/addons/base_setup/i18n/ru.po +++ b/addons/base_setup/i18n/ru.po @@ -6,159 +6,238 @@ msgid "" 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-27 11:05+0000\n" +"POT-Creation-Date: 2010-10-18 17:46+0000\n" +"PO-Revision-Date: 2010-10-26 17:44+0000\n" "Last-Translator: Chertykov Denis <chertykov@gmail.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-09-29 04:59+0000\n" +"X-Launchpad-Export-Date: 2010-10-27 04:58+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_setup -#: wizard_field:base_setup.base_setup,company,city:0 -#: wizard_field:base_setup.base_setup,init,city:0 -#: wizard_field:base_setup.base_setup,update,city:0 +#: field:base.setup.company,city:0 msgid "City" msgstr "Город" #. module: base_setup -#: wizard_view:base_setup.base_setup,finish:0 +#: constraint:ir.model:0 msgid "" -"You can start configuring the system or connect directly to the database " -"using the default setup." +"The Object name must start with x_ and not contain any special character !" msgstr "" -"Вы можете начать настройку системы или соединиться непосредственно с базой " -"данных, используя настройки по умолчанию." +"Название объекта должно начинаться с x_ и не должно содержать специальных " +"символов !" #. module: base_setup -#: wizard_field:base_setup.base_setup,company,zip:0 -#: wizard_field:base_setup.base_setup,init,zip:0 -#: wizard_field:base_setup.base_setup,update,zip:0 -msgid "Zip code" -msgstr "Почтовый индекс" +#: constraint:ir.actions.act_window:0 +msgid "Invalid model name in the action definition." +msgstr "Недопустимое имя модели в определении действия." #. module: base_setup -#: wizard_view:base_setup.base_setup,init:0 -msgid "Select a Profile" -msgstr "Выберите профайл." +#: field:base.setup.installer,account_voucher:0 +msgid "Invoicing" +msgstr "Выставление счетов" #. module: base_setup -#: wizard_view:base_setup.base_setup,company:0 -msgid "Report header" -msgstr "Заголовок отчета" +#: field:base.setup.company,name:0 +msgid "Company Name" +msgstr "Название компании" #. module: base_setup -#: wizard_button:base_setup.base_setup,finish,config:0 -msgid "Start Configuration" -msgstr "Начать настройку" +#: field:base.setup.company,email:0 +msgid "E-mail" +msgstr "Эл.почта" + +#. module: base_setup +#: field:base.setup.company,account_no:0 +msgid "Bank Account No" +msgstr "Банковский счет №" #. module: base_setup -#: wizard_view:base_setup.base_setup,init:0 +#: field:base.setup.installer,profile_tools:0 +msgid "Extra Tools" +msgstr "Доп. инструменты" + +#. module: base_setup +#: field:base.setup.company,rml_footer1:0 +msgid "Report Footer 1" +msgstr "Нижний колонтитул отчета 1" + +#. module: base_setup +#: help:base.setup.installer,mrp:0 msgid "" -"You'll be able to install more modules later through the Administration menu." +"Helps you manage your manufacturing processes and generate reports on those " +"processes." msgstr "" -"Вы можете установить больше модулей позднее при помощи меню " -"Администрирования." #. module: base_setup -#: wizard_view:base_setup.base_setup,init:0 -msgid "" -"A profile sets a pre-selection of modules for specific needs. These profiles " -"have been setup to help you discover the different aspects of OpenERP. This " -"is just an overview, we have 300+ available modules." +#: help:base.setup.installer,marketing:0 +msgid "Helps you manage your marketing campaigns step by step." msgstr "" -"Профайл устанавливает заранее выбранные модули для определенных целей. Эти " -"профайлы были настроены, чтобы помочь вам ознакомиться с различными " -"аспектами OpenERP. Это просто обзор, имеется более 300 доступных модулей." #. module: base_setup -#: wizard_button:base_setup.base_setup,company,update:0 -#: wizard_button:base_setup.base_setup,init,company:0 -msgid "Next" -msgstr "Далее" +#: view:base.setup.config:0 +msgid "Your database is now created." +msgstr "Ваша база создана." #. module: base_setup -#: wizard_field:base_setup.base_setup,company,email:0 -#: wizard_field:base_setup.base_setup,init,email:0 -#: wizard_field:base_setup.base_setup,update,email:0 -msgid "E-mail" -msgstr "Эл.почта" +#: field:base.setup.installer,point_of_sale:0 +msgid "Point of Sales" +msgstr "Кассовый терминал" #. module: base_setup -#: wizard_field:base_setup.base_setup,company,state_id:0 -#: wizard_field:base_setup.base_setup,init,state_id:0 -#: wizard_field:base_setup.base_setup,update,state_id:0 -msgid "State" -msgstr "Область/штат" +#: field:base.setup.installer,association:0 +msgid "Associations" +msgstr "Ассоциации" #. module: base_setup -#: wizard_view:base_setup.base_setup,finish:0 -msgid "Your new database is now fully installed." -msgstr "Теперь новая база данных полностью установлена." +#: help:base.setup.installer,account_accountant:0 +msgid "" +"Helps you handle your accounting needs, if you are not an accountant, we " +"suggest you to install only the Invoicing " +msgstr "" +"Помогает обрабатывать бухгалтерский учет, если вы не бухгалтер, мы советуем " +"вам установить только выставление счетов " #. module: base_setup -#: wizard_field:base_setup.base_setup,company,profile:0 -#: wizard_field:base_setup.base_setup,init,profile:0 -#: wizard_field:base_setup.base_setup,update,profile:0 -msgid "Profile" -msgstr "Профайл" +#: view:base.setup.config:0 +msgid "" +"You can start configuring the system or connect directly to the database as " +"an administrator." +msgstr "Вы можете начать настройку системы или войти как администратор." #. module: base_setup -#: wizard_field:base_setup.base_setup,company,rml_footer1:0 -#: wizard_field:base_setup.base_setup,init,rml_footer1:0 -#: wizard_field:base_setup.base_setup,update,rml_footer1:0 -msgid "Report Footer 1" -msgstr "Нижний колонтитул отчета 1" +#: field:base.setup.company,progress:0 +#: field:base.setup.installer,progress:0 +msgid "Configuration Progress" +msgstr "Настройка производится" #. module: base_setup -#: wizard_field:base_setup.base_setup,company,rml_footer2:0 -#: wizard_field:base_setup.base_setup,init,rml_footer2:0 -#: wizard_field:base_setup.base_setup,update,rml_footer2:0 +#: field:base.setup.company,rml_footer2:0 msgid "Report Footer 2" msgstr "Нижний колонитул отчета 2" #. module: base_setup -#: wizard_view:base_setup.base_setup,company:0 -msgid "General Information" -msgstr "Общая информация" +#: field:base.setup.company,currency:0 +#: model:ir.model,name:base_setup.model_res_currency +msgid "Currency" +msgstr "Валюта" + +#. module: base_setup +#: field:base.setup.company,state_id:0 +msgid "Fed. State" +msgstr "Штат" + +#. module: base_setup +#: field:base.setup.installer,marketing:0 +msgid "Marketing" +msgstr "Маркетинг" #. module: base_setup -#: wizard_field:base_setup.base_setup,company,street2:0 -#: wizard_field:base_setup.base_setup,init,street2:0 -#: wizard_field:base_setup.base_setup,update,street2:0 -msgid "Street2" -msgstr "Улица (2-я строка)" +#: field:base.setup.company,company_id:0 +msgid "Company" +msgstr "Компания" + +#. module: base_setup +#: field:base.setup.installer,sale:0 +msgid "Sales Management" +msgstr "Управление продажами" + +#. module: base_setup +#: help:base.setup.installer,profile_tools:0 +msgid "" +"Lets you install various interesting but non-essential tools like Survey, " +"Lunch and Ideas box." +msgstr "" +"Позволяет установить интересные, но не обязательные инструменты: Обзор, Ланч " +"и Коробка идей." #. module: base_setup -#: wizard_view:base_setup.base_setup,company:0 -msgid "Report Information" -msgstr "Информация об отчетах" +#: field:base.setup.installer,report_designer:0 +msgid "Advanced Reporting" +msgstr "Расширенные отчеты" #. module: base_setup -#: wizard_field:base_setup.base_setup,company,phone:0 -#: wizard_field:base_setup.base_setup,init,phone:0 -#: wizard_field:base_setup.base_setup,update,phone:0 +#: field:base.setup.company,phone:0 msgid "Phone" msgstr "Телефон" #. module: base_setup -#: wizard_view:base_setup.base_setup,company:0 -msgid "Define Main Company" -msgstr "Задать головную компанию" +#: view:base.setup.company:0 +msgid "res_config_contents" +msgstr "" #. module: base_setup -#: wizard_field:base_setup.base_setup,company,name:0 -#: wizard_field:base_setup.base_setup,init,name:0 -#: wizard_field:base_setup.base_setup,update,name:0 -msgid "Company Name" -msgstr "Название компании" +#: view:base.setup.installer:0 +msgid "title" +msgstr "" + +#. module: base_setup +#: view:base.setup.config:0 +msgid "Use Directly" +msgstr "Использовать непосредственно" + +#. module: base_setup +#: field:base.setup.installer,knowledge:0 +msgid "Knowledge Management" +msgstr "Управление базой знаний" #. module: base_setup -#: help:base_setup.base_setup,company,rml_footer2:0 -#: help:base_setup.base_setup,init,rml_footer2:0 -#: help:base_setup.base_setup,update,rml_footer2:0 +#: help:base.setup.installer,product_expiry:0 +msgid "" +"Installs a preselected set of OpenERP applications which will help you " +"manage your industry." +msgstr "" + +#. module: base_setup +#: help:base.setup.installer,project:0 +msgid "" +"Helps you manage your projects and tasks by tracking them, generating " +"plannings, etc..." +msgstr "" + +#. module: base_setup +#: help:base.setup.installer,point_of_sale:0 +msgid "" +"Helps you get the most out of your points of sales with fast sale encoding, " +"simplified payment mode encoding, automatic picking lists generation and " +"more." +msgstr "" + +#. module: base_setup +#: help:base.setup.installer,hr:0 +msgid "" +"Helps you manage your human resources by encoding your employees structure, " +"generating work sheets, tracking attendance and more." +msgstr "" + +#. module: base_setup +#: help:base.setup.installer,account_voucher:0 +msgid "" +"Allows you to create your invoices and track the payments. It is an easier " +"version of the accounting module for managers who are not accountants." +msgstr "" + +#. module: base_setup +#: constraint:ir.ui.view:0 +msgid "Invalid XML for View Architecture!" +msgstr "Неправильный XML для просмотра архитектуры!" + +#. module: base_setup +#: field:base.setup.installer,hr:0 +msgid "Human Resources" +msgstr "Отдел кадров" + +#. module: base_setup +#: help:base.setup.installer,purchase:0 +msgid "" +"Helps you manage your purchase-related processes such as requests for " +"quotations, supplier invoices, etc..." +msgstr "" + +#. module: base_setup +#: help:base.setup.company,rml_footer2:0 msgid "" "This sentence will appear at the bottom of your reports.\n" "We suggest you to put bank information here:\n" @@ -169,54 +248,106 @@ msgstr "" "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701" #. module: base_setup -#: wizard_field:base_setup.base_setup,company,country_id:0 -#: wizard_field:base_setup.base_setup,init,country_id:0 -#: wizard_field:base_setup.base_setup,update,country_id:0 +#: field:base.setup.company,street2:0 +msgid "Street 2" +msgstr "Улица 2" + +#. module: base_setup +#: model:ir.model,name:base_setup.model_base_setup_installer +msgid "base.setup.installer" +msgstr "" + +#. module: base_setup +#: field:base.setup.company,country_id:0 msgid "Country" msgstr "Страна" #. module: base_setup -#: wizard_view:base_setup.base_setup,company:0 -#: wizard_view:base_setup.base_setup,finish:0 -#: wizard_view:base_setup.base_setup,init:0 -#: wizard_view:base_setup.base_setup,update:0 -#: model:ir.actions.wizard,name:base_setup.action_wizard_setup -#: model:ir.actions.wizard,name:base_setup.wizard_base_setup +#: model:ir.actions.act_window,name:base_setup.action_base_setup msgid "Setup" msgstr "Установка" #. module: base_setup -#: help:base_setup.base_setup,company,rml_footer1:0 -#: help:base_setup.base_setup,init,rml_footer1:0 -#: help:base_setup.base_setup,update,rml_footer1:0 +#: field:base.setup.installer,account_accountant:0 +msgid "Accounting & Finance" +msgstr "Бухгалтерия и Финансы" + +#. module: base_setup +#: field:base.setup.installer,auction:0 +msgid "Auction Houses" +msgstr "" + +#. module: base_setup +#: field:base.setup.company,zip:0 +msgid "Zip Code" +msgstr "Индекс" + +#. module: base_setup +#: view:base.setup.config:0 +msgid "Start Configuration" +msgstr "Начать настройку" + +#. module: base_setup +#: help:base.setup.installer,knowledge:0 msgid "" -"This sentence will appear at the bottom of your reports.\n" -"We suggest you to write legal sentences here:\n" -"Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07" +"Lets you install addons geared towards sharing knowledge with and between " +"your employees." msgstr "" -"Это предложение появится внизу ваших отчетов.\n" -"Рекомендуем поместить здесь юридическую информацию:\n" -"Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07" #. module: base_setup -#: wizard_view:base_setup.base_setup,update:0 -msgid "Summary" -msgstr "Обзор" +#: model:ir.actions.act_window,name:base_setup.action_base_setup_company +msgid "Company Configuration" +msgstr "Настройка компании" + +#. module: base_setup +#: field:base.setup.company,logo:0 +msgid "Logo" +msgstr "Логотип" + +#. module: base_setup +#: field:base.setup.installer,purchase:0 +msgid "Purchase Management" +msgstr "Управление закупками" #. module: base_setup -#: wizard_button:base_setup.base_setup,update,finish:0 -msgid "Install" -msgstr "Установить" +#: help:base.setup.installer,sale:0 +msgid "Helps you handle your quotations, sale orders and invoicing." +msgstr "" #. module: base_setup -#: wizard_view:base_setup.base_setup,finish:0 -msgid "Installation Done" -msgstr "Установка завершена" +#: field:base.setup.installer,stock:0 +msgid "Warehouse Management" +msgstr "Управление складом" #. module: base_setup -#: help:base_setup.base_setup,company,rml_header1:0 -#: help:base_setup.base_setup,init,rml_header1:0 -#: help:base_setup.base_setup,update,rml_header1:0 +#: field:base.setup.installer,project:0 +msgid "Project Management" +msgstr "Управление проектами" + +#. module: base_setup +#: field:base.setup.config,installed_users:0 +msgid "Installed Users" +msgstr "Установленные пользователи" + +#. module: base_setup +#: view:base.setup.config:0 +msgid "New Database" +msgstr "Новая база" + +#. module: base_setup +#: field:base.setup.installer,crm:0 +msgid "Customer Relationship Management" +msgstr "Управление отношениями с заказчиками" + +#. module: base_setup +#: help:base.setup.installer,auction:0 +msgid "" +"Installs a preselected set of OpenERP applications selected to help you " +"manage your auctions as well as the business processes around them." +msgstr "" + +#. module: base_setup +#: help:base.setup.company,rml_header1:0 msgid "" "This sentence will appear at the top right corner of your reports.\n" "We suggest you to put a slogan here:\n" @@ -227,47 +358,99 @@ msgstr "" "\"Решения для бизнеса с открытым исходным кодом\"." #. module: base_setup -#: wizard_field:base_setup.base_setup,company,rml_header1:0 -#: wizard_field:base_setup.base_setup,init,rml_header1:0 -#: wizard_field:base_setup.base_setup,update,rml_header1:0 +#: help:base.setup.installer,report_designer:0 +msgid "" +"Lets you install various tools to simplify and enhance OpenERP's report " +"creation." +msgstr "" + +#. module: base_setup +#: field:base.setup.company,rml_header1:0 msgid "Report Header" msgstr "Заголовок отчета" #. module: base_setup -#: wizard_view:base_setup.base_setup,company:0 +#: view:base.setup.config:0 +msgid "Information about your new database" +msgstr "Информация о вашей новой базе" + +#. module: base_setup +#: field:base.setup.company,config_logo:0 +#: field:base.setup.config,config_logo:0 +#: field:base.setup.installer,config_logo:0 +msgid "Image" +msgstr "Картинка" + +#. module: base_setup +#: field:base.setup.installer,product_expiry:0 +msgid "Food Industry" +msgstr "Пищевая индустрия" + +#. module: base_setup +#: field:base.setup.installer,mrp:0 +msgid "Manufacturing" +msgstr "Производство" + +#. module: base_setup +#: view:base.setup.company:0 msgid "Your Logo - Use a size of about 450x150 pixels." msgstr "Ваш логотип - используйте размер примерно 450x150 пикселей" #. module: base_setup -#: wizard_field:base_setup.base_setup,company,currency:0 -#: wizard_field:base_setup.base_setup,init,currency:0 -#: wizard_field:base_setup.base_setup,update,currency:0 -msgid "Currency" -msgstr "Валюта" +#: help:base.setup.company,rml_footer1:0 +msgid "" +"This sentence will appear at the bottom of your reports.\n" +"We suggest you to write legal sentences here:\n" +"Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07" +msgstr "" +"Это предложение появится внизу ваших отчетов.\n" +"Рекомендуем поместить здесь юридическую информацию:\n" +"Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07" + +#. module: base_setup +#: field:base.setup.company,website:0 +msgid "Company Website" +msgstr "Сайт компании" #. module: base_setup -#: wizard_field:base_setup.base_setup,company,street:0 -#: wizard_field:base_setup.base_setup,init,street:0 -#: wizard_field:base_setup.base_setup,update,street:0 +#: view:base.setup.installer:0 +msgid "Install Specific Industry Applications" +msgstr "Установить конкретные промышленные приложения" + +#. module: base_setup +#: field:base.setup.company,street:0 msgid "Street" msgstr "Улица" #. module: base_setup -#: wizard_button:base_setup.base_setup,finish,menu:0 -msgid "Use Directly" -msgstr "Использовать непосредственно" +#: model:ir.model,name:base_setup.model_base_setup_company +msgid "base.setup.company" +msgstr "" #. module: base_setup -#: wizard_button:base_setup.base_setup,init,menu:0 -msgid "Cancel" -msgstr "Отмена" +#: help:base.setup.company,website:0 +msgid "Example: http://openerp.com" +msgstr "Пример: http://openerp.com" #. module: base_setup -#: wizard_field:base_setup.base_setup,company,logo:0 -#: wizard_field:base_setup.base_setup,init,logo:0 -#: wizard_field:base_setup.base_setup,update,logo:0 -msgid "Logo" -msgstr "Логотип" +#: model:ir.actions.act_window,name:base_setup.action_base_setup_installer +msgid "Install Applications" +msgstr "Установить приложения" + +#. module: base_setup +#: help:base.setup.installer,crm:0 +msgid "" +"Helps you track and manage relations with customers such as leads, requests " +"or issues. Can automatically send reminders, escalate requests or trigger " +"business-specific actions based on standard events." +msgstr "" + +#. module: base_setup +#: help:base.setup.installer,stock:0 +msgid "" +"Helps you manage your inventory and main stock operations: delivery orders, " +"receptions, etc." +msgstr "" #. module: base_setup #: model:ir.module.module,shortdesc:base_setup.module_meta_information @@ -275,7 +458,89 @@ msgid "Base Setup" msgstr "Базовая настройка" #. module: base_setup -#: wizard_button:base_setup.base_setup,company,init:0 -#: wizard_button:base_setup.base_setup,update,company:0 -msgid "Previous" -msgstr "Назад" +#: help:base.setup.installer,association:0 +msgid "" +"Installs a preselected set of OpenERP applications which will help you " +"manage your association more efficiently." +msgstr "" + +#. module: base_setup +#: model:ir.model,name:base_setup.model_base_setup_config +msgid "base.setup.config" +msgstr "" + +#. module: base_setup +#: code:addons/base_setup/__init__.py:0 +#, python-format +msgid "The following users have been installed : \n" +msgstr "Были введены следующие пользователи: \n" + +#~ msgid "" +#~ "You can start configuring the system or connect directly to the database " +#~ "using the default setup." +#~ msgstr "" +#~ "Вы можете начать настройку системы или соединиться непосредственно с базой " +#~ "данных, используя настройки по умолчанию." + +#~ msgid "Zip code" +#~ msgstr "Почтовый индекс" + +#~ msgid "Select a Profile" +#~ msgstr "Выберите профайл." + +#~ msgid "Report header" +#~ msgstr "Заголовок отчета" + +#~ msgid "" +#~ "You'll be able to install more modules later through the Administration menu." +#~ msgstr "" +#~ "Вы можете установить больше модулей позднее при помощи меню " +#~ "Администрирования." + +#~ msgid "" +#~ "A profile sets a pre-selection of modules for specific needs. These profiles " +#~ "have been setup to help you discover the different aspects of OpenERP. This " +#~ "is just an overview, we have 300+ available modules." +#~ msgstr "" +#~ "Профайл устанавливает заранее выбранные модули для определенных целей. Эти " +#~ "профайлы были настроены, чтобы помочь вам ознакомиться с различными " +#~ "аспектами OpenERP. Это просто обзор, имеется более 300 доступных модулей." + +#~ msgid "Next" +#~ msgstr "Далее" + +#~ msgid "Your new database is now fully installed." +#~ msgstr "Теперь новая база данных полностью установлена." + +#~ msgid "Profile" +#~ msgstr "Профайл" + +#~ msgid "Street2" +#~ msgstr "Улица (2-я строка)" + +#~ msgid "Define Main Company" +#~ msgstr "Задать головную компанию" + +#~ msgid "Summary" +#~ msgstr "Обзор" + +#~ msgid "Install" +#~ msgstr "Установить" + +#~ msgid "Installation Done" +#~ msgstr "Установка завершена" + +#~ msgid "Cancel" +#~ msgstr "Отмена" + +#~ msgid "Previous" +#~ msgstr "Назад" + +#~ msgid "General Information" +#~ msgstr "Общая информация" + +#~ msgid "Report Information" +#~ msgstr "Информация об отчетах" + +#~ msgid "State" +#~ msgstr "Область/штат" diff --git a/addons/base_vat/i18n/ru.po b/addons/base_vat/i18n/ru.po index 685138c095f..6aef4c89a0d 100644 --- a/addons/base_vat/i18n/ru.po +++ b/addons/base_vat/i18n/ru.po @@ -6,23 +6,23 @@ msgid "" 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:17+0000\n" -"Last-Translator: Nikolay Chesnokov <chesnokov_n@msn.com>\n" +"POT-Creation-Date: 2010-10-18 17:46+0000\n" +"PO-Revision-Date: 2010-10-26 17:10+0000\n" +"Last-Translator: Chertykov Denis <chertykov@gmail.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-09-29 04:59+0000\n" +"X-Launchpad-Export-Date: 2010-10-27 04:58+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_vat -#: model:ir.module.module,description:base_vat.module_meta_information +#: code:addons/base_vat/base_vat.py:0 +#, python-format msgid "" -"Enable the VAT Number for the partner. Check the validity of that VAT Number." -msgstr "" -"Разрешить использование кода налога для партнера. Проверьте правильность " -"кода налога." +"The Vat does not seems to be correct. You should have entered something like " +"this %s" +msgstr "НДС не кажется верным. Вы должны ввести что-то вроде этого: %s" #. module: base_vat #: constraint:ir.ui.view:0 @@ -30,11 +30,47 @@ msgid "Invalid XML for View Architecture!" msgstr "Некорректный формат XML структуры для просмотра." #. module: base_vat +#: constraint:ir.model:0 +msgid "" +"The Object name must start with x_ and not contain any special character !" +msgstr "" +"Название объекта должно начинаться с x_ и не должно содержать специальных " +"символов !" + +#. module: base_vat +#: model:ir.module.module,shortdesc:base_vat.module_meta_information +msgid "Base VAT - To check VAT number validity" +msgstr "База НДС - для проверки правильности НДС" + +#. module: base_vat +#: code:addons/base_vat/base_vat.py:0 +#, python-format +msgid "The VAT is invalid, It should begin with the country code" +msgstr "НДС неправильный, он должен начинаться с кода страны" + +#. module: base_vat +#: help:res.partner,vat_subjected:0 +msgid "" +"Check this box if the partner is subjected to the VAT. It will be used for " +"the VAT legal statement." +msgstr "" +"Отметьте, если партнер -плательщик НДС. Используется для заявления НДС." + +#. module: base_vat +#: model:ir.model,name:base_vat.model_res_partner +msgid "Partner" +msgstr "Партнёр" + +#. module: base_vat #: field:res.partner,vat_subjected:0 msgid "VAT Legal Statement" msgstr "Действующий код налога" -#. module: base_vat -#: model:ir.module.module,shortdesc:base_vat.module_meta_information -msgid "VAT" -msgstr "Код налога" +#~ msgid "VAT" +#~ msgstr "Код налога" + +#~ msgid "" +#~ "Enable the VAT Number for the partner. Check the validity of that VAT Number." +#~ msgstr "" +#~ "Разрешить использование кода налога для партнера. Проверьте правильность " +#~ "кода налога." diff --git a/addons/claim_from_delivery/i18n/es.po b/addons/claim_from_delivery/i18n/es.po index e9e7faa12b2..9b4a2b36206 100644 --- a/addons/claim_from_delivery/i18n/es.po +++ b/addons/claim_from_delivery/i18n/es.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2010-10-18 17:46+0000\n" -"PO-Revision-Date: 2010-10-24 21:49+0000\n" -"Last-Translator: Carlos @ smile.fr <Unknown>\n" +"PO-Revision-Date: 2010-10-25 07:14+0000\n" +"Last-Translator: Carlos-smile <Unknown>\n" "Language-Team: Spanish <es@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-10-25 04:39+0000\n" +"X-Launchpad-Export-Date: 2010-10-26 04:40+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: claim_from_delivery diff --git a/addons/crm/i18n/nl.po b/addons/crm/i18n/nl.po index e76dc7a8f6c..93fafb6aaea 100644 --- a/addons/crm/i18n/nl.po +++ b/addons/crm/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: 2010-10-18 17:46+0000\n" -"PO-Revision-Date: 2010-10-24 09:03+0000\n" -"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n" +"PO-Revision-Date: 2010-10-26 09:02+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\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-10-25 04:39+0000\n" +"X-Launchpad-Export-Date: 2010-10-27 04:58+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: crm @@ -412,12 +412,12 @@ msgstr "Fondsenwerving" #: view:res.partner:0 #: field:res.partner,opportunity_ids:0 msgid "Leads and Opportunities" -msgstr "" +msgstr "Leads en verkoopkansen" #. module: crm #: view:crm.send.mail:0 msgid "_Send" -msgstr "" +msgstr "Ver_stuur" #. module: crm #: view:crm.lead:0 @@ -427,33 +427,33 @@ msgstr "Communicatie" #. module: crm #: field:crm.case.section,change_responsible:0 msgid "Change Responsible" -msgstr "" +msgstr "Wijzig verantwoordelijke" #. module: crm #: field:crm.merge.opportunity,state:0 msgid "Set State To" -msgstr "" +msgstr "Zet status op" #. module: crm #: model:ir.model,name:crm.model_crm_lead2opportunity_action msgid "Convert/Merge Opportunity" -msgstr "" +msgstr "Verkoopkans omzetten/samenvoegen" #. module: crm #: field:crm.lead,write_date:0 msgid "Update Date" -msgstr "" +msgstr "Wijzigingsdatum" #. module: crm #: help:crm.meeting,count:0 msgid "Repeat max that times" -msgstr "" +msgstr "Herhaal max aantal keren" #. module: crm #: view:crm.lead2opportunity.action:0 #: field:crm.lead2opportunity.action,name:0 msgid "Select Action" -msgstr "" +msgstr "Selecteer actie" #. module: crm #: field:base.action.rule,trg_categ_id:0 @@ -471,17 +471,17 @@ msgstr "Categorie" #. module: crm #: view:crm.lead.report:0 msgid "#Opportunities" -msgstr "" +msgstr "#Verkoopkansen" #. module: crm #: model:crm.case.resource.type,name:crm.type_oppor2 msgid "Campaign 1" -msgstr "" +msgstr "Campagne 1" #. module: crm #: model:crm.case.resource.type,name:crm.type_oppor1 msgid "Campaign 2" -msgstr "" +msgstr "Campagne 2" #. module: crm #: view:crm.meeting:0 @@ -491,12 +491,12 @@ msgstr "Privacy" #. module: crm #: view:crm.lead.report:0 msgid "Opportunity Analysis" -msgstr "" +msgstr "Verkoopkans analyse" #. module: crm #: help:crm.meeting,location:0 msgid "Location of Event" -msgstr "" +msgstr "Locatie gebeurtenis" #. module: crm #: field:crm.meeting,rrule:0 @@ -506,7 +506,7 @@ msgstr "Herhaling regel" #. module: crm #: help:crm.installer,fetchmail:0 msgid "Allows you to receive E-Mails from POP/IMAP server." -msgstr "" +msgstr "Laat u e-mails ontvangen van POP/IMAP server." #. module: crm #: model:process.transition,note:crm.process_transition_opportunitymeeting0 @@ -566,27 +566,27 @@ msgstr "Niet lopend" #: view:crm.send.mail:0 #: model:ir.actions.act_window,name:crm.action_crm_reply_mail msgid "Reply to last Mail" -msgstr "" +msgstr "Beantwoordt laatste mail" #. module: crm #: field:crm.lead,email:0 msgid "E-Mail" -msgstr "" +msgstr "E-Mail" #. module: crm #: field:crm.installer,wiki_sale_faq:0 msgid "Sale FAQ" -msgstr "" +msgstr "Verkoop FAQ" #. module: crm #: model:ir.model,name:crm.model_crm_send_mail_attachment msgid "crm.send.mail.attachment" -msgstr "" +msgstr "crm.send.mail.attachment" #. module: crm #: field:crm.meeting,count:0 msgid "Count" -msgstr "" +msgstr "Aantal" #. module: crm #: selection:crm.lead.report,month:0 @@ -610,7 +610,7 @@ msgstr "Deze personen ontvangen email." #: view:crm.meeting:0 #: field:crm.meeting,name:0 msgid "Summary" -msgstr "" +msgstr "Samenvatting" #. module: crm #: view:crm.segmentation:0 @@ -623,6 +623,9 @@ msgid "" "Thick this box if you want that on escalation, the responsible of this sale " "team automatically becomes responsible of the lead/opportunity escaladed" msgstr "" +"Vink aan als u wilt dat bij escalatie de verantwoordelijke van het " +"verkoopteam automatisch de verantwoordelijke van de geëscaleerde " +"lead/verkoopkans wordt." #. module: crm #: help:crm.installer,outlook:0 @@ -631,6 +634,8 @@ msgid "" "Allows you to link your e-mail to OpenERP's documents. You can attach it to " "any existing one in OpenERP or create a new one." msgstr "" +"Laat uw e-mail koppelen met OpenERP's documenten. U kunt het bijvoegen bij " +"alle bestaande in OpenERP of een nieuwe maken." #. module: crm #: view:crm.case.categ:0 @@ -655,7 +660,7 @@ msgstr "Profielschetsopties" #. module: crm #: view:crm.phonecall.report:0 msgid "#Phone calls" -msgstr "" +msgstr "#Telefoontjes" #. module: crm #: view:crm.lead:0 @@ -669,12 +674,15 @@ msgid "" "modes available with the customer. With each commercial opportunity, you can " "indicate the canall which is this opportunity source." msgstr "" +"De kanalen vertegenwoordigen de verschillende beschikbare " +"communicatiemiddelen met de klant. Met elke verkoopkans kunt u het kanaal " +"aangeven dat de bron van de verkoopkans is." #. module: crm #: code:addons/crm/crm_meeting.py:0 #, python-format msgid "The meeting '%s' has been confirmed." -msgstr "" +msgstr "De afspraak '%s' is bevestigd." #. module: crm #: field:crm.case.section,user_id:0 @@ -693,6 +701,8 @@ msgid "" "The email address put in the 'Reply-To' of all emails sent by OpenERP about " "cases in this sales team" msgstr "" +"Het e-mail adres bij 'Beantwoordt aan' van alle door OpenERP verstuurde e-" +"mails omtrent dossiers in dit verkoopteam" #. module: crm #: view:res.users:0 @@ -705,6 +715,8 @@ msgid "" "Defines a rule or repeating pattern of time to exclude from the recurring " "rule." msgstr "" +"Definieer een regel of herhaalpatroon of tijd om uit te sluiten van de " +"herhaalregel." #. module: crm #: view:crm.segmentation.line:0 @@ -717,12 +729,14 @@ msgid "" "If the active field is set to true, it will allow you to hide the event " "alarm information without removing it." msgstr "" +"Als het actief veld wordt uitgezet, kunt u het verbergen zonder te moeten " +"verwijderen" #. module: crm #: view:crm.lead:0 #: view:crm.meeting:0 msgid "Details" -msgstr "" +msgstr "Details" #. module: crm #: help:crm.installer,crm_caldav:0 @@ -730,11 +744,13 @@ msgid "" "Helps you to synchronize the meetings with other calendar clients and " "mobiles." msgstr "" +"Helpt u bij het synchroniseren van de afspraken met andere agenda software " +"en mobiele telefoons." #. module: crm #: selection:crm.meeting,freq:0 msgid "Years" -msgstr "" +msgstr "Jaren" #. module: crm #: help:crm.installer,crm_claim:0 @@ -742,6 +758,8 @@ msgid "" "Manages the suppliers and customers claims, including your corrective or " "preventive actions." msgstr "" +"Beheert de leveranciers- en klantklachten, inclusief uw correctieve en " +"voorkomende activiteiten." #. module: crm #: view:crm.lead:0 @@ -757,7 +775,7 @@ msgstr "Segmentatie relaties" #. module: crm #: field:crm.lead.report,probable_revenue:0 msgid "Probable Revenue" -msgstr "" +msgstr "Verwachte omzet" #. module: crm #: help:crm.segmentation,name:0 @@ -773,13 +791,13 @@ msgstr "Waarschijnlijkheid (%)" #. module: crm #: view:crm.lead:0 msgid "Leads Generation" -msgstr "" +msgstr "Leads generatie" #. module: crm #: view:board.board:0 #: model:ir.ui.menu,name:crm.menu_board_statistics_dash msgid "Statistics Dashboard" -msgstr "" +msgstr "Statistisch dashboard" #. module: crm #: code:addons/crm/wizard/crm_lead_to_opportunity.py:0 @@ -804,7 +822,7 @@ msgstr "Televisie" #. module: crm #: field:crm.installer,crm_caldav:0 msgid "Calendar Synchronizing" -msgstr "" +msgstr "Agenda synchronisatie" #. module: crm #: view:crm.segmentation:0 @@ -831,23 +849,23 @@ msgstr "Naam verkoopkans" #. module: crm #: field:crm.meeting,byday:0 msgid "By day" -msgstr "" +msgstr "Op dag" #. module: crm #: field:base.action.rule,act_section_id:0 msgid "Set Team to" -msgstr "" +msgstr "Zet team op" #. module: crm #: view:calendar.attendee:0 #: field:calendar.attendee,categ_id:0 msgid "Event Type" -msgstr "" +msgstr "Soort gebeurtenis" #. module: crm #: model:ir.model,name:crm.model_crm_installer msgid "crm.installer" -msgstr "" +msgstr "crm.installer" #. module: crm #: field:crm.segmentation,exclusif:0 @@ -858,7 +876,7 @@ msgstr "Exclusief" #: code:addons/crm/crm_opportunity.py:0 #, python-format msgid "The opportunity '%s' has been won." -msgstr "" +msgstr "Verkoopkans '%s' is gewonnen." #. module: crm #: help:crm.case.section,active:0 @@ -866,11 +884,13 @@ msgid "" "If the active field is set to true, it will allow you to hide the sales team " "without removing it." msgstr "" +"Als het actief veld is aangevinkt, kunt u het verkoopteam verbergen zonder " +"het te verwijderen." #. module: crm #: help:crm.meeting,alarm_id:0 msgid "Set an alarm at this time, before the event occurs" -msgstr "" +msgstr "Stel het alarm in op een tijd voorafgaand aan de gebeurtenis" #. module: crm #: model:ir.module.module,description:crm.module_meta_information @@ -906,12 +926,39 @@ msgid "" " * My Cases (list)\n" " * Jobs Tracking (graph)\n" msgstr "" +"Het generieke OpenERP Customer Relationship Management\n" +"systeem laat een groep mensen intelligent en efficiënt werken met\n" +"leads, verkoopkansen, afspraken, telefoongesprekken etc.\n" +"Het beheer tkerntaken zoals communicatie, identificatie, priorisatie,\n" +"toewijzing, oplossing en notificatie.\n" +"\n" +"OpenERP zorgt dat gebruikers, klanten en leveranciers erin slagen alle " +"dossiers te volgen. \n" +"Het verzorgt automatische herinneringen, escaleert aanvragen, activeert " +"specifieke methoden\n" +"en tal van andere acties gebaseerd op het bedrijfsbeleid.\n" +"\n" +"Het mooiste van dit systeem dat gebruikers niets sopeciaals hoeven te doen.\n" +"Ze kunnen gewoon een email naar de aanvraag volger sturen. OpenERP zorgt " +"voor het bedanken voor de email, het automatisch doorsturen naar de " +"betreffende medewerkers, en zorgt dat alle toekomstige correspondentie naar " +"de juiste plaats gaat.\n" +"\n" +"De CRM module heeft een email gateway voor de synchronisatie tussen email en " +"OpenERP. \n" +"Maak dashboard voor CRM dat bevat:\n" +" * Mijn leads (list)\n" +" * Leads per stadium (graph)\n" +" * Mijn afspraken (list)\n" +" * Verkoop pijplijn per stadium (graph)\n" +" * Mijn dossiers (list)\n" +" * Banen volgen (graph)\n" #. module: crm #: field:crm.lead.report,create_date:0 #: field:crm.phonecall.report,create_date:0 msgid "Create Date" -msgstr "" +msgstr "Aanmaakdatum" #. module: crm #: field:crm.lead,ref2:0 @@ -927,7 +974,7 @@ msgstr "Verkoop Inkoop" #: view:crm.case.stage:0 #: field:crm.case.stage,requirements:0 msgid "Requirements" -msgstr "" +msgstr "Vereisten" #. module: crm #: help:crm.meeting,exdate:0 @@ -935,11 +982,13 @@ msgid "" "This property defines the list of date/time exceptions for a recurring " "calendar component." msgstr "" +"Deze eigenschap definieert de lijst van datum/tijd uitzonderingen voor een " +"terugkerend agenda-item." #. module: crm #: view:crm.phonecall2opportunity:0 msgid "Convert To Opportunity " -msgstr "" +msgstr "Converteer naar verkoopkans " #. module: crm #: help:crm.case.stage,sequence:0 @@ -965,22 +1014,22 @@ msgstr "Categorie relatie" #: view:crm.add.note:0 #: model:ir.actions.act_window,name:crm.action_crm_add_note msgid "Add Note" -msgstr "" +msgstr "Voeg notitie toe" #. module: crm #: field:crm.lead,is_supplier_add:0 msgid "Supplier" -msgstr "" +msgstr "Leverancier" #. module: crm #: help:crm.send.mail,reply_to:0 msgid "Reply-to of the Sales team defined on this case" -msgstr "" +msgstr "Beantwoordt-aan van het voor dit dosseir gedefinieerde verkoopteam" #. module: crm #: view:crm.lead:0 msgid "Mark Won" -msgstr "" +msgstr "Markeren als gewonnen" #. module: crm #: selection:crm.segmentation.line,expr_name:0 @@ -990,7 +1039,7 @@ msgstr "Inkoophoeveelheid" #. module: crm #: view:crm.lead:0 msgid "Mark Lost" -msgstr "" +msgstr "Markeren als verloren" #. module: crm #: selection:crm.lead.report,month:0 @@ -1003,17 +1052,17 @@ msgstr "Maart" #: code:addons/crm/crm_lead.py:0 #, python-format msgid "The opportunity '%s' has been closed." -msgstr "" +msgstr "Verkoopkans '%s' is gesloten." #. module: crm #: field:crm.lead,day_open:0 msgid "Days to Open" -msgstr "" +msgstr "Dagen voor openen" #. module: crm #: view:crm.meeting:0 msgid "Show time as" -msgstr "" +msgstr "Tijd weergeven als" #. module: crm #: code:addons/crm/crm_lead.py:0 @@ -1036,7 +1085,7 @@ msgstr "Mobiel" #. module: crm #: view:crm.lead:0 msgid "Next Stage" -msgstr "" +msgstr "Volgende stadium" #. module: crm #: view:board.board:0 @@ -1051,7 +1100,7 @@ msgstr "Referentie" #. module: crm #: field:crm.lead,optin:0 msgid "Opt-In" -msgstr "" +msgstr "Opt-In" #. module: crm #: code:addons/crm/crm_opportunity.py:0 @@ -1079,12 +1128,12 @@ msgstr "Volgende actie" #. module: crm #: field:crm.meeting,end_date:0 msgid "Repeat Until" -msgstr "" +msgstr "Herhaal tot" #. module: crm #: view:crm.meeting:0 msgid "Extended Options..." -msgstr "" +msgstr "Uitgebreide opties..." #. module: crm #: field:crm.meeting,date_deadline:0 @@ -1110,12 +1159,12 @@ msgstr "Relatiesegmenten" #. module: crm #: view:res.partner:0 msgid "Previous" -msgstr "" +msgstr "Vorige" #. module: crm #: view:crm.lead:0 msgid "Statistics" -msgstr "" +msgstr "Statistieken" #. module: crm #: field:crm.meeting,attendee_ids:0 @@ -1126,33 +1175,33 @@ msgstr "Deelnemers" #: view:crm.lead2opportunity.action:0 #: view:res.partner:0 msgid "Next" -msgstr "" +msgstr "Volgende" #. module: crm #: view:crm.lead:0 msgid "Stage:" -msgstr "" +msgstr "Stadium:" #. module: crm #: model:crm.case.stage,name:crm.stage_lead5 #: view:crm.lead:0 msgid "Won" -msgstr "" +msgstr "Gewonnen" #. module: crm #: field:crm.lead.report,delay_expected:0 msgid "Overpassed Deadline" -msgstr "" +msgstr "Overschreden einddatum" #. module: crm #: model:crm.case.section,name:crm.section_sales_department msgid "Sales Department" -msgstr "" +msgstr "Verkoopafdeling" #. module: crm #: field:crm.send.mail,html:0 msgid "HTML formatting?" -msgstr "" +msgstr "HTML formaat?" #. module: crm #: field:crm.lead,type:0 @@ -1181,7 +1230,7 @@ msgstr "Laagste" #: view:crm.send.mail:0 #: field:crm.send.mail.attachment,binary:0 msgid "Attachment" -msgstr "" +msgstr "Bijlage" #. module: crm #: view:crm.lead:0 @@ -1196,12 +1245,12 @@ msgstr "Aanmaakdatum" #. module: crm #: help:crm.meeting,interval:0 msgid "Repeat every x" -msgstr "" +msgstr "Herhaal elke x" #. module: crm #: model:crm.case.categ,name:crm.categ_oppor5 msgid "Need a Website Design" -msgstr "" +msgstr "Heeft website ontwerp nodig" #. module: crm #: field:crm.meeting,recurrent_uid:0 @@ -1219,7 +1268,7 @@ msgstr "Onderwerp" #. module: crm #: field:crm.meeting,tu:0 msgid "Tue" -msgstr "" +msgstr "Din" #. module: crm #: view:crm.case.stage:0 @@ -1233,7 +1282,7 @@ msgstr "Fase" #. module: crm #: view:crm.lead:0 msgid "History Information" -msgstr "" +msgstr "Historie informatie" #. module: crm #: constraint:ir.ui.view:0 @@ -1243,27 +1292,27 @@ msgstr "Ongeldige XML voor weergave!" #. module: crm #: field:base.action.rule,act_mail_to_partner:0 msgid "Mail to Partner" -msgstr "" +msgstr "Mail naar relatie" #. module: crm #: view:crm.lead:0 msgid "Mailings" -msgstr "" +msgstr "Mailings" #. module: crm #: field:crm.meeting,class:0 msgid "Mark as" -msgstr "" +msgstr "Markeren als" #. module: crm #: help:crm.meeting,rrule_type:0 msgid "Let the event automatically repeat at that interval" -msgstr "" +msgstr "Laat de gebeurtenis automatisch herhalen met dit interval" #. module: crm #: view:base.action.rule:0 msgid "Condition Case Fields" -msgstr "" +msgstr "Conditie dossier velden" #. module: crm #: view:crm.case.section:0 @@ -1299,23 +1348,23 @@ msgstr "Max relatie-ID bereikt" #: model:ir.actions.act_window,name:crm.action_report_crm_phonecall #: model:ir.ui.menu,name:crm.menu_report_crm_phonecalls_tree msgid "Phone Calls Analysis" -msgstr "" +msgstr "Telefoongesprek Analyse" #. module: crm #: field:crm.lead.report,opening_date:0 #: field:crm.phonecall.report,opening_date:0 msgid "Opening Date" -msgstr "" +msgstr "Openingsdatum" #. module: crm #: help:crm.phonecall,duration:0 msgid "Duration in Minutes" -msgstr "" +msgstr "Duur in minuten" #. module: crm #: help:crm.installer,crm_helpdesk:0 msgid "Manages a Helpdesk service." -msgstr "" +msgstr "Beheert een helpdesk dienst." #. module: crm #: field:crm.segmentation,som_interval:0 @@ -1326,28 +1375,28 @@ msgstr "Dagen per periode" #: code:addons/crm/wizard/crm_lead_to_opportunity.py:0 #, python-format msgid "Closed/Cancelled \\nLeads Could not convert into Opportunity" -msgstr "" +msgstr "Gesloten/Geannuleerd \\nLeads konden niet omgezet in verkoopkans" #. module: crm #: view:crm.lead.report:0 #: view:crm.phonecall.report:0 msgid " Year " -msgstr "" +msgstr " Jaar " #. module: crm #: view:crm.meeting:0 msgid "Edit All" -msgstr "" +msgstr "Bewerk alles" #. module: crm #: field:crm.meeting,fr:0 msgid "Fri" -msgstr "" +msgstr "Vrij" #. module: crm #: field:crm.meeting,write_date:0 msgid "Write Date" -msgstr "" +msgstr "Schrijfdatum" #. module: crm #: view:crm.meeting:0 @@ -1372,7 +1421,7 @@ msgstr "" #: model:ir.actions.act_window,name:crm.action_crm_lead2partner #: model:ir.actions.act_window,name:crm.action_crm_phonecall2partner msgid "Create a Partner" -msgstr "" +msgstr "Relatie aanmaken" #. module: crm #: field:crm.segmentation,state:0 @@ -1382,19 +1431,19 @@ msgstr "Uitvoeringsstatus" #. module: crm #: selection:crm.meeting,week_list:0 msgid "Monday" -msgstr "" +msgstr "Maandag" #. module: crm #: field:crm.lead,day_close:0 msgid "Days to Close" -msgstr "" +msgstr "Dagen tot sluiting" #. module: crm #: field:crm.add.note,attachment_ids:0 #: field:crm.case.section,complete_name:0 #: field:crm.send.mail,attachment_ids:0 msgid "unknown" -msgstr "" +msgstr "onbekend" #. module: crm #: field:crm.lead,id:0 @@ -1406,7 +1455,7 @@ msgstr "ID" #. module: crm #: model:ir.model,name:crm.model_crm_partner2opportunity msgid "Partner To Opportunity" -msgstr "" +msgstr "Relatie naar verkoopkans" #. module: crm #: view:crm.meeting:0 @@ -1424,22 +1473,22 @@ msgstr "Datum" #: view:crm.lead.report:0 #: view:crm.phonecall.report:0 msgid "Extended Filters..." -msgstr "" +msgstr "Uitgebreide filters..." #. module: crm #: model:ir.model,name:crm.model_calendar_attendee msgid "Attendee information" -msgstr "" +msgstr "Informatie deelnemer" #. module: crm #: view:crm.phonecall.report:0 msgid "Search" -msgstr "" +msgstr "Zoeken" #. module: crm #: field:crm.meeting,interval:0 msgid "Interval" -msgstr "" +msgstr "Interval" #. module: crm #: view:crm.segmentation:0 @@ -1455,7 +1504,7 @@ msgstr "Historie" #. module: crm #: field:crm.case.section,code:0 msgid "Code" -msgstr "" +msgstr "Code" #. module: crm #: field:crm.case.section,child_ids:0 @@ -1483,7 +1532,7 @@ msgstr "Telefonische verkoop" #. module: crm #: field:crm.meeting,freq:0 msgid "Frequency" -msgstr "" +msgstr "Frequentie" #. module: crm #: view:crm.lead:0 @@ -1508,17 +1557,17 @@ msgstr "Annuleren" #. module: crm #: model:ir.model,name:crm.model_res_users msgid "res.users" -msgstr "" +msgstr "res.users" #. module: crm #: model:ir.model,name:crm.model_crm_merge_opportunity msgid "Merge two Opportunities" -msgstr "" +msgstr "Twee verkoopkansen samenvoegen" #. module: crm #: selection:crm.meeting,rrule_type:0 msgid "Custom" -msgstr "" +msgstr "Aangepast" #. module: crm #: view:crm.lead:0 @@ -1541,22 +1590,22 @@ msgstr "" #. module: crm #: model:ir.actions.act_window,name:crm.crm_phonecall_categ_action msgid "Phonecall Categories" -msgstr "" +msgstr "Telefoongesprek categoriën" #. module: crm #: view:crm.meeting:0 msgid "Invite People" -msgstr "" +msgstr "Personen uitnodigen" #. module: crm #: view:board.board:0 msgid "Opportunities By Categories" -msgstr "" +msgstr "Verkoopkansen op categorie" #. module: crm #: constraint:crm.case.section:0 msgid "Error ! You cannot create recursive Sales team." -msgstr "" +msgstr "Fout ! U kunt geen recursief verkoopteam maken." #. module: crm #: view:crm.meeting:0 @@ -1573,6 +1622,7 @@ msgstr "Verkoopbedrag" #, python-format msgid "Unable to send mail. Please check SMTP is configured properly." msgstr "" +"Kan geen mail versturen. Controleer aub of SMTP juist is geconfigureerd." #. module: crm #: selection:crm.segmentation.line,expr_operator:0 @@ -1582,7 +1632,7 @@ msgstr "=" #. module: crm #: selection:crm.meeting,state:0 msgid "Unconfirmed" -msgstr "" +msgstr "Onbevestigd" #. module: crm #: field:crm.case.categ,name:0 @@ -1608,27 +1658,27 @@ msgstr "Plan een gewone of telefonische afspraak" #: view:crm.lead.report:0 #: view:crm.phonecall.report:0 msgid "My Case(s)" -msgstr "" +msgstr "Mijn dossier(s)" #. module: crm #: field:crm.lead,birthdate:0 msgid "Birthdate" -msgstr "" +msgstr "Geboortedatum" #. module: crm #: view:crm.meeting:0 msgid "The" -msgstr "" +msgstr "De" #. module: crm #: field:crm.send.mail.attachment,wizard_id:0 msgid "Wizard" -msgstr "" +msgstr "Assistent" #. module: crm #: constraint:ir.rule:0 msgid "Rules are not supported for osv_memory objects !" -msgstr "" +msgstr "Regels worden niet ondersteund voor osv_memory objecten !" #. module: crm #: help:crm.lead,section_id:0 @@ -1636,12 +1686,14 @@ msgid "" "Sales team to which this case belongs to. Defines responsible user and e-" "mail address for the mail gateway." msgstr "" +"Verkoopteam waar dit dossier bij hoort. Definieert verantwoordelijke en e-" +"mail adres voor de mail gateway." #. module: crm #: view:crm.lead:0 #: view:crm.phonecall:0 msgid "Creation" -msgstr "" +msgstr "Aanmaak" #. module: crm #: selection:crm.lead,priority:0 @@ -1659,37 +1711,37 @@ msgstr "Converteer naar prospect naar zakenrelatie" #. module: crm #: view:crm.phonecall2opportunity:0 msgid "_Convert" -msgstr "" +msgstr "_Omzetten" #. module: crm #: selection:crm.meeting,week_list:0 msgid "Saturday" -msgstr "" +msgstr "Zaterdag" #. module: crm #: selection:crm.meeting,byday:0 msgid "Fifth" -msgstr "" +msgstr "Vijfde" #. module: crm #: view:crm.phonecall2phonecall:0 msgid "_Schedule" -msgstr "" +msgstr "_Planning" #. module: crm #: field:crm.lead.report,delay_close:0 msgid "Delay to Close" -msgstr "" +msgstr "Wachttijd tot sluiting" #. module: crm #: field:crm.meeting,we:0 msgid "Wed" -msgstr "" +msgstr "Woe" #. module: crm #: model:crm.case.categ,name:crm.categ_oppor6 msgid "Potential Reseller" -msgstr "" +msgstr "Potentiele wederverkoper" #. module: crm #: field:crm.lead.report,planned_revenue:0 @@ -1703,27 +1755,27 @@ msgstr "Geraamde omzet" #: view:crm.phonecall:0 #: view:crm.phonecall.report:0 msgid "Group By..." -msgstr "" +msgstr "Groepeer op.." #. module: crm #: help:crm.lead,partner_id:0 msgid "Optional linked partner, usually after conversion of the lead" -msgstr "" +msgstr "Optioneel gekoppelde relatie, meestal na omzetten van de lead" #. module: crm #: view:crm.meeting:0 msgid "Invitation details" -msgstr "" +msgstr "Details uitnodiging" #. module: crm #: field:crm.case.section,parent_id:0 msgid "Parent Team" -msgstr "" +msgstr "Bovenliggende team" #. module: crm #: field:crm.lead,date_action:0 msgid "Next Action Date" -msgstr "" +msgstr "Volgende actiedatum" #. module: crm #: selection:crm.segmentation,state:0 @@ -1738,18 +1790,18 @@ msgstr "Uren" #. module: crm #: field:crm.lead,zip:0 msgid "Zip" -msgstr "" +msgstr "Postcode" #. module: crm #: code:addons/crm/crm_lead.py:0 #, python-format msgid "The case '%s' has been opened." -msgstr "" +msgstr "Dossier '%s' is geopend." #. module: crm #: view:crm.installer:0 msgid "title" -msgstr "" +msgstr "titel" #. module: crm #: model:crm.case.categ,name:crm.categ_phone1 @@ -1764,22 +1816,24 @@ msgid "" "This percentage depicts the default/average probability of the Case for this " "stage to be a success" msgstr "" +"Dit percentage geeft de standaard/gemiddelde waarschijnlijkheid aan voor dit " +"stadium om te slagen bij het dossier" #. module: crm #: view:crm.phonecall.report:0 #: model:ir.actions.act_window,name:crm.act_crm_opportunity_crm_phonecall_new msgid "Phone calls" -msgstr "" +msgstr "Telefoongesprek" #. module: crm #: selection:crm.meeting,show_as:0 msgid "Free" -msgstr "" +msgstr "Vrij" #. module: crm #: view:crm.installer:0 msgid "Synchronization" -msgstr "" +msgstr "Synchronisatie" #. module: crm #: field:crm.case.section,allow_unlink:0 @@ -1789,7 +1843,7 @@ msgstr "Sta verwijderen toe" #. module: crm #: field:crm.meeting,mo:0 msgid "Mon" -msgstr "" +msgstr "Maa" #. module: crm #: selection:crm.lead,priority:0 @@ -1804,7 +1858,7 @@ msgstr "Hoogste" #: view:crm.lead:0 #: field:crm.lead,description:0 msgid "Notes" -msgstr "" +msgstr "Notities" #. module: crm #: selection:crm.meeting,freq:0 @@ -1820,18 +1874,18 @@ msgstr "Waarde" #: view:crm.lead:0 #: view:crm.lead.report:0 msgid "Opportunity by Categories" -msgstr "" +msgstr "Verkoopkansen op categorie" #. module: crm #: view:crm.lead:0 #: field:crm.lead,partner_name:0 msgid "Customer Name" -msgstr "" +msgstr "Klantnaam" #. module: crm #: model:ir.model,name:crm.model_crm_phonecall2opportunity msgid "Phonecall To Opportunity" -msgstr "" +msgstr "Telefoongesprek naar verkoopkans" #. module: crm #: field:crm.case.section,reply_to:0 @@ -1846,7 +1900,7 @@ msgstr "Minuten" #. module: crm #: view:crm.case.section:0 msgid "Select stages for this Sales Team" -msgstr "" +msgstr "Selecteer stadia voor dit verkoopteam" #. module: crm #: code:addons/crm/wizard/crm_merge_opportunities.py:0 @@ -1854,6 +1908,7 @@ msgstr "" msgid "" "There are no other 'Open' or 'Pending' Opportunities for the partner '%s'." msgstr "" +"Er zijn geen andere 'Open' of 'Wachtend' verkoopkansen voor de relatie '%s'." #. module: crm #: model:process.transition,note:crm.process_transition_leadpartner0 @@ -1890,32 +1945,32 @@ msgstr "Extra info" #: model:ir.actions.act_window,name:crm.action_merge_opportunities #: model:ir.actions.act_window,name:crm.merge_opportunity_act msgid "Merge Opportunities" -msgstr "" +msgstr "Verkoopkansen samenvoegen" #. module: crm #: model:crm.case.resource.type,name:crm.type_lead5 msgid "Google Adwords" -msgstr "" +msgstr "Google Adwords" #. module: crm #: model:ir.model,name:crm.model_crm_phonecall msgid "crm.phonecall" -msgstr "" +msgstr "crm.phonecall" #. module: crm #: model:crm.case.resource.type,name:crm.type_lead3 msgid "Mail Campaign 2" -msgstr "" +msgstr "Mail Campagne 2" #. module: crm #: model:crm.case.resource.type,name:crm.type_lead2 msgid "Mail Campaign 1" -msgstr "" +msgstr "Mail Campagne 1" #. module: crm #: view:crm.lead:0 msgid "Create" -msgstr "" +msgstr "Aanmaken" #. module: crm #: code:addons/crm/crm.py:0 @@ -1942,7 +1997,7 @@ msgstr "Gebruik Verkoop-/Inkoop-regels" #. module: crm #: model:ir.model,name:crm.model_crm_lead2opportunity_partner msgid "Lead To Opportunity Partner" -msgstr "" +msgstr "Lead naar verkoopkans relatie" #. module: crm #: field:crm.meeting,location:0 @@ -1952,18 +2007,18 @@ msgstr "Locatie" #. module: crm #: view:crm.lead:0 msgid "Reply" -msgstr "" +msgstr "Antwoord" #. module: crm #: selection:crm.meeting,freq:0 msgid "Weeks" -msgstr "" +msgstr "Weken" #. module: crm #: code:addons/crm/wizard/crm_lead_to_opportunity.py:0 #, python-format msgid "Lead " -msgstr "" +msgstr "Lead " #. module: crm #: code:addons/crm/crm.py:0 @@ -1974,7 +2029,7 @@ msgstr "Fout!" #. module: crm #: selection:crm.meeting,freq:0 msgid "Seconds" -msgstr "" +msgstr "Seconden" #. module: crm #: model:ir.model,name:crm.model_crm_segmentation_line @@ -1995,23 +2050,25 @@ msgstr "Caldav URL" #. module: crm #: view:crm.lead:0 msgid "Expected Revenues" -msgstr "" +msgstr "Verwachte omzet" #. module: crm #: model:crm.case.resource.type,name:crm.type_lead6 msgid "Google Adwords 2" -msgstr "" +msgstr "Google Adwords 2" #. module: crm #: help:crm.lead,type:0 #: help:crm.lead.report,type:0 msgid "Type is used to separate Leads and Opportunities" -msgstr "" +msgstr "Soort wordt gebruikt om leads en verkoopkansen te scheiden" #. module: crm #: view:crm.phonecall2partner:0 msgid "Are you sure you want to create a partner based on this Phonecall ?" msgstr "" +"Weet u zeker dat u een relatie wilt aanmaken op basis van dit " +"telefoongesprek?" #. module: crm #: selection:crm.lead.report,month:0 @@ -2025,12 +2082,12 @@ msgstr "Juli" #: model:ir.model,name:crm.model_crm_case_section #: model:ir.ui.menu,name:crm.menu_crm_case_section_act msgid "Sales Teams" -msgstr "" +msgstr "Verkoopteams" #. module: crm #: model:ir.model,name:crm.model_crm_lead2partner msgid "Lead to Partner" -msgstr "" +msgstr "Lead naar relatie" #. module: crm #: view:crm.segmentation:0 @@ -2042,12 +2099,12 @@ msgstr "Segmentatie" #. module: crm #: view:crm.lead:0 msgid "Team" -msgstr "" +msgstr "Team" #. module: crm #: field:crm.installer,outlook:0 msgid "MS-Outlook" -msgstr "" +msgstr "MS-Outlook" #. module: crm #: view:crm.phonecall:0 @@ -2059,7 +2116,7 @@ msgstr "Niet vastgehouden" #. module: crm #: field:crm.lead.report,probability:0 msgid "Probability" -msgstr "" +msgstr "Waarschijnlijkheid" #. module: crm #: view:crm.lead.report:0 @@ -2089,28 +2146,30 @@ msgstr "Maak een nieuwe relatie" #: view:crm.meeting:0 #: view:res.partner:0 msgid "Start Date" -msgstr "" +msgstr "Startdatum" #. module: crm #: selection:crm.phonecall,state:0 #: view:crm.phonecall.report:0 msgid "Todo" -msgstr "" +msgstr "Te doen" #. module: crm #: view:crm.meeting:0 msgid "Delegate" -msgstr "" +msgstr "Delegeren" #. module: crm #: view:crm.meeting:0 msgid "Decline" -msgstr "" +msgstr "Weigeren" #. module: crm #: help:crm.lead,optin:0 msgid "If opt-in is checked, this contact has accepted to receive emails." msgstr "" +"Als opt-in is aangevinkt, heeft deze contactpersoon geaccepteerd om emails " +"te ontvangen." #. module: crm #: view:crm.meeting:0 @@ -2149,7 +2208,7 @@ msgstr "Gesloten" #. module: crm #: view:crm.installer:0 msgid "Plug-In" -msgstr "" +msgstr "Plug-In" #. module: crm #: model:crm.case.categ,name:crm.categ_meet2 @@ -2180,7 +2239,7 @@ msgstr "Klant afspraak" #: view:crm.lead:0 #: field:crm.lead,email_cc:0 msgid "Global CC" -msgstr "" +msgstr "Globale CC" #. module: crm #: view:crm.phonecall:0 @@ -2194,7 +2253,7 @@ msgstr "Telefoongesprekken" #: help:crm.lead.report,delay_open:0 #: help:crm.phonecall.report,delay_open:0 msgid "Number of Days to open the case" -msgstr "" +msgstr "Aantal dagen tot openen dossier" #. module: crm #: field:crm.lead,phone:0 @@ -2224,7 +2283,7 @@ msgstr ">" #. module: crm #: view:crm.meeting:0 msgid "Uncertain" -msgstr "" +msgstr "Onzeker" #. module: crm #: field:crm.send.mail,email_cc:0 diff --git a/addons/crm/i18n/pl.po b/addons/crm/i18n/pl.po index 185113bcff3..2383ec59e8c 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-10-18 17:46+0000\n" -"PO-Revision-Date: 2010-10-24 13:14+0000\n" -"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\n" +"PO-Revision-Date: 2010-10-26 08:36+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\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-10-25 04:39+0000\n" +"X-Launchpad-Export-Date: 2010-10-27 04:58+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: crm @@ -445,13 +445,13 @@ msgstr "Zaktualizuj datę" #. module: crm #: help:crm.meeting,count:0 msgid "Repeat max that times" -msgstr "" +msgstr "Powtórz maksymalnie razy" #. module: crm #: view:crm.lead2opportunity.action:0 #: field:crm.lead2opportunity.action,name:0 msgid "Select Action" -msgstr "" +msgstr "Wybierz akcję" #. module: crm #: field:base.action.rule,trg_categ_id:0 @@ -469,17 +469,17 @@ msgstr "Kategoria" #. module: crm #: view:crm.lead.report:0 msgid "#Opportunities" -msgstr "" +msgstr "#Szans" #. module: crm #: model:crm.case.resource.type,name:crm.type_oppor2 msgid "Campaign 1" -msgstr "" +msgstr "Kampania 1" #. module: crm #: model:crm.case.resource.type,name:crm.type_oppor1 msgid "Campaign 2" -msgstr "" +msgstr "Kampania 2" #. module: crm #: view:crm.meeting:0 @@ -489,12 +489,12 @@ msgstr "Prywatność" #. module: crm #: view:crm.lead.report:0 msgid "Opportunity Analysis" -msgstr "" +msgstr "Analiza szans" #. module: crm #: help:crm.meeting,location:0 msgid "Location of Event" -msgstr "" +msgstr "Miejsce zdarzenia" #. module: crm #: field:crm.meeting,rrule:0 @@ -504,7 +504,7 @@ msgstr "Reguła rekurencyjna" #. module: crm #: help:crm.installer,fetchmail:0 msgid "Allows you to receive E-Mails from POP/IMAP server." -msgstr "" +msgstr "Pozwala otrzymywać maile z serwera PO/IMAP." #. module: crm #: model:process.transition,note:crm.process_transition_opportunitymeeting0 @@ -514,7 +514,7 @@ msgstr "Spotkanie albo rozmowa telefoniczna w sprawie szansy" #. module: crm #: model:process.node,note:crm.process_node_leads0 msgid "Very first contact with new prospect" -msgstr "Pierwszy kontakt z tą okazją" +msgstr "Pierwszy kontakt z nowym potencjalnym klientem" #. module: crm #: code:addons/crm/crm_lead.py:0 @@ -564,7 +564,7 @@ msgstr "Nie uruchomiony" #: view:crm.send.mail:0 #: model:ir.actions.act_window,name:crm.action_crm_reply_mail msgid "Reply to last Mail" -msgstr "" +msgstr "Odpowiedz na ostatni mail" #. module: crm #: field:crm.lead,email:0 @@ -584,7 +584,7 @@ msgstr "" #. module: crm #: field:crm.meeting,count:0 msgid "Count" -msgstr "" +msgstr "Liczba" #. module: crm #: selection:crm.lead.report,month:0 @@ -608,7 +608,7 @@ msgstr "Ci ludzie otrzymają wiadomość" #: view:crm.meeting:0 #: field:crm.meeting,name:0 msgid "Summary" -msgstr "" +msgstr "Podsumowanie" #. module: crm #: view:crm.segmentation:0 @@ -629,6 +629,8 @@ msgid "" "Allows you to link your e-mail to OpenERP's documents. You can attach it to " "any existing one in OpenERP or create a new one." msgstr "" +"Pozwala połączyć twoje wiadomości z dokumentami OpenERP. Możesz połączyć je " +"z dowolnym istniejącym dokumentem lub utworzyć nowy dokument." #. module: crm #: view:crm.case.categ:0 @@ -648,12 +650,12 @@ msgstr "" #. module: crm #: view:crm.segmentation:0 msgid "Profiling Options" -msgstr "" +msgstr "Opcje profilowania" #. module: crm #: view:crm.phonecall.report:0 msgid "#Phone calls" -msgstr "" +msgstr "# telefonów" #. module: crm #: view:crm.lead:0 @@ -666,13 +668,13 @@ msgid "" "The channels represent the different communication " "modes available with the customer. With each commercial opportunity, you can " "indicate the canall which is this opportunity source." -msgstr "" +msgstr "Kanały są różnymi sposobami komunikowania się z klientem." #. module: crm #: code:addons/crm/crm_meeting.py:0 #, python-format msgid "The meeting '%s' has been confirmed." -msgstr "" +msgstr "Spotkanie '%s' zostało potwierdzone." #. module: crm #: field:crm.case.section,user_id:0 diff --git a/addons/crm_profiling/i18n/ru.po b/addons/crm_profiling/i18n/ru.po index 815e7f56a5c..6e9f50c9ff1 100644 --- a/addons/crm_profiling/i18n/ru.po +++ b/addons/crm_profiling/i18n/ru.po @@ -6,17 +6,22 @@ msgid "" 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-09-29 10:27+0000\n" +"POT-Creation-Date: 2010-10-18 17:46+0000\n" +"PO-Revision-Date: 2010-10-26 08:33+0000\n" "Last-Translator: Chertykov Denis <chertykov@gmail.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-09-30 04:43+0000\n" +"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: crm_profiling +#: view:crm_profiling.questionnaire:0 +msgid "Questions List" +msgstr "Опросный лист" + +#. module: crm_profiling #: constraint:ir.model:0 msgid "" "The Object name must start with x_ and not contain any special character !" @@ -25,6 +30,11 @@ msgstr "" "символов !" #. module: crm_profiling +#: constraint:ir.actions.act_window:0 +msgid "Invalid model name in the action definition." +msgstr "Недопустимое имя модели в определении действия." + +#. module: crm_profiling #: field:crm_profiling.answer,question_id:0 #: field:crm_profiling.question,name:0 #: model:ir.model,name:crm_profiling.model_crm_profiling_question @@ -42,14 +52,14 @@ msgid "Child Profiles" msgstr "Подчиненные профили" #. module: crm_profiling -#: model:ir.module.module,shortdesc:crm_profiling.module_meta_information -msgid "crm_profiling management" -msgstr "Управление профилями CRM" +#: view:crm.segmentation:0 +msgid "Partner Segmentations" +msgstr "Сегментация партнеров" #. module: crm_profiling -#: constraint:ir.actions.act_window:0 -msgid "Invalid model name in the action definition." -msgstr "Недопустимое имя модели в определении действия." +#: constraint:ir.ui.menu:0 +msgid "Error ! You can not create recursive Menu." +msgstr "Ошибка ! Нельзя создать зацикленные меню." #. module: crm_profiling #: field:crm_profiling.answer,name:0 @@ -58,11 +68,22 @@ msgid "Answer" msgstr "Ответ" #. module: crm_profiling +#: model:ir.model,name:crm_profiling.model_crm_segmentation +msgid "Partner Segmentation" +msgstr "" + +#. module: crm_profiling #: view:res.partner:0 msgid "Profiling" msgstr "Профилирование" #. module: crm_profiling +#: model:ir.module.module,shortdesc:crm_profiling.module_meta_information +msgid "Crm Profiling management - To Perform Segmentation within Partners" +msgstr "" + +#. module: crm_profiling +#: view:crm_profiling.questionnaire:0 #: field:crm_profiling.questionnaire,description:0 msgid "Description" msgstr "Описание" @@ -102,11 +123,12 @@ msgid "Questionnaires" msgstr "Опросники" #. module: crm_profiling -#: field:crm_profiling.questionnaire,name:0 -#: model:ir.model,name:crm_profiling.model_crm_profiling_questionnaire -#: wizard_view:open_questionnaire,init:0 -msgid "Questionnaire" -msgstr "Опросник" +#: help:crm.segmentation,profiling_active:0 +msgid "" +"Check this box if you want to use this tab as " +"part of the segmentation rule. If not checked, " +"the criteria beneath will be ignored" +msgstr "" #. module: crm_profiling #: constraint:crm.segmentation:0 @@ -130,13 +152,6 @@ msgid "Included Answers" msgstr "Включенные Ответы" #. module: crm_profiling -#: help:crm.segmentation,profiling_active:0 -msgid "" -"Check this box if you want to use this tab as part of the segmentation rule. " -"If not checked, the criteria beneath will be ignored" -msgstr "" - -#. module: crm_profiling #: view:crm_profiling.question:0 #: field:crm_profiling.questionnaire,questions_ids:0 #: model:ir.actions.act_window,name:crm_profiling.open_questions @@ -156,9 +171,18 @@ msgid "Cancel" msgstr "Отмена" #. module: crm_profiling -#: view:crm.segmentation:0 -msgid "Partner Segmentations" -msgstr "Сегментация партнеров" +#: model:ir.model,name:crm_profiling.model_res_partner +msgid "Partner" +msgstr "Партнёр" + +#. module: crm_profiling +#: code:addons/crm_profiling/crm_profiling.py:0 +#: field:crm_profiling.questionnaire,name:0 +#: model:ir.model,name:crm_profiling.model_crm_profiling_questionnaire +#: wizard_view:open_questionnaire,init:0 +#, python-format +msgid "Questionnaire" +msgstr "Опросник" #. module: crm_profiling #: model:ir.actions.wizard,name:crm_profiling.wizard_open_questionnaire @@ -169,3 +193,6 @@ msgstr "Используя опросник" #: wizard_button:open_questionnaire,open,compute:0 msgid "Save Data" msgstr "Сохранить данные" + +#~ msgid "crm_profiling management" +#~ msgstr "Управление профилями CRM" diff --git a/addons/delivery/i18n/ru.po b/addons/delivery/i18n/ru.po index 1049fb707fe..1a9f04db159 100644 --- a/addons/delivery/i18n/ru.po +++ b/addons/delivery/i18n/ru.po @@ -6,33 +6,25 @@ msgid "" 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-10-16 09:49+0000\n" -"Last-Translator: Nikolay Chesnokov <chesnokov_n@msn.com>\n" +"POT-Creation-Date: 2010-10-18 17:46+0000\n" +"PO-Revision-Date: 2010-10-26 08:44+0000\n" +"Last-Translator: Chertykov Denis <chertykov@gmail.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-10-17 04:53+0000\n" +"X-Launchpad-Export-Date: 2010-10-27 04:58+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: delivery -#: constraint:ir.model:0 -msgid "" -"The Object name must start with x_ and not contain any special character !" -msgstr "" -"Название объекта должно начинаться с x_ и не должно содержать специальных " -"символов !" +#: report:sale.shipping:0 +msgid "Order Ref." +msgstr "Ссылка заказа" #. module: delivery -#: selection:delivery.grid.line,operator:0 -msgid ">=" -msgstr ">=" - -#. module: delivery -#: view:res.partner:0 -msgid "Sales & Purchases" -msgstr "Продажи и закупки" +#: model:product.template,name:delivery.delivery_product_product_template +msgid "Delivery by Poste" +msgstr "Доставка почтой" #. module: delivery #: view:delivery.grid:0 @@ -40,24 +32,20 @@ msgid "Destination" msgstr "Место назначения" #. module: delivery -#: model:product.template,name:delivery.delivery_product_product_template -msgid "Delivery by Poste" -msgstr "Доставка почтой" - -#. module: delivery -#: constraint:ir.ui.view:0 -msgid "Invalid XML for View Architecture!" -msgstr "Неправильный XML для просмотра архитектуры!" +#: field:stock.move,weight_net:0 +msgid "Net weight" +msgstr "Вес нетто" #. module: delivery -#: constraint:res.partner:0 -msgid "Error ! You can not create recursive associated members." -msgstr "Ошибка! Вы не можете создать рекурсивных связанных участников." +#: code:addons/delivery/delivery.py:0 +#, python-format +msgid "No price available !" +msgstr "Нет каталога !" #. module: delivery -#: field:delivery.grid,state_ids:0 -msgid "States" -msgstr "Cостояния" +#: model:ir.model,name:delivery.model_delivery_grid_line +msgid "Delivery Grid Line" +msgstr "" #. module: delivery #: constraint:ir.actions.act_window:0 @@ -65,21 +53,62 @@ msgid "Invalid model name in the action definition." msgstr "Недопустимое имя модели в определении действия." #. module: delivery -#: help:res.partner,property_delivery_carrier:0 -msgid "This delivery method will be used when invoicing from packing." +#: view:delivery.grid:0 +msgid "Delivery grids" +msgstr "Расценки на доставку" + +#. module: delivery +#: selection:delivery.grid.line,type:0 +#: selection:delivery.grid.line,variable_factor:0 +#: field:stock.picking,volume:0 +msgid "Volume" +msgstr "Объем" + +#. module: delivery +#: field:delivery.grid,line_ids:0 +msgid "Grid Line" +msgstr "Разделяемая строка" + +#. module: delivery +#: model:ir.actions.report.xml,name:delivery.report_shipping +msgid "Delivery order" +msgstr "Заказ на доставку" + +#. module: delivery +#: view:res.partner:0 +msgid "Deliveries Properties" +msgstr "Свойства доставки" + +#. module: delivery +#: model:ir.actions.act_window,name:delivery.action_picking_tree4 +msgid "Picking to be invoiced" msgstr "" -"Этот метод доставки должен использоваться при фактурировании на основании " -"данных упаковки." #. module: delivery -#: model:ir.model,name:delivery.model_delivery_grid -msgid "Delivery Grid" -msgstr "Расценки на доставку" +#: help:delivery.grid,sequence:0 +msgid "Gives the sequence order when displaying a list of delivery grid." +msgstr "" #. module: delivery -#: field:delivery.grid,zip_from:0 -msgid "Start Zip" -msgstr "Почтовый индекс отправителя" +#: view:delivery.grid:0 +#: field:delivery.grid,country_ids:0 +msgid "Countries" +msgstr "Страны" + +#. module: delivery +#: report:sale.shipping:0 +msgid "Delivery Order :" +msgstr "Заказ на доставку:" + +#. module: delivery +#: model:ir.model,name:delivery.model_sale_order +msgid "Sale Order" +msgstr "Заказ на продажу" + +#. module: delivery +#: field:delivery.grid.line,variable_factor:0 +msgid "Variable Factor" +msgstr "Переменный фактор" #. module: delivery #: selection:delivery.grid.line,price_type:0 @@ -87,31 +116,41 @@ msgid "Fixed" msgstr "Фиксированный" #. module: delivery -#: field:delivery.grid,line_ids:0 -msgid "Grid Line" -msgstr "Разделяемая строка" +#: view:delivery.sale.order:0 +#: field:delivery.sale.order,carrier_id:0 +#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form +#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form +#: field:res.partner,property_delivery_carrier:0 +msgid "Delivery Method" +msgstr "Метод доставки" #. module: delivery -#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form -#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form -msgid "Delivery Pricelist" -msgstr "Каталог доставки" +#: help:delivery.grid,active:0 +msgid "" +"If the active field is set to true, it will allow you to hide the delivery " +"grid without removing it." +msgstr "" #. module: delivery -#: model:ir.actions.act_window,name:delivery.action_picking_tree5 -#: model:ir.ui.menu,name:delivery.menu_action_picking_tree5 -msgid "Generate Draft Invoices On Receptions" -msgstr "Генерировать черновики счетов при получении" +#: model:ir.model,name:delivery.model_stock_move +msgid "Stock Move" +msgstr "Движение ТМЦ" #. module: delivery -#: model:ir.model,name:delivery.model_delivery_grid_line -msgid "Delivery line of grid" -msgstr "Разделяемая строка поставки" +#: code:addons/delivery/delivery.py:0 +#, python-format +msgid "No line matched this order in the choosed delivery grids !" +msgstr "" #. module: delivery -#: model:ir.ui.menu,name:delivery.menu_delivery -msgid "Delivery" -msgstr "Доставка" +#: field:stock.picking,carrier_tracking_ref:0 +msgid "Carrier Tracking Ref" +msgstr "" + +#. module: delivery +#: field:stock.picking,weight_net:0 +msgid "Net Weight" +msgstr "Вес нетто" #. module: delivery #: view:delivery.grid.line:0 @@ -119,61 +158,76 @@ msgid "Grid Lines" msgstr "Разделяемые строки" #. module: delivery -#: field:delivery.grid.line,grid_id:0 -msgid "Grid" -msgstr "Разделение" +#: view:delivery.grid:0 +msgid "Grid definition" +msgstr "Определение разделения" #. module: delivery -#: view:res.partner:0 -msgid "Deliveries Properties" -msgstr "Свойства доставки" +#: view:delivery.sale.order:0 +msgid "_Cancel" +msgstr "_Отмена" #. module: delivery -#: field:delivery.carrier,active:0 -#: field:delivery.grid,active:0 -msgid "Active" -msgstr "Активен" +#: field:delivery.grid.line,operator:0 +msgid "Operator" +msgstr "Оператор" #. module: delivery -#: view:delivery.grid:0 -msgid "Grid definition" -msgstr "Определение разделения" +#: model:ir.model,name:delivery.model_res_partner +msgid "Partner" +msgstr "Партнёр" #. module: delivery -#: selection:delivery.grid.line,type:0 -#: selection:delivery.grid.line,variable_factor:0 -msgid "Weight * Volume" -msgstr "Вес * объем" +#: constraint:ir.ui.menu:0 +msgid "Error ! You can not create recursive Menu." +msgstr "Ошибка ! Нельзя создать зацикленные меню." #. module: delivery -#: selection:delivery.grid.line,operator:0 -msgid "=" -msgstr "=" +#: report:sale.shipping:0 +msgid "Invoiced to" +msgstr "счет-фактура" #. module: delivery -#: field:delivery.carrier,product_id:0 -msgid "Delivery Product" -msgstr "Услуга или изделие, соответствующее доставке" +#: model:ir.model,name:delivery.model_stock_picking +msgid "Picking List" +msgstr "Комплектовочный лист" #. module: delivery -#: view:delivery.grid.line:0 -msgid "Condition" -msgstr "Условие" +#: model:ir.model,name:delivery.model_delivery_sale_order +msgid "Make Delievery" +msgstr "Сделать доставку" #. module: delivery -#: model:ir.model,name:delivery.model_delivery_carrier -msgid "Carrier and delivery grids" -msgstr "Разделение поставки и перевозчика" +#: model:ir.module.module,description:delivery.module_meta_information +msgid "" +"Allows you to add delivery methods in sale orders and picking.\n" +" You can define your own carrier and delivery grids for prices.\n" +" When creating invoices from picking, OpenERP is able to add and compute " +"the shipping line.\n" +"\n" +" " +msgstr "" #. module: delivery -#: field:delivery.grid.line,standard_price:0 -msgid "Cost Price" -msgstr "Себестоимость" +#: code:addons/delivery/stock.py:0 +#, python-format +msgid "Warning" +msgstr "Внимание" #. module: delivery -#: field:delivery.grid.line,name:0 -msgid "Name" -msgstr "Название" +#: field:delivery.grid.line,grid_id:0 +msgid "Grid" +msgstr "Разделение" + +#. module: delivery +#: field:delivery.grid,zip_to:0 +msgid "To Zip" +msgstr "Почтовый индекс получателя" + +#. module: delivery +#: constraint:ir.ui.view:0 +msgid "Invalid XML for View Architecture!" +msgstr "Неправильный XML для просмотра архитектуры!" #. module: delivery #: constraint:product.template:0 @@ -183,9 +237,49 @@ msgstr "" "категориям." #. module: delivery -#: field:delivery.grid,country_ids:0 -msgid "Countries" -msgstr "Страны" +#: report:sale.shipping:0 +msgid "Order Date" +msgstr "Дата заказа" + +#. module: delivery +#: field:delivery.grid,name:0 +msgid "Grid Name" +msgstr "Имя разделения" + +#. module: delivery +#: view:stock.move:0 +msgid "Weights" +msgstr "Вес" + +#. module: delivery +#: field:stock.picking,number_of_packages:0 +msgid "Number of Packages" +msgstr "Количество упаковок" + +#. module: delivery +#: selection:delivery.grid.line,type:0 +#: selection:delivery.grid.line,variable_factor:0 +#: report:sale.shipping:0 +#: field:stock.move,weight:0 +#: field:stock.picking,weight:0 +msgid "Weight" +msgstr "Вес" + +#. module: delivery +#: field:sale.order,carrier_id:0 +msgid "Delivery method" +msgstr "Метод доставки" + +#. module: delivery +#: code:addons/delivery/wizard/delivery_sale_order.py:0 +#, python-format +msgid "No grid available !" +msgstr "" + +#. module: delivery +#: selection:delivery.grid.line,operator:0 +msgid ">=" +msgstr ">=" #. module: delivery #: constraint:product.template:0 @@ -195,14 +289,51 @@ msgstr "" "Ошибка. ЕИМ по умолчанию и закупочная ЕИМ должны иметь одинаковую категорию." #. module: delivery -#: view:sale.order:0 -msgid "Notes" -msgstr "Примечания" +#: code:addons/delivery/wizard/delivery_sale_order.py:0 +#, python-format +msgid "Order not in draft state !" +msgstr "Заказ не в состоянии \"Черновик\" !" #. module: delivery -#: field:delivery.grid.line,variable_factor:0 -msgid "Variable Factor" -msgstr "Переменный фактор" +#: constraint:res.partner:0 +msgid "Error ! You can not create recursive associated members." +msgstr "Ошибка! Вы не можете создать рекурсивных связанных участников." + +#. module: delivery +#: report:sale.shipping:0 +msgid "Lot" +msgstr "Партия" + +#. module: delivery +#: model:ir.model,name:delivery.model_delivery_grid +msgid "Delivery Grid" +msgstr "Расценки на доставку" + +#. module: delivery +#: field:delivery.carrier,active:0 +#: field:delivery.grid,active:0 +msgid "Active" +msgstr "Активен" + +#. module: delivery +#: report:sale.shipping:0 +msgid "Shipping Date" +msgstr "Дата отгрузки" + +#. module: delivery +#: field:delivery.carrier,product_id:0 +msgid "Delivery Product" +msgstr "Услуга или изделие, соответствующее доставке" + +#. module: delivery +#: view:delivery.grid.line:0 +msgid "Condition" +msgstr "Условие" + +#. module: delivery +#: field:delivery.grid.line,standard_price:0 +msgid "Cost Price" +msgstr "Себестоимость" #. module: delivery #: selection:delivery.grid.line,price_type:0 @@ -211,153 +342,221 @@ msgid "Variable" msgstr "Переменная" #. module: delivery -#: field:delivery.grid,name:0 -msgid "Grid Name" -msgstr "Имя разделения" +#: help:res.partner,property_delivery_carrier:0 +msgid "This delivery method will be used when invoicing from picking." +msgstr "" #. module: delivery -#: view:delivery.carrier:0 -#: field:delivery.carrier,name:0 -#: field:delivery.grid,carrier_id:0 -#: field:stock.picking,carrier_id:0 -msgid "Carrier" -msgstr "Доставка" +#: field:delivery.grid.line,max_value:0 +msgid "Maximum Value" +msgstr "Максимальное значение" #. module: delivery -#: selection:delivery.grid.line,type:0 -#: selection:delivery.grid.line,variable_factor:0 -#: field:stock.picking,volume:0 -msgid "Volume" -msgstr "Объем" +#: report:sale.shipping:0 +msgid "Quantity" +msgstr "Количество" #. module: delivery -#: field:delivery.grid.line,max_value:0 -msgid "Maximum Value" -msgstr "Максимальное значение" +#: field:delivery.grid,zip_from:0 +msgid "Start Zip" +msgstr "Почтовый индекс отправителя" #. module: delivery -#: wizard_button:delivery.sale.order,init,delivery:0 -msgid "Add Delivery Costs" -msgstr "Добавить стоимость доставки" +#: help:sale.order,carrier_id:0 +msgid "" +"Complete this field if you plan to invoice the shipping based on picking." +msgstr "" #. module: delivery -#: wizard_field:delivery.sale.order,init,carrier_id:0 -#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form -#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form -#: field:res.partner,property_delivery_carrier:0 -msgid "Delivery Method" -msgstr "Метод доставки" +#: constraint:ir.model:0 +msgid "" +"The Object name must start with x_ and not contain any special character !" +msgstr "" +"Название объекта должно начинаться с x_ и не должно содержать специальных " +"символов !" #. module: delivery -#: field:sale.order,id:0 -msgid "ID" -msgstr "Идентификатор" +#: field:delivery.carrier,partner_id:0 +msgid "Carrier Partner" +msgstr "Партнер по доставке" #. module: delivery -#: field:delivery.grid.line,operator:0 -msgid "Operator" -msgstr "Оператор" +#: view:res.partner:0 +msgid "Sales & Purchases" +msgstr "Продажи и закупки" #. module: delivery -#: model:ir.module.module,shortdesc:delivery.module_meta_information -msgid "Carriers and deliveries" -msgstr "Перевозчики и поставки" +#: view:delivery.sale.order:0 +msgid "Create Deliveries" +msgstr "Создать доставки" #. module: delivery -#: field:delivery.carrier,grids_id:0 -msgid "Delivery Grids" -msgstr "Разделение поставки" +#: model:ir.actions.act_window,name:delivery.action_delivery_cost +#: view:sale.order:0 +msgid "Delivery Costs" +msgstr "Стоимость поставки" + +#. module: delivery +#: report:sale.shipping:0 +msgid "Description" +msgstr "Описание" + +#. module: delivery +#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form +#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form +msgid "Delivery Pricelist" +msgstr "Каталог доставки" #. module: delivery +#: field:delivery.carrier,price:0 #: selection:delivery.grid.line,type:0 #: selection:delivery.grid.line,variable_factor:0 -#: field:stock.picking,weight:0 -msgid "Weight" -msgstr "Вес" +msgid "Price" +msgstr "Цена" #. module: delivery -#: field:delivery.grid,sequence:0 -msgid "Sequence" -msgstr "Последовательность" +#: code:addons/delivery/wizard/delivery_sale_order.py:0 +#, python-format +msgid "No grid matching for this carrier !" +msgstr "" #. module: delivery -#: field:delivery.carrier,partner_id:0 -msgid "Carrier Partner" -msgstr "Партнер по доставке" +#: model:ir.ui.menu,name:delivery.menu_delivery +msgid "Delivery" +msgstr "Доставка" #. module: delivery -#: model:ir.module.module,description:delivery.module_meta_information -msgid "" -"Allows you to add delivery methods in sales orders and packing. You can " -"define your own carrier and delivery grids for prices. When creating " -"invoices from picking, Open ERP is able to add and compute the shipping line." -msgstr "" -"Позволяет добавить методы доставки в заказы на продажу и упаковку. Вы можете " -"определить своего собственного перевозчика и выполнить разделение поставка " -"для определения стоимости. При создании счета-фактуры на основании упаковки, " -"Open ERP имеет возможность добавлять и вычислить строки доставки." +#: selection:delivery.grid.line,type:0 +#: selection:delivery.grid.line,variable_factor:0 +msgid "Weight * Volume" +msgstr "Вес * объем" #. module: delivery -#: field:delivery.grid,zip_to:0 -msgid "To Zip" -msgstr "Почтовый индекс получателя" +#: selection:delivery.grid.line,operator:0 +msgid "=" +msgstr "=" #. module: delivery -#: model:ir.actions.act_window,name:delivery.action_picking_tree4 -#: model:ir.ui.menu,name:delivery.menu_action_picking_tree3 -msgid "Packing to be invoiced" -msgstr "Фактурирование по упаковке" +#: code:addons/delivery/stock.py:0 +#, python-format +msgid "The carrier %s (id: %d) has no delivery grid!" +msgstr "" #. module: delivery -#: help:sale.order,carrier_id:0 +#: field:delivery.grid.line,name:0 +msgid "Name" +msgstr "Название" + +#. module: delivery +#: help:delivery.carrier,active:0 msgid "" -"Complete this field if you plan to invoice the shipping based on packing." +"If the active field is set to true, it will allow you to hide the delivery " +"carrier without removing it." msgstr "" -"Заполните это поле, если вы планируете счет доставки основанный на упаковке." #. module: delivery -#: model:ir.actions.wizard,name:delivery.wizard_deliver_line_add -msgid "Delivery Costs" -msgstr "Стоимость поставки" +#: view:delivery.carrier:0 +#: field:delivery.carrier,name:0 +#: field:delivery.grid,carrier_id:0 +#: model:ir.model,name:delivery.model_delivery_carrier +#: report:sale.shipping:0 +#: field:stock.picking,carrier_id:0 +msgid "Carrier" +msgstr "Доставка" #. module: delivery -#: field:delivery.grid.line,list_price:0 -msgid "Sale Price" -msgstr "Цена продажи" +#: view:delivery.sale.order:0 +msgid "_Apply" +msgstr "_Применить" #. module: delivery -#: constraint:product.product:0 -msgid "Error: Invalid ean code" -msgstr "Ошибка: Неправильный штрих-код" +#: field:sale.order,id:0 +msgid "ID" +msgstr "Идентификатор" #. module: delivery -#: view:delivery.grid:0 -msgid "Delivery grids" -msgstr "Расценки на доставку" +#: code:addons/delivery/wizard/delivery_sale_order.py:0 +#, python-format +msgid "The order state have to be draft to add delivery lines." +msgstr "" +"Состояние заказа должно быть \"Черновик\" для добавления позиций доставки." #. module: delivery -#: wizard_button:delivery.sale.order,init,end:0 -msgid "Cancel" -msgstr "Отмена" +#: model:ir.module.module,shortdesc:delivery.module_meta_information +msgid "Carriers and deliveries" +msgstr "Перевозчики и поставки" #. module: delivery -#: field:sale.order,carrier_id:0 -msgid "Delivery method" -msgstr "Метод доставки" +#: field:delivery.carrier,grids_id:0 +msgid "Delivery Grids" +msgstr "Разделение поставки" #. module: delivery -#: field:delivery.carrier,price:0 -#: selection:delivery.grid.line,type:0 -#: selection:delivery.grid.line,variable_factor:0 -msgid "Price" -msgstr "Цена" +#: field:delivery.grid,sequence:0 +msgid "Sequence" +msgstr "Последовательность" #. module: delivery -#: constraint:res.partner:0 -msgid "The VAT doesn't seem to be correct." -msgstr "НДС выглядит неправильно" +#: field:delivery.grid.line,list_price:0 +msgid "Sale Price" +msgstr "Цена продажи" + +#. module: delivery +#: view:delivery.grid:0 +#: field:delivery.grid,state_ids:0 +msgid "States" +msgstr "Cостояния" + +#. module: delivery +#: constraint:product.product:0 +msgid "Error: Invalid ean code" +msgstr "Ошибка: Неправильный штрих-код" #. module: delivery #: field:delivery.grid.line,price_type:0 msgid "Price Type" msgstr "Тип цены" + +#~ msgid "Generate Draft Invoices On Receptions" +#~ msgstr "Генерировать черновики счетов при получении" + +#~ msgid "Notes" +#~ msgstr "Примечания" + +#~ msgid "Cancel" +#~ msgstr "Отмена" + +#~ msgid "The VAT doesn't seem to be correct." +#~ msgstr "НДС выглядит неправильно" + +#~ msgid "Delivery line of grid" +#~ msgstr "Разделяемая строка поставки" + +#~ msgid "Carrier and delivery grids" +#~ msgstr "Разделение поставки и перевозчика" + +#~ msgid "Add Delivery Costs" +#~ msgstr "Добавить стоимость доставки" + +#~ msgid "Packing to be invoiced" +#~ msgstr "Фактурирование по упаковке" + +#~ msgid "" +#~ "Complete this field if you plan to invoice the shipping based on packing." +#~ msgstr "" +#~ "Заполните это поле, если вы планируете счет доставки основанный на упаковке." + +#~ msgid "" +#~ "Allows you to add delivery methods in sales orders and packing. You can " +#~ "define your own carrier and delivery grids for prices. When creating " +#~ "invoices from picking, Open ERP is able to add and compute the shipping line." +#~ msgstr "" +#~ "Позволяет добавить методы доставки в заказы на продажу и упаковку. Вы можете " +#~ "определить своего собственного перевозчика и выполнить разделение поставка " +#~ "для определения стоимости. При создании счета-фактуры на основании упаковки, " +#~ "Open ERP имеет возможность добавлять и вычислить строки доставки." + +#~ msgid "This delivery method will be used when invoicing from packing." +#~ msgstr "" +#~ "Этот метод доставки должен использоваться при фактурировании на основании " +#~ "данных упаковки." diff --git a/addons/document_ftp/ftpserver/__init__.py b/addons/document_ftp/ftpserver/__init__.py index eef04d3eb93..d110267f175 100644 --- a/addons/document_ftp/ftpserver/__init__.py +++ b/addons/document_ftp/ftpserver/__init__.py @@ -59,6 +59,7 @@ if HOST.lower() == 'none': else: netsvc.Logger().notifyChannel("FTP", netsvc.LOG_INFO, "\n Serving FTP on %s:%s\n" % (HOST, PORT)) ds = ftp_server() + ds.daemon = True ds.start() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py index 4e53a895587..1189e1c4cec 100644 --- a/addons/email_template/email_template.py +++ b/addons/email_template/email_template.py @@ -103,7 +103,7 @@ def get_value(cursor, user, recid, message=None, template=None, context=None): class email_template(osv.osv): "Templates for sending Email" - + _name = "email.template" _description = 'Email Templates for Models' @@ -131,7 +131,7 @@ class email_template(osv.osv): 'def_to':fields.char( 'Recipient (To)', size=250, - help="The Recipient of email. " + help="The Recipient of email. " "Placeholders can be used here. " "e.g. ${object.email_to}"), 'def_cc':fields.char( @@ -146,20 +146,20 @@ class email_template(osv.osv): help="Blind Carbon Copy address(es), comma-separated." " Placeholders can be used here. " "e.g. ${object.email_bcc}"), - 'reply_to':fields.char('Reply-To', - size=250, + 'reply_to':fields.char('Reply-To', + size=250, help="The address recipients should reply to," " if different from the From address." " Placeholders can be used here. " "e.g. ${object.email_reply_to}"), - 'message_id':fields.char('Message-ID', - size=250, + 'message_id':fields.char('Message-ID', + size=250, help="Specify the Message-ID SMTP header to use in outgoing emails. Please note that this overrides the Resource tracking option! Placeholders can be used here."), 'track_campaign_item':fields.boolean('Resource Tracking', help="Enable this is you wish to include a special \ tracking marker in outgoing emails so you can identify replies and link \ them back to the corresponding resource record. \ -This is useful for CRM leads for example"), +This is useful for CRM leads for example"), 'lang':fields.char( 'Language', size=250, @@ -182,7 +182,7 @@ This is useful for CRM leads for example"), translate=True), 'use_sign':fields.boolean( 'Signature', - help="the signature from the User details" + help="the signature from the User details" " will be appended to the mail"), 'file_name':fields.char( 'Report Filename', @@ -199,16 +199,16 @@ This is useful for CRM leads for example"), 'attachment_id', 'Attached Files', help="You may attach existing files to this template, " - "so they will be added in all emails created from this template"), + "so they will be added in all emails created from this template"), 'ref_ir_act_window':fields.many2one( 'ir.actions.act_window', 'Window Action', - help="Action that will open this email template on Resource records", + help="Action that will open this email template on Resource records", readonly=True), 'ref_ir_value':fields.many2one( 'ir.values', 'Wizard Button', - help="Button in the side bar of the form view of this Resource that will invoke the Window Action", + help="Button in the side bar of the form view of this Resource that will invoke the Window Action", readonly=True), 'allowed_groups':fields.many2many( 'res.groups', @@ -265,7 +265,7 @@ This is useful for CRM leads for example"), 'template_language' : lambda *a:'mako', } - + _sql_constraints = [ ('name', 'unique (name)', _('The template name must be unique !')) ] @@ -312,11 +312,11 @@ This is useful for CRM leads for example"), def delete_action(self, cr, uid, ids, context): self.unlink_action(cr, uid, ids, context) return True - + def unlink(self, cr, uid, ids, context=None): self.unlink_action(cr, uid, ids, context) return super(email_template, self).unlink(cr, uid, ids, context) - + def copy(self, cr, uid, id, default=None, context=None): if default is None: default = {} @@ -328,7 +328,7 @@ This is useful for CRM leads for example"), new_name = new_name + '_' + random.choice('abcdefghij') + random.choice('lmnopqrs') + random.choice('tuvwzyz') default.update({'name':new_name}) return super(email_template, self).copy(cr, uid, id, default, context) - + def build_expression(self, field_name, sub_field_name, null_value, template_language='mako'): """ Returns a template expression based on data provided @@ -354,10 +354,10 @@ This is useful for CRM leads for example"), if sub_field_name: expression += "." + sub_field_name if null_value: - expression += "|default: '''%s'''" % null_value + expression += "|default: '''%s'''" % null_value expression += "}}" - return expression - + return expression + def onchange_model_object_field(self, cr, uid, ids, model_object_field, template_language, context=None): if not model_object_field: return {} @@ -385,7 +385,7 @@ This is useful for CRM leads for example"), result['sub_model_object_field'] = False result['null_value'] = False return {'value':result} - + def onchange_sub_model_object_field(self, cr, uid, ids, model_object_field, sub_model_object_field, template_language, context=None): if not model_object_field or not sub_model_object_field: return {} @@ -447,7 +447,7 @@ This is useful for CRM leads for example"), def _add_attachment(self, cursor, user, mailbox_id, name, data, filename, context=None): """ Add an attachment to a given mailbox entry. - + :param data: base64 encoded attachment data to store """ attachment_obj = self.pool.get('ir.attachment') @@ -484,7 +484,7 @@ This is useful for CRM leads for example"), """ Generate report to be attached and attach it to the email, and add any directly attached files as well. - + @param cursor: Database Cursor @param user: ID of User @param template: Browse record of @@ -492,8 +492,8 @@ This is useful for CRM leads for example"), @param record_id: ID of the target model for which this mail has to be generated - @param mail: Browse record of email object - @return: True + @param mail: Browse record of email object + @return: True """ if template.report_template: reportname = 'report.' + \ @@ -510,7 +510,7 @@ This is useful for CRM leads for example"), user, [record_id], data, - context) + context) fname = tools.ustr(get_value(cursor, user, record_id, template.file_name, template, context) or 'Report') @@ -524,7 +524,7 @@ This is useful for CRM leads for example"), self._add_attachment(cursor, user, mail.id, attachment.name, attachment.datas, attachment.datas_fname, context) return True - + def _generate_mailbox_item_from_template(self, cursor, user, @@ -534,7 +534,7 @@ This is useful for CRM leads for example"), """ Generates an email from the template for record record_id of target object - + @param cursor: Database Cursor @param user: ID of User @param template: Browse record of @@ -542,7 +542,7 @@ This is useful for CRM leads for example"), @param record_id: ID of the target model for which this mail has to be generated - @return: ID of created object + @return: ID of created object """ if context is None: context = {} @@ -571,9 +571,9 @@ This is useful for CRM leads for example"), ctx = context.copy() ctx.update({'lang':lang}) template = self.browse(cursor, user, template.id, context=ctx) - - # determine name of sender, either it is specified in email_id or we - # use the account name + + # determine name of sender, either it is specified in email_id or we + # use the account name email_id = from_account['email_id'].strip() email_from = re.findall(r'([^ ,<@]+@[^> ,]+)', email_id)[0] if email_from != email_id: @@ -663,7 +663,7 @@ This is useful for CRM leads for example"), context) return mailbox_id - + def generate_mail(self, cursor, @@ -721,7 +721,7 @@ email_template() class email_template_preview(osv.osv_memory): _name = "email_template.preview" _description = "Email Template Preview" - + def _get_model_recs(self, cr, uid, context=None): if context is None: context = {} @@ -738,6 +738,7 @@ class email_template_preview(osv.osv_memory): if default_id and default_id not in ref_obj_ids: ref_obj_ids.insert(0, default_id) return model_obj.name_get(cr, uid, ref_obj_ids, context) + return [] def default_get(self, cr, uid, fields, context=None): if context is None: @@ -762,7 +763,7 @@ class email_template_preview(osv.osv_memory): context['template_id'], ['object_name'], context)['object_name'] - + _columns = { 'ref_template':fields.many2one( 'email.template', @@ -772,13 +773,13 @@ class email_template_preview(osv.osv_memory): 'to':fields.char('To', size=250, readonly=True), 'cc':fields.char('CC', size=250, readonly=True), 'bcc':fields.char('BCC', size=250, readonly=True), - 'reply_to':fields.char('Reply-To', - size=250, + 'reply_to':fields.char('Reply-To', + size=250, help="The address recipients should reply to," " if different from the From address." " Placeholders can be used here."), - 'message_id':fields.char('Message-ID', - size=250, + 'message_id':fields.char('Message-ID', + size=250, help="The Message-ID header value, if you need to" "specify it, for example to automatically recognize the replies later." " Placeholders can be used here."), @@ -819,7 +820,7 @@ class email_template_preview(osv.osv_memory): vals['body_html'] = get_value(cr, uid, rel_model_ref, template.def_body_html, template, context) vals['report'] = get_value(cr, uid, rel_model_ref, template.file_name, template, context) return {'value':vals} - + email_template_preview() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/event/event.py b/addons/event/event.py index 61a24901b0a..e8c60660136 100644 --- a/addons/event/event.py +++ b/addons/event/event.py @@ -55,7 +55,8 @@ class event_event(osv.osv): 'registration_ids': False, }) return super(event_event, self).copy(cr, uid, id, default=default, context=context) - def onchange_product(self, cr, uid, ids, product_id): + + def onchange_product(self, cr, uid, ids, product_id=False): """This function returns value of product's unit price based on product id. @param self: The object pointer @param cr: the current row, from the database cursor, @@ -132,7 +133,6 @@ class event_event(osv.osv): } return res - def _get_register(self, cr, uid, ids, fields, args, context=None): """Get Confirm or uncofirm register value. @param ids: List of Event registration type's id @@ -165,7 +165,6 @@ class event_event(osv.osv): res[event.id]['register_current'] = number and number[0] or 0.0 if 'register_prospect' in fields: res[event.id]['register_prospect'] = number and number[0] or 0.0 - return res def write(self, cr, uid, ids, vals, context=None): @@ -707,7 +706,7 @@ class event_registration_badge(osv.osv): _name = 'event.registration.badge' _description = __doc__ _columns = { - 'registration_id': fields.many2one('event.registration', 'Registration', required=True), + "registration_id": fields.many2one('event.registration', 'Registration', required=True), "title": fields.char('Title', size=128), "name": fields.char('Name', size=128, required=True), "address_id": fields.many2one('res.partner.address', 'Address'), diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml index 6fc620abdf8..04ea01915e2 100644 --- a/addons/event/event_view.xml +++ b/addons/event/event_view.xml @@ -179,8 +179,8 @@ <field name="register_min"/> <field name="register_current"/> <field name="section_id" invisible="context.get('invisible_section', True)"/> - <field name="state"/> <field name="user_id"/> + <field name="state"/> <button string="Confirm Event" help="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/> <button string="Cancel Event" help="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/> <button string="Event Done" help="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/> @@ -280,7 +280,7 @@ res_model="event.registration" src_model="event.event" view_mode="tree,form,calendar,graph" - context="{'search_default_event_id': active_id}" + domain="[('event_id','=',active_id)]" view_type="form"/> <act_window diff --git a/addons/hr/hr.py b/addons/hr/hr.py index 3c65e79f11f..0f499c43ddd 100644 --- a/addons/hr/hr.py +++ b/addons/hr/hr.py @@ -25,6 +25,8 @@ from osv import fields, osv import tools from tools.translate import _ +import addons + class hr_employee_category(osv.osv): def name_get(self, cr, uid, ids, context=None): @@ -180,9 +182,8 @@ class hr_employee(osv.osv): return {'value': {'work_email' : work_email}} def _get_photo(self, cr, uid, context=None): - return open(os.path.join( - tools.config['addons_path'], 'hr/image', 'photo.png'), - 'rb') .read().encode('base64') + res_path = addons.get_module_resource("hr","image/photo.png") + return open(res_path,'rb').read().encode('base64') _defaults = { 'active': 1, diff --git a/addons/hr/i18n/mn.po b/addons/hr/i18n/mn.po index eb74694a641..e5f65db8bc2 100644 --- a/addons/hr/i18n/mn.po +++ b/addons/hr/i18n/mn.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2010-10-18 17:46+0000\n" -"PO-Revision-Date: 2010-10-20 07:16+0000\n" -"Last-Translator: OpenERP Administrators <Unknown>\n" +"PO-Revision-Date: 2010-10-27 01:32+0000\n" +"Last-Translator: badralkh <Unknown>\n" "Language-Team: Mongolian <mn@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-10-21 05:02+0000\n" +"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: hr @@ -26,22 +26,22 @@ msgstr "Openerp хэрэглэгч" #: view:hr.job:0 #: field:hr.job,requirements:0 msgid "Requirements" -msgstr "" +msgstr "Шаардлагууд" #. module: hr #: constraint:hr.department:0 msgid "Error! You can not create recursive departments." -msgstr "Алдаа!" +msgstr "Алдаа! Рекурс хэлтсүүдийг үүсгэж болохгүй" #. module: hr #: model:process.transition,name:hr.process_transition_contactofemployee0 msgid "Link the employee to information" -msgstr "" +msgstr "Ажилтны мэдээлэл руу шилжих" #. module: hr #: field:hr.employee,sinid:0 msgid "SIN No" -msgstr "Даатгалын дугаар" +msgstr "" #. module: hr #: model:ir.module.module,shortdesc:hr.module_meta_information @@ -57,12 +57,12 @@ msgstr "Хүний нөөц" #: view:hr.employee:0 #: view:hr.job:0 msgid "Group By..." -msgstr "" +msgstr "Бүлэглэх..." #. module: hr #: field:hr.employee,work_email:0 msgid "Work E-mail" -msgstr "" +msgstr "Ажлын Э-мэйл" #. module: hr #: constraint:ir.actions.act_window:0 @@ -81,27 +81,27 @@ msgstr "Хэлтэс" #. module: hr #: help:hr.installer,hr_attendance:0 msgid "Simplifies the management of employee's attendances." -msgstr "" +msgstr "Ажилтны ирц хөтлөлтийг хялбарчилж өгдөг" #. module: hr #: view:hr.job:0 msgid "Mark as Old" -msgstr "" +msgstr "Хуучин болгон тэмдэглэх" #. module: hr #: view:hr.job:0 msgid "Jobs" -msgstr "" +msgstr "Ажлын байр" #. module: hr #: view:hr.job:0 msgid "In Recruitment" -msgstr "" +msgstr "Хүний нөөцийн бүрдүүлэлтэд" #. module: hr #: view:hr.installer:0 msgid "title" -msgstr "" +msgstr "гарчиг" #. module: hr #: field:hr.department,company_id:0 @@ -114,22 +114,22 @@ msgstr "Компани" #. module: hr #: field:hr.job,no_of_recruitment:0 msgid "Expected in Recruitment" -msgstr "" +msgstr "Хүний нөөцийн бүрдүүлэлтээр хүлээгдсэн" #. module: hr #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_config msgid "Holidays" -msgstr "" +msgstr "Амралт, чөлөө" #. module: hr #: help:hr.installer,hr_holidays:0 msgid "Tracks employee leaves, allocation requests and planning." -msgstr "" +msgstr "Ажилтны амралт, чөлөө, түүний хуваарилалтын хүсэлтийг хянах" #. module: hr #: model:ir.model,name:hr.model_hr_employee_marital_status msgid "Employee Marital Status" -msgstr "" +msgstr "Ажилчдын гэрлэлтийн байдал" #. module: hr #: help:hr.employee,partner_id:0 @@ -137,42 +137,44 @@ msgid "" "Partner that is related to the current employee. Accounting transaction will " "be written on this partner belongs to employee." msgstr "" +"Одоогийн ажилтантай холбоотой харилцагч. Санхүү бүртгэлийн транзакц тухайн " +"ажилтанд хамаарах харилцагчид хийгдэх болно." #. module: hr #: model:process.transition,name:hr.process_transition_employeeuser0 msgid "Link a user to an employee" -msgstr "" +msgstr "Хэрэглэгчид ажилтныг харгалзуул" #. module: hr #: field:hr.installer,hr_contract:0 msgid "Employee's Contracts" -msgstr "" +msgstr "Ажилчдын хөдөлмөрийн гэрээ" #. module: hr #: help:hr.installer,hr_payroll:0 msgid "Generic Payroll system." -msgstr "" +msgstr "Цалингийн үндсэн систем" #. module: hr #: view:hr.employee:0 msgid "My Departments Employee" -msgstr "" +msgstr "Манай хэлтсийн ажилчид" #. module: hr #: constraint:hr.employee:0 msgid "" "Error ! You cannot select a department for which the employee is the manager." -msgstr "" +msgstr "Алдаа! Ажилтан нь менежер байх хэлтсийг сонгож болохгүй." #. module: hr #: help:hr.employee,passport_id:0 msgid "Employee Passport Information" -msgstr "" +msgstr "Ажилтны пасспортын мэдээлэл" #. module: hr #: view:hr.employee:0 msgid "Position" -msgstr "" +msgstr "Албан тушаал" #. module: hr #: model:ir.actions.act_window,name:hr.action2 @@ -185,22 +187,24 @@ msgid "" "The Related user field on the Employee form allows to link the OpenERP user " "(and her rights) to the employee." msgstr "" +"Ажилтан маягтын холбоотой хэрэглэх талбар нь OpenERP хэрэглэгчийн ажилтантай " +"холбодог" #. module: hr #: view:hr.job:0 #: selection:hr.job,state:0 msgid "In Recruitement" -msgstr "" +msgstr "Хүний нөөцийн бүрдүүлэлтэд" #. module: hr #: field:hr.employee,identification_id:0 msgid "Identification No" -msgstr "" +msgstr "Ялгах дугаар" #. module: hr #: field:hr.job,no_of_employee:0 msgid "No of Employee" -msgstr "" +msgstr "Ажилтны тоо" #. module: hr #: selection:hr.employee,gender:0 @@ -212,16 +216,17 @@ msgstr "эм" msgid "" "Tracks and helps employees encode and validate timesheets and attendances." msgstr "" +"Ажилчдыг ирц ба цаг бүртгэлийг бүртгэж, батламжлах үйлдлийг зохицуулна" #. module: hr #: field:hr.installer,hr_evaluation:0 msgid "Periodic Evaluations" -msgstr "" +msgstr "Үечилсэн үнэлгээ" #. module: hr #: field:hr.installer,hr_timesheet_sheet:0 msgid "Timesheets" -msgstr "" +msgstr "Цаг бүртгэл" #. module: hr #: model:ir.actions.act_window,name:hr.open_view_employee_tree @@ -231,12 +236,12 @@ msgstr "Ажилчдын бүтэц" #. module: hr #: view:hr.employee:0 msgid "Social IDs" -msgstr "Нийтийн Дугаар" +msgstr "Бүртгэлийн дугаарууд" #. module: hr #: help:hr.job,no_of_employee:0 msgid "Number of employee with that job." -msgstr "" +msgstr "Энэ албан тушаал дах ажилтны тоо" #. module: hr #: field:hr.employee,work_phone:0 @@ -246,14 +251,14 @@ msgstr "Ажлын утас" #. module: hr #: field:hr.employee.category,child_ids:0 msgid "Child Categories" -msgstr "Жижиг зэрэглэл" +msgstr "Хүү зэрэглэл" #. module: hr #: view:hr.job:0 #: field:hr.job,description:0 #: model:ir.model,name:hr.model_hr_job msgid "Job Description" -msgstr "" +msgstr "Ажлын байрны тодорхойлолт" #. module: hr #: field:hr.employee,work_location:0 @@ -263,7 +268,7 @@ msgstr "Ажлын байршил" #. module: hr #: field:hr.employee,passport_id:0 msgid "Passport" -msgstr "" +msgstr "Пасспорт" #. module: hr #: view:hr.employee:0 @@ -276,7 +281,7 @@ msgstr "Ажилтан" #. module: hr #: model:process.node,note:hr.process_node_employeecontact0 msgid "Other information" -msgstr "" +msgstr "Бусад мэдээлэл" #. module: hr #: field:hr.employee,address_id:0 @@ -286,12 +291,12 @@ msgstr "Ажлын хаяг" #. module: hr #: model:ir.actions.act_window,name:hr.action_hr_installer msgid "Human Resources Application Configuration" -msgstr "" +msgstr "Хүний нөөцийн модулийн тохиргоо" #. module: hr #: field:hr.employee,birthday:0 msgid "Date of Birth" -msgstr "" +msgstr "Төрсөн огноо" #. module: hr #: model:ir.ui.menu,name:hr.menu_hr_reporting @@ -306,14 +311,14 @@ msgstr "" #. module: hr #: model:ir.actions.act_window,name:hr.open_board_hr msgid "Human Resources Dashboard" -msgstr "" +msgstr "Хүний нөөцийн хянах самбар" #. module: hr #: view:hr.employee:0 #: field:hr.employee,job_id:0 #: view:hr.job:0 msgid "Job" -msgstr "" +msgstr "Ажлын байр" #. module: hr #: view:hr.department:0 @@ -329,32 +334,32 @@ msgstr "Тохиргоо" #. module: hr #: view:hr.employee:0 msgid "Categories" -msgstr "" +msgstr "Зэрэглэл" #. module: hr #: field:hr.job,expected_employees:0 msgid "Expected Employees" -msgstr "" +msgstr "Нийт орон тоо" #. module: hr #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" -msgstr "Архитектур алдаатай!" +msgstr "Харагдацын архитектурын xml алдаатай !" #. module: hr #: help:hr.employee,sinid:0 msgid "Social Insurance Number" -msgstr "" +msgstr "Нийгмийн даатгалын дугаар" #. module: hr #: field:hr.employee.category,parent_id:0 msgid "Parent Category" -msgstr "Харилцагчийн зэрэглэл" +msgstr "Харьяалагдах зэрэглэл" #. module: hr #: constraint:hr.employee.category:0 msgid "Error ! You cannot create recursive Categories." -msgstr "" +msgstr "Алдаа ! Рекурс зэрэглэлийг үүсгэж болохгүй." #. module: hr #: view:hr.department:0 @@ -368,12 +373,12 @@ msgstr "Хэлтсүүд" #. module: hr #: model:process.node,name:hr.process_node_employeecontact0 msgid "Employee Contact" -msgstr "Ажилтны гэрээ" +msgstr "Ажилтны хөдөлмөрийн гэрээ" #. module: hr #: view:board.board:0 msgid "My Board" -msgstr "" +msgstr "Өөрийн хянах самбар" #. module: hr #: selection:hr.employee,gender:0 @@ -395,12 +400,12 @@ msgstr "Ажилтны зэрэглэл" #. module: hr #: field:hr.installer,config_logo:0 msgid "Image" -msgstr "" +msgstr "Зураг" #. module: hr #: model:process.process,name:hr.process_process_employeecontractprocess0 msgid "Employee Contract" -msgstr "" +msgstr "Ажилтны хөдөлмөрийн гэрээ" #. module: hr #: help:hr.installer,hr_evaluation:0 @@ -408,32 +413,34 @@ msgid "" "Lets you create and manage the periodic evaluation and performance review of " "employees." msgstr "" +"Ажилтны бүтээмжийн стандарт, үечилсэн үнэлгээг хөтлөх, үүсгэх боломжийг " +"олгоно." #. module: hr #: model:ir.model,name:hr.model_hr_department msgid "hr.department" -msgstr "Хүний нөөцийн хэлтэс" +msgstr "" #. module: hr #: help:hr.employee,parent_id:0 msgid "It is linked with manager of Department" -msgstr "" +msgstr "Энэ нь хэлтсийн менежертэй холбоотой байна" #. module: hr #: field:hr.installer,hr_recruitment:0 msgid "Recruitment Process" -msgstr "" +msgstr "Нөөцийн бүрдүүлэлтийн үйл ажиллагаа" #. module: hr #: field:hr.employee,category_ids:0 #: field:hr.employee.category,name:0 msgid "Category" -msgstr "Ангилал" +msgstr "Зэрэглэл" #. module: hr #: help:hr.employee,bank_account_id:0 msgid "Employee bank salary account" -msgstr "" +msgstr "банк дах ажилтны цалингийн данс" #. module: hr #: field:hr.department,note:0 @@ -448,22 +455,22 @@ msgstr "Гэрээний мэдээлэл" #. module: hr #: constraint:ir.ui.menu:0 msgid "Error ! You can not create recursive Menu." -msgstr "" +msgstr "Алдаа! Рекурс цэс үүсгэж болохгүй" #. module: hr #: model:ir.actions.act_window,name:hr.open_board_hr_manager msgid "HR Manager Dashboard" -msgstr "" +msgstr "Хүний нөөцийн менежерийн хянах самбар" #. module: hr #: view:hr.employee:0 msgid "Status" -msgstr "Байдал" +msgstr "Үндсэн төлөв" #. module: hr #: field:hr.installer,progress:0 msgid "Configuration Progress" -msgstr "" +msgstr "Тохиргооны явц" #. module: hr #: model:ir.actions.act_window,name:hr.open_view_categ_tree @@ -474,12 +481,12 @@ msgstr "Зэрэглэлийн бүтэц" #. module: hr #: field:hr.employee,partner_id:0 msgid "unknown" -msgstr "" +msgstr "Үл мэдэгдэх" #. module: hr #: field:hr.installer,hr_holidays:0 msgid "Holidays / Leaves Management" -msgstr "" +msgstr "Амралт, чөлөө / Амралт, чөлөөний удирдлага" #. module: hr #: field:hr.employee,ssnid:0 @@ -494,7 +501,7 @@ msgstr "Идэвхитэй" #. module: hr #: constraint:hr.employee:0 msgid "Error ! You cannot create recursive Hierarchy of Employees." -msgstr "Алдаа!" +msgstr "Алдаа! Ажилтны рекурс мод үүсгэж болохгүй" #. module: hr #: view:hr.department:0 @@ -506,28 +513,28 @@ msgstr "Компаниуд" msgid "" "In the Employee form, there are different kind of information like Contact " "information." -msgstr "" +msgstr "Ажилтны маягт дээр холбоо барих хаяг шиг янз бүрийн мэдээлэл бий." #. module: hr #: help:hr.job,expected_employees:0 msgid "Required number of Employees in total for that job." -msgstr "" +msgstr "Энэ ажлын байрт харгалзах нийт ажилтны тоо шаардагдаж байна" #. module: hr #: selection:hr.job,state:0 msgid "Old" -msgstr "" +msgstr "Хуучин" #. module: hr #: field:hr.employee.marital.status,description:0 msgid "Status Description" -msgstr "" +msgstr "Гэрлэлтийн байдлын тайлбар" #. module: hr #: view:hr.job:0 #: field:hr.job,state:0 msgid "State" -msgstr "" +msgstr "Төлөв" #. module: hr #: field:hr.employee,marital:0 @@ -541,27 +548,27 @@ msgstr "Гэрлэлтийн байдал" #. module: hr #: help:hr.installer,hr_recruitment:0 msgid "Helps you manage and streamline your recruitment process." -msgstr "" +msgstr "Хүний нөөцийн бүрдүүлэлтийн үйл ажиллагааг удирдахад тусална" #. module: hr #: model:process.node,note:hr.process_node_employee0 msgid "Employee form and structure" -msgstr "" +msgstr "Ажилтны маягт, бүтэц" #. module: hr #: field:hr.employee,photo:0 msgid "Photo" -msgstr "" +msgstr "Зураг" #. module: hr #: model:ir.model,name:hr.model_res_users msgid "res.users" -msgstr "" +msgstr "Хэрэглэгч" #. module: hr #: field:hr.installer,hr_payroll_account:0 msgid "Payroll Accounting" -msgstr "" +msgstr "Цалингийн санхүү бүртгэл" #. module: hr #: view:hr.employee:0 @@ -579,7 +586,7 @@ msgstr "" #. module: hr #: view:res.users:0 msgid "Current Activity" -msgstr "" +msgstr "Одоогийн ажилбар" #. module: hr #: help:hr.installer,hr_expense:0 @@ -587,6 +594,8 @@ msgid "" "Tracks and manages employee expenses, and can automatically re-invoice " "clients if the expenses are project-related." msgstr "" +"Зардал нь төсөлтэй холбоотой бол ажилтны зардалыг зохицуулах, хянаж " +"үйлчлүүлэгчид автоматаар мэдэгдэх боломжтой" #. module: hr #: view:hr.job:0 @@ -612,34 +621,35 @@ msgstr "Гэрийн хаяг" #: field:hr.installer,hr_attendance:0 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config msgid "Attendances" -msgstr "" +msgstr "Ирцүүд" #. module: hr #: view:hr.employee.marital.status:0 #: view:hr.job:0 msgid "Description" -msgstr "" +msgstr "Тайлбар" #. module: hr #: help:hr.installer,hr_contract:0 msgid "Extends employee profiles to help manage their contracts." msgstr "" +"Хөдөлмөрийн гэрээг зохицуулах зорилгоор ажилтны мэдээллийг өргөтгөдөг" #. module: hr #: field:hr.installer,hr_payroll:0 msgid "Payroll" -msgstr "" +msgstr "Цалингийн цэс" #. module: hr #: field:hr.job,name:0 msgid "Job Name" -msgstr "" +msgstr "Ажлын байрны нэр" #. module: hr #: view:hr.job:0 #: selection:hr.job,state:0 msgid "In Position" -msgstr "" +msgstr "Нээлттэй" #. module: hr #: view:hr.department:0 @@ -649,7 +659,7 @@ msgstr "Хэлтэс" #. module: hr #: field:hr.employee,country_id:0 msgid "Nationality" -msgstr "Яс үндэс" +msgstr "Үндэстэн" #. module: hr #: view:hr.department:0 @@ -661,17 +671,17 @@ msgstr "Тэмдэглэл" #. module: hr #: model:ir.model,name:hr.model_hr_installer msgid "hr.installer" -msgstr "" +msgstr "ХН-ийн модулийг суулгах" #. module: hr #: view:board.board:0 msgid "HR Manager Board" -msgstr "" +msgstr "Хүний нөөцийн менежерийн самбар" #. module: hr #: field:hr.employee,resource_id:0 msgid "Resource" -msgstr "" +msgstr "Нөөц" #. module: hr #: field:hr.department,complete_name:0 @@ -698,7 +708,7 @@ msgstr "Ажилчид" #. module: hr #: field:hr.employee,bank_account_id:0 msgid "Bank Account" -msgstr "" +msgstr "Банк дах данс" #. module: hr #: field:hr.department,name:0 @@ -708,34 +718,34 @@ msgstr "Хэлтэсийн нэр" #. module: hr #: help:hr.employee,ssnid:0 msgid "Social Security Number" -msgstr "" +msgstr "Регистрийн дугаар" #. module: hr #: model:process.node,note:hr.process_node_openerpuser0 msgid "Creation of a OpenERP user" -msgstr "" +msgstr "OpenERP хэрэглэгчийг үүсгэх" #. module: hr #: field:hr.department,child_ids:0 msgid "Child Departments" -msgstr "Жижиг хэлтэс" +msgstr "Хүү хэлтэсүүд" #. module: hr #: model:ir.actions.act_window,name:hr.action_hr_job #: model:ir.ui.menu,name:hr.menu_hr_job msgid "Job Positions" -msgstr "" +msgstr "Ажлын байрууд" #. module: hr #: view:hr.employee:0 #: field:hr.employee,coach_id:0 msgid "Coach" -msgstr "" +msgstr "Дадлагажуулагч" #. module: hr #: field:hr.installer,hr_expense:0 msgid "Expenses" -msgstr "" +msgstr "Зардал" #. module: hr #: view:hr.department:0 @@ -748,7 +758,7 @@ msgstr "Менежер" #. module: hr #: help:hr.installer,hr_payroll_account:0 msgid "Generic Payroll system Integrated with Accountings." -msgstr "" +msgstr "Санхүү бүртгэлтэй нэгдмэл цалингийн ерөнхий систем" #. module: hr #: field:hr.employee,child_ids:0 diff --git a/addons/hr/i18n/pl.po b/addons/hr/i18n/pl.po index a32dfaf942c..59101a8859c 100644 --- a/addons/hr/i18n/pl.po +++ b/addons/hr/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-10-18 17:46+0000\n" -"PO-Revision-Date: 2010-10-24 12:13+0000\n" -"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\n" +"PO-Revision-Date: 2010-10-26 08:16+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\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-10-25 04:39+0000\n" +"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: hr @@ -357,7 +357,7 @@ msgstr "Kategoria nadrzędna" #. module: hr #: constraint:hr.employee.category:0 msgid "Error ! You cannot create recursive Categories." -msgstr "" +msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych kategorii." #. module: hr #: view:hr.department:0 @@ -376,7 +376,7 @@ msgstr "Kontakt do pracownika" #. module: hr #: view:board.board:0 msgid "My Board" -msgstr "" +msgstr "Moja konsola" #. module: hr #: selection:hr.employee,gender:0 @@ -398,19 +398,19 @@ msgstr "Kategoria pracownika" #. module: hr #: field:hr.installer,config_logo:0 msgid "Image" -msgstr "" +msgstr "Obraz" #. module: hr #: model:process.process,name:hr.process_process_employeecontractprocess0 msgid "Employee Contract" -msgstr "" +msgstr "Umowa pracownika" #. module: hr #: help:hr.installer,hr_evaluation:0 msgid "" "Lets you create and manage the periodic evaluation and performance review of " "employees." -msgstr "" +msgstr "Pozwala ci zarządzać okresowymi ocenami i osiągnięciami pracowników." #. module: hr #: model:ir.model,name:hr.model_hr_department @@ -420,12 +420,12 @@ msgstr "" #. module: hr #: help:hr.employee,parent_id:0 msgid "It is linked with manager of Department" -msgstr "" +msgstr "Jest związane z szefem departamentu" #. module: hr #: field:hr.installer,hr_recruitment:0 msgid "Recruitment Process" -msgstr "" +msgstr "Proces rekrutacji" #. module: hr #: field:hr.employee,category_ids:0 @@ -436,7 +436,7 @@ msgstr "Kategoria" #. module: hr #: help:hr.employee,bank_account_id:0 msgid "Employee bank salary account" -msgstr "" +msgstr "Konto bankowe pracownika dla płacy" #. module: hr #: field:hr.department,note:0 @@ -451,12 +451,12 @@ msgstr "Informacje kontaktowe" #. module: hr #: constraint:ir.ui.menu:0 msgid "Error ! You can not create recursive Menu." -msgstr "" +msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych menu." #. module: hr #: model:ir.actions.act_window,name:hr.open_board_hr_manager msgid "HR Manager Dashboard" -msgstr "" +msgstr "Konsola Dyrektora kadr" #. module: hr #: view:hr.employee:0 diff --git a/addons/hr/i18n/pt.po b/addons/hr/i18n/pt.po index 5189bcfa822..469046dfdf8 100644 --- a/addons/hr/i18n/pt.po +++ b/addons/hr/i18n/pt.po @@ -6,27 +6,26 @@ msgid "" 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:57+0000\n" -"Last-Translator: mga (Open ERP) <Unknown>\n" +"POT-Creation-Date: 2010-10-18 17:46+0000\n" +"PO-Revision-Date: 2010-10-26 13:57+0000\n" +"Last-Translator: Carlos Almeida <Unknown>\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-09-29 05:12+0000\n" +"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: hr #: model:process.node,name:hr.process_node_openerpuser0 -#: model:process.transition,name:hr.process_transition_employeeuser0 msgid "Openerp user" msgstr "Utilizador Open ERP" #. module: hr -#: model:ir.actions.act_window,name:hr.edit_workgroup -#: model:ir.ui.menu,name:hr.menu_edit_workgroup -msgid "Working Time Categories" -msgstr "Categorias de tempos de trabalhos" +#: view:hr.job:0 +#: field:hr.job,requirements:0 +msgid "Requirements" +msgstr "Requisitos" #. module: hr #: constraint:hr.department:0 @@ -34,93 +33,177 @@ msgid "Error! You can not create recursive departments." msgstr "Erro! Não podes criar departamentos recursivos." #. module: hr +#: model:process.transition,name:hr.process_transition_contactofemployee0 +msgid "Link the employee to information" +msgstr "Associar o empregado à informação" + +#. module: hr #: field:hr.employee,sinid:0 msgid "SIN No" -msgstr "Nº SIN" +msgstr "Nº SS" #. module: hr #: model:ir.module.module,shortdesc:hr.module_meta_information +#: model:ir.ui.menu,name:hr.menu_hr_deshboard +#: model:ir.ui.menu,name:hr.menu_hr_main +#: model:ir.ui.menu,name:hr.menu_hr_management #: model:ir.ui.menu,name:hr.menu_hr_root msgid "Human Resources" -msgstr "Recursos humanos" +msgstr "Recursos Humanos" #. module: hr -#: selection:hr.timesheet,dayofweek:0 -msgid "Sunday" -msgstr "Domingo" +#: view:hr.department:0 +#: view:hr.employee:0 +#: view:hr.job:0 +msgid "Group By..." +msgstr "Agrupar Por..." #. module: hr -#: view:res.users:0 -msgid "Parents" -msgstr "Ascendentes" +#: field:hr.employee,work_email:0 +msgid "Work E-mail" +msgstr "E-mail Trabalho" #. module: hr #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "Nome de modelo inválido na definição da acção" +msgstr "Nome de módulo inválido na definição da acção" #. module: hr -#: view:hr.department:0 +#: view:hr.employee:0 +#: field:hr.employee,department_id:0 +#: view:hr.job:0 +#: field:hr.job,department_id:0 +#: view:res.users:0 msgid "Department" msgstr "Departamento" #. module: hr -#: model:process.transition,name:hr.process_transition_contactofemployee0 -msgid "Contact of employee" -msgstr "Contracto do empregado" +#: help:hr.installer,hr_attendance:0 +msgid "Simplifies the management of employee's attendances." +msgstr "Simplifica a gestão das assiduidades dos empregados" #. module: hr -#: field:hr.employee,work_email:0 -msgid "Work Email" -msgstr "Email Profissional" +#: view:hr.job:0 +msgid "Mark as Old" +msgstr "Marcar como antigo" + +#. module: hr +#: view:hr.job:0 +msgid "Jobs" +msgstr "Cargo" #. module: hr -#: field:hr.timesheet.group,name:0 -msgid "Group name" -msgstr "Nome do grupo" +#: view:hr.job:0 +msgid "In Recruitment" +msgstr "Em Recrutamento" + +#. module: hr +#: view:hr.installer:0 +msgid "title" +msgstr "título" #. module: hr #: field:hr.department,company_id:0 -#: field:hr.employee,company_id:0 +#: view:hr.employee:0 +#: view:hr.job:0 +#: field:hr.job,company_id:0 msgid "Company" msgstr "Empresa" #. module: hr -#: selection:hr.timesheet,dayofweek:0 -msgid "Friday" -msgstr "Sexta-feira" +#: field:hr.job,no_of_recruitment:0 +msgid "Expected in Recruitment" +msgstr "Espera-se em Recrutamento" #. module: hr -#: field:hr.department,parent_id:0 -msgid "Parent Department" -msgstr "Departamento ascendente" +#: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_config +msgid "Holidays" +msgstr "Férias" + +#. module: hr +#: help:hr.installer,hr_holidays:0 +msgid "Tracks employee leaves, allocation requests and planning." +msgstr "" +"Regista faltas dos empregados, requisições de colocações e planeamento" + +#. module: hr +#: model:ir.model,name:hr.model_hr_employee_marital_status +msgid "Employee Marital Status" +msgstr "Estado Cívil do Empregado" + +#. module: hr +#: help:hr.employee,partner_id:0 +msgid "" +"Partner that is related to the current employee. Accounting transaction will " +"be written on this partner belongs to employee." +msgstr "" +"O parceiro que está relacionado com o empregado actual. A transacção " +"contabilística a escrever neste parceiro pertence ao empregado." + +#. module: hr +#: model:process.transition,name:hr.process_transition_employeeuser0 +msgid "Link a user to an employee" +msgstr "Associar um utilizador a um empregado" + +#. module: hr +#: field:hr.installer,hr_contract:0 +msgid "Employee's Contracts" +msgstr "Contratos do Empregado" + +#. module: hr +#: help:hr.installer,hr_payroll:0 +msgid "Generic Payroll system." +msgstr "Sistema de Processamento de Salários Genérico" #. module: hr -#: view:hr.department:0 #: view:hr.employee:0 -#: field:hr.employee,notes:0 -msgid "Notes" -msgstr "Notas" +msgid "My Departments Employee" +msgstr "Meus Empregados por Departementos" + +#. module: hr +#: constraint:hr.employee:0 +msgid "" +"Error ! You cannot select a department for which the employee is the manager." +msgstr "" +"Erro ! Não pode seleccionar um departamento cujo empregado é o gestor." + +#. module: hr +#: help:hr.employee,passport_id:0 +msgid "Employee Passport Information" +msgstr "Informação do Passaporte do Empregado" #. module: hr -#: field:hr.timesheet,hour_from:0 -msgid "Work from" -msgstr "Trabalhar de" +#: view:hr.employee:0 +msgid "Position" +msgstr "Posto" #. module: hr #: model:ir.actions.act_window,name:hr.action2 msgid "Employee Hierarchy" -msgstr "Hierarquia dos empregados" +msgstr "Hierarquia de Empregados" #. module: hr -#: model:ir.ui.menu,name:hr.menu_hr_configuration -msgid "Configuration" -msgstr "Configuração" +#: model:process.transition,note:hr.process_transition_employeeuser0 +msgid "" +"The Related user field on the Employee form allows to link the OpenERP user " +"(and her rights) to the employee." +msgstr "" #. module: hr -#: selection:hr.employee,marital:0 -msgid "Unmaried" -msgstr "Não casado" +#: view:hr.job:0 +#: selection:hr.job,state:0 +msgid "In Recruitement" +msgstr "Em Recrutamento" + +#. module: hr +#: field:hr.employee,identification_id:0 +msgid "Identification No" +msgstr "Não" + +#. module: hr +#: field:hr.job,no_of_employee:0 +msgid "No of Employee" +msgstr "Nº de Empregados" #. module: hr #: selection:hr.employee,gender:0 @@ -128,15 +211,25 @@ msgid "Female" msgstr "Feminino" #. module: hr -#: view:hr.timesheet.group:0 -msgid "Working Time Category" -msgstr "Categoria do tempo de trabalho" +#: help:hr.installer,hr_timesheet_sheet:0 +msgid "" +"Tracks and helps employees encode and validate timesheets and attendances." +msgstr "" + +#. module: hr +#: field:hr.installer,hr_evaluation:0 +msgid "Periodic Evaluations" +msgstr "Avaliações Periódicas" + +#. module: hr +#: field:hr.installer,hr_timesheet_sheet:0 +msgid "Timesheets" +msgstr "Folhas de Presença" #. module: hr #: model:ir.actions.act_window,name:hr.open_view_employee_tree -#: model:ir.ui.menu,name:hr.menu_open_view_employee_tree msgid "Employees Structure" -msgstr "Estrutura dos empregados" +msgstr "Estrutura de Empregados" #. module: hr #: view:hr.employee:0 @@ -144,9 +237,14 @@ msgid "Social IDs" msgstr "IDs Sociais" #. module: hr +#: help:hr.job,no_of_employee:0 +msgid "Number of employee with that job." +msgstr "Número de empregados com esse cargo" + +#. module: hr #: field:hr.employee,work_phone:0 msgid "Work Phone" -msgstr "Telefone do trabalho" +msgstr "Telefone do Trabalho" #. module: hr #: field:hr.employee.category,child_ids:0 @@ -154,27 +252,49 @@ msgid "Child Categories" msgstr "Categorias descendentes" #. module: hr +#: view:hr.job:0 +#: field:hr.job,description:0 +#: model:ir.model,name:hr.model_hr_job +msgid "Job Description" +msgstr "Descrição do Cargo" + +#. module: hr #: field:hr.employee,work_location:0 msgid "Office Location" -msgstr "Localização do escritório" +msgstr "Localização do Escritório" + +#. module: hr +#: field:hr.employee,passport_id:0 +msgid "Passport" +msgstr "Passaporte" #. module: hr #: view:hr.employee:0 -#: field:hr.employee,name:0 +#: view:hr.job:0 #: model:ir.model,name:hr.model_hr_employee #: model:process.node,name:hr.process_node_employee0 msgid "Employee" msgstr "Empregado" #. module: hr -#: field:hr.timesheet.group,manager:0 -msgid "Workgroup manager" -msgstr "Gerente do grupo de trabalho" +#: model:process.node,note:hr.process_node_employeecontact0 +msgid "Other information" +msgstr "Outra Informação" #. module: hr -#: field:hr.employee,child_ids:0 -msgid "Subordinates" -msgstr "Subordinados" +#: field:hr.employee,address_id:0 +msgid "Working Address" +msgstr "Endereço de trabalho" + +#. module: hr +#: model:ir.actions.act_window,name:hr.action_hr_installer +msgid "Human Resources Application Configuration" +msgstr "Configuração da Aplicação de Gestão de Recursos Humanos" + +#. module: hr +#: field:hr.employee,birthday:0 +msgid "Date of Birth" +msgstr "Data de Nascimento" #. module: hr #: model:ir.ui.menu,name:hr.menu_hr_reporting @@ -182,19 +302,42 @@ msgid "Reporting" msgstr "Relatório" #. module: hr +#: model:ir.model,name:hr.model_ir_actions_act_window +msgid "ir.actions.act_window" +msgstr "" + +#. module: hr +#: model:ir.actions.act_window,name:hr.open_board_hr +msgid "Human Resources Dashboard" +msgstr "Painel de Recursos Humanos" + +#. module: hr +#: view:hr.employee:0 +#: field:hr.employee,job_id:0 +#: view:hr.job:0 +msgid "Job" +msgstr "Cargo" + +#. module: hr +#: view:hr.department:0 #: field:hr.department,member_ids:0 msgid "Members" msgstr "Membros" #. module: hr -#: field:hr.employee,ssnid:0 -msgid "SSN No" -msgstr "Nº SSN" +#: model:ir.ui.menu,name:hr.menu_hr_configuration +msgid "Configuration" +msgstr "Configuração" #. module: hr -#: model:process.transition,note:hr.process_transition_contactofemployee0 -msgid "Fill up contact information" -msgstr "Preencha as informações de contacto" +#: view:hr.employee:0 +msgid "Categories" +msgstr "Categorias" + +#. module: hr +#: field:hr.job,expected_employees:0 +msgid "Expected Employees" +msgstr "Empregados Esperados" #. module: hr #: constraint:ir.ui.view:0 @@ -202,20 +345,26 @@ msgid "Invalid XML for View Architecture!" msgstr "XML inválido para a arquitectura de vista" #. module: hr -#: selection:hr.employee,marital:0 -msgid "Divorced" -msgstr "Divorciado" +#: help:hr.employee,sinid:0 +msgid "Social Insurance Number" +msgstr "Número da Segurança Social" #. module: hr #: field:hr.employee.category,parent_id:0 msgid "Parent Category" -msgstr "Categoria ascendente" +msgstr "Categoria Pai" + +#. module: hr +#: constraint:hr.employee.category:0 +msgid "Error ! You cannot create recursive Categories." +msgstr "Erro! Não pode criar categorias recursivas." #. module: hr +#: view:hr.department:0 #: model:ir.actions.act_window,name:hr.open_module_tree_department -#: model:ir.actions.act_window,name:hr.open_module_tree_department_tree -#: model:ir.ui.menu,name:hr.menu_department_def -#: model:ir.ui.menu,name:hr.menu_department_tree +#: model:ir.ui.menu,name:hr.menu_hr_department_tree +#: view:res.users:0 +#: field:res.users,context_department_id:0 msgid "Departments" msgstr "Departamentos" @@ -225,14 +374,9 @@ msgid "Employee Contact" msgstr "Contacto do empregado" #. module: hr -#: selection:hr.employee,marital:0 -msgid "Maried" -msgstr "Casado" - -#. module: hr -#: field:hr.timesheet,tgroup_id:0 -msgid "Employee's timesheet group" -msgstr "Grupo dos horários do empregado" +#: view:board.board:0 +msgid "My Board" +msgstr "Meu Painel" #. module: hr #: selection:hr.employee,gender:0 @@ -240,20 +384,35 @@ msgid "Male" msgstr "Masculino" #. module: hr -#: model:process.transition,note:hr.process_transition_employeeuser0 -msgid "Create openerp user" -msgstr "Criar um utilizador openerp" +#: model:ir.actions.act_window,name:hr.open_view_categ_form +#: model:ir.ui.menu,name:hr.menu_view_employee_category_form +msgid "Categories of Employee" +msgstr "Categoria dos Empregados" #. module: hr #: view:hr.employee.category:0 #: model:ir.model,name:hr.model_hr_employee_category msgid "Employee Category" -msgstr "Categoria do empregado" +msgstr "Categoria do Empregado" #. module: hr -#: selection:hr.timesheet,dayofweek:0 -msgid "Tuesday" -msgstr "Terça-feira" +#: field:hr.installer,config_logo:0 +msgid "Image" +msgstr "Imagem" + +#. module: hr +#: model:process.process,name:hr.process_process_employeecontractprocess0 +msgid "Employee Contract" +msgstr "Contrato do Empregado" + +#. module: hr +#: help:hr.installer,hr_evaluation:0 +msgid "" +"Lets you create and manage the periodic evaluation and performance review of " +"employees." +msgstr "" +"Permite-lhe criar e gerir a avaliação periódica e de desempenho dos seus " +"empregados." #. module: hr #: model:ir.model,name:hr.model_hr_department @@ -261,17 +420,27 @@ msgid "hr.department" msgstr "Departamento RH" #. module: hr -#: field:hr.employee,user_id:0 -msgid "Related User" -msgstr "Utilizador relacionado" +#: help:hr.employee,parent_id:0 +msgid "It is linked with manager of Department" +msgstr "Está associado com o gestor do departamento" #. module: hr -#: field:hr.employee,category_id:0 +#: field:hr.installer,hr_recruitment:0 +msgid "Recruitment Process" +msgstr "Processo de Recrutamento" + +#. module: hr +#: field:hr.employee,category_ids:0 #: field:hr.employee.category,name:0 msgid "Category" msgstr "Categoria" #. module: hr +#: help:hr.employee,bank_account_id:0 +msgid "Employee bank salary account" +msgstr "Conta bancária do mepregado" + +#. module: hr #: field:hr.department,note:0 msgid "Note" msgstr "Nota" @@ -282,14 +451,24 @@ msgid "Contact Information" msgstr "Informações de contacto" #. module: hr +#: constraint:ir.ui.menu:0 +msgid "Error ! You can not create recursive Menu." +msgstr "Erro! Não pode criar menus recursivos." + +#. module: hr +#: model:ir.actions.act_window,name:hr.open_board_hr_manager +msgid "HR Manager Dashboard" +msgstr "Painel do Gestor de RH" + +#. module: hr #: view:hr.employee:0 msgid "Status" -msgstr "Status" +msgstr "Estado" #. module: hr -#: selection:hr.timesheet,dayofweek:0 -msgid "Monday" -msgstr "Segunda-feira" +#: field:hr.installer,progress:0 +msgid "Configuration Progress" +msgstr "Progresso da Configuração" #. module: hr #: model:ir.actions.act_window,name:hr.open_view_categ_tree @@ -298,17 +477,22 @@ msgid "Categories structure" msgstr "Estrutura das categorias" #. module: hr -#: field:hr.timesheet,dayofweek:0 -msgid "Day of week" -msgstr "Dia da semana" +#: field:hr.employee,partner_id:0 +msgid "unknown" +msgstr "desconhecido" #. module: hr -#: field:hr.employee,birthday:0 -msgid "Birthday" -msgstr "Data de nascimento" +#: field:hr.installer,hr_holidays:0 +msgid "Holidays / Leaves Management" +msgstr "Gestão das Férias/Faltas" + +#. module: hr +#: field:hr.employee,ssnid:0 +msgid "SSN No" +msgstr "Nº Segurança Social" #. module: hr -#: field:hr.employee,active:0 +#: view:hr.employee:0 msgid "Active" msgstr "Activo" @@ -318,65 +502,78 @@ msgid "Error ! You cannot create recursive Hierarchy of Employees." msgstr "Erro ! Não pode criar uma hierarquia recursiva de empregados." #. module: hr -#: model:process.process,name:hr.process_process_employeecontractprocess0 -msgid "Employee Contract Process" -msgstr "Processo de contracto do empregado" +#: view:hr.department:0 +msgid "Companies" +msgstr "Empresas" #. module: hr -#: model:process.node,note:hr.process_node_openerpuser0 -msgid "Create OpenERP User" -msgstr "Criar um utilizador OpenERP" +#: model:process.transition,note:hr.process_transition_contactofemployee0 +msgid "" +"In the Employee form, there are different kind of information like Contact " +"information." +msgstr "" +"No formulário de empregado, tem diversos tipos de informação, como os " +"contactos dos mesmos" #. module: hr -#: model:process.node,note:hr.process_node_employee0 -msgid "Employee Complete Form" -msgstr "Formulário completo do empregado" +#: help:hr.job,expected_employees:0 +msgid "Required number of Employees in total for that job." +msgstr "Número de empregados necessários para o cargo" #. module: hr -#: view:hr.department:0 -msgid "Companies" -msgstr "Empresas" +#: selection:hr.job,state:0 +msgid "Old" +msgstr "Antigo" #. module: hr -#: selection:hr.timesheet,dayofweek:0 -msgid "Wednesday" -msgstr "Quarta-feira" +#: field:hr.employee.marital.status,description:0 +msgid "Status Description" +msgstr "Descrição do Estado" #. module: hr -#: model:ir.actions.act_window,name:hr.open_view_categ_form -#: model:ir.ui.menu,name:hr.menu_view_employee_category_form -msgid "Categories of Employee" -msgstr "Categoria dos empregados" +#: view:hr.job:0 +#: field:hr.job,state:0 +msgid "State" +msgstr "Estado" #. module: hr -#: field:hr.timesheet,date_from:0 -msgid "Starting date" -msgstr "Data de inicio" +#: field:hr.employee,marital:0 +#: view:hr.employee.marital.status:0 +#: field:hr.employee.marital.status,name:0 +#: model:ir.actions.act_window,name:hr.action_hr_marital_status +#: model:ir.ui.menu,name:hr.hr_menu_marital_status +msgid "Marital Status" +msgstr "Estado Cívil" #. module: hr -#: field:res.users,parent_id:0 -msgid "Parent Users" -msgstr "Utilizadores ascendentes" +#: help:hr.installer,hr_recruitment:0 +msgid "Helps you manage and streamline your recruitment process." +msgstr "Ajuda-o a gerir e organizar o processo de recrutamento" #. module: hr -#: field:hr.employee,address_id:0 -msgid "Working Address" -msgstr "Endereço de trabalho" +#: model:process.node,note:hr.process_node_employee0 +msgid "Employee form and structure" +msgstr "Formulário e estrutura do Empregado" #. module: hr -#: field:hr.employee,marital:0 -msgid "Marital Status" -msgstr "Estado civil" +#: field:hr.employee,photo:0 +msgid "Photo" +msgstr "Fotografia" + +#. module: hr +#: model:ir.model,name:hr.model_res_users +msgid "res.users" +msgstr "Utilizadores" #. module: hr -#: model:ir.model,name:hr.model_hr_timesheet -msgid "Timesheet Line" -msgstr "Linha de horário" +#: field:hr.installer,hr_payroll_account:0 +msgid "Payroll Accounting" +msgstr "Contabilidade do Processamento de Salários" #. module: hr #: view:hr.employee:0 msgid "Personal Information" -msgstr "Informação pessoal" +msgstr "Informação Pessoal" #. module: hr #: constraint:ir.model:0 @@ -386,41 +583,76 @@ msgstr "" "O nome do objecto deve começar com x_ e não pode conter um carácter especial!" #. module: hr -#: view:hr.timesheet:0 -#: field:hr.timesheet.group,timesheet_id:0 -#: model:ir.model,name:hr.model_hr_timesheet_group -msgid "Working Time" -msgstr "Tempo de trabalho" +#: view:res.users:0 +msgid "Current Activity" +msgstr "Actividade Actual" #. module: hr -#: selection:hr.timesheet,dayofweek:0 -msgid "Thursday" -msgstr "Quinta-feira" +#: help:hr.installer,hr_expense:0 +msgid "" +"Tracks and manages employee expenses, and can automatically re-invoice " +"clients if the expenses are project-related." +msgstr "" +"Regista e processa as despesas dos empregados, e pode ainda automaticamente " +"facturar os clientes se as despesas estão relacionadas com algum projecto" #. module: hr -#: field:hr.timesheet,hour_to:0 -msgid "Work to" -msgstr "Trabalhar para" +#: view:hr.job:0 +msgid "Current" +msgstr "Actual" #. module: hr -#: selection:hr.employee,marital:0 -msgid "Other" -msgstr "Outro" +#: field:hr.department,parent_id:0 +msgid "Parent Department" +msgstr "Departamento Pai" #. module: hr #: view:hr.employee.category:0 msgid "Employees Categories" -msgstr "Categorias dos empregados" +msgstr "Categorias de Empredados" #. module: hr #: field:hr.employee,address_home_id:0 msgid "Home Address" -msgstr "Endereço de residência" +msgstr "Endereço de Casa" + +#. module: hr +#: field:hr.installer,hr_attendance:0 +#: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config +msgid "Attendances" +msgstr "Assiduidades" + +#. module: hr +#: view:hr.employee.marital.status:0 +#: view:hr.job:0 +msgid "Description" +msgstr "Descrição" + +#. module: hr +#: help:hr.installer,hr_contract:0 +msgid "Extends employee profiles to help manage their contracts." +msgstr "Extende perfis de empregados para ajudar a gerir os seus contratos" + +#. module: hr +#: field:hr.installer,hr_payroll:0 +msgid "Payroll" +msgstr "Processamento de Salários" + +#. module: hr +#: field:hr.job,name:0 +msgid "Job Name" +msgstr "Nome do Cargo" + +#. module: hr +#: view:hr.job:0 +#: selection:hr.job,state:0 +msgid "In Position" +msgstr "Em Posição" #. module: hr #: view:hr.department:0 msgid "department" -msgstr "Departamento" +msgstr "departamento" #. module: hr #: field:hr.employee,country_id:0 @@ -428,66 +660,219 @@ msgid "Nationality" msgstr "Nacionalidade" #. module: hr -#: field:hr.employee,otherid:0 -msgid "Other ID" -msgstr "Outra Identificação" +#: view:hr.department:0 +#: view:hr.employee:0 +#: field:hr.employee,notes:0 +msgid "Notes" +msgstr "Notas" #. module: hr -#: field:hr.timesheet,name:0 +#: model:ir.model,name:hr.model_hr_installer +msgid "hr.installer" +msgstr "hr.installer" + +#. module: hr +#: view:board.board:0 +msgid "HR Manager Board" +msgstr "Painel do Gestor de RH" + +#. module: hr +#: field:hr.employee,resource_id:0 +msgid "Resource" +msgstr "Recurso" + +#. module: hr +#: field:hr.department,complete_name:0 +#: field:hr.employee.category,complete_name:0 msgid "Name" msgstr "Nome" #. module: hr #: field:hr.employee,gender:0 msgid "Gender" -msgstr "Sexo" +msgstr "Género" #. module: hr #: view:hr.employee:0 +#: field:hr.job,employee_ids:0 +#: model:ir.actions.act_window,name:hr.hr_employee_normal_action_tree #: model:ir.actions.act_window,name:hr.open_view_employee_list -#: model:ir.ui.menu,name:hr.menu_open_view_employee_list +#: model:ir.actions.act_window,name:hr.open_view_employee_list_my +#: model:ir.ui.menu,name:hr.menu_open_view_employee_list_my +#: model:ir.ui.menu,name:hr.menu_view_employee_category_configuration_form msgid "Employees" msgstr "Empregados" #. module: hr +#: field:hr.employee,bank_account_id:0 +msgid "Bank Account" +msgstr "Conta Bancária" + +#. module: hr #: field:hr.department,name:0 msgid "Department Name" msgstr "Nome do Departamento" #. module: hr +#: help:hr.employee,ssnid:0 +msgid "Social Security Number" +msgstr "Número da Segurança Social" + +#. module: hr +#: model:process.node,note:hr.process_node_openerpuser0 +msgid "Creation of a OpenERP user" +msgstr "Criação de um utilizador OpenERP" + +#. module: hr #: field:hr.department,child_ids:0 msgid "Child Departments" msgstr "Departamentos descendentes" #. module: hr +#: model:ir.actions.act_window,name:hr.action_hr_job +#: model:ir.ui.menu,name:hr.menu_hr_job +msgid "Job Positions" +msgstr "Cargos" + +#. module: hr #: view:hr.employee:0 -msgid "Job Information" -msgstr "Informações do trabalho" +#: field:hr.employee,coach_id:0 +msgid "Coach" +msgstr "Treinador" #. module: hr -#: model:process.node,note:hr.process_node_employeecontact0 -msgid "Fill up employee's contact information" -msgstr "Preencha as informações de contacto do empregado" +#: field:hr.installer,hr_expense:0 +msgid "Expenses" +msgstr "Despesas" #. module: hr +#: view:hr.department:0 #: field:hr.department,manager_id:0 +#: view:hr.employee:0 #: field:hr.employee,parent_id:0 msgid "Manager" msgstr "Gestor" #. module: hr -#: model:ir.actions.act_window,name:hr.open_view_employee_list_my -#: model:ir.ui.menu,name:hr.menu_open_view_employee_list_my -msgid "All Employees" -msgstr "Todos os empregados" +#: help:hr.installer,hr_payroll_account:0 +msgid "Generic Payroll system Integrated with Accountings." +msgstr "Sistema de Processamento de Salários Integrado com a Contabilidade" #. module: hr -#: selection:hr.timesheet,dayofweek:0 -msgid "Saturday" -msgstr "Sábado" +#: field:hr.employee,child_ids:0 +msgid "Subordinates" +msgstr "Subordinados" -#. module: hr -#: model:ir.actions.act_window,name:hr.open_view_employee_new -#: model:ir.ui.menu,name:hr.menu_open_view_employee_new -msgid "New Employee" -msgstr "Novo Empregado" +#~ msgid "Working Time Categories" +#~ msgstr "Categorias de tempos de trabalhos" + +#~ msgid "Sunday" +#~ msgstr "Domingo" + +#~ msgid "Contact of employee" +#~ msgstr "Contracto do empregado" + +#~ msgid "Work Email" +#~ msgstr "Email Profissional" + +#~ msgid "Group name" +#~ msgstr "Nome do grupo" + +#~ msgid "Friday" +#~ msgstr "Sexta-feira" + +#~ msgid "Work from" +#~ msgstr "Trabalhar de" + +#~ msgid "Unmaried" +#~ msgstr "Não casado" + +#~ msgid "Working Time Category" +#~ msgstr "Categoria do tempo de trabalho" + +#~ msgid "Workgroup manager" +#~ msgstr "Gerente do grupo de trabalho" + +#~ msgid "Fill up contact information" +#~ msgstr "Preencha as informações de contacto" + +#~ msgid "Divorced" +#~ msgstr "Divorciado" + +#~ msgid "Maried" +#~ msgstr "Casado" + +#~ msgid "Employee's timesheet group" +#~ msgstr "Grupo dos horários do empregado" + +#~ msgid "Create openerp user" +#~ msgstr "Criar um utilizador openerp" + +#~ msgid "Tuesday" +#~ msgstr "Terça-feira" + +#~ msgid "Related User" +#~ msgstr "Utilizador relacionado" + +#~ msgid "Monday" +#~ msgstr "Segunda-feira" + +#~ msgid "Day of week" +#~ msgstr "Dia da semana" + +#~ msgid "Create OpenERP User" +#~ msgstr "Criar um utilizador OpenERP" + +#~ msgid "Employee Complete Form" +#~ msgstr "Formulário completo do empregado" + +#~ msgid "Wednesday" +#~ msgstr "Quarta-feira" + +#~ msgid "Starting date" +#~ msgstr "Data de inicio" + +#~ msgid "Timesheet Line" +#~ msgstr "Linha de horário" + +#~ msgid "Working Time" +#~ msgstr "Tempo de trabalho" + +#~ msgid "Thursday" +#~ msgstr "Quinta-feira" + +#~ msgid "Work to" +#~ msgstr "Trabalhar para" + +#~ msgid "Other" +#~ msgstr "Outro" + +#~ msgid "Other ID" +#~ msgstr "Outra Identificação" + +#~ msgid "Job Information" +#~ msgstr "Informações do trabalho" + +#~ msgid "Fill up employee's contact information" +#~ msgstr "Preencha as informações de contacto do empregado" + +#~ msgid "All Employees" +#~ msgstr "Todos os empregados" + +#~ msgid "Saturday" +#~ msgstr "Sábado" + +#~ msgid "New Employee" +#~ msgstr "Novo Empregado" + +#~ msgid "Parent Users" +#~ msgstr "Utilizadores ascendentes" + +#~ msgid "Parents" +#~ msgstr "Ascendentes" + +#~ msgid "Birthday" +#~ msgstr "Data de nascimento" + +#~ msgid "Employee Contract Process" +#~ msgstr "Processo de contracto do empregado" diff --git a/addons/hr_attendance/i18n/mn.po b/addons/hr_attendance/i18n/mn.po index 187dcbfbfa4..d198e3257a8 100644 --- a/addons/hr_attendance/i18n/mn.po +++ b/addons/hr_attendance/i18n/mn.po @@ -7,179 +7,201 @@ msgid "" msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" -"POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-09-29 09:01+0000\n" -"Last-Translator: ub121 <ubs121@gmail.com>\n" +"POT-Creation-Date: 2010-10-18 17:46+0000\n" +"PO-Revision-Date: 2010-10-27 02:49+0000\n" +"Last-Translator: badralkh <Unknown>\n" "Language-Team: Mongolian <mn@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-09-30 04:43+0000\n" +"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: hr_attendance -#: field:hr.employee,state:0 -#: model:ir.model,name:hr_attendance.model_hr_attendance -msgid "Attendance" -msgstr "Ирц" +#: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking +msgid "Time Tracking" +msgstr "Ирц, цагийн хяналт" #. module: hr_attendance -#: constraint:ir.model:0 +#: view:hr.attendance:0 +msgid "Group By..." +msgstr "Бүлэглэвэл..." + +#. module: hr_attendance +#: constraint:ir.actions.act_window:0 +msgid "Invalid model name in the action definition." +msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр байна." + +#. module: hr_attendance +#: view:hr.attendance:0 +msgid "Today" +msgstr "Өнөөдөр" + +#. module: hr_attendance +#: code:addons/hr_attendance/hr_attendance.py:0 +#, python-format msgid "" -"The Object name must start with x_ and not contain any special character !" +"You tried to %s with a date anterior to another event !\n" +"Try to contact the administrator to correct attendances." msgstr "" -"Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж " -"болохгүй!" +"Өөр үйлдлээс өмнөх огноо байна ( %s) !\n" +"Администраторт хэлж ирцүүдийг засуулна уу." #. module: hr_attendance -#: wizard_view:hr.si_so,init:0 -#: wizard_view:hr.si_so,si_ask_so:0 -#: wizard_view:hr.si_so,so_ask_si:0 -#: model:ir.actions.wizard,name:hr_attendance.si_so -#: model:ir.ui.menu,name:hr_attendance.menu_si_so -msgid "Sign in / Sign out" -msgstr "Нэвтрэх / Гарах" +#: selection:hr.attendance.month,month:0 +msgid "March" +msgstr "3 сар" #. module: hr_attendance -#: rml:report.hr.timesheet.attendance.error:0 +#: view:hr.sign.in.out.ask:0 msgid "" -"(*) A positive delay means that the employee worked less than recorded." +"You did not sign out the last time. Please enter the date and time you " +"signed out." msgstr "" -"(*) Эерэг саатал нь ажилтан тэмдэглэснээс бага ажилласан гэсэн утга болно." +"Та сүүлийн удаа системээс гарахдаа гарах үйлдлийг хийгээгүй байна. Системээс " +"гарсан огноо, цагаа оруулна уу!" #. module: hr_attendance -#: view:hr.attendance:0 -msgid "Employee attendances" -msgstr "Ажилчдын ирц" +#: report:report.hr.timesheet.attendance.error:0 +msgid "Total period:" +msgstr "Нийт мөчлөг" #. module: hr_attendance -#: constraint:ir.ui.view:0 -msgid "Invalid XML for View Architecture!" -msgstr "Харагдах архитектурт нийцэхгүй XML!" +#: field:hr.action.reason,name:0 +msgid "Reason" +msgstr "Шалтгаан" #. module: hr_attendance -#: wizard_view:hr.si_so,init:0 -msgid "You are now ready to sign in or out of the attendance follow up" -msgstr "Ирцийн зөв дарааллын дагуу нэврэх буюу гарахад бэлэн боллоо" +#: view:hr.attendance.error:0 +msgid "Print Attendance Report Error" +msgstr "Алдаатай ирцийн тайланг хэвлэх" #. module: hr_attendance -#: selection:hr.action.reason,action_type:0 -#: wizard_button:hr.si_so,init,so_test:0 -#: wizard_button:hr.si_so,so_ask_si,so:0 -msgid "Sign out" -msgstr "Гарах" +#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:0 +#, python-format +msgid "The sign-out date must be in the past" +msgstr "Системээс гарсан огноо нь өнгөрсөн огноо байх ёстой" #. module: hr_attendance -#: rml:report.hr.timesheet.attendance.error:0 -msgid "Delay" -msgstr "Зогсолт" +#: report:report.hr.timesheet.attendance.error:0 +msgid "Date Signed" +msgstr "Нэвтэрсэн огноо" #. module: hr_attendance -#: wizard_field:hr.si_so,init,name:0 -#: wizard_field:hr.si_so,si_ask_so,name:0 -#: wizard_field:hr.si_so,so_ask_si,name:0 -msgid "Employee's name" -msgstr "Ажилтны нэр" +#: view:hr.action.reason:0 +msgid "Attendance reasons" +msgstr "Ирцийн шалтгаанууд" #. module: hr_attendance -#: wizard_button:hr.attendance.print_month,init,print:0 -#: wizard_button:hr.attendance.print_week,init,print:0 -msgid "Print Timesheet" -msgstr "Хуваарь хэвлэх" +#: view:hr.attendance:0 +#: field:hr.attendance,day:0 +msgid "Day" +msgstr "Өдөр" #. module: hr_attendance -#: model:ir.actions.wizard,name:hr_attendance.wizard_attendance_error -msgid "Print Attendance Error Report" -msgstr "Ирцийн алдаатай мэдээлэл хэвлэх" +#: selection:hr.employee,state:0 +msgid "Present" +msgstr "Байна" #. module: hr_attendance -#: constraint:ir.actions.act_window:0 -msgid "Invalid model name in the action definition." -msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр байна." +#: model:ir.model,name:hr_attendance.model_hr_sign_in_out_ask +msgid "Ask for Sign In Out" +msgstr "Системд нэвтрэх, гарахыг хүсэх" #. module: hr_attendance -#: model:ir.actions.wizard,name:hr_attendance.print_week -msgid "Print Timesheet by week" -msgstr "Долоо хоногийн хуваарь хэвлэх" +#: field:hr.attendance,action_desc:0 +#: model:ir.model,name:hr_attendance.model_hr_action_reason +msgid "Action Reason" +msgstr "Ирцийн үйлдэл" #. module: hr_attendance -#: field:hr.attendance,employee_id:0 -msgid "Employee" -msgstr "Ажилтан" +#: view:hr.sign.in.out:0 +msgid "Ok" +msgstr "" #. module: hr_attendance -#: wizard_view:hr.attendance.print_week,init:0 -#: wizard_view:hr.attendance.report,init:0 -msgid "Select a time span" -msgstr "Цагийн интервал сонгох" +#: view:hr.action.reason:0 +msgid "Define attendance reason" +msgstr "Ирцийн үйлдлийг тодорхойлох" #. module: hr_attendance -#: rml:report.hr.timesheet.attendance.error:0 -msgid "Date Recorded" -msgstr "Бичигдсэн огноо" +#: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_month +msgid "Attendances By Month" +msgstr "Сарын ирц" #. module: hr_attendance -#: selection:hr.attendance,action:0 -#: view:hr.employee:0 -msgid "Sign In" -msgstr "Нэвтрэх" +#: field:hr.sign.in.out,name:0 +#: field:hr.sign.in.out.ask,name:0 +msgid "Employees name" +msgstr "Ажилтны нэр" #. module: hr_attendance -#: rml:report.hr.timesheet.attendance.error:0 -msgid "Total period:" -msgstr "Нийт мөчлөг" +#: model:ir.actions.act_window,name:hr_attendance.open_view_attendance_reason +#: model:ir.ui.menu,name:hr_attendance.menu_open_view_attendance_reason +msgid "Attendance Reasons" +msgstr "Ирцийн үйлдлүүд" #. module: hr_attendance -#: field:hr.attendance,action_desc:0 -#: model:ir.model,name:hr_attendance.model_hr_action_reason -msgid "Action reason" -msgstr "Үйл ажиллагааны шалтгаан" +#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:0 +#, python-format +msgid "UserError" +msgstr "Хэрэглэгчийн Алдаа" #. module: hr_attendance -#: selection:hr.attendance.print_month,init,month:0 -msgid "March" -msgstr "3 сар" +#: field:hr.attendance.error,end_date:0 +#: field:hr.attendance.week,end_date:0 +msgid "Ending Date" +msgstr "Дуусах огноо" #. module: hr_attendance -#: selection:hr.attendance.print_month,init,month:0 -msgid "August" -msgstr "8 сар" +#: view:hr.attendance:0 +msgid "Employee attendance" +msgstr "Ажилтаны ирц" #. module: hr_attendance -#: selection:hr.attendance.print_month,init,month:0 -msgid "May" -msgstr "5 сар" +#: code:addons/hr_attendance/hr_attendance.py:0 +#, python-format +msgid "Warning" +msgstr "Анхааруулга" #. module: hr_attendance -#: wizard_field:hr.si_so,so_ask_si,last_time:0 -msgid "Your last sign in" -msgstr "Таны сүүлийн нэвтрэлт" +#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:0 +#, python-format +msgid "The Sign-in date must be in the past" +msgstr "Системд нэвтэрсэн огноо нь өнгөрсөн огноо байх ёстой" #. module: hr_attendance -#: selection:hr.attendance.print_month,init,month:0 -msgid "June" -msgstr "6 сар" +#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:0 +#, python-format +msgid "A sign-in must be right after a sign-out !" +msgstr "Системд нэвтэрсэн үйлдэл системээс гарсны яг ард нь байна." #. module: hr_attendance -#: model:ir.actions.wizard,name:hr_attendance.print_month -msgid "Print Timesheet by month" -msgstr "Сарын хуваарь хэвлэх" +#: field:hr.employee,state:0 +#: model:ir.model,name:hr_attendance.model_hr_attendance +msgid "Attendance" +msgstr "Ирц" #. module: hr_attendance -#: selection:hr.attendance,action:0 -#: view:hr.employee:0 -msgid "Sign Out" -msgstr "Гарах" +#: view:hr.sign.in.out:0 +msgid "You are now ready to sign in or out of the attendance follow up" +msgstr "Ирцийн зөв дарааллын дагуу нэврэх буюу гарахад бэлэн боллоо" #. module: hr_attendance -#: model:ir.module.module,shortdesc:hr_attendance.module_meta_information -msgid "Attendances Of Employees" -msgstr "Ажилчдын ирц" +#: field:hr.attendance.error,max_delay:0 +msgid "Max. Delay (Min)" +msgstr "Хамгийн их саатал (Хамгийн бага)" #. module: hr_attendance -#: field:hr.action.reason,name:0 -msgid "Reason" -msgstr "Шалтгаан" +#: view:hr.attendance.error:0 +#: view:hr.attendance.month:0 +msgid "Print" +msgstr "Хэвлэх" + +#. module: hr_attendance +#: view:hr.attendance:0 +msgid "Hr Attendance Search" +msgstr "Ирцээс хайх" #. module: hr_attendance #: constraint:hr.attendance:0 @@ -189,115 +211,175 @@ msgstr "" "хийгдэх ёстой." #. module: hr_attendance -#: rml:report.hr.timesheet.attendance.error:0 -msgid "Date Signed" -msgstr "Нэвтэрсэн огноо" +#: selection:hr.attendance.month,month:0 +msgid "July" +msgstr "7 сар" #. module: hr_attendance -#: field:hr.attendance,name:0 -msgid "Date" -msgstr "Огноо" +#: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_error +#: model:ir.actions.report.xml,name:hr_attendance.attendance_error_report +msgid "Attendance Error Report" +msgstr "Ирцийн алдаатай мэдээлэл" #. module: hr_attendance -#: selection:hr.attendance.print_month,init,month:0 -msgid "July" -msgstr "7 сар" +#: field:hr.attendance.error,init_date:0 +#: field:hr.attendance.week,init_date:0 +msgid "Starting Date" +msgstr "Эхлэл Огноо" #. module: hr_attendance -#: wizard_view:hr.si_so,si_ask_so:0 +#: constraint:ir.ui.view:0 +msgid "Invalid XML for View Architecture!" +msgstr "Харагдах архитектурт нийцэхгүй XML!" + +#. module: hr_attendance +#: report:report.hr.timesheet.attendance.error:0 +msgid "Min Delay" +msgstr "Хамгийн бага саатал" + +#. module: hr_attendance +#: selection:hr.attendance,action:0 +#: view:hr.employee:0 +msgid "Sign In" +msgstr "Нэвтрэх" + +#. module: hr_attendance +#: report:report.hr.timesheet.attendance.error:0 +msgid "Operation" +msgstr "Үйл ажиллагаа" + +#. module: hr_attendance +#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0 +#, python-format +msgid "No Data Available" +msgstr "Өгөгдөл байхгүй байна" + +#. module: hr_attendance +#: selection:hr.attendance.month,month:0 +msgid "September" +msgstr "9 сар" + +#. module: hr_attendance +#: selection:hr.attendance.month,month:0 +msgid "December" +msgstr "12 сар" + +#. module: hr_attendance +#: field:hr.attendance.month,month:0 +msgid "Month" +msgstr "Сар" + +#. module: hr_attendance +#: report:report.hr.timesheet.attendance.error:0 msgid "" -"You did not signed out the last time. Please enter the date and time you " -"signed out." -msgstr "" -"Та сүүлд гарсан бүртгэлээ хийгээгүй байна. Гарсан огноогоо оруулна уу." +"(*) A negative delay means that the employee worked more than encoded." +msgstr "Сөрөг саатал нь ажилтан бүртгэсэнээсээ их ажилласан гэсэн үг." #. module: hr_attendance -#: view:hr.action.reason:0 -msgid "Attendance reasons" -msgstr "Ирцийн шалтгаанууд" +#: help:hr.attendance,action_desc:0 +msgid "" +"Specifies the reason for Signing In/Signing Out in case of extra hours." +msgstr "Системд нэвтэрсэн/ системээс гарсан ирцийн үйлдлийг тодорхойлно." #. module: hr_attendance -#: wizard_field:hr.attendance.print_week,init,init_date:0 -#: wizard_field:hr.attendance.report,init,init_date:0 -msgid "Starting Date" -msgstr "Эхлэл Огноо" +#: model:ir.model,name:hr_attendance.model_hr_attendance_month +msgid "Print Monthly Attendance Report" +msgstr "Сарын ирцийн тайланг хэвлэх" #. module: hr_attendance -#: selection:hr.employee,state:0 -msgid "Present" -msgstr "Байна" +#: model:ir.model,name:hr_attendance.model_hr_sign_in_out +msgid "Sign In Sign Out" +msgstr "" #. module: hr_attendance -#: selection:hr.employee,state:0 -msgid "Absent" -msgstr "Тасалсан" +#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:0 +#: view:hr.sign.in.out:0 +#: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_sigh_in_out +#: model:ir.ui.menu,name:hr_attendance.menu_hr_attendance_sigh_in_out +#, python-format +msgid "Sign in / Sign out" +msgstr "Нэвтрэх / Гарах" #. module: hr_attendance -#: selection:hr.attendance.print_month,init,month:0 -msgid "February" -msgstr "2 сар" +#: view:hr.sign.in.out.ask:0 +msgid "hr.sign.out.ask" +msgstr "Системээс гарах хүсэлт" #. module: hr_attendance -#: selection:hr.attendance.print_month,init,month:0 -msgid "October" -msgstr "10 сар" +#: constraint:ir.ui.menu:0 +msgid "Error ! You can not create recursive Menu." +msgstr "Алдаа! Рекурс цэсийг үүсгэж болохгүй." #. module: hr_attendance -#: wizard_field:hr.si_so,si_ask_so,last_time:0 -msgid "Your last sign out" -msgstr "Таны сүүлийн нэвтрэлт" +#: selection:hr.attendance.month,month:0 +msgid "August" +msgstr "8 сар" #. module: hr_attendance -#: rml:report.hr.timesheet.attendance.error:0 -msgid "Min Delay" -msgstr "Хамгийн бага зогсолт" +#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:0 +#, python-format +msgid "A sign-out must be right after a sign-in !" +msgstr "Системээс гарах нь системд нэвтрэх үйлдлийн яг ард нь байна." #. module: hr_attendance -#: field:hr.action.reason,action_type:0 -msgid "Action's type" -msgstr "Үйл ажиллагааны төрөл" +#: selection:hr.attendance.month,month:0 +msgid "June" +msgstr "6 сар" #. module: hr_attendance -#: view:hr.action.reason:0 -msgid "Define attendance reason" -msgstr "Ирцийн шалтгаан тодорхойлох" +#: model:ir.model,name:hr_attendance.model_hr_attendance_error +msgid "Print Error Attendance Report" +msgstr "Алдаатай ирцийн тайланг хэвлэх" #. module: hr_attendance -#: selection:hr.action.reason,action_type:0 -#: wizard_button:hr.si_so,init,si_test:0 -#: wizard_button:hr.si_so,si_ask_so,si:0 -msgid "Sign in" -msgstr "Нэвтрэх" +#: model:ir.module.module,shortdesc:hr_attendance.module_meta_information +msgid "Attendances Of Employees" +msgstr "Ажилчдын ирц" #. module: hr_attendance -#: wizard_view:hr.attendance.report,init:0 -msgid "Analysis Information" -msgstr "Мэдээлэлд шинжилгээ хийх" +#: field:hr.attendance,name:0 +msgid "Date" +msgstr "Огноо" #. module: hr_attendance -#: wizard_field:hr.si_so,init,state:0 -msgid "Current state" -msgstr "Одоогийн байдал" +#: selection:hr.attendance.month,month:0 +msgid "November" +msgstr "11 сар" + +#. module: hr_attendance +#: selection:hr.attendance.month,month:0 +msgid "October" +msgstr "10 сар" #. module: hr_attendance -#: selection:hr.attendance.print_month,init,month:0 +#: view:hr.attendance:0 +msgid "My Attendances" +msgstr "Өөрийн ирц" + +#. module: hr_attendance +#: selection:hr.attendance.month,month:0 msgid "January" msgstr "1 сар" #. module: hr_attendance -#: selection:hr.attendance.print_month,init,month:0 -msgid "April" -msgstr "4 сар" +#: selection:hr.action.reason,action_type:0 +#: view:hr.sign.in.out:0 +#: view:hr.sign.in.out.ask:0 +msgid "Sign in" +msgstr "Нэвтрэх" #. module: hr_attendance -#: model:ir.actions.act_window,name:hr_attendance.open_view_attendance -#: model:ir.ui.menu,name:hr_attendance.menu_hr_attendance -#: model:ir.ui.menu,name:hr_attendance.menu_open_view_attendance -msgid "Attendances" -msgstr "Ирцүүд" +#: view:hr.attendance.error:0 +msgid "Analysis Information" +msgstr "Мэдээлэлд шинжилгээ хийх" #. module: hr_attendance -#: rml:report.hr.timesheet.attendance.error:0 +#: view:hr.sign.in.out:0 +msgid "Sign-Out Entry must follow Sign-In." +msgstr "Системээс гарсан бүртгэлийг системд нэвтэрсэн бүртгэл дагалдана" + +#. module: hr_attendance +#: report:report.hr.timesheet.attendance.error:0 msgid "Attendance Errors" msgstr "Ирцийн алдаанууд" @@ -305,103 +387,214 @@ msgstr "Ирцийн алдаанууд" #: field:hr.attendance,action:0 #: selection:hr.attendance,action:0 msgid "Action" -msgstr "Үйл ажиллагаа" +msgstr "Үйлдэл" #. module: hr_attendance -#: wizard_button:hr.attendance.report,init,print:0 -msgid "Print Attendance Report" -msgstr "Ирцийн мэдээлэл хэвлэх" +#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0 +#, python-format +msgid "No records found for your selection!" +msgstr "Таны сонголтод таарах бичлэг олдсонгүй" #. module: hr_attendance -#: model:ir.actions.act_window,name:hr_attendance.open_view_attendance_reason -#: model:ir.ui.menu,name:hr_attendance.menu_open_view_attendance_reason -msgid "Attendance Reasons" -msgstr "Ирцийн шалтгаан" +#: model:ir.model,name:hr_attendance.model_hr_attendance_week +msgid "Print Week Attendance Report" +msgstr "Долоо хоногийн ирцийн тайлан" #. module: hr_attendance -#: selection:hr.attendance.print_month,init,month:0 -msgid "November" -msgstr "11 сар" +#: field:hr.sign.in.out,emp_id:0 +#: field:hr.sign.in.out.ask,emp_id:0 +msgid "Empoyee ID" +msgstr "Ажилтны дугаар" #. module: hr_attendance -#: wizard_view:hr.attendance.report,init:0 -msgid "Bellow this delay, the error is considered to be voluntary" +#: view:hr.attendance.error:0 +#: view:hr.attendance.month:0 +#: view:hr.sign.in.out:0 +#: view:hr.sign.in.out.ask:0 +msgid "Cancel" +msgstr "Цуцлах" + +#. module: hr_attendance +#: constraint:ir.model:0 +msgid "" +"The Object name must start with x_ and not contain any special character !" msgstr "" +"Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж " +"болохгүй!" #. module: hr_attendance -#: wizard_field:hr.attendance.report,init,max_delay:0 -msgid "Max. Delay (Min)" -msgstr "Хамгийн их зогсолт(Хамгийн бага)" +#: help:hr.action.reason,name:0 +msgid "Specifies the reason for Signing In/Signing Out." +msgstr "Системд нэвтэрсэн, системээс гарсан ирцийн үйлдлийг тодорхойлдог" #. module: hr_attendance -#: wizard_view:hr.attendance.print_week,init:0 -msgid "Select a starting and a end date" -msgstr "Эхлэх болон дуусах огноо сонгох" +#: report:report.hr.timesheet.attendance.error:0 +msgid "" +"(*) A positive delay means that the employee worked less than recorded." +msgstr "" +"(*) Эерэг саатал нь ажилтан тэмдэглэснээс бага ажилласан гэсэн утга болно." #. module: hr_attendance -#: wizard_field:hr.attendance.print_week,init,end_date:0 -#: wizard_field:hr.attendance.report,init,end_date:0 -msgid "Ending Date" -msgstr "Дуусах огноо" +#: view:hr.attendance.month:0 +msgid "Print Attendance Report Monthly" +msgstr "Сар бүрийн ирцийн тайланг хэвлэх" #. module: hr_attendance -#: wizard_view:hr.si_so,so_ask_si:0 -msgid "" -"You did not signed in the last time. Please enter the date and time you " -"signed in." -msgstr "Та сүүлийн цагт нэвтэрсэнгүй. Нэвтэрсэн огноо болон цагаа оруулна уу" +#: selection:hr.action.reason,action_type:0 +#: view:hr.sign.in.out:0 +#: view:hr.sign.in.out.ask:0 +msgid "Sign out" +msgstr "Гарах" #. module: hr_attendance -#: selection:hr.attendance.print_month,init,month:0 -msgid "September" -msgstr "9 сар" +#: report:report.hr.timesheet.attendance.error:0 +msgid "Delay" +msgstr "Саатал" #. module: hr_attendance -#: selection:hr.attendance.print_month,init,month:0 -msgid "December" -msgstr "12 сар" +#: view:hr.attendance:0 +#: model:ir.model,name:hr_attendance.model_hr_employee +msgid "Employee" +msgstr "Ажилтан" + +#. module: hr_attendance +#: view:hr.sign.in.out.ask:0 +#: field:hr.sign.in.out.ask,last_time:0 +msgid "Your last sign out" +msgstr "Сүүлд та системээс гарсан үйлдэл" + +#. module: hr_attendance +#: report:report.hr.timesheet.attendance.error:0 +msgid "Date Recorded" +msgstr "Бичигдсэн огноо" + +#. module: hr_attendance +#: model:ir.actions.act_window,name:hr_attendance.open_view_attendance +#: model:ir.ui.menu,name:hr_attendance.menu_hr_attendance +#: model:ir.ui.menu,name:hr_attendance.menu_open_view_attendance +msgid "Attendances" +msgstr "Ирцүүд" + +#. module: hr_attendance +#: selection:hr.attendance.month,month:0 +msgid "May" +msgstr "5 сар" + +#. module: hr_attendance +#: view:hr.sign.in.out.ask:0 +msgid "Your last sign in" +msgstr "Таны сүүлийн нэвтрэлт" + +#. module: hr_attendance +#: selection:hr.attendance,action:0 +#: view:hr.employee:0 +msgid "Sign Out" +msgstr "Гарах" + +#. module: hr_attendance +#: field:hr.attendance,employee_id:0 +msgid "Employee's Name" +msgstr "Ажилтны нэр" + +#. module: hr_attendance +#: selection:hr.employee,state:0 +msgid "Absent" +msgstr "Байхгүй байгаа" + +#. module: hr_attendance +#: selection:hr.attendance.month,month:0 +msgid "February" +msgstr "2 сар" + +#. module: hr_attendance +#: field:hr.action.reason,action_type:0 +msgid "Action's type" +msgstr "Үйлдлийн төрөл" #. module: hr_attendance #: view:hr.attendance:0 -msgid "Employee attendance" -msgstr "Ажилтаны ирц" +msgid "Employee attendances" +msgstr "Ажилчдын ирц" #. module: hr_attendance -#: wizard_view:hr.attendance.print_month,init:0 -msgid "Select a month" -msgstr "Сар сонгох" +#: field:hr.sign.in.out,state:0 +msgid "Current state" +msgstr "Одоогийн төлөв" #. module: hr_attendance -#: wizard_field:hr.attendance.print_month,init,month:0 -msgid "Month" -msgstr "Сар" +#: selection:hr.attendance.month,month:0 +msgid "April" +msgstr "4 сар" #. module: hr_attendance -#: model:ir.module.module,description:hr_attendance.module_meta_information -msgid "This module aims to manage employee's attendances." -msgstr "Модулийн зорилго нь ажилчдын ирцийг зохицуулах" +#: view:hr.attendance.error:0 +msgid "Bellow this delay, the error is considered to be voluntary" +msgstr "Саатал нь үүнээс бага бол, энэ алдааг анзаарахгүй гэж үзнэ" #. module: hr_attendance -#: model:ir.actions.report.xml,name:hr_attendance.attendance_error_report -msgid "Attendance Error Report" -msgstr "Ирцийн алдаатай мэдээлэл" +#: constraint:ir.rule:0 +msgid "Rules are not supported for osv_memory objects !" +msgstr "osv_memory обьект дүрмийг дэмждэггүй" #. module: hr_attendance -#: wizard_field:hr.attendance.print_month,init,year:0 +#: view:hr.sign.in.out.ask:0 +msgid "" +"You did not sign in the last time. Please enter the date and time you signed " +"in." +msgstr "" +"Сүүлд таны системд нэвтэрсэн үйлдэл бүртгэгдсэнгүй. Системд нэвтэрсэн огноо, " +"цагаа оруулна уу!" + +#. module: hr_attendance +#: field:hr.attendance.month,year:0 msgid "Year" msgstr "Жил" #. module: hr_attendance -#: wizard_button:hr.attendance.print_month,init,end:0 -#: wizard_button:hr.attendance.print_week,init,end:0 -#: wizard_button:hr.attendance.report,init,end:0 -#: wizard_button:hr.si_so,init,end:0 -#: wizard_button:hr.si_so,si_ask_so,end:0 -#: wizard_button:hr.si_so,so_ask_si,end:0 -msgid "Cancel" -msgstr "Цуцлах" +#: view:hr.sign.in.out.ask:0 +msgid "hr.sign.in.out.ask" +msgstr "Нэвтрэх, гарахыг хүсэх" -#. module: hr_attendance -#: rml:report.hr.timesheet.attendance.error:0 -msgid "Operation" -msgstr "Үйл ажиллагаа" +#~ msgid "Employee's name" +#~ msgstr "Ажилтны нэр" + +#~ msgid "Print Timesheet" +#~ msgstr "Хуваарь хэвлэх" + +#~ msgid "Print Attendance Error Report" +#~ msgstr "Ирцийн алдаатай мэдээлэл хэвлэх" + +#~ msgid "Print Timesheet by week" +#~ msgstr "Долоо хоногийн хуваарь хэвлэх" + +#~ msgid "Select a time span" +#~ msgstr "Цагийн интервал сонгох" + +#~ msgid "Action reason" +#~ msgstr "Үйл ажиллагааны шалтгаан" + +#~ msgid "Print Timesheet by month" +#~ msgstr "Сарын хуваарь хэвлэх" + +#~ msgid "Print Attendance Report" +#~ msgstr "Ирцийн мэдээлэл хэвлэх" + +#~ msgid "Select a starting and a end date" +#~ msgstr "Эхлэх болон дуусах огноо сонгох" + +#~ msgid "" +#~ "You did not signed in the last time. Please enter the date and time you " +#~ "signed in." +#~ msgstr "Та сүүлийн цагт нэвтэрсэнгүй. Нэвтэрсэн огноо болон цагаа оруулна уу" + +#~ msgid "Select a month" +#~ msgstr "Сар сонгох" + +#~ msgid "This module aims to manage employee's attendances." +#~ msgstr "Модулийн зорилго нь ажилчдын ирцийг зохицуулах" + +#~ msgid "" +#~ "You did not signed out the last time. Please enter the date and time you " +#~ "signed out." +#~ msgstr "" +#~ "Та сүүлд гарсан бүртгэлээ хийгээгүй байна. Гарсан огноогоо оруулна уу." diff --git a/addons/hr_attendance/i18n/pt.po b/addons/hr_attendance/i18n/pt.po index 94ac70485c4..9d748367a16 100644 --- a/addons/hr_attendance/i18n/pt.po +++ b/addons/hr_attendance/i18n/pt.po @@ -6,298 +6,381 @@ msgid "" 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 13:21+0000\n" -"Last-Translator: Madalena_prime <madalena.barreto@prime.cv>\n" +"POT-Creation-Date: 2010-10-18 17:46+0000\n" +"PO-Revision-Date: 2010-10-26 19:53+0000\n" +"Last-Translator: Carlos Almeida <Unknown>\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-09-29 05:13+0000\n" +"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: hr_attendance -#: field:hr.employee,state:0 -#: model:ir.model,name:hr_attendance.model_hr_attendance -msgid "Attendance" -msgstr "Assiduidade" +#: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking +msgid "Time Tracking" +msgstr "Registo de Tempo" #. module: hr_attendance -#: constraint:ir.model:0 +#: view:hr.attendance:0 +msgid "Group By..." +msgstr "Agrupar Por..." + +#. module: hr_attendance +#: constraint:ir.actions.act_window:0 +msgid "Invalid model name in the action definition." +msgstr "Nome de módulo inválido na definição da acção" + +#. module: hr_attendance +#: view:hr.attendance:0 +msgid "Today" +msgstr "Hoje" + +#. module: hr_attendance +#: code:addons/hr_attendance/hr_attendance.py:0 +#, python-format msgid "" -"The Object name must start with x_ and not contain any special character !" +"You tried to %s with a date anterior to another event !\n" +"Try to contact the administrator to correct attendances." msgstr "" -"O nome do objecto deve começar com x_ e não pode conter um carácter especial!" +"Você tentou %s com uma data anterior a outro evento!\n" +"Contacte o administrador para corrigir as assiduidade." #. module: hr_attendance -#: wizard_view:hr.si_so,init:0 -#: wizard_view:hr.si_so,si_ask_so:0 -#: wizard_view:hr.si_so,so_ask_si:0 -#: model:ir.actions.wizard,name:hr_attendance.si_so -#: model:ir.ui.menu,name:hr_attendance.menu_si_so -msgid "Sign in / Sign out" -msgstr "Entrar / Sair" +#: selection:hr.attendance.month,month:0 +msgid "March" +msgstr "Março" #. module: hr_attendance -#: rml:report.hr.timesheet.attendance.error:0 +#: view:hr.sign.in.out.ask:0 msgid "" -"(*) A positive delay means that the employee worked less than recorded." +"You did not sign out the last time. Please enter the date and time you " +"signed out." msgstr "" -"(*) Um atraso positivo significa que o empregado trabalhou menos do que o " -"gravado" +"Você não registou a saída da última vez. Por favor indique a hora em que " +"saiu." + +#. module: hr_attendance +#: report:report.hr.timesheet.attendance.error:0 +msgid "Total period:" +msgstr "Período total:" + +#. module: hr_attendance +#: field:hr.action.reason,name:0 +msgid "Reason" +msgstr "Motivo" + +#. module: hr_attendance +#: view:hr.attendance.error:0 +msgid "Print Attendance Report Error" +msgstr "Imprimir Relatório de Desvios de Assiduidade" + +#. module: hr_attendance +#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:0 +#, python-format +msgid "The sign-out date must be in the past" +msgstr "A data de saída tem de ser passada" + +#. module: hr_attendance +#: report:report.hr.timesheet.attendance.error:0 +msgid "Date Signed" +msgstr "Data de Assinatura" + +#. module: hr_attendance +#: view:hr.action.reason:0 +msgid "Attendance reasons" +msgstr "Tipos de Registo Entrada/Saída" #. module: hr_attendance #: view:hr.attendance:0 -msgid "Employee attendances" -msgstr "Presenças do empregado" +#: field:hr.attendance,day:0 +msgid "Day" +msgstr "Dia" #. module: hr_attendance -#: constraint:ir.ui.view:0 -msgid "Invalid XML for View Architecture!" -msgstr "XML inválido para a arquitectura de vista" +#: selection:hr.employee,state:0 +msgid "Present" +msgstr "Presente" #. module: hr_attendance -#: wizard_view:hr.si_so,init:0 -msgid "You are now ready to sign in or out of the attendance follow up" -msgstr "Você já pode registar ou sair do seguimento de presenças" +#: model:ir.model,name:hr_attendance.model_hr_sign_in_out_ask +msgid "Ask for Sign In Out" +msgstr "Perguntar por Entradas e Saídas" #. module: hr_attendance -#: selection:hr.action.reason,action_type:0 -#: wizard_button:hr.si_so,init,so_test:0 -#: wizard_button:hr.si_so,so_ask_si,so:0 -msgid "Sign out" -msgstr "Sair" +#: field:hr.attendance,action_desc:0 +#: model:ir.model,name:hr_attendance.model_hr_action_reason +msgid "Action Reason" +msgstr "Razão da Acção" #. module: hr_attendance -#: rml:report.hr.timesheet.attendance.error:0 -msgid "Delay" -msgstr "Atraso" +#: view:hr.sign.in.out:0 +msgid "Ok" +msgstr "Ok" #. module: hr_attendance -#: wizard_field:hr.si_so,init,name:0 -#: wizard_field:hr.si_so,si_ask_so,name:0 -#: wizard_field:hr.si_so,so_ask_si,name:0 -msgid "Employee's name" -msgstr "Nome do empregado" +#: view:hr.action.reason:0 +msgid "Define attendance reason" +msgstr "Definir tipo de entradas e saídas" #. module: hr_attendance -#: wizard_button:hr.attendance.print_month,init,print:0 -#: wizard_button:hr.attendance.print_week,init,print:0 -msgid "Print Timesheet" -msgstr "" +#: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_month +msgid "Attendances By Month" +msgstr "Assiduidades por Mês" #. module: hr_attendance -#: model:ir.actions.wizard,name:hr_attendance.wizard_attendance_error -msgid "Print Attendance Error Report" -msgstr "Imprimir relatório de erro de presença" +#: field:hr.sign.in.out,name:0 +#: field:hr.sign.in.out.ask,name:0 +msgid "Employees name" +msgstr "Nomes de Empregados" #. module: hr_attendance -#: constraint:ir.actions.act_window:0 -msgid "Invalid model name in the action definition." -msgstr "" +#: model:ir.actions.act_window,name:hr_attendance.open_view_attendance_reason +#: model:ir.ui.menu,name:hr_attendance.menu_open_view_attendance_reason +msgid "Attendance Reasons" +msgstr "Tipos de Entradas e Saídas" #. module: hr_attendance -#: model:ir.actions.wizard,name:hr_attendance.print_week -msgid "Print Timesheet by week" -msgstr "" +#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:0 +#, python-format +msgid "UserError" +msgstr "Erro de Utilizador" #. module: hr_attendance -#: field:hr.attendance,employee_id:0 -msgid "Employee" -msgstr "Empregado" +#: field:hr.attendance.error,end_date:0 +#: field:hr.attendance.week,end_date:0 +msgid "Ending Date" +msgstr "Data de Fim" #. module: hr_attendance -#: wizard_view:hr.attendance.print_week,init:0 -#: wizard_view:hr.attendance.report,init:0 -msgid "Select a time span" -msgstr "" +#: view:hr.attendance:0 +msgid "Employee attendance" +msgstr "Assiduidade do Empregado" #. module: hr_attendance -#: rml:report.hr.timesheet.attendance.error:0 -msgid "Date Recorded" -msgstr "Data gravado" +#: code:addons/hr_attendance/hr_attendance.py:0 +#, python-format +msgid "Warning" +msgstr "Aviso" #. module: hr_attendance -#: selection:hr.attendance,action:0 -#: view:hr.employee:0 -msgid "Sign In" -msgstr "Entrar" +#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:0 +#, python-format +msgid "The Sign-in date must be in the past" +msgstr "A data de entrada deve estar no passado" #. module: hr_attendance -#: rml:report.hr.timesheet.attendance.error:0 -msgid "Total period:" -msgstr "Período total:" +#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:0 +#, python-format +msgid "A sign-in must be right after a sign-out !" +msgstr "A entrada deve estar depois da saída !" #. module: hr_attendance -#: field:hr.attendance,action_desc:0 -#: model:ir.model,name:hr_attendance.model_hr_action_reason -msgid "Action reason" -msgstr "Motivo da acção" +#: field:hr.employee,state:0 +#: model:ir.model,name:hr_attendance.model_hr_attendance +msgid "Attendance" +msgstr "Assiduidade" #. module: hr_attendance -#: selection:hr.attendance.print_month,init,month:0 -msgid "March" -msgstr "" +#: view:hr.sign.in.out:0 +msgid "You are now ready to sign in or out of the attendance follow up" +msgstr "Você já pode registar entradas ou saídas do registo de assiduidade" #. module: hr_attendance -#: selection:hr.attendance.print_month,init,month:0 -msgid "August" -msgstr "" +#: field:hr.attendance.error,max_delay:0 +msgid "Max. Delay (Min)" +msgstr "Máx. Atraso (Min)" #. module: hr_attendance -#: selection:hr.attendance.print_month,init,month:0 -msgid "May" -msgstr "" +#: view:hr.attendance.error:0 +#: view:hr.attendance.month:0 +msgid "Print" +msgstr "Imprimir" #. module: hr_attendance -#: wizard_field:hr.si_so,so_ask_si,last_time:0 -msgid "Your last sign in" -msgstr "A sua ultima entrada" +#: view:hr.attendance:0 +msgid "Hr Attendance Search" +msgstr "Procura de Assiduidades RH" #. module: hr_attendance -#: selection:hr.attendance.print_month,init,month:0 -msgid "June" -msgstr "" +#: constraint:hr.attendance:0 +msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)" +msgstr "Erro: Entrada (Saída) deve ser seguida de Saída (Entrada)" #. module: hr_attendance -#: model:ir.actions.wizard,name:hr_attendance.print_month -msgid "Print Timesheet by month" -msgstr "" +#: selection:hr.attendance.month,month:0 +msgid "July" +msgstr "Julho" + +#. module: hr_attendance +#: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_error +#: model:ir.actions.report.xml,name:hr_attendance.attendance_error_report +msgid "Attendance Error Report" +msgstr "Relatório de Desvios de Assiduidades" + +#. module: hr_attendance +#: field:hr.attendance.error,init_date:0 +#: field:hr.attendance.week,init_date:0 +msgid "Starting Date" +msgstr "Data Inicial" + +#. module: hr_attendance +#: constraint:ir.ui.view:0 +msgid "Invalid XML for View Architecture!" +msgstr "XML inválido para a arquitectura de vista" + +#. module: hr_attendance +#: report:report.hr.timesheet.attendance.error:0 +msgid "Min Delay" +msgstr "Atraso mínimo" #. module: hr_attendance #: selection:hr.attendance,action:0 #: view:hr.employee:0 -msgid "Sign Out" -msgstr "Sair" +msgid "Sign In" +msgstr "Entrar" #. module: hr_attendance -#: model:ir.module.module,shortdesc:hr_attendance.module_meta_information -msgid "Attendances Of Employees" -msgstr "" +#: report:report.hr.timesheet.attendance.error:0 +msgid "Operation" +msgstr "Operação" #. module: hr_attendance -#: field:hr.action.reason,name:0 -msgid "Reason" -msgstr "Motivo" +#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0 +#, python-format +msgid "No Data Available" +msgstr "Data Não Disponível" #. module: hr_attendance -#: constraint:hr.attendance:0 -msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)" -msgstr "" +#: selection:hr.attendance.month,month:0 +msgid "September" +msgstr "Setembro" #. module: hr_attendance -#: rml:report.hr.timesheet.attendance.error:0 -msgid "Date Signed" -msgstr "Data de assinatura" +#: selection:hr.attendance.month,month:0 +msgid "December" +msgstr "Dezembro" #. module: hr_attendance -#: field:hr.attendance,name:0 -msgid "Date" -msgstr "Data" +#: field:hr.attendance.month,month:0 +msgid "Month" +msgstr "Mês" #. module: hr_attendance -#: selection:hr.attendance.print_month,init,month:0 -msgid "July" +#: report:report.hr.timesheet.attendance.error:0 +msgid "" +"(*) A negative delay means that the employee worked more than encoded." msgstr "" +"(*) Um atraso negativo indica que o empregado trabalhou mais horas que o " +"previsto" #. module: hr_attendance -#: wizard_view:hr.si_so,si_ask_so:0 +#: help:hr.attendance,action_desc:0 msgid "" -"You did not signed out the last time. Please enter the date and time you " -"signed out." -msgstr "" -"Você não se registou da última vez. Por favor insira a data e a hora da " -"última vez que fez o registo." +"Specifies the reason for Signing In/Signing Out in case of extra hours." +msgstr "Especifique as razões de Entrada/Saída no caso de horas extras." #. module: hr_attendance -#: view:hr.action.reason:0 -msgid "Attendance reasons" -msgstr "Rasões de presença" +#: model:ir.model,name:hr_attendance.model_hr_attendance_month +msgid "Print Monthly Attendance Report" +msgstr "Imprimir Realtório Mensal de Assiduidades" #. module: hr_attendance -#: wizard_field:hr.attendance.print_week,init,init_date:0 -#: wizard_field:hr.attendance.report,init,init_date:0 -msgid "Starting Date" -msgstr "" +#: model:ir.model,name:hr_attendance.model_hr_sign_in_out +msgid "Sign In Sign Out" +msgstr "Entrada Saída" #. module: hr_attendance -#: selection:hr.employee,state:0 -msgid "Present" -msgstr "Presente" +#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:0 +#: view:hr.sign.in.out:0 +#: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_sigh_in_out +#: model:ir.ui.menu,name:hr_attendance.menu_hr_attendance_sigh_in_out +#, python-format +msgid "Sign in / Sign out" +msgstr "Entrada / Saída" #. module: hr_attendance -#: selection:hr.employee,state:0 -msgid "Absent" -msgstr "Ausente" +#: view:hr.sign.in.out.ask:0 +msgid "hr.sign.out.ask" +msgstr "hr.sign.out.ask" #. module: hr_attendance -#: selection:hr.attendance.print_month,init,month:0 -msgid "February" -msgstr "" +#: constraint:ir.ui.menu:0 +msgid "Error ! You can not create recursive Menu." +msgstr "Erro ! Não pode criar menus recursivos" #. module: hr_attendance -#: selection:hr.attendance.print_month,init,month:0 -msgid "October" -msgstr "" +#: selection:hr.attendance.month,month:0 +msgid "August" +msgstr "Agosto" #. module: hr_attendance -#: wizard_field:hr.si_so,si_ask_so,last_time:0 -msgid "Your last sign out" -msgstr "A sua ultima saída" +#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:0 +#, python-format +msgid "A sign-out must be right after a sign-in !" +msgstr "O registo de uma saída deve ser depois de uma entrada!" #. module: hr_attendance -#: rml:report.hr.timesheet.attendance.error:0 -msgid "Min Delay" -msgstr "Atraso mínimo" +#: selection:hr.attendance.month,month:0 +msgid "June" +msgstr "Junho" #. module: hr_attendance -#: field:hr.action.reason,action_type:0 -msgid "Action's type" -msgstr "Tipo da acção" +#: model:ir.model,name:hr_attendance.model_hr_attendance_error +msgid "Print Error Attendance Report" +msgstr "Imprimir Relatório de Desvios de Assiduidade" #. module: hr_attendance -#: view:hr.action.reason:0 -msgid "Define attendance reason" -msgstr "Definir rasões de presença" +#: model:ir.module.module,shortdesc:hr_attendance.module_meta_information +msgid "Attendances Of Employees" +msgstr "Assiduidades dos Empregados" #. module: hr_attendance -#: selection:hr.action.reason,action_type:0 -#: wizard_button:hr.si_so,init,si_test:0 -#: wizard_button:hr.si_so,si_ask_so,si:0 -msgid "Sign in" -msgstr "Entrar" +#: field:hr.attendance,name:0 +msgid "Date" +msgstr "Data" #. module: hr_attendance -#: wizard_view:hr.attendance.report,init:0 -msgid "Analysis Information" -msgstr "" +#: selection:hr.attendance.month,month:0 +msgid "November" +msgstr "Novembro" #. module: hr_attendance -#: wizard_field:hr.si_so,init,state:0 -msgid "Current state" -msgstr "Estado actual" +#: selection:hr.attendance.month,month:0 +msgid "October" +msgstr "Outubro" + +#. module: hr_attendance +#: view:hr.attendance:0 +msgid "My Attendances" +msgstr "A Minha Assiduidade" #. module: hr_attendance -#: selection:hr.attendance.print_month,init,month:0 +#: selection:hr.attendance.month,month:0 msgid "January" -msgstr "" +msgstr "Janeiro" #. module: hr_attendance -#: selection:hr.attendance.print_month,init,month:0 -msgid "April" -msgstr "" +#: selection:hr.action.reason,action_type:0 +#: view:hr.sign.in.out:0 +#: view:hr.sign.in.out.ask:0 +msgid "Sign in" +msgstr "Entrada" #. module: hr_attendance -#: model:ir.actions.act_window,name:hr_attendance.open_view_attendance -#: model:ir.ui.menu,name:hr_attendance.menu_hr_attendance -#: model:ir.ui.menu,name:hr_attendance.menu_open_view_attendance -msgid "Attendances" -msgstr "Presenças" +#: view:hr.attendance.error:0 +msgid "Analysis Information" +msgstr "Informação da Análise" #. module: hr_attendance -#: rml:report.hr.timesheet.attendance.error:0 +#: view:hr.sign.in.out:0 +msgid "Sign-Out Entry must follow Sign-In." +msgstr "Um registo de saída deve ser seguida de um de entrada." + +#. module: hr_attendance +#: report:report.hr.timesheet.attendance.error:0 msgid "Attendance Errors" -msgstr "Erros de presenças" +msgstr "Desvios de Assiduidade" #. module: hr_attendance #: field:hr.attendance,action:0 @@ -306,102 +389,190 @@ msgid "Action" msgstr "Acção" #. module: hr_attendance -#: wizard_button:hr.attendance.report,init,print:0 -msgid "Print Attendance Report" -msgstr "" +#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0 +#, python-format +msgid "No records found for your selection!" +msgstr "Não foram encontrados registos para a sua selecção!" #. module: hr_attendance -#: model:ir.actions.act_window,name:hr_attendance.open_view_attendance_reason -#: model:ir.ui.menu,name:hr_attendance.menu_open_view_attendance_reason -msgid "Attendance Reasons" -msgstr "Rasões de presença" +#: model:ir.model,name:hr_attendance.model_hr_attendance_week +msgid "Print Week Attendance Report" +msgstr "Imprimir Relatório Semanal de Assiduidades" #. module: hr_attendance -#: selection:hr.attendance.print_month,init,month:0 -msgid "November" -msgstr "" +#: field:hr.sign.in.out,emp_id:0 +#: field:hr.sign.in.out.ask,emp_id:0 +msgid "Empoyee ID" +msgstr "ID do Empregado" #. module: hr_attendance -#: wizard_view:hr.attendance.report,init:0 -msgid "Bellow this delay, the error is considered to be voluntary" -msgstr "" +#: view:hr.attendance.error:0 +#: view:hr.attendance.month:0 +#: view:hr.sign.in.out:0 +#: view:hr.sign.in.out.ask:0 +msgid "Cancel" +msgstr "Cancelar" #. module: hr_attendance -#: wizard_field:hr.attendance.report,init,max_delay:0 -msgid "Max. Delay (Min)" +#: constraint:ir.model:0 +msgid "" +"The Object name must start with x_ and not contain any special character !" msgstr "" +"O nome do objecto deve começar com x_ e não pode conter um carácter especial!" #. module: hr_attendance -#: wizard_view:hr.attendance.print_week,init:0 -msgid "Select a starting and a end date" -msgstr "" +#: help:hr.action.reason,name:0 +msgid "Specifies the reason for Signing In/Signing Out." +msgstr "Especificar tipos de Entradas/Saídas" #. module: hr_attendance -#: wizard_field:hr.attendance.print_week,init,end_date:0 -#: wizard_field:hr.attendance.report,init,end_date:0 -msgid "Ending Date" +#: report:report.hr.timesheet.attendance.error:0 +msgid "" +"(*) A positive delay means that the employee worked less than recorded." msgstr "" +"(*) Um atraso positivo significa que o empregado trabalhou menos do que o " +"gravado" #. module: hr_attendance -#: wizard_view:hr.si_so,so_ask_si:0 -msgid "" -"You did not signed in the last time. Please enter the date and time you " -"signed in." -msgstr "" -"Você não registou-se na última vez. Por favor insira a data da ultima vez " -"que fez o registo." +#: view:hr.attendance.month:0 +msgid "Print Attendance Report Monthly" +msgstr "Imprimir Relatório de Assiduidades Mensalmente" #. module: hr_attendance -#: selection:hr.attendance.print_month,init,month:0 -msgid "September" -msgstr "" +#: selection:hr.action.reason,action_type:0 +#: view:hr.sign.in.out:0 +#: view:hr.sign.in.out.ask:0 +msgid "Sign out" +msgstr "Sair" #. module: hr_attendance -#: selection:hr.attendance.print_month,init,month:0 -msgid "December" -msgstr "" +#: report:report.hr.timesheet.attendance.error:0 +msgid "Delay" +msgstr "Atraso" #. module: hr_attendance #: view:hr.attendance:0 -msgid "Employee attendance" -msgstr "Presença do empregado" +#: model:ir.model,name:hr_attendance.model_hr_employee +msgid "Employee" +msgstr "Empregado" #. module: hr_attendance -#: wizard_view:hr.attendance.print_month,init:0 -msgid "Select a month" -msgstr "" +#: view:hr.sign.in.out.ask:0 +#: field:hr.sign.in.out.ask,last_time:0 +msgid "Your last sign out" +msgstr "A sua última saída" #. module: hr_attendance -#: wizard_field:hr.attendance.print_month,init,month:0 -msgid "Month" -msgstr "" +#: report:report.hr.timesheet.attendance.error:0 +msgid "Date Recorded" +msgstr "Data de Registo" #. module: hr_attendance -#: model:ir.module.module,description:hr_attendance.module_meta_information -msgid "This module aims to manage employee's attendances." -msgstr "" +#: model:ir.actions.act_window,name:hr_attendance.open_view_attendance +#: model:ir.ui.menu,name:hr_attendance.menu_hr_attendance +#: model:ir.ui.menu,name:hr_attendance.menu_open_view_attendance +msgid "Attendances" +msgstr "Assiduidades" #. module: hr_attendance -#: model:ir.actions.report.xml,name:hr_attendance.attendance_error_report -msgid "Attendance Error Report" -msgstr "Relatório de erro das presenças" +#: selection:hr.attendance.month,month:0 +msgid "May" +msgstr "Maio" #. module: hr_attendance -#: wizard_field:hr.attendance.print_month,init,year:0 -msgid "Year" +#: view:hr.sign.in.out.ask:0 +msgid "Your last sign in" +msgstr "A Sua Última Entrada" + +#. module: hr_attendance +#: selection:hr.attendance,action:0 +#: view:hr.employee:0 +msgid "Sign Out" +msgstr "Sair" + +#. module: hr_attendance +#: field:hr.attendance,employee_id:0 +msgid "Employee's Name" +msgstr "Nome do Empregado" + +#. module: hr_attendance +#: selection:hr.employee,state:0 +msgid "Absent" +msgstr "Falta" + +#. module: hr_attendance +#: selection:hr.attendance.month,month:0 +msgid "February" +msgstr "Fevereiro" + +#. module: hr_attendance +#: field:hr.action.reason,action_type:0 +msgid "Action's type" +msgstr "Tipo da Acção" + +#. module: hr_attendance +#: view:hr.attendance:0 +msgid "Employee attendances" +msgstr "Assiduidade do Empregado" + +#. module: hr_attendance +#: field:hr.sign.in.out,state:0 +msgid "Current state" +msgstr "Estado Actual" + +#. module: hr_attendance +#: selection:hr.attendance.month,month:0 +msgid "April" +msgstr "Abril" + +#. module: hr_attendance +#: view:hr.attendance.error:0 +msgid "Bellow this delay, the error is considered to be voluntary" +msgstr "Abaixo deste atraso, o erro é considerado como sendo voluntário" + +#. module: hr_attendance +#: constraint:ir.rule:0 +msgid "Rules are not supported for osv_memory objects !" +msgstr "O objecto osv_memory não suporta regras!" + +#. module: hr_attendance +#: view:hr.sign.in.out.ask:0 +msgid "" +"You did not sign in the last time. Please enter the date and time you signed " +"in." msgstr "" +"Você não registou a entrada. Por favor registe a data e hora da última " +"entrada agora." #. module: hr_attendance -#: wizard_button:hr.attendance.print_month,init,end:0 -#: wizard_button:hr.attendance.print_week,init,end:0 -#: wizard_button:hr.attendance.report,init,end:0 -#: wizard_button:hr.si_so,init,end:0 -#: wizard_button:hr.si_so,si_ask_so,end:0 -#: wizard_button:hr.si_so,so_ask_si,end:0 -msgid "Cancel" -msgstr "Cancelar" +#: field:hr.attendance.month,year:0 +msgid "Year" +msgstr "Ano" #. module: hr_attendance -#: rml:report.hr.timesheet.attendance.error:0 -msgid "Operation" -msgstr "Operação" +#: view:hr.sign.in.out.ask:0 +msgid "hr.sign.in.out.ask" +msgstr "hr.sign.in.out.ask" + +#~ msgid "Employee's name" +#~ msgstr "Nome do empregado" + +#~ msgid "Print Attendance Error Report" +#~ msgstr "Imprimir relatório de erro de presença" + +#~ msgid "Action reason" +#~ msgstr "Motivo da acção" + +#~ msgid "" +#~ "You did not signed out the last time. Please enter the date and time you " +#~ "signed out." +#~ msgstr "" +#~ "Você não se registou da última vez. Por favor insira a data e a hora da " +#~ "última vez que fez o registo." + +#~ msgid "" +#~ "You did not signed in the last time. Please enter the date and time you " +#~ "signed in." +#~ msgstr "" +#~ "Você não registou-se na última vez. Por favor insira a data da ultima vez " +#~ "que fez o registo." diff --git a/addons/hr_contract/i18n/mn.po b/addons/hr_contract/i18n/mn.po index e8cde50a39c..d9245da73ad 100644 --- a/addons/hr_contract/i18n/mn.po +++ b/addons/hr_contract/i18n/mn.po @@ -7,14 +7,14 @@ msgid "" msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" -"POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-09-29 10:58+0000\n" -"Last-Translator: ub121 <ubs121@gmail.com>\n" +"POT-Creation-Date: 2010-10-18 17:46+0000\n" +"PO-Revision-Date: 2010-10-27 03:20+0000\n" +"Last-Translator: badralkh <Unknown>\n" "Language-Team: Mongolian <mn@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-09-30 04:43+0000\n" +"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: hr_contract @@ -28,6 +28,11 @@ msgid "Gross" msgstr "Бааз" #. module: hr_contract +#: view:hr.contract:0 +msgid "Trial Period" +msgstr "Туршилтын хугацаа" + +#. module: hr_contract #: constraint:ir.model:0 msgid "" "The Object name must start with x_ and not contain any special character !" @@ -36,15 +41,39 @@ msgstr "" "болохгүй!" #. module: hr_contract -#: view:hr.contract:0 #: view:hr.employee:0 -msgid "Generalities" -msgstr "Ерөнхий" +msgid "Calculations" +msgstr "Тооцоолол" #. module: hr_contract -#: field:hr.employee,children:0 -msgid "Number of children" -msgstr "Хүүхдийн тоо" +#: selection:hr.contract.wage.type,type:0 +msgid "Net" +msgstr "Цэвэр" + +#. module: hr_contract +#: view:hr.employee:0 +msgid "Medical Examination" +msgstr "Эрүүл мэндийн үзлэг" + +#. module: hr_contract +#: field:hr.employee,vehicle:0 +msgid "Company Vehicle" +msgstr "Компанийн тээврийн хэрэгсэл" + +#. module: hr_contract +#: field:hr.contract,department_id:0 +msgid "Department" +msgstr "Хэлтэс" + +#. module: hr_contract +#: view:hr.employee:0 +msgid "Miscellaneous" +msgstr "Бусад" + +#. module: hr_contract +#: view:hr.contract:0 +msgid "Current" +msgstr "Одоогийн" #. module: hr_contract #: field:hr.contract.wage.type,factor_type:0 @@ -52,24 +81,41 @@ msgid "Factor for hour cost" msgstr "Цагийн өртөгийн фактор" #. module: hr_contract +#: view:hr.employee:0 +msgid "Function Arguments" +msgstr "Функцийн хувьсагчууд" + +#. module: hr_contract #: view:hr.contract.wage.type:0 msgid "Wage Types" msgstr "Цалингийн төрлүүд" #. module: hr_contract -#: constraint:ir.actions.act_window:0 -msgid "Invalid model name in the action definition." -msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр байна." +#: constraint:ir.ui.menu:0 +msgid "Error ! You can not create recursive Menu." +msgstr "Алдаа! Рекурс цэсийг үүсгэж болохгүй" #. module: hr_contract +#: selection:hr.contract.wage.type,type:0 +msgid "Basic" +msgstr "Үндсэн" + +#. module: hr_contract +#: view:hr.contract:0 #: field:hr.contract,employee_id:0 +#: model:ir.model,name:hr_contract.model_hr_employee msgid "Employee" msgstr "Ажилтан" #. module: hr_contract -#: selection:hr.contract.wage.type,type:0 -msgid "Net" -msgstr "Цэвэр" +#: field:hr.contract,trial_date_start:0 +msgid "Trial Start Date" +msgstr "Туршилтын үе эхлэх огноо" + +#. module: hr_contract +#: constraint:ir.actions.act_window:0 +msgid "Invalid model name in the action definition." +msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр байна." #. module: hr_contract #: model:ir.module.module,shortdesc:hr_contract.module_meta_information @@ -82,42 +128,71 @@ msgid "Hours in the period" msgstr "Хугацааны мөчлөг" #. module: hr_contract -#: field:hr.contract,function:0 +#: view:hr.employee:0 msgid "Function" msgstr "Үүрэг" #. module: hr_contract -#: field:hr.employee,marital_status:0 -#: view:hr.employee.marital.status:0 -#: field:hr.employee.marital.status,name:0 -#: model:ir.actions.act_window,name:hr_contract.action_hr_marital_status -#: model:ir.ui.menu,name:hr_contract.hr_menu_marital_status -msgid "Marital Status" -msgstr "Гэрлэлтийн байдал" +#: view:hr.employee:0 +msgid "Description" +msgstr "Тайлбар" #. module: hr_contract -#: view:hr.employee:0 -msgid "Miscelleanous" -msgstr "Бусад" +#: field:hr.contract,wage:0 +msgid "Wage" +msgstr "Цалин" + +#. module: hr_contract +#: field:hr.employee,place_of_birth:0 +msgid "Place of Birth" +msgstr "Төрсөн газар" #. module: hr_contract #: view:hr.contract:0 #: view:hr.employee:0 #: field:hr.employee,contract_ids:0 +#: model:ir.actions.act_window,name:hr_contract.act_hr_employee_2_hr_contract +#: model:ir.actions.act_window,name:hr_contract.action_hr_contract +#: model:ir.ui.menu,name:hr_contract.hr_menu_contract msgid "Contracts" msgstr "Гэрээнүүд" #. module: hr_contract -#: field:hr.contract.wage.type,type:0 -msgid "Type" -msgstr "Төрөл" +#: field:hr.employee,manager:0 +msgid "Is a Manager" +msgstr "Менежер эсэх" #. module: hr_contract -#: field:hr.contract,wage_type_id:0 -#: view:hr.contract.wage.type:0 -#: model:ir.model,name:hr_contract.model_hr_contract_wage_type -msgid "Wage Type" -msgstr "Цалингийн төрөл" +#: view:hr.contract:0 +#: field:hr.contract,working_hours:0 +msgid "Working Schedule" +msgstr "Ажлын цагийн хуваарь" + +#. module: hr_contract +#: view:hr.contract:0 +msgid "Job" +msgstr "Ажлын байр" + +#. module: hr_contract +#: view:hr.contract:0 +#: view:hr.employee:0 +msgid "Passport" +msgstr "Пасспорт" + +#. module: hr_contract +#: view:hr.contract:0 +msgid "Search Contract" +msgstr "Гэрээг хайх" + +#. module: hr_contract +#: help:hr.employee,contract_id:0 +msgid "Latest contract of the employee" +msgstr "Ажилтны одоогийн хөдөлмөрийн гэрээ" + +#. module: hr_contract +#: field:hr.contract,advantages_net:0 +msgid "Deductions" +msgstr "Суутгал" #. module: hr_contract #: field:hr.contract.wage.type.period,name:0 @@ -125,29 +200,44 @@ msgid "Period Name" msgstr "Мөчлөгийн нэр" #. module: hr_contract -#: model:ir.model,name:hr_contract.model_hr_employee_marital_status -msgid "Employee Marital Status" -msgstr "Ажилчдын гэрлэлтийн байдал" +#: view:hr.contract:0 +#: field:hr.contract,advantages:0 +#: view:hr.employee:0 +msgid "Advantages" +msgstr "Давуу тал" #. module: hr_contract -#: field:hr.employee,medic_exam:0 -msgid "Medical examination date" -msgstr "Эмнэлэгийн үзлэгийн огноо" +#: view:hr.contract:0 +#: view:hr.employee:0 +msgid "Valid for" +msgstr "Хүчинтэй хугацаа дуусах огноо" #. module: hr_contract -#: field:hr.contract.wage.type,name:0 -msgid "Wage Type Name" -msgstr "Цалингийн төрлийн нэр" +#: view:hr.contract:0 +#: view:hr.employee:0 +msgid "Work Permit" +msgstr "Ажлын зөвшөөрөл" #. module: hr_contract -#: field:hr.contract,working_hours_per_day:0 -msgid "Working hours per day" -msgstr "Өдөрт дунджаар ажиллах хугацаа" +#: field:hr.employee,children:0 +msgid "Number of Children" +msgstr "Хүүхдийн тоо" + +#. module: hr_contract +#: model:ir.actions.act_window,name:hr_contract.action_hr_contract_type +#: model:ir.ui.menu,name:hr_contract.hr_menu_contract_type +msgid "Contract Types" +msgstr "Гэрээний төрлүүд" + +#. module: hr_contract +#: view:hr.contract.wage.type:0 +msgid "Search Wage Type" +msgstr "Цалин төрлийг хайх" #. module: hr_contract #: view:hr.employee:0 -msgid "Salary" -msgstr "Цалин" +msgid "Payslip Line" +msgstr "Цалингийн хуудасны мөр" #. module: hr_contract #: field:hr.contract,date_end:0 @@ -160,6 +250,16 @@ msgid "Invalid XML for View Architecture!" msgstr "Дэлгэцийн XML алдаатай!" #. module: hr_contract +#: field:hr.contract,name:0 +msgid "Contract Reference" +msgstr "Гэрээний нэр" + +#. module: hr_contract +#: help:hr.employee,vehicle_distance:0 +msgid "In kilometers" +msgstr "Километрээр" + +#. module: hr_contract #: view:hr.contract:0 #: field:hr.contract,notes:0 #: view:hr.employee:0 @@ -167,63 +267,124 @@ msgid "Notes" msgstr "Тэмдэглэл" #. module: hr_contract +#: field:hr.contract,wage_type_id:0 +#: view:hr.contract.wage.type:0 +#: model:ir.actions.act_window,name:hr_contract.action_hr_contract_wage_type +#: model:ir.model,name:hr_contract.model_hr_contract_wage_type +#: model:ir.ui.menu,name:hr_contract.hr_menu_contract_wage_type +msgid "Wage Type" +msgstr "Цалингийн төрөл" + +#. module: hr_contract #: view:hr.contract:0 -#: view:hr.employee:0 -#: model:ir.actions.act_window,name:hr_contract.action_hr_contract +#: field:hr.employee,contract_id:0 #: model:ir.model,name:hr_contract.model_hr_contract -#: model:ir.ui.menu,name:hr_contract.hr_menu_contract #: model:ir.ui.menu,name:hr_contract.next_id_56 msgid "Contract" msgstr "Гэрээ" #. module: hr_contract +#: view:hr.contract:0 +#: field:hr.contract,type_id:0 #: view:hr.contract.type:0 +#: field:hr.contract.type,name:0 +#: model:ir.model,name:hr_contract.model_hr_contract_type msgid "Contract Type" msgstr "Гэрээний төрөл" #. module: hr_contract +#: view:hr.contract.wage.type.period:0 +msgid "Search Wage Period" +msgstr "Цалийн мөчлөгийг хайх" + +#. module: hr_contract +#: view:hr.employee:0 +msgid "Salary Computation" +msgstr "Цалингийн тооцоолол" + +#. module: hr_contract +#: view:hr.employee:0 +msgid "Job Info" +msgstr "Ажлын байрны мэдээлэл" + +#. module: hr_contract #: field:hr.contract.wage.type,period_id:0 +#: view:hr.contract.wage.type.period:0 #: model:ir.model,name:hr_contract.model_hr_contract_wage_type_period msgid "Wage Period" msgstr "Цалингийн мөчлөг" #. module: hr_contract -#: field:hr.employee,audiens_num:0 -msgid "AUDIENS Number" -msgstr "AUDIENS дугаар" +#: field:hr.contract,job_id:0 +msgid "Job Title" +msgstr "Албан тушаал" + +#. module: hr_contract +#: model:ir.actions.act_window,name:hr_contract.action_hr_contract_wage_type_period +#: model:ir.ui.menu,name:hr_contract.hr_menu_contract_wage_type_period +msgid "Wage period" +msgstr "Цалингийн мөчлөг" + +#. module: hr_contract +#: field:hr.employee,vehicle_distance:0 +msgid "Home-Work Distance" +msgstr "Гэрээс ажил хүртэлх зай" + +#. module: hr_contract +#: field:hr.contract,date_start:0 +msgid "Start Date" +msgstr "Эхлэх огноо" + +#. module: hr_contract +#: view:hr.employee:0 +msgid "Company contribution" +msgstr "Ажил олгогчийн төлөх шимтгэл" + +#. module: hr_contract +#: field:hr.contract.wage.type,type:0 +msgid "Type" +msgstr "Төрөл" + +#. module: hr_contract +#: field:hr.contract,trial_date_end:0 +msgid "Trial End Date" +msgstr "Туршилт хугацаа дуусах огноо" #. module: hr_contract #: view:hr.contract:0 -msgid "Remuneration" -msgstr "Нөхөн олговор" +#: view:hr.contract.wage.type:0 +msgid "Group By..." +msgstr "Бүлэглэвэл..." #. module: hr_contract -#: field:hr.contract,name:0 -msgid "Contract Name" -msgstr "Гэрээний нэр" +#: view:hr.contract.wage.type:0 +msgid "Period" +msgstr "Мөчлөг" #. module: hr_contract -#: model:ir.actions.act_window,name:hr_contract.action_hr_contract_wage_type -#: model:ir.ui.menu,name:hr_contract.hr_menu_contract_wage_type -msgid "Contract Wage Type" -msgstr "Гэрээн дахь цалингийн төрөл" +#: view:hr.contract:0 +msgid "Overpassed" +msgstr "Хугацаа нь өнгөрсөн" #. module: hr_contract -#: field:hr.employee,place_of_birth:0 -msgid "Place of Birth" -msgstr "Төрсөн газар" +#: field:hr.contract.wage.type,name:0 +msgid "Wage Type Name" +msgstr "Цалингийн төрлийн нэр" #. module: hr_contract -#: field:hr.employee,manager:0 -msgid "Manager" -msgstr "Менежер" +#: view:hr.employee:0 +msgid "Employee specific allowances and deductions" +msgstr "Ажилтанд бүрт онцлог олголт, суутгалууд" #. module: hr_contract -#: view:hr.contract.wage.type.period:0 -#: model:ir.actions.act_window,name:hr_contract.action_hr_contract_wage_type_period -#: model:ir.ui.menu,name:hr_contract.hr_menu_contract_wage_type_period -msgid "Wage period" -msgstr "Цалингийн мөчлөг" +#: view:hr.employee:0 +msgid "Contract Details" +msgstr "Гэрээний дэлгэрэнгүй" + +#. module: hr_contract +#: view:hr.employee:0 +msgid "Salary Structure" +msgstr "Цалингийн шатлал" #. module: hr_contract #: help:hr.contract.wage.type,factor_type:0 @@ -236,22 +397,77 @@ msgstr "" "тооцоход хэрэглэгдэнэ" #. module: hr_contract -#: field:hr.contract,wage:0 -msgid "Wage" -msgstr "Цалин" +#: view:hr.employee:0 +msgid "Personal Info" +msgstr "Хувийн мэдээлэл" #. module: hr_contract -#: field:hr.contract,date_start:0 -msgid "Start Date" -msgstr "Эхлэх огноо" +#: view:hr.contract:0 +#: view:hr.employee:0 +msgid "Duration" +msgstr "Үргэлжлэх хугацаа" #. module: hr_contract -#: field:hr.employee.marital.status,description:0 -msgid "Status Description" -msgstr "Статусын тайлбар" +#: field:hr.employee,medic_exam:0 +msgid "Medical Examination Date" +msgstr "Эмнэлгийн үзлэгийн огноо" + +#. module: hr_contract +#: field:hr.contract,advantages_gross:0 +msgid "Allowances" +msgstr "Олголтууд" #. module: hr_contract #: view:hr.contract:0 -#: view:hr.employee:0 -msgid "Contract Duration" -msgstr "Гэрээний үргэлжлэх хугацаа" +msgid "Main Data" +msgstr "Үндсэн мэдээлэл" + +#. module: hr_contract +#: view:hr.contract.type:0 +msgid "Search Contract Type" +msgstr "Гэрээний төрлийг хайх" + +#~ msgid "Generalities" +#~ msgstr "Ерөнхий" + +#~ msgid "Number of children" +#~ msgstr "Хүүхдийн тоо" + +#~ msgid "Marital Status" +#~ msgstr "Гэрлэлтийн байдал" + +#~ msgid "Miscelleanous" +#~ msgstr "Бусад" + +#~ msgid "Employee Marital Status" +#~ msgstr "Ажилчдын гэрлэлтийн байдал" + +#~ msgid "Medical examination date" +#~ msgstr "Эмнэлэгийн үзлэгийн огноо" + +#~ msgid "Working hours per day" +#~ msgstr "Өдөрт дунджаар ажиллах хугацаа" + +#~ msgid "Salary" +#~ msgstr "Цалин" + +#~ msgid "AUDIENS Number" +#~ msgstr "AUDIENS дугаар" + +#~ msgid "Remuneration" +#~ msgstr "Нөхөн олговор" + +#~ msgid "Contract Name" +#~ msgstr "Гэрээний нэр" + +#~ msgid "Contract Wage Type" +#~ msgstr "Гэрээн дахь цалингийн төрөл" + +#~ msgid "Manager" +#~ msgstr "Менежер" + +#~ msgid "Status Description" +#~ msgstr "Статусын тайлбар" + +#~ msgid "Contract Duration" +#~ msgstr "Гэрээний үргэлжлэх хугацаа" diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py index 4d8ef9d440f..9de7379d962 100644 --- a/addons/hr_evaluation/hr_evaluation.py +++ b/addons/hr_evaluation/hr_evaluation.py @@ -200,14 +200,12 @@ class hr_evaluation(osv.osv): for employee in employee_obj.browse(cr, uid, [employee_id], context=context): if employee and employee.evaluation_plan_id and employee.evaluation_plan_id.id: evaluation_plan_id=employee.evaluation_plan_id.id - employee_ids=employee_obj.search(cr, uid, [('parent_id','=',employee.id)], context=context) return {'value': {'plan_id':evaluation_plan_id}} def button_plan_in_progress(self, cr, uid, ids, context=None): hr_eval_inter_obj = self.pool.get('hr.evaluation.interview') if context is None: context = {} - apprai_id = [] for evaluation in self.browse(cr, uid, ids, context=context): wait = False for phase in evaluation.plan_id.phase_ids: diff --git a/addons/hr_expense/i18n/mn.po b/addons/hr_expense/i18n/mn.po index 4a5d88dad9d..01fa2207f15 100644 --- a/addons/hr_expense/i18n/mn.po +++ b/addons/hr_expense/i18n/mn.po @@ -7,14 +7,14 @@ msgid "" msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" -"POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-10-05 07:25+0000\n" -"Last-Translator: OpenERP Administrators <Unknown>\n" +"POT-Creation-Date: 2010-10-18 17:46+0000\n" +"PO-Revision-Date: 2010-10-27 02:54+0000\n" +"Last-Translator: badralkh <Unknown>\n" "Language-Team: Mongolian <mn@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-10-08 04:39+0000\n" +"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: hr_expense @@ -33,10 +33,21 @@ msgid "The accoutant reimburse the expenses" msgstr "Зардлуудыг нөхөн төлөх данс" #. module: hr_expense -#: model:ir.actions.act_window,name:hr_expense.expense_all_confirm -#: model:ir.ui.menu,name:hr_expense.menu_expense_all_confirm -msgid "Expenses waiting validation" -msgstr "Батлахыг хүлээж буй зардлууд" +#: field:hr.expense.expense,date_confirm:0 +#: field:hr.expense.report,date_confirm:0 +msgid "Confirmation Date" +msgstr "Баталсаг огноо" + +#. module: hr_expense +#: view:hr.expense.expense:0 +#: view:hr.expense.report:0 +msgid "Group By..." +msgstr "Бүлэглэвэл..." + +#. module: hr_expense +#: model:product.template,name:hr_expense.product_product_expense_air_product_template +msgid "Air Ticket" +msgstr "Онгоцны тийз" #. module: hr_expense #: constraint:ir.actions.act_window:0 @@ -44,14 +55,34 @@ msgid "Invalid model name in the action definition." msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр байна." #. module: hr_expense -#: field:hr.expense.expense,date_confirm:0 -msgid "Date Confirmed" -msgstr "Баталсан огноо" +#: view:hr.expense.expense:0 +#: field:hr.expense.expense,department_id:0 +#: view:hr.expense.report:0 +#: field:hr.expense.report,department_id:0 +msgid "Department" +msgstr "Хэлтэс" #. module: hr_expense -#: selection:hr.expense.expense,state:0 -msgid "Waiting confirmation" -msgstr "Батлахыг хүлээх" +#: view:hr.expense.report:0 +msgid "Extended filters..." +msgstr "Нэмэлт шүүлтүүр" + +#. module: hr_expense +#: selection:hr.expense.report,month:0 +msgid "March" +msgstr "3 сар" + +#. module: hr_expense +#: field:hr.expense.report,invoiced:0 +msgid "# of Invoiced Lines" +msgstr "" + +#. module: hr_expense +#: field:hr.expense.expense,company_id:0 +#: view:hr.expense.report:0 +#: field:hr.expense.report,company_id:0 +msgid "Company" +msgstr "" #. module: hr_expense #: view:hr.expense.expense:0 @@ -59,18 +90,18 @@ msgid "Set to Draft" msgstr "Ноороглох" #. module: hr_expense -#: model:ir.actions.act_window,name:hr_expense.expense_my_confirm -#: model:ir.ui.menu,name:hr_expense.menu_expense_my_confirm -msgid "My expenses waiting validation" -msgstr "Батлахыг хүлээж буй миний зардлууд" +#: view:hr.expense.expense:0 +msgid "To Pay" +msgstr "" #. module: hr_expense -#: model:ir.actions.act_window,name:hr_expense.expense_all -#: model:ir.ui.menu,name:hr_expense.menu_expense_all -msgid "All expenses" -msgstr "Бүх зардлууд" +#: model:ir.model,name:hr_expense.model_hr_expense_report +msgid "Expenses Statistics" +msgstr "" #. module: hr_expense +#: selection:hr.expense.expense,state:0 +#: view:hr.expense.report:0 #: model:process.node,name:hr_expense.process_node_approved0 msgid "Approved" msgstr "Зөвшөөрсөн" @@ -81,10 +112,11 @@ msgid "UoM" msgstr "Хэмжих нэгж" #. module: hr_expense -#: view:hr.expense.expense:0 -#: model:process.transition.action,name:hr_expense.process_transition_action_refuse0 -msgid "Refuse" -msgstr "Татгалзах" +#: help:hr.expense.expense,date_valid:0 +msgid "" +"Date of the acceptation of the sheet expense. It's filled when the button " +"Accept is pressed." +msgstr "" #. module: hr_expense #: view:hr.expense.expense:0 @@ -92,7 +124,12 @@ msgid "Notes" msgstr "Тэмдэглэл" #. module: hr_expense -#: selection:hr.expense.expense,state:0 +#: field:hr.expense.expense,invoice_id:0 +msgid "Employee's Invoice" +msgstr "" + +#. module: hr_expense +#: selection:hr.expense.report,state:0 msgid "Cancelled" msgstr "Цуцлагдсан" @@ -102,33 +139,44 @@ msgid "Validation" msgstr "Батлах" #. module: hr_expense -#: help:product.product,hr_expense_ok:0 -msgid "" -"Determine if the product can be visible in the list of product within a " -"selection from an HR expense sheet line." -msgstr "" +#: selection:hr.expense.report,state:0 +msgid "Waiting confirmation" +msgstr "Батлахыг хүлээх" #. module: hr_expense -#: selection:hr.expense.expense,state:0 +#: selection:hr.expense.report,state:0 msgid "Accepted" msgstr "Зөвшөөрсөн" #. module: hr_expense -#: rml:hr.expense:0 +#: view:hr.expense.report:0 +msgid " Month " +msgstr "" + +#. module: hr_expense +#: report:hr.expense:0 #: field:hr.expense.expense,ref:0 #: field:hr.expense.line,ref:0 msgid "Reference" msgstr "Лавлах" #. module: hr_expense -#: rml:hr.expense:0 +#: report:hr.expense:0 msgid "Certified honest and conform," msgstr "" #. module: hr_expense -#: model:ir.actions.report.xml,name:hr_expense.hr_expenses -msgid "Print HR expenses" -msgstr "Зардлуудыг хэвлэх" +#: help:hr.expense.expense,date_confirm:0 +msgid "" +"Date of the confirmation of the sheet expense. It's filled when the button " +"Confirm is pressed." +msgstr "" + +#. module: hr_expense +#: view:hr.expense.report:0 +#: field:hr.expense.report,nbr:0 +msgid "# of Lines" +msgstr "" #. module: hr_expense #: model:process.transition,name:hr_expense.process_transition_refuseexpense0 @@ -136,6 +184,21 @@ msgid "Refuse expense" msgstr "Зардлыг хүлээн зөвшөөрөхгүй" #. module: hr_expense +#: model:product.template,name:hr_expense.product_product_expense_car_product_template +msgid "Car Travel" +msgstr "" + +#. module: hr_expense +#: field:hr.expense.report,price_average:0 +msgid "Average Price" +msgstr "" + +#. module: hr_expense +#: view:hr.expense.report:0 +msgid "Total Invoiced Lines" +msgstr "" + +#. module: hr_expense #: view:hr.expense.expense:0 #: model:process.transition.action,name:hr_expense.process_transition_action_confirm0 msgid "Confirm" @@ -147,34 +210,60 @@ msgid "The accoutant validates the sheet" msgstr "Нягтлан энэ шийтийг батална." #. module: hr_expense +#: field:hr.expense.report,delay_valid:0 +msgid "Delay to Valid" +msgstr "" + +#. module: hr_expense +#: help:hr.expense.line,sequence:0 +msgid "Gives the sequence order when displaying a list of expense lines." +msgstr "" + +#. module: hr_expense +#: code:addons/hr_expense/hr_expense.py:0 +#, python-format +msgid "" +"Please configure Default Expanse account for Product purchase, " +"`property_account_expense_categ`" +msgstr "" + +#. module: hr_expense #: field:hr.expense.line,analytic_account:0 +#: view:hr.expense.report:0 +#: field:hr.expense.report,analytic_account:0 msgid "Analytic account" msgstr "Аналитик данс" #. module: hr_expense -#: model:process.node,name:hr_expense.process_node_supplierinvoice0 -#: model:process.transition,name:hr_expense.process_transition_approveinvoice0 -msgid "Supplier Invoice" -msgstr "Нийлүүлэгчийн нэхэмжлэл" +#: field:hr.expense.report,date:0 +msgid "Date " +msgstr "" #. module: hr_expense #: field:hr.expense.expense,state:0 +#: view:hr.expense.report:0 +#: field:hr.expense.report,state:0 msgid "State" msgstr "Төлөв" #. module: hr_expense -#: rml:hr.expense:0 +#: report:hr.expense:0 +#: view:hr.expense.expense:0 #: field:hr.expense.expense,employee_id:0 +#: view:hr.expense.report:0 msgid "Employee" msgstr "Ажилтан" #. module: hr_expense -#: rml:hr.expense:0 +#: report:hr.expense:0 +#: field:hr.expense.report,product_qty:0 msgid "Qty" msgstr "Тоо хэмжээ" #. module: hr_expense -#: rml:hr.expense:0 +#: report:hr.expense:0 +#: view:hr.expense.report:0 +#: field:hr.expense.report,price_total:0 msgid "Total Price" msgstr "Нийт үнэ" @@ -184,12 +273,28 @@ msgid "Some costs may be reinvoices to the customer" msgstr "Зарим үнүүдийг харилцагч дахин нэхэмжилж магадгүй" #. module: hr_expense -#: model:ir.actions.act_window,name:hr_expense.expense_my -#: model:ir.ui.menu,name:hr_expense.menu_expense_my +#: code:addons/hr_expense/hr_expense.py:0 +#, python-format +msgid "Error !" +msgstr "" + +#. module: hr_expense +#: view:board.board:0 +#: model:ir.actions.act_window,name:hr_expense.action_my_expense msgid "My Expenses" msgstr "Миний зардлууд" #. module: hr_expense +#: view:hr.expense.report:0 +msgid "Creation Date" +msgstr "" + +#. module: hr_expense +#: model:ir.actions.report.xml,name:hr_expense.hr_expenses +msgid "HR expenses" +msgstr "" + +#. module: hr_expense #: field:hr.expense.expense,id:0 msgid "Sheet ID" msgstr "Хуудасны дугаар" @@ -201,14 +306,20 @@ msgstr "Нөхөн төлөх зардал" #. module: hr_expense #: field:hr.expense.expense,journal_id:0 +#: field:hr.expense.report,journal_id:0 msgid "Force Journal" msgstr "Хүчинтэй журнал" #. module: hr_expense -#: model:ir.actions.act_window,name:hr_expense.expense_my_new -#: model:ir.ui.menu,name:hr_expense.menu_expense_my_new -msgid "New Expenses Sheet" -msgstr "Шинэ зардлын хуудас" +#: view:hr.expense.report:0 +#: field:hr.expense.report,no_of_products:0 +msgid "# of Products" +msgstr "" + +#. module: hr_expense +#: selection:hr.expense.report,month:0 +msgid "July" +msgstr "" #. module: hr_expense #: model:process.transition,note:hr_expense.process_transition_reimburseexpense0 @@ -226,8 +337,33 @@ msgid "Invalid XML for View Architecture!" msgstr "Дэлгэцийн XML алдаатай!" #. module: hr_expense +#: constraint:product.template:0 +msgid "Error: UOS must be in a different category than the UOM" +msgstr "" + +#. module: hr_expense +#: view:hr.expense.report:0 +msgid " Month-1 " +msgstr "" + +#. module: hr_expense +#: field:hr.expense.expense,date_valid:0 +#: field:hr.expense.report,date_valid:0 +msgid "Validation Date" +msgstr "" + +#. module: hr_expense +#: view:hr.expense.report:0 +#: model:ir.actions.act_window,name:hr_expense.action_hr_expense_report_all +#: model:ir.ui.menu,name:hr_expense.menu_hr_expense_report_all +msgid "Expenses Analysis" +msgstr "" + +#. module: hr_expense +#: view:hr.expense.expense:0 #: field:hr.expense.line,expense_id:0 #: model:ir.model,name:hr_expense.model_hr_expense_expense +#: model:process.process,name:hr_expense.process_process_expenseprocess0 msgid "Expense" msgstr "Зардал" @@ -239,22 +375,75 @@ msgid "Expense Lines" msgstr "Зардлын мөрүүд" #. module: hr_expense +#: field:hr.expense.report,delay_confirm:0 +msgid "Delay to Confirm" +msgstr "" + +#. module: hr_expense +#: selection:hr.expense.report,month:0 +msgid "September" +msgstr "" + +#. module: hr_expense +#: selection:hr.expense.report,month:0 +msgid "December" +msgstr "" + +#. module: hr_expense +#: view:hr.expense.expense:0 +#: view:hr.expense.report:0 +#: field:hr.expense.report,month:0 +msgid "Month" +msgstr "" + +#. module: hr_expense #: field:hr.expense.expense,currency_id:0 +#: field:hr.expense.report,currency_id:0 msgid "Currency" msgstr "Валют" #. module: hr_expense +#: code:addons/hr_expense/hr_expense.py:0 +#, python-format +msgid "The employee must have a working address" +msgstr "" + +#. module: hr_expense +#: selection:hr.expense.expense,state:0 +msgid "Waiting Approval" +msgstr "" + +#. module: hr_expense #: model:process.node,note:hr_expense.process_node_draftexpenses0 msgid "Employee encode all his expenses" msgstr "Ажилчдын бүх зардлыг шифрлэх" #. module: hr_expense #: selection:hr.expense.expense,state:0 +#: view:hr.expense.report:0 +#: selection:hr.expense.report,state:0 msgid "Invoiced" msgstr "Нэхэмжилсэн" #. module: hr_expense +#: field:product.product,hr_expense_ok:0 +msgid "Can Constitute an Expense" +msgstr "" + +#. module: hr_expense +#: view:hr.expense.report:0 +msgid " Year " +msgstr "" + +#. module: hr_expense +#: constraint:product.template:0 +msgid "" +"Error: The default UOM and the purchase UOM must be in the same category." +msgstr "" + +#. module: hr_expense #: selection:hr.expense.expense,state:0 +#: selection:hr.expense.report,state:0 msgid "Reimbursed" msgstr "Нөхөн төлөлт" @@ -269,17 +458,16 @@ msgid "Create Customer invoice" msgstr "Хэрэглэгчийн нэхэмжлэл үүсгэх" #. module: hr_expense +#: view:hr.expense.expense:0 #: selection:hr.expense.expense,state:0 +#: selection:hr.expense.report,state:0 msgid "Draft" msgstr "Ноорог" #. module: hr_expense -#: constraint:ir.model:0 -msgid "" -"The Object name must start with x_ and not contain any special character !" +#: constraint:ir.ui.menu:0 +msgid "Error ! You can not create recursive Menu." msgstr "" -"Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж " -"болохгүй!" #. module: hr_expense #: view:hr.expense.expense:0 @@ -292,46 +480,72 @@ msgid "Expense is approved." msgstr "Зөвшөөрсөн зардлууд" #. module: hr_expense +#: selection:hr.expense.report,month:0 +msgid "August" +msgstr "" + +#. module: hr_expense +#: model:process.node,note:hr_expense.process_node_approved0 +msgid "The direct manager approves the sheet" +msgstr "Менежерийн зөвшөөрлийн хуудас" + +#. module: hr_expense #: field:hr.expense.expense,amount:0 msgid "Total Amount" msgstr "Нийт хэмжээ" #. module: hr_expense +#: selection:hr.expense.report,month:0 +msgid "June" +msgstr "" + +#. module: hr_expense #: model:process.node,name:hr_expense.process_node_draftexpenses0 msgid "Draft Expenses" msgstr "Ноорог зардлууд" #. module: hr_expense +#: view:hr.expense.expense:0 +msgid "Customer Project" +msgstr "" + +#. module: hr_expense +#: view:hr.expense.expense:0 #: field:hr.expense.expense,user_id:0 msgid "User" msgstr "Хэрэглэгч" #. module: hr_expense -#: rml:hr.expense:0 +#: report:hr.expense:0 #: field:hr.expense.expense,date:0 #: field:hr.expense.line,date_value:0 msgid "Date" msgstr "Огноо" #. module: hr_expense -#: rml:hr.expense:0 -msgid "Total:" -msgstr "Нийт:" +#: selection:hr.expense.report,month:0 +msgid "November" +msgstr "" #. module: hr_expense -#: rml:hr.expense:0 -msgid "HR Expenses" -msgstr "Хүний нөөцийн зардалууд" +#: selection:hr.expense.report,month:0 +msgid "October" +msgstr "" #. module: hr_expense -#: field:hr.expense.expense,date_valid:0 -msgid "Date Validated" -msgstr "Батлагдсан огноо" +#: report:hr.expense:0 +msgid "Total:" +msgstr "Нийт:" #. module: hr_expense -#: field:hr.expense.expense,account_move_id:0 -msgid "Account Move" -msgstr "Данс шилжүүлэх" +#: selection:hr.expense.report,month:0 +msgid "January" +msgstr "" + +#. module: hr_expense +#: report:hr.expense:0 +msgid "HR Expenses" +msgstr "Хүний нөөцийн зардалууд" #. module: hr_expense #: model:process.node,note:hr_expense.process_node_confirmedexpenses0 @@ -344,21 +558,26 @@ msgid "The direct manager refuses the sheet.Reset as draft." msgstr "Менежер хүлээн зөвшөөрөөгүй зардлыг ноороглож дахин засах" #. module: hr_expense +#: model:process.node,name:hr_expense.process_node_supplierinvoice0 +#: model:process.transition,name:hr_expense.process_transition_approveinvoice0 +msgid "Supplier Invoice" +msgstr "Нийлүүлэгчийн нэхэмжлэл" + +#. module: hr_expense #: view:hr.expense.expense:0 msgid "Expenses Sheet" msgstr "Зардлын хуудас" #. module: hr_expense -#: model:ir.actions.act_window,name:hr_expense.expense_all_invoiced -#: model:ir.ui.menu,name:hr_expense.menu_expense_all_invoiced -msgid "Expenses waiting payment" -msgstr "Хүлээлтийн зардлын төлбөр" +#: view:hr.expense.report:0 +msgid "Waiting" +msgstr "" #. module: hr_expense -#: model:ir.actions.act_window,name:hr_expense.expense_my_draft -#: model:ir.ui.menu,name:hr_expense.menu_expense_my_draft -msgid "My Draft expenses" -msgstr "Миний ноорог зардлууд" +#: view:hr.expense.report:0 +#: field:hr.expense.report,day:0 +msgid "Day" +msgstr "" #. module: hr_expense #: model:ir.module.module,shortdesc:hr_expense.module_meta_information @@ -367,15 +586,15 @@ msgstr "Хүний нөөцийн зардлын мөр" #. module: hr_expense #: view:hr.expense.expense:0 -#: field:hr.expense.expense,invoice_id:0 -#: model:process.transition.action,name:hr_expense.process_transition_action_supplierinvoice0 -msgid "Invoice" -msgstr "Нэхэмжлэл" +msgid "References" +msgstr "" #. module: hr_expense #: view:hr.expense.expense:0 -msgid "Cancel" -msgstr "Цуцлах" +#: field:hr.expense.report,invoice_id:0 +#: model:process.transition.action,name:hr_expense.process_transition_action_supplierinvoice0 +msgid "Invoice" +msgstr "Нэхэмжлэл" #. module: hr_expense #: model:process.transition,name:hr_expense.process_transition_reimbursereinvoice0 @@ -383,9 +602,18 @@ msgid "Reinvoice" msgstr "Дахин нэхэмжлэх" #. module: hr_expense -#: model:process.process,name:hr_expense.process_process_expenseprocess0 -msgid "Expense Process" -msgstr "Урсгал зардал" +#: view:board.board:0 +#: model:ir.actions.act_window,name:hr_expense.action_employee_expense +msgid "All Employee Expenses" +msgstr "" + +#. module: hr_expense +#: constraint:ir.model:0 +msgid "" +"The Object name must start with x_ and not contain any special character !" +msgstr "" +"Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж " +"болохгүй!" #. module: hr_expense #: view:hr.expense.expense:0 @@ -393,10 +621,15 @@ msgid "Other Info" msgstr "Бусад мэдээлэл" #. module: hr_expense -#: model:ir.actions.act_window,name:hr_expense.expense_all_draft -#: model:ir.ui.menu,name:hr_expense.menu_expense_all_draft -msgid "Draft expenses" -msgstr "Ноорог зардлууд" +#: help:hr.expense.expense,journal_id:0 +msgid "The journal used when the expense is invoiced" +msgstr "" + +#. module: hr_expense +#: view:hr.expense.expense:0 +#: model:process.transition.action,name:hr_expense.process_transition_action_refuse0 +msgid "Refuse" +msgstr "Татгалзах" #. module: hr_expense #: model:process.transition,name:hr_expense.process_transition_confirmexpense0 @@ -409,13 +642,12 @@ msgid "Approve expense" msgstr "Зардлыг зөвшөөрөх" #. module: hr_expense -#: view:hr.expense.expense:0 #: model:process.transition.action,name:hr_expense.process_transition_action_accept0 msgid "Accept" msgstr "Зөвшөөрөх" #. module: hr_expense -#: rml:hr.expense:0 +#: report:hr.expense:0 msgid "This document must be dated and signed for reimbursement" msgstr "" "Энэ бичиг баримтанд нь огноо болон нөхөн төлөлтийн гарын үсэг зурагдсан " @@ -427,32 +659,35 @@ msgid "Expense is refused." msgstr "Зардал хүлээн зөвшөөрөгдсөнгүй." #. module: hr_expense -#: rml:hr.expense:0 +#: report:hr.expense:0 #: field:hr.expense.line,unit_amount:0 msgid "Unit Price" msgstr "Нэгжийн үнэ" #. module: hr_expense -#: model:ir.actions.act_window,name:hr_expense.expense_all_valid -#: model:ir.ui.menu,name:hr_expense.menu_expense_all_valid -msgid "Expenses waiting invoice" -msgstr "Зардлын нэхэмжлэл хүлээх" - -#. module: hr_expense #: field:hr.expense.line,product_id:0 +#: view:hr.expense.report:0 +#: field:hr.expense.report,product_id:0 +#: model:ir.model,name:hr_expense.model_product_product msgid "Product" msgstr "Бүтээгдэхүүн" #. module: hr_expense +#: view:hr.expense.expense:0 +msgid "Expenses of My Department" +msgstr "" + +#. module: hr_expense +#: view:hr.expense.expense:0 +#: field:hr.expense.expense,name:0 #: field:hr.expense.line,description:0 msgid "Description" msgstr "Тайлбар" #. module: hr_expense -#: view:hr.expense.expense:0 -#: field:hr.expense.expense,name:0 -msgid "Expense Sheet" -msgstr "Зардлын хуудас" +#: selection:hr.expense.report,month:0 +msgid "May" +msgstr "" #. module: hr_expense #: field:hr.expense.line,unit_quantity:0 @@ -460,39 +695,57 @@ msgid "Quantities" msgstr "Тоо хэмжээ" #. module: hr_expense +#: field:hr.expense.report,no_of_account:0 +msgid "# of Accounts" +msgstr "" + +#. module: hr_expense +#: selection:hr.expense.expense,state:0 #: model:process.node,name:hr_expense.process_node_refused0 msgid "Refused" msgstr "Гологдсон" #. module: hr_expense -#: field:product.product,hr_expense_ok:0 -msgid "Can be Expensed" -msgstr "Зарлага болгох" - -#. module: hr_expense -#: rml:hr.expense:0 +#: report:hr.expense:0 msgid "Ref." msgstr "реф." #. module: hr_expense +#: field:hr.expense.report,employee_id:0 +msgid "Employee's Name" +msgstr "" + +#. module: hr_expense +#: view:hr.expense.expense:0 +msgid "This Month" +msgstr "" + +#. module: hr_expense #: field:hr.expense.expense,user_valid:0 +#: view:hr.expense.report:0 +#: field:hr.expense.report,user_id:0 msgid "Validation User" msgstr "Хэрэглэгч батлах" #. module: hr_expense -#: rml:hr.expense:0 +#: report:hr.expense:0 msgid "(Date and signature)" msgstr "Огноо болон гарын үсэг" #. module: hr_expense -#: rml:hr.expense:0 +#: selection:hr.expense.report,month:0 +msgid "February" +msgstr "" + +#. module: hr_expense +#: report:hr.expense:0 msgid "Name" msgstr "Нэр" #. module: hr_expense -#: field:hr.expense.line,name:0 -msgid "Short Description" -msgstr "Богино тайлбар" +#: field:hr.expense.expense,account_move_id:0 +msgid "Ledger Posting" +msgstr "" #. module: hr_expense #: model:process.transition,note:hr_expense.process_transition_approveinvoice0 @@ -500,9 +753,46 @@ msgid "Creates supplier invoice." msgstr "Нийлүүлэгчийн нэхэмжлэл бүрдүүлэлт" #. module: hr_expense -#: model:process.node,note:hr_expense.process_node_approved0 -msgid "The direct manager approves the sheet" -msgstr "Менежерийн зөвшөөрлийн хуудас" +#: model:product.template,name:hr_expense.product_product_expense_hotel_product_template +msgid "Hotel Accommodation" +msgstr "" + +#. module: hr_expense +#: selection:hr.expense.report,month:0 +msgid "April" +msgstr "" + +#. module: hr_expense +#: field:hr.expense.line,name:0 +msgid "Expense Note" +msgstr "" + +#. module: hr_expense +#: help:hr.expense.expense,state:0 +msgid "" +"When the expense request is created the state is 'Draft'.\n" +" It is confirmed by the user and request is sent to admin, the state is " +"'Waiting Confirmation'. \n" +"If the admin accepts it, the state is 'Accepted'.\n" +" If an invoice is made for the expense request, the state is 'Invoiced'.\n" +" If the expense is paid to user, the state is 'Reimbursed'." +msgstr "" + +#. module: hr_expense +#: view:hr.expense.expense:0 +msgid "Approve" +msgstr "" + +#. module: hr_expense +#: view:hr.expense.line:0 +#: field:hr.expense.line,total_amount:0 +msgid "Total" +msgstr "Нийт" + +#. module: hr_expense +#: constraint:ir.rule:0 +msgid "Rules are not supported for osv_memory objects !" +msgstr "" #. module: hr_expense #: field:hr.expense.line,sequence:0 @@ -516,16 +806,87 @@ msgstr "Батлагдсан зардал" #. module: hr_expense #: view:hr.expense.expense:0 +#: model:ir.actions.act_window,name:hr_expense.expense_all +#: model:ir.ui.menu,name:hr_expense.menu_expense_all #: model:ir.ui.menu,name:hr_expense.next_id_49 msgid "Expenses" msgstr "Зардлууд" #. module: hr_expense -#: field:hr.expense.line,total_amount:0 -msgid "Total" -msgstr "Нийт" +#: constraint:product.product:0 +msgid "Error: Invalid ean code" +msgstr "" + +#. module: hr_expense +#: view:hr.expense.report:0 +#: field:hr.expense.report,year:0 +msgid "Year" +msgstr "" + +#. module: hr_expense +#: view:hr.expense.expense:0 +msgid "To Approve" +msgstr "" + +#. module: hr_expense +#: help:product.product,hr_expense_ok:0 +msgid "" +"Determines if the product can be visible in the list of product within a " +"selection from an HR expense sheet line." +msgstr "" #. module: hr_expense #: model:process.node,name:hr_expense.process_node_reinvoicing0 msgid "Reinvoicing" msgstr "Дахин нэхэмжлэх" + +#~ msgid "Expenses waiting validation" +#~ msgstr "Батлахыг хүлээж буй зардлууд" + +#~ msgid "Date Confirmed" +#~ msgstr "Баталсан огноо" + +#~ msgid "My expenses waiting validation" +#~ msgstr "Батлахыг хүлээж буй миний зардлууд" + +#~ msgid "All expenses" +#~ msgstr "Бүх зардлууд" + +#~ msgid "Print HR expenses" +#~ msgstr "Зардлуудыг хэвлэх" + +#~ msgid "New Expenses Sheet" +#~ msgstr "Шинэ зардлын хуудас" + +#~ msgid "Date Validated" +#~ msgstr "Батлагдсан огноо" + +#~ msgid "Account Move" +#~ msgstr "Данс шилжүүлэх" + +#~ msgid "Expenses waiting payment" +#~ msgstr "Хүлээлтийн зардлын төлбөр" + +#~ msgid "My Draft expenses" +#~ msgstr "Миний ноорог зардлууд" + +#~ msgid "Cancel" +#~ msgstr "Цуцлах" + +#~ msgid "Draft expenses" +#~ msgstr "Ноорог зардлууд" + +#~ msgid "Expenses waiting invoice" +#~ msgstr "Зардлын нэхэмжлэл хүлээх" + +#~ msgid "Expense Sheet" +#~ msgstr "Зардлын хуудас" + +#~ msgid "Can be Expensed" +#~ msgstr "Зарлага болгох" + +#~ msgid "Short Description" +#~ msgstr "Богино тайлбар" + +#~ msgid "Expense Process" +#~ msgstr "Урсгал зардал" diff --git a/addons/hr_holidays/i18n/mn.po b/addons/hr_holidays/i18n/mn.po index 168d69d6e7b..8679e63e7a0 100644 --- a/addons/hr_holidays/i18n/mn.po +++ b/addons/hr_holidays/i18n/mn.po @@ -7,339 +7,500 @@ msgid "" msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" -"POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-09-01 06:54+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2010-10-18 17:46+0000\n" +"PO-Revision-Date: 2010-10-27 04:32+0000\n" +"Last-Translator: badralkh <Unknown>\n" "Language-Team: Mongolian <mn@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-09-29 05:11+0000\n" +"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: hr_holidays -#: model:ir.ui.menu,name:hr_holidays.menu_open_ask_holidays_new -msgid "New Holidays Request" -msgstr "" +#: selection:hr.holidays.status,color_name:0 +msgid "Blue" +msgstr "Цэнхэр" #. module: hr_holidays -#: model:ir.ui.menu,name:hr_holidays.menu_action_all_holiday -msgid "All Holidays Requests" -msgstr "" +#: view:hr.holidays:0 +#: field:hr.holidays,allocation_type:0 +#: field:hr.holidays,holiday_type:0 +msgid "Allocation Type" +msgstr "Хуваарилах төрөл" + +#. module: hr_holidays +#: selection:hr.holidays,state:0 +msgid "Waiting Second Approval" +msgstr "2 дох зөвшөөрлийг хүлээж байна" + +#. module: hr_holidays +#: view:available.holidays.report:0 +#: field:available.holidays.report,taken_leaves:0 +msgid "Taken Leaves" +msgstr "Авсан амралт, чөлөө" + +#. module: hr_holidays +#: help:hr.holidays.status,remaining_leaves:0 +msgid "Maximum Leaves Allowed - Leaves Already Taken" +msgstr "Зөвшөөрсөн амралт, чөлөөний дээд хэмжээ - Хэдийн авсан амралт, чөлөө" + +#. module: hr_holidays +#: view:hr.holidays:0 +msgid "Leaves Management" +msgstr "Амралт, чөлөөний удирдлага" + +#. module: hr_holidays +#: view:available.holidays.report:0 +#: view:hr.holidays:0 +msgid "Group By..." +msgstr "Бүлэглэвэл..." #. module: hr_holidays #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "" +msgstr "Үйлдлийн тодорхойлолт дээрх модел буруу байна" #. module: hr_holidays -#: model:ir.actions.act_window,name:hr_holidays.action_holiday_waiting -msgid "Requests Awaiting for Validation" -msgstr "" +#: model:hr.holidays.status,name:hr_holidays.holiday_status_sl +msgid "Sick Leave" +msgstr "Өвчний улмаас ирээгүй" #. module: hr_holidays -#: selection:hr.holidays.status,color_name:0 -msgid "Light Blue" -msgstr "" +#: view:available.holidays.report:0 +#: field:available.holidays.report,department_id:0 +#: view:hr.holidays:0 +#: field:hr.holidays,department_id:0 +msgid "Department" +msgstr "Хэлтэс" + +#. module: hr_holidays +#: selection:available.holidays.report,state:0 +#: selection:hr.holidays,state:0 +msgid "Refused" +msgstr "Татгалзах" + +#. module: hr_holidays +#: view:available.holidays.report:0 +#: field:available.holidays.report,max_leave:0 +msgid "Allocated Leaves" +msgstr "Хуваарилсан амралт, чөлөө" + +#. module: hr_holidays +#: selection:hr.holidays,allocation_type:0 +msgid "Company Allocation" +msgstr "Компаниар хуваарилах" #. module: hr_holidays #: selection:hr.holidays.status,color_name:0 msgid "Brown" -msgstr "" +msgstr "Хүрэн" #. module: hr_holidays -#: xsl:holidays.summary:0 -msgid "of the" -msgstr "" +#: view:available.holidays.report:0 +#: view:hr.holidays:0 +msgid "Remaining Days" +msgstr "Үлдсэн хоног" #. module: hr_holidays -#: xsl:holidays.summary:0 -msgid "Off-Days' Summary" -msgstr "" +#: selection:available.holidays.report,month:0 +msgid "March" +msgstr "3 сар" #. module: hr_holidays -#: view:hr.holidays:0 -#: model:process.transition,name:hr_holidays.process_transition_employeeholidays0 -msgid "Employee Holidays" +#: selection:hr.holidays,holiday_type:0 +msgid "By Employee" +msgstr "Ажилтнаар" + +#. module: hr_holidays +#: help:hr.holidays,employee_id:0 +msgid "" +"Leave Manager can let this field empty if this leave request/allocation is " +"for every employee" msgstr "" +"Амралт/амралтын хуваарилахыг хүсэх нь ажилтан бүрийн хувьд байвал амралт, " +"чөлөөг зөвшөөрөгч нь энэ талбарын хоосон үлдээж болно." + +#. module: hr_holidays +#: view:available.holidays.report:0 +msgid "Leave Days" +msgstr "Амралт, чөлөөтэй өдрүүд" #. module: hr_holidays #: view:hr.holidays:0 msgid "Set to Draft" -msgstr "" +msgstr "Ноорог болгох" #. module: hr_holidays -#: model:ir.model,name:hr_holidays.model_hr_holidays -#: model:process.node,name:hr_holidays.process_node_holidays0 +#: model:ir.actions.act_window,name:hr_holidays.act_hr_employee_holiday_request +#: model:ir.ui.menu,name:hr_holidays.menu_hr_reporting_holidays +#: model:ir.ui.menu,name:hr_holidays.menu_open_ask_holidays msgid "Holidays" -msgstr "" +msgstr "Амралт, чөлөө" #. module: hr_holidays -#: xsl:holidays.summary:0 -msgid "to" -msgstr "" +#: field:available.holidays.report,category_id:0 +msgid "Category's Name" +msgstr "Зэрэглэлтийн нэр" #. module: hr_holidays #: selection:hr.holidays.status,color_name:0 msgid "Light Cyan" -msgstr "" +msgstr "Цайвар цэнхэр ногоон" #. module: hr_holidays #: selection:hr.holidays.status,color_name:0 msgid "Light Green" -msgstr "" +msgstr "Цайвар ногоон" #. module: hr_holidays -#: model:process.transition,name:hr_holidays.process_transition_employeedeclaration0 -msgid "Employee Declaration" -msgstr "" +#: model:ir.actions.report.xml,name:hr_holidays.report_holidays_summary +msgid "Summary Of Leaves" +msgstr "Амралт, чөлөөний товчоо" #. module: hr_holidays #: view:hr.holidays:0 #: selection:hr.holidays,state:0 -#: model:process.transition.action,name:hr_holidays.process_transition_action_validate0 -msgid "Validate" -msgstr "" - -#. module: hr_holidays -#: model:process.transition,name:hr_holidays.process_transition_refusedrequest0 -msgid "Refused Request" -msgstr "" - -#. module: hr_holidays -#: model:process.node,name:hr_holidays.process_node_approved0 msgid "Approved" -msgstr "" - -#. module: hr_holidays -#: selection:hr.holidays.summary.employee,init,holiday_type:0 -msgid "Both" -msgstr "" +msgstr "Зөвшөөрсөн" #. module: hr_holidays #: view:hr.holidays:0 msgid "Refuse" -msgstr "" +msgstr "Татгалзар" #. module: hr_holidays -#: wizard_button:hr.holidays.summary,notify,end:0 -#: wizard_button:hr.holidays.summary.employee,notify,end:0 -msgid "Ok" -msgstr "" +#: view:available.holidays.report:0 +#: view:hr.holidays:0 +msgid "Leaves" +msgstr "Чөлөө, амралтууд" #. module: hr_holidays -#: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday -msgid "My Holidays Requests" -msgstr "" +#: model:ir.model,name:hr_holidays.model_hr_holidays +msgid "Leave" +msgstr "Амралт, чөлөө" #. module: hr_holidays -#: field:hr.holidays,notes:0 -msgid "Notes" -msgstr "" +#: field:hr.holidays.remaining.leaves.user,no_of_leaves:0 +msgid "Remaining leaves" +msgstr "Үлдсэн амралт, чөлөө" #. module: hr_holidays -#: field:hr.holidays,holiday_status:0 -#: field:hr.holidays.log,holiday_status:0 -msgid "Holiday's Status" -msgstr "" +#: model:ir.ui.menu,name:hr_holidays.menu_account_central_journal +msgid "Leaves by Department" +msgstr "Хэлтсийн амралт, чөлөө" #. module: hr_holidays -#: model:process.transition,note:hr_holidays.process_transition_refusedrequest0 -msgid "Request is refused." -msgstr "" +#: selection:available.holidays.report,state:0 +#: selection:hr.holidays,state:0 +msgid "Cancelled" +msgstr "Цуцлагдсан" #. module: hr_holidays -#: model:ir.ui.menu,name:hr_holidays.menu_open_ask_holidays -msgid "Holidays Management" +#: help:hr.holidays,type:0 +msgid "" +"Choose 'Leave Request' if someone wants to take an off-day. \n" +"Choose 'Allocation Request' if you want to increase the number of leaves " +"available for someone" msgstr "" +"Амралт эсвэ ажлаас чөлөө авах бол 'Амралт, чөлөө хүсэх'-ийг, амралт, чөлөө " +"авах боломжтой хоног хуваарилуулахын тулд 'Амралт, чөлөөг хуваарилах' -ыг " +"сонгоно уу." #. module: hr_holidays -#: xsl:holidays.summary:0 -msgid "Analyze from" +#: code:addons/hr_holidays/hr_holidays.py:0 +#, python-format +msgid "Warning !" msgstr "" #. module: hr_holidays -#: model:ir.actions.report.xml,name:hr_holidays.report_holidays_summary -msgid "Summary Of Holidays" -msgstr "" +#: field:hr.holidays.status,color_name:0 +msgid "Color in Report" +msgstr "Тайлан дээрх өнгө" #. module: hr_holidays -#: model:process.node,note:hr_holidays.process_node_calendar0 -msgid "The holiday is set in the calendar" -msgstr "" +#: model:ir.model,name:hr_holidays.model_hr_holidays_summary_employee +msgid "HR Holidays Summary Report By Employee" +msgstr "Ажилтнаар ангилсан амралт, чөлөөний товчоо" #. module: hr_holidays +#: field:available.holidays.report,holiday_status_id:0 +#: field:hr.holidays.remaining.leaves.user,leave_type:0 #: view:hr.holidays.status:0 -msgid "Holiday status" -msgstr "" +#: field:hr.holidays.status,name:0 +#: field:hr.holidays.summary.dept,holiday_type:0 +#: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status +#: model:ir.model,name:hr_holidays.model_hr_holidays_status +#: model:ir.ui.menu,name:hr_holidays.menu_open_view_holiday_status +msgid "Leave Type" +msgstr "Амралт, чөлөөний төрөл" #. module: hr_holidays -#: model:ir.model,name:hr_holidays.model_hr_holidays_status -msgid "Holidays Status" -msgstr "" +#: view:available.holidays.report:0 +msgid "Validation User" +msgstr "Батламжилсан хэрэглэгч" #. module: hr_holidays -#: field:hr.holidays,date_to:0 -msgid "Vacation end day" -msgstr "" +#: code:addons/hr_holidays/hr_holidays.py:0 +#, python-format +msgid "Warning!" +msgstr "Анхааруулга!" #. module: hr_holidays -#: model:process.node,note:hr_holidays.process_node_legaldeclaration0 -msgid "Legal Declaration Document to declare new employee" -msgstr "" +#: selection:available.holidays.report,state:0 +#: selection:hr.holidays,state:0 +msgid "Draft" +msgstr "Ноорог" #. module: hr_holidays #: selection:hr.holidays.status,color_name:0 msgid "Magenta" -msgstr "" +msgstr "Аналин улаан" #. module: hr_holidays -#: model:ir.model,name:hr_holidays.model_hr_holidays_per_user -msgid "Holidays Per User" +#: help:hr.holidays,state:0 +msgid "" +"When the holiday request is created the state is 'Draft'.\n" +" It is confirmed by the user and request is sent to admin, the state is " +"'Waiting Approval'. If the admin accepts it, the state is " +"'Approved'. If it is refused, the state is 'Refused'." msgstr "" +"Амралт, чөлөөний хүсэлтийг 'Ноорог' төлөвтэйгөөр үүсгэсэн үед:\n" +"Хэрэглэгч хүсэлтийг баталмагц администратор руу 'Зөвшөөрөхийг хүлээж " +"байгаа' төлөвтэйгөөр илгээгдэнэ. Администратор зөвшөөрмөгц 'Зөвшөөрсөн' " +"төлөвтэй болно. Харин татгалзвал 'Татгалзсан' төлөвт шилжинэ." #. module: hr_holidays -#: view:hr.holidays.status:0 -msgid "Define holiday status" -msgstr "" +#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:0 +#, python-format +msgid "You have to select at least 1 Department. And try again" +msgstr "Та цөөндөө 1 хэлтэс сонгох хэрэгтэй. Дахин оролдоно уу." #. module: hr_holidays -#: selection:hr.holidays.summary,init,holiday_type:0 -#: selection:hr.holidays.summary.employee,init,holiday_type:0 +#: selection:hr.holidays.summary.dept,holiday_type:0 +#: selection:hr.holidays.summary.employee,holiday_type:0 msgid "Confirmed" -msgstr "" +msgstr "Баталсан" #. module: hr_holidays -#: wizard_field:hr.holidays.summary,init,date_from:0 -#: wizard_field:hr.holidays.summary.employee,init,date_from:0 +#: field:hr.holidays.summary.dept,date_from:0 +#: field:hr.holidays.summary.employee,date_from:0 msgid "From" +msgstr "Хэзээнээс" + +#. module: hr_holidays +#: help:hr.holidays,allocation_type:0 +msgid "" +"This field is only for informative purposes, to depict if the leave " +"request/allocation comes from an employee or from the company" msgstr "" +"1 ажилтнаас эсвэл тухайн компаниас энэ амралт, чөлөө буюу түүний " +"хуваарилалтыг хүсэх хүсэлт ирснийг дүрслэх зорилготой мэдээллийн чанартай " +"талбар юм" #. module: hr_holidays #: view:hr.holidays:0 -#: model:process.transition.action,name:hr_holidays.process_transition_action_confirm0 msgid "Confirm" -msgstr "" +msgstr "Батлах" #. module: hr_holidays -#: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_waiting -#: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday_waiting -msgid "My Awaiting Confirmation Holidays Requests" -msgstr "" +#: model:ir.model,name:hr_holidays.model_available_holidays_report +msgid "available.holidays.report" +msgstr "Амралт, чөлөөний боломж тайлан" #. module: hr_holidays -#: field:hr.holidays,user_id:0 -msgid "Employee_id" -msgstr "" +#: model:ir.module.module,description:hr_holidays.module_meta_information +msgid "" +"Human Resources: Holidays tracking and workflow\n" +"\n" +" This module allows you to manage leaves and leaves' requests.\n" +" Implements a dashboard for human resource management that includes.\n" +" * My Leaves\n" +" * My Expenses\n" +" Note that:\n" +" - A synchronisation with an internal agenda (use of the CRM module) is " +"possible: in order to automatically create a case when an holiday request is " +"accepted, you have to link the holidays status to a case section. You can " +"set up this info and your colour preferences in\n" +" HR / Configuration / Holidays Status\n" +" - An employee can make an ask for more off-days by making a new " +"Allocation It will increase his total of that leave type available (if the " +"request is accepted).\n" +" - There are two ways to print the employee's holidays:\n" +" * The first will allow to choose employees by department and is used " +"by clicking the menu item located in\n" +" HR / Holidays Request / Print Summary of Holidays\n" +" * The second will allow you to choose the holidays report for " +"specific employees. Go on the list\n" +" HR / Employees / Employees\n" +" then select the ones you want to choose, click on the print icon " +"and select the option\n" +" 'Print Summary of Employee's Holidays'\n" +" - The wizard allows you to choose if you want to print either the " +"Confirmed & Validated holidays or only the Validated ones. These states must " +"be set up by a user from the group 'HR'. You can define these features in " +"the security tab from the user data in\n" +" Administration / Users / Users\n" +" for example, you maybe will do it for the user 'admin'\n" +" .\n" +msgstr "" +"Хүний нөөц: Амралт, чөлөөний хяналт ба ажлын урсгал\n" +" Энэ модуль нь амралт чөлөөний хүсэлтийг зохицуулах болмжийг " +"олгоно.\n" +" ХН-ийн хянах самбарт\n" +" Өөрийн амралт,чөлөө\n" +" Өөрийн зардал\n" +" Тэмдэглэл \n" +" CRM модулийн дотоод сануулга ирэхэд амралт, чөлөөг " +"зөвшөөрдөг байхын тулд амралт, чөлөөний төрөлд тохиолдлын хэсгийг " +"харгалзуулсан байх хэрэгтэй.\n" + +#. module: hr_holidays +#: view:available.holidays.report:0 +#: field:available.holidays.report,remaining_leave:0 +#: field:hr.holidays.status,remaining_leaves:0 +msgid "Remaining Leaves" +msgstr "Үлдсэн амралт, чөлөө" + +#. module: hr_holidays +#: view:available.holidays.report:0 +#: field:available.holidays.report,state:0 +#: view:hr.holidays:0 +#: field:hr.holidays,state:0 +msgid "State" +msgstr "Төлөв" #. module: hr_holidays -#: model:process.node,note:hr_holidays.process_node_holidaysdefinition0 -msgid "Encoding of annual available holidays." -msgstr "" +#: model:ir.model,name:hr_holidays.model_hr_holidays_remaining_leaves_user +msgid "Total holidays by type" +msgstr "Төрлөөр ангилсан амралт, чөлөө" #. module: hr_holidays +#: view:available.holidays.report:0 +#: view:hr.holidays:0 #: field:hr.holidays,employee_id:0 -#: field:hr.holidays.log,employee_id:0 +#: field:hr.holidays.remaining.leaves.user,name:0 msgid "Employee" -msgstr "" +msgstr "Ажилтан" #. module: hr_holidays -#: selection:hr.holidays,state:0 +#: selection:available.holidays.report,state:0 msgid "Waiting Validation" -msgstr "" +msgstr "Батламжлах хүлээгдэж байна" #. module: hr_holidays -#: model:process.transition,note:hr_holidays.process_transition_employeeholidays0 -msgid "Employee get holidays" -msgstr "" +#: view:hr.holidays:0 +msgid "General" +msgstr "Ерөнхий" #. module: hr_holidays -#: selection:hr.holidays.status,color_name:0 -msgid "Light Salmon" -msgstr "" +#: view:available.holidays.report:0 +#: view:hr.holidays:0 +msgid "Type" +msgstr "Төрөл" #. module: hr_holidays #: selection:hr.holidays.status,color_name:0 -msgid "Wheat" -msgstr "" +msgid "Red" +msgstr "Улаан" #. module: hr_holidays -#: field:hr.holidays.log,nb_holidays:0 -msgid "Number of Holidays Requested" -msgstr "" +#: view:hr.holidays.remaining.leaves.user:0 +msgid "Leaves by Type" +msgstr "Төрлөөр ангилсан амралт, чөлөө" #. module: hr_holidays -#: model:ir.actions.act_window,name:hr_holidays.act_hr_employee_holiday_request -msgid "My Holiday Requests" +#: selection:hr.holidays.status,color_name:0 +msgid "Light Salmon" +msgstr "Цайвар улбар шар" + +#. module: hr_holidays +#: selection:hr.holidays.status,color_name:0 +msgid "Wheat" msgstr "" #. module: hr_holidays #: view:hr.holidays:0 +#: field:hr.holidays,number_of_days:0 +#: field:hr.holidays,number_of_days_temp:0 msgid "Number of Days" -msgstr "" +msgstr "Хоногийн тоо" #. module: hr_holidays -#: field:hr.holidays.status,name:0 -#: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status -#: model:ir.ui.menu,name:hr_holidays.menu_open_view_holiday_status -msgid "Holiday Status" -msgstr "" +#: help:hr.holidays,category_id:0 +msgid "Category Of employee" +msgstr "Ажилтны зэрэглэл" #. module: hr_holidays -#: wizard_view:hr.holidays.summary,init:0 -#: wizard_view:hr.holidays.summary.employee,init:0 -msgid "Report Options" -msgstr "" +#: view:board.board:0 +msgid "Remaining Leave by Type and User" +msgstr "Төрөл ба хэрэглэгчээр ангилсан үлдсэн амралт, чөлөө" + +#. module: hr_holidays +#: selection:available.holidays.report,month:0 +msgid "July" +msgstr "7 сар" #. module: hr_holidays #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" +msgstr "Харагдацын архитетурын xml буруу" + +#. module: hr_holidays +#: help:hr.holidays.status,double_validation:0 +msgid "" +"If its True then its Allocation/Request have to be validated by second " +"validator" msgstr "" #. module: hr_holidays -#: model:process.node,note:hr_holidays.process_node_approved0 -msgid "His manager approves the request" +#: selection:hr.holidays,state:0 +msgid "Waiting Approval" msgstr "" #. module: hr_holidays -#: model:process.transition,note:hr_holidays.process_transition_holidaysdefrequest0 -msgid "If holidays available, employee can take it and fill it." +#: field:hr.holidays.summary.employee,emp:0 +msgid "Employee(s)" msgstr "" #. module: hr_holidays -#: wizard_view:hr.holidays.summary.employee,notify:0 -msgid "You have to select at least 1 Employee. Try again." +#: view:available.holidays.report:0 +msgid " Month " msgstr "" #. module: hr_holidays -#: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday_validate -msgid "My Validated Holidays Requests" +#: help:hr.holidays.status,categ_id:0 +msgid "" +"If you link this type of leave with a category in the CRM, it will " +"synchronize each leave asked with a case in this category, to display it in " +"the company shared calendar for example." msgstr "" #. module: hr_holidays -#: wizard_field:hr.holidays.summary.employee,init,emp:0 -msgid "Employee(s)" +#: field:hr.holidays,parent_id:0 +msgid "Parent" msgstr "" #. module: hr_holidays -#: field:hr.holidays,number_of_days:0 -msgid "Number of Days in this Holiday Request" +#: help:hr.holidays,manager_id2:0 +msgid "" +"This area is automaticly filled by the user who validate the leave with " +"second level (If Leave type need second validation)" msgstr "" #. module: hr_holidays -#: model:ir.actions.act_window,name:hr_holidays.action_holidays_per_user -#: model:ir.ui.menu,name:hr_holidays.menu_open_holidays_per_user -msgid "Holidays Per Employee" +#: selection:available.holidays.report,month:0 +msgid "September" msgstr "" #. module: hr_holidays -#: field:hr.holidays.status,limit:0 -msgid "Allow to override Limit" +#: selection:available.holidays.report,month:0 +msgid "December" msgstr "" #. module: hr_holidays -#: field:hr.holidays.log,holiday_user_id:0 -msgid "Holidays user" +#: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_remaining_leaves_empoloyee_all +msgid "Remaining Leaves by User" msgstr "" #. module: hr_holidays @@ -348,76 +509,56 @@ msgid "Lavender" msgstr "" #. module: hr_holidays -#: model:ir.model,name:hr_holidays.model_hr_holidays_log -msgid "hr.holidays.log" +#: view:available.holidays.report:0 +#: field:available.holidays.report,month:0 +msgid "Month" msgstr "" #. module: hr_holidays -#: model:ir.actions.wizard,name:hr_holidays.wizard_holidays_summary -msgid "Print Summary of Employee's Holidays" +#: model:ir.actions.act_window,name:hr_holidays.open_ask_holidays +#: model:ir.ui.menu,name:hr_holidays.menu_open_ask_holidays_new +msgid "Leave Requests" msgstr "" #. module: hr_holidays -#: model:process.node,name:hr_holidays.process_node_calendar0 -msgid "Calendar" +#: field:hr.holidays.status,limit:0 +msgid "Allow to Override Limit" msgstr "" #. module: hr_holidays -#: field:hr.holidays,date_from:0 -msgid "Vacation start day" +#: view:hr.holidays.summary.employee:0 +#: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_summary_employee +msgid "Employee's Holidays" msgstr "" #. module: hr_holidays -#: model:ir.module.module,description:hr_holidays.module_meta_information +#: view:available.holidays.report:0 +#: field:hr.holidays,category_id:0 +msgid "Category" +msgstr "" + +#. module: hr_holidays +#: help:hr.holidays.status,max_leaves:0 msgid "" -"Human Ressources: Holidays tracking and workflow\n" -"\n" -" This module allows you to manage holidays and holidays requests. For " -"each employee, you can also define a number of available holidays per " -"holiday status.\n" -"\n" -" Note that:\n" -" - A synchronisation with an internal agenda (use of the CRM module) is " -"possible: in order to automatically create a case when an holiday request is " -"accepted, you have to link the holidays status to a case section. You can " -"set up this info and your colour preferences in\n" -" HR / Configuration / Holidays Status\n" -" - An employee can make a negative holiday request (holiday request of -2 " -"days for example), this is considered by the system as an ask for more off-" -"days. It will increase his total of that holiday status available (if the " -"request is accepted).\n" -" - There are two ways to print the employee's holidays:\n" -" * The first will allow to choose employees by department and is used " -"by clicking the menu item located in\n" -" HR / Holidays Request / Print Summary of Holidays\n" -" * The second will allow you to choose the holidays report for " -"specific employees. Go on the list\n" -" HR / Employees / Employees\n" -" then select the ones you want to choose, click on the print icon " -"and select the option\n" -" 'Print Summary of Employee's Holidays'\n" -" - The wizard allows you to choose if you want to print either the " -"Confirmed & Validated holidays or only the Validated ones. These states must " -"be set up by a user from the group 'HR' and with the role 'holidays'. You " -"can define these features in the security tab from the user data in\n" -" Administration / Users / Users\n" -" for example, you maybe will do it for the user 'admin'.\n" +"This value is given by the sum of all holidays requests with a positive " +"value." msgstr "" #. module: hr_holidays -#: wizard_view:hr.holidays.summary,notify:0 -#: wizard_view:hr.holidays.summary.employee,notify:0 -msgid "Notification" +#: view:available.holidays.report:0 +msgid "Available Holidays" msgstr "" #. module: hr_holidays -#: model:process.node,note:hr_holidays.process_node_holidaysrequest0 -msgid "Employee fills in a request for holidays" +#: view:board.board:0 +#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board +msgid "All Employee Leaves" msgstr "" #. module: hr_holidays -#: model:process.transition,note:hr_holidays.process_transition_setholiday0 -msgid "Holiday is set in the calendar." +#: code:addons/hr_holidays/hr_holidays.py:0 +#, python-format +msgid "No user related to the selected employee." msgstr "" #. module: hr_holidays @@ -426,9 +567,9 @@ msgid "Light Coral" msgstr "" #. module: hr_holidays -#: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_available -#: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday_available -msgid "My Available Holidays" +#: view:hr.holidays.summary.dept:0 +#: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_summary_dept +msgid "Holidays by Department" msgstr "" #. module: hr_holidays @@ -437,23 +578,46 @@ msgid "Black" msgstr "" #. module: hr_holidays -#: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday_refuse -msgid "My Refused Holidays Requests" +#: constraint:ir.ui.menu:0 +msgid "Error ! You can not create recursive Menu." msgstr "" #. module: hr_holidays -#: model:process.transition,name:hr_holidays.process_transition_setholiday0 -msgid "Set Holiday" +#: field:resource.calendar.leaves,holiday_id:0 +msgid "Holiday" msgstr "" #. module: hr_holidays -#: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday_draft -msgid "My Draft Holidays Requests" +#: field:hr.holidays.status,max_leaves:0 +msgid "Maximum Leaves Allowed" msgstr "" #. module: hr_holidays -#: field:hr.holidays,state:0 -msgid "Status" +#: code:addons/hr_holidays/hr_holidays.py:0 +#, python-format +msgid "" +"You cannot validate leaves for %s while available leaves are less than asked " +"leaves.' %(record.category_id.name)))\n" +" nb = -(record.number_of_days_temp)\n" +" else:\n" +" nb = record.number_of_days_temp\n" +"\n" +" if record.holiday_type == 'employee' and record.employee_id:\n" +" user_id = record.employee_id.user_id and " +"record.employee_id.user_id.id or uid\n" +"\n" +" self.write(cr, uid, [record.id], {'state':'confirm', " +"'number_of_days': nb, 'user_id': user_id })\n" +" return True\n" +"\n" +" def holidays_refuse(self, cr, uid, ids, *args):\n" +" vals = {'state': 'refuse'}\n" +" ids2 = self.pool.get('hr.employee" +msgstr "" + +#. module: hr_holidays +#: view:available.holidays.report:0 +msgid " Year " msgstr "" #. module: hr_holidays @@ -462,107 +626,177 @@ msgid "Ivory" msgstr "" #. module: hr_holidays -#: model:ir.actions.act_window,name:hr_holidays.action_my_holiday -msgid "My Holidays Request" +#: selection:available.holidays.report,month:0 +msgid "August" msgstr "" #. module: hr_holidays -#: field:hr.holidays.status,color_name:0 -msgid "Color of the status" +#: selection:available.holidays.report,month:0 +msgid "June" msgstr "" #. module: hr_holidays -#: selection:hr.holidays.summary,init,holiday_type:0 +#: selection:hr.holidays.summary.dept,holiday_type:0 +#: selection:hr.holidays.summary.employee,holiday_type:0 msgid "Both Validated and Confirmed" msgstr "" #. module: hr_holidays -#: xsl:holidays.summary:0 -msgid "holidays." +#: field:hr.holidays.status,leaves_taken:0 +msgid "Leaves Already Taken" msgstr "" #. module: hr_holidays -#: selection:hr.holidays,state:0 -msgid "draft" +#: field:available.holidays.report,user_id:0 +#: field:hr.holidays,user_id:0 +#: field:hr.holidays.remaining.leaves.user,user_id:0 +msgid "User" msgstr "" #. module: hr_holidays -#: model:process.transition,note:hr_holidays.process_transition_employeedeclaration0 -msgid "Document for employee" +#: field:hr.holidays.status,active:0 +msgid "Active" msgstr "" #. module: hr_holidays -#: field:hr.holidays.log,date:0 -msgid "Date" +#: field:hr.holidays,date_from:0 +msgid "Start Date" msgstr "" #. module: hr_holidays -#: model:process.transition.action,name:hr_holidays.process_transition_action_reufse0 -msgid "Reufse" +#: selection:available.holidays.report,month:0 +msgid "November" msgstr "" #. module: hr_holidays -#: field:hr.holidays.status,section_id:0 -msgid "Section" +#: view:available.holidays.report:0 +msgid "Extended Filters..." +msgstr "" + +#. module: hr_holidays +#: selection:available.holidays.report,month:0 +msgid "October" +msgstr "" + +#. module: hr_holidays +#: selection:available.holidays.report,month:0 +msgid "January" +msgstr "" + +#. module: hr_holidays +#: selection:hr.holidays,allocation_type:0 +msgid "Employee Request" msgstr "" #. module: hr_holidays #: field:hr.holidays,manager_id:0 -msgid "Holiday manager" +msgid "First Approval" msgstr "" #. module: hr_holidays -#: field:hr.holidays.status,active:0 -msgid "Active" +#: model:hr.holidays.status,name:hr_holidays.holiday_status_cl +msgid "Casual Leave" msgstr "" #. module: hr_holidays -#: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_draft -msgid "My Holidays Request Draft" +#: field:available.holidays.report,date:0 +msgid "Date" msgstr "" #. module: hr_holidays -#: model:process.transition,name:hr_holidays.process_transition_approvedrequest0 -msgid "Approved Request" +#: view:hr.holidays:0 +msgid "Extended options..." msgstr "" #. module: hr_holidays -#: model:process.node,name:hr_holidays.process_node_holidaysrequest0 -msgid "Holidays Request" +#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:0 +#, python-format +msgid "Error" msgstr "" #. module: hr_holidays -#: model:ir.ui.menu,name:hr_holidays.menu_action_holiday_waiting -msgid "Holidays Requests Awaiting for Validation" +#: code:addons/hr_holidays/hr_holidays.py:0 +#, python-format +msgid "" +"You cannot validate leaves for %s while available leaves are less than asked " +"leaves.' %(record.employee_id.name)))\n" +" nb = -(record.number_of_days_temp)\n" +" elif record.holiday_type == 'category' and record.type == " +"'remove':\n" +" if record.category_id and not " +"record.holiday_status_id.limit:\n" +" leaves_rest = self.pool.get('hr.holidays.status" +msgstr "" + +#. module: hr_holidays +#: selection:hr.holidays.status,color_name:0 +msgid "Light Blue" +msgstr "" + +#. module: hr_holidays +#: constraint:hr.holidays:0 +msgid "" +"Start date should not be larger than end date!\n" +"Number of Days should be greater than 1!" +msgstr "" + +#. module: hr_holidays +#: field:hr.holidays,type:0 +msgid "Request Type" +msgstr "" + +#. module: hr_holidays +#: help:hr.holidays.status,active:0 +msgid "" +"If the active field is set to false, it will allow you to hide the leave " +"type without removing it." +msgstr "" + +#. module: hr_holidays +#: view:available.holidays.report:0 +#: field:available.holidays.report,day:0 +msgid "Day" msgstr "" #. module: hr_holidays #: view:hr.holidays:0 -msgid "General" +#: field:hr.holidays,notes:0 +msgid "Reasons" +msgstr "" + +#. module: hr_holidays +#: model:ir.actions.act_window,name:hr_holidays.action_hr_available_holidays_report +#: model:ir.ui.menu,name:hr_holidays.menu_hr_available_holidays_report_tree +msgid "Leaves Analysis" msgstr "" #. module: hr_holidays #: view:hr.holidays:0 -#: selection:hr.holidays,state:0 -#: wizard_button:hr.holidays.summary,init,end:0 -#: wizard_button:hr.holidays.summary.employee,init,end:0 +#: view:hr.holidays.summary.dept:0 +#: view:hr.holidays.summary.employee:0 msgid "Cancel" msgstr "" #. module: hr_holidays -#: model:process.transition,name:hr_holidays.process_transition_holidaysdefrequest0 -msgid "Holidays def Request" +#: help:hr.holidays.status,color_name:0 +msgid "" +"This color will be used in the leaves summary located in Reporting\\Leaves " +"by Departement" msgstr "" #. module: hr_holidays -#: selection:hr.holidays.summary,init,holiday_type:0 -#: selection:hr.holidays.summary.employee,init,holiday_type:0 +#: view:available.holidays.report:0 +#: selection:available.holidays.report,state:0 +#: view:hr.holidays:0 +#: selection:hr.holidays.summary.dept,holiday_type:0 +#: selection:hr.holidays.summary.employee,holiday_type:0 msgid "Validated" msgstr "" #. module: hr_holidays -#: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_refuse -msgid "My Holidays Request Refused" +#: view:hr.holidays:0 +#: selection:hr.holidays,type:0 +msgid "Allocation Request" msgstr "" #. module: hr_holidays @@ -572,67 +806,132 @@ msgid "" msgstr "" #. module: hr_holidays -#: wizard_button:hr.holidays.summary,init,checkdept:0 -#: wizard_button:hr.holidays.summary.employee,init,checkemp:0 +#: model:ir.model,name:hr_holidays.model_resource_calendar_leaves +msgid "Leave Detail" +msgstr "" + +#. module: hr_holidays +#: field:hr.holidays.status,double_validation:0 +msgid "Apply Double Validation" +msgstr "" + +#. module: hr_holidays +#: field:hr.holidays,holiday_status_id:0 +msgid " Leave Type" +msgstr "" + +#. module: hr_holidays +#: view:hr.holidays.summary.dept:0 +#: view:hr.holidays.summary.employee:0 msgid "Print" msgstr "" #. module: hr_holidays -#: model:ir.actions.wizard,name:hr_holidays.holidays_summary -#: model:ir.ui.menu,name:hr_holidays.menu_holidays_summary -msgid "Print Summary of Holidays" +#: view:board.board:0 +#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_board +msgid "My Leaves" +msgstr "" + +#. module: hr_holidays +#: view:board.board:0 +msgid "My Leaves by Type" msgstr "" #. module: hr_holidays -#: wizard_field:hr.holidays.summary,init,depts:0 +#: field:hr.holidays.summary.dept,depts:0 msgid "Department(s)" msgstr "" #. module: hr_holidays +#: view:hr.holidays:0 +#: selection:hr.holidays,type:0 +msgid "Leave Request" +msgstr "" + +#. module: hr_holidays #: field:hr.holidays,name:0 msgid "Description" msgstr "" #. module: hr_holidays -#: selection:hr.holidays,state:0 -#: model:process.node,name:hr_holidays.process_node_refused0 -msgid "Refused" +#: selection:available.holidays.report,month:0 +msgid "May" +msgstr "" + +#. module: hr_holidays +#: field:hr.holidays.status,categ_id:0 +msgid "Meeting Category" msgstr "" #. module: hr_holidays -#: model:process.transition,note:hr_holidays.process_transition_approvedrequest0 -msgid "Request is approved." +#: help:hr.holidays,holiday_type:0 +msgid "" +"By Employee: Allocation/Request for individual Employee, By Employee " +"Category: Allocation/Request for group of employees in category" msgstr "" #. module: hr_holidays -#: model:process.node,name:hr_holidays.process_node_holidaysdefinition0 -msgid "Holidays Definition" +#: view:hr.holidays:0 +msgid "Search Leave" msgstr "" #. module: hr_holidays -#: wizard_field:hr.holidays.summary,init,holiday_type:0 -#: wizard_field:hr.holidays.summary.employee,init,holiday_type:0 +#: field:hr.holidays.summary.employee,holiday_type:0 msgid "Select Holiday Type" msgstr "" #. module: hr_holidays +#: field:available.holidays.report,employee_id:0 +msgid "Employee's Name" +msgstr "" + +#. module: hr_holidays +#: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_leaves_by_month +msgid "Leaves by Month" +msgstr "" + +#. module: hr_holidays +#: selection:hr.holidays,holiday_type:0 +msgid "By Employee Category" +msgstr "" + +#. module: hr_holidays +#: view:hr.holidays:0 +msgid "This Month" +msgstr "" + +#. module: hr_holidays +#: field:hr.holidays,manager_id2:0 +msgid "Second Approval" +msgstr "" + +#. module: hr_holidays #: field:hr.holidays,case_id:0 msgid "Case" msgstr "" #. module: hr_holidays -#: field:hr.holidays,holiday_user_id:0 -msgid "Holiday per user" +#: field:hr.holidays,date_to:0 +msgid "End Date" msgstr "" #. module: hr_holidays -#: model:process.node,note:hr_holidays.process_node_holidays0 -msgid "Encode number of available holidays" +#: selection:available.holidays.report,month:0 +msgid "February" msgstr "" #. module: hr_holidays -#: model:process.node,name:hr_holidays.process_node_legaldeclaration0 -msgid "Secretariat Social" +#: help:hr.holidays.status,limit:0 +msgid "" +"If you tick this checkbox, the system will allow, for this section, the " +"employees to take more leaves than the available ones." +msgstr "" + +#. module: hr_holidays +#: help:hr.holidays.status,leaves_taken:0 +msgid "" +"This value is given by the sum of all holidays requests with a negative " +"value." msgstr "" #. module: hr_holidays @@ -641,8 +940,8 @@ msgid "Violet" msgstr "" #. module: hr_holidays -#: selection:hr.holidays.status,color_name:0 -msgid "Red" +#: selection:available.holidays.report,month:0 +msgid "April" msgstr "" #. module: hr_holidays @@ -651,23 +950,34 @@ msgid "Human Resources: Holidays management" msgstr "" #. module: hr_holidays -#: model:process.process,name:hr_holidays.process_process_holidaysprocess0 -msgid "Holidays Process" +#: model:ir.model,name:hr_holidays.model_hr_holidays_summary_dept +msgid "HR Holidays Summary Report By Department" msgstr "" #. module: hr_holidays -#: wizard_view:hr.holidays.summary,notify:0 -msgid "You have to select at least 1 Department. Try again." +#: help:hr.holidays,manager_id:0 +msgid "This area is automaticly filled by the user who validate the leave" msgstr "" #. module: hr_holidays -#: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_validate -msgid "My Holidays Request Validated" +#: view:hr.holidays:0 +msgid "Approve" +msgstr "" + +#. module: hr_holidays +#: field:hr.holidays,linked_request_ids:0 +msgid "Linked Requests" +msgstr "" + +#. module: hr_holidays +#: constraint:ir.rule:0 +msgid "Rules are not supported for osv_memory objects !" msgstr "" #. module: hr_holidays -#: field:hr.holidays.log,holiday_req_id:0 -msgid "Holiday Request ID" +#: model:ir.actions.act_window,name:hr_holidays.open_allocation_holidays +#: model:ir.ui.menu,name:hr_holidays.menu_open_allocation_holidays +msgid "Allocation Requests" msgstr "" #. module: hr_holidays @@ -681,6 +991,41 @@ msgid "Light Pink" msgstr "" #. module: hr_holidays -#: model:process.node,note:hr_holidays.process_node_refused0 -msgid "His manager refuses the request" +#: view:hr.holidays:0 +#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation +msgid "Leaves Summary" +msgstr "" + +#. module: hr_holidays +#: code:addons/hr_holidays/hr_holidays.py:0 +#, python-format +msgid "Wrong leave definition." +msgstr "" + +#. module: hr_holidays +#: view:hr.holidays:0 +msgid "Manager" +msgstr "" + +#. module: hr_holidays +#: view:hr.holidays:0 +msgid "To Confirm" +msgstr "" + +#. module: hr_holidays +#: view:available.holidays.report:0 +#: field:available.holidays.report,year:0 +msgid "Year" +msgstr "" + +#. module: hr_holidays +#: view:hr.holidays:0 +msgid "To Approve" +msgstr "" + +#. module: hr_holidays +#: code:addons/hr_holidays/hr_holidays.py:0 +#, python-format +msgid "" +"You Cannot Validate leaves while available leaves are less than asked leaves." msgstr "" diff --git a/addons/hr_holidays/i18n/pl.po b/addons/hr_holidays/i18n/pl.po index f8e099d5c2f..00a0814f9b9 100644 --- a/addons/hr_holidays/i18n/pl.po +++ b/addons/hr_holidays/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-10-18 17:46+0000\n" -"PO-Revision-Date: 2010-10-24 13:12+0000\n" -"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\n" +"PO-Revision-Date: 2010-10-26 08:09+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\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-10-25 04:39+0000\n" +"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: hr_holidays @@ -355,12 +355,12 @@ msgstr "Pozostało dni urlopu" #: view:hr.holidays:0 #: field:hr.holidays,state:0 msgid "State" -msgstr "" +msgstr "Stan" #. module: hr_holidays #: model:ir.model,name:hr_holidays.model_hr_holidays_remaining_leaves_user msgid "Total holidays by type" -msgstr "" +msgstr "Syma urlopów wg typów" #. module: hr_holidays #: view:available.holidays.report:0 @@ -384,7 +384,7 @@ msgstr "Ogólne" #: view:available.holidays.report:0 #: view:hr.holidays:0 msgid "Type" -msgstr "" +msgstr "Typ" #. module: hr_holidays #: selection:hr.holidays.status,color_name:0 @@ -394,7 +394,7 @@ msgstr "Czerwony" #. module: hr_holidays #: view:hr.holidays.remaining.leaves.user:0 msgid "Leaves by Type" -msgstr "" +msgstr "Nieobecności wg typów" #. module: hr_holidays #: selection:hr.holidays.status,color_name:0 @@ -416,17 +416,17 @@ msgstr "Liczba dni" #. module: hr_holidays #: help:hr.holidays,category_id:0 msgid "Category Of employee" -msgstr "" +msgstr "Kategoria pracownika" #. module: hr_holidays #: view:board.board:0 msgid "Remaining Leave by Type and User" -msgstr "" +msgstr "Urlop do wykorzystania wg Typu i Użytkowników" #. module: hr_holidays #: selection:available.holidays.report,month:0 msgid "July" -msgstr "" +msgstr "Lipiec" #. module: hr_holidays #: constraint:ir.ui.view:0 @@ -439,11 +439,13 @@ msgid "" "If its True then its Allocation/Request have to be validated by second " "validator" msgstr "" +"Jeśli to jest prawda, to Wniosek musi być zatwierdzony przez jeszcze jednego " +"zatiwerdzającego" #. module: hr_holidays #: selection:hr.holidays,state:0 msgid "Waiting Approval" -msgstr "" +msgstr "Oczekuje na aprobatę" #. module: hr_holidays #: field:hr.holidays.summary.employee,emp:0 @@ -453,7 +455,7 @@ msgstr "Pracowników" #. module: hr_holidays #: view:available.holidays.report:0 msgid " Month " -msgstr "" +msgstr " Miesiąc " #. module: hr_holidays #: help:hr.holidays.status,categ_id:0 @@ -462,11 +464,14 @@ msgid "" "synchronize each leave asked with a case in this category, to display it in " "the company shared calendar for example." msgstr "" +"Jeśli połączysz ten typ nieobecności z kategorią w CRM, to uzyskasz " +"synchronizację wniosków ze sprawami w danej kategorii, aby na przykład " +"wyświetlać je we współdzielonym kalendarzu." #. module: hr_holidays #: field:hr.holidays,parent_id:0 msgid "Parent" -msgstr "" +msgstr "Nadrzędny" #. module: hr_holidays #: help:hr.holidays,manager_id2:0 @@ -474,21 +479,24 @@ msgid "" "This area is automaticly filled by the user who validate the leave with " "second level (If Leave type need second validation)" msgstr "" +"Ta część jest automatycznie wypełniana przez użytkownika, który zatwierdza " +"nieobecność na drugim poziomie (jeśli typ nieobecności wymaga drugiego " +"zatwierdzania)" #. module: hr_holidays #: selection:available.holidays.report,month:0 msgid "September" -msgstr "" +msgstr "Wrzesień" #. module: hr_holidays #: selection:available.holidays.report,month:0 msgid "December" -msgstr "" +msgstr "Grudzień" #. module: hr_holidays #: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_remaining_leaves_empoloyee_all msgid "Remaining Leaves by User" -msgstr "" +msgstr "Pozostałe urlopy wg użytkowników" #. module: hr_holidays #: selection:hr.holidays.status,color_name:0 @@ -499,24 +507,24 @@ msgstr "Lawendowy" #: view:available.holidays.report:0 #: field:available.holidays.report,month:0 msgid "Month" -msgstr "" +msgstr "Miesiąc" #. module: hr_holidays #: model:ir.actions.act_window,name:hr_holidays.open_ask_holidays #: model:ir.ui.menu,name:hr_holidays.menu_open_ask_holidays_new msgid "Leave Requests" -msgstr "" +msgstr "Wniosek urlopowy" #. module: hr_holidays #: field:hr.holidays.status,limit:0 msgid "Allow to Override Limit" -msgstr "" +msgstr "Pozwala przekroczyć limit" #. module: hr_holidays #: view:hr.holidays.summary.employee:0 #: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_summary_employee msgid "Employee's Holidays" -msgstr "" +msgstr "Urlopy pracowników" #. module: hr_holidays #: view:available.holidays.report:0 diff --git a/addons/hr_payroll/i18n/sv.po b/addons/hr_payroll/i18n/sv.po index 3c2e881fd93..ad8d60e87c7 100644 --- a/addons/hr_payroll/i18n/sv.po +++ b/addons/hr_payroll/i18n/sv.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2010-10-18 17:46+0000\n" -"PO-Revision-Date: 2010-10-24 21:35+0000\n" -"Last-Translator: Magnus Brandt, Aspirix AB <Unknown>\n" +"PO-Revision-Date: 2010-10-25 07:13+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\n" "Language-Team: Swedish <sv@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-10-25 04:39+0000\n" +"X-Launchpad-Export-Date: 2010-10-26 04:40+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: hr_payroll diff --git a/addons/hr_timesheet/i18n/it.po b/addons/hr_timesheet/i18n/it.po index 0b2fe5c37c7..d9360d41fe0 100644 --- a/addons/hr_timesheet/i18n/it.po +++ b/addons/hr_timesheet/i18n/it.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: 2010-10-18 17:46+0000\n" -"PO-Revision-Date: 2010-10-24 23:10+0000\n" -"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n" +"PO-Revision-Date: 2010-10-25 07:15+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\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-10-25 04:39+0000\n" +"X-Launchpad-Export-Date: 2010-10-26 04:40+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: hr_timesheet diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py index 6411bae7bc0..c780951d07e 100644 --- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py +++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py @@ -261,7 +261,7 @@ class hr_timesheet_sheet(osv.osv): raise osv.except_osv(_('Error !'), _('You can not sign in from an other date than today')) emp_ids = emp_obj.search(cr, uid, [('user_id', '=', uid)], context=context) context['sheet_id']=ids[0] - success = emp_obj.attendance_action_change(cr, uid, emp_ids, type='sign_in', context=context,) + emp_obj.attendance_action_change(cr, uid, emp_ids, type='sign_in', context=context,) return True def sign_out(self, cr, uid, ids, context=None): @@ -272,7 +272,7 @@ class hr_timesheet_sheet(osv.osv): raise osv.except_osv(_('Error !'), _('You can not sign out from an other date than today')) emp_ids = emp_obj.search(cr, uid, [('user_id', '=', uid)]) context['sheet_id']=ids[0] - success = emp_obj.attendance_action_change(cr, uid, emp_ids, type='sign_out', context=context,) + emp_obj.attendance_action_change(cr, uid, emp_ids, type='sign_out', context=context,) return True _columns = { diff --git a/addons/l10n_be/account_pcmn_belgium.xml b/addons/l10n_be/account_pcmn_belgium.xml index dc6c86fc9fa..3471a184d62 100644 --- a/addons/l10n_be/account_pcmn_belgium.xml +++ b/addons/l10n_be/account_pcmn_belgium.xml @@ -6718,6 +6718,7 @@ <field name="ref_base_code_id" ref="vat_code_a49"/> <field name="ref_tax_code_id" ref="vat_code_a64"/> <field name="type_tax_use">sale</field> + <field name="sequence">0</field> </record> <record id="vat_21_s" model="account.tax.template"> <field name="chart_template_id" ref="l10nbe_chart_template"/> diff --git a/addons/l10n_ch/test/l10n_ch_report.yml b/addons/l10n_ch/test/l10n_ch_report.yml index a8a976bc424..24f7a9154ec 100644 --- a/addons/l10n_ch/test/l10n_ch_report.yml +++ b/addons/l10n_ch/test/l10n_ch_report.yml @@ -1,11 +1,24 @@ - + In order to test the PDF reports defined on a l10n_ch, we will create a invoice record +- + !record {model: account.invoice, id: test_invoice_1}: + currency_id: base.EUR + company_id: base.main_company + address_invoice_id: base.res_partner_address_tang + partner_id: base.res_partner_asus + state: draft + type: out_invoice + account_id: account.a_recv + name: Test invoice 1 + address_contact_id: base.res_partner_address_tang +- In order to test the PDF reports defined on a l10n_ch, we will print BVR Report - !python {model: account.invoice}: | import netsvc, tools, os - run_str = 'cp ' + tools.config['addons_path'] + '/l10n_ch/report/ocrbb.ttf' + ' ' + '/tmp/ocrbb.ttf' + run_str = 'cp ' + tools.config['addons_path'] + '/l10n_ch/report/ocrbb.ttf' + ' ' + '/tmp/ocrbb.ttf' os.system(run_str) - (data, format) = netsvc.LocalService('report.l10n_ch.bvr').create(cr, uid, [ref('account.test_invoice_1')], {}, {}) + (data, format) = netsvc.LocalService('report.l10n_ch.bvr').create(cr, uid, [ref('test_invoice_1')], {}, {}) if tools.config['test_report_directory']: file(os.path.join(tools.config['test_report_directory'], 'l10ch-bvr_report.'+format), 'wb+').write(data) @@ -14,6 +27,6 @@ - !python {model: account.invoice}: | import netsvc, tools, os - (data, format) = netsvc.LocalService('report.l10n_ch.invoice.bvr').create(cr, uid, [ref('account.test_invoice_1')], {}, {}) + (data, format) = netsvc.LocalService('report.l10n_ch.invoice.bvr').create(cr, uid, [ref('test_invoice_1')], {}, {}) if tools.config['test_report_directory']: file(os.path.join(tools.config['test_report_directory'], 'l10ch-bvr_invoice_report.'+format), 'wb+').write(data) diff --git a/addons/l10n_lu/test/l10n_lu_report.yml b/addons/l10n_lu/test/l10n_lu_report.yml index 43b1ce35df1..f3a35253850 100644 --- a/addons/l10n_lu/test/l10n_lu_report.yml +++ b/addons/l10n_lu/test/l10n_lu_report.yml @@ -12,3 +12,5 @@ (data, format) = netsvc.LocalService('report.l10n_lu.tax.report.print').create(cr, uid, [], {'model':'ir.ui.menu', 'form':{'tax_code_id': ref('account_tax_code_id_r1'), 'period_id': ref('account.period_1')}}, {}) if tools.config['test_report_directory']: file(os.path.join(tools.config['test_report_directory'], 'l10n_lu-vat_report.'+format), 'wb+').write(data) + + diff --git a/addons/membership/demo_data.xml b/addons/membership/demo_data.xml deleted file mode 100644 index 6809702a113..00000000000 --- a/addons/membership/demo_data.xml +++ /dev/null @@ -1,166 +0,0 @@ -<?xml version="1.0" ?> -<openerp> - <data noupdate="1"> - <record id="account_tax_testingtax0" model="account.tax"> - <field eval="1" name="sequence"/> - <field eval="1.0" name="base_sign"/> - <field eval=""true"" name="applicable_type"/> - <field name="company_id" ref="base.main_company"/> - <field eval=""# price_unit -# address : res.partner.address object or False -# product : product.product object or False - -result = price_unit * 0.10"" name="python_compute_inv"/> - <field eval="1.0" name="ref_tax_sign"/> - <field eval=""percent"" name="type"/> - <field eval="1.0" name="ref_base_sign"/> - <field eval=""1"" name="active"/> - <field eval=""testing tax"" name="name"/> - <field eval="0.069" name="amount"/> - <field eval=""# price_unit -# address : res.partner.address object or False -# product : product.product object or None -# partner : res.partner object or None - -result = price_unit * 0.10"" name="python_compute"/> - <field eval="1.0" name="tax_sign"/> - </record> - </data> - <data noupdate="1"> - <record id="base.EUR" model="res.currency"/> - </data> - <data> - <record id="product_template_0" model="product.template"> - <field name="list_price" eval="150.0"/> - <field name="name" eval=""Membership 2006""/> - <field name="categ_id" eval="7"/> - <field name="type" eval=""service""/> - </record> - </data> - <data> - <record id="product_product_0" model="product.product"> - <field eval=""2007-03-31"" name="membership_date_to"/> - <field eval=""1"" name="membership"/> - <field eval=""m2006"" name="default_code"/> - <field eval=""2006-01-01"" name="membership_date_from"/> - <field eval=""1"" name="active"/> - <field eval="150.0" name="price_margin"/> - <field name="product_tmpl_id" ref="product_template_0"/> - </record> - </data> - <data> - <record id="product_template_1" model="product.template"> - <field name="list_price" eval="160.0"/> - <field name="name" eval=""Membership 2007""/> - <field name="categ_id" eval="7"/> - <field name="type" eval=""service""/> - </record> - </data> - <data> - <record id="product_product_1" model="product.product"> - <field eval=""2008-03-31"" name="membership_date_to"/> - <field eval=""1"" name="membership"/> - <field eval=""m2007"" name="default_code"/> - <field eval=""2007-01-01"" name="membership_date_from"/> - <field eval=""1"" name="active"/> - <field eval="160.0" name="price_margin"/> - <field name="product_tmpl_id" ref="product_template_1"/> - </record> - </data> - <data> - <record id="product_template_2" model="product.template"> - <field name="list_price" eval="165.0"/> - <field name="name" eval=""Membership 2008""/> - <field name="categ_id" eval="7"/> - <field name="type" eval=""service""/> - </record> - </data> - <data> - <record id="product_product_2" model="product.product"> - <field eval=""2009-03-31"" name="membership_date_to"/> - <field eval=""1"" name="membership"/> - <field eval=""m2008"" name="default_code"/> - <field eval=""2008-01-01"" name="membership_date_from"/> - <field eval=""1"" name="active"/> - <field eval="165.0" name="price_margin"/> - <field name="product_tmpl_id" ref="product_template_2"/> - </record> - </data> - <data noupdate="1"> - <record id="account_invoice_0" model="account.invoice"> - <field name="partner_id" ref="base.res_partner_agrolait"/> - <field name="account_id" ref="account.a_recv"/> - <field name="address_contact_id" ref="base.res_partner_address_8"/> - <field eval=""none"" name="reference_type"/> - <field name="journal_id" ref="account.sales_journal"/> - <field name="company_id" ref="base.main_company"/> - <field name="currency_id" ref="base.EUR"/> - <field name="address_invoice_id" ref="base.res_partner_address_8"/> - <field eval=""paid"" name="state"/> - <field eval=""out_invoice"" name="type"/> - <field eval=""2006-02-10"" name="date_invoice"/> - </record> - <record id="account_invoice_line_membership0" model="account.invoice.line"> - <field name="uos_id" ref="product.product_uom_unit"/> - <field eval=""Membership 2006"" name="name"/> - <field name="invoice_id" ref="account_invoice_0"/> - <field eval="150.0" name="price_unit"/> - <field eval="[(6,0,[ref('account_tax_testingtax0')])]" name="invoice_line_tax_id"/> - <field name="product_id" ref="product_product_0"/> - <field eval="1.0" name="quantity"/> - <field name="account_id" ref="account.a_sale"/> - </record> - </data> - - <data noupdate="1"> - <record id="account_invoice_1" model="account.invoice"> - <field name="partner_id" ref="base.res_partner_agrolait"/> - <field name="account_id" ref="account.a_recv"/> - <field name="address_contact_id" ref="base.res_partner_address_8"/> - <field eval=""none"" name="reference_type"/> - <field name="journal_id" ref="account.sales_journal"/> - <field name="company_id" ref="base.main_company"/> - <field name="currency_id" ref="base.EUR"/> - <field name="address_invoice_id" ref="base.res_partner_address_8"/> - <field eval=""paid"" name="state"/> - <field eval=""out_invoice"" name="type"/> - <field eval=""2007-01-30"" name="date_invoice"/> - </record> - <record id="account_invoice_line_membership1" model="account.invoice.line"> - <field name="uos_id" ref="product.product_uom_unit"/> - <field eval=""Membership 2007"" name="name"/> - <field name="invoice_id" ref="account_invoice_1"/> - <field eval="160.0" name="price_unit"/> - <field eval="[(6,0,[ref('account_tax_testingtax0')])]" name="invoice_line_tax_id"/> - <field name="product_id" ref="product_product_1"/> - <field eval="1.0" name="quantity"/> - <field name="account_id" ref="account.a_sale"/> - </record> - </data> - - <data noupdate="1"> - <record id="account_invoice_2" model="account.invoice"> - <field name="partner_id" ref="base.res_partner_agrolait"/> - <field name="account_id" ref="account.a_recv"/> - <field name="address_contact_id" ref="base.res_partner_address_8"/> - <field eval=""none"" name="reference_type"/> - <field name="journal_id" ref="account.sales_journal"/> - <field name="company_id" ref="base.main_company"/> - <field name="currency_id" ref="base.EUR"/> - <field name="address_invoice_id" ref="base.res_partner_address_8"/> - <field eval=""paid"" name="state"/> - <field eval=""out_invoice"" name="type"/> - <field eval=""2007-11-30"" name="date_invoice"/> - </record> - <record id="account_invoice_line_membership1" model="account.invoice.line"> - <field name="uos_id" ref="product.product_uom_unit"/> - <field eval=""Membership 2007"" name="name"/> - <field name="invoice_id" ref="account_invoice_2"/> - <field eval="160.0" name="price_unit"/> - <field eval="[(6,0,[ref('account_tax_testingtax0')])]" name="invoice_line_tax_id"/> - <field name="product_id" ref="product_product_2"/> - <field eval="1.0" name="quantity"/> - <field name="account_id" ref="account.a_sale"/> - </record> - </data> -</openerp> diff --git a/addons/membership/membership.py b/addons/membership/membership.py index 4cd16b72322..a7f84603608 100644 --- a/addons/membership/membership.py +++ b/addons/membership/membership.py @@ -49,13 +49,21 @@ STATE_PRIOR = { class membership_line(osv.osv): '''Member line''' + def _get_partners(self, cr, uid, ids, context=None): + list_membership_line = [] + member_line_obj = self.pool.get('membership.membership_line') + for partner in self.pool.get('res.partner').browse(cr, uid, ids, context=context): + if partner.member_lines: + list_membership_line += member_line_obj.search(cr, uid, [('id', 'in', [ l.id for l in partner.member_lines])], context=context) + return list_membership_line + def _get_membership_lines(self, cr, uid, ids, context=None): - list_membership_line = [] - member_line_obj = self.pool.get('membership.membership_line') - for invoice in self.pool.get('account.invoice').browse(cr, uid, ids, context=context): - if invoice.invoice_line: - list_membership_line += member_line_obj.search(cr, uid, [('account_invoice_line', 'in', [ l.id for l in invoice.invoice_line])], context=context) - return list_membership_line + list_membership_line = [] + member_line_obj = self.pool.get('membership.membership_line') + for invoice in self.pool.get('account.invoice').browse(cr, uid, ids, context=context): + if invoice.invoice_line: + list_membership_line += member_line_obj.search(cr, uid, [('account_invoice_line', 'in', [ l.id for l in invoice.invoice_line])], context=context) + return list_membership_line def _check_membership_date(self, cr, uid, ids, context=None): """Check if membership product is not in the past @@ -74,7 +82,7 @@ class membership_line(osv.osv): ) JOIN account_invoice ai ON ( ai.id = ail.invoice_id) - WHERE ml.id IN %s''',(tuple(ids),)) + WHERE ml.id IN %s''', (tuple(ids),)) res = cr.fetchall() for r in res: if r[0] and r[0] < 0: @@ -138,16 +146,22 @@ class membership_line(osv.osv): 'date_from': fields.date('From', readonly=True), 'date_to': fields.date('To', readonly=True), 'date_cancel': fields.date('Cancel date'), - 'date': fields.date('Join Date'), - 'member_price':fields.float('Member Price', digits_compute= dp.get_precision('Sale Price'), required=True), + 'date': fields.date('Join Date', help="Date on which member has joined the membership"), + 'member_price': fields.float('Member Price', digits_compute= dp.get_precision('Sale Price'), required=True, help='Amount for the membership'), 'account_invoice_line': fields.many2one('account.invoice.line', 'Account Invoice line', readonly=True), 'account_invoice_id': fields.related('account_invoice_line', 'invoice_id', type='many2one', relation='account.invoice', string='Invoice', readonly=True), - 'state': fields.function( - _state, method=True, + 'state': fields.function(_state, method=True, string='Membership State', type='selection', selection=STATE, store = { - 'account.invoice':(_get_membership_lines, ['state'], 10), - }), + 'account.invoice': (_get_membership_lines, ['state'], 10), + 'res.partner': (_get_partners, ['membership_state'], 12), + }, help="""It indicates the membership state. + -Non Member: A member who has not applied for any membership. + -Cancelled Member: A member who has cancelled his membership. + -Old Member: A member whose membership date has expired. + -Waiting Member: A member who has applied for the membership and whose invoice is going to be created. + -Invoiced Member: A member whose invoice has been created. + -Paid Member: A member who has paid the membership amount."""), 'company_id': fields.related('account_invoice_line', 'invoice_id', 'company_id', type="many2one", relation="res.company", string="Company", readonly=True, store=True) } _rec_name = 'partner' @@ -172,7 +186,7 @@ class Partner(osv.osv): list_partner.append(data.partner.id) ids2 = list_partner while ids2: - ids2 = res_obj.search(cr, uid, [('associate_member','in',ids2)], context=context) + ids2 = res_obj.search(cr, uid, [('associate_member', 'in', ids2)], context=context) list_partner += ids2 return list_partner @@ -185,7 +199,7 @@ class Partner(osv.osv): list_partner.append(data.partner_id.id) ids2 = list_partner while ids2: - ids2 = res_obj.search(cr, uid, [('associate_member','in',ids2)], context=context) + ids2 = res_obj.search(cr, uid, [('associate_member', 'in', ids2)], context=context) list_partner += ids2 return list_partner @@ -232,7 +246,7 @@ class Partner(osv.osv): s = 3 if s==4: for mline in partner_data.member_lines: - if mline.date_from < today and mline.date_to < today and mline.date_from<=mline.date_to and (mline.account_invoice_line and mline.account_invoice_line.invoice_id.state) == 'paid': + if mline.date_from < today and mline.date_to < today and mline.date_from <= mline.date_to and (mline.account_invoice_line and mline.account_invoice_line.invoice_id.state) == 'paid': s = 5 else: s = 6 @@ -294,7 +308,7 @@ class Partner(osv.osv): def _get_partners(self, cr, uid, ids, context=None): ids2 = ids while ids2: - ids2 = self.search(cr, uid, [('associate_member','in',ids2)], context=context) + ids2 = self.search(cr, uid, [('associate_member', 'in', ids2)], context=context) ids += ids2 return ids @@ -302,45 +316,51 @@ class Partner(osv.osv): return self._membership_state(*args, **kwargs) _columns = { - 'associate_member': fields.many2one('res.partner', 'Associate member'), + 'associate_member': fields.many2one('res.partner', 'Associate member',help="A member with whom you want to associate your membership.It will consider the membership state of the associated member."), 'member_lines': fields.one2many('membership.membership_line', 'partner', 'Membership'), - 'free_member': fields.boolean('Free member'), + 'free_member': fields.boolean('Free member', help = "Select if you want to give membership free of cost."), 'membership_amount': fields.float( 'Membership amount', digits=(16, 2), - help = 'The price negociated by the partner'), + help = 'The price negotiated by the partner'), 'membership_state': fields.function( - __get_membership_state, method = True, + __get_membership_state, method=True, string = 'Current Membership State', type = 'selection', selection = STATE, store = { 'account.invoice': (_get_invoice_partner, ['state'], 10), 'membership.membership_line': (_get_partner_id, ['state'], 10), 'res.partner': (_get_partners, ['free_member', 'membership_state', 'associate_member'], 10) - }), + }, help="""It indicates the membership state. + -Non Member: A member who has not applied for any membership. + -Cancelled Member: A member who has cancelled his membership. + -Old Member: A member whose membership date has expired. + -Waiting Member: A member who has applied for the membership and whose invoice is going to be created. + -Invoiced Member: A member whose invoice has been created. + -Paid Member: A member who has paid the membership amount."""), 'membership_start': fields.function( - _membership_date, method = True, multi = 'membeship_start', + _membership_date, method=True, multi = 'membeship_start', string = 'Start membership date', type = 'date', store = { 'account.invoice': (_get_invoice_partner, ['state'], 10), 'membership.membership_line': (_get_partner_id, ['state'], 10, ), 'res.partner': (lambda self, cr, uid, ids, c={}: ids, ['free_member'], 10) - }), + }, help="Date from which membership becomes active."), 'membership_stop': fields.function( - _membership_date, method = True, - string = 'Stop membership date', type = 'date', multi='membership_stop', + _membership_date, method=True, + string = 'Stop membership date', type='date', multi='membership_stop', store = { 'account.invoice': (_get_invoice_partner, ['state'], 10), 'membership.membership_line': (_get_partner_id, ['state'], 10), - 'res.partner': (lambda self,cr,uid,ids,c={}:ids, ['free_member'], 10) - }), + 'res.partner': (lambda self, cr, uid, ids, c={}: ids, ['free_member'], 10) + }, help="Date until which membership remains active."), 'membership_cancel': fields.function( - _membership_date, method = True, + _membership_date, method=True, string = 'Cancel membership date', type='date', multi='membership_cancel', store = { 'account.invoice': (_get_invoice_partner, ['state'], 11), 'membership.membership_line': (_get_partner_id, ['state'], 10), - 'res.partner': (lambda self,cr,uid,ids,c={}:ids, ['free_member'], 10) - }), + 'res.partner': (lambda self, cr, uid, ids, c={}: ids, ['free_member'], 10) + }, help="Date on which membership has been cancelled"), } _defaults = { 'free_member': False, @@ -375,17 +395,17 @@ class Partner(osv.osv): def create_membership_invoice(self, cr, uid, ids, product_id=None, datas=None, context=None): """ Create Customer Invoice of Membership for partners. @param datas: datas has dictionary value which consist Id of Membership product and Cost Amount of Membership. - datas = {'membership_product_id': None, 'amount':None} + datas = {'membership_product_id': None, 'amount': None} """ invoice_obj = self.pool.get('account.invoice') invoice_line_obj = self.pool.get('account.invoice.line') invoice_tax_obj = self.pool.get('account.invoice.tax') - product_id = product_id or datas.get('membership_product_id',False) + product_id = product_id or datas.get('membership_product_id', False) amount = datas.get('amount', 0.0) if not context: context={} invoice_list = [] - if type(ids) in (int,long,): + if type(ids) in (int, long,): ids = [ids] for partner in self.browse(cr, uid, ids, context=context): account_id = partner.property_account_receivable and partner.property_account_receivable.id or False @@ -432,7 +452,7 @@ Partner() class product_template(osv.osv): _inherit = 'product.template' _columns = { - 'member_price':fields.float('Member Price', digits_compute= dp.get_precision('Sale Price')), + 'member_price': fields.float('Member Price', digits_compute= dp.get_precision('Sale Price')), } product_template() @@ -442,7 +462,7 @@ class Product(osv.osv): model_obj = self.pool.get('ir.model.data') if ('product' in context) and (context['product']=='membership_product'): - model_data_ids_form = model_obj.search(cr, user, [('model','=','ir.ui.view'), ('name','in',['membership_products_form', 'membership_products_tree'])], context=context) + model_data_ids_form = model_obj.search(cr, user, [('model','=','ir.ui.view'), ('name', 'in', ['membership_products_form', 'membership_products_tree'])], context=context) resource_id_form = model_obj.read(cr, user, model_data_ids_form, fields=['res_id', 'name'], context=context) dict_model = {} for i in resource_id_form: @@ -456,14 +476,15 @@ class Product(osv.osv): '''Product''' _inherit = 'product.product' _columns = { - 'membership': fields.boolean('Membership', help='Specify if this product is a membership product'), - 'membership_date_from': fields.date('Date from', help='Active Membership since this date'), - 'membership_date_to': fields.date('Date to', help='Expired date of Membership'), + 'membership': fields.boolean('Membership', help='Select if a product is a membership product.'), + 'membership_date_from': fields.date('Date from', help='Date from which membership becomes active.'), + 'membership_date_to': fields.date('Date to', help='Date until which membership remains active.'), } _defaults = { - 'membership': False + 'membership': False, } + Product() @@ -477,10 +498,11 @@ class Invoice(osv.osv): today = time.strftime('%Y-%m-%d') for invoice in self.browse(cr, uid, ids): mlines = member_line_obj.search(cr, uid, - [('account_invoice_line','in', - [ l.id for l in invoice.invoice_line])]) + [('account_invoice_line', 'in', + [l.id for l in invoice.invoice_line])]) member_line_obj.write(cr, uid, mlines, {'date_cancel': today}) return super(Invoice, self).action_cancel(cr, uid, ids) + Invoice() class account_invoice_line(osv.osv): @@ -495,7 +517,7 @@ class account_invoice_line(osv.osv): member_line_obj = self.pool.get('membership.membership_line') for line in self.browse(cr, uid, ids, context=context): if line.invoice_id.type == 'out_invoice': - ml_ids = member_line_obj.search(cr, uid, [('account_invoice_line','=',line.id)], context=context) + ml_ids = member_line_obj.search(cr, uid, [('account_invoice_line', '=', line.id)], context=context) if line.product_id and line.product_id.membership and not ml_ids: # Product line has changed to a membership product date_from = line.product_id.membership_date_from @@ -523,7 +545,7 @@ class account_invoice_line(osv.osv): context={} member_line_obj = self.pool.get('membership.membership_line') for id in ids: - ml_ids = member_line_obj.search(cr, uid, [('account_invoice_line','=',id)], context=context) + ml_ids = member_line_obj.search(cr, uid, [('account_invoice_line', '=', id)], context=context) member_line_obj.unlink(cr, uid, ml_ids, context=context) return super(account_invoice_line, self).unlink(cr, uid, ids, context=context) @@ -534,7 +556,7 @@ class account_invoice_line(osv.osv): line = self.browse(cr, uid, result, context=context) member_line_obj = self.pool.get('membership.membership_line') if line.invoice_id.type == 'out_invoice': - ml_ids = member_line_obj.search(cr, uid, [('account_invoice_line','=',line.id)], context=context) + ml_ids = member_line_obj.search(cr, uid, [('account_invoice_line', '=', line.id)], context=context) if line.product_id and line.product_id.membership and not ml_ids: # Product line is a membership product date_from = line.product_id.membership_date_from @@ -553,4 +575,5 @@ class account_invoice_line(osv.osv): return result account_invoice_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/membership/membership_view.xml b/addons/membership/membership_view.xml index b9d99e6cdb7..e3c0bb9a1e2 100644 --- a/addons/membership/membership_view.xml +++ b/addons/membership/membership_view.xml @@ -71,7 +71,7 @@ <separator string="Categorization" colspan="2"/> <field name="list_price" string="Membership Fee"/> <field name="type" /> - <field name="property_account_income"/> + <field name="property_account_income" domain="[('type', '!=', 'view')]"/> <field name="categ_id"/> <separator string="Sale Taxes" colspan="2"/> <newline/> diff --git a/addons/membership/report/__init__.py b/addons/membership/report/__init__.py index dd247c52f3a..05c893ae400 100644 --- a/addons/membership/report/__init__.py +++ b/addons/membership/report/__init__.py @@ -20,3 +20,4 @@ ############################################################################## import report_membership +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file diff --git a/addons/membership/report/report_membership.py b/addons/membership/report/report_membership.py index 4718866d8a3..43ffa7a5b28 100644 --- a/addons/membership/report/report_membership.py +++ b/addons/membership/report/report_membership.py @@ -23,7 +23,6 @@ from osv import fields, osv import tools import decimal_precision as dp - STATE = [ ('none', 'Non Member'), ('canceled', 'Cancelled Member'), @@ -44,7 +43,7 @@ class report_membership(osv.osv): _rec_name = 'year' _columns = { 'year': fields.char('Year', size=4, readonly=True, select=1), - 'month':fields.selection([('01', 'January'), ('02', 'February'), \ + 'month': fields.selection([('01', 'January'), ('02', 'February'), \ ('03', 'March'), ('04', 'April'),\ ('05', 'May'), ('06', 'June'), \ ('07', 'July'), ('08', 'August'),\ @@ -63,7 +62,7 @@ class report_membership(osv.osv): 'membership_state': fields.selection(STATE, 'Current Membership State', readonly=True), 'user_id': fields.many2one('res.users', 'Salesman', readonly=True), 'company_id': fields.many2one('res.company', 'Company', readonly=True) -} + } def init(self, cr): '''Create the view''' @@ -127,20 +126,20 @@ class report_membership(osv.osv): ml.state, ml.id ) AS foo - GROUP BY - year, - month, - date_from, - date_to, - partner_id, - user_id, - membership_id, - company_id, - membership_state, - associate_member_id, + GROUP BY + year, + month, + date_from, + date_to, + partner_id, + user_id, + membership_id, + company_id, + membership_state, + associate_member_id, membership_amount )""") report_membership() -# 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/membership/report/report_membership_view.xml b/addons/membership/report/report_membership_view.xml index d36b4af0afe..61e0d9ddd8b 100644 --- a/addons/membership/report/report_membership_view.xml +++ b/addons/membership/report/report_membership_view.xml @@ -9,7 +9,7 @@ <field name="model">report.membership</field> <field name="type">tree</field> <field name="arch" type="xml"> - <tree colors="blue:state in ('draft');black:state in ('open','free');gray:state in ('done','cancel') " string="Membership"> + <tree colors="blue:membership_state in ('draft');black:membership_state in ('open','free');gray:membership_state in ('done','cancel') " string="Membership"> <field name="partner_id"/> <field name="membership_state"/> <field name="associate_member_id" invisible="1"/> @@ -46,7 +46,6 @@ <separator orientation="vertical"/> <field name="partner_id"/> <field name="membership_id"/> - <field name="state"/> <field name="user_id"/> </group> <newline/> @@ -79,11 +78,10 @@ <field name="type">graph</field> <field name="arch" type="xml"> <graph string="Membership" type="bar"> - <field name="year"/> - <field name="canceled_number"/> - <field name="waiting_number"/> - <field name="invoiced_number"/> - <field name="paid_number"/> + <field name="year" /> + <field name="num_waiting" operator="+"/> + <field name="num_invoiced" operator="+"/> + <field name="num_paid" operator="+"/> </graph> </field> </record> diff --git a/addons/membership/wizard/membership_invoice.py b/addons/membership/wizard/membership_invoice.py index 9b9fddc2313..b0a46f3951d 100644 --- a/addons/membership/wizard/membership_invoice.py +++ b/addons/membership/wizard/membership_invoice.py @@ -19,11 +19,7 @@ # ############################################################################## -import time - from osv import fields, osv -from tools.translate import _ -import tools import decimal_precision as dp class membership_invoice(osv.osv_memory): @@ -35,7 +31,7 @@ class membership_invoice(osv.osv_memory): 'product_id': fields.many2one('product.product','Membership', required=True), 'member_price': fields.float('Member Price', digits_compute= dp.get_precision('Sale Price'), required=True), } - def onchange_product(self, cr, uid, ids, product_id): + def onchange_product(self, cr, uid, ids, product_id=False): """This function returns value of product's member price based on product id. """ if not product_id: @@ -49,15 +45,14 @@ class membership_invoice(osv.osv_memory): datas = {} if not context: context = {} - data = self.browse(cr, uid, ids) + data = self.browse(cr, uid, ids, context=context) if data: data = data[0] datas = { 'membership_product_id': data.product_id.id, 'amount': data.member_price } - invoice_ids = context.get('active_ids', []) - invoice_list = partner_obj.create_membership_invoice(cr, uid, invoice_ids, datas=datas, context=context) + invoice_list = partner_obj.create_membership_invoice(cr, uid, context.get('active_ids', []), datas=datas, context=context) return { 'domain': [('id', 'in', invoice_list)], @@ -70,4 +65,4 @@ class membership_invoice(osv.osv_memory): membership_invoice() -# 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/mrp/i18n/pl.po b/addons/mrp/i18n/pl.po index ebea0fb6217..338a7ba1561 100644 --- a/addons/mrp/i18n/pl.po +++ b/addons/mrp/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-10-18 17:46+0000\n" -"PO-Revision-Date: 2010-10-24 13:13+0000\n" -"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\n" +"PO-Revision-Date: 2010-10-26 08:13+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\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-10-25 04:38+0000\n" +"X-Launchpad-Export-Date: 2010-10-27 04:58+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: mrp @@ -340,37 +340,37 @@ msgstr "Odnośnik do pozycji w planie zewnętrznym" #. module: mrp #: selection:mrp.production.order,month:0 msgid "August" -msgstr "" +msgstr "Sierpień" #. module: mrp #: model:ir.model,name:mrp.model_mrp_production_order msgid "Production Order Report" -msgstr "" +msgstr "Raport zamówień produkcji" #. module: mrp #: selection:mrp.production.order,month:0 msgid "June" -msgstr "" +msgstr "Czerwiec" #. module: mrp #: model:ir.model,name:mrp.model_mrp_product_produce msgid "Product Produce" -msgstr "" +msgstr "Produkcja produktu" #. module: mrp #: selection:mrp.production.order,month:0 msgid "October" -msgstr "" +msgstr "Październik" #. module: mrp #: model:process.transition,name:mrp.process_transition_procurestockableproduct0 msgid "Procurement of stockable Product" -msgstr "" +msgstr "Zapotrzebowanie na produkt rejestrowany" #. module: mrp #: view:mrp.bom:0 msgid "Default UOM" -msgstr "" +msgstr "Domyślna JM" #. module: mrp #: code:addons/mrp/report/price.py:0 @@ -385,7 +385,7 @@ msgstr "Ilość" #. module: mrp #: field:mrp.production.workcenter.line,hour:0 msgid "Nbr of hours" -msgstr "" +msgstr "Liczba godzin" #. module: mrp #: view:mrp.production:0 @@ -398,6 +398,8 @@ msgid "" "The system creates an order (production or purchased) depending on the sold " "quantity and the products parameters." msgstr "" +"System utworzy zamówienie (produkcji lub zakupu) zależnie od sprzedanej " +"ilości i parametrów produktu." #. module: mrp #: model:process.transition,note:mrp.process_transition_servicemts0 @@ -409,12 +411,12 @@ msgstr "" #. module: mrp #: field:mrp.installer,mrp_repair:0 msgid "Repairs" -msgstr "" +msgstr "Naprawy" #. module: mrp #: field:mrp.installer,stock_location:0 msgid "Advanced Routes" -msgstr "" +msgstr "Zaawansowane marszruty" #. module: mrp #: model:ir.actions.act_window,name:mrp.action_report_in_out_picking_tree @@ -427,6 +429,8 @@ msgid "" "Enables warranty and repair management (and their impact on stocks and " "invoicing)." msgstr "" +"Włącza zarządzanie gwarancjami i naprawą (i jego wpływ na zapasy i " +"fakturowanie)." #. module: mrp #: field:mrp.production,date_planned_date:0 @@ -454,7 +458,7 @@ msgstr "" #. module: mrp #: view:board.board:0 msgid "Stock Value Variation" -msgstr "" +msgstr "Odchylenia wartości zapasów" #. module: mrp #: model:ir.actions.act_window,name:mrp.action2 @@ -464,23 +468,23 @@ msgstr "Struktura zestawień materiałowych" #. module: mrp #: model:process.node,note:mrp.process_node_serviceproduct0 msgid "Product type is service" -msgstr "" +msgstr "Typ produktu jest serwis" #. module: mrp #: code:addons/mrp/report/price.py:0 #, python-format msgid "of " -msgstr "" +msgstr "z " #. module: mrp #: model:process.transition,name:mrp.process_transition_bom0 msgid "Manufacturing decomposition" -msgstr "" +msgstr "Dekompozycja produkcji" #. module: mrp #: model:process.node,note:mrp.process_node_serviceproduct1 msgid "For Services." -msgstr "" +msgstr "Do usług." #. module: mrp #: field:mrp.bom.revision,date:0 diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py index 751cf384b6e..c71565442e5 100644 --- a/addons/mrp/mrp.py +++ b/addons/mrp/mrp.py @@ -24,6 +24,7 @@ from osv import osv, fields from tools.translate import _ import netsvc import time +import tools #---------------------------------------------------------- @@ -309,7 +310,7 @@ class mrp_bom(osv.osv): mult = (d + (m and 1.0 or 0.0)) cycle = mult * wc_use.cycle_nbr result2.append({ - 'name': bom.routing_id.name, + 'name': tools.ustr(wc_use.name) + ' - ' + tools.ustr(bom.product_id.name), 'workcenter_id': wc.id, 'sequence': level+(wc_use.sequence or 0), 'cycle': cycle, diff --git a/addons/multi_company/i18n/ru.po b/addons/multi_company/i18n/ru.po index acfed97ff47..396b6716db6 100644 --- a/addons/multi_company/i18n/ru.po +++ b/addons/multi_company/i18n/ru.po @@ -7,96 +7,85 @@ msgid "" msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" -"POT-Creation-Date: 2009-12-08 11:46+0000\n" -"PO-Revision-Date: 2010-08-03 08:13+0000\n" -"Last-Translator: Nikolay Chesnokov <chesnokov_n@msn.com>\n" +"POT-Creation-Date: 2010-10-18 17:46+0000\n" +"PO-Revision-Date: 2010-10-26 08:32+0000\n" +"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n" "Language-Team: Russian <ru@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-09-29 05:16+0000\n" +"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: multi_company -#: help:multi_company.default,object_id:0 -msgid "Object affect by this rules" -msgstr "Объект затрагивает эти правила" - -#. module: multi_company -#: constraint:ir.model:0 -msgid "" -"The Object name must start with x_ and not contain any special character !" -msgstr "" -"Название объекта должно начинаться с x_ и не должно содержать специальных " -"символов !" - -#. module: multi_company -#: constraint:product.template:0 -msgid "" -"Error: The default UOM and the purchase UOM must be in the same category." -msgstr "" -"Ошибка. ЕИМ по умолчанию и закупочная ЕИМ должны иметь одинаковую категорию." - -#. module: multi_company -#: constraint:res.partner:0 -msgid "The VAT doesn't seem to be correct." -msgstr "НДС выглядит неправильно" - -#. module: multi_company -#: constraint:ir.actions.act_window:0 -msgid "Invalid model name in the action definition." -msgstr "Недопустимое имя модели в определении действия" - -#. module: multi_company #: model:res.company,overdue_msg:multi_company.res_company_odoo #: model:res.company,overdue_msg:multi_company.res_company_oerp_be #: model:res.company,overdue_msg:multi_company.res_company_oerp_editor #: model:res.company,overdue_msg:multi_company.res_company_oerp_in #: model:res.company,overdue_msg:multi_company.res_company_oerp_us msgid "" -"Would your payment have been carried out after this mail was sent, please " -"consider the present one as void. Do not hesitate to contact our accounting " -"department" +"\n" +"Date: %(date)s\n" +"\n" +"Dear %(partner_name)s,\n" +"\n" +"Please find in attachment a reminder of all your unpaid invoices, for a " +"total amount due of:\n" +"\n" +"%(followup_amount).2f %(company_currency)s\n" +"\n" +"Thanks,\n" +"--\n" +"%(user_signature)s\n" +"%(company_name)s\n" +" " msgstr "" +"\n" +"Дата: %(date)s\n" +"\n" +"Уважаемый / уважаемая %(partner_name)s,\n" +"\n" +"Пожалуйста, просмотрите в приложении напоминание о всех не оплаченных вами " +"счетах.\n" +"Всего на сумму: %(followup_amount).2f %(company_currency)s\n" +"\n" +"Спасибо,\n" +"--\n" +"%(user_signature)s\n" +"%(company_name)s\n" +" " #. module: multi_company -#: field:multi_company.default,company_dest_id:0 -msgid "Default Company" -msgstr "Компания по умолчанию" +#: constraint:ir.actions.act_window:0 +msgid "Invalid model name in the action definition." +msgstr "Недопустимое имя модели в определении действия" #. module: multi_company -#: field:multi_company.default,object_id:0 -msgid "Object" -msgstr "Объект" +#: constraint:product.template:0 +msgid "Error: UOS must be in a different category than the UOM" +msgstr "Ошибка. UOS и UOM должны принадлежать к разным категориям." #. module: multi_company -#: model:ir.module.module,shortdesc:multi_company.module_meta_information -#: view:multi_company.default:0 -msgid "Multi Company" -msgstr "Концерн" +#: model:product.category,name:multi_company.Odoo1 +msgid "Odoo Offers" +msgstr "Предложения Odoo" #. module: multi_company -#: model:ir.module.module,description:multi_company.module_meta_information +#: constraint:product.template:0 msgid "" -"This module add the possibility to easily manage \n" -" the default value for each object\n" -" " +"Error: The default UOM and the purchase UOM must be in the same category." msgstr "" +"Ошибка. ЕИМ по умолчанию и закупочная ЕИМ должны иметь одинаковую категорию." #. module: multi_company -#: field:multi_company.default,company_id:0 -msgid "Main Company" -msgstr "Головная компания" - -#. module: multi_company -#: view:multi_company.default:0 -msgid "Condition" -msgstr "Условие" +#: constraint:product.category:0 +msgid "Error ! You can not create recursive categories." +msgstr "Ошибка ! Невозможно создать рекурсивную категорию." #. module: multi_company -#: help:multi_company.default,company_dest_id:0 -msgid "Company to store the current record" -msgstr "" +#: constraint:res.company:0 +msgid "Error! You can not create recursive companies." +msgstr "Ошибка! Невозможно создать рекурсивную компанию." #. module: multi_company #: constraint:ir.ui.view:0 @@ -104,92 +93,102 @@ msgid "Invalid XML for View Architecture!" msgstr "Некорректный формат XML структуры для просмотра." #. module: multi_company -#: field:multi_company.default,name:0 -msgid "Name" -msgstr "Имя" +#: model:ir.ui.menu,name:multi_company.menu_custom_multicompany +msgid "Multi-Companies" +msgstr "" #. module: multi_company -#: constraint:product.template:0 -msgid "Error: UOS must be in a different category than the UOM" -msgstr "Ошибка. UOS и UOM должны принадлежать к разным категориям." +#: model:ir.module.module,shortdesc:multi_company.module_meta_information +#: view:multi_company.default:0 +msgid "Multi Company" +msgstr "Концерн" #. module: multi_company -#: model:product.category,name:multi_company.Odoo1 -msgid "Odoo Offers" -msgstr "Предложения Odoo" +#: constraint:res.partner:0 +msgid "Error ! You can not create recursive associated members." +msgstr "Ошибка! Вы не можете создать рекурсивных связанных участников." #. module: multi_company -#: constraint:res.company:0 -msgid "Error! You can not create recursive companies." -msgstr "Ошибка! Невозможно создать рекурсивную компанию." +#: constraint:product.product:0 +msgid "Error: Invalid ean code" +msgstr "Ошибка: Неправильный штрих-код" #. module: multi_company -#: help:multi_company.default,name:0 -msgid "Name it to easily find a record" +#: constraint:res.users:0 +msgid "The chosen company is not in the allowed companies for this user" msgstr "" +"Выбранной компании нет в разрешенных компаниях для этого пользователя" #. module: multi_company -#: model:ir.ui.menu,name:multi_company.menu_custom_multicompany -msgid "Multi company" -msgstr "Концерн" +#: constraint:ir.ui.menu:0 +msgid "Error ! You can not create recursive Menu." +msgstr "Ошибка ! Нельзя создать зацикленные меню." #. module: multi_company -#: model:ir.model,name:multi_company.model_multi_company_default -msgid "multi_company.default" -msgstr "" - -#. module: multi_company -#: help:multi_company.default,company_id:0 -msgid "Company where the user is connected" -msgstr "Компании, в составе которых находиться пользователь" +#: view:multi_company.default:0 +msgid "Returning" +msgstr "Возвращаемое" #. module: multi_company #: model:ir.actions.act_window,name:multi_company.action_inventory_form +#: model:ir.ui.menu,name:multi_company.menu_action_inventory_form msgid "Default Company per Object" msgstr "Компании по умолчанию для объекта" #. module: multi_company -#: field:multi_company.default,expression:0 -msgid "Expression" -msgstr "Выражение" +#: view:multi_company.default:0 +msgid "Matching" +msgstr "Сопоставление" + +#. module: multi_company +#: view:multi_company.default:0 +msgid "Condition" +msgstr "Условие" #. module: multi_company #: model:product.template,name:multi_company.product_product_odoo1_product_template msgid "Odoo Offer" msgstr "Предложение Odoo" -#. module: multi_company -#: field:multi_company.default,sequence:0 -msgid "Sequence" -msgstr "Последовательность" +#~ msgid "Object" +#~ msgstr "Объект" -#. module: multi_company -#: constraint:product.category:0 -msgid "Error ! You can not create recursive categories." -msgstr "Ошибка ! Невозможно создать рекурсивную категорию." +#~ msgid "The VAT doesn't seem to be correct." +#~ msgstr "НДС выглядит неправильно" -#. module: multi_company -#: constraint:product.product:0 -msgid "Error: Invalid ean code" -msgstr "Ошибка: Неправильный штрих-код" +#~ msgid "" +#~ "The Object name must start with x_ and not contain any special character !" +#~ msgstr "" +#~ "Название объекта должно начинаться с x_ и не должно содержать специальных " +#~ "символов !" -#. module: multi_company -#: help:multi_company.default,expression:0 -msgid "Expression, must be True to match" -msgstr "" +#~ msgid "Multi company" +#~ msgstr "Концерн" -#. module: multi_company -#: model:ir.ui.menu,name:multi_company.menu_action_inventory_form -msgid "Default company per Object" -msgstr "Компания по умолчанию для объекта" +#~ msgid "Main Company" +#~ msgstr "Головная компания" + +#~ msgid "Name" +#~ msgstr "Имя" + +#~ msgid "Sequence" +#~ msgstr "Последовательность" + +#~ msgid "Expression" +#~ msgstr "Выражение" -#. module: multi_company -#: code:addons/multi_company/multi_company.py:0 #, python-format -msgid " (copy)" -msgstr " (копия)" +#~ msgid " (copy)" +#~ msgstr " (копия)" -#. module: multi_company -#: view:multi_company.default:0 -msgid "Matching" -msgstr "Сопоставление" +#~ msgid "Object affect by this rules" +#~ msgstr "Объект затрагивает эти правила" + +#~ msgid "Default Company" +#~ msgstr "Компания по умолчанию" + +#~ msgid "Company where the user is connected" +#~ msgstr "Компании, в составе которых находиться пользователь" + +#~ msgid "Default company per Object" +#~ msgstr "Компания по умолчанию для объекта" diff --git a/addons/partner_geo_assign/i18n/de.po b/addons/partner_geo_assign/i18n/de.po deleted file mode 100644 index 86d223a36ba..00000000000 --- a/addons/partner_geo_assign/i18n/de.po +++ /dev/null @@ -1,117 +0,0 @@ -# German 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 <EMAIL@ADDRESS>, 2010. -# -msgid "" -msgstr "" -"Project-Id-Version: openobject-addons\n" -"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" -"POT-Creation-Date: 2010-08-20 08:40+0000\n" -"PO-Revision-Date: 2010-10-05 13:33+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: German <de@li.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-10-08 04:39+0000\n" -"X-Generator: Launchpad (build Unknown)\n" - -#. module: partner_geo_assign -#: code:addons/partner_geo_assign/partner_geo_assign.py:0 -#, python-format -msgid "Network error" -msgstr "" - -#. module: partner_geo_assign -#: constraint:ir.ui.view:0 -msgid "Invalid XML for View Architecture!" -msgstr "" - -#. module: partner_geo_assign -#: help:res.partner,partner_weight:0 -msgid "" -"Gives the probability to assign a lead to this partner. (0 means no " -"assignation.)" -msgstr "" - -#. module: partner_geo_assign -#: model:ir.module.module,description:partner_geo_assign.module_meta_information -msgid "" -"\n" -"This is the module used by OpenERP SA to redirect customers to his " -"partners,\n" -"based on geolocalization.\n" -" " -msgstr "" - -#. module: partner_geo_assign -#: field:res.partner,partner_weight:0 -msgid "Weight" -msgstr "" - -#. module: partner_geo_assign -#: model:ir.module.module,shortdesc:partner_geo_assign.module_meta_information -msgid "Partner Geo-Localisation" -msgstr "" - -#. module: partner_geo_assign -#: view:res.partner:0 -msgid "Geo Localization" -msgstr "" - -#. module: partner_geo_assign -#: code:addons/partner_geo_assign/partner_geo_assign.py:0 -#, python-format -msgid "" -"Could not contact geolocation servers, please make sure you have a working " -"internet connection (%s)" -msgstr "" - -#. module: partner_geo_assign -#: constraint:ir.model:0 -msgid "" -"The Object name must start with x_ and not contain any special character !" -msgstr "" - -#. module: partner_geo_assign -#: field:res.partner,date_localization:0 -msgid "Geo Localization Date" -msgstr "" - -#. module: partner_geo_assign -#: view:crm.lead:0 -msgid "Geo Assign" -msgstr "" - -#. module: partner_geo_assign -#: field:crm.lead,partner_latitude:0 -#: field:res.partner,partner_latitude:0 -msgid "Geo Latitude" -msgstr "" - -#. module: partner_geo_assign -#: model:ir.model,name:partner_geo_assign.model_crm_lead -msgid "crm.lead" -msgstr "" - -#. module: partner_geo_assign -#: model:ir.model,name:partner_geo_assign.model_res_partner -msgid "Partner" -msgstr "" - -#. module: partner_geo_assign -#: view:crm.lead:0 -msgid "Geo Assignation" -msgstr "" - -#. module: partner_geo_assign -#: view:res.partner:0 -msgid "Geo Localize" -msgstr "" - -#. module: partner_geo_assign -#: field:crm.lead,partner_longitude:0 -#: field:res.partner,partner_longitude:0 -msgid "Geo Longitude" -msgstr "" diff --git a/addons/partner_geo_assign/i18n/fr.po b/addons/partner_geo_assign/i18n/fr.po deleted file mode 100644 index 093542f4993..00000000000 --- a/addons/partner_geo_assign/i18n/fr.po +++ /dev/null @@ -1,116 +0,0 @@ -# Translation of OpenERP Server. -# This file contains the translation of the following modules: -# * partner_geo_assign -# -msgid "" -msgstr "" -"Project-Id-Version: OpenERP Server 6.0dev\n" -"Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2010-08-20 08:40+0000\n" -"PO-Revision-Date: 2010-08-30 12:19+0000\n" -"Last-Translator: <>\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-09-29 05:17+0000\n" -"X-Generator: Launchpad (build Unknown)\n" - -#. module: partner_geo_assign -#: code:addons/partner_geo_assign/partner_geo_assign.py:0 -#, python-format -msgid "Network error" -msgstr "" - -#. module: partner_geo_assign -#: constraint:ir.ui.view:0 -msgid "Invalid XML for View Architecture!" -msgstr "" - -#. module: partner_geo_assign -#: help:res.partner,partner_weight:0 -msgid "" -"Gives the probability to assign a lead to this partner. (0 means no " -"assignation.)" -msgstr "" - -#. module: partner_geo_assign -#: model:ir.module.module,description:partner_geo_assign.module_meta_information -msgid "" -"\n" -"This is the module used by OpenERP SA to redirect customers to his " -"partners,\n" -"based on geolocalization.\n" -" " -msgstr "" - -#. module: partner_geo_assign -#: field:res.partner,partner_weight:0 -msgid "Weight" -msgstr "" - -#. module: partner_geo_assign -#: model:ir.module.module,shortdesc:partner_geo_assign.module_meta_information -msgid "Partner Geo-Localisation" -msgstr "" - -#. module: partner_geo_assign -#: view:res.partner:0 -msgid "Geo Localization" -msgstr "" - -#. module: partner_geo_assign -#: code:addons/partner_geo_assign/partner_geo_assign.py:0 -#, python-format -msgid "" -"Could not contact geolocation servers, please make sure you have a working " -"internet connection (%s)" -msgstr "" - -#. module: partner_geo_assign -#: constraint:ir.model:0 -msgid "" -"The Object name must start with x_ and not contain any special character !" -msgstr "" - -#. module: partner_geo_assign -#: field:res.partner,date_localization:0 -msgid "Geo Localization Date" -msgstr "" - -#. module: partner_geo_assign -#: view:crm.lead:0 -msgid "Geo Assign" -msgstr "" - -#. module: partner_geo_assign -#: field:crm.lead,partner_latitude:0 -#: field:res.partner,partner_latitude:0 -msgid "Geo Latitude" -msgstr "" - -#. module: partner_geo_assign -#: model:ir.model,name:partner_geo_assign.model_crm_lead -msgid "crm.lead" -msgstr "" - -#. module: partner_geo_assign -#: model:ir.model,name:partner_geo_assign.model_res_partner -msgid "Partner" -msgstr "" - -#. module: partner_geo_assign -#: view:crm.lead:0 -msgid "Geo Assignation" -msgstr "" - -#. module: partner_geo_assign -#: view:res.partner:0 -msgid "Geo Localize" -msgstr "" - -#. module: partner_geo_assign -#: field:crm.lead,partner_longitude:0 -#: field:res.partner,partner_longitude:0 -msgid "Geo Longitude" -msgstr "" diff --git a/addons/partner_geo_assign/i18n/it.po b/addons/partner_geo_assign/i18n/it.po deleted file mode 100644 index bcc5ac363a1..00000000000 --- a/addons/partner_geo_assign/i18n/it.po +++ /dev/null @@ -1,128 +0,0 @@ -# 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 <EMAIL@ADDRESS>, 2010. -# -msgid "" -msgstr "" -"Project-Id-Version: openobject-addons\n" -"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" -"POT-Creation-Date: 2010-08-20 08:40+0000\n" -"PO-Revision-Date: 2010-09-29 09:26+0000\n" -"Last-Translator: OpenERP Administrators <Unknown>\n" -"Language-Team: Italian <it@li.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-09-30 04:44+0000\n" -"X-Generator: Launchpad (build Unknown)\n" - -#. module: partner_geo_assign -#: code:addons/partner_geo_assign/partner_geo_assign.py:0 -#, python-format -msgid "Network error" -msgstr "Errore di rete" - -#. module: partner_geo_assign -#: constraint:ir.ui.view:0 -msgid "Invalid XML for View Architecture!" -msgstr "XML non valido per Visualizzare l'architettura!" - -#. module: partner_geo_assign -#: help:res.partner,partner_weight:0 -msgid "" -"Gives the probability to assign a lead to this partner. (0 means no " -"assignation.)" -msgstr "" -"Fornisce la probabilità di assegnare una richesta a questo partner (0 " -"significa nessuna assegnazione)." - -#. module: partner_geo_assign -#: model:ir.module.module,description:partner_geo_assign.module_meta_information -msgid "" -"\n" -"This is the module used by OpenERP SA to redirect customers to his " -"partners,\n" -"based on geolocalization.\n" -" " -msgstr "" -"\n" -"Questo è il modulo usato da OpenERP SA per indirizzare i venditori ai loro " -"partners,\n" -"basandosi sulla geolocalizzazione.\n" -" " - -#. module: partner_geo_assign -#: field:res.partner,partner_weight:0 -msgid "Weight" -msgstr "Peso" - -#. module: partner_geo_assign -#: model:ir.module.module,shortdesc:partner_geo_assign.module_meta_information -msgid "Partner Geo-Localisation" -msgstr "Geo-Localizzazione Partner" - -#. module: partner_geo_assign -#: view:res.partner:0 -msgid "Geo Localization" -msgstr "Geo-Localizzazione" - -#. module: partner_geo_assign -#: code:addons/partner_geo_assign/partner_geo_assign.py:0 -#, python-format -msgid "" -"Could not contact geolocation servers, please make sure you have a working " -"internet connection (%s)" -msgstr "" -"Non è possibile contattare i server per la geo-localizzaziome, per favore " -"assicurarsi di avere una connessione ad internet funzionante (%s)" - -#. module: partner_geo_assign -#: 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: partner_geo_assign -#: field:res.partner,date_localization:0 -msgid "Geo Localization Date" -msgstr "Data Geo-localizzazione" - -#. module: partner_geo_assign -#: view:crm.lead:0 -msgid "Geo Assign" -msgstr "Geo assegnamento" - -#. module: partner_geo_assign -#: field:crm.lead,partner_latitude:0 -#: field:res.partner,partner_latitude:0 -msgid "Geo Latitude" -msgstr "Geo Latitudine" - -#. module: partner_geo_assign -#: model:ir.model,name:partner_geo_assign.model_crm_lead -msgid "crm.lead" -msgstr "crm.lead" - -#. module: partner_geo_assign -#: model:ir.model,name:partner_geo_assign.model_res_partner -msgid "Partner" -msgstr "Partner" - -#. module: partner_geo_assign -#: view:crm.lead:0 -msgid "Geo Assignation" -msgstr "Geo Assegnazione" - -#. module: partner_geo_assign -#: view:res.partner:0 -msgid "Geo Localize" -msgstr "Geo Localizzazione" - -#. module: partner_geo_assign -#: field:crm.lead,partner_longitude:0 -#: field:res.partner,partner_longitude:0 -msgid "Geo Longitude" -msgstr "Geo Longitudine" diff --git a/addons/point_of_sale/__init__.py b/addons/point_of_sale/__init__.py index 88f00077d16..be73103125f 100644 --- a/addons/point_of_sale/__init__.py +++ b/addons/point_of_sale/__init__.py @@ -19,7 +19,7 @@ # ############################################################################## -import pos +import point_of_sale import account_bank_statement import wizard import report diff --git a/addons/point_of_sale/__openerp__.py b/addons/point_of_sale/__openerp__.py index 1c23a27acd1..6e742830148 100644 --- a/addons/point_of_sale/__openerp__.py +++ b/addons/point_of_sale/__openerp__.py @@ -62,18 +62,18 @@ Main features : 'wizard/pos_payment.xml', 'wizard/pos_scan_product_view.xml', 'wizard/pos_return_view.xml', - 'pos_report.xml', - 'pos_view.xml', + 'point_of_sale_report.xml', + 'point_of_sale_view.xml', 'report/report_pos_order_view.xml', 'report/report_cash_register_view.xml', - 'pos_sequence.xml', - 'pos_workflow.xml', - 'statement_view.xml', - 'statement_report.xml', + 'point_of_sale_sequence.xml', + 'point_of_sale_workflow.xml', + 'account_statement_view.xml', + 'account_statement_report.xml', ], - 'demo_xml': ['pos_demo.xml','singer_statement_demo.xml'], - 'test':['test/pos_test.yml', - 'test/pos_report.yml', + 'demo_xml': ['point_of_sale_demo.xml','account_statement_demo.xml'], + 'test': ['test/point_of_sale_test.yml', + 'test/point_of_sale_report.yml', ], 'installable': True, } diff --git a/addons/point_of_sale/account_bank_statement.py b/addons/point_of_sale/account_bank_statement.py index 1d5c833ccbf..9cf50f6d018 100644 --- a/addons/point_of_sale/account_bank_statement.py +++ b/addons/point_of_sale/account_bank_statement.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2008 PC Solutions (<http://pcsol.be>). All Rights Reserved # Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). @@ -16,77 +16,81 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <http://www.gnu.org/licenses/>. # ############################################################################## -from osv import osv -from osv import fields +from osv import fields, osv class account_journal(osv.osv): - _inherit = 'account.journal' _columns = { 'auto_cash': fields.boolean('Automatic Opening', help="This field authorize the automatic creation of the cashbox"), - 'special_journal':fields.boolean('Special Journal', help="Will put all the orders in waiting status till being accepted"), + 'special_journal': fields.boolean('Special Journal', help="Will put all the orders in waiting status till being accepted"), 'check_dtls': fields.boolean('Check Details', help="This field authorize Validation of Cashbox without checking ending details"), - 'journal_users': fields.many2many('res.users','pos_journal_users','journal_id','user_id','Users'), + 'journal_users': fields.many2many('res.users', 'pos_journal_users', 'journal_id', 'user_id', 'Users'), } _defaults = { - 'check_dtls': lambda *a:False, - 'auto_cash': lambda *a:True, + 'check_dtls': False, + 'auto_cash': True, } account_journal() class account_cash_statement(osv.osv): - + _inherit = 'account.bank.statement' - def _equal_balance(self, cr, uid, cash_id, context={}): + def _equal_balance(self, cr, uid, cash_id, context=None): + if context is None: + context = {} statement = self.browse(cr, uid, cash_id, context=context) if not statement.journal_id.check_dtls: return True - if statement.journal_id.check_dtls and (statement.balance_end != statement.balance_end_cash): return False else: - return True - - def _user_allow(self, cr, uid, ids, statement, context={}): + return True + + def _user_allow(self, cr, uid, statement_id, context=None): + if context is None: + context = {} res = False uids = [] + statement = self.browse(cr, uid, statement_id, context=context) for user in statement.journal_id.journal_users: uids.append(user.id) - if uid in uids: res = True - return res - - def _get_cash_open_box_lines(self, cr, uid, context={}): + + def _get_cash_open_box_lines(self, cr, uid, context=None): + if context is None: + context = {} res = super(account_cash_statement,self)._get_cash_open_box_lines(cr, uid, context) curr = [0.01, 0.02, 0.05, 0.10, 0.20, 0.50] for rs in curr: dct = { - 'pieces':rs, - 'number':0 + 'pieces': rs, + 'number': 0 } res.append(dct) res.sort() return res - - def _get_default_cash_close_box_lines(self, cr, uid, context={}): + + def _get_default_cash_close_box_lines(self, cr, uid, context=None): + if context is None: + context = {} res = super(account_cash_statement,self)._get_default_cash_close_box_lines(cr, uid, context) curr = [0.01, 0.02, 0.05, 0.10, 0.20, 0.50] for rs in curr: dct = { - 'pieces':rs, - 'number':0 + 'pieces': rs, + 'number': 0 } res.append(dct) res.sort() return res - + account_cash_statement() -# 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/point_of_sale/singer_statement_demo.xml b/addons/point_of_sale/account_statement_demo.xml index 3862c3c97cb..3862c3c97cb 100644 --- a/addons/point_of_sale/singer_statement_demo.xml +++ b/addons/point_of_sale/account_statement_demo.xml diff --git a/addons/point_of_sale/statement_report.xml b/addons/point_of_sale/account_statement_report.xml index a81d51a2679..a81d51a2679 100644 --- a/addons/point_of_sale/statement_report.xml +++ b/addons/point_of_sale/account_statement_report.xml diff --git a/addons/point_of_sale/statement_view.xml b/addons/point_of_sale/account_statement_view.xml index d400bc35a4b..d400bc35a4b 100644 --- a/addons/point_of_sale/statement_view.xml +++ b/addons/point_of_sale/account_statement_view.xml diff --git a/addons/point_of_sale/statement_wizard.xml b/addons/point_of_sale/account_statement_wizard.xml index 25f099810b4..25f099810b4 100644 --- a/addons/point_of_sale/statement_wizard.xml +++ b/addons/point_of_sale/account_statement_wizard.xml diff --git a/addons/point_of_sale/i18n/sv.po b/addons/point_of_sale/i18n/sv.po index a116ef92915..ff722d6abfd 100644 --- a/addons/point_of_sale/i18n/sv.po +++ b/addons/point_of_sale/i18n/sv.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2010-10-18 17:46+0000\n" -"PO-Revision-Date: 2010-10-24 21:48+0000\n" -"Last-Translator: Magnus Brandt, Aspirix AB <Unknown>\n" +"PO-Revision-Date: 2010-10-25 07:16+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\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-10-25 04:39+0000\n" +"X-Launchpad-Export-Date: 2010-10-26 04:39+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: point_of_sale diff --git a/addons/point_of_sale/pos.py b/addons/point_of_sale/point_of_sale.py index 6429e21c08d..41f3274c667 100644 --- a/addons/point_of_sale/pos.py +++ b/addons/point_of_sale/point_of_sale.py @@ -20,10 +20,11 @@ ############################################################################## import time -import netsvc -from osv import fields, osv from datetime import datetime from dateutil.relativedelta import relativedelta + +import netsvc +from osv import fields, osv from tools.translate import _ from decimal import Decimal import decimal_precision as dp @@ -39,63 +40,55 @@ class pos_config_journal(osv.osv): } pos_config_journal() -class pos_company_discount(osv.osv): +class pos_company_discount(osv.osv): """ Company Discount and Cashboxes """ - _inherit = 'res.company' _columns = { - 'company_discount': fields.float('Max Discount(%)', digits_compute= dp.get_precision('Point Of Sale')), - 'max_diff': fields.float('Max Difference for Cashboxes', digits_compute= dp.get_precision('Point Of Sale Discount')), - } + 'company_discount': fields.float('Max Discount(%)', digits_compute=dp.get_precision('Point Of Sale')), + 'max_diff': fields.float('Max Difference for Cashboxes', digits_compute=dp.get_precision('Point Of Sale Discount')), + } pos_company_discount() class pos_order(osv.osv): - """ Point of sale gives business owners a convenient way of checking out customers and of recording sales """ _name = "pos.order" _description = "Point of Sale" _order = "date_order, create_date desc" - _order = "date_order desc" - def unlink(self, cr, uid, ids, context=None): for rec in self.browse(cr, uid, ids, context=context): for rec_statement in rec.statement_ids: - if (rec_statement.statement_id and rec_statement.statement_id.state=='confirm') or rec.state=='done': + if (rec_statement.statement_id and rec_statement.statement_id.state == 'confirm') or rec.state == 'done': raise osv.except_osv(_('Invalid action !'), _('Cannot delete a point of sale which is closed or contains confirmed cashboxes!')) return super(pos_order, self).unlink(cr, uid, ids, context=context) def onchange_partner_pricelist(self, cr, uid, ids, part, context=None): - """ Changed price list on_change of partner_id""" - if not part: return {} - pricelist = self.pool.get('res.partner').browse(cr, uid, part).property_product_pricelist.id - return {'value':{'pricelist_id': pricelist}} + pricelist = self.pool.get('res.partner').browse(cr, uid, part, context=context).property_product_pricelist.id + return {'value': {'pricelist_id': pricelist}} def _amount_total(self, cr, uid, ids, field_name, arg, context=None): - """ Calculates amount_tax of order line @param field_names: Names of fields. @return: Dictionary of values """ - cr.execute(""" - SELECT - p.id, - COALESCE(SUM( - l.price_unit*l.qty*(1-(l.discount/100.0)))::decimal(16,2), 0 - ) AS amount - FROM pos_order p - LEFT OUTER JOIN pos_order_line l ON (p.id=l.order_id) - WHERE p.id IN %s GROUP BY p.id """,(tuple(ids),)) + SELECT + p.id, + COALESCE(SUM( + l.price_unit*l.qty*(1-(l.discount/100.0)))::decimal(16,2), 0 + ) AS amount + FROM pos_order p + LEFT OUTER JOIN pos_order_line l ON (p.id = l.order_id) + WHERE p.id IN %s GROUP BY p.id """,(tuple(ids),)) res = dict(cr.fetchall()) - for rec in self.browse(cr, uid, ids, context): + for rec in self.browse(cr, uid, ids, context=context): if rec.partner_id \ and rec.partner_id.property_account_position \ and rec.partner_id.property_account_position.tax_ids: @@ -105,81 +98,75 @@ class pos_order(osv.osv): return res def _get_date_payment2(self, cr, uid, ids, context, *a): - # Todo need to check this function """ Find payment Date - @param field_names: Names of fields. @return: Dictionary of values """ - res = {} - val=None + val = None for order in self.browse(cr, uid, ids): - cr.execute("SELECT date_payment FROM pos_order WHERE id=%s", (order.id,)) + cr.execute("SELECT date_payment FROM pos_order WHERE id = %s", (order.id,)) date_p=cr.fetchone() date_p=date_p and date_p[0] or None if date_p: res[order.id]=date_p return res - cr.execute(" SELECT max(l.date) " + cr.execute(" SELECT MAX(l.date) " " FROM account_move_line l, account_move m, account_invoice i, account_move_reconcile r, pos_order o " - " WHERE i.move_id=m.id AND l.move_id=m.id AND l.reconcile_id=r.id AND o.id=%s AND o.invoice_id=i.id", + " WHERE i.move_id = m.id AND l.move_id = m.id AND l.reconcile_id = r.id AND o.id = %s AND o.invoice_id = i.id", (order.id,)) - val=cr.fetchone() - val= val and val[0] or None + val = cr.fetchone() + val = val and val[0] or None if val: - res[order.id]=val + res[order.id] = val return res def _get_date_payment(self, cr, uid, ids, context, *a): - """ Find Validation Date @return: Dictionary of values """ - res = {} - val=None + val = None for order in self.browse(cr, uid, ids): - cr.execute("SELECT date_validation FROM pos_order WHERE id=%s", (order.id,)) - date_p=cr.fetchone() - date_p=date_p and date_p[0] or None + cr.execute("SELECT date_validation FROM pos_order WHERE id = %s", (order.id,)) + date_p = cr.fetchone() + date_p = date_p and date_p[0] or None if date_p: - res[order.id]=date_p + res[order.id] = date_p return res - discount_allowed=order.company_id.company_discount + discount_allowed = order.company_id.company_discount for line in order.lines: if line.discount > discount_allowed: return {order.id: None } if order.amount_paid == order.amount_total and not date_p: - cr.execute("SELECT MAX(date) FROM account_bank_statement_line WHERE pos_statement_id=%s", (order.id,)) - val=cr.fetchone() - val=val and val[0] or None + cr.execute("SELECT MAX(date) FROM account_bank_statement_line WHERE pos_statement_id = %s", (order.id,)) + val = cr.fetchone() + val = val and val[0] or None if order.invoice_id and order.invoice_id.move_id and not date_p and not val: for o in order.invoice_id.move_id.line_id: - if o.balance==0: - if val<o.date_created: - val=o.date_created + if o.balance == 0: + if val < o.date_created: + val = o.date_created if val: - res[order.id]=val + res[order.id] = val return res def _amount_all(self, cr, uid, ids, name, args, context=None): tax_obj = self.pool.get('account.tax') cur_obj = self.pool.get('res.currency') - res={} - for order in self.browse(cr, uid, ids): + res = {} + for order in self.browse(cr, uid, ids, context=context): res[order.id] = { 'amount_paid': 0.0, 'amount_return':0.0, 'amount_tax':0.0, } - val=0.0 - cur_obj = self.pool.get('res.currency') + val = 0.0 cur = order.pricelist_id.currency_id for payment in order.statement_ids: res[order.id]['amount_paid'] += payment.amount res[order.id]['amount_return'] += (payment.amount < 0 and payment.amount or 0) for line in order.lines: - if order.price_type!='tax_excluded': + if order.price_type != 'tax_excluded': res[order.id]['amount_tax'] = reduce(lambda x, y: x+round(y['amount'], 2), tax_obj.compute_inv(cr, uid, line.product_id.taxes_id, line.price_unit * \ @@ -191,31 +178,19 @@ class pos_order(osv.osv): res[order.id]['amount_tax'] = cur_obj.round(cr, uid, cur, val) return res - - - def _sale_journal_get(self, cr, uid, context): - + def _sale_journal_get(self, cr, uid, context=None): """ To get sale journal for this order" @return: journal """ - journal_obj = self.pool.get('account.journal') - res = journal_obj.search(cr, uid, - [('type', '=', 'sale')], limit=1) - if res: - return res[0] - else: - return False - - def _shop_get(self, cr, uid, context): + res = journal_obj.search(cr, uid, [('type', '=', 'sale')], limit=1) + return res and res[0] or False + def _shop_get(self, cr, uid, context=None): """ To get Shop for this order" @return: Shop id """ - res = self.pool.get('sale.shop').search(cr, uid, []) - if res: - return res[0] - else: - return False + return res and res[0] or False + def copy(self, cr, uid, id, default=None, context=None): if not default: default = {} @@ -225,39 +200,37 @@ class pos_order(osv.osv): 'invoice_id': False, 'account_move': False, 'picking_id': False, - 'statement_ids':[], + 'statement_ids': [], 'nb_print': 0, 'pickings': [] }) - return super(pos_order, self).copy(cr, uid, id, default, context) - - def _get_v( self, cr, uid, ids,*a): + return super(pos_order, self).copy(cr, uid, id, default, context=context) + def _get_v( self, cr, uid, ids, *a): """ Changed the Validation state of order @return: State """ - res_obj = self.pool.get('res.users') - company_disc=self.browse(cr,uid,ids) + company_disc = self.browse(cr, uid, ids) + list_jrnl = [] + r = {} if not company_disc: - comp=res_obj.browse(cr,uid,uid).company_id.company_discount or 0.0 + comp = res_obj.browse(cr, uid, uid).company_id.company_discount or 0.0 else: - comp= company_disc[0] and company_disc[0].company_id and company_disc[0].company_id.company_discount or 0.0 - cr.execute("select discount from pos_order_line where order_id=%s and discount <= %s", (ids[0],comp)) - res=cr.fetchone() - cr.execute("select discount from pos_order_line where order_id=%s and discount > %s", (ids[0],comp)) - res2=cr.fetchone() - cr.execute("select journal_id from account_bank_statement_line where pos_statement_id=%s ", (ids[0],)) - res3=cr.fetchall() - list_jrnl=[] + comp = company_disc[0] and company_disc[0].company_id and company_disc[0].company_id.company_discount or 0.0 + cr.execute("SELECT discount FROM pos_order_line WHERE order_id = %s AND discount <= %s", (ids[0], comp)) + res = cr.fetchone() + cr.execute("SELECT discount FROM pos_order_line WHERE order_id = %s AND discount > %s", (ids[0], comp)) + res2 = cr.fetchone() + cr.execute("SELECT journal_id FROM account_bank_statement_line WHERE pos_statement_id = %s ", (ids[0], )) + res3 = cr.fetchall() for r in res3: - cr.execute("select id from account_journal where name= '%s' and special_journal='t'", (r[0],)) - res3=cr.fetchone() - is_special=res3 and res3[0] or None + cr.execute("SELECT id FROM account_journal WHERE name = '%s' AND special_journal = 't'", (r[0], )) + res3 = cr.fetchone() + is_special = res3 and res3[0] or None if is_special: list_jrnl.append(is_special) - r = {} for order in self.browse(cr, uid, ids): - if order.state in ('paid','done','invoiced') and res and not res2 and not len(list_jrnl): + if order.state in ('paid', 'done', 'invoiced') and res and not res2 and not len(list_jrnl): r[order.id] = 'accepted' return r @@ -269,8 +242,8 @@ class pos_order(osv.osv): 'shop_id': fields.many2one('sale.shop', 'Shop', required=True, states={'draft': [('readonly', False)]}, readonly=True), 'date_order': fields.datetime('Date Ordered', readonly=True), - 'date_validation': fields.function(_get_date_payment, method=True, string='Validation Date', type='date', store=True), - 'date_payment': fields.function(_get_date_payment2, method=True, string='Payment Date', type='date', store=True), + 'date_validation': fields.function(_get_date_payment, method=True, string='Validation Date', type='date', store=True), + 'date_payment': fields.function(_get_date_payment2, method=True, string='Payment Date', type='date', store=True), 'date_validity': fields.date('Validity Date', required=True), 'user_id': fields.many2one('res.users', 'Connected Salesman', help="Person who uses the the register. It could be a reliever, a student or an interim employee."), 'user_salesman_id': fields.many2one('res.users', 'Cashier', required=True, help="User who is logged into the system."), @@ -281,15 +254,19 @@ class pos_order(osv.osv): 'amount_return': fields.function(_amount_all, 'Returned', method=True, digits_compute=dp.get_precision('Point Of Sale'), multi='all'), 'lines': fields.one2many('pos.order.line', 'order_id', 'Order Lines', states={'draft': [('readonly', False)]}, readonly=True), 'price_type': fields.selection([ - ('tax_excluded','Tax excluded') - ], 'Price method', required=True), - 'statement_ids': fields.one2many('account.bank.statement.line','pos_statement_id','Payments',states={'draft': [('readonly', False)]},readonly=True), + ('tax_excluded','Tax excluded')], + 'Price method', required=True), + 'statement_ids': fields.one2many('account.bank.statement.line', 'pos_statement_id', 'Payments', states={'draft': [('readonly', False)]}, readonly=True), 'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', required=True, states={'draft': [('readonly', False)]}, readonly=True), - 'partner_id': fields.many2one( 'res.partner', 'Customer', change_default=True, select=1, states={'draft': [('readonly', False)], 'paid': [('readonly', False)]}), - 'state': fields.selection([('draft', 'Quotation'), ('payment', 'Payment'), - ('advance','Advance'), - ('paid', 'Paid'), ('done', 'Done'), ('invoiced', 'Invoiced'), ('cancel', 'Cancel')], - 'State', readonly=True, ), + 'partner_id': fields.many2one('res.partner', 'Customer', change_default=True, select=1, states={'draft': [('readonly', False)], 'paid': [('readonly', False)]}), + 'state': fields.selection([('draft', 'Quotation'), + ('payment', 'Payment'), + ('advance','Advance'), + ('paid', 'Paid'), + ('done', 'Done'), + ('invoiced', 'Invoiced'), + ('cancel', 'Cancel')], + 'State', readonly=True), 'invoice_id': fields.many2one('account.invoice', 'Invoice'), 'account_move': fields.many2one('account.move', 'Account Entry', readonly=True), 'pickings': fields.one2many('stock.picking', 'pos_order', 'Picking', readonly=True), @@ -297,27 +274,23 @@ class pos_order(osv.osv): 'first_name': fields.char('First Name', size=64), 'note': fields.text('Internal Notes'), 'nb_print': fields.integer('Number of Print', readonly=True), - 'sale_journal': fields.many2one('account.journal', 'Journal', required=True, states={'draft': [('readonly', False)]}, readonly=True, ), + 'sale_journal': fields.many2one('account.journal', 'Journal', required=True, states={'draft': [('readonly', False)]}, readonly=True), 'invoice_wanted': fields.boolean('Create Invoice'), - 'note_2': fields.char('Customer Note',size=64), - 'type_rec': fields.char('Type of Receipt',size=64), + 'note_2': fields.char('Customer Note', size=64), + 'type_rec': fields.char('Type of Receipt', size=64), 'remboursed': fields.boolean('Remboursed'), 'contract_number': fields.char('Contract Number', size=512, select=1), 'journal_entry': fields.boolean('Journal Entry'), } - def _select_pricelist(self, cr, uid, context): - + def _select_pricelist(self, cr, uid, context=None): """ To get default pricelist for the order" @param name: Names of fields. @return: pricelist ID """ - pricelist = self.pool.get('product.pricelist').search(cr, uid, [('name', '=', 'Public Pricelist')]) - if pricelist: - return pricelist[0] - else: - return False + pricelist = self.pool.get('product.pricelist').search(cr, uid, [('name', '=', 'Public Pricelist')], context=context) + return pricelist and pricelist[0] or False def _journal_default(self, cr, uid, context=None): """ To get default pricelist for the order" @@ -325,24 +298,21 @@ class pos_order(osv.osv): @return: journal ID """ journal_list = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'cash')]) - if journal_list: - return journal_list[0] - else: - return False + return journal_list and journal_list[0] or False _defaults = { 'user_salesman_id':lambda self, cr, uid, context: uid, 'user_id': lambda self, cr, uid, context: uid, 'sale_manager': lambda self, cr, uid, context: uid, - 'state': lambda *a: 'draft', - 'price_type': lambda *a: 'tax_excluded', + 'state': 'draft', + 'price_type': 'tax_excluded', 'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'pos.order'), - 'date_order': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'), + 'date_order': time.strftime('%Y-%m-%d %H:%M:%S'), 'date_validity': lambda *a: (datetime.today() + relativedelta(months=+6)).strftime('%Y-%m-%d'), - 'nb_print': lambda *a: 0, + 'nb_print': 0, 'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id, 'sale_journal': _sale_journal_get, - 'invoice_wanted': lambda *a: False, + 'invoice_wanted': False, 'shop_id': _shop_get, 'pricelist_id': _select_pricelist, } @@ -364,22 +334,19 @@ class pos_order(osv.osv): return True def test_paid(self, cr, uid, ids, context=None): - """ Test all amount is paid for this order @return: True """ - for order in self.browse(cr, uid, ids, context): + for order in self.browse(cr, uid, ids, context=context): if order.lines and not order.amount_total: return True if (not order.lines) or (not order.statement_ids) or \ - Decimal(str(order.amount_total))!=Decimal(str(order.amount_paid)): + Decimal(str(order.amount_total)) != Decimal(str(order.amount_paid)): return False return True def _get_qty_differences(self, orders, old_picking): - """check if the customer changed the product quantity """ - order_dict = {} for order in orders: for line in order.lines: @@ -401,9 +368,7 @@ class pos_order(osv.osv): return diff_dict def _split_picking(self, cr, uid, ids, context, old_picking, diff_dict): - """if the customer changes the product quantity, split the picking in two""" - # create a copy of the original picking and adjust the product qty: picking_model = self.pool.get('stock.picking') defaults = { @@ -412,7 +377,7 @@ class pos_order(osv.osv): } new_picking_id = picking_model.copy(cr, uid, old_picking.id, defaults) # state = 'draft' - new_picking = picking_model.browse(cr, uid, new_picking_id, context) + new_picking = picking_model.browse(cr, uid, new_picking_id, context=context) for line in new_picking.move_lines: p_id = line.product_id.id @@ -442,17 +407,16 @@ class pos_order(osv.osv): def create_picking(self, cr, uid, ids, context=None): """Create a picking for each order and validate it.""" - picking_obj = self.pool.get('stock.picking') - property_obj=self.pool.get("ir.property") + property_obj = self.pool.get("ir.property") move_obj=self.pool.get('stock.move') - pick_name=self.pool.get('ir.sequence').get(cr, uid, 'stock.picking.out') - orders = self.browse(cr, uid, ids, context) + pick_name = self.pool.get('ir.sequence').get(cr, uid, 'stock.picking.out') + orders = self.browse(cr, uid, ids, context=context) for order in orders: if not order.picking_id: new = True picking_id = picking_obj.create(cr, uid, { - 'name':pick_name, + 'name': pick_name, 'origin': order.name, 'type': 'out', 'state': 'draft', @@ -461,12 +425,12 @@ class pos_order(osv.osv): 'invoice_state': 'none', 'auto_picking': True, 'pos_order': order.id, - }) - self.write(cr, uid, [order.id], {'picking_id': picking_id}) + }, context=context) + self.write(cr, uid, [order.id], {'picking_id': picking_id}, context=context) else: picking_id = order.picking_id.id - picking_obj.write(cr, uid, [picking_id], {'auto_picking': True}) - picking = picking_obj.browse(cr, uid, [picking_id], context)[0] + picking_obj.write(cr, uid, [picking_id], {'auto_picking': True}, context=context) + picking = picking_obj.browse(cr, uid, [picking_id], context=context)[0] new = False # split the picking (if product quantity has changed): @@ -476,13 +440,13 @@ class pos_order(osv.osv): if new: for line in order.lines: - if line.product_id and line.product_id.type=='service': + if line.product_id and line.product_id.type == 'service': continue - prop_ids = property_obj.search(cr, uid, [('name', '=', 'property_stock_customer')]) - val = property_obj.browse(cr, uid, prop_ids[0]).value_reference - cr.execute("select s.id from stock_location s, stock_warehouse w where w.lot_stock_id=s.id and w.id=%s", (order.shop_id.warehouse_id.id,)) - res=cr.fetchone() - location_id=res and res[0] or None + prop_ids = property_obj.search(cr, uid, [('name', '=', 'property_stock_customer')], context=context) + val = property_obj.browse(cr, uid, prop_ids[0], context=context).value_reference + cr.execute("SELECT s.id FROM stock_location s, stock_warehouse w WHERE w.lot_stock_id = s.id AND w.id = %s", (order.shop_id.warehouse_id.id, )) + res = cr.fetchone() + location_id = res and res[0] or None stock_dest_id = val.id if line.qty < 0: location_id, stock_dest_id = stock_dest_id, location_id @@ -500,37 +464,33 @@ class pos_order(osv.osv): 'state': 'waiting', 'location_id': location_id, 'location_dest_id': stock_dest_id, - }) + }, context=context) wf_service = netsvc.LocalService("workflow") wf_service.trg_validate(uid, 'stock.picking', picking_id, 'button_confirm', cr) - self.pool.get('stock.picking').force_assign(cr, uid, [picking_id], context) + picking_obj.force_assign(cr, uid, [picking_id], context) return True def set_to_draft(self, cr, uid, ids, *args): - """ Changes order state to draft @return: True """ if not len(ids): return False - self.write(cr, uid, ids, {'state': 'draft'}) - wf_service = netsvc.LocalService("workflow") for i in ids: wf_service.trg_create(uid, 'pos.order', i, cr) return True def button_invalidate(self, cr, uid, ids, *args): - """ Check the access for the sale order @return: True """ res_obj = self.pool.get('res.company') try: - part_company=res_obj.browse(cr,uid,uid) and res_obj.browse(cr,uid,uid).parent_id and res_obj.browse(cr,uid,uid).parent_id.id or None + part_company = res_obj.browse(cr, uid, uid) and res_obj.browse(cr, uid, uid).parent_id and res_obj.browse(cr, uid, uid).parent_id.id or None except Exception: raise osv.except_osv(_('Error'), _('You don\'t have enough access to validate this sale!')) if part_company: @@ -538,42 +498,39 @@ class pos_order(osv.osv): return True def cancel_order(self, cr, uid, ids, context=None): - """ Changes order state to cancel @return: True """ - self.write(cr, uid, ids, {'state': 'cancel'}) + self.write(cr, uid, ids, {'state': 'cancel'}, context=context) self.cancel_picking(cr, uid, ids, context=context) return True def add_payment(self, cr, uid, order_id, data, context=None): - """Create a new payment for the order""" - statement_obj= self.pool.get('account.bank.statement') - statementl_obj = self.pool.get('account.bank.statement.line') + statement_line_obj = self.pool.get('account.bank.statement.line') prod_obj = self.pool.get('product.product') - property_obj=self.pool.get('ir.property') - curr_c=self.pool.get('res.users').browse(cr, uid, uid).company_id - curr_company=curr_c.id - order = self.browse(cr, uid, order_id, context) + property_obj = self.pool.get('ir.property') + curr_c = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id + curr_company = curr_c.id + order = self.browse(cr, uid, order_id, context=context) if not order.num_sale and data['num_sale']: - self.write(cr,uid,order_id,{'num_sale': data['num_sale']}) - ids_new=[] + self.write(cr, uid, order_id, {'num_sale': data['num_sale']}, context=context) + ids_new = [] args = { 'amount': data['amount'], } if 'payment_date' in data.keys(): args['date'] = data['payment_date'] if 'payment_name' in data.keys(): - args['name'] = data['payment_name'] + ' ' +order.name + args['name'] = data['payment_name'] + ' ' + order.name account_def = property_obj.get(cr, uid, 'property_account_receivable', 'res.partner', context=context) args['account_id'] = order.partner_id and order.partner_id.property_account_receivable and order.partner_id.property_account_receivable.id or account_def.id or curr_c.account_receivable.id - if data.get('is_acc',False): + if data.get('is_acc', False): args['is_acc'] = data['is_acc'] - args['account_id']= prod_obj.browse(cr,uid, data['product_id']).property_account_income and prod_obj.browse(cr,uid, data['product_id']).property_account_income.id + args['account_id'] = prod_obj.browse(cr, uid, data['product_id'], context=context).property_account_income and prod_obj.browse(cr, uid, data['product_id'], context=context).property_account_income.id if not args['account_id']: - raise osv.except_osv(_('Error'), _('Please provide an account for the product: %s')%(prod_obj.browse(cr,uid, data['product_id']).name)) + raise osv.except_osv(_('Error'), _('Please provide an account for the product: %s')%(prod_obj.browse(cr, uid, data['product_id'], context=context).name)) args['partner_id'] = order.partner_id and order.partner_id.id or None args['ref'] = order.contract_number or None @@ -581,15 +538,15 @@ class pos_order(osv.osv): ('journal_id', '=', data['journal']), ('company_id', '=', curr_company), ('user_id', '=', uid), - ('state', '=', 'open')]) - if len(statement_id)==0: + ('state', '=', 'open')], context=context) + if len(statement_id) == 0: raise osv.except_osv(_('Error !'), _('You have to open at least one cashbox')) if statement_id: - statement_id=statement_id[0] - args['statement_id']= statement_id - args['pos_statement_id']= order_id - args['journal_id']= data['journal'] - statementl_obj.create(cr, uid, args) + statement_id = statement_id[0] + args['statement_id'] = statement_id + args['pos_statement_id'] = order_id + args['journal_id'] = data['journal'] + statement_line_obj.create(cr, uid, args, context=context) ids_new.append(statement_id) wf_service = netsvc.LocalService("workflow") @@ -599,9 +556,7 @@ class pos_order(osv.osv): return statement_id def add_product(self, cr, uid, order_id, product_id, qty, context=None): - """Create a new order line the order""" - line_obj = self.pool.get('pos.order.line') values = self.read(cr, uid, order_id, ['partner_id', 'pricelist_id']) @@ -616,10 +571,9 @@ class pos_order(osv.osv): 'product_id': product_id, 'qty': qty, 'price_unit': price, - }) + }, context=context) wf_service = netsvc.LocalService("workflow") wf_service.trg_write(uid, 'pos.order', order_id, cr) - return order_line_id, price def refund(self, cr, uid, ids, context=None): @@ -627,7 +581,7 @@ class pos_order(osv.osv): clone_list = [] line_obj = self.pool.get('pos.order.line') - for order in self.browse(cr, uid, ids): + for order in self.browse(cr, uid, ids, context=context): clone_id = self.copy(cr, uid, order.id, { 'name': order.name + ' REFUND', 'date_order': time.strftime('%Y-%m-%d'), @@ -636,26 +590,25 @@ class pos_order(osv.osv): 'invoice_id': False, 'nb_print': 0, 'statement_ids': False, - }) + }, context=context) clone_list.append(clone_id) - for clone in self.browse(cr, uid, clone_list): + for clone in self.browse(cr, uid, clone_list, context=context): for order_line in clone.lines: line_obj.write(cr, uid, [order_line.id], { 'qty': -order_line.qty - }) + }, context=context) return clone_list def action_invoice(self, cr, uid, ids, context=None): """Create a invoice of order """ - inv_ref = self.pool.get('account.invoice') inv_line_ref = self.pool.get('account.invoice.line') - product_obj= self.pool.get('product.product') + product_obj = self.pool.get('product.product') inv_ids = [] - for order in self.pool.get('pos.order').browse(cr, uid, ids, context): + for order in self.pool.get('pos.order').browse(cr, uid, ids, context=context): if order.invoice_id: inv_ids.append(order.invoice_id.id) continue @@ -663,12 +616,12 @@ class pos_order(osv.osv): if not order.partner_id: raise osv.except_osv(_('Error'), _('Please provide a partner for the sale.')) - acc= order.partner_id.property_account_receivable.id + acc = order.partner_id.property_account_receivable.id inv = { 'name': 'Invoice from POS: '+order.name, 'origin': order.name, - 'account_id':acc, - 'journal_id':order.sale_journal.id or None, + 'account_id': acc, + 'journal_id': order.sale_journal.id or None, 'type': 'out_invoice', 'reference': order.name, 'partner_id': order.partner_id.id, @@ -677,9 +630,9 @@ class pos_order(osv.osv): inv.update(inv_ref.onchange_partner_id(cr, uid, [], 'out_invoice', order.partner_id.id)['value']) if not inv.get('account_id', None): inv['account_id'] = acc - inv_id = inv_ref.create(cr, uid, inv, context) + inv_id = inv_ref.create(cr, uid, inv, context=context) - self.write(cr, uid, [order.id], {'invoice_id': inv_id, 'state': 'invoiced'}) + self.write(cr, uid, [order.id], {'invoice_id': inv_id, 'state': 'invoiced'}, context=context) inv_ids.append(inv_id) for line in order.lines: inv_line = { @@ -697,10 +650,9 @@ class pos_order(osv.osv): inv_line['discount'] = line.discount inv_line['account_id'] = acc inv_line['name'] = inv_name - inv_line['invoice_line_tax_id'] = ('invoice_line_tax_id' in inv_line)\ and [(6, 0, inv_line['invoice_line_tax_id'])] or [] - inv_line_ref.create(cr, uid, inv_line, context) + inv_line_ref.create(cr, uid, inv_line, context=context) for i in inv_ids: wf_service = netsvc.LocalService("workflow") @@ -708,9 +660,7 @@ class pos_order(osv.osv): return inv_ids def create_account_move(self, cr, uid, ids, context=None): - """Create a account move line of order """ - account_move_obj = self.pool.get('account.move') account_move_line_obj = self.pool.get('account.move.line') account_period_obj = self.pool.get('account.period') @@ -720,9 +670,9 @@ class pos_order(osv.osv): period = account_period_obj.find(cr, uid, context=context)[0] for order in self.browse(cr, uid, ids, context=context): - curr_c =res_obj.browse(cr, uid, uid).company_id + curr_c = res_obj.browse(cr, uid, uid).company_id comp_id = res_obj.browse(cr, order.user_id.id, order.user_id.id).company_id - comp_id=comp_id and comp_id.id or False + comp_id = comp_id and comp_id.id or False to_reconcile = [] group_tax = {} account_def = property_obj.get(cr, uid, 'property_account_receivable', 'res.partner', context=context).id @@ -737,10 +687,9 @@ class pos_order(osv.osv): # Create an move for each order line for line in order.lines: - tax_amount = 0 taxes = [t for t in line.product_id.taxes_id] - if order.price_type=='tax_excluded': + if order.price_type == 'tax_excluded': computed_taxes = account_tax_obj.compute_all( cr, uid, taxes, line.price_unit, line.qty)['taxes'] else: @@ -757,7 +706,7 @@ class pos_order(osv.osv): group_tax[group_key] += round(tax['amount'], 2) else: group_tax[group_key] = round(tax['amount'], 2) - if order.price_type!='tax_excluded': + if order.price_type != 'tax_excluded': amount = line.price_subtotal - tax_amount else: amount = line.price_subtotal @@ -775,7 +724,6 @@ class pos_order(osv.osv): 'account defined for this product: "%s" (id:%d)') \ % (line.product_id.name, line.product_id.id, )) - # Empty the tax list as long as there is no tax code: tax_code_id = False tax_amount = 0 @@ -797,7 +745,7 @@ class pos_order(osv.osv): 'date': order.date_order[:10], 'ref': order.contract_number or order.name, 'quantity': line.qty, - 'product_id':line.product_id.id, + 'product_id': line.product_id.id, 'move_id': move_id, 'account_id': income_account, 'company_id': comp_id, @@ -821,7 +769,7 @@ class pos_order(osv.osv): continue account_move_line_obj.create(cr, uid, { - 'name': "bb"+order.name, + 'name': "bb" + order.name, 'date': order.date_order[:10], 'ref': order.contract_number or order.name, 'product_id':line.product_id.id, @@ -842,13 +790,13 @@ class pos_order(osv.osv): (tax_code_pos, base_code_pos, account_pos)= (0, 1, 2) for key, amount in group_tax.items(): account_move_line_obj.create(cr, uid, { - 'name':"cc"+order.name, + 'name': "cc" + order.name, 'date': order.date_order[:10], 'ref': order.contract_number or order.name, 'move_id': move_id, 'company_id': comp_id, 'quantity': line.qty, - 'product_id':line.product_id.id, + 'product_id': line.product_id.id, 'account_id': key[account_pos], 'credit': ((amount>0) and amount) or 0.0, 'debit': ((amount<0) and -amount) or 0.0, @@ -860,15 +808,15 @@ class pos_order(osv.osv): # counterpart to_reconcile.append(account_move_line_obj.create(cr, uid, { - 'name': "dd"+order.name, + 'name': "dd" + order.name, 'date': order.date_order[:10], 'ref': order.contract_number or order.name, 'move_id': move_id, 'company_id': comp_id, 'account_id': order_account, - 'credit': ((order.amount_total<0) and -order.amount_total)\ + 'credit': ((order.amount_total < 0) and -order.amount_total)\ or 0.0, - 'debit': ((order.amount_total>0) and order.amount_total)\ + 'debit': ((order.amount_total > 0) and order.amount_total)\ or 0.0, 'journal_id': order.sale_journal.id, 'period_id': period, @@ -882,7 +830,6 @@ class pos_order(osv.osv): _('There is no receivable account defined for this journal:'\ ' "%s" (id:%d)') % (order.sale_journal.name, order.sale_journal.id, )) for payment in order.statement_ids: - # Create one entry for the payment if payment.is_acc: continue @@ -903,23 +850,24 @@ class pos_order(osv.osv): }) account_move_line_obj.copy(cr, uid, s.id, { 'statement_id': False, - 'account_id':order_account + 'account_id': order_account }) - self.write(cr,uid,order.id,{'state':'done'}) + self.write(cr, uid, order.id, {'state':'done'}, context=context) return True def cancel_picking(self, cr, uid, ids, context=None): + stock_picking_obj = self.pool.get('stock.picking') for order in self.browse(cr, uid, ids, context=context): for picking in order.pickings: - self.pool.get('stock.picking').unlink(cr, uid, [picking.id], context) + stock_picking_obj.unlink(cr, uid, [picking.id], context=context) return True def action_payment(self, cr, uid, ids, context=None): vals = {'state': 'payment'} - sequence_obj=self.pool.get('ir.sequence') - for pos in self.browse(cr, uid, ids): + sequence_obj = self.pool.get('ir.sequence') + for pos in self.browse(cr, uid, ids, context=context): create_contract_nb = False for line in pos.lines: if line.product_id.product_type == 'MD': @@ -927,21 +875,21 @@ class pos_order(osv.osv): break if create_contract_nb: seq = sequence_obj.get(cr, uid, 'pos.user_%s' % pos.user_salesman_id.login) - vals['contract_number'] ='%s-%s' % (pos.user_salesman_id.login, seq) - self.write(cr, uid, ids, vals) + vals['contract_number'] = '%s-%s' % (pos.user_salesman_id.login, seq) + self.write(cr, uid, ids, vals, context=context) def action_paid(self, cr, uid, ids, context=None): if not context: context = {} - if context.get('flag',False): + if context.get('flag', False): self.create_picking(cr, uid, ids, context=None) - self.write(cr, uid, ids, {'state': 'paid'}) + self.write(cr, uid, ids, {'state': 'paid'}, context=context) else: - context['flag']=True + context['flag'] = True return True def action_cancel(self, cr, uid, ids, context=None): - self.write(cr, uid, ids, {'state': 'cancel'}) + self.write(cr, uid, ids, {'state': 'cancel'}, context=context) return True def action_done(self, cr, uid, ids, context=None): @@ -951,12 +899,12 @@ class pos_order(osv.osv): return True def compute_state(self, cr, uid, id): - cr.execute("select act.id, act.name from wkf_activity act " - "inner join wkf_workitem item on act.id=item.act_id " - "inner join wkf_instance inst on item.inst_id=inst.id " - "inner join wkf on inst.wkf_id=wkf.id " - "where wkf.osv='pos.order' and inst.res_id=%s " - "order by act.name", (id,)) + cr.execute("SELECT act.id, act.name FROM wkf_activity act " + "INNER JOIN wkf_workitem item ON act.id = item.act_id " + "INNER JOIN wkf_instance inst ON item.inst_id = inst.id " + "INNER JOIN wkf ON inst.wkf_id = wkf.id " + "WHERE wkf.osv = 'pos.order' AND inst.res_id = %s " + "ORDER BY act.name", (id, )) return [name for id, name in cr.fetchall()] pos_order() @@ -964,7 +912,7 @@ pos_order() class account_bank_statement(osv.osv): _inherit = 'account.bank.statement' _columns= { - 'user_id': fields.many2one('res.users',ondelete='cascade',string='User', readonly=True), + 'user_id': fields.many2one('res.users', ondelete='cascade', string='User', readonly=True), } _defaults = { 'user_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).id @@ -980,9 +928,9 @@ class account_bank_statement_line(osv.osv): return res _columns= { 'journal_id': fields.function(_get_statement_journal, method=True,store=True, string='Journal', type='char', size=64), - 'am_out':fields.boolean("To count"), - 'is_acc':fields.boolean("Is accompte"), - 'pos_statement_id': fields.many2one('pos.order',ondelete='cascade'), + 'am_out': fields.boolean("To count"), + 'is_acc': fields.boolean("Is accompte"), + 'pos_statement_id': fields.many2one('pos.order', ondelete='cascade'), } account_bank_statement_line() @@ -990,18 +938,18 @@ class pos_order_line(osv.osv): _name = "pos.order.line" _description = "Lines of Point of Sale" - def _get_amount(self, cr, uid, ids, field_name, arg, context): + def _get_amount(self, cr, uid, ids, field_name, arg, context=None): res = {} - for line in self.browse(cr, uid, ids): + for line in self.browse(cr, uid, ids, context=context): price = self.price_by_product(cr, uid, ids, line.order_id.pricelist_id.id, line.product_id.id, line.qty, line.order_id.partner_id.id) - res[line.id]=price + res[line.id] = price return res - def _amount_line_ttc(self, cr, uid, ids, field_name, arg, context): + def _amount_line_ttc(self, cr, uid, ids, field_name, arg, context=None): res = dict.fromkeys(ids, 0.0) account_tax_obj = self.pool.get('account.tax') self.price_by_product_multi(cr, uid, ids) - for line in self.browse(cr, uid, ids): + for line in self.browse(cr, uid, ids, context=context): tax_amount = 0.0 taxes = [t for t in line.product_id.taxes_id] if line.qty == 0.0: @@ -1009,27 +957,25 @@ class pos_order_line(osv.osv): computed_taxes = account_tax_obj.compute_all(cr, uid, taxes, line.price_unit, line.qty)['taxes'] for tax in computed_taxes: tax_amount += tax['amount'] - if line.discount!=0.0: + if line.discount != 0.0: res[line.id] = line.price_unit * line.qty * (1 - (line.discount or 0.0) / 100.0) else: - res[line.id]=line.price_unit*line.qty + res[line.id] = line.price_unit*line.qty res[line.id] = res[line.id] + tax_amount return res - def _amount_line(self, cr, uid, ids, field_name, arg, context): + def _amount_line(self, cr, uid, ids, field_name, arg, context=None): res = {} - self.price_by_product_multi(cr, uid, ids) - for line in self.browse(cr, uid, ids): + for line in self.browse(cr, uid, ids, context=context): if line.discount!=0.0: res[line.id] = line.price_unit * line.qty * (1 - (line.discount or 0.0) / 100.0) else: - res[line.id]=line.price_unit*line.qty + res[line.id] = line.price_unit * line.qty return res def _amount_line_all(self, cr, uid, ids, field_names, arg, context): res = dict([(i, {}) for i in ids]) - account_tax_obj = self.pool.get('account.tax') self.price_by_product_multi(cr, uid, ids) @@ -1059,9 +1005,7 @@ class pos_order_line(osv.osv): def price_by_product_multi(self, cr, uid, ids, context=None): if context is None: context = {} - res = {}.fromkeys(ids, 0.0) - lines = self.browse(cr, uid, ids, context=context) pricelist_ids = [line.order_id.pricelist_id.id for line in lines] @@ -1105,10 +1049,10 @@ class pos_order_line(osv.osv): raise osv.except_osv(_('No Pricelist !'), _('You have to select a pricelist in the sale form !\n' \ 'Please set one before choosing a product.')) - p_obj = self.pool.get('product.product').browse(cr,uid,[product_id])[0] + p_obj = self.pool.get('product.product').browse(cr, uid, [product_id])[0] uom_id = p_obj.uom_po_id.id price = self.pool.get('product.pricelist').price_get(cr, uid, - [pricelist], product_id, qty or 1.0, partner_id,{'uom': uom_id})[pricelist] + [pricelist], product_id, qty or 1.0, partner_id, {'uom': uom_id})[pricelist] unit_price=price or p_obj.list_price if unit_price is False: raise osv.except_osv(_('No valid pricelist line found !'), @@ -1119,38 +1063,38 @@ class pos_order_line(osv.osv): def onchange_product_id(self, cr, uid, ids, pricelist, product_id, qty=0, partner_id=False): price = self.price_by_product(cr, uid, ids, pricelist, product_id, qty, partner_id) - self.write(cr,uid,ids,{'price_unit':price}) + self.write(cr, uid, ids, {'price_unit':price}) pos_stot = (price * qty) - return {'value': {'price_unit': price,'price_subtotal_incl': pos_stot}} + return {'value': {'price_unit': price, 'price_subtotal_incl': pos_stot}} - def onchange_subtotal(self, cr, uid, ids, discount, price, pricelist,qty,partner_id, product_id,*a): + def onchange_subtotal(self, cr, uid, ids, discount, price, pricelist, qty,partner_id, product_id, *a): prod_obj = self.pool.get('product.product') price_f = self.price_by_product(cr, uid, ids, pricelist, product_id, qty, partner_id) - prod_id='' + prod_id = '' if product_id: - prod_id=prod_obj.browse(cr,uid,product_id).disc_controle - disc=0.0 - if (disc != 0.0 or prod_id) and price_f>0: - disc=100-(price/price_f*100) - return {'value':{'discount':disc, 'price_unit':price_f}} + prod_id = prod_obj.browse(cr, uid, product_id).disc_controle + disc = 0.0 + if (disc != 0.0 or prod_id) and price_f > 0: + disc = 100 - (price/price_f*100) + return {'value': {'discount': disc, 'price_unit': price_f}} return {} - def onchange_dis(self, cr, uid,ids, qty, price_subtotal_incl, discount,*a): + def onchange_dis(self, cr, uid, ids, qty, price_subtotal_incl, discount, *a): price_sub = price_subtotal_incl - sub_total_discount = price_sub-(price_subtotal_incl*(discount*0.01)) - return {'value': {'price_subtotal_incl':sub_total_discount}} + sub_total_discount = price_sub - (price_subtotal_incl*(discount*0.01)) + return {'value': {'price_subtotal_incl': sub_total_discount}} - def onchange_ded(self, cr, uid,ids, val_ded,price_u,*a): + def onchange_ded(self, cr, uid, ids, val_ded, price_u, *a): res_obj = self.pool.get('res.users') - comp = res_obj.browse(cr,uid,uid).company_id.company_discount or 0.0 - val=0.0 + comp = res_obj.browse(cr, uid, uid).company_id.company_discount or 0.0 + val = 0.0 if val_ded and price_u: - val=100.0*val_ded/price_u + val=100.0 * val_ded / price_u if val > comp: - return {'value': {'discount':val, 'notice':'' }} - return {'value': {'discount':val}} + return {'value': {'discount': val, 'notice': '' }} + return {'value': {'discount': val}} - def onchange_discount(self, cr, uid,ids, discount,price,*a): + def onchange_discount(self, cr, uid, ids, discount, price, *a): pos_order = self.pool.get('pos.order.line') res_obj = self.pool.get('res.users') company_disc = pos_order.browse(cr,uid,ids) @@ -1161,11 +1105,11 @@ class pos_order_line(osv.osv): comp= company_disc[0] and company_disc[0].order_id.company_id and company_disc[0].order_id.company_id.company_discount or 0.0 if discount > comp : - return {'value': {'notice':'','price_ded':price*discount*0.01 or 0.0 }} + return {'value': {'notice': '', 'price_ded': price * discount * 0.01 or 0.0 }} else: - return {'value': {'notice':'Minimum Discount','price_ded':price*discount*0.01 or 0.0 }} + return {'value': {'notice': 'Minimum Discount', 'price_ded': price * discount * 0.01 or 0.0 }} else : - return {'value': {'notice':'No Discount', 'price_ded':price*discount*0.01 or 0.0}} + return {'value': {'notice': 'No Discount', 'price_ded': price * discount * 0.01 or 0.0}} def onchange_qty(self, cr, uid, ids, discount, qty, price, context=None): subtotal = qty * price @@ -1175,12 +1119,12 @@ class pos_order_line(osv.osv): _columns = { 'name': fields.char('Line Description', size=512), - 'company_id':fields.many2one('res.company', 'Company', required=True), + 'company_id': fields.many2one('res.company', 'Company', required=True), 'notice': fields.char('Discount Notice', size=128, required=True), 'serial_number': fields.char('Serial Number', size=128), 'product_id': fields.many2one('product.product', 'Product', domain=[('sale_ok', '=', True)], required=True, change_default=True), 'price_unit': fields.function(_get_amount, method=True, string='Unit Price', store=True), - 'price_ded': fields.float('Discount(Amount)',digits_compute=dp.get_precision('Point Of Sale')), + 'price_ded': fields.float('Discount(Amount)', digits_compute=dp.get_precision('Point Of Sale')), 'qty': fields.float('Quantity'), 'qty_rfd': fields.float('Refunded Quantity'), 'price_subtotal': fields.function(_amount_line_all, method=True, multi='pos_order_line_amount', string='Subtotal w/o Tax'), @@ -1201,17 +1145,17 @@ class pos_order_line(osv.osv): def create(self, cr, user, vals, context=None): if vals.get('product_id'): - return super(pos_order_line, self).create(cr, user, vals, context) + return super(pos_order_line, self).create(cr, user, vals, context=context) return False def write(self, cr, user, ids, values, context=None): if 'product_id' in values and not values['product_id']: return False - return super(pos_order_line, self).write(cr, user, ids, values, context) + return super(pos_order_line, self).write(cr, user, ids, values, context=context) def _scan_product(self, cr, uid, ean, qty, order): # search pricelist_id - product_obj=self.pool.get('product.product') + product_obj = self.pool.get('product.product') pricelist_id = self.pool.get('pos.order').read(cr, uid, [order], ['pricelist_id'] ) if not pricelist_id: return False @@ -1223,11 +1167,11 @@ class pos_order_line(osv.osv): return False # search price product - product =product_obj.read(cr, uid, product_id) + product = product_obj.read(cr, uid, product_id) product_name = product[0]['name'] price = self.price_by_product(cr, uid, 0, pricelist_id[0]['pricelist_id'][0], product_id[0], 1) - order_line_ids = self.search(cr, uid, [('name','=',product_name),('order_id','=',order)]) + order_line_ids = self.search(cr, uid, [('name', '=', product_name), ('order_id', '=' ,order)]) if order_line_ids: new_line = False order_line_id = order_line_ids[0] @@ -1253,7 +1197,7 @@ class pos_order_line(osv.osv): raise osv.except_osv(_('Error'), _('Modify line failed !')) line_id = order_line_id - price_line = float(qty)*float(price) + price_line = float(qty) * float(price) return { 'name': product_name, 'product_id': product_id[0], @@ -1273,12 +1217,11 @@ class product_product(osv.osv): 'disc_controle': fields.boolean('Discount Control'), } _defaults = { - 'disc_controle': lambda *a: True, + 'disc_controle': True, } product_product() class stock_picking(osv.osv): - _inherit = 'stock.picking' _columns = { 'pos_order': fields.many2one('pos.order', 'Pos order'), diff --git a/addons/point_of_sale/posrule_data2.xml b/addons/point_of_sale/point_of_sale_data.xml index 1010f75d055..1010f75d055 100644 --- a/addons/point_of_sale/posrule_data2.xml +++ b/addons/point_of_sale/point_of_sale_data.xml diff --git a/addons/point_of_sale/pos_demo.xml b/addons/point_of_sale/point_of_sale_demo.xml index 913a2907e03..aa76e3e9976 100644 --- a/addons/point_of_sale/pos_demo.xml +++ b/addons/point_of_sale/point_of_sale_demo.xml @@ -1,6 +1,11 @@ <?xml version="1.0"?> <openerp> <data> + + <record id="account.cash_journal" model="account.journal"> + <field eval="[(6, 0, [ref('base.user_root')])]" name="journal_users"/> + </record> + <record id="account_invoice_invoicefrompospos0" model="account.invoice"> <field name="origin">POS/019</field> <field name="reference">POS/019</field> diff --git a/addons/point_of_sale/pos_report.xml b/addons/point_of_sale/point_of_sale_report.xml index 3e6a265b34e..3e6a265b34e 100644 --- a/addons/point_of_sale/pos_report.xml +++ b/addons/point_of_sale/point_of_sale_report.xml diff --git a/addons/point_of_sale/pos_sequence.xml b/addons/point_of_sale/point_of_sale_sequence.xml index 399dccc634f..399dccc634f 100644 --- a/addons/point_of_sale/pos_sequence.xml +++ b/addons/point_of_sale/point_of_sale_sequence.xml diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/point_of_sale_view.xml index 4d277d216c8..4d277d216c8 100644 --- a/addons/point_of_sale/pos_view.xml +++ b/addons/point_of_sale/point_of_sale_view.xml diff --git a/addons/point_of_sale/pos_workflow.xml b/addons/point_of_sale/point_of_sale_workflow.xml index c325c4951c9..c325c4951c9 100644 --- a/addons/point_of_sale/pos_workflow.xml +++ b/addons/point_of_sale/point_of_sale_workflow.xml diff --git a/addons/point_of_sale/test/pos_report.yml b/addons/point_of_sale/test/point_of_sale_report.yml index 7eeea10bd1a..d058c8fd691 100644 --- a/addons/point_of_sale/test/pos_report.yml +++ b/addons/point_of_sale/test/point_of_sale_report.yml @@ -88,7 +88,7 @@ - name: statement date: "2010-10-13" type: customer - account_id: account_account_sales0 + account_id: account_pos_account_sales amount: 100 partner_id: base.res_partner_agrolait period_id: account.period_5 diff --git a/addons/point_of_sale/test/pos_test.yml b/addons/point_of_sale/test/point_of_sale_test.yml index 6baffce34f4..347ea961c8f 100644 --- a/addons/point_of_sale/test/pos_test.yml +++ b/addons/point_of_sale/test/point_of_sale_test.yml @@ -3,42 +3,42 @@ - I configure all details for the Customer, Salesman and Product, Account. -- +- I create View Account Type. -- +- !record {model: account.account.type, id: account_account_type_view0}: close_method: none code: View name: View sign: 1 -- +- I create Income Account Type. -- +- !record {model: account.account.type, id: account_account_type_income0}: close_method: unreconciled code: Income name: Income sign: 1 -- +- I create Expense Account Type. -- +- !record {model: account.account.type, id: account_account_type_expense0}: close_method: unreconciled code: Expense name: Expense sign: 1 -- +- I create Cash Account Type. -- +- !record {model: account.account.type, id: account_account_type_cash0}: close_method: balance code: Cash name: Cash sign: 1 -- +- I create Minimal Chart Account. -- - !record {model: account.account, id: account_account_minimalchart0}: +- + !record {model: account.account, id: account_pos_account_minimalchart}: code: '0' company_id: base.main_company currency_mode: current @@ -47,188 +47,188 @@ parent_right: 12 type: view user_type: account_account_type_view0 -- +- I create Payable Account. -- - !record {model: account.account, id: account_account_payable1}: +- + !record {model: account.account, id: account_pos_account_payable}: code: AP company_id: base.main_company currency_mode: current name: Payable - parent_id: account_account_minimalchart0 + parent_id: account_pos_account_minimalchart parent_left: 2 parent_right: 3 reconcile: true type: payable user_type: account_account_type_expense0 -- +- I create Receivable Account. -- - !record {model: account.account, id: account_account_receivable0}: +- + !record {model: account.account, id: account_pos_account_receivable}: code: AR company_id: base.main_company currency_mode: current name: Receivable - parent_id: account_account_minimalchart0 + parent_id: account_pos_account_minimalchart parent_left: 4 parent_right: 5 reconcile: true type: receivable user_type: account_account_type_income0 -- +- I create Cash Account. -- - !record {model: account.account, id: account_account_cash0}: +- + !record {model: account.account, id: account_pos_account_cash}: code: C company_id: base.main_company currency_mode: current name: Cash - parent_id: account_account_minimalchart0 + parent_id: account_pos_account_minimalchart parent_left: 6 parent_right: 7 type: other user_type: account_account_type_cash0 -- +- I create Purchases Account. -- - !record {model: account.account, id: account_account_purchases0}: +- + !record {model: account.account, id: account_pos_account_purchases}: code: P company_id: base.main_company currency_mode: current name: Purchases - parent_id: account_account_minimalchart0 + parent_id: account_pos_account_minimalchart parent_left: 8 parent_right: 9 type: other user_type: account_account_type_expense0 -- +- I create Sales Account. -- - !record {model: account.account, id: account_account_sales0}: +- + !record {model: account.account, id: account_pos_account_sales}: code: Sale company_id: base.main_company currency_mode: current name: Sales - parent_id: account_account_minimalchart0 + parent_id: account_pos_account_minimalchart parent_left: 10 parent_right: 11 type: other user_type: account_account_type_income0 -- +- I create Purchase Journal. -- - !record {model: account.journal, id: account_journal_purchasejournal0}: +- + !record {model: account.journal, id: account_pos_account_journal_purchasejournal}: code: PUJ company_id: base.main_company - default_credit_account_id: account_account_purchases0 - default_debit_account_id: account_account_purchases0 + default_credit_account_id: account_pos_account_purchases + default_debit_account_id: account_pos_account_purchases name: Purchase Journal sequence_id: account.sequence_purchase_journal type: purchase view_id: account.account_journal_view -- +- I create Sale Journal. -- - !record {model: account.journal, id: account_journal_salejournal0}: +- + !record {model: account.journal, id: account_pos_account_journal_salejournal}: code: SAJ company_id: base.main_company - default_credit_account_id: account_account_sales0 - default_debit_account_id: account_account_sales0 + default_credit_account_id: account_pos_account_sales + default_debit_account_id: account_pos_account_sales name: Sale Journal sequence_id: account.sequence_sale_journal type: sale view_id: account.account_journal_view -- +- I create Bank Journal. -- - !record {model: account.journal, id: account_journal_bankjournal0}: +- + !record {model: account.journal, id: account_pos_account_journal_bankjournal}: code: BNK company_id: base.main_company - default_credit_account_id: account_account_cash0 - default_debit_account_id: account_account_cash0 + default_credit_account_id: account_pos_account_cash + default_debit_account_id: account_pos_account_cash name: Bank Journal sequence_id: account.sequence_journal type: cash view_id: account.account_journal_bank_view -- +- I create property for account payable. -- +- !record {model: ir.property, id: ir_property_propertyaccountexpensecateg0}: company_id: base.main_company fields_id: account.field_res_partner_property_account_payable name: property_account_expense_categ value_reference: account.account,5 -- +- I create property for account receivable. -- +- !record {model: ir.property, id: ir_property_propertyaccountincomecateg0}: company_id: base.main_company fields_id: account.field_res_partner_property_account_receivable name: property_account_income_categ value_reference: account.account,6 -- +- I create Partner category Customers. -- +- !record {model: res.partner.category, id: res_partner_category_customers0}: name: Customers - I create partner -- +- !record {model: res.partner, id: res_partner_cleartrail0}: category_id: - res_partner_category_customers0 name: Cleartrail -- +- I create partner address. -- +- !record {model: res.partner.address, id: res_partner_address_1}: partner_id: res_partner_cleartrail0 street: onam plaza, 14 B palasia A B Road type: contact -- +- I create partner invoice address. -- +- !record {model: res.partner.address, id: res_partner_address_2}: partner_id: res_partner_cleartrail0 type: invoice -- +- I create partner delivery address. -- +- !record {model: res.partner.address, id: res_partner_address_3}: partner_id: res_partner_cleartrail0 street: sangam house 15 B palasia, A B Road type: delivery - - I create product category. -- + I create product category. +- !record {model: product.category, id: product_category_allproductssellable0}: name: Mobile Products Sellable - I create partner. -- +- !record {model: res.partner, id: res_partner_microlinktechnologies0}: address: - street: Kailash Vaibhav, Parksite name: Micro Link Technologies - property_account_payable: account_account_payable1 - property_account_receivable: account_account_receivable0 - supplier: true + property_account_payable: account_pos_account_payable + property_account_receivable: account_pos_account_receivable + supplier: true - I create partner address . -- +- !record {model: res.partner.address, id: res_partner_address_0}: country_id: base.in partner_id: res_partner_microlinktechnologies0 street: Ash House, Ash Road title: base.res_partner_title_miss -- +- I create product category . -- +- !record {model: product.category, id: product_category_services0}: name: Mobile Services -- +- I create product template . -- +- !record {model: product.template, id: product_template_lgviewtysmart0}: categ_id: product_category_allproductssellable0 cost_method: standard @@ -241,9 +241,9 @@ type: product uom_id: product.product_uom_unit uom_po_id: product.product_uom_unit -- +- I create product LG Viewty Smart. -- +- !record {model: product.product, id: product_product_lgviewtysmart0}: categ_id: product_category_allproductssellable0 cost_method: standard @@ -251,22 +251,22 @@ mes_type: fixed name: LG Viewty Smart procure_method: make_to_order - property_account_expense: account_account_payable1 - property_account_income: account_account_receivable0 + property_account_expense: account_pos_account_payable + property_account_income: account_pos_account_receivable seller_delay: '1' standard_price: 160.0 supply_method: produce type: product uom_id: product.product_uom_unit uom_po_id: product.product_uom_unit -- - I create product category . +- + I create product category . - !record {model: product.category, id: product_category_computer0}: name: Computer -- +- I create product HP Pavilion Desktop PCs -- +- !record {model: product.product, id: product_product_hppaviliondesktoppcs0}: categ_id: product_category_computer0 cost_method: standard @@ -282,9 +282,9 @@ type: product uom_id: product.product_uom_unit uom_po_id: product.product_uom_unit - property_account_expense: account_account_payable1 - property_account_income: account_account_receivable0 -- + property_account_expense: account_pos_account_payable + property_account_income: account_pos_account_receivable +- I create New Order by adding the details of Salesman and "Product" as LG Viewty Smart Quantity as 10. - !record {model: pos.order, id: pos_order_pos0}: diff --git a/addons/point_of_sale/wizard/all_closed_cashbox_of_the_day.py b/addons/point_of_sale/wizard/all_closed_cashbox_of_the_day.py index 58f78902a14..e38d1c1aa03 100644 --- a/addons/point_of_sale/wizard/all_closed_cashbox_of_the_day.py +++ b/addons/point_of_sale/wizard/all_closed_cashbox_of_the_day.py @@ -19,40 +19,30 @@ # ############################################################################## -import netsvc -from osv import osv,fields -from tools.translate import _ -import time +from osv import osv class all_closed_cashbox_of_the_day(osv.osv_memory): _name = 'all.closed.cashbox.of.the.day' _description = 'All closed cashbox of the day' - _columns = { - - } - def print_report(self, cr, uid, ids, context=None): - """ To get the date and print the report - @param self: The object pointer. @param cr: A database cursor @param uid: ID of the user currently logged in @param context: A standard dictionary @return : retrun report """ - datas = {'ids' : context.get('active_ids',[])} + datas = {'ids': context.get('active_ids', [])} res = {} datas['form'] = res - return { - 'type' : 'ir.actions.report.xml', - 'report_name':'all.closed.cashbox.of.the.day', - 'datas' : datas, + 'type': 'ir.actions.report.xml', + 'report_name': 'all.closed.cashbox.of.the.day', + 'datas': datas, } all_closed_cashbox_of_the_day() -# 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/point_of_sale/wizard/pos_add_product.py b/addons/point_of_sale/wizard/pos_add_product.py index 5735d2976a4..601c3d3f305 100644 --- a/addons/point_of_sale/wizard/pos_add_product.py +++ b/addons/point_of_sale/wizard/pos_add_product.py @@ -32,10 +32,10 @@ class add_product(osv.osv_memory): 'quantity': fields.float('Quantity', required=True), } _defaults = { - 'quantity': lambda *a: 1, + 'quantity': 1, } - def select_product(self, cr, uid, ids, context): + def select_product(self, cr, uid, ids, context=None): """ To get the product and quantity and add in order . @param self: The object pointer. @@ -44,13 +44,14 @@ class add_product(osv.osv_memory): @param context: A standard dictionary @return : Return the add product form again for adding more product """ + if context is None: + context = {} this = self.browse(cr, uid, ids[0], context=context) record_id = context and context.get('active_id', False) assert record_id, _('Active ID is not found') if record_id: order_obj = self.pool.get('pos.order') order_obj.add_product(cr, uid, record_id, this.product_id.id, this.quantity, context=context) - return { 'name': _('Add Product'), 'view_type': 'form', @@ -61,34 +62,36 @@ class add_product(osv.osv_memory): 'views': False, 'type': 'ir.actions.act_window', } - def close_action(self, cr, uid, ids, context): + + def close_action(self, cr, uid, ids, context=None): """ To get the product and Make the payment . @param self: The object pointer. @param cr: A database cursor @param uid: ID of the user currently logged in @param context: A standard dictionary - @return : Return the Make Payment + @return : Return the Make Payment """ - + if context is None: + context = {} record_id = context and context.get('active_id', False) order_obj= self.pool.get('pos.order') - obj=order_obj.browse(cr, uid, record_id) - order_obj.write(cr, uid, [record_id], {'state':'done'}) + obj = order_obj.browse(cr, uid, record_id, context=context) + order_obj.write(cr, uid, [record_id], {'state': 'done'}, context=context) if obj.amount_total != obj.amount_paid: return { - 'name': _('Make Payment'), - 'context ':context and context.get('active_id', False), - 'view_type': 'form', - 'view_mode': 'form', - 'res_model': 'pos.make.payment', - 'view_id': False, - 'target': 'new', - 'views': False, - 'type': 'ir.actions.act_window', - + 'name': _('Make Payment'), + 'context': context and context.get('active_id', False), + 'view_type': 'form', + 'view_mode': 'form', + 'res_model': 'pos.make.payment', + 'view_id': False, + 'target': 'new', + 'views': False, + 'type': 'ir.actions.act_window', } - return {} + return {} + add_product() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/point_of_sale/wizard/pos_box_entries.py b/addons/point_of_sale/wizard/pos_box_entries.py index 103e49be62d..243cbc02c7d 100644 --- a/addons/point_of_sale/wizard/pos_box_entries.py +++ b/addons/point_of_sale/wizard/pos_box_entries.py @@ -19,30 +19,31 @@ # ############################################################################## -from osv import osv, fields import time + +from osv import osv, fields from tools.translate import _ -def get_journal(self, cr, uid, context): +def get_journal(self, cr, uid, context=None): """ - Make the selection list of Cash Journal . - @param self: The object pointer. - @param cr: A database cursor - @param uid: ID of the user currently logged in - @param context: A standard dictionary - @return :Return the list of journal + Make the selection list of Cash Journal . + @param self: The object pointer. + @param cr: A database cursor + @param uid: ID of the user currently logged in + @param context: A standard dictionary + @return :Return the list of journal """ - obj = self.pool.get('account.journal') + journal_obj = self.pool.get('account.journal') statement_obj = self.pool.get('account.bank.statement') - cr.execute("SELECT DISTINCT journal_id from pos_journal_users where user_id=%s order by journal_id", (uid,)) + cr.execute("SELECT DISTINCT journal_id FROM pos_journal_users WHERE user_id = %s ORDER BY journal_id", (uid, )) j_ids = map(lambda x1: x1[0], cr.fetchall()) - ids = obj.search(cr, uid, [('type', '=', 'cash'), ('id', 'in', j_ids)]) - obj_ids= statement_obj.search(cr, uid, [('state', '!=', 'confirm'), ('user_id', '=', uid), ('journal_id', 'in', ids)]) - res_obj = obj.read(cr, uid, ids, ['journal_id'], context) - res_obj = [(r1['id'])for r1 in res_obj] - res = statement_obj.read(cr, uid, obj_ids, ['journal_id'], context) + ids = journal_obj.search(cr, uid, [('type', '=', 'cash'), ('id', 'in', j_ids)], context=context) + obj_ids = statement_obj.search(cr, uid, [('state', '!=', 'confirm'), ('user_id', '=', uid), ('journal_id', 'in', ids)], context=context) + res_obj = journal_obj.read(cr, uid, ids, ['journal_id'], context=context) + res_obj = [(r1['id']) for r1 in res_obj] + res = statement_obj.read(cr, uid, obj_ids, ['journal_id'], context=context) res = [(r['journal_id']) for r in res] res.insert(0, ('', '')) return res @@ -51,10 +52,7 @@ class pos_box_entries(osv.osv_memory): _name = 'pos.box.entries' _description = 'Pos Box Entries' - - - def _get_income_product(self, cr, uid, context): - + def _get_income_product(self, cr, uid, context=None): """ Make the selection list of purchasing products. @param self: The object pointer. @@ -63,10 +61,10 @@ class pos_box_entries(osv.osv_memory): @param context: A standard dictionary @return :Return of operation of product """ - obj = self.pool.get('product.product') - ids = obj.search(cr, uid, [('income_pdt', '=', True)]) - res = obj.read(cr, uid, ids, ['id', 'name'], context) - res = [(r['id'],r['name']) for r in res] + product_obj = self.pool.get('product.product') + ids = product_obj.search(cr, uid, [('income_pdt', '=', True)], context=context) + res = product_obj.read(cr, uid, ids, ['id', 'name'], context=context) + res = [(r['id'], r['name']) for r in res] res.insert(0, ('', '')) return res @@ -74,17 +72,17 @@ class pos_box_entries(osv.osv_memory): _columns = { 'name': fields.char('Description', size=32, required=True), - 'journal_id': fields.selection(get_journal, "Register", required=True), - 'product_id': fields.selection(_get_income_product, "Operation", required=True), + 'journal_id': fields.selection(get_journal, 'Register', required=True), + 'product_id': fields.selection(_get_income_product, 'Operation', required=True), 'amount': fields.float('Amount', digits=(16, 2)), 'ref': fields.char('Ref', size=32), } _defaults = { - 'journal_id': lambda *a: 1, - 'product_id': lambda *a: 1, + 'journal_id': 1, + 'product_id': 1, } - def get_in(self, cr, uid, ids, context): + def get_in(self, cr, uid, ids, context=None): """ Create the entry of statement in journal. @param self: The object pointer. @@ -94,14 +92,13 @@ class pos_box_entries(osv.osv_memory): @return :Return of operation of product """ statement_obj = self.pool.get('account.bank.statement') - product_obj = self.pool.get('product.template') res_obj = self.pool.get('res.users') product_obj = self.pool.get('product.product') bank_statement = self.pool.get('account.bank.statement.line') - for data in self.read(cr, uid, ids): - args = {} - curr_company = res_obj.browse(cr, uid, uid).company_id.id - statement_id = statement_obj.search(cr, uid, [('journal_id', '=', data['journal_id']), ('company_id', '=', curr_company), ('user_id', '=', uid), ('state', '=', 'open')]) + for data in self.read(cr, uid, ids, context=context): + vals = {} + curr_company = res_obj.browse(cr, uid, uid, context=context).company_id.id + statement_id = statement_obj.search(cr, uid, [('journal_id', '=', data['journal_id']), ('company_id', '=', curr_company), ('user_id', '=', uid), ('state', '=', 'open')], context=context) if not statement_id: raise osv.except_osv(_('Error !'), _('You have to open at least one cashbox')) @@ -116,22 +113,20 @@ class pos_box_entries(osv.osv_memory): 'journal_id': data['journal_id'], 'company_id': curr_company, 'user_id': uid, - }) + }, context=context) - args['statement_id'] = statement_id - args['journal_id'] = data['journal_id'] + vals['statement_id'] = statement_id + valss['journal_id'] = data['journal_id'] if acc_id: - args['account_id'] = acc_id.id - args['amount'] = data['amount'] or 0.0 - args['ref'] = "%s" % (data['ref'] or '') - args['name'] = "%s: %s " % (product_obj.browse(cr, uid, data['product_id']).name, data['name'].decode('utf8')) - address_u = res_obj.browse(cr, uid, uid).address_id + vals['account_id'] = acc_id.id + vals['amount'] = data['amount'] or 0.0 + vals['ref'] = "%s" % (data['ref'] or '') + vals['name'] = "%s: %s " % (product_obj.browse(cr, uid, data['product_id'], context=context).name, data['name'].decode('utf8')) + address_u = res_obj.browse(cr, uid, uid, context=context).address_id if address_u: - partner_id = address_u.partner_id and address_u.partner_id.id or None - args['partner_id'] = partner_id - bank_statement.create(cr, uid, args) - - return {} + vals['partner_id'] = address_u.partner_id and address_u.partner_id.id or None + bank_statement.create(cr, uid, vals, context=context) + return {} pos_box_entries() diff --git a/addons/point_of_sale/wizard/pos_box_out.py b/addons/point_of_sale/wizard/pos_box_out.py index e4aebe2cc1d..d2eb7b62509 100644 --- a/addons/point_of_sale/wizard/pos_box_out.py +++ b/addons/point_of_sale/wizard/pos_box_out.py @@ -19,20 +19,19 @@ # ############################################################################## -from osv import osv, fields import time -from tools.translate import _ from datetime import datetime from dateutil.relativedelta import relativedelta -import pos_box_entries +from osv import osv, fields +from tools.translate import _ +import pos_box_entries class pos_box_out(osv.osv_memory): _name = 'pos.box.out' _description = 'Pos Box Out' - def _get_expense_product(self, cr, uid, context): - + def _get_expense_product(self, cr, uid, context=None): """ Make the selection list of expense product. @param self: The object pointer. @@ -41,26 +40,26 @@ class pos_box_out(osv.osv_memory): @param context: A standard dictionary @return :Return of operation of product """ - obj = self.pool.get('product.product') - company_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.id - ids = obj.search(cr, uid, ['&', ('expense_pdt', '=', True), '|', ('company_id', '=', company_id), ('company_id', '=', None)]) - res = obj.read(cr, uid, ids, ['id', 'name'], context) + product_obj = self.pool.get('product.product') + company_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.id + ids = product_obj.search(cr, uid, ['&', ('expense_pdt', '=', True), '|', ('company_id', '=', company_id), ('company_id', '=', None)], context=context) + res = product_obj.read(cr, uid, ids, ['id', 'name'], context=context) res = [(r['id'], r['name']) for r in res] res.insert(0, ('', '')) return res _columns = { 'name': fields.char('Description', size=32, required=True), - 'journal_id': fields.selection(pos_box_entries.get_journal, "Register", required=True), - 'product_id': fields.selection(_get_expense_product, "Operation", required=True), + 'journal_id': fields.selection(pos_box_entries.get_journal, 'Register', required=True), + 'product_id': fields.selection(_get_expense_product, 'Operation', required=True), 'amount': fields.float('Amount', digits=(16, 2)), 'ref': fields.char('Ref', size=32), } _defaults = { - 'journal_id': lambda *a: 1, - 'product_id': lambda *a: 1, + 'journal_id': 1, + 'product_id': 1, } - def get_out(self, cr, uid, ids, context): + def get_out(self, cr, uid, ids, context=None): """ Create the entries in the CashBox . @@ -70,34 +69,34 @@ class pos_box_out(osv.osv_memory): @param context: A standard dictionary @return :Return of operation of product """ - args = {} + vals = {} statement_obj = self.pool.get('account.bank.statement') statement_line_obj = self.pool.get('account.bank.statement.line') product_obj = self.pool.get('product.template') productp_obj = self.pool.get('product.product') res_obj = self.pool.get('res.users') - for data in self.read(cr, uid, ids): - curr_company = res_obj.browse(cr, uid, uid).company_id.id - statement_id = statement_obj.search(cr, uid, [('journal_id', '=', data['journal_id']), ('company_id', '=', curr_company), ('user_id', '=', uid), ('state', '=', 'open')]) + for data in self.read(cr, uid, ids, context=context): + curr_company = res_obj.browse(cr, uid, uid, context=context).company_id.id + statement_id = statement_obj.search(cr, uid, [('journal_id', '=', data['journal_id']), ('company_id', '=', curr_company), ('user_id', '=', uid), ('state', '=', 'open')], context=context) monday = (datetime.today() + relativedelta(weekday=0)).strftime('%Y-%m-%d') sunday = (datetime.today() + relativedelta(weekday=6)).strftime('%Y-%m-%d') - done_statmt = statement_obj.search(cr, uid, [('date', '>=', monday+' 00:00:00'), ('date', '<=', sunday+' 23:59:59'), ('journal_id', '=', data['journal_id']), ('company_id', '=', curr_company), ('user_id', '=', uid)]) - stat_done = statement_obj.browse(cr, uid, done_statmt) - address_u = res_obj.browse(cr, uid, uid).address_id + done_statmt = statement_obj.search(cr, uid, [('date', '>=', monday+' 00:00:00'), ('date', '<=', sunday+' 23:59:59'), ('journal_id', '=', data['journal_id']), ('company_id', '=', curr_company), ('user_id', '=', uid)], context=context) + stat_done = statement_obj.browse(cr, uid, done_statmt, context=context) + address_u = res_obj.browse(cr, uid, uid, context=context).address_id am = 0.0 - amount_check = productp_obj.browse(cr, uid, data['product_id']).am_out or False + amount_check = productp_obj.browse(cr, uid, data['product_id'], context=context).am_out or False for st in stat_done: for s in st.line_ids: if address_u and s.partner_id == address_u.partner_id and s.am_out: am += s.amount - if (-data['amount'] or 0.0) + am < -(res_obj.browse(cr, uid, uid).company_id.max_diff or 0.0) and amount_check: + if (-data['amount'] or 0.0) + am < -(res_obj.browse(cr, uid, uid, context=context).company_id.max_diff or 0.0) and amount_check: val = (res_obj.browse(cr, uid, uid).company_id.max_diff or 0.0) + am raise osv.except_osv(_('Error !'), _('The maximum value you can still withdraw is exceeded. \n Remaining value is equal to %d ')%(val)) - acc_id = product_obj.browse(cr, uid, data['product_id']).property_account_income + acc_id = product_obj.browse(cr, uid, data['product_id'], context=context).property_account_income if not acc_id: - raise osv.except_osv(_('Error !'), _('please check that account is set to %s')%(product_obj.browse(cr, uid, data['product_id']).name)) + raise osv.except_osv(_('Error !'), _('please check that account is set to %s')%(product_obj.browse(cr, uid, data['product_id'], context=context).name)) if not statement_id: raise osv.except_osv(_('Error !'), _('You have to open at least one cashbox')) if statement_id: @@ -108,24 +107,23 @@ class pos_box_out(osv.osv_memory): 'journal_id': data['journal_id'], 'company_id': curr_company, 'user_id': uid, - }) - args['statement_id'] = statement_id - args['journal_id'] = data['journal_id'] + }, context=context) + vals['statement_id'] = statement_id + vals['journal_id'] = data['journal_id'] if acc_id: - args['account_id'] = acc_id.id + vals['account_id'] = acc_id.id amount = data['amount'] or 0.0 if data['amount'] > 0: amount = -data['amount'] - args['amount'] = amount - if productp_obj.browse(cr, uid, data['product_id']).am_out: - args['am_out'] = True - args['ref'] = data['ref'] or '' - args['name'] = "%s: %s " % (product_obj.browse(cr, uid, data['product_id']).name, data['name'].decode('utf8')) - address_u = res_obj.browse(cr, uid, uid).address_id + vals['amount'] = amount + if productp_obj.browse(cr, uid, data['product_id'], context=context).am_out: + vals['am_out'] = True + vals['ref'] = data['ref'] or '' + vals['name'] = "%s: %s " % (product_obj.browse(cr, uid, data['product_id'], context=context).name, data['name'].decode('utf8')) + address_u = res_obj.browse(cr, uid, uid, context=context).address_id if address_u: - partner_id = address_u.partner_id and address_u.partner_id.id or None - args['partner_id'] = partner_id - statement_line_id = statement_line_obj.create(cr, uid, args) + vals['partner_id'] = address_u.partner_id and address_u.partner_id.id or None + statement_line_id = statement_line_obj.create(cr, uid, vals, context=context) return {} pos_box_out() diff --git a/addons/point_of_sale/wizard/pos_close_statement.py b/addons/point_of_sale/wizard/pos_close_statement.py index 82e47a2caa3..02c82a3cf98 100644 --- a/addons/point_of_sale/wizard/pos_close_statement.py +++ b/addons/point_of_sale/wizard/pos_close_statement.py @@ -26,7 +26,7 @@ class pos_close_statement(osv.osv_memory): _name = 'pos.close.statement' _description = 'Close Statements' - def close_statement(self, cr, uid, ids, context): + def close_statement(self, cr, uid, ids, context=None): """ Close the statements @param self: The object pointer. @@ -39,34 +39,33 @@ class pos_close_statement(osv.osv_memory): statement_obj = self.pool.get('account.bank.statement') journal_obj = self.pool.get('account.journal') cr.execute("SELECT DISTINCT journal_id FROM pos_journal_users " - "WHERE user_id=%s ORDER BY journal_id", (uid,)) + "WHERE user_id=%s ORDER BY journal_id", (uid, )) j_ids = map(lambda x1: x1[0], cr.fetchall()) - journal_ids = journal_obj.search(cr, uid, [('auto_cash', '=', True), ('type', '=', 'cash'), ('id', 'in', j_ids)]) - ids = statement_obj.search(cr, uid, [('state', '!=', 'confirm'), ('user_id', '=', uid), ('journal_id', 'in', journal_ids)]) - for journal in journal_obj.browse(cr, uid, journal_ids): + journal_ids = journal_obj.search(cr, uid, [('auto_cash', '=', True), ('type', '=', 'cash'), ('id', 'in', j_ids)], context=context) + ids = statement_obj.search(cr, uid, [('state', '!=', 'confirm'), ('user_id', '=', uid), ('journal_id', 'in', journal_ids)], context=context) + for journal in journal_obj.browse(cr, uid, journal_ids, context=context): if not ids: raise osv.except_osv(_('Message'), _('Registers are already closed.')) else: if not journal.check_dtls: - statement_obj.button_confirm_cash(cr, uid, ids, context) + statement_obj.button_confirm_cash(cr, uid, ids, context=context) - data_obj = self.pool.get('ir.model.data') - id2 = data_obj._get_id(cr, uid, 'account', 'view_bank_statement_tree') - id3 = data_obj._get_id(cr, uid, 'account', 'view_bank_statement_form2') - result = data_obj._get_id(cr, uid, 'point_of_sale', 'view_pos_confirm_cash_statement_filter') + id2 = mod_obj._get_id(cr, uid, 'account', 'view_bank_statement_tree') + id3 = mod_obj._get_id(cr, uid, 'account', 'view_bank_statement_form2') + result = mod_obj._get_id(cr, uid, 'point_of_sale', 'view_pos_confirm_cash_statement_filter') search_id = mod_obj.read(cr, uid, result, ['res_id'], context=context) if id2: - id2 = data_obj.browse(cr, uid, id2, context=context).res_id + id2 = mod_obj.browse(cr, uid, id2, context=context).res_id if id3: - id3 = data_obj.browse(cr, uid, id3, context=context).res_id + id3 = mod_obj.browse(cr, uid, id3, context=context).res_id return { - 'domain': "[('id','in'," + str(ids) + ")]", + 'domain': "[('id', 'in', " + str(ids) + ")]", 'name': 'Close Statements', 'view_type': 'form', - 'view_mode': 'tree,form', + 'view_mode': 'tree, form', 'search_view_id': search_id['res_id'], 'res_model': 'account.bank.statement', - 'views': [(id2, 'tree'),(id3, 'form')], + 'views': [(id2, 'tree'), (id3, 'form')], 'type': 'ir.actions.act_window' } diff --git a/addons/point_of_sale/wizard/pos_confirm.py b/addons/point_of_sale/wizard/pos_confirm.py index de293eaebc7..f4c53d66297 100644 --- a/addons/point_of_sale/wizard/pos_confirm.py +++ b/addons/point_of_sale/wizard/pos_confirm.py @@ -28,7 +28,7 @@ class pos_confirm(osv.osv_memory): _name = 'pos.confirm' _description = 'Point of Sale Confirm' - def action_confirm(self, cr, uid, ids, context): + def action_confirm(self, cr, uid, ids, context=None): """ Confirm the order and close the sales. @param self: The object pointer. @@ -37,7 +37,8 @@ class pos_confirm(osv.osv_memory): @param context: A standard dictionary @return :Blank dictionary """ - + if context is None: + context = {} record_id = context and context.get('active_id', False) if record_id: if isinstance(record_id, (int, long)): @@ -47,7 +48,7 @@ class pos_confirm(osv.osv_memory): for order_id in order_obj.browse(cr, uid, record_id, context=context): if order_id.state == 'paid': - order_obj.write(cr, uid, [order_id.id], {'journal_entry': True}) + order_obj.write(cr, uid, [order_id.id], {'journal_entry': True}, context=context) order_obj.create_account_move(cr, uid, [order_id.id], context=context) wf_service = netsvc.LocalService("workflow") diff --git a/addons/point_of_sale/wizard/pos_details.py b/addons/point_of_sale/wizard/pos_details.py index 22d29b469fa..2e272826b4f 100644 --- a/addons/point_of_sale/wizard/pos_details.py +++ b/addons/point_of_sale/wizard/pos_details.py @@ -19,9 +19,10 @@ # ############################################################################## +import time + from osv import osv, fields from tools.translate import _ -import time class pos_details(osv.osv_memory): @@ -33,11 +34,11 @@ class pos_details(osv.osv_memory): 'date_end': fields.date('Date End', required=True) } _defaults = { - 'date_start': lambda *a: time.strftime('%Y-%m-%d'), - 'date_end': lambda *a: time.strftime('%Y-%m-%d'), + 'date_start': time.strftime('%Y-%m-%d'), + 'date_end': time.strftime('%Y-%m-%d'), } - def print_report(self, cr, uid, ids, context={}): + def print_report(self, cr, uid, ids, context=None): """ To get the date and print the report @param self: The object pointer. @@ -46,12 +47,12 @@ class pos_details(osv.osv_memory): @param context: A standard dictionary @return : retrun report """ - + if context is None: + context = {} datas = {'ids': context.get('active_ids', [])} - res = self.read(cr, uid, ids, ['date_start', 'date_end'], context) + res = self.read(cr, uid, ids, ['date_start', 'date_end'], context=context) res = res and res[0] or {} datas['form'] = res - return { 'type': 'ir.actions.report.xml', 'report_name': 'pos.details', diff --git a/addons/point_of_sale/wizard/pos_discount.py b/addons/point_of_sale/wizard/pos_discount.py index 375b7dc20d4..d92a545a4ab 100644 --- a/addons/point_of_sale/wizard/pos_discount.py +++ b/addons/point_of_sale/wizard/pos_discount.py @@ -32,7 +32,7 @@ class pos_discount(osv.osv_memory): 'discount_notes': fields.char('Discount Notes', size= 128, required=True), } _defaults = { - 'discount': lambda *a: 5, + 'discount': 5, } @@ -47,11 +47,11 @@ class pos_discount(osv.osv_memory): """ res = super(pos_discount, self).view_init(cr, uid, fields_list, context=context) record_id = context and context.get('active_id', False) or False - order = self.pool.get('pos.order').browse(cr, uid, record_id) + order = self.pool.get('pos.order').browse(cr, uid, record_id, context=context) if not order.lines: raise osv.except_osv('Error!','No Order Lines ') True - def apply_discount(self, cr, uid, ids, context): + def apply_discount(self, cr, uid, ids, context=None): """ To give the discount of product and check the. @@ -61,16 +61,16 @@ class pos_discount(osv.osv_memory): @param context: A standard dictionary @return : nothing """ + order_ref = self.pool.get('pos.order') + order_line_ref = self.pool.get('pos.order.line') + if context is None: + context = {} this = self.browse(cr, uid, ids[0], context=context) record_id = context and context.get('active_id', False) if isinstance(record_id, (int, long)): record_id = [record_id] - order_ref = self.pool.get('pos.order') - order_line_ref = self.pool.get('pos.order.line') - for order in order_ref.browse(cr, uid, record_id, context=context): - for line in order.lines: company_discount = order.company_id.company_discount applied_discount = this.discount @@ -81,10 +81,7 @@ class pos_discount(osv.osv_memory): notice = 'Minimum Discount' else: notice = this.discount_notes - - res_new = { - } - + res_new = {} if this.discount <= company_discount: res_new = { 'discount': this.discount, diff --git a/addons/point_of_sale/wizard/pos_get_sale.py b/addons/point_of_sale/wizard/pos_get_sale.py index 1cc9675bf84..48bd89bce7f 100644 --- a/addons/point_of_sale/wizard/pos_get_sale.py +++ b/addons/point_of_sale/wizard/pos_get_sale.py @@ -28,10 +28,10 @@ class pos_get_sale(osv.osv_memory): _description = 'Get From Sale' _columns = { - 'picking_id': fields.many2one('stock.picking', 'Sale Order', domain=[('state', 'in', ('assigned', 'confirmed')), ('type', '=', 'out')], context="{'contact_display':'partner'}", required=True), + 'picking_id': fields.many2one('stock.picking', 'Sale Order', domain=[('state', 'in', ('assigned', 'confirmed')), ('type', '=', 'out')], context="{'contact_display': 'partner'}", required=True), } - def sale_complete(self, cr, uid, ids, context): + def sale_complete(self, cr, uid, ids, context=None): """ Select the picking order and add the in Point of sale order @param self: The object pointer. @@ -40,29 +40,29 @@ class pos_get_sale(osv.osv_memory): @param context: A standard dictionary @return : nothing """ - this = self.browse(cr, uid, ids[0], context=context) - record_id = context and context.get('active_id', False) - proxy_pos = self.pool.get('pos.order') proxy_pick = self.pool.get('stock.picking') proxy_order_line = self.pool.get('pos.order.line') + if context is None: + context = {} + this = self.browse(cr, uid, ids[0], context=context) + record_id = context and context.get('active_id', False) if record_id: - order = proxy_pos.browse(cr, uid, record_id, context) - + order = proxy_pos.browse(cr, uid, record_id, context=context) if order.state in ('paid', 'invoiced'): raise osv.except_osv(_('UserError '), _("You can't modify this order. It has already been paid")) - for pick in proxy_pick.browse(cr, uid, [this.picking_id.id], context): + for pick in proxy_pick.browse(cr, uid, [this.picking_id.id], context=context): proxy_pos.write(cr, uid, record_id, { 'picking_id': this.picking_id.id, 'partner_id': pick.address_id and pick.address_id.partner_id.id - }) + }, context=context) order = proxy_pick.write(cr, uid, [this.picking_id.id], { 'invoice_state': 'none', 'pos_order': record_id - }) + }, context=context) for line in pick.move_lines: proxy_order_line.create(cr, uid, { @@ -72,8 +72,7 @@ class pos_get_sale(osv.osv_memory): 'product_id': line.product_id.id, 'price_unit': line.sale_line_id.price_unit, 'discount': line.sale_line_id.discount, - }) - + }, context=context) return {} pos_get_sale() diff --git a/addons/point_of_sale/wizard/pos_open_statement.py b/addons/point_of_sale/wizard/pos_open_statement.py index 67c5b125768..9bbed850dfc 100644 --- a/addons/point_of_sale/wizard/pos_open_statement.py +++ b/addons/point_of_sale/wizard/pos_open_statement.py @@ -26,7 +26,7 @@ class pos_open_statement(osv.osv_memory): _name = 'pos.open.statement' _description = 'Open Statements' - def open_statement(self, cr, uid, ids, context): + def open_statement(self, cr, uid, ids, context=None): """ Open the statements @param self: The object pointer. @@ -37,20 +37,20 @@ class pos_open_statement(osv.osv_memory): """ data = {} mod_obj = self.pool.get('ir.model.data') - company_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.id statement_obj = self.pool.get('account.bank.statement') sequence_obj = self.pool.get('ir.sequence') journal_obj = self.pool.get('account.journal') + company_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.id cr.execute("SELECT DISTINCT journal_id FROM pos_journal_users " - "WHERE user_id=%s ORDER BY journal_id"% (uid,)) + "WHERE user_id = %s ORDER BY journal_id"% (uid, )) j_ids = map(lambda x1: x1[0], cr.fetchall()) - journal_ids = journal_obj.search(cr, uid, [('auto_cash', '=', True), ('type', '=', 'cash'), ('id', 'in', j_ids)]) + journal_ids = journal_obj.search(cr, uid, [('auto_cash', '=', True), ('type', '=', 'cash'), ('id', 'in', j_ids)], context=context) - for journal in journal_obj.browse(cr, uid, journal_ids): - ids = statement_obj.search(cr, uid, [('state', '!=', 'confirm'), ('user_id', '=', uid), ('journal_id', '=', journal.id)]) + for journal in journal_obj.browse(cr, uid, journal_ids, context=context): + ids = statement_obj.search(cr, uid, [('state', '!=', 'confirm'), ('user_id', '=', uid), ('journal_id', '=', journal.id)], context=context) if len(ids): raise osv.except_osv(_('Message'), _('You can not open a Cashbox for "%s".\nPlease close its related Register.' %(journal.name))) - + number = '' if journal.sequence_id: number = sequence_obj.get_id(cr, uid, journal.sequence_id.id) @@ -62,27 +62,26 @@ class pos_open_statement(osv.osv_memory): 'user_id': uid, 'state': 'draft', 'name': number }) - statement_id = statement_obj.create(cr, uid, data) + statement_id = statement_obj.create(cr, uid, data, context=context) statement_obj.button_open(cr, uid, [statement_id], context) - data_obj = self.pool.get('ir.model.data') - id2 = data_obj._get_id(cr, uid, 'account', 'view_bank_statement_tree') - id3 = data_obj._get_id(cr, uid, 'account', 'view_bank_statement_form2') - result = data_obj._get_id(cr, uid, 'point_of_sale', 'view_pos_open_cash_statement_filter') + id2 = mod_obj._get_id(cr, uid, 'account', 'view_bank_statement_tree') + id3 = mod_obj._get_id(cr, uid, 'account', 'view_bank_statement_form2') + result = mod_obj._get_id(cr, uid, 'point_of_sale', 'view_pos_open_cash_statement_filter') search_id = mod_obj.read(cr, uid, result, ['res_id'], context=context) if id2: - id2 = data_obj.browse(cr, uid, id2, context=context).res_id + id2 = mod_obj.browse(cr, uid, id2, context=context).res_id if id3: - id3 = data_obj.browse(cr, uid, id3, context=context).res_id + id3 = mod_obj.browse(cr, uid, id3, context=context).res_id return { - 'domain': "[('state','=','open'),('user_id','=',"+ str(uid) +")]", + 'domain': "[('state', '=', 'open'),('user_id', '=', "+ str(uid) +")]", 'name': 'Open Statement', 'view_type': 'form', - 'view_mode': 'tree,form', + 'view_mode': 'tree, form', 'search_view_id': search_id['res_id'], 'res_model': 'account.bank.statement', - 'views': [(id2, 'tree'),(id3, 'form')], + 'views': [(id2, 'tree'), (id3, 'form')], 'context': {'search_default_open': 1}, 'type': 'ir.actions.act_window' } diff --git a/addons/point_of_sale/wizard/pos_payment.py b/addons/point_of_sale/wizard/pos_payment.py index 1c92ad24132..2d9b1a5d402 100644 --- a/addons/point_of_sale/wizard/pos_payment.py +++ b/addons/point_of_sale/wizard/pos_payment.py @@ -19,16 +19,18 @@ # ############################################################################## -from osv import osv,fields +import time + +from osv import osv, fields from tools.translate import _ import pos_box_entries -import time + class pos_make_payment(osv.osv_memory): _name = 'pos.make.payment' _description = 'Point of Sale Payment' - def default_get(self, cr, uid, fields, context): + def default_get(self, cr, uid, fields, context=None): """ To get default values for the object. @param self: The object pointer. @@ -38,40 +40,40 @@ class pos_make_payment(osv.osv_memory): @param context: A standard dictionary @return: A dictionary which of fields with values. """ + if context is None: + context = {} + j_obj = self.pool.get('account.journal') + order_obj=self.pool.get('pos.order') res = super(pos_make_payment, self).default_get(cr, uid, fields, context=context) - active_id = context and context.get('active_id',False) + active_id = context and context.get('active_id', False) if active_id: - j_obj = self.pool.get('account.journal') cr.execute("SELECT DISTINCT journal_id FROM pos_journal_users " - "WHERE user_id=%d ORDER BY journal_id"% (uid,)) + "WHERE user_id = %d ORDER BY journal_id"% (uid, )) j_ids = map(lambda x1: x1[0], cr.fetchall()) - journal = j_obj.search(cr, uid, [('type', '=', 'cash'), ('id', 'in', j_ids)]) - + journal = j_obj.search(cr, uid, [('type', '=', 'cash'), ('id', 'in', j_ids)], context=context) journal = journal and journal[0] or False - - order_obj=self.pool.get('pos.order') - order = order_obj.browse(cr, uid, active_id, context) + order = order_obj.browse(cr, uid, active_id, context=context) #get amount to pay amount = order.amount_total - order.amount_paid if amount <= 0.0: context.update({'flag': True}) order_obj.action_paid(cr, uid, [active_id], context) elif order.amount_paid > 0.0: - order_obj.write(cr, uid, [active_id], {'state': 'advance'}) + order_obj.write(cr, uid, [active_id], {'state': 'advance'}, context=context) invoice_wanted_checked = False current_date = time.strftime('%Y-%m-%d') if 'journal' in fields: - res.update({'journal':journal}) + res.update({'journal': journal}) if 'amount' in fields: - res.update({'amount':amount}) + res.update({'amount': amount}) if 'invoice_wanted' in fields: - res.update({'invoice_wanted':invoice_wanted_checked}) + res.update({'invoice_wanted': invoice_wanted_checked}) if 'payment_date' in fields: - res.update({'payment_date':current_date}) + res.update({'payment_date': current_date}) if 'payment_name' in fields: - res.update({'payment_name':'Payment'}) + res.update({'payment_name': 'Payment'}) if 'partner_id' in fields: res.update({'partner_id': order.partner_id.id or False}) if 'pricelist_id' in fields: @@ -82,7 +84,7 @@ class pos_make_payment(osv.osv_memory): super(pos_make_payment, self).view_init(cr, uid, fields_list, context=context) active_id = context and context.get('active_id', False) or False if active_id: - order = self.pool.get('pos.order').browse(cr, uid, active_id) + order = self.pool.get('pos.order').browse(cr, uid, active_id, context=context) if not order.lines: raise osv.except_osv(_('Error!'),_('No order lines defined for this sale ')) return True @@ -99,15 +101,15 @@ class pos_make_payment(osv.osv_memory): @return: New arch of view. """ - - result = super(pos_make_payment, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False) + if context is None: + context = {} active_model = context.get('active_model') active_id = context.get('active_id', False) if not active_id or (active_model and active_model != 'pos.order'): return result - order = self.pool.get('pos.order').browse(cr, uid, active_id) + order = self.pool.get('pos.order').browse(cr, uid, active_id, context=context) if order.amount_total == order.amount_paid: result['arch'] = """ <form string="Make Payment" colspan="4"> <group col="2" colspan="2"> @@ -132,26 +134,25 @@ class pos_make_payment(osv.osv_memory): amount = amount - product.list_price return {'value': {'amount': amount}} - def check(self, cr, uid, ids, context): - + def check(self, cr, uid, ids, context=None): """Check the order: if the order is not paid: continue payment, if the order is paid print invoice (if wanted) or ticket. """ - active_id = context and context.get('active_id',False) order_obj = self.pool.get('pos.order') + active_id = context and context.get('active_id', False) order = order_obj.browse(cr, uid, active_id, context) amount = order.amount_total - order.amount_paid - data = self.read(cr, uid, ids)[0] + data = self.read(cr, uid, ids, context=context)[0] invoice_wanted = data['invoice_wanted'] is_accompte = data['is_acc'] # Todo need to check ... if is_accompte: line_id, price = order_obj.add_product(cr, uid, order.id, data['product_id'], -1.0, context) amount = order.amount_total - order.amount_paid - price - + if amount != 0.0: - order_obj.write(cr, uid, [active_id], {'invoice_wanted': invoice_wanted, 'partner_id': data['partner_id']}) + order_obj.write(cr, uid, [active_id], {'invoice_wanted': invoice_wanted, 'partner_id': data['partner_id']}, context=context) order_obj.add_payment(cr, uid, active_id, data, context=context) if order_obj.test_paid(cr, uid, [active_id]): @@ -159,33 +160,33 @@ class pos_make_payment(osv.osv_memory): order_obj.action_invoice(cr, uid, [active_id], context) order_obj.create_picking(cr, uid, [active_id], context) if context.get('return'): - order_obj.write(cr, uid, [active_id],{'state':'done'}) + order_obj.write(cr, uid, [active_id], {'state':'done'}, context=context) else: - order_obj.write(cr, uid, [active_id],{'state':'paid'}) + order_obj.write(cr, uid, [active_id],{'state':'paid'}, context=context) return self.create_invoice(cr, uid, ids, context) else: context.update({'flag': True}) order_obj.action_paid(cr, uid, [active_id], context) if context.get('return'): - order_obj.write(cr, uid, [active_id],{'state':'done'}) + order_obj.write(cr, uid, [active_id], {'state':'done'}, context=context) else: - order_obj.write(cr, uid, [active_id],{'state':'paid'}) + order_obj.write(cr, uid, [active_id], {'state':'paid'}, context=context) return self.print_report(cr, uid, ids, context) if order.amount_paid > 0.0: context.update({'flag': True}) # Todo need to check order_obj.action_paid(cr, uid, [active_id], context) - order_obj.write(cr, uid, [active_id],{'state': 'advance'}) + order_obj.write(cr, uid, [active_id], {'state': 'advance'}, context=context) return self.print_report(cr, uid, ids, context) return {} - def create_invoice(self, cr, uid, ids, context): + def create_invoice(self, cr, uid, ids, context=None): """ Create a invoice """ - active_ids = [context and context.get('active_id',False)] + active_ids = [context and context.get('active_id', False)] datas = {'ids': active_ids} datas['form'] = {} return { @@ -204,12 +205,11 @@ class pos_make_payment(osv.osv_memory): @return : retrun report """ if not context: - context={} - active_id=context.get('active_id',[]) + context = {} + active_id = context.get('active_id', []) datas = {'ids' : [active_id]} res = {} datas['form'] = res - return { 'type': 'ir.actions.report.xml', 'report_name': 'pos.receipt', @@ -217,14 +217,14 @@ class pos_make_payment(osv.osv_memory): } _columns = { - 'journal':fields.selection(pos_box_entries.get_journal, "Cash Register",required=True), + 'journal': fields.selection(pos_box_entries.get_journal, "Cash Register", required=True), 'product_id': fields.many2one('product.product', "Advance"), - 'amount':fields.float('Amount', digits=(16,2) ,required= True), + 'amount': fields.float('Amount', digits=(16,2) ,required= True), 'payment_name': fields.char('Payment name', size=32, required=True), 'payment_date': fields.date('Payment date', required=True), 'is_acc': fields.boolean('Advance'), 'invoice_wanted': fields.boolean('Invoice'), - 'num_sale':fields.char('Num.File', size=32), + 'num_sale': fields.char('Num.File', size=32), 'pricelist_id': fields.many2one('product.pricelist', 'Pricelist'), 'partner_id': fields.many2one('res.partner', 'Customer'), } diff --git a/addons/point_of_sale/wizard/pos_payment_report.py b/addons/point_of_sale/wizard/pos_payment_report.py index 85863315bdb..893cb3c0fda 100644 --- a/addons/point_of_sale/wizard/pos_payment_report.py +++ b/addons/point_of_sale/wizard/pos_payment_report.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). # @@ -15,20 +15,18 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <http://www.gnu.org/licenses/>. # ############################################################################## - from osv import osv from tools.translate import _ - class pos_payment_report(osv.osv_memory): _name = 'pos.payment.report' _description = 'Payment Report' - def print_report(self, cr, uid, ids, context={}): + def print_report(self, cr, uid, ids, context=None): """ To get the date and print the report @param self: The object pointer. @@ -37,7 +35,8 @@ class pos_payment_report(osv.osv_memory): @param context: A standard dictionary @return : retrun report """ - + if context is None: + context = {} datas = {'ids': context.get('active_ids', [])} return { 'type': 'ir.actions.report.xml', diff --git a/addons/point_of_sale/wizard/pos_payment_report_date.py b/addons/point_of_sale/wizard/pos_payment_report_date.py index 0830e092081..f2e3fb40419 100644 --- a/addons/point_of_sale/wizard/pos_payment_report_date.py +++ b/addons/point_of_sale/wizard/pos_payment_report_date.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). # @@ -15,20 +15,21 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <http://www.gnu.org/licenses/>. # ############################################################################## +import time + from osv import osv from osv import fields -import time class pos_payment_report_date(osv.osv_memory): _name = 'pos.payment.report.date' _description = 'POS Payment Report according to date' - def print_report(self, cr, uid, ids, context=None): + def print_report(self, cr, uid, ids, context=None): """ To get the date and print the report @param self: The object pointer. @@ -37,8 +38,10 @@ class pos_payment_report_date(osv.osv_memory): @param context: A standard dictionary @return : retrun report """ + if context is None: + context = {} datas = {'ids': context.get('active_ids', [])} - res = self.read(cr, uid, ids, ['date_start', 'date_end', 'user_id']) + res = self.read(cr, uid, ids, ['date_start', 'date_end', 'user_id'], context=context) res = res and res[0] or {} datas['form'] = res @@ -54,8 +57,8 @@ class pos_payment_report_date(osv.osv_memory): 'user_id': fields.many2many('res.users', 'res_user_sale', 'user_id', 'sale_id', 'Salesman') } _defaults = { - 'date_start': lambda *a: time.strftime('%Y-%m-%d'), - 'date_end': lambda *a: time.strftime('%Y-%m-%d'), + 'date_start': time.strftime('%Y-%m-%d'), + 'date_end': time.strftime('%Y-%m-%d'), } pos_payment_report_date() diff --git a/addons/point_of_sale/wizard/pos_payment_report_user.py b/addons/point_of_sale/wizard/pos_payment_report_user.py index 1ac927a4fcd..02db921618b 100644 --- a/addons/point_of_sale/wizard/pos_payment_report_user.py +++ b/addons/point_of_sale/wizard/pos_payment_report_user.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). # @@ -15,19 +15,16 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <http://www.gnu.org/licenses/>. # ############################################################################## -from osv import osv -from osv import fields - +from osv import osv, fields class pos_payment_report_user(osv.osv_memory): _name = 'pos.payment.report.user' _description = 'Sales lines by Users' def print_report(self, cr, uid, ids, context=None): - """ To get the date and print the report @param self: The object pointer. @@ -36,11 +33,12 @@ class pos_payment_report_user(osv.osv_memory): @param context: A standard dictionary @return : retrun report """ + if context is None: + context = {} datas = {'ids': context.get('active_ids', [])} - res = self.read(cr, uid, ids, ['user_id']) + res = self.read(cr, uid, ids, ['user_id'], context=context) res = res and res[0] or {} datas['form'] = res - return { 'type': 'ir.actions.report.xml', 'report_name': 'pos.payment.report.user', diff --git a/addons/procurement/i18n/ru.po b/addons/procurement/i18n/ru.po index c054abadc46..7a4ea638677 100644 --- a/addons/procurement/i18n/ru.po +++ b/addons/procurement/i18n/ru.po @@ -8,24 +8,24 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2010-10-18 17:46+0000\n" -"PO-Revision-Date: 2010-10-22 10:51+0000\n" +"PO-Revision-Date: 2010-10-26 08:01+0000\n" "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n" "Language-Team: Russian <ru@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-10-23 04:51+0000\n" +"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: procurement #: model:ir.ui.menu,name:procurement.menu_stock_sched msgid "Schedulers" -msgstr "" +msgstr "Планировщики" #. module: procurement #: model:ir.model,name:procurement.model_make_procurement msgid "Make Procurements" -msgstr "" +msgstr "Сделать закупки" #. module: procurement #: help:procurement.order.compute.all,automatic:0 @@ -38,12 +38,12 @@ msgstr "" #. module: procurement #: view:stock.warehouse.orderpoint:0 msgid "Group By..." -msgstr "" +msgstr "Объединять по..." #. module: procurement #: view:procurement.order:0 msgid "Planification" -msgstr "" +msgstr "Планирование" #. module: procurement #: code:addons/procurement/procurement.py:0 @@ -86,7 +86,7 @@ msgstr "Компания" #. module: procurement #: field:procurement.order,product_uos_qty:0 msgid "UoS Quantity" -msgstr "" +msgstr "Кол-во во второй ед. изм." #. module: procurement #: view:procurement.order:0 @@ -140,7 +140,7 @@ msgstr "" #. module: procurement #: view:stock.warehouse.orderpoint:0 msgid "Minimum Stock Rules Search" -msgstr "" +msgstr "Искать правила минимальных запасов" #. module: procurement #: help:stock.warehouse.orderpoint,product_min_qty:0 @@ -148,6 +148,9 @@ msgid "" "When the virtual stock goes belong the Min Quantity, OpenERP generates a " "procurement to bring the virtual stock to the Max Quantity." msgstr "" +"Когда виртуальные запасы становятся меньше минимального количества, OpenERP " +"создает запрос на снабжение, чтобы довести виртуальные запасы до " +"максимального количества." #. module: procurement #: view:procurement.order.compute.all:0 @@ -157,7 +160,7 @@ msgstr "Параметры планировщика" #. module: procurement #: model:ir.model,name:procurement.model_stock_move msgid "Stock Move" -msgstr "" +msgstr "Движение ТМЦ" #. module: procurement #: selection:procurement.order,state:0 @@ -167,12 +170,12 @@ msgstr "Готово" #. module: procurement #: field:procurement.order.compute.all,automatic:0 msgid "Automatic orderpoint" -msgstr "" +msgstr "Автоматическая точка заказа" #. module: procurement #: field:mrp.property,composition:0 msgid "Properties composition" -msgstr "" +msgstr "Составление свойств" #. module: procurement #: selection:procurement.order,state:0 @@ -201,11 +204,13 @@ msgid "" "Reference of the document that created this Procurement.\n" "This is automatically completed by OpenERP." msgstr "" +"Ссылка на документ, создавший этот запрос на снабжение.\n" +"Выполнено OpenERP автоматически." #. module: procurement #: model:ir.model,name:procurement.model_stock_warehouse_orderpoint msgid "Minimum Inventory Rule" -msgstr "" +msgstr "Правило минимума ТМЦ" #. module: procurement #: field:procurement.order,priority:0 @@ -228,7 +233,7 @@ msgstr "Местоположение" #. module: procurement #: model:ir.model,name:procurement.model_stock_picking msgid "Picking List" -msgstr "" +msgstr "Комплектовочный лист" #. module: procurement #: field:make.procurement,warehouse_id:0 @@ -250,7 +255,7 @@ msgstr "Продукция и местоположения" #. module: procurement #: model:ir.model,name:procurement.model_procurement_order_compute msgid "Compute Procurement" -msgstr "" +msgstr "Вычислить снабжение" #. module: procurement #: model:ir.module.module,shortdesc:procurement.module_meta_information @@ -289,6 +294,7 @@ msgstr "Количество" #, python-format msgid "Not enough stock and no minimum orderpoint rule defined." msgstr "" +"Не достаточный запас и не определено правило минимальной точки заказа." #. module: procurement #: code:addons/procurement/procurement.py:0 @@ -322,6 +328,8 @@ msgid "" "If you encode manually a Procurement, you probably want to use a make to " "order method." msgstr "" +"Если вы составляете запрос на снабжение вручную, вероятно вы хотите " +"использовать изготовление на заказ." #. module: procurement #: view:res.company:0 @@ -331,7 +339,7 @@ msgstr "ПМР и Логистическое планирование" #. module: procurement #: model:ir.ui.menu,name:procurement.menu_stock_procurement msgid "Automatic Procurements" -msgstr "" +msgstr "Автоматическое снабжение" #. module: procurement #: field:stock.warehouse.orderpoint,product_max_qty:0 @@ -363,12 +371,12 @@ msgstr "Исключения" #. module: procurement #: model:process.node,note:procurement.process_node_serviceonorder0 msgid "Assignment from Production or Purchase Order." -msgstr "" +msgstr "Выделение из заказа на производство или на закупку." #. module: procurement #: model:ir.model,name:procurement.model_mrp_property msgid "Property" -msgstr "" +msgstr "Параметр" #. module: procurement #: model:ir.actions.act_window,name:procurement.act_make_procurement @@ -379,7 +387,7 @@ msgstr "Заявка на снабжение" #. module: procurement #: view:procurement.orderpoint.compute:0 msgid "Compute Stock" -msgstr "" +msgstr "Вычислить запасы" #. module: procurement #: view:procurement.order:0 @@ -422,11 +430,14 @@ msgid "" "When the virtual stock goes belong the Max Quantity, OpenERP generates a " "procurement to bring the virtual stock to the Max Quantity." msgstr "" +"Когда виртуальные запасы становятся меньше максимального количества, OpenERP " +"создает запрос на снабжение, чтобы довести виртуальные запасы до " +"максимального количества." #. module: procurement #: help:procurement.orderpoint.compute,automatic:0 msgid "If the stock of a product is under 0, it will act like an orderpoint" -msgstr "" +msgstr "Если остатки ТМЦ меньше 0, это будет действовать как точка заказа" #. module: procurement #: view:procurement.order:0 @@ -443,6 +454,11 @@ msgid "" "background, you may have to wait for a few minutes until it has finished " "computing." msgstr "" +"Этот мастер позволяет вам обработать все заказы на снабжение, производство " +"и/или закупку, которые будут обработана в соответствии с их настройками. По " +"умолчанию, планировщик запускается каждую ночь. Вы можете использовать это " +"меню для его принудительного запуска. Помните, что он работает в фоновом " +"режиме, вы должны подождать несколько минут до окончания обработки." #. module: procurement #: view:procurement.order:0 @@ -458,7 +474,7 @@ msgstr "Черновик" #. module: procurement #: constraint:ir.ui.menu:0 msgid "Error ! You can not create recursive Menu." -msgstr "" +msgstr "Ошибка ! Нельзя создать зацикленные меню." #. module: procurement #: constraint:ir.model:0 @@ -480,6 +496,9 @@ msgid "" "procurements. All procurements that are not between today and today+range " "are skipped for futur computation." msgstr "" +"Это временные рамки, обрабатываемые планировщиком при расчете снабжения. Все " +"снабжение, которое не находится между сегодня и сегодня+срок оставляется для " +"будущих расчетов." #. module: procurement #: selection:procurement.order,priority:0 @@ -497,6 +516,8 @@ msgid "" "If the active field is set to true, it will allow you to hide the orderpoint " "without removing it." msgstr "" +"Если значение активного поля \"истина\", то это позволит вам скрыть точку " +"заказа" #. module: procurement #: field:stock.warehouse.orderpoint,active:0 @@ -506,7 +527,7 @@ msgstr "Активно" #. module: procurement #: model:process.node,name:procurement.process_node_procureproducts0 msgid "Procure Products" -msgstr "" +msgstr "Снабжение товарами" #. module: procurement #: field:procurement.order,date_planned:0 @@ -522,17 +543,17 @@ msgstr "Исключение" #: code:addons/procurement/schedulers.py:0 #, python-format msgid "Automatic OP: %s" -msgstr "" +msgstr "Авто точка зак.: %s" #. module: procurement #: model:ir.model,name:procurement.model_procurement_orderpoint_compute msgid "Automatic Order Point" -msgstr "" +msgstr "Автоматическая точка заказа" #. module: procurement #: field:stock.warehouse.orderpoint,qty_multiple:0 msgid "Qty Multiple" -msgstr "" +msgstr "Кратное кол-во" #. module: procurement #: model:ir.model,name:procurement.model_res_company @@ -558,12 +579,12 @@ msgstr "Причина снабжения" #: code:addons/procurement/procurement.py:0 #, python-format msgid "Qty Multiple must be greater than zero." -msgstr "" +msgstr "Кратное кол-во должно быть больше 0." #. module: procurement #: selection:stock.warehouse.orderpoint,logic:0 msgid "Order to Max" -msgstr "" +msgstr "Заказ по максимуму" #. module: procurement #: field:procurement.order,date_close:0 @@ -574,19 +595,19 @@ msgstr "Дата закрытия" #: code:addons/procurement/procurement.py:0 #, python-format msgid "Procurement '%s' is in exception: not enough stock." -msgstr "" +msgstr "Снабжение '%s' - исключительная ситуация: не достаточный запас." #. module: procurement #: code:addons/procurement/procurement.py:0 #, python-format msgid "Cannot delete Procurement Order(s) which are in %s State!" -msgstr "" +msgstr "Нельзя удалить заказ(ы) на снабжение в состоянии %s !" #. module: procurement #: code:addons/procurement/procurement.py:0 #, python-format msgid "Data Insufficient !" -msgstr "" +msgstr "Недостаточно данных !" #. module: procurement #: model:ir.model,name:procurement.model_mrp_property_group @@ -618,7 +639,7 @@ msgstr "Общая информация" #. module: procurement #: view:procurement.order:0 msgid "Run Procurement" -msgstr "" +msgstr "Запустить снабжение" #. module: procurement #: selection:procurement.order,state:0 @@ -628,7 +649,7 @@ msgstr "Готово" #. module: procurement #: help:stock.warehouse.orderpoint,qty_multiple:0 msgid "The procurement quantity will by rounded up to this multiple." -msgstr "" +msgstr "Закупаемое количество будет округляться до кратного." #. module: procurement #: view:make.procurement:0 @@ -643,7 +664,7 @@ msgstr "Отмена" #. module: procurement #: field:stock.warehouse.orderpoint,logic:0 msgid "Reordering Mode" -msgstr "" +msgstr "Режим изменения порядка" #. module: procurement #: field:procurement.order,origin:0 @@ -658,7 +679,7 @@ msgstr "Не срочно" #. module: procurement #: model:ir.model,name:procurement.model_procurement_order_compute_all msgid "Compute all schedulers" -msgstr "" +msgstr "Вычисление всех планировщиков" #. module: procurement #: view:procurement.order:0 @@ -677,7 +698,7 @@ msgstr "Детали" #: model:ir.actions.act_window,name:procurement.procurement_exceptions #: model:ir.ui.menu,name:procurement.menu_stock_procurement_action msgid "Procurement Exceptions" -msgstr "" +msgstr "Исключитель" #. module: procurement #: model:ir.actions.act_window,name:procurement.act_procurement_2_stock_warehouse_orderpoint @@ -710,7 +731,7 @@ msgstr "ТМЦ" #. module: procurement #: view:procurement.order:0 msgid "Temporary" -msgstr "" +msgstr "Временный" #. module: procurement #: field:mrp.property,description:0 @@ -726,7 +747,7 @@ msgstr "мин." #. module: procurement #: view:stock.warehouse.orderpoint:0 msgid "Quantity Rules" -msgstr "" +msgstr "Правила количеств" #. module: procurement #: selection:procurement.order,state:0 @@ -766,7 +787,7 @@ msgstr "Резервирование" #. module: procurement #: model:process.node,note:procurement.process_node_procureproducts0 msgid "The way to procurement depends on the product type." -msgstr "" +msgstr "Способ снабжения зависит от вида ТМЦ." #. module: procurement #: view:make.procurement:0 @@ -774,6 +795,8 @@ msgid "" "This wizard will plan the procurement for this product. This procurement may " "generate task, production orders or purchase orders." msgstr "" +"Этот мастер будет планировать снабжение этой продукцией. Процесс снабжения " +"может генерировать задачи, заказы на производство, заказы на закупку." #. module: procurement #: field:mrp.property,name:0 @@ -789,7 +812,7 @@ msgstr "макс." #. module: procurement #: field:procurement.order,product_uos:0 msgid "Product UoS" -msgstr "" +msgstr "Вторая ед. изм." #. module: procurement #: code:addons/procurement/procurement.py:0 @@ -802,13 +825,14 @@ msgstr "" #: model:ir.ui.menu,name:procurement.menu_stock_proc_schedulers #: view:procurement.order.compute.all:0 msgid "Compute Schedulers" -msgstr "" +msgstr "Вычислить планировщики" #. module: procurement #: view:procurement.orderpoint.compute:0 msgid "" "Wizard checks all the stock minimum rules and generate procurement order." msgstr "" +"Мастер проверит все правила минимальных запасов и создаст заказ на снабжение." #. module: procurement #: field:procurement.order,product_uom:0 @@ -828,7 +852,7 @@ msgstr "Весьма срочно" #. module: procurement #: field:procurement.orderpoint.compute,automatic:0 msgid "Automatic Orderpoint" -msgstr "" +msgstr "Авто точка заказа" #. module: procurement #: view:procurement.order:0 @@ -838,13 +862,13 @@ msgstr "Детали снабжения" #. module: procurement #: constraint:ir.rule:0 msgid "Rules are not supported for osv_memory objects !" -msgstr "" +msgstr "Для объектов osv_memory правила не поддерживаются !" #. module: procurement #: code:addons/procurement/schedulers.py:0 #, python-format msgid "SCHEDULER" -msgstr "" +msgstr "ПЛАНИРОВЩИК" #~ msgid "Temporary Procurement Exceptions" #~ msgstr "Временные исключения снабжения" diff --git a/addons/product/i18n/ru.po b/addons/product/i18n/ru.po index 5e7e427abab..3992fb4f2b0 100644 --- a/addons/product/i18n/ru.po +++ b/addons/product/i18n/ru.po @@ -6,575 +6,769 @@ msgid "" 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-09-29 11:26+0000\n" +"POT-Creation-Date: 2010-10-18 17:46+0000\n" +"PO-Revision-Date: 2010-10-26 08:48+0000\n" "Last-Translator: Chertykov Denis <chertykov@gmail.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-09-30 04:43+0000\n" +"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: product -#: view:product.pricelist.item:0 -msgid "Max. Margin" -msgstr "Макс. маржа" +#: model:product.template,name:product.product_product_ram512_product_template +msgid "DDR 512MB PC400" +msgstr "DDR 512MB PC400" #. module: product -#: view:product.pricelist.item:0 -msgid "Base Price" -msgstr "Базовая цена" +#: field:product.packaging,rows:0 +msgid "Number of Layers" +msgstr "Количество уровней" #. module: product -#: help:product.template,standard_price:0 +#: code:addons/product/pricelist.py:0 +#: constraint:product.pricelist.item:0 +#, python-format msgid "" -"The cost of the product for accounting stock valuation. It can serves as a " -"base price for supplier price." +"Error ! You cannot assign the Main Pricelist as Other Pricelist in PriceList " +"Item!" msgstr "" +"Ошибка ! Нельзя определить Главный Каталог как Другой Каталог в объекте " +"Каталог!" #. module: product -#: selection:product.template,type:0 -msgid "Service" -msgstr "Услуга" - -#. module: product -#: help:product.template,purchase_ok:0 +#: help:product.pricelist.item,product_tmpl_id:0 msgid "" -"Determine if the product is visible in the list of products within a " -"selection from a purchase order line." +"Set a template if this rule only apply to a template of product. Keep empty " +"for all products" msgstr "" -"Должно ли изделие быть видимым при выборе из списка изделий в форме заказа" +"Установите шаблон, если правило применяется только для шаблона продукции. " +"Оставьте пустым для всей продукции." #. module: product -#: help:product.supplierinfo,name:0 -msgid "Supplier of this product" -msgstr "Поставщик этой продукции" +#: constraint:ir.actions.act_window:0 +msgid "Invalid model name in the action definition." +msgstr "Недопустимое имя модели в определении действия." #. module: product -#: model:product.template,name:product.product_product_ram512_product_template -msgid "DDR 512MB PC400" -msgstr "DDR 512MB PC400" +#: model:product.category,name:product.cat1 +msgid "Sellable" +msgstr "Для продажи" #. module: product -#: model:product.template,name:product.product_product_0_product_template -msgid "Onsite Senior Intervention" -msgstr "Вмешательство руководства на месте" +#: model:product.template,name:product.product_product_mb2_product_template +msgid "Mainboard ASUStek A7V8X-X" +msgstr "Материнская плата ASUStek A7V8X-X" #. module: product -#: help:product.supplierinfo,qty:0 -msgid "" -"The minimal quantity to purchase for this supplier, expressed in the default " -"unit of measure." +#: help:product.template,seller_qty:0 +msgid "This is minimum quantity to purchase from Main Supplier." +msgstr "Это минимальное количество для закупки у основного поставщика." + +#. module: product +#: model:product.uom,name:product.uom_day +msgid "Day" +msgstr "День" + +#. module: product +#: view:product.product:0 +msgid "UoM" +msgstr "Ед. изм." + +#. module: product +#: model:product.template,name:product.product_product_pc2_product_template +msgid "Basic+ PC (assembly on order)" msgstr "" -"Минимальный размер закупки от этого поставщика, выраженный в стандартных " -"единицах измерения." #. module: product -#: field:product.template,weight_net:0 -msgid "Net weight" -msgstr "Вес нетто" +#: field:product.product,incoming_qty:0 +msgid "Incoming" +msgstr "Входящие" #. module: product -#: help:product.product,incoming_qty:0 +#: field:product.template,mes_type:0 +msgid "Measure Type" +msgstr "Тип измерения" + +#. module: product +#: help:res.partner,property_product_pricelist:0 msgid "" -"Quantities of products that are planned to arrive in selected locations or " -"all internal if none have been selected." +"This pricelist will be used, instead of the default one, for sales to the " +"current partner" msgstr "" -"Объемы продукции, которые планируется достичь в выбранных местах или все " -"внутренние, если никакие не были выбраны." +"Для продаж текущему партнеру, вместо каталога по умолчанию, будет " +"использоваться этот каталог" #. module: product -#: help:product.product,virtual_available:0 +#: constraint:product.supplierinfo:0 msgid "" -"Futur stock for this product according to the selected location or all " -"internal if none have been selected. Computed as: Real Stock - Outgoing + " -"Incoming." +"Error: The default UOM and the Supplier Product UOM must be in the same " +"category." msgstr "" +"Ошибка: ед. изм. по умолчанию и ед. изм. поставщика продукции должны быть из " +"одной категории." #. module: product -#: field:product.packaging,width:0 -msgid "Width" -msgstr "Ширина" +#: field:product.template,seller_qty:0 +msgid "Supplier Quantity" +msgstr "" #. module: product -#: help:product.pricelist.item,product_tmpl_id:0 -msgid "" -"Set a template if this rule only apply to a template of product. Keep empty " -"for all products" -msgstr "" -"Установите шаблон, если правило применяется только для шаблона продукции. " -"Оставьте пустым для всей продукции." +#: selection:product.template,mes_type:0 +msgid "Fixed" +msgstr "Фиксированный" #. module: product -#: field:product.template,procure_method:0 -msgid "Procure Method" -msgstr "Метод закупки" +#: code:addons/product/pricelist.py:0 +#, python-format +msgid "Warning !" +msgstr "Внимание!" #. module: product -#: constraint:ir.actions.act_window:0 -msgid "Invalid model name in the action definition." -msgstr "Недопустимое имя модели в определении действия." +#: model:ir.actions.report.xml,name:product.report_product_pricelist +#: model:ir.model,name:product.model_product_pricelist +#: field:product.product,price:0 +#: field:product.product,pricelist_id:0 +#: view:product.supplierinfo:0 +msgid "Pricelist" +msgstr "Каталог" #. module: product -#: model:process.process,name:product.process_process_productprocess0 -msgid "Product Process" -msgstr "" +#: view:product.product:0 +#: view:product.template:0 +msgid "Base Prices" +msgstr "Базовае цены" #. module: product -#: help:product.price.type,field:0 -msgid "Associated field in the product form." -msgstr "Связанные поля в форме изделия" +#: field:product.pricelist.item,name:0 +msgid "Rule Name" +msgstr "Название правила" #. module: product -#: selection:product.template,cost_method:0 -msgid "Standard Price" -msgstr "Стандартная цена" +#: field:product.product,code:0 +#: field:product.product,default_code:0 +msgid "Reference" +msgstr "Ссылка" #. module: product -#: help:product.packaging,height:0 -msgid "The height of the package" -msgstr "Высота упаковки" +#: constraint:product.category:0 +msgid "Error ! You can not create recursive categories." +msgstr "Ошибка ! Невозможно создать рекурсивную категорию." #. module: product -#: view:product.pricelist:0 -msgid "Products Price List" -msgstr "Каталог продукции" +#: model:product.template,name:product.product_product_24_product_template +msgid "Keyboard" +msgstr "Клавиатура" #. module: product -#: model:product.category,name:product.cat1 -msgid "Sellable" -msgstr "Для продажи" +#: model:ir.model,name:product.model_res_partner +msgid "Partner" +msgstr "Партнер" #. module: product -#: model:product.template,name:product.product_product_26_product_template -msgid "Kit Keyboard + Mouse" -msgstr "Комплект мыши и клавиатуры" +#: help:product.template,supply_method:0 +msgid "" +"Produce will generate production order or tasks, according to the product " +"type. Purchase will trigger purchase orders when requested." +msgstr "" +"Произвести - будет генерироваться заказ на производство или задача в " +"зависимости от типа продукции. Закупить - будет инициировать заказ на " +"закупку," #. module: product -#: field:product.price.type,name:0 -msgid "Price Name" -msgstr "Название цены" +#: selection:product.template,cost_method:0 +msgid "Average Price" +msgstr "Средняя цена" #. module: product -#: field:product.product,price:0 -msgid "Customer Price" -msgstr "Цена клиента" +#: help:product.pricelist.item,name:0 +msgid "Explicit rule name for this pricelist line." +msgstr "Название явного правила для позиции каталога." #. module: product -#: field:product.template,company_id:0 -msgid "Company" -msgstr "Компания" +#: model:ir.actions.act_window,name:product.product_uom_categ_form_action +#: model:ir.ui.menu,name:product.menu_product_uom_categ_form_action +msgid "Units of Measure Categories" +msgstr "Категории единиц измерения" #. module: product -#: field:product.template,rental:0 -msgid "Rentable Product" -msgstr "Изделие для аренды" +#: model:product.template,name:product.product_product_cpu1_product_template +msgid "Processor AMD Athlon XP 1800+" +msgstr "Процессор AMD Athlon XP 1800+" #. module: product -#: field:product.product,lst_price:0 -msgid "List Price" -msgstr "Цена по каталогу" +#: model:product.template,name:product.product_product_20_product_template +msgid "HDD on demand" +msgstr "HDD по требованию" #. module: product -#: model:ir.actions.act_window,name:product.product_price_type_action -#: model:ir.ui.menu,name:product.menu_product_price_type_action -msgid "Prices Types" -msgstr "Типы цен" +#: field:product.price_list,price_list:0 +msgid "PriceList" +msgstr "Прайс-лист" #. module: product -#: selection:product.template,type:0 -msgid "Stockable Product" -msgstr "Складируемая продукция" +#: field:product.supplierinfo,product_uom:0 +#: view:product.template:0 +msgid "UOM" +msgstr "Ед. изм." #. module: product -#: model:product.category,name:product.product_category_services -msgid "Services" -msgstr "Услуги" +#: model:product.uom,name:product.product_uom_unit +msgid "PCE" +msgstr "шт." #. module: product -#: help:product.template,list_price:0 +#: view:product.template:0 +msgid "Miscelleanous" +msgstr "Разное" + +#. module: product +#: model:product.template,name:product.product_product_worker0_product_template +msgid "Worker" +msgstr "Работник" + +#. module: product +#: help:product.template,sale_ok:0 msgid "" -"Base price for computing the customer price. Sometimes called the catalog " -"price." -msgstr "" -"Базовая цена для расчёта цены продажи. Иногда называется справочой ценой." +"Determines if the product can be visible in the list of product within a " +"selection from a sale order line." +msgstr "Определяет видимость продукции при выборе позиции заказа на продажу." #. module: product -#: field:pricelist.partnerinfo,min_quantity:0 -msgid "Quantity" -msgstr "Количество" +#: model:product.pricelist.version,name:product.ver0 +msgid "Default Public Pricelist Version" +msgstr "Версия открытого каталога по умолчанию" #. module: product -#: model:product.template,name:product.product_product_cpu3_product_template -msgid "Processor AMD Athlon XP 2200+" -msgstr "Процессор AMD Athlon XP 2200+" +#: selection:product.template,cost_method:0 +msgid "Standard Price" +msgstr "Стандартная цена" #. module: product -#: help:product.price.type,name:0 -msgid "Name of this kind of price." -msgstr "Наименование типа цены" +#: model:product.pricelist.type,name:product.pricelist_type_sale +#: field:res.partner,property_product_pricelist:0 +msgid "Sale Pricelist" +msgstr "Каталог продаж" #. module: product -#: help:product.pricelist.version,date_start:0 -msgid "Starting date for this pricelist version to be valid." -msgstr "Каталог действителен, начиная с даты" +#: view:product.template:0 +#: field:product.template,type:0 +msgid "Product Type" +msgstr "Тип ТМЦ" #. module: product -#: field:product.product,incoming_qty:0 -msgid "Incoming" -msgstr "Входящие" +#: view:product.uom:0 +msgid " e.g: 1 * (this unit) = ratio * (reference unit)" +msgstr "" #. module: product -#: selection:product.template,procure_method:0 -msgid "Make to Stock" -msgstr "Изготовление про запас" +#: code:addons/product/product.py:0 +#, python-format +msgid "Products: " +msgstr "ТМЦ: " #. module: product -#: view:product.product:0 -#: view:product.template:0 -msgid "Weigths" -msgstr "Вес" +#: constraint:product.template:0 +msgid "Error: UOS must be in a different category than the UOM" +msgstr "" +"Ошибка. Единицы продажи и единицы измерения должны принадлежать к разным " +"категориям." #. module: product -#: model:product.template,name:product.product_product_fan2_product_template -msgid "Silent fan" -msgstr "Тихий вентилятор" +#: field:product.category,parent_id:0 +msgid "Parent Category" +msgstr "Категория предка" #. module: product -#: help:product.template,supply_method:0 +#: help:product.product,outgoing_qty:0 msgid "" -"Produce will generate production order or tasks, according to the product " -"type. Purchase will trigger purchase orders when requested." +"Quantities of products that are planned to leave in selected locations or " +"all internal if none have been selected." msgstr "" +"Количества продукции, которые планируется отправить в указанные места, или " +"вся внутренняя, если ничего не выбранно." #. module: product -#: model:process.transition,note:product.process_transition_supplierofproduct0 -msgid "You can see the list of suppliers for that product." -msgstr "Вы можете просмотреть список поставщиков этого изделия" +#: help:product.template,procure_method:0 +msgid "" +"'Make to Stock': When needed, take from the stock or wait until re-" +"supplying. 'Make to Order': When needed, purchase or produce for the " +"procurement request." +msgstr "" +"'Изготовить на склад': при необходимости, взять со склада или ждать " +"поставки. 'Изготовить на заказ': при необходимости, закупить или произвести " +"по запросу на снабжение." #. module: product -#: help:product.packaging,rows:0 -msgid "The number of layer on a palet or box" -msgstr "Число слоёв на палете или в коробке" +#: model:process.node,note:product.process_node_supplier0 +msgid "Supplier name, price, product code, ..." +msgstr "Название поставщика, каталог, код ТМЦ, ..." #. module: product -#: model:product.pricelist.type,name:product.pricelist_type_sale -#: field:res.partner,property_product_pricelist:0 -msgid "Sale Pricelist" -msgstr "Каталог продаж" +#: model:product.template,name:product.product_product_hdd3_product_template +msgid "HDD Seagate 7200.8 160GB" +msgstr "Жёсткий диск Seagate 7200.8 160GB" #. module: product -#: field:product.pricelist.item,base_pricelist_id:0 -msgid "If Other Pricelist" -msgstr "В другом каталоге" +#: field:product.product,ean13:0 +msgid "EAN13" +msgstr "Штрих-код 13" #. module: product -#: model:ir.actions.act_window,name:product.product_normal_action -#: model:ir.actions.act_window,name:product.product_normal_action_tree -#: model:ir.ui.menu,name:product.menu_main_product -#: model:ir.ui.menu,name:product.menu_products +#: field:product.template,seller_id:0 +msgid "Main Supplier" +msgstr "Основной поставщик" + +#. module: product +#: model:ir.actions.act_window,name:product.product_ul_form_action +#: model:ir.model,name:product.model_product_packaging +#: model:ir.ui.menu,name:product.menu_product_ul_form_action +#: view:product.packaging:0 #: view:product.product:0 -msgid "Products" -msgstr "ТМЦ" +#: view:product.ul:0 +msgid "Packaging" +msgstr "Упаковка" #. module: product -#: help:product.pricelist.item,price_round:0 +#: view:product.product:0 +#: field:product.template,categ_id:0 +msgid "Category" +msgstr "Категория" + +#. module: product +#: help:product.pricelist.item,min_quantity:0 msgid "" -"Sets the price so that it is a multiple of this value.\n" -"Rounding is applied after the discount and before the surcharge.\n" -"To have prices that end in 9.99, set rounding 10, surcharge -0.01" +"The rule only applies if the partner buys/sells more than this quantity." msgstr "" -"Устанавливает цену кратной данному значению.\n" -"Округление применяется после скидки, но перед надбавкой.\n" -"Так, чтобы цена заканчивалась на 9,99, установите округление 10, надбавку -" -"0,01." +"Правило применяется только в случае, если партнёр покупает или продает более " +"этой величины." #. module: product -#: view:product.pricelist.item:0 -msgid "New Price =" -msgstr "Новая цена =" +#: model:product.template,name:product.product_product_woodmm0_product_template +msgid "Wood 2mm" +msgstr "" #. module: product -#: field:product.product,virtual_available:0 -msgid "Virtual Stock" -msgstr "Виртуальные запасы" +#: field:product.price_list,qty1:0 +msgid "Quantity-1" +msgstr "Количество-1" #. module: product -#: selection:product.template,mes_type:0 -msgid "Fixed" -msgstr "Фиксированный" +#: help:product.packaging,ul_qty:0 +msgid "The number of packages by layer" +msgstr "Количество упаковок на слой" #. module: product -#: model:ir.actions.act_window,name:product.product_uom_categ_form_action -#: model:ir.ui.menu,name:product.menu_product_uom_categ_form_action -msgid "Units of Measure Categories" -msgstr "Категории единиц измерения" +#: field:product.packaging,qty:0 +msgid "Quantity by Package" +msgstr "Количество по пакету" #. module: product -#: help:product.pricelist.item,product_id:0 +#: code:addons/product/pricelist.py:0 +#, python-format msgid "" -"Set a product if this rule only apply to one product. Keep empty for all " -"products" +"Could not resolve product category, ' \\n " +"'you have defined cyclic categories ' \\n " +"'of products!" msgstr "" +"Не удается определить категорию ТМЦ, '\\n' вы зациклили категории ' \\n 'ТМЦ!" #. module: product -#: model:ir.model,name:product.model_product_pricelist_type -#: field:product.pricelist,type:0 -#: view:product.pricelist.type:0 -msgid "Pricelist Type" -msgstr "Тип каталога" +#: view:product.product:0 +#: view:product.template:0 +#: field:product.template,state:0 +msgid "Status" +msgstr "Статус" + +#. module: product +#: help:product.template,categ_id:0 +msgid "Select category for the current product" +msgstr "Выберите категорию для ТМЦ" + +#. module: product +#: field:product.product,outgoing_qty:0 +msgid "Outgoing" +msgstr "Исходящее" + +#. module: product +#: selection:product.uom,uom_type:0 +msgid "Reference UoM for this category" +msgstr "Ссылка на ед. езм. для этой категории" + +#. module: product +#: model:product.price.type,name:product.list_price +msgid "Public Price" +msgstr "Открытый каталог" + +#. module: product +#: field:product.price_list,qty5:0 +msgid "Quantity-5" +msgstr "Количество-5" + +#. module: product +#: model:product.category,name:product.product_category_10 +msgid "IT components" +msgstr "ИТ компоненты" + +#. module: product +#: field:product.template,product_manager:0 +msgid "Product Manager" +msgstr "Менеджер продукции" + +#. module: product +#: field:product.supplierinfo,product_name:0 +msgid "Supplier Product Name" +msgstr "Название ТМЦ поставщика" + +#. module: product +#: model:product.template,name:product.product_product_pc3_product_template +msgid "Medium PC" +msgstr "Средний ПК" + +#. module: product +#: view:product.pricelist:0 +msgid "Products Price Search" +msgstr "Искать цену ТМЦ" #. module: product #: view:product.product:0 #: view:product.template:0 -msgid "Base Prices" -msgstr "Базовае цены" +#: field:product.template,description_sale:0 +msgid "Sale Description" +msgstr "Описание продужи" #. module: product -#: model:ir.ui.menu,name:product.menu_price -msgid "Prices Computations" -msgstr "Вычисление цен" +#: view:product.product:0 +#: view:product.template:0 +msgid "Storage Localisation" +msgstr "Место хранения" #. module: product -#: field:product.pricelist.item,name:0 -msgid "Rule Name" -msgstr "Название правила" +#: help:product.packaging,length:0 +msgid "The length of the package" +msgstr "Длина пакета" #. module: product -#: model:ir.ui.menu,name:product.menu_config_product -msgid "Configuration" -msgstr "Настройки" +#: help:product.template,weight_net:0 +msgid "The net weight in Kg." +msgstr "Вес нетто в килограммах." #. module: product -#: field:product.packaging,rows:0 -msgid "Number of Layer" -msgstr "Число слоёв" +#: help:product.template,state:0 +msgid "Tells the user if he can use the product or not." +msgstr "Сообщите пользователю, может ли он пользоваться продукцией" #. module: product -#: constraint:product.category:0 -msgid "Error ! You can not create recursive categories." -msgstr "Ошибка ! Невозможно создать рекурсивную категорию." +#: field:pricelist.partnerinfo,min_quantity:0 +#: field:product.supplierinfo,qty:0 +msgid "Quantity" +msgstr "Количество" #. module: product -#: field:product.template,uom_id:0 -msgid "Default UoM" -msgstr "Единица измерения по умолчанию" +#: field:product.packaging,height:0 +msgid "Height" +msgstr "Высота" #. module: product -#: field:product.template,produce_delay:0 -msgid "Manufacturing Lead Time" -msgstr "Время производства" +#: help:product.pricelist.version,date_end:0 +msgid "Ending date for this pricelist version to be valid." +msgstr "Конечная дата, до которой каталог действителен" #. module: product -#: field:product.supplierinfo,pricelist_ids:0 -msgid "Supplier Pricelist" -msgstr "Каталог поставщика" +#: model:product.category,name:product.cat0 +msgid "All products" +msgstr "Все ТМЦ" #. module: product -#: view:product.packaging:0 -#: view:product.product:0 -msgid "Pallet Dimension" +#: model:ir.model,name:product.model_pricelist_partnerinfo +msgid "pricelist.partnerinfo" msgstr "" #. module: product -#: field:product.pricelist.item,base:0 -msgid "Based on" -msgstr "На основе" +#: field:product.price_list,qty2:0 +msgid "Quantity-2" +msgstr "Количество-2" #. module: product -#: model:product.template,name:product.product_product_24_product_template -msgid "Keyboard" -msgstr "Клавиатура" +#: field:product.price_list,qty3:0 +msgid "Quantity-3" +msgstr "Количество-3" #. module: product -#: field:product.supplierinfo,name:0 -msgid "Partner" -msgstr "Партнер" +#: view:product.product:0 +msgid "Codes" +msgstr "Коды" #. module: product -#: field:product.template,sale_delay:0 -msgid "Customer Lead Time" +#: field:product.price_list,qty4:0 +msgid "Quantity-4" +msgstr "Количество-4" + +#. module: product +#: view:res.partner:0 +msgid "Sales & Purchases" +msgstr "Продажи и закупки" + +#. module: product +#: model:product.uom.categ,name:product.uom_categ_wtime +msgid "Working Time" +msgstr "Время работы" + +#. module: product +#: model:product.template,name:product.product_product_metalcleats0_product_template +msgid "Metal Cleats" +msgstr "Металлические зажимы" + +#. module: product +#: model:ir.model,name:product.model_product_uom_categ +msgid "Product uom categ" +msgstr "Категория ед. изм. продукции" + +#. module: product +#: model:product.ul,name:product.product_ul_box +msgid "Box 20x20x40" +msgstr "Ящик 20x20x40" + +#. module: product +#: view:product.pricelist.item:0 +msgid "Price Computation" +msgstr "Расчет цены" + +#. module: product +#: field:product.template,purchase_ok:0 +msgid "Can be Purchased" +msgstr "Можно закупать" + +#. module: product +#: model:product.template,name:product.product_product_cpu2_product_template +msgid "High speed processor config" msgstr "" #. module: product -#: model:product.template,name:product.product_product_25_product_template -msgid "Mouse" -msgstr "Мышь" +#: model:process.transition,note:product.process_transition_supplierofproduct0 +msgid "" +"1 or several supplier(s) can be linked to a product. All information stands " +"in the product form." +msgstr "" +"Один или несколько поставщиков могут быть связаны с ТМЦ. Вся информация в " +"форме ТМЦ." #. module: product -#: help:product.template,cost_method:0 +#: help:product.uom,category_id:0 msgid "" -"Standard Price: the cost price is fixed and recomputed periodically (usually " -"at the end of the year), Average Price: the cost price is recomputed at each " -"reception of products." +"Quantity conversions may happen automatically between Units of Measure in " +"the same category, according to their respective ratios." msgstr "" +"Между единицами измерения одной категории, преобразования количеств могут " +"происходить автоматически в соответствии с коэффициентами." #. module: product -#: field:product.pricelist,name:0 -msgid "Pricelist Name" -msgstr "Название прайс-листа" +#: help:product.packaging,width:0 +msgid "The width of the package" +msgstr "Ширина пакета" #. module: product -#: field:product.template,seller_ids:0 -msgid "Partners" -msgstr "Партнеры" +#: field:product.product,virtual_available:0 +msgid "Virtual Stock" +msgstr "Виртуальные запасы" #. module: product -#: selection:product.template,cost_method:0 -msgid "Average Price" -msgstr "Средняя цена" +#: selection:product.category,type:0 +msgid "View" +msgstr "Вид" #. module: product -#: model:process.node,note:product.process_node_product0 -msgid "Create new Product" -msgstr "Создать ТМЦ" +#: model:ir.actions.act_window,name:product.product_template_action_tree +msgid "Product Templates" +msgstr "Шаблоны ТМЦ" #. module: product -#: help:product.pricelist.item,name:0 -msgid "Explicit rule name for this pricelist line." -msgstr "" +#: model:product.template,name:product.product_product_restaurantexpenses0_product_template +msgid "Restaurant Expenses" +msgstr "Расходы ресторана" + +#. module: product +#: constraint:product.product:0 +msgid "Error: Invalid ean code" +msgstr "Ошибка: Неправильный штрих-код" + +#. module: product +#: field:product.pricelist.item,min_quantity:0 +msgid "Min. Quantity" +msgstr "Мин. кол-во" + +#. module: product +#: model:ir.model,name:product.model_product_price_type +msgid "Price Type" +msgstr "Тип цены" #. module: product #: view:product.pricelist.item:0 -msgid "Min. Margin" -msgstr "Мин. маржа" +msgid "Max. Margin" +msgstr "Макс. маржа" #. module: product #: view:product.pricelist.item:0 -msgid "* ( 1 + " -msgstr "* ( 1 + " +msgid "Base Price" +msgstr "Базовая цена" #. module: product -#: model:product.template,name:product.product_product_cpu1_product_template -msgid "Processor AMD Athlon XP 1800+" -msgstr "Процессор AMD Athlon XP 1800+" +#: model:product.template,name:product.product_product_fan2_product_template +msgid "Silent fan" +msgstr "Тихий вентилятор" #. module: product -#: selection:product.template,state:0 -msgid "In Production" -msgstr "В производстве" +#: help:product.supplierinfo,name:0 +msgid "Supplier of this product" +msgstr "Поставщик этой продукции" #. module: product -#: field:product.category,child_id:0 -msgid "Child Categories" -msgstr "Подчиненные категории" +#: help:product.pricelist.version,active:0 +msgid "" +"When a version is duplicated it is set to non active, so that the dates do " +"not overlaps with original version. You should change the dates and " +"reactivate the pricelist" +msgstr "" #. module: product -#: model:product.category,name:product.product_category_accessories -msgid "Accessories" -msgstr "Дополнительные" +#: model:product.template,name:product.product_product_kitshelfofcm0_product_template +msgid "KIT Shelf of 100cm" +msgstr "" #. module: product -#: field:product.supplierinfo,sequence:0 -msgid "Priority" -msgstr "Приоритет" +#: field:product.supplierinfo,name:0 +msgid "Supplier" +msgstr "Поставщик" #. module: product -#: model:product.template,name:product.product_product_20_product_template -msgid "HDD on demand" -msgstr "" +#: model:product.template,name:product.product_product_sidepanel0_product_template +msgid "Side Panel" +msgstr "Боковая панель" #. module: product -#: field:product.uom,factor_inv:0 -#: field:product.uom,factor_inv_data:0 -msgid "Factor" -msgstr "Множитель" +#: model:product.template,name:product.product_product_26_product_template +msgid "Kit Keyboard + Mouse" +msgstr "Комплект мыши и клавиатуры" #. module: product -#: wizard_button:product.price_list,init,price:0 -msgid "Print" -msgstr "Распечатать" +#: field:product.price.type,name:0 +msgid "Price Name" +msgstr "Название цены" #. module: product -#: model:process.node,name:product.process_node_supplier0 -msgid "Supplier Info" -msgstr "Информация о поставщике" +#: help:product.pricelist,active:0 +msgid "" +"If the active field is set to true, it will allow you to hide the pricelist " +"without removing it." +msgstr "" +"если поле \"Активно\" установлено в \"истина\", то это позволит вам скрыть " +"каталог без его удаления." #. module: product -#: field:product.ul,type:0 -msgid "Type" -msgstr "Тип" +#: model:product.template,name:product.product_product_cpu3_product_template +msgid "Processor AMD Athlon XP 2200+" +msgstr "Процессор AMD Athlon XP 2200+" #. module: product -#: wizard_field:product.price_list,init,price_list:0 -msgid "PriceList" -msgstr "Прайс-лист" +#: model:ir.actions.act_window,name:product.action_product_price_list +#: model:ir.model,name:product.model_product_price_list +#: view:product.price_list:0 +#: report:product.pricelist:0 +#: field:product.pricelist.version,pricelist_id:0 +msgid "Price List" +msgstr "Каталог" #. module: product #: view:product.product:0 #: view:product.template:0 -msgid "UOM" -msgstr "Ед. изм." +msgid "Suppliers" +msgstr "Поставщики" #. module: product -#: model:product.uom,name:product.product_uom_unit -msgid "PCE" -msgstr "шт." +#: view:product.product:0 +msgid "To Purchase" +msgstr "Для закупки" #. module: product -#: model:ir.actions.act_window,name:product.product_pricelist_action2 -#: model:ir.ui.menu,name:product.menu_product_pricelist_action2 -#: model:ir.ui.menu,name:product.menu_product_pricelist_main -msgid "Pricelists" -msgstr "Каталоги" +#: view:product.pricelist.item:0 +msgid "New Price =" +msgstr "Новая цена =" #. module: product -#: field:product.supplierinfo,product_name:0 -msgid "Partner Product Name" -msgstr "Наименование изделия партнёра" +#: help:product.pricelist.item,sequence:0 +msgid "Gives the sequence order when displaying a list of pricelist items." +msgstr "" +"Дает порядок последовательности при выводе элементов списка каталога." #. module: product -#: view:product.product:0 -#: view:product.template:0 -msgid "Miscelleanous" -msgstr "Разное" +#: model:product.category,name:product.product_category_accessories +msgid "Accessories" +msgstr "Дополнительные" #. module: product -#: help:product.pricelist.item,base:0 -msgid "The mode for computing the price for this rule." +#: field:product.template,sale_delay:0 +msgid "Customer Lead Time" msgstr "" #. module: product -#: model:ir.actions.act_window,name:product.product_uom_form_action -#: model:ir.ui.menu,name:product.menu_product_uom_form_action -#: model:ir.ui.menu,name:product.next_id_16 -#: view:product.uom:0 -msgid "Units of Measure" -msgstr "Единицы измерения" +#: model:process.transition,name:product.process_transition_supplierofproduct0 +msgid "Supplier of the product" +msgstr "Поставщик ТМЦ" #. module: product -#: field:product.product,partner_ref:0 -msgid "Customer ref" -msgstr "Ссылка на клиента" +#: help:product.template,uos_id:0 +msgid "" +"Used by companies that manage two units of measure: invoicing and inventory " +"management. For example, in food industries, you will manage a stock of ham " +"but invoice in Kg. Keep empty to use the default UOM." +msgstr "" +"Используется компаниями которые оперируют двумя единицами измерения: для " +"счетов и для управления запасами. Например, в пищевой индустрии. Оставьте " +"пустым для использования ед. изм. по умолчанию." #. module: product -#: field:product.supplierinfo,qty:0 -msgid "Minimal Quantity" -msgstr "Минимальное количество" +#: view:product.pricelist.item:0 +msgid "Min. Margin" +msgstr "Мин. маржа" #. module: product -#: model:product.category,name:product.product_category_pc -msgid "PC" -msgstr "ПК" +#: field:product.category,child_id:0 +msgid "Child Categories" +msgstr "Подчиненные категории" #. module: product -#: help:product.template,seller_delay:0 -msgid "" -"This is the average delay in days between the purchase order confirmation " -"and the reception of goods for this product and for the default supplier. It " -"is used by the scheduler to order requests based on reordering delays." -msgstr "" +#: field:product.pricelist.version,date_end:0 +msgid "End Date" +msgstr "Дата окончания" #. module: product -#: field:product.template,seller_delay:0 -msgid "Supplier Lead Time" -msgstr "Время поставки" +#: view:product.price_list:0 +msgid "Print" +msgstr "Распечатать" #. module: product -#: model:product.pricelist.version,name:product.ver0 -msgid "Default Public Pricelist Version" -msgstr "" +#: view:product.product:0 +#: field:product.ul,type:0 +msgid "Type" +msgstr "Тип" + +#. module: product +#: model:ir.actions.act_window,name:product.product_pricelist_action2 +#: model:ir.ui.menu,name:product.menu_product_pricelist_action2 +#: model:ir.ui.menu,name:product.menu_product_pricelist_main +msgid "Pricelists" +msgstr "Каталоги" + +#. module: product +#: field:product.product,partner_ref:0 +msgid "Customer ref" +msgstr "Ссылка на клиента" + +#. module: product +#: view:product.product:0 +msgid "Miscellaneous" +msgstr "Прочее" #. module: product #: field:product.pricelist.type,key:0 @@ -582,95 +776,98 @@ msgid "Key" msgstr "Ключ" #. module: product -#: field:product.pricelist.item,price_version_id:0 -msgid "Price List Version" -msgstr "Версия каталога" - -#. module: product #: view:product.pricelist.item:0 msgid "Rules Test Match" -msgstr "" +msgstr "Проверка правил" #. module: product -#: help:res.partner,property_product_pricelist:0 +#: help:product.pricelist.item,product_id:0 msgid "" -"This pricelist will be used, instead of the default one, " -"for sales to the current partner" +"Set a product if this rule only apply to one product. Keep empty for all " +"products" msgstr "" -"При продаже данному партнеру будет использован не каталог по умолчанию, а " -"этот каталог." +"Выберите ТМЦ, если это правило применимо к одному товару. Оставьте пустым " +"для всех ТМЦ" #. module: product -#: model:ir.model,name:product.model_product_pricelist -#: view:product.supplierinfo:0 -msgid "Pricelist" -msgstr "Каталог" +#: model:product.template,name:product.product_product_kitchendesignproject0_product_template +msgid "Kitchen Design Project" +msgstr "Проект дизайна кухни" #. module: product -#: selection:product.template,type:0 -msgid "Consumable" -msgstr "Расходные" +#: constraint:ir.ui.view:0 +msgid "Invalid XML for View Architecture!" +msgstr "Неправильный XML для просмотра архитектуры!" #. module: product -#: help:product.price.type,currency_id:0 -msgid "The currency the field is expressed in." -msgstr "Валюта" +#: model:product.uom,name:product.uom_hour +msgid "Hour" +msgstr "Час" #. module: product -#: help:product.template,weight:0 -msgid "The gross weight in Kg." -msgstr "Вес брутто в килограммах." +#: selection:product.template,state:0 +msgid "In Development" +msgstr "В разработке" #. module: product -#: selection:product.ul,type:0 -msgid "Box" -msgstr "Коробка" +#: model:product.template,name:product.product_product_shelfofcm1_product_template +msgid "Shelf of 200cm" +msgstr "Полка 200см" #. module: product -#: constraint:ir.ui.view:0 -msgid "Invalid XML for View Architecture!" -msgstr "Неправильный XML для просмотра архитектуры!" +#: view:product.uom:0 +msgid "Ratio & Precision" +msgstr "Коэффициент & Точность" #. module: product -#: help:product.template,sale_ok:0 -msgid "" -"Determine if the product can be visible in the list of product within a " -"selection from a sale order line." -msgstr "" -"Указывается, если продукция должна быть видна в списке продукции на продажу." +#: model:product.uom,name:product.product_uom_gram +msgid "g" +msgstr "г" #. module: product -#: constraint:product.template:0 -msgid "Error: UOS must be in a different category than the UOM" -msgstr "" -"Ошибка. Единицы продажи и единицы измерения должны принадлежать к разным " -"категориям." +#: model:product.category,name:product.product_category_11 +msgid "IT components kits" +msgstr "ИТ набор компонентов" #. module: product -#: field:product.category,parent_id:0 -msgid "Parent Category" -msgstr "Категория предка" +#: selection:product.category,type:0 +#: selection:product.template,state:0 +msgid "Normal" +msgstr "Обычный" #. module: product -#: selection:product.template,state:0 -msgid "In Development" -msgstr "В разработке" +#: model:process.node,name:product.process_node_supplier0 +#: view:product.supplierinfo:0 +msgid "Supplier Information" +msgstr "Информация поставщика" #. module: product -#: help:product.pricelist.type,key:0 -msgid "" -"Used in the code to select specific prices based on the context. Keep " -"unchanged." -msgstr "" +#: field:product.price.type,currency_id:0 +#: report:product.pricelist:0 +#: field:product.pricelist,currency_id:0 +msgid "Currency" +msgstr "Валюта" #. module: product -#: help:product.product,outgoing_qty:0 -msgid "" -"Quantities of products that are planned to leave in selected locations or " -"all internal if none have been selected." +#: model:product.template,name:product.product_product_ram_product_template +msgid "DDR 256MB PC400" +msgstr "DDR 256MB PC400" + +#. module: product +#: view:product.category:0 +msgid "Product Categories" +msgstr "Категории ТМЦ" + +#. module: product +#: view:product.uom:0 +msgid " e.g: 1 * (reference unit) = ratio * (this unit)" msgstr "" -"Количества продукции, которые планируется отправить в указанные места, или " -"вся внутренняя, если ничего не выбранно." + +#. module: product +#: view:product.product:0 +#: view:product.template:0 +msgid "Procurement & Locations" +msgstr "Снабжение и местоположения" #. module: product #: field:product.packaging,weight:0 @@ -678,385 +875,539 @@ msgid "Total Package Weight" msgstr "Итоговый вес пакета" #. module: product -#: help:product.template,procure_method:0 +#: help:product.packaging,code:0 +msgid "The code of the transport unit." +msgstr "Код транспортной единицы." + +#. module: product +#: help:product.template,standard_price:0 msgid "" -"'Make to Stock': When needed, take from the stock or wait until re-" -"supplying. 'Make to Order': When needed, purchase or produce for the " -"procurement request." +"Product's cost for accounting stock valuation. It is the base price for the " +"supplier price." +msgstr "Учетная стоимость ТМЦ. Это базовая цена для цены поставщика." + +#. module: product +#: view:product.price.type:0 +msgid "Products Price Type" +msgstr "Тип цены продукции" + +#. module: product +#: field:product.product,price_extra:0 +msgid "Variant Price Extra" msgstr "" #. module: product +#: model:product.template,name:product.product_product_fan_product_template +msgid "Regular case fan 80mm" +msgstr "Обычный корпусной вентилятор 80мм" + +#. module: product +#: model:ir.model,name:product.model_product_supplierinfo +msgid "Information about a product supplier" +msgstr "Информация о поставщике продукции" + +#. module: product #: view:product.product:0 -#: view:product.template:0 -msgid "Procurement" -msgstr "Снабжение" +msgid "Extended Filters..." +msgstr "Расширенные фильтры..." #. module: product -#: model:ir.actions.act_window,name:product.product_category_action -#: model:ir.ui.menu,name:product.menu_product_category_action -msgid "Products by Category" -msgstr "ТМЦ по категориям" +#: view:product.product:0 +#: view:product.template:0 +#: field:product.template,description_purchase:0 +msgid "Purchase Description" +msgstr "Описание закупки" #. module: product -#: model:product.template,name:product.product_product_hdd1_product_template -msgid "HDD Seagate 7200.8 80GB" -msgstr "Жёсткий диск Seagate 7200.8 80GB" +#: constraint:product.pricelist.version:0 +msgid "You cannot have 2 pricelist versions that overlap!" +msgstr "Нельзя иметь 2 перекрывающиеся версии каталога!" #. module: product -#: help:product.pricelist.version,active:0 +#: help:product.supplierinfo,delay:0 msgid "" -"When a version is duplicated it is set to non active, so that the dates do " -"not overlaps with original version. You should change the dates and " -"reactivate the pricelist" +"Lead time in days between the confirmation of the purchase order and the " +"reception of the products in your warehouse. Used by the scheduler for " +"automatic computation of the purchase order planning." msgstr "" +"Запас по времени между подтверждением заказа на закупку и приходом ТМЦ на " +"склад. Используется планировщиком для автоматического планирования заказа на " +"закупку." #. module: product -#: model:product.template,name:product.product_product_hdd3_product_template -msgid "HDD Seagate 7200.8 160GB" -msgstr "Жёсткий диск Seagate 7200.8 160GB" +#: selection:product.template,type:0 +msgid "Stockable Product" +msgstr "Складируемая продукция" #. module: product -#: view:product.product:0 -msgid "Product Variant" -msgstr "Вариант ТМЦ" +#: field:product.packaging,code:0 +msgid "Code" +msgstr "Код" #. module: product -#: field:product.packaging,ul:0 -msgid "Type of Package" -msgstr "Тип упаковки" +#: view:product.supplierinfo:0 +msgid "Seq" +msgstr "Последовательность" #. module: product -#: field:product.template,loc_rack:0 -msgid "Rack" -msgstr "Стеллаж" +#: view:product.price_list:0 +msgid "Calculate Product Price per unit base on pricelist version." +msgstr "Вычислить цену за единицу продукции основанную на версии каталога." #. module: product -#: field:product.uom,category_id:0 -msgid "UoM Category" -msgstr "Категория единиц измерения" +#: model:ir.model,name:product.model_product_ul +msgid "Shipping Unit" +msgstr "Единица поставки" #. module: product -#: selection:product.ul,type:0 -msgid "Pack" -msgstr "Упаковка" +#: field:pricelist.partnerinfo,suppinfo_id:0 +msgid "Partner Information" +msgstr "Информация партнера" #. module: product -#: field:product.product,ean13:0 -msgid "EAN13" -msgstr "Штрих-код 13" +#: model:ir.model,name:product.model_res_users +msgid "res.users" +msgstr "" + +#. module: product +#: selection:product.ul,type:0 +#: model:product.uom.categ,name:product.product_uom_categ_unit +msgid "Unit" +msgstr "Ед." #. module: product #: view:product.product:0 #: view:product.template:0 -#: field:product.template,description_sale:0 -msgid "Sale Description" -msgstr "Описание продужи" +msgid "Information" +msgstr "Информация" #. module: product -#: field:product.template,uos_id:0 -msgid "Unit of Sale" -msgstr "Единица продажи" +#: view:product.pricelist.item:0 +msgid "Products Listprices Items" +msgstr "Элкменты каталога продукции" #. module: product -#: field:product.template,mes_type:0 -msgid "Measure Type" -msgstr "Тип измерения" +#: view:product.packaging:0 +msgid "Other Info" +msgstr "Прочая информация" #. module: product -#: model:product.uom.categ,name:product.product_uom_categ_kgm -msgid "Weight" -msgstr "Вес" +#: field:product.pricelist.version,items_id:0 +msgid "Price List Items" +msgstr "Элементы каталога" #. module: product -#: model:product.template,name:product.product_product_22_product_template -msgid "Processor on demand" -msgstr "" +#: selection:product.uom,uom_type:0 +msgid "Bigger than the reference UoM" +msgstr "Больший чем ед. изм. ссылки" #. module: product -#: help:product.supplierinfo,product_name:0 -msgid "" -"Name of the product for this partner, will be used when printing a request " -"for quotation. Keep empty to use the internal one." -msgstr "" +#: model:ir.module.module,shortdesc:product.module_meta_information +msgid "Products & Pricelists" +msgstr "ТМЦ и каталоги" #. module: product -#: field:product.template,supply_method:0 -msgid "Supply method" -msgstr "Метод поставки" +#: view:product.product:0 +msgid "To Sell" +msgstr "На продажу" #. module: product -#: model:product.category,name:product.product_category_11 -msgid "IT components kits" -msgstr "" +#: model:product.category,name:product.product_category_services0 +msgid "Marketable Services" +msgstr "Платные услуги" #. module: product -#: view:product.uom.categ:0 -msgid "Units of Measure categories" -msgstr "Категории единиц измерения" +#: field:product.pricelist.item,price_surcharge:0 +msgid "Price Surcharge" +msgstr "Надбавка к цене" #. module: product -#: field:product.category,sequence:0 -#: field:product.packaging,sequence:0 -#: field:product.pricelist.item,sequence:0 -msgid "Sequence" -msgstr "Последовательность" +#: model:product.template,name:product.product_product_mb1_product_template +msgid "Mainboard ASUStek A7N8X" +msgstr "Материнская плата ASUStek A7N8X" #. module: product -#: view:product.supplierinfo:0 -msgid "Supplier Information" -msgstr "Информация поставщика" +#: field:product.product,packaging:0 +msgid "Logistical Units" +msgstr "Логистические единицы" #. module: product -#: model:ir.actions.act_window,name:product.product_ul_form_action -#: model:ir.model,name:product.model_product_packaging -#: model:ir.ui.menu,name:product.menu_product_ul_form_action -#: view:product.packaging:0 +#: field:product.category,complete_name:0 +#: field:product.category,name:0 +#: field:product.pricelist.type,name:0 +#: field:product.pricelist.version,name:0 #: view:product.product:0 -#: view:product.ul:0 -msgid "Packaging" -msgstr "Упаковка" +#: field:product.template,name:0 +#: field:product.ul,name:0 +#: field:product.uom,name:0 +#: field:product.uom.categ,name:0 +msgid "Name" +msgstr "Название" #. module: product -#: field:product.price.type,currency_id:0 -#: field:product.pricelist,currency_id:0 -msgid "Currency" -msgstr "Валюта" +#: code:addons/product/pricelist.py:0 +#, python-format +msgid "" +"No active version for the selected pricelist !\n" +"' \\n 'Please create or activate one." +msgstr "" +"Нет активной версии для выбранного каталога!\n" +"' \\n 'Пожалуйста, создайте или активируйте каталог." #. module: product -#: model:product.template,name:product.product_product_cpu_gen_product_template -msgid "Regular processor config" -msgstr "Типовая конфигурация процессора" +#: view:product.product:0 +msgid "Stockable" +msgstr "Хранимое" #. module: product -#: view:product.product:0 -#: view:product.template:0 -msgid "Descriptions" -msgstr "Описания" +#: model:product.uom,name:product.product_uom_kgm +msgid "kg" +msgstr "кг" #. module: product -#: model:process.transition,name:product.process_transition_supplierofproduct0 -msgid "Suppliers of Product" -msgstr "Поставщики изделия" +#: constraint:ir.rule:0 +msgid "Rules are not supported for osv_memory objects !" +msgstr "Для объектов osv_memory правила не поддерживаются !" #. module: product -#: field:product.pricelist.version,date_start:0 -msgid "Start Date" -msgstr "Дата начала" +#: model:product.uom,name:product.product_uom_meter +msgid "m" +msgstr "м" #. module: product -#: view:res.partner:0 -msgid "Sales Properties" -msgstr "Свойства продажи" +#: selection:product.template,state:0 +msgid "Obsolete" +msgstr "Устаревший" #. module: product -#: help:product.product,qty_available:0 -msgid "" -"Current quantities of products in selected locations or all internal if none " -"have been selected." -msgstr "" -"Текуще количество продукции в выбранных складах или общее количество, если " -"ничего не выбрано." +#: model:product.uom,name:product.product_uom_km +msgid "km" +msgstr "км" #. module: product -#: model:product.template,name:product.product_product_pc1_product_template -msgid "Basic PC" -msgstr "Базовый ПК" +#: help:product.template,cost_method:0 +msgid "" +"Standard Price: the cost price is fixed and recomputed periodically (usually " +"at the end of the year), Average Price: the cost price is recomputed at each " +"reception of products." +msgstr "" +"Стандартная цена: стоимость фиксирована и пересчитывается периодически " +"(обычно в конце года). Средняя цена: стоимость пересчитывается при каждом " +"приходе продукции." #. module: product -#: field:product.template,loc_row:0 -msgid "Row" -msgstr "Строка" +#: help:product.category,sequence:0 +msgid "" +"Gives the sequence order when displaying a list of product categories." +msgstr "Дает порядок последовательности при выводе списка категорий ТМЦ." #. module: product -#: field:product.template,categ_id:0 -msgid "Category" -msgstr "Категория" +#: field:product.uom,factor:0 +#: field:product.uom,factor_inv:0 +msgid "Ratio" +msgstr "Коэффициент" #. module: product -#: help:product.pricelist.item,min_quantity:0 +#: help:product.template,purchase_ok:0 msgid "" -"The rule only applies if the partner buys/sells more than this quantity." +"Determine if the product is visible in the list of products within a " +"selection from a purchase order line." msgstr "" -"Правило применяется только в случае, если партнёр покупает или продает более " -"этой величины." +"Должно ли изделие быть видимым при выборе из списка изделий в форме заказа" #. module: product -#: model:product.template,name:product.product_product_ram_product_template -msgid "DDR 256MB PC400" -msgstr "DDR 256MB PC400" +#: field:product.template,weight_net:0 +msgid "Net weight" +msgstr "Вес нетто" #. module: product -#: field:product.product,qty_available:0 -msgid "Real Stock" -msgstr "Доступные запасы" +#: field:product.packaging,width:0 +msgid "Width" +msgstr "Ширина" #. module: product -#: view:product.category:0 -msgid "Product Categories" -msgstr "Категории ТМЦ" +#: help:product.price.type,field:0 +msgid "Associated field in the product form." +msgstr "Связанные поля в форме изделия" #. module: product -#: help:product.uom,category_id:0 -msgid "" -"Unit of Measure of a category can be converted between each others in the " -"same category." -msgstr "" -"Единицы измерения могут быть приведены друг к другу в пределах одной " -"категории." +#: view:product.product:0 +msgid "Unit of Measure" +msgstr "Ед. изм." #. module: product -#: model:ir.model,name:product.model_product_uom -msgid "Product Unit of Measure" -msgstr "Ед. изм. продукции" +#: field:product.template,procure_method:0 +msgid "Procurement Method" +msgstr "Метод снабжения" #. module: product -#: field:product.template,sale_ok:0 -msgid "Can be sold" -msgstr "Можно продавать" +#: report:product.pricelist:0 +msgid "Printing Date" +msgstr "Дата печати" #. module: product -#: model:product.template,name:product.product_product_23_product_template -msgid "Complete PC With Peripherals" -msgstr "Комплектовать ПК периферией" +#: field:product.template,uos_id:0 +msgid "Unit of Sale" +msgstr "Единица продажи" #. module: product -#: constraint:product.template:0 +#: help:product.template,seller_delay:0 msgid "" -"Error: The default UOM and the purchase UOM must be in the same category." +"This is the average delay in days between the purchase order confirmation " +"and the reception of goods for this product and for the default supplier. It " +"is used by the scheduler to order requests based on reordering delays." msgstr "" +"Это средняя задержка в днях между подтверждением заказа на закупку и " +"получением для этой продукции и для поставщика по умолчанию. Используется " +"планировщиком для подачи запросов основанных на задержках при повторной " +"подаче заказов." #. module: product -#: model:product.template,name:product.product_product_mb2_product_template -msgid "Mainboard ASUStek A7V8X-X" -msgstr "Материнская плата ASUStek A7V8X-X" +#: help:product.template,seller_id:0 +msgid "Main Supplier who has highest priority in Supplier List." +msgstr "Основной поставщик - имеет высший приоритет в списке поставщиков." #. module: product -#: field:product.uom,factor:0 -msgid "Rate" -msgstr "Курс" +#: model:product.category,name:product.product_category_services +#: view:product.product:0 +msgid "Services" +msgstr "Услуги" #. module: product -#: view:product.pricelist.item:0 -msgid "Products Listprices Items" -msgstr "Элкменты каталога продукции" +#: field:product.pricelist.item,base_pricelist_id:0 +msgid "If Other Pricelist" +msgstr "В другом каталоге" #. module: product -#: field:product.uom,rounding:0 -msgid "Rounding Precision" -msgstr "Точность округления" +#: model:ir.actions.act_window,name:product.product_normal_action +#: model:ir.actions.act_window,name:product.product_normal_action_puchased +#: model:ir.actions.act_window,name:product.product_normal_action_tree +#: model:ir.ui.menu,name:product.menu_products +#: view:product.product:0 +msgid "Products" +msgstr "ТМЦ" #. module: product -#: help:product.packaging,width:0 -msgid "The width of the package" -msgstr "Ширина пакета" +#: help:product.packaging,rows:0 +msgid "The number of layers on a pallet or box" +msgstr "Количество слоев на поддоне или в коробке" #. module: product -#: field:product.packaging,qty:0 -msgid "Quantity by Package" -msgstr "Количество по пакету" +#: help:product.pricelist.item,base:0 +msgid "The mode for computing the price for this rule." +msgstr "Режим для вычисления цены для этого правила." #. module: product -#: help:product.template,uos_id:0 +#: view:product.packaging:0 +#: view:product.product:0 +msgid "Pallet Dimension" +msgstr "Размер поддона" + +#. module: product +#: code:addons/product/product.py:0 +#, python-format +msgid " (copy)" +msgstr " (копия)" + +#. module: product +#: field:product.template,seller_ids:0 +msgid "Partners" +msgstr "Партнеры" + +#. module: product +#: help:product.template,sale_delay:0 msgid "" -"Used by companies that manages two unit of measure: invoicing and inventory " -"management. For example, in food industries, you will manage a stock of ham " -"but invoice in Kg. Keep empty to use the default UOM." +"This is the average delay in days between the confirmation of the customer " +"order and the delivery of the finished products. It's the time you promise " +"to your customers." msgstr "" +"Это средняя задержка в днях между подтверждением заказа и доставкой готовой " +"продукции. Это срок, который вы обещаете вашему партнеру." #. module: product #: view:product.product:0 #: view:product.template:0 -msgid "Procurement & Locations" -msgstr "Снабжение и местоположения" +msgid "Second UoM" +msgstr "Вторая ед. езм." + +#. module: product +#: model:product.template,name:product.product_product_woodlintelm0_product_template +msgid "Wood Lintel 4m" +msgstr "" + +#. module: product +#: model:ir.actions.act_window,name:product.product_uom_form_action +#: model:ir.ui.menu,name:product.menu_product_uom_form_action +#: model:ir.ui.menu,name:product.next_id_16 +#: view:product.uom:0 +msgid "Units of Measure" +msgstr "Единицы измерения" + +#. module: product +#: field:product.supplierinfo,min_qty:0 +msgid "Minimal Quantity" +msgstr "Минимальное количество" + +#. module: product +#: model:product.category,name:product.product_category_pc +msgid "PC" +msgstr "ПК" + +#. module: product +#: help:product.supplierinfo,product_code:0 +msgid "" +"This supplier's product code will be used when printing a request for " +"quotation. Keep empty to use the internal one." +msgstr "" +"Этот код продукции поставщика будет использован при печати запроса цен. " +"Оставьте пустым для использования внутреннего кода." + +#. module: product +#: selection:product.template,procure_method:0 +msgid "Make to Stock" +msgstr "Изготовление про запас" + +#. module: product +#: field:product.pricelist.item,price_version_id:0 +msgid "Price List Version" +msgstr "Версия каталога" + +#. module: product +#: selection:product.template,type:0 +msgid "Consumable" +msgstr "Расходные" + +#. module: product +#: help:product.price.type,currency_id:0 +msgid "The currency the field is expressed in." +msgstr "Валюта" + +#. module: product +#: help:product.template,weight:0 +msgid "The gross weight in Kg." +msgstr "Вес брутто в килограммах." #. module: product #: view:product.product:0 #: view:product.template:0 -#: field:product.template,state:0 -msgid "Status" -msgstr "Статус" +msgid "Procurement" +msgstr "Снабжение" #. module: product -#: field:product.product,outgoing_qty:0 -msgid "Outgoing" -msgstr "Исходящее" +#: field:product.uom,category_id:0 +msgid "UoM Category" +msgstr "Категория единиц измерения" #. module: product -#: selection:product.template,supply_method:0 -msgid "Buy" -msgstr "Покупка" +#: field:product.template,loc_rack:0 +msgid "Rack" +msgstr "Стеллаж" #. module: product -#: model:ir.model,name:product.model_product_pricelist_version -#: view:product.pricelist:0 -#: view:product.pricelist.version:0 -msgid "Pricelist Version" -msgstr "Версия каталога" +#: field:product.template,uom_po_id:0 +msgid "Purchase Unit of Measure" +msgstr "Единицы измерения при закупке" #. module: product -#: field:product.pricelist.item,price_round:0 -msgid "Price Rounding" -msgstr "Округление цены" +#: field:product.template,supply_method:0 +msgid "Supply method" +msgstr "Метод поставки" #. module: product -#: model:product.price.type,name:product.list_price -msgid "Public Price" -msgstr "" +#: view:product.product:0 +msgid "Group by..." +msgstr "Объединять по..." #. module: product -#: field:product.pricelist.item,price_max_margin:0 -msgid "Max. Price Margin" -msgstr "Максимальная маржа цены" +#: model:product.template,name:product.product_product_cpu_gen_product_template +msgid "Regular processor config" +msgstr "Типовая конфигурация процессора" #. module: product -#: view:res.partner:0 -msgid "Sales & Purchases" -msgstr "Продажи и закупки" +#: field:product.pricelist.version,date_start:0 +msgid "Start Date" +msgstr "Дата начала" #. module: product -#: model:product.category,name:product.product_category_10 -msgid "IT components" +#: help:product.template,produce_delay:0 +msgid "" +"Average delay in days to produce this product. This is only for the " +"production order and, if it is a multi-level bill of material, it's only for " +"the level of this product. Different lead times will be summed for all " +"levels and purchase orders." msgstr "" #. module: product -#: help:product.packaging,weight_ul:0 -msgid "The weight of the empty UL" +#: help:product.product,qty_available:0 +msgid "" +"Current quantities of products in selected locations or all internal if none " +"have been selected." msgstr "" +"Текуще количество продукции в выбранных складах или общее количество, если " +"ничего не выбрано." #. module: product -#: help:product.packaging,code:0 -msgid "The code of the transport unit." -msgstr "Код транспортной единицы." +#: model:product.template,name:product.product_product_pc1_product_template +msgid "Basic PC" +msgstr "Базовый ПК" #. module: product -#: field:product.template,uom_po_id:0 -msgid "Purchase UoM" -msgstr "" +#: field:product.product,qty_available:0 +msgid "Real Stock" +msgstr "Доступные запасы" #. module: product -#: view:product.price.type:0 -msgid "Products Price Type" -msgstr "Тип цены продукции" +#: model:product.uom,name:product.product_uom_cm +msgid "cm" +msgstr "см" #. module: product -#: field:product.template,product_manager:0 -msgid "Product Manager" -msgstr "Менеджер продукции" +#: model:ir.model,name:product.model_product_uom +msgid "Product Unit of Measure" +msgstr "Ед. изм. продукции" #. module: product -#: field:product.product,price_extra:0 -msgid "Variant Price Extra" +#: constraint:product.template:0 +msgid "" +"Error: The default UOM and the purchase UOM must be in the same category." msgstr "" +"Ошибка. ед. изм. по умолчанию и закупочные ед. изм. должны иметь одинаковую " +"категорию." #. module: product -#: model:product.template,name:product.product_product_fan_product_template -msgid "Regular case fan 80mm" +#: constraint:ir.ui.menu:0 +msgid "Error ! You can not create recursive Menu." +msgstr "Ошибка ! Нельзя создать зацикленные меню." + +#. module: product +#: view:product.uom:0 +msgid "Unit of Measure Properties" +msgstr "Свойства единиц измерения" + +#. module: product +#: model:product.template,name:product.product_product_shelf1_product_template +msgid "Rack 200cm" +msgstr "Стойка 200 см" + +#. module: product +#: selection:product.template,supply_method:0 +msgid "Buy" +msgstr "Покупка" + +#. module: product +#: view:product.uom.categ:0 +msgid "Units of Measure categories" +msgstr "Категории единиц измерения" + +#. module: product +#: help:product.packaging,weight_ul:0 +msgid "The weight of the empty UL" msgstr "" #. module: product -#: model:ir.model,name:product.model_product_supplierinfo -msgid "Information about a product supplier" -msgstr "Информация о поставщике продукции" +#: selection:product.uom,uom_type:0 +msgid "Smaller than the reference UoM" +msgstr "" #. module: product #: field:product.price.type,active:0 @@ -1065,7 +1416,7 @@ msgstr "Информация о поставщике продукции" #: field:product.product,active:0 #: field:product.uom,active:0 msgid "Active" -msgstr "Активен" +msgstr "Активно" #. module: product #: field:product.product,price_margin:0 @@ -1073,239 +1424,354 @@ msgid "Variant Price Margin" msgstr "Маржа цены варианта" #. module: product -#: wizard_view:product.price_list,init:0 -msgid "Price list" -msgstr "Прайс" +#: help:product.packaging,ean:0 +msgid "The EAN code of the package unit." +msgstr "Штрих-код EAN упаковки" #. module: product -#: model:product.template,name:product.product_product_pc3_product_template -msgid "Medium PC" -msgstr "Средний ПК" +#: field:product.packaging,weight_ul:0 +msgid "Empty Package Weight" +msgstr "Вес пустого пакета" #. module: product -#: model:ir.model,name:product.model_pricelist_partnerinfo -msgid "pricelist.partnerinfo" +#: field:product.price.type,field:0 +msgid "Product Field" +msgstr "Поле продукции" + +#. module: product +#: model:ir.actions.act_window,name:product.product_pricelist_type_action +msgid "Pricelists Types" +msgstr "Тпипы каталогов" + +#. module: product +#: help:product.uom,factor:0 +msgid "" +"How many times this UoM is smaller than the reference UoM in this category:\n" +"1 * (reference unit) = ratio * (this unit)" msgstr "" #. module: product -#: model:product.price.type,name:product.standard_price -#: field:product.template,standard_price:0 -msgid "Cost Price" -msgstr "Себестоимость" +#: help:product.template,uom_id:0 +msgid "Default Unit of Measure used for all stock operation." +msgstr "" +"Единица измерения по умолчанию, используемая для всех операций с ТМЦ." #. module: product -#: view:product.product:0 -#: view:product.template:0 -#: field:product.template,description_purchase:0 -msgid "Purchase Description" -msgstr "Описание закупки" +#: model:product.category,name:product.product_category_misc0 +msgid "Misc" +msgstr "Прочее" #. module: product -#: view:product.product:0 -#: view:product.template:0 -msgid "Second UoM" +#: model:product.template,name:product.product_product_pc4_product_template +msgid "Customizable PC" +msgstr "Настраиваемый ПК" + +#. module: product +#: field:pricelist.partnerinfo,price:0 +msgid "Unit Price" +msgstr "Цена за ед." + +#. module: product +#: model:product.category,name:product.product_category_7 +#: model:product.template,name:product.product_product_1_product_template +msgid "Onsite Intervention" +msgstr "Вмешательство на месте" + +#. module: product +#: model:product.pricelist,name:product.list0 +msgid "Public Pricelist" +msgstr "Открытый каталог" + +#. module: product +#: model:product.category,name:product.product_category_marketableproduct0 +msgid "Marketable Products" msgstr "" #. module: product -#: model:product.category,name:product.product_category_4 -msgid "Dello Computer" +#: field:product.supplierinfo,product_code:0 +msgid "Supplier Product Code" +msgstr "Код ТМЦ поставщика" + +#. module: product +#: constraint:ir.model:0 +msgid "" +"The Object name must start with x_ and not contain any special character !" msgstr "" +"Название объекта должно начинаться с x_ и не должно содержать специальных " +"символов !" #. module: product #: view:product.product:0 -#: view:product.template:0 -msgid "Storage Localisation" -msgstr "" +msgid "Default UOM" +msgstr "Ед. изм. по умолчанию" #. module: product -#: help:product.packaging,length:0 -msgid "The length of the package" -msgstr "Длина пакета" +#: selection:product.ul,type:0 +msgid "Pallet" +msgstr "Поддон" #. module: product -#: field:product.pricelist.item,price_min_margin:0 -msgid "Min. Price Margin" -msgstr "Минимальная маржа цены" +#: field:product.packaging,ul_qty:0 +msgid "Package by layer" +msgstr "Упаковка по слоям" #. module: product -#: help:product.packaging,ean:0 -msgid "The EAN code of the package unit." -msgstr "Штрих-код EAN упаковки" +#: field:product.template,warranty:0 +msgid "Warranty (months)" +msgstr "Гарантия (мес.)" #. module: product -#: field:product.template,weight:0 -msgid "Gross weight" -msgstr "Вес брутто" +#: model:ir.model,name:product.model_product_product +#: model:ir.ui.menu,name:product.prod_config_main +#: model:process.node,name:product.process_node_product0 +#: model:process.process,name:product.process_process_productprocess0 +#: field:product.packaging,product_id:0 +#: field:product.pricelist.item,product_id:0 +#: view:product.product:0 +#: field:product.supplierinfo,product_id:0 +#: model:res.request.link,name:product.req_link_product +msgid "Product" +msgstr "Товарно-материальные ценности" #. module: product -#: help:product.product,packaging:0 -msgid "" -"Gives the different ways to package the same product. This has no impact on " -"the packing order and is mainly used if you use the EDI module." -msgstr "" +#: selection:product.template,supply_method:0 +msgid "Produce" +msgstr "Прозвести" #. module: product -#: model:ir.model,name:product.model_product_category -#: field:product.pricelist.item,categ_id:0 -msgid "Product Category" -msgstr "Категория ТМЦ" +#: selection:product.template,procure_method:0 +msgid "Make to Order" +msgstr "Изготовление на заказ" #. module: product -#: field:product.price.type,field:0 -msgid "Product Field" -msgstr "Поле продукции" +#: field:product.product,variants:0 +msgid "Variants" +msgstr "Варианты" #. module: product -#: model:ir.actions.act_window,name:product.product_pricelist_type_action -#: model:ir.ui.menu,name:product.menu_product_pricelist_type_action -msgid "Pricelists Types" -msgstr "Тпипы каталогов" +#: model:ir.actions.act_window,name:product.product_category_action +#: model:ir.ui.menu,name:product.menu_products_category +msgid "Products by Category" +msgstr "ТМЦ по категориям" #. module: product -#: help:product.template,state:0 -msgid "Tells the user if he can use the product or not." -msgstr "Сообщите пользователю, может ли он пользоваться продукцией" +#: model:ir.actions.act_window,name:product.product_category_action_form +#: model:ir.ui.menu,name:product.menu_product_category_action_form +msgid "Products Categories" +msgstr "Категории ТМЦ" #. module: product -#: field:product.supplierinfo,product_code:0 -msgid "Partner Product Code" +#: field:product.template,uos_coeff:0 +msgid "UOM -> UOS Coeff" msgstr "" #. module: product -#: model:product.category,name:product.product_category_3 -msgid "Computer Stuff" -msgstr "" +#: help:product.supplierinfo,sequence:0 +msgid "Assigns the priority to the list of product supplier." +msgstr "Назначает приоритет в списке поставщиков ТМЦ." #. module: product -#: field:product.packaging,code:0 -#: field:product.product,code:0 -#: field:product.product,default_code:0 -msgid "Code" -msgstr "Код" +#: field:product.template,uom_id:0 +msgid "Default Unit Of Measure" +msgstr "Единица измерения по умолчанию" #. module: product -#: help:product.uom,factor_inv:0 -msgid "" -"The coefficient for the formula:\n" -"coeff (base unit) = 1 (this unit). Factor = 1 / Rate." -msgstr "" +#: model:product.template,name:product.product_product_tow1_product_template +msgid "ATX Mid-size Tower" +msgstr "Среднеразмерный ATX корпус" #. module: product -#: view:product.supplierinfo:0 -msgid "Seq" -msgstr "Последовательность" +#: view:product.pricelist.item:0 +msgid "Rounding Method" +msgstr "Метод округления" #. module: product -#: model:product.category,name:product.product_category_8 -msgid "Phone Help" -msgstr "Телефон помощи" +#: model:ir.actions.report.xml,name:product.report_product_label +msgid "Products Labels" +msgstr "Этикетки изделия" #. module: product -#: selection:product.template,mes_type:0 -msgid "Variable" -msgstr "Переменный" +#: model:product.ul,name:product.product_ul_big_box +msgid "Box 30x40x60" +msgstr "Коробка 30x40x60" #. module: product -#: help:product.template,uom_id:0 -msgid "Default Unit of Measure used for all stock operation." -msgstr "" +#: selection:product.template,type:0 +msgid "Service" +msgstr "Услуга" #. module: product -#: model:ir.model,name:product.model_product_template -#: field:product.pricelist.item,product_tmpl_id:0 -#: field:product.product,product_tmpl_id:0 -#: view:product.template:0 -msgid "Product Template" -msgstr "Шаблон ТМЦ" +#: help:product.packaging,height:0 +msgid "The height of the package" +msgstr "Высота упаковки" #. module: product -#: model:ir.model,name:product.model_product_ul -msgid "Shipping Unit" -msgstr "Единица поставки" +#: view:product.pricelist:0 +msgid "Products Price List" +msgstr "Каталог продукции" #. module: product -#: help:product.uom,rounding:0 +#: field:product.pricelist,company_id:0 +#: field:product.pricelist.item,company_id:0 +#: field:product.pricelist.version,company_id:0 +#: field:product.supplierinfo,company_id:0 +#: field:product.template,company_id:0 +msgid "Company" +msgstr "Компания" + +#. module: product +#: field:product.product,lst_price:0 +msgid "List Price" +msgstr "Цена по каталогу" + +#. module: product +#: model:ir.actions.act_window,name:product.product_price_type_action +msgid "Prices Types" +msgstr "Типы цен" + +#. module: product +#: help:product.template,list_price:0 msgid "" -"The computed quantity will be a multiple of this value. Use 1.0 for products " -"that can not be split." +"Base price for computing the customer price. Sometimes called the catalog " +"price." msgstr "" -"Расчетная величина будет кратна этому значению. Используйте 1.0 для " -"продуктов, которые не могут быть разделены." +"Базовая цена для расчёта цены продажи. Иногда называется справочой ценой." #. module: product -#: field:product.packaging,height:0 -msgid "Height" -msgstr "Высота" +#: code:addons/product/pricelist.py:0 +#, python-format +msgid "Partner section of the product form" +msgstr "Раздел партнера в форме ввода ТМЦ" #. module: product -#: model:product.template,name:product.product_product_pc4_product_template -msgid "Customizable PC" +#: help:product.price.type,name:0 +msgid "Name of this kind of price." +msgstr "Наименование типа цены" + +#. module: product +#: help:product.packaging,qty:0 +msgid "The total number of products you can put by pallet or box." msgstr "" +"Общее количество ТМЦ, которое вы модете разместить на поддоне или в коробке." #. module: product -#: help:product.pricelist.version,date_end:0 -msgid "Ending date for this pricelist version to be valid." -msgstr "Конечная дата, до которой каталог действителен" +#: help:product.pricelist.version,date_start:0 +msgid "Starting date for this pricelist version to be valid." +msgstr "Каталог действителен, начиная с даты" #. module: product -#: field:pricelist.partnerinfo,suppinfo_id:0 -msgid "Partner Information" -msgstr "Информация партнера" +#: help:product.template,uom_po_id:0 +msgid "" +"Default Unit of Measure used for purchase orders. It must be in the same " +"category than the default unit of measure." +msgstr "" +"Единицы измерения по умолчанию для заказов на закупку. Должны быть той же " +"категории, что и единицы измерения по умолчанию." + +#. module: product +#: model:product.template,description:product.product_product_cpu1_product_template +msgid "This product is configured with example of push/pull flows" +msgstr "" + +#. module: product +#: field:product.packaging,length:0 +msgid "Length" +msgstr "Длина" + +#. module: product +#: model:product.uom.categ,name:product.uom_categ_length +msgid "Length / Distance" +msgstr "Длинна / Расстояние" + +#. module: product +#: model:product.template,name:product.product_product_0_product_template +msgid "Onsite Senior Intervention" +msgstr "Вмешательство руководства на месте" + +#. module: product +#: model:ir.model,name:product.model_product_pricelist_type +#: field:product.pricelist,type:0 +#: view:product.pricelist.type:0 +msgid "Pricelist Type" +msgstr "Тип каталога" + +#. module: product +#: model:product.category,name:product.product_category_otherproducts0 +msgid "Other Products" +msgstr "Другие ТМЦ" #. module: product #: view:product.product:0 -#: view:product.template:0 -#: field:product.template,type:0 -msgid "Product Type" -msgstr "Тип ТМЦ" +msgid "Characteristics" +msgstr "Характеристики" #. module: product -#: model:product.category,name:product.product_category_7 -#: model:product.template,name:product.product_product_1_product_template -msgid "Onsite Intervention" -msgstr "Вмешательство на месте" +#: field:product.template,sale_ok:0 +msgid "Can be Sold" +msgstr "Может быть продан" #. module: product -#: model:product.category,name:product.cat0 -msgid "All products" -msgstr "Все ТМЦ" +#: field:product.template,produce_delay:0 +msgid "Manufacturing Lead Time" +msgstr "Время производства" + +#. module: product +#: field:product.supplierinfo,pricelist_ids:0 +msgid "Supplier Pricelist" +msgstr "Каталог поставщика" + +#. module: product +#: field:product.pricelist.item,base:0 +msgid "Based on" +msgstr "На основе" #. module: product -#: wizard_button:product.price_list,init,end:0 -msgid "Cancel" -msgstr "Отмена" +#: model:product.category,name:product.product_category_rawmaterial0 +msgid "Raw Materials" +msgstr "Сырье" #. module: product -#: help:product.packaging,qty:0 -msgid "The total number of products you can put by palet or box." +#: help:product.product,virtual_available:0 +msgid "" +"Future stock for this product according to the selected locations or all " +"internal if none have been selected. Computed as: Real Stock - Outgoing + " +"Incoming." msgstr "" +"Будущие запасы этих ТМЦ в соответствии с выбранным местом хранения (или " +"всеми внутренними если ничего не было выбрано). Вычисленные как: " +"Действительные запасы - Исходящие + Входящие." #. module: product -#: model:ir.model,name:product.model_product_pricelist_item -msgid "Pricelist item" -msgstr "Элемент каталога" +#: field:product.pricelist,name:0 +msgid "Pricelist Name" +msgstr "Название прайс-листа" #. module: product -#: model:ir.actions.wizard,name:product.report_wizard_price -#: field:product.pricelist.version,pricelist_id:0 -msgid "Price List" -msgstr "Каталог" +#: help:product.supplierinfo,product_uom:0 +msgid "Supplier Product UoM." +msgstr "Ед. изм. ТМЦ поставщика." #. module: product -#: model:product.pricelist,name:product.list0 -msgid "Public Pricelist" -msgstr "" +#: field:product.uom,rounding:0 +msgid "Rounding Precision" +msgstr "Точность округления" #. module: product -#: model:product.template,name:product.product_product_21_product_template -msgid "RAM on demand" -msgstr "" +#: model:ir.model,name:product.model_product_pricelist_version +#: view:product.pricelist:0 +#: view:product.pricelist.version:0 +msgid "Pricelist Version" +msgstr "Версия каталога" #. module: product -#: selection:product.ul,type:0 -#: model:product.uom.categ,name:product.product_uom_categ_unit -msgid "Unit" -msgstr "Ед." +#: view:product.pricelist.item:0 +msgid "* ( 1 + " +msgstr "* ( 1 + " + +#. module: product +#: help:product.packaging,weight:0 +msgid "The weight of a full package, pallet or box." +msgstr "Вес полной упаковки, коробки или поддона." #. module: product #: model:product.template,name:product.product_product_hdd2_product_template @@ -1313,325 +1779,394 @@ msgid "HDD Seagate 7200.8 120GB" msgstr "Жесткий диск Seagate 7200.8 120GB" #. module: product -#: wizard_field:product.price_list,init,qty2:0 -msgid "Quantity-2" -msgstr "Количество-2" +#: model:product.template,name:product.product_product_employee0_product_template +msgid "Employee" +msgstr "Сотрудник" #. module: product -#: view:product.product:0 -#: view:product.template:0 -msgid "Information" -msgstr "Информация" +#: model:product.template,name:product.product_product_shelfofcm0_product_template +msgid "Shelf of 100cm" +msgstr "Полка 100см" #. module: product -#: view:product.product:0 -msgid "Codes" -msgstr "Коды" +#: model:ir.model,name:product.model_product_category +#: field:product.pricelist.item,categ_id:0 +msgid "Product Category" +msgstr "Категория ТМЦ" #. module: product -#: constraint:ir.model:0 -msgid "" -"The Object name must start with x_ and not contain any special character !" -msgstr "" -"Название объекта должно начинаться с x_ и не должно содержать специальных " -"символов !" +#: report:product.pricelist:0 +msgid "Price List Name" +msgstr "Название каталога" #. module: product -#: wizard_field:product.price_list,init,qty4:0 -msgid "Quantity-4" -msgstr "Количество-4" +#: field:product.supplierinfo,delay:0 +msgid "Delivery Lead Time" +msgstr "Время выполнения доставки" #. module: product -#: wizard_field:product.price_list,init,qty5:0 -msgid "Quantity-5" -msgstr "Количество-5" +#: help:product.uom,active:0 +msgid "" +"By unchecking the active field you can disable a unit of measure without " +"deleting it." +msgstr "" +"Сняв отметку с активного поля \"Активно\", вы можете запретить единицу " +"измерения без ее удаления." #. module: product -#: view:product.packaging:0 -#: view:product.product:0 -msgid "Other Info" -msgstr "Прочая информация" +#: field:product.template,seller_delay:0 +msgid "Supplier Lead Time" +msgstr "Время поставки" #. module: product -#: view:product.product:0 -#: view:product.template:0 -msgid "Delays" -msgstr "Задержки" +#: help:product.product,active:0 +msgid "" +"If the active field is set to true, it will allow you to hide the product " +"without removing it." +msgstr "" +"если поле \"Активно\" установлено в \"истина\", то это позволит вам скрыть " +"ТМЦ без ее удаления." #. module: product -#: field:product.pricelist.version,items_id:0 -msgid "Price List Items" -msgstr "Элементы каталога" +#: selection:product.ul,type:0 +msgid "Box" +msgstr "Коробка" #. module: product -#: help:product.supplierinfo,product_code:0 +#: model:product.template,name:product.product_product_rearpanelarm1_product_template +msgid "Rear Panel SHE200" +msgstr "Задняя панель SHE200" + +#. module: product +#: help:product.pricelist.type,key:0 msgid "" -"Code of the product for this partner, will be used when printing a request " -"for quotation. Keep empty to use the internal one." +"Used in the code to select specific prices based on the context. Keep " +"unchanged." msgstr "" #. module: product -#: selection:product.template,state:0 -msgid "Obsolete" -msgstr "Устаревший" +#: model:product.template,name:product.product_product_hdd1_product_template +msgid "HDD Seagate 7200.8 80GB" +msgstr "Жёсткий диск Seagate 7200.8 80GB" #. module: product -#: selection:product.ul,type:0 -msgid "Pallet" -msgstr "" +#: help:product.supplierinfo,qty:0 +msgid "This is a quantity which is converted into Default Uom." +msgstr "Это количество, которое конвертируется в ед. езм. по умолчанию." #. module: product -#: field:pricelist.partnerinfo,price:0 -msgid "Unit Price" -msgstr "Цена за ед." +#: field:product.packaging,ul:0 +msgid "Type of Package" +msgstr "Тип упаковки" #. module: product -#: field:product.template,warranty:0 -msgid "Warranty (months)" -msgstr "Гарантия (мес.)" +#: selection:product.ul,type:0 +msgid "Pack" +msgstr "Упаковка" #. module: product -#: field:product.packaging,ul_qty:0 -msgid "Package by layer" +#: model:product.category,name:product.product_category_4 +msgid "Dello Computer" msgstr "" #. module: product -#: help:product.template,type:0 -msgid "" -"Will change the way procurements are processed. Consumables are stockable " -"products with infinite stock, or for use when you have no inventory " -"management in the system." +#: model:product.uom.categ,name:product.product_uom_categ_kgm +msgid "Weight" +msgstr "Вес" + +#. module: product +#: model:product.template,name:product.product_product_22_product_template +msgid "Processor on demand" msgstr "" #. module: product -#: model:process.node,note:product.process_node_supplier0 -msgid "Product suppliers, with their product name, price, etc." -msgstr "Поставщики изделия, с названиями и ценами" +#: model:product.template,name:product.product_product_25_product_template +msgid "Mouse" +msgstr "Мышь" #. module: product -#: model:ir.model,name:product.model_product_price_type -msgid "Price type" -msgstr "Тип цены" +#: field:product.uom,uom_type:0 +msgid "UoM Type" +msgstr "Тип ед. изм." #. module: product -#: model:ir.model,name:product.model_product_product -#: model:process.node,name:product.process_node_product0 -#: field:product.packaging,product_id:0 -#: field:product.pricelist.item,product_id:0 -#: view:product.product:0 -#: field:product.supplierinfo,product_id:0 -#: model:res.request.link,name:product.req_link_product -msgid "Product" -msgstr "Товарно-материальные ценности" +#: help:product.template,product_manager:0 +msgid "This is use as task responsible" +msgstr "" #. module: product -#: field:product.template,volume:0 -msgid "Volume" -msgstr "Объем" +#: help:product.uom,rounding:0 +msgid "" +"The computed quantity will be a multiple of this value. Use 1.0 for a UoM " +"that cannot be further split, such as a piece." +msgstr "" +"Вычисленное количество будет кратно этому значению. Используйте 1.0 для ед. " +"изм. которые не могут быть разделены, например штуки." #. module: product -#: field:pricelist.partnerinfo,name:0 -#: field:product.packaging,name:0 #: view:product.product:0 #: view:product.template:0 -#: field:product.template,description:0 -msgid "Description" -msgstr "Описание" +msgid "Descriptions" +msgstr "Описания" #. module: product -#: field:product.packaging,ean:0 -msgid "EAN" -msgstr "" +#: field:product.template,loc_row:0 +msgid "Row" +msgstr "Строка" + +#. module: product +#: model:product.template,name:product.product_product_rearpanelarm0_product_template +msgid "Rear Panel SHE100" +msgstr "Задняя панель SHE200" + +#. module: product +#: model:product.template,name:product.product_product_23_product_template +msgid "Complete PC With Peripherals" +msgstr "Комплектовать ПК периферией" #. module: product #: view:product.product:0 #: view:product.template:0 -msgid "Product Description" -msgstr "Описание продукции" +msgid "Weigths" +msgstr "Вес" #. module: product -#: view:product.pricelist.item:0 -msgid " ) + " -msgstr " ) + " +#: model:product.template,name:product.product_product_hotelexpenses0_product_template +msgid "Hotel Expenses" +msgstr "Расходы отеля" #. module: product -#: help:product.template,sale_delay:0 +#: help:product.uom,factor_inv:0 msgid "" -"This is the average time between the confirmation of the customer order and " -"the delivery of the finished products. It's the time you promise to your " -"customers." +"How many times this UoM is bigger than the reference UoM in this category:\n" +"1 * (this unit) = ratio * (reference unit)" msgstr "" -"Среднее время между подтверждением заказа и доставкой товара. Это время вы " -"сообщаете заказчикам." #. module: product -#: model:ir.model,name:product.model_product_uom_categ -msgid "Product uom categ" -msgstr "Категория ед. изм. продукции" +#: model:product.template,name:product.product_product_shelf0_product_template +msgid "Rack 100cm" +msgstr "Стойка 100см" #. module: product -#: wizard_field:product.price_list,init,qty3:0 -msgid "Quantity-3" -msgstr "Количество-3" +#: help:product.packaging,sequence:0 +msgid "Gives the sequence order when displaying a list of packaging." +msgstr "Дает порядок последовательности при выводе списка упаковок." #. module: product -#: model:product.ul,name:product.product_ul_box -msgid "Box 20x20x40" -msgstr "" +#: field:product.pricelist.item,price_round:0 +msgid "Price Rounding" +msgstr "Округление цены" #. module: product -#: selection:product.template,supply_method:0 -msgid "Produce" -msgstr "Прозвести" +#: field:product.pricelist.item,price_max_margin:0 +msgid "Max. Price Margin" +msgstr "Максимальная маржа цены" #. module: product -#: selection:product.template,procure_method:0 -msgid "Make to Order" -msgstr "Изготовление на заказ" +#: help:product.supplierinfo,product_name:0 +msgid "" +"This supplier's product name will be used when printing a request for " +"quotation. Keep empty to use the internal one." +msgstr "" +"Название продукции, используемое поставщиком, будет выводиться при печати " +"запроса цен. Оставьте пустым для использования внутреннего названия." #. module: product -#: field:product.pricelist.item,price_surcharge:0 -msgid "Price Surcharge" -msgstr "Надбавка к цене" +#: help:product.supplierinfo,min_qty:0 +msgid "" +"The minimal quantity to purchase to this supplier, expressed in the default " +"unit of measure." +msgstr "" +"Минимальное количество продукции закупаемой у этого поставщика, в единицах " +"измерения по умолчанию." #. module: product -#: constraint:product.pricelist.version:0 -msgid "You cannot have 2 pricelist versions that overlap!" -msgstr "" +#: selection:product.template,mes_type:0 +msgid "Variable" +msgstr "Переменный" #. module: product -#: view:product.pricelist.item:0 -msgid "Rounding Method" -msgstr "Метод округления" +#: field:product.template,rental:0 +msgid "Can be Rent" +msgstr "Может быть аренда" #. module: product -#: field:product.product,variants:0 -msgid "Variants" -msgstr "Варианты" +#: model:product.price.type,name:product.standard_price +#: field:product.template,standard_price:0 +msgid "Cost Price" +msgstr "Себестоимость" #. module: product -#: view:product.pricelist.item:0 -msgid "Price Computation" -msgstr "Расчет цены" +#: field:product.pricelist.item,price_min_margin:0 +msgid "Min. Price Margin" +msgstr "Минимальная маржа цены" #. module: product -#: model:product.template,name:product.product_product_mb1_product_template -msgid "Mainboard ASUStek A7N8X" -msgstr "Материнская плата ASUStek A7N8X" +#: field:product.template,weight:0 +msgid "Gross weight" +msgstr "Вес брутто" #. module: product -#: field:product.template,loc_case:0 -msgid "Case" -msgstr "" +#: model:product.template,name:product.product_product_assemblysection0_product_template +msgid "Assembly Section" +msgstr "Зона сборки" #. module: product -#: field:product.pricelist.version,date_end:0 -msgid "End Date" -msgstr "Дата окончания" +#: model:product.category,name:product.product_category_3 +msgid "Computer Stuff" +msgstr "Компьютерные компоненты" #. module: product -#: model:ir.actions.act_window,name:product.product_category_action_form -#: model:ir.ui.menu,name:product.menu_product_category_action_form -msgid "Products Categories" -msgstr "Категории ТМЦ" +#: model:product.category,name:product.product_category_8 +msgid "Phone Help" +msgstr "Телефон помощи" #. module: product -#: field:product.product,packaging:0 -msgid "Logistical Units" +#: help:product.pricelist.item,price_round:0 +msgid "" +"Sets the price so that it is a multiple of this value.\n" +"Rounding is applied after the discount and before the surcharge.\n" +"To have prices that end in 9.99, set rounding 10, surcharge -0.01" msgstr "" +"Устанавливает цену кратной данному значению.\n" +"Округление применяется после скидки, но перед надбавкой.\n" +"Так, чтобы цена заканчивалась на 9,99, установите округление 10, надбавку -" +"0,01." #. module: product -#: field:product.category,complete_name:0 -#: field:product.category,name:0 -#: field:product.pricelist.type,name:0 -#: field:product.pricelist.version,name:0 -#: field:product.template,name:0 -#: field:product.ul,name:0 -#: field:product.uom,name:0 -#: field:product.uom.categ,name:0 -msgid "Name" -msgstr "Название" +#: view:product.price_list:0 +msgid "Close" +msgstr "Закрыть" #. module: product -#: help:product.template,uos_coeff:0 -msgid "" -"Coefficient to convert UOM to UOS\n" -" uom = uos * coeff" -msgstr "" +#: model:ir.model,name:product.model_product_pricelist_item +msgid "Pricelist item" +msgstr "Элемент каталога" #. module: product -#: field:product.template,purchase_ok:0 -msgid "Can be Purchased" -msgstr "Можно закупать" +#: model:product.template,name:product.product_product_21_product_template +msgid "RAM on demand" +msgstr "ОЗУ по требованию" #. module: product -#: field:product.template,uos_coeff:0 -msgid "UOM -> UOS Coeff" -msgstr "" +#: view:res.partner:0 +msgid "Sales Properties" +msgstr "Свойства продажи" #. module: product -#: model:product.template,name:product.product_product_cpu2_product_template -msgid "High speed processor config" -msgstr "" +#: model:product.uom,name:product.product_uom_ton +msgid "tonne" +msgstr "тонна" #. module: product -#: model:product.template,name:product.product_product_pc2_product_template -msgid "Basic+ PC (assembly on order)" -msgstr "" +#: view:product.product:0 +#: view:product.template:0 +msgid "Delays" +msgstr "Задержки" #. module: product -#: field:product.template,cost_method:0 -msgid "Costing Method" -msgstr "Метод ценообразования" +#: model:process.node,note:product.process_node_product0 +msgid "Creation of the product" +msgstr "Создание ТМЦ" #. module: product -#: view:product.packaging:0 -#: view:product.product:0 -msgid "Palletization" +#: help:product.template,type:0 +msgid "" +"Will change the way procurements are processed. Consumables are stockable " +"products with infinite stock, or for use when you have no inventory " +"management in the system." msgstr "" #. module: product +#: field:pricelist.partnerinfo,name:0 +#: field:product.packaging,name:0 +#: report:product.pricelist:0 #: view:product.product:0 #: view:product.template:0 -msgid "Prices & Suppliers" -msgstr "Цены и поставщики" +#: field:product.template,description:0 +msgid "Description" +msgstr "Описание" #. module: product -#: help:product.packaging,weight:0 -msgid "The weight of a full of products palet or box." +#: field:product.packaging,ean:0 +msgid "EAN" msgstr "" #. module: product -#: selection:product.template,state:0 -msgid "End of Lifecycle" -msgstr "Конец жизненного цикла" +#: view:product.template:0 +msgid "Product Description" +msgstr "Описание продукции" #. module: product -#: model:ir.module.module,shortdesc:product.module_meta_information -msgid "Products & Pricelists" -msgstr "ТМЦ и каталоги" +#: view:product.pricelist.item:0 +msgid " ) + " +msgstr " ) + " #. module: product -#: help:product.uom,factor:0 +#: help:product.product,incoming_qty:0 msgid "" -"The coefficient for the formula:\n" -"1 (base unit) = coeff (this unit). Rate = 1 / Factor." +"Quantities of products that are planned to arrive in selected locations or " +"all internal if none have been selected." msgstr "" +"Объемы продукции, которые планируется достичь в выбранных местах или все " +"внутренние, если никакие не были выбраны." #. module: product -#: help:product.template,weight_net:0 -msgid "The net weight in Kg." -msgstr "Вес нетто в килограммах." +#: field:product.template,volume:0 +msgid "Volume" +msgstr "Объем" #. module: product -#: model:product.template,name:product.product_product_tow1_product_template -msgid "ATX Mid-size Tower" -msgstr "Среднеразмерный ATX корпус" +#: field:product.template,loc_case:0 +msgid "Case" +msgstr "Вопрос" #. module: product -#: field:product.supplierinfo,delay:0 -msgid "Delivery Delay" -msgstr "Задержка доставки" +#: view:product.product:0 +msgid "Product Variant" +msgstr "Вариант ТМЦ" + +#. module: product +#: model:product.category,name:product.product_category_shelves0 +msgid "Shelves" +msgstr "Полки" + +#. module: product +#: code:addons/product/pricelist.py:0 +#, python-format +msgid "Other Pricelist" +msgstr "Другой прайс" + +#. module: product +#: model:ir.model,name:product.model_product_template +#: field:product.pricelist.item,product_tmpl_id:0 +#: field:product.product,product_tmpl_id:0 +#: view:product.template:0 +msgid "Product Template" +msgstr "Шаблон ТМЦ" + +#. module: product +#: field:product.template,cost_method:0 +msgid "Costing Method" +msgstr "Метод ценообразования" + +#. module: product +#: view:product.packaging:0 +#: view:product.product:0 +msgid "Palletization" +msgstr "Укладка на паллеты" + +#. module: product +#: selection:product.template,state:0 +msgid "End of Lifecycle" +msgstr "Конец жизненного цикла" + +#. module: product +#: help:product.product,packaging:0 +msgid "" +"Gives the different ways to package the same product. This has no impact on " +"the picking order and is mainly used if you use the EDI module." +msgstr "" #. module: product #: model:ir.actions.act_window,name:product.product_pricelist_action @@ -1641,9 +2176,12 @@ msgid "Pricelist Versions" msgstr "Версии каталогов" #. module: product -#: field:product.packaging,weight_ul:0 -msgid "Empty Package Weight" -msgstr "Вес пустого пакета" +#: field:product.category,sequence:0 +#: field:product.packaging,sequence:0 +#: field:product.pricelist.item,sequence:0 +#: field:product.supplierinfo,sequence:0 +msgid "Sequence" +msgstr "Последовательность" #. module: product #: field:product.template,list_price:0 @@ -1651,23 +2189,9 @@ msgid "Sale Price" msgstr "Цена продажи" #. module: product -#: help:product.template,produce_delay:0 -msgid "" -"Average time to produce this product. This is only for the production order " -"and, if it is a multi-level bill of material, it's only for the level of " -"this product. Different delays will be summed for all levels and purchase " -"orders." -msgstr "" - -#. module: product -#: wizard_field:product.price_list,init,qty1:0 -msgid "Quantity-1" -msgstr "Количество-1" - -#. module: product -#: field:product.packaging,length:0 -msgid "Length" -msgstr "Длина" +#: field:product.category,type:0 +msgid "Category Type" +msgstr "Тип категории" #. module: product #: model:product.category,name:product.cat2 @@ -1675,31 +2199,21 @@ msgid "Private" msgstr "" #. module: product -#: help:product.supplierinfo,delay:0 -msgid "" -"Delay in days between the confirmation of the purchase order and the " -"reception of the products in your warehouse. Used by the scheduler for " -"automatic computation of the purchase order planning." -msgstr "" -"Задержка в днях между подтверждением заказа и поступлением изделия на склад. " -"Используется планировщиком для автоматического планирования заказов." - -#. module: product -#: help:product.template,uom_po_id:0 +#: help:product.template,uos_coeff:0 msgid "" -"Default Unit of Measure used for purchase orders. It must in the same " -"category than the default unit of measure." +"Coefficient to convert UOM to UOS\n" +" uos = uom * coeff" msgstr "" #. module: product -#: constraint:product.product:0 -msgid "Error: Invalid ean code" -msgstr "Ошибка: Неправильный штрих-код" +#: field:product.pricelist.item,price_discount:0 +msgid "Price Discount" +msgstr "Скидка с цены" #. module: product -#: field:product.pricelist.item,min_quantity:0 -msgid "Min. Quantity" -msgstr "Мин. кол-во" +#: help:product.template,volume:0 +msgid "The volume in m3." +msgstr "Объём в метрах куб." #. module: product #: help:product.pricelist.item,categ_id:0 @@ -1708,27 +2222,124 @@ msgid "" "and his childs. Keep empty for all products" msgstr "" -#. module: product -#: model:ir.actions.report.xml,name:product.report_product_label -msgid "Products Labels" -msgstr "Этикетки изделия" +#~ msgid "" +#~ "Determine if the product can be visible in the list of product within a " +#~ "selection from a sale order line." +#~ msgstr "" +#~ "Указывается, если продукция должна быть видна в списке продукции на продажу." -#. module: product -#: help:product.template,volume:0 -msgid "The volume in m3." -msgstr "Объём в метрах куб." +#~ msgid "" +#~ "The minimal quantity to purchase for this supplier, expressed in the default " +#~ "unit of measure." +#~ msgstr "" +#~ "Минимальный размер закупки от этого поставщика, выраженный в стандартных " +#~ "единицах измерения." -#. module: product -#: model:product.ul,name:product.product_ul_big_box -msgid "Box 30x40x60" -msgstr "" +#~ msgid "Procure Method" +#~ msgstr "Метод закупки" -#. module: product -#: model:product.uom,name:product.product_uom_kgm -msgid "KGM" -msgstr "" +#~ msgid "Customer Price" +#~ msgstr "Цена клиента" -#. module: product -#: field:product.pricelist.item,price_discount:0 -msgid "Price Discount" -msgstr "Скидка с цены" +#~ msgid "Configuration" +#~ msgstr "Настройки" + +#~ msgid "In Production" +#~ msgstr "В производстве" + +#~ msgid "Priority" +#~ msgstr "Приоритет" + +#~ msgid "Factor" +#~ msgstr "Множитель" + +#~ msgid "" +#~ "This pricelist will be used, instead of the default one, " +#~ "for sales to the current partner" +#~ msgstr "" +#~ "При продаже данному партнеру будет использован не каталог по умолчанию, а " +#~ "этот каталог." + +#~ msgid "Can be sold" +#~ msgstr "Можно продавать" + +#~ msgid "Rate" +#~ msgstr "Курс" + +#~ msgid "Price list" +#~ msgstr "Прайс" + +#~ msgid "Price type" +#~ msgstr "Тип цены" + +#~ msgid "" +#~ "The computed quantity will be a multiple of this value. Use 1.0 for products " +#~ "that can not be split." +#~ msgstr "" +#~ "Расчетная величина будет кратна этому значению. Используйте 1.0 для " +#~ "продуктов, которые не могут быть разделены." + +#~ msgid "Cancel" +#~ msgstr "Отмена" + +#~ msgid "Prices & Suppliers" +#~ msgstr "Цены и поставщики" + +#~ msgid "Delivery Delay" +#~ msgstr "Задержка доставки" + +#~ msgid "Number of Layer" +#~ msgstr "Число слоёв" + +#~ msgid "The number of layer on a palet or box" +#~ msgstr "Число слоёв на палете или в коробке" + +#~ msgid "Supplier Info" +#~ msgstr "Информация о поставщике" + +#~ msgid "Rentable Product" +#~ msgstr "Изделие для аренды" + +#~ msgid "You can see the list of suppliers for that product." +#~ msgstr "Вы можете просмотреть список поставщиков этого изделия" + +#~ msgid "Default UoM" +#~ msgstr "Единица измерения по умолчанию" + +#~ msgid "Prices Computations" +#~ msgstr "Вычисление цен" + +#~ msgid "Suppliers of Product" +#~ msgstr "Поставщики изделия" + +#~ msgid "" +#~ "Unit of Measure of a category can be converted between each others in the " +#~ "same category." +#~ msgstr "" +#~ "Единицы измерения могут быть приведены друг к другу в пределах одной " +#~ "категории." + +#~ msgid "" +#~ "This is the average time between the confirmation of the customer order and " +#~ "the delivery of the finished products. It's the time you promise to your " +#~ "customers." +#~ msgstr "" +#~ "Среднее время между подтверждением заказа и доставкой товара. Это время вы " +#~ "сообщаете заказчикам." + +#~ msgid "Product suppliers, with their product name, price, etc." +#~ msgstr "Поставщики изделия, с названиями и ценами" + +#~ msgid "" +#~ "Delay in days between the confirmation of the purchase order and the " +#~ "reception of the products in your warehouse. Used by the scheduler for " +#~ "automatic computation of the purchase order planning." +#~ msgstr "" +#~ "Задержка в днях между подтверждением заказа и поступлением изделия на склад. " +#~ "Используется планировщиком для автоматического планирования заказов." + +#~ msgid "Partner Product Name" +#~ msgstr "Наименование изделия партнёра" + +#~ msgid "Create new Product" +#~ msgstr "Создать ТМЦ" diff --git a/addons/product/product.py b/addons/product/product.py index 60a8cf97783..b43f40b1cbc 100644 --- a/addons/product/product.py +++ b/addons/product/product.py @@ -492,7 +492,7 @@ class product_product(osv.osv): if not context: context={} if name: - ids = self.search(cr, user, [('default_code','=',name)]+ args, limit=limit, context=context) + ids = self.search(cr, user, [('default_code',operator,name)]+ args, limit=limit, context=context) if not len(ids): ids = self.search(cr, user, [('ean13','=',name)]+ args, limit=limit, context=context) if not len(ids): diff --git a/addons/project/project.py b/addons/project/project.py index 294c711eaac..6c9f66dd009 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -483,7 +483,10 @@ class task(osv.osv): def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False): users_obj = self.pool.get('res.users') - obj_tm = users_obj.browse(cr, uid, uid, context).company_id.project_time_mode_id + + # read uom as admin to avoid access rights issues, e.g. for portal/share users, + # this should be safe (no context passed to avoid side-effects) + obj_tm = users_obj.browse(cr, 1, uid).company_id.project_time_mode_id tm = obj_tm and obj_tm.name or 'Hours' res = super(task, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar, submenu=submenu) diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 8cf262237da..01b5999cdcd 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -85,7 +85,7 @@ <label string="ID: %%(task_id)s"/> <label string="Status: %%(state)s"/> <label string="Date Start: %%(date_start)s"/> - <label string="Date Stop: %%(date_stop)s"/> + <label string="Date Stop: %%(date)s"/> </group> </page> <page string="Tasks Stages" groups="base.group_extended"> diff --git a/addons/purchase/i18n/fr.po b/addons/purchase/i18n/fr.po index 094da93b301..55dabfd1a68 100644 --- a/addons/purchase/i18n/fr.po +++ b/addons/purchase/i18n/fr.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 10:08+0000\n" -"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n" +"PO-Revision-Date: 2010-10-26 11:23+0000\n" +"Last-Translator: qdp (OpenERP) <qdp-launchpad@tinyerp.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-09-29 04:54+0000\n" +"X-Launchpad-Export-Date: 2010-10-27 04:58+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: purchase @@ -584,7 +584,7 @@ msgstr "Créer la facture à partir de la liste de colisage" #. module: purchase #: help:purchase.order,date_order:0 msgid "Date on which this document has been created." -msgstr "" +msgstr "Date a laquelle ce document a été créé" #. module: purchase #: view:purchase.order:0 @@ -594,7 +594,7 @@ msgstr "Livraisons & Factures" #. module: purchase #: field:purchase.order,date_order:0 msgid "Date" -msgstr "" +msgstr "Date" #. module: purchase #: help:purchase.order,origin:0 @@ -661,7 +661,7 @@ msgstr "" #. module: purchase #: view:purchase.order.line:0 msgid "History" -msgstr "" +msgstr "Historique" #. module: purchase #: field:purchase.order,state:0 @@ -692,7 +692,7 @@ msgstr "Position Fiscale" #. module: purchase #: rml:purchase.order:0 msgid "Request for Quotation N°" -msgstr "" +msgstr "Demande de devis N°" #. module: purchase #: field:purchase.order,invoice_id:0 @@ -824,7 +824,7 @@ msgstr "UdM produit" #. module: purchase #: field:purchase.order.line,move_ids:0 msgid "Reservation" -msgstr "" +msgstr "Réservation" #. module: purchase #: model:process.node,note:purchase.process_node_confirmpurchaseorder0 @@ -912,7 +912,7 @@ msgstr "" #. module: purchase #: view:purchase.order.line:0 msgid "Stock Moves" -msgstr "" +msgstr "Mouvements de stock" #. module: purchase #: selection:report.purchase.order.category,state:0 @@ -924,13 +924,13 @@ msgstr "" #: field:report.purchase.order.category,price_total:0 #: field:report.purchase.order.product,price_total:0 msgid "Total Price" -msgstr "" +msgstr "Prix total" #. module: purchase #: selection:report.purchase.order.category,state:0 #: selection:report.purchase.order.product,state:0 msgid "Quotation" -msgstr "" +msgstr "Devis" #. module: purchase #: selection:report.purchase.order.category,state:0 @@ -942,10 +942,10 @@ msgstr "" #: selection:report.purchase.order.category,state:0 #: selection:report.purchase.order.product,state:0 msgid "In progress" -msgstr "" +msgstr "En cours" #. module: purchase #: code:addons/purchase/purchase.py:0 #, python-format msgid "Cannot delete Purchase Order(s) which are in %s State!" -msgstr "" +msgstr "Impossible de supprimer des bons de commande dans l'état %s !" diff --git a/addons/purchase/i18n/ru.po b/addons/purchase/i18n/ru.po index 36024f72900..36f6a06e7ee 100644 --- a/addons/purchase/i18n/ru.po +++ b/addons/purchase/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-10-24 15:52+0000\n" +"PO-Revision-Date: 2010-10-26 07:57+0000\n" "Last-Translator: Chertykov Denis <chertykov@gmail.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-10-25 04:38+0000\n" +"X-Launchpad-Export-Date: 2010-10-27 04:58+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: purchase @@ -179,7 +179,7 @@ msgstr "С уважением," #. module: purchase #: rml:purchase.order:0 msgid "Net Total :" -msgstr "" +msgstr "Чистый итог:" #. module: purchase #: selection:purchase.order,state:0 @@ -295,7 +295,7 @@ msgstr "Подтверждено" #. module: purchase #: model:process.node,name:purchase.process_node_productrecept0 msgid "Product Receipt" -msgstr "" +msgstr "Получение ТМЦ" #. module: purchase #: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0 @@ -570,7 +570,7 @@ msgstr "Запрос цен, предложенный системой." #. module: purchase #: model:process.transition,name:purchase.process_transition_packinginvoice0 msgid "Packing Invoice" -msgstr "" +msgstr "Счет на упаковку" #. module: purchase #: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0 diff --git a/addons/purchase_analytic_plans/i18n/ru.po b/addons/purchase_analytic_plans/i18n/ru.po index 80364d09207..58bccbcb450 100644 --- a/addons/purchase_analytic_plans/i18n/ru.po +++ b/addons/purchase_analytic_plans/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: 2010-10-18 17:46+0000\n" -"PO-Revision-Date: 2010-10-24 15:20+0000\n" +"PO-Revision-Date: 2010-10-25 07:14+0000\n" "Last-Translator: Chertykov Denis <chertykov@gmail.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-10-25 04:38+0000\n" +"X-Launchpad-Export-Date: 2010-10-26 04:39+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: purchase_analytic_plans diff --git a/addons/report_intrastat/test/report_instratat_report.yml b/addons/report_intrastat/test/report_instratat_report.yml index c6162f51c25..858f9330358 100644 --- a/addons/report_intrastat/test/report_instratat_report.yml +++ b/addons/report_intrastat/test/report_instratat_report.yml @@ -1,8 +1,21 @@ - + In order to test the PDF reports defined using report_instratat module, we will create a invoice record +- + !record {model: account.invoice, id: test_invoice_1}: + currency_id: base.EUR + company_id: base.main_company + address_invoice_id: base.res_partner_address_tang + partner_id: base.res_partner_asus + state: draft + type: out_invoice + account_id: account.a_recv + name: Test invoice 1 + address_contact_id: base.res_partner_address_tang +- In order to test the PDF reports defined using report_instratat module, we print a Instratat Report -- +- !python {model: account.invoice}: | import netsvc, tools, os - (data, format) = netsvc.LocalService('report.account.invoice.intrastat').create(cr, uid, [ref('account.test_invoice_1')], {}, {}) + (data, format) = netsvc.LocalService('report.account.invoice.intrastat').create(cr, uid, [ref('test_invoice_1')], {}, {}) if tools.config['test_report_directory']: file(os.path.join(tools.config['test_report_directory'], 'report_instratat-instrastat_report.'+format), 'wb+').write(data) diff --git a/addons/sale/i18n/ru.po b/addons/sale/i18n/ru.po index 0cb51bbb046..3cd78b357d0 100644 --- a/addons/sale/i18n/ru.po +++ b/addons/sale/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: 2010-10-18 17:46+0000\n" -"PO-Revision-Date: 2010-10-24 17:27+0000\n" +"PO-Revision-Date: 2010-10-25 07:16+0000\n" "Last-Translator: Chertykov Denis <chertykov@gmail.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-10-25 04:39+0000\n" +"X-Launchpad-Export-Date: 2010-10-26 04:40+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: sale diff --git a/addons/sale/report/sale_report.py b/addons/sale/report/sale_report.py index 25046063391..75c37ff9416 100644 --- a/addons/sale/report/sale_report.py +++ b/addons/sale/report/sale_report.py @@ -30,26 +30,26 @@ class sale_report(osv.osv): _columns = { 'date': fields.date('Date Order', readonly=True), 'date_confirm': fields.date('Date Confirm', readonly=True), - 'shipped':fields.boolean('Shipped', readonly=True), - 'shipped_qty_1':fields.integer('Shipped Qty', readonly=True), + 'shipped': fields.boolean('Shipped', readonly=True), + 'shipped_qty_1': fields.integer('Shipped Qty', readonly=True), 'year': fields.char('Year', size=4, readonly=True), - 'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), - ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'), - ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True), + 'month': fields.selection([('01', 'January'), ('02', 'February'), ('03', 'March'), ('04', 'April'), + ('05', 'May'), ('06', 'June'), ('07', 'July'), ('08', 'August'), ('09', 'September'), + ('10', 'October'), ('11', 'November'), ('12', 'December')], 'Month', readonly=True), 'day': fields.char('Day', size=128, readonly=True), - 'product_id':fields.many2one('product.product', 'Product', readonly=True), + 'product_id': fields.many2one('product.product', 'Product', readonly=True), 'uom_name': fields.char('Default UoM', size=128, readonly=True), - 'product_uom_qty':fields.float('# of Qty', readonly=True), + 'product_uom_qty': fields.float('# of Qty', readonly=True), - 'partner_id':fields.many2one('res.partner', 'Partner', readonly=True), - 'shop_id':fields.many2one('sale.shop', 'Shop', readonly=True), - 'company_id':fields.many2one('res.company', 'Company', readonly=True), - 'user_id':fields.many2one('res.users', 'Salesman', readonly=True), - 'price_total':fields.float('Total Price', readonly=True), - 'delay':fields.float('Commitment Delay', digits=(16,2), readonly=True), - 'price_average':fields.float('Average Price', readonly=True,group_operator="avg"), + 'partner_id': fields.many2one('res.partner', 'Partner', readonly=True), + 'shop_id': fields.many2one('sale.shop', 'Shop', readonly=True), + 'company_id': fields.many2one('res.company', 'Company', readonly=True), + 'user_id': fields.many2one('res.users', 'Salesman', readonly=True), + 'price_total': fields.float('Total Price', readonly=True), + 'delay': fields.float('Commitment Delay', digits=(16,2), readonly=True), + 'price_average': fields.float('Average Price', readonly=True,group_operator="avg"), 'categ_id': fields.many2one('product.category','Category of Product', readonly=True), - 'nbr':fields.integer('# of Lines', readonly=True), + 'nbr': fields.integer('# of Lines', readonly=True), 'state': fields.selection([ ('draft', 'Quotation'), ('waiting_date', 'Waiting Schedule'), @@ -124,5 +124,4 @@ class sale_report(osv.osv): """) sale_report() - - +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/sale/sale.py b/addons/sale/sale.py index caee07d4aff..f96ddb054f6 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -65,7 +65,7 @@ class sale_order(osv.osv): 'shipped': False, 'invoice_ids': [], 'picking_ids': [], - 'date_confirm':False, + 'date_confirm': False, 'name': self.pool.get('ir.sequence').get(cr, uid, 'sale.order'), }) return super(sale_order, self).copy(cr, uid, id, default, context=context) @@ -345,7 +345,6 @@ class sale_order(osv.osv): payment_term = part.property_payment_term and part.property_payment_term.id or False fiscal_position = part.property_account_position and part.property_account_position.id or False dedicated_salesman = part.user_id and part.user_id.id or uid - val = { 'partner_invoice_id': addr['invoice'], 'partner_order_id': addr['contact'], @@ -354,10 +353,8 @@ class sale_order(osv.osv): 'fiscal_position': fiscal_position, 'user_id': dedicated_salesman, } - if pricelist: val['pricelist_id'] = pricelist - return {'value': val} def shipping_policy_change(self, cr, uid, ids, policy, context=None): @@ -375,7 +372,7 @@ class sale_order(osv.osv): def write(self, cr, uid, ids, vals, context=None): if context is None: context = {} - if 'order_policy' in vals: + if vals.get('order_policy', False): if vals['order_policy'] == 'prepaid': vals.update({'invoice_quantity': 'order'}) elif vals['order_policy'] == 'picking': @@ -385,7 +382,7 @@ class sale_order(osv.osv): def create(self, cr, uid, vals, context=None): if context is None: context = {} - if 'order_policy' in vals: + if vals.get('order_policy', False): if vals['order_policy'] == 'prepaid': vals.update({'invoice_quantity': 'order'}) if vals['order_policy'] == 'picking': @@ -418,10 +415,7 @@ class sale_order(osv.osv): raise osv.except_osv(_('Error !'), _('There is no sale journal defined for this company: "%s" (id:%d)') % (order.company_id.name, order.company_id.id)) a = order.partner_id.property_account_receivable.id - if order.payment_term: - pay_term = order.payment_term.id - else: - pay_term = False + pay_term = order.payment_term and order.payment_term.id or False invoiced_sale_line_ids = self.pool.get('sale.order.line').search(cr, uid, [('order_id', '=', order.id), ('invoiced', '=', True)], context=context) from_line_invoice_ids = [] for invoiced_sale_line_id in self.pool.get('sale.order.line').browse(cr, uid, invoiced_sale_line_ids, context=context): @@ -450,7 +444,7 @@ class sale_order(osv.osv): 'fiscal_position': order.fiscal_position.id or order.partner_id.property_account_position.id, 'date_invoice': context.get('date_invoice',False), 'company_id': order.company_id.id, - 'user_id':order.user_id and order.user_id.id or False + 'user_id': order.user_id and order.user_id.id or False } inv.update(self._inv_get(cr, uid, order)) inv_id = inv_obj.create(cr, uid, inv, context=context) @@ -485,11 +479,10 @@ class sale_order(osv.osv): 'res_model': 'account.invoice', 'context': "{'type':'out_invoice'}", 'type': 'ir.actions.act_window', - 'nodestroy' :True, + 'nodestroy': True, 'target': 'current', 'res_id': inv_ids and inv_ids[0] or False, } - return result def action_invoice_create(self, cr, uid, ids, grouped=False, states=['confirmed', 'done', 'exception'], date_inv = False, context=None): @@ -539,7 +532,6 @@ class sale_order(osv.osv): if order.order_policy == 'picking': picking_obj.write(cr, uid, map(lambda x: x.id, order.picking_ids), {'invoice_state': 'invoiced'}) cr.execute('insert into sale_order_invoice_rel (order_id,invoice_id) values (%s,%s)', (order.id, res)) - return res def action_invoice_cancel(self, cr, uid, ids, context=None): @@ -591,7 +583,6 @@ class sale_order(osv.osv): # if order.state == 'invoice_except': self.write(cr, uid, [order.id], {'state': 'progress'}, context=context) - return True def action_cancel(self, cr, uid, ids, context=None): @@ -858,29 +849,29 @@ class sale_order_line(osv.osv): _description = 'Sale Order Line' _columns = { 'order_id': fields.many2one('sale.order', 'Order Reference', required=True, ondelete='cascade', select=True, readonly=True, states={'draft':[('readonly',False)]}), - 'name': fields.char('Description', size=256, required=True, select=True, readonly=True, states={'draft':[('readonly',False)]}), + 'name': fields.char('Description', size=256, required=True, select=True, readonly=True, states={'draft': [('readonly', False)]}), 'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of sale order lines."), - 'delay': fields.float('Delivery Lead Time', required=True, help="Number of days between the order confirmation the the shipping of the products to the customer", readonly=True, states={'draft':[('readonly',False)]}), + 'delay': fields.float('Delivery Lead Time', required=True, help="Number of days between the order confirmation the the shipping of the products to the customer", readonly=True, states={'draft': [('readonly', False)]}), 'product_id': fields.many2one('product.product', 'Product', domain=[('sale_ok', '=', True)], change_default=True), 'invoice_lines': fields.many2many('account.invoice.line', 'sale_order_line_invoice_rel', 'order_line_id', 'invoice_id', 'Invoice Lines', readonly=True), 'invoiced': fields.boolean('Invoiced', readonly=True), 'procurement_id': fields.many2one('procurement.order', 'Procurement'), - 'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Sale Price'), readonly=True, states={'draft':[('readonly',False)]}), + 'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Sale Price'), readonly=True, states={'draft': [('readonly', False)]}), 'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal', digits_compute= dp.get_precision('Sale Price')), - 'tax_id': fields.many2many('account.tax', 'sale_order_tax', 'order_line_id', 'tax_id', 'Taxes', readonly=True, states={'draft':[('readonly',False)]}), - 'type': fields.selection([('make_to_stock', 'from stock'), ('make_to_order', 'on order')], 'Procurement Method', required=True, readonly=True, states={'draft':[('readonly',False)]}), - 'property_ids': fields.many2many('mrp.property', 'sale_order_line_property_rel', 'order_id', 'property_id', 'Properties', readonly=True, states={'draft':[('readonly',False)]}), + 'tax_id': fields.many2many('account.tax', 'sale_order_tax', 'order_line_id', 'tax_id', 'Taxes', readonly=True, states={'draft': [('readonly', False)]}), + 'type': fields.selection([('make_to_stock', 'from stock'), ('make_to_order', 'on order')], 'Procurement Method', required=True, readonly=True, states={'draft': [('readonly', False)]}), + 'property_ids': fields.many2many('mrp.property', 'sale_order_line_property_rel', 'order_id', 'property_id', 'Properties', readonly=True, states={'draft': [('readonly', False)]}), 'address_allotment_id': fields.many2one('res.partner.address', 'Allotment Partner'), - 'product_uom_qty': fields.float('Quantity (UoM)', digits=(16, 2), required=True, readonly=True, states={'draft':[('readonly',False)]}), - 'product_uom': fields.many2one('product.uom', 'Unit of Measure ', required=True, readonly=True, states={'draft':[('readonly',False)]}), - 'product_uos_qty': fields.float('Quantity (UoS)', readonly=True, states={'draft':[('readonly',False)]}), + 'product_uom_qty': fields.float('Quantity (UoM)', digits=(16, 2), required=True, readonly=True, states={'draft': [('readonly', False)]}), + 'product_uom': fields.many2one('product.uom', 'Unit of Measure ', required=True, readonly=True, states={'draft': [('readonly', False)]}), + 'product_uos_qty': fields.float('Quantity (UoS)', readonly=True, states={'draft': [('readonly', False)]}), 'product_uos': fields.many2one('product.uom', 'Product UoS'), 'product_packaging': fields.many2one('product.packaging', 'Packaging'), 'move_ids': fields.one2many('stock.move', 'sale_line_id', 'Inventory Moves', readonly=True), - 'discount': fields.float('Discount (%)', digits=(16, 2), readonly=True, states={'draft':[('readonly',False)]}), + 'discount': fields.float('Discount (%)', digits=(16, 2), readonly=True, states={'draft': [('readonly', False)]}), 'number_packages': fields.function(_number_packages, method=True, type='integer', string='Number Packages'), 'notes': fields.text('Notes'), - 'th_weight': fields.float('Weight', readonly=True, states={'draft':[('readonly',False)]}), + 'th_weight': fields.float('Weight', readonly=True, states={'draft': [('readonly', False)]}), 'state': fields.selection([('draft', 'Draft'),('confirmed', 'Confirmed'),('done', 'Done'),('cancel', 'Cancelled'),('exception', 'Exception')], 'State', required=True, readonly=True, help='* The \'Draft\' state is set when the related sale order in draft state. \ \n* The \'Confirmed\' state is set when the related sale order is confirmed. \ @@ -889,7 +880,7 @@ class sale_order_line(osv.osv): \n* The \'Cancelled\' state is set when a user cancel the sale order related.'), 'order_partner_id': fields.related('order_id', 'partner_id', type='many2one', relation='res.partner', string='Customer'), 'salesman_id':fields.related('order_id', 'user_id', type='many2one', relation='res.users', string='Salesman'), - 'company_id': fields.related('order_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True, states={'draft':[('readonly',False)]}), + 'company_id': fields.related('order_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True, states={'draft': [('readonly', False)]}), } _order = 'sequence, id desc' _defaults = { @@ -897,7 +888,7 @@ class sale_order_line(osv.osv): 'delay': 0.0, 'product_uom_qty': 1, 'product_uos_qty': 1, - 'sequence': 10, + 'sequence': 10, 'invoiced': 0, 'state': 'draft', 'type': 'make_to_stock', @@ -1049,7 +1040,6 @@ class sale_order_line(osv.osv): return {'value': {'th_weight': 0, 'product_packaging': False, 'product_uos_qty': qty}, 'domain': {'product_uom': [], 'product_uos': []}} - if not date_order: date_order = time.strftime('%Y-%m-%d') @@ -1081,7 +1071,6 @@ class sale_order_line(osv.osv): uom2 = product_uom_obj.browse(cr, uid, uom) if product_obj.uom_id.category_id.id != uom2.category_id.id: uom = False - if uos: if product_obj.uos_id: uos2 = product_uom_obj.browse(cr, uid, uos) @@ -1142,10 +1131,7 @@ class sale_order_line(osv.osv): max(0,product_obj.virtual_available), product_obj.uom_id.name, max(0,product_obj.qty_available), product_obj.uom_id.name) } - - # get unit price - if not pricelist: warning = { 'title': 'No Pricelist !', @@ -1189,12 +1175,11 @@ class sale_order_line(osv.osv): """Allows to delete sale order lines in draft,cancel states""" for rec in self.browse(cr, uid, ids, context=context): if rec.state not in ['draft', 'cancel']: - raise osv.except_osv(_('Invalid action !'), _('Cannot delete a sale order line which is %s !')%(rec.state,)) + raise osv.except_osv(_('Invalid action !'), _('Cannot delete a sale order line which is %s !') %(rec.state,)) return super(sale_order_line, self).unlink(cr, uid, ids, context=context) sale_order_line() - class sale_config_picking_policy(osv.osv_memory): _name = 'sale.config.picking_policy' _inherit = 'res.config' diff --git a/addons/sale/stock.py b/addons/sale/stock.py index ae29b70837b..f9e0c38494b 100644 --- a/addons/sale/stock.py +++ b/addons/sale/stock.py @@ -116,10 +116,8 @@ class stock_picking(osv.osv): result = super(stock_picking, self).action_invoice_create(cursor, user, ids, journal_id=journal_id, group=group, type=type, context=context) - picking_ids = result.keys() invoice_ids = result.values() - invoices = {} for invoice in invoice_obj.browse(cursor, user, invoice_ids, context=context): @@ -127,20 +125,16 @@ class stock_picking(osv.osv): for picking in picking_obj.browse(cursor, user, picking_ids, context=context): - if not picking.sale_id: continue sale_lines = picking.sale_id.order_line invoice_created = invoices[result[picking.id]] - for inv in invoice_obj.browse(cursor, user, [invoice_created.id], context=context): if not inv.fiscal_position: invoice_obj.write(cursor, user, [inv.id], {'fiscal_position': picking.sale_id.fiscal_position.id}, context=context) - if picking.sale_id.client_order_ref: inv_name = picking.sale_id.client_order_ref + " : " + invoice_created.name invoice_obj.write(cursor, user, [invoice_created.id], {'name': inv_name}, context=context) - for sale_line in sale_lines: if sale_line.product_id.type == 'service' and sale_line.invoiced == False: if group: @@ -182,10 +176,9 @@ class stock_picking(osv.osv): 'account_analytic_id': account_analytic_id, 'notes':sale_line.notes }, context=context) - self.pool.get('sale.order.line').write(cursor, user, [sale_line.id], {'invoiced':True, + self.pool.get('sale.order.line').write(cursor, user, [sale_line.id], {'invoiced': True, 'invoice_lines': [(6, 0, [invoice_line_id])], }) - return result def action_cancel(self, cr, uid, ids, context={}): @@ -194,7 +187,7 @@ class stock_picking(osv.osv): call_ship_end = True if pick.sale_id: for picks in pick.sale_id.picking_ids: - if picks.state not in ('done','cancel'): + if picks.state not in ('done', 'cancel'): call_ship_end = False break if call_ship_end: diff --git a/addons/sale/test/so_make_invoice.yml b/addons/sale/test/so_make_invoice.yml index 0133391395b..053521208bf 100644 --- a/addons/sale/test/so_make_invoice.yml +++ b/addons/sale/test/so_make_invoice.yml @@ -1,5 +1,5 @@ - - In order to test the 'Make Invoices' wizard of sale module in the Open-ERP, + In order to test the 'Make Invoices' wizard of sale module in the Open-ERP, I create two Sale order,group them and create invoice. - I create a Sale Order for Slider Mobile for qty 100 having order_policy manual. @@ -28,7 +28,7 @@ shop_id: sale.shop - I confirm the Sale Order. -- +- !workflow {model: sale.order, action: order_confirm, ref: sale_order_so3} - I create a Sale Order for products Slider Mobile and LG Viewty Smart for qty 100 having order_policy manual. @@ -56,7 +56,7 @@ product_id: sale.product_product_lgviewtysmart0 product_uos_qty: 100.0 th_weight: 0.0 - type: make_to_order + type: make_to_order order_policy: manual partner_id: sale.res_partner_cleartrail0 partner_invoice_id: sale.res_partner_address_2 @@ -65,75 +65,10 @@ picking_policy: direct pricelist_id: product.list0 shop_id: sale.shop -- - I confirm the Sale Order. -- - !workflow {model: sale.order, action: order_confirm, ref: sale_order_so4} -- - Then I cancel the sale order line -- - I click on the "Cancel" button of sale order line and verify that it gives a warning message. - - !python {model: sale.order.line}: | - sale_order_obj = self.pool.get('sale.order') - so = sale_order_obj.browse(cr, uid, ref("sale_order_so4")) - sol = so.order_line[1] - try: - self.button_cancel(cr, uid, [sol.id], {"lang": "en_US", "tz": False, "active_model": - "ir.ui.menu", "active_ids": [ref("sale.menu_invoicing_sales_order_lines")], - "search_default_uninvoiced": 1, "active_id": ref("sale.menu_invoicing_sales_order_lines"), - }) - except: - pass -- - I verify that picking has been generated for the sale order. -- - !python {model: sale.order}: | - so = self.browse(cr, uid, ref("sale_order_so4")) - assert so.picking_ids,"Picking has not been generated for sale_order_so4" -- - Then I cancel its related stock move from Outgoing Products -- - !python {model: stock.move}: | - sale_order_obj = self.pool.get('sale.order') - so = sale_order_obj.browse(cr, uid, ref("sale_order_so4")) - pick_obj = self.pool.get('stock.picking') - pick_id = pick_obj.search(cr, uid, [('origin', '=', so.name),('type','=','out')]) - pick_brw = pick_obj.browse(cr,uid,pick_id)[0] - move_obj = self.pool.get('stock.move') - move_id = move_obj.search(cr, uid, [('picking_id', '=', pick_brw.name),('name','=','LG Viewty Smart')]) - self.action_cancel(cr,uid,move_id) -- - Then I cancel its related stock move from Delivery Order -- - !python {model: stock.move}: | - sale_order_obj = self.pool.get('sale.order') - so = sale_order_obj.browse(cr, uid, ref("sale_order_so4")) - pick_obj = self.pool.get('stock.picking') - pick_id = pick_obj.search(cr, uid, [('origin', '=', so.name)]) - pick_brw = pick_obj.browse(cr,uid,pick_id)[0] - move_obj = self.pool.get('stock.move') - move_id = move_obj.search(cr, uid, [('picking_id', '=', pick_brw.name),('name','=','LG Viewty Smart')]) - self.action_cancel(cr,uid,move_id) -- - Then I cancel the sale order line for LG Viewty Smart -- - !python {model: sale.order.line}: | - sale_order_obj = self.pool.get('sale.order') - so = sale_order_obj.browse(cr, uid, ref("sale_order_so4")) - sol = so.order_line[1] - self.button_cancel(cr, uid, [sol.id], {"lang": "en_US", "tz": False, "active_model": - "ir.ui.menu", "active_ids": [ref("sale.menu_invoicing_sales_order_lines")], - "search_default_uninvoiced": 1, "active_id": ref("sale.menu_invoicing_sales_order_lines"), - }) -- - I verify that the state of sale order line is cancel + I confirm the Sale Order. - - !python {model: sale.order.line}: | - sale_order_obj = self.pool.get('sale.order') - so = sale_order_obj.browse(cr, uid, ref("sale_order_so4")) - chk = self.search(cr, uid, [('order_id', '=', so.name),('state','=','cancel')]) - assert chk,"Sale order line has not been cancelled" + !workflow {model: sale.order, action: order_confirm, ref: sale_order_so4} - Then I click on the "Make Invoices" button - @@ -154,8 +89,8 @@ inv = self.search(cr, uid, [('origin','=','Test_SO004|Test_SO003|')]) assert inv, "Invoices has not been generated" - - I verify that an account invoice line with origin 'Test_SO004' is created -- + I verify that an account invoice line with origin 'Test_SO004' is created +- !python {model: account.invoice.line}: | sale_order_obj = self.pool.get('sale.order') acc_inv_obj = self.pool.get('account.invoice') @@ -164,7 +99,7 @@ inv_line = self.search(cr, uid, [('origin','=',so.name),('name','=','Slider Mobile'),('invoice_id','=',inv)]) assert inv_line, "Account invoice line has not been created" - - I verify that an account invoice line with origin 'Test_SO003' is created + I verify that an account invoice line with origin 'Test_SO003' is created - !python {model: account.invoice.line}: | sale_order_obj = self.pool.get('sale.order') @@ -184,7 +119,7 @@ wf_service.trg_validate(uid, 'account.invoice',id,'invoice_open', cr) - I assign an analytic journal to the bank journal -- +- !record {model: account.journal, id: sale.account_journal_bankjournal0}: analytic_journal_id: account.cose_journal_sale - @@ -200,7 +135,7 @@ ref('account.period_8'), ref('sale.account_journal_bankjournal0'), name='tst') - - I verify the invoice is in Paid state + I verify the invoice is in Paid state - !python {model: account.invoice}: | invoice_id = self.search(cr, uid, [('origin','=','Test_SO004|Test_SO003|'),('state','=','paid')]) diff --git a/addons/sale/wizard/sale_line_invoice.py b/addons/sale/wizard/sale_line_invoice.py index 4281e180970..0b6a5219b0c 100644 --- a/addons/sale/wizard/sale_line_invoice.py +++ b/addons/sale/wizard/sale_line_invoice.py @@ -27,33 +27,33 @@ class sale_order_line_make_invoice(osv.osv_memory): _name = "sale.order.line.make.invoice" _description = "Sale OrderLine Make_invoice" def make_invoices(self, cr, uid, ids, context): - """ + """ To make invoices. - + @param self: The object pointer. @param cr: A database cursor @param uid: ID of the user currently logged in - @param ids: the ID or list of IDs - @param context: A standard dictionary - - @return: A dictionary which of fields with values. - - """ + @param ids: the ID or list of IDs + @param context: A standard dictionary + + @return: A dictionary which of fields with values. + + """ res = False invoices = {} #TODO: merge with sale.py/make_invoice def make_invoice(order, lines): - """ + """ To make invoices. - - @param order: - @param lines: - - @return: - - """ + + @param order: + @param lines: + + @return: + + """ a = order.partner_id.property_account_receivable.id if order.partner_id and order.partner_id.property_payment_term.id: pay_term = order.partner_id.property_payment_term.id @@ -68,7 +68,7 @@ class sale_order_line_make_invoice(osv.osv_memory): 'partner_id': order.partner_id.id, 'address_invoice_id': order.partner_invoice_id.id, 'address_contact_id': order.partner_invoice_id.id, - 'invoice_line': [(6,0,lines)], + 'invoice_line': [(6, 0, lines)], 'currency_id' : order.pricelist_id.currency_id.id, 'comment': order.note, 'payment_term': pay_term, @@ -81,7 +81,7 @@ class sale_order_line_make_invoice(osv.osv_memory): sales_order_obj = self.pool.get('sale.order') wf_service = netsvc.LocalService('workflow') for line in sales_order_line_obj.browse(cr, uid, context['active_ids']): - if (not line.invoiced) and (line.state not in ('draft','cancel')): + if (not line.invoiced) and (line.state not in ('draft', 'cancel')): if not line.order_id.id in invoices: invoices[line.order_id.id] = [] line_id = sales_order_line_obj.invoice_line_create(cr, uid, @@ -90,12 +90,12 @@ class sale_order_line_make_invoice(osv.osv_memory): invoices[line.order_id.id].append((line, lid)) sales_order_line_obj.write(cr, uid, [line.id], {'invoiced': True}) - for result in invoices.values(): - order = result[0][0].order_id - il = map(lambda x: x[1], result) - res = make_invoice(order, il) - cr.execute('INSERT INTO sale_order_invoice_rel \ - (order_id,invoice_id) values (%s,%s)', (order.id, res)) + for result in invoices.values(): + order = result[0][0].order_id + il = map(lambda x: x[1], result) + res = make_invoice(order, il) + cr.execute('INSERT INTO sale_order_invoice_rel \ + (order_id,invoice_id) values (%s,%s)', (order.id, res)) flag = True data_sale = sales_order_obj.browse(cr, uid, line.order_id.id) @@ -105,11 +105,11 @@ class sale_order_line_make_invoice(osv.osv_memory): break if flag: wf_service.trg_validate(uid, 'sale.order', line.order_id.id, 'all_lines', cr) - sales_order_obj.write(cr, uid, [line.order_id.id], {'state' : 'progress'}) + sales_order_obj.write(cr, uid, [line.order_id.id], {'state': 'progress'}) if not invoices: raise osv.except_osv(_('Warning'), _('Invoice cannot be created for this Sale Order Line due to one of the following reasons:\n1.The state of this sale order line is either "draft" or "cancel"!\n2.The Sale Order Line is Invoiced!')) - + return {} sale_order_line_make_invoice() diff --git a/addons/sale/wizard/sale_make_invoice.py b/addons/sale/wizard/sale_make_invoice.py index 8d0b191620b..242d83c72ef 100644 --- a/addons/sale/wizard/sale_make_invoice.py +++ b/addons/sale/wizard/sale_make_invoice.py @@ -27,7 +27,7 @@ class sale_make_invoice(osv.osv_memory): _description = "Sale Make Invoice" _columns = { 'grouped': fields.boolean('Group the invoices', help='Check the box to group the invoices for the same customers'), - 'invoice_date':fields.date('Invoice Date'), + 'invoice_date': fields.date('Invoice Date'), } _defaults = { 'grouped': False @@ -66,7 +66,7 @@ class sale_make_invoice(osv.osv_memory): 'view_mode': 'tree,form', 'res_model': 'account.invoice', 'view_id': False, - 'context': "{'type':'out_refund'}", + 'context': "{'type': 'out_refund'}", 'type': 'ir.actions.act_window', 'search_view_id': id['res_id'] } diff --git a/addons/sale/wizard/sale_make_invoice_advance.py b/addons/sale/wizard/sale_make_invoice_advance.py index ea7cdd56704..b60591b4fea 100644 --- a/addons/sale/wizard/sale_make_invoice_advance.py +++ b/addons/sale/wizard/sale_make_invoice_advance.py @@ -83,12 +83,12 @@ class sale_advance_payment_inv(osv.osv_memory): 'reference': False, 'account_id': sale.partner_id.property_account_receivable.id, 'partner_id': sale.partner_id.id, - 'address_invoice_id':sale.partner_invoice_id.id, - 'address_contact_id':sale.partner_order_id.id, + 'address_invoice_id': sale.partner_invoice_id.id, + 'address_contact_id': sale.partner_order_id.id, 'invoice_line': [(6, 0, create_ids)], - 'currency_id' :sale.pricelist_id.currency_id.id, + 'currency_id': sale.pricelist_id.currency_id.id, 'comment': '', - 'payment_term':sale.payment_term.id, + 'payment_term': sale.payment_term.id, 'fiscal_position': sale.fiscal_position.id or sale.partner_id.property_account_position.id } @@ -98,7 +98,7 @@ class sale_advance_payment_inv(osv.osv_memory): for inv in sale.invoice_ids: ids_inv.append(inv.id) ids_inv.append(inv_id) - obj_sale.write(cr, uid, sale.id, {'invoice_ids':[(6, 0, ids_inv)]}) + obj_sale.write(cr, uid, sale.id, {'invoice_ids': [(6, 0, ids_inv)]}) list_inv.append(inv_id) # # If invoice on picking: add the cost on the SO @@ -127,7 +127,7 @@ class sale_advance_payment_inv(osv.osv_memory): 'res_model': 'sale.open.invoice', 'type': 'ir.actions.act_window', 'target': 'new', - 'context':context + 'context': context } sale_advance_payment_inv() @@ -151,7 +151,6 @@ class sale_open_invoice(osv.osv_memory): mod_obj = self.pool.get('ir.model.data') for advance_pay in self.browse(cr, uid, ids): result = mod_obj._get_id(cr, uid, 'account', 'view_account_invoice_filter') - id = mod_obj.read(cr, uid, result, ['res_id']) form_id = mod_obj._get_id(cr, uid, 'account', 'invoice_form') form_res = mod_obj.browse(cr, uid, form_id, context=context).res_id tree_id = mod_obj._get_id(cr, uid, 'account', 'invoice_tree') @@ -164,7 +163,7 @@ class sale_open_invoice(osv.osv_memory): 'res_id': int(context['invoice_id'][0]), 'view_id': False, 'views': [(form_res, 'form'), (tree_res, 'tree')], - 'context': "{'type':'out_invoice'}", + 'context': "{'type': 'out_invoice'}", 'type': 'ir.actions.act_window', } diff --git a/addons/sale_analytic_plans/i18n/ru.po b/addons/sale_analytic_plans/i18n/ru.po index 0d1c8d81760..14c8c6a2a0c 100644 --- a/addons/sale_analytic_plans/i18n/ru.po +++ b/addons/sale_analytic_plans/i18n/ru.po @@ -6,14 +6,14 @@ msgid "" 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-02 14:34+0000\n" -"Last-Translator: mga (Open ERP) <Unknown>\n" +"POT-Creation-Date: 2010-10-18 17:46+0000\n" +"PO-Revision-Date: 2010-10-26 08:55+0000\n" +"Last-Translator: Chertykov Denis <chertykov@gmail.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-09-29 05:12+0000\n" +"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: sale_analytic_plans @@ -22,6 +22,14 @@ msgid "Analytic Distribution" msgstr "Аналитическое распределение" #. module: sale_analytic_plans +#: constraint:ir.model:0 +msgid "" +"The Object name must start with x_ and not contain any special character !" +msgstr "" +"Название объекта должно начинаться с x_ и не должно содержать специальных " +"символов !" + +#. module: sale_analytic_plans #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" msgstr "Неправильный XML для просмотра архитектуры!" @@ -30,3 +38,8 @@ msgstr "Неправильный XML для просмотра архитект #: model:ir.module.module,shortdesc:sale_analytic_plans.module_meta_information msgid "Sales Analytic Distribution Management" msgstr "" + +#. module: sale_analytic_plans +#: model:ir.model,name:sale_analytic_plans.model_sale_order_line +msgid "Sale Order Line" +msgstr "Позиция заказа" diff --git a/addons/sale_analytic_plans/sale_analytic_plans.py b/addons/sale_analytic_plans/sale_analytic_plans.py index 9fffae1d74a..cc006f3afc0 100644 --- a/addons/sale_analytic_plans/sale_analytic_plans.py +++ b/addons/sale_analytic_plans/sale_analytic_plans.py @@ -30,7 +30,7 @@ class sale_order_line(osv.osv): if context is None: context = {} line_obj = self.pool.get('account.invoice.line') - create_ids = super(sale_order_line,self).invoice_line_create(cr, uid, ids, context=context) + create_ids = super(sale_order_line, self).invoice_line_create(cr, uid, ids, context=context) i = 0 for line in self.browse(cr, uid, ids, context): line_obj.write(cr, uid, [create_ids[i]], {'analytics_id': line.analytics_id.id}) @@ -39,4 +39,4 @@ class sale_order_line(osv.osv): sale_order_line() -# 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/sale_analytic_plans/sale_analytic_plans_view.xml b/addons/sale_analytic_plans/sale_analytic_plans_view.xml index 932b54898e9..944bc629d13 100644 --- a/addons/sale_analytic_plans/sale_analytic_plans_view.xml +++ b/addons/sale_analytic_plans/sale_analytic_plans_view.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> <openerp> - <data> + <data> <record model="ir.ui.view" id="view_order_form_inherit"> <field name="name">sale.order.form.inherit</field> @@ -18,9 +18,9 @@ <field name="type">form</field> <field name="inherit_id" ref="sale.view_order_form"/> <field name="arch" type="xml"> - <field name="product_id" position="after"> - <field name="analytics_id" domain="[('plan_id','<>',False)]"/> - </field> + <xpath expr="/form/notebook/page/field[@name='order_line']/form/notebook/page/field[@name='product_id']" position="after"> + <field name="analytics_id" domain="[('plan_id','<>',False)]" groups="analytic.group_analytic_accounting"/> + </xpath> </field> </record> @@ -30,11 +30,11 @@ <field name="type">form</field> <field name="inherit_id" ref="sale.view_order_line_form2"/> <field name="arch" type="xml"> - <field name="product_id" readonly="1" select="1" position="after"> - <field name="analytics_id" domain="[('plan_id','<>',False)]"/> + <field name="product_id" position="after"> + <field name="analytics_id" domain="[('plan_id','<>',False)]" groups="analytic.group_analytic_accounting"/> </field> </field> </record> - </data> + </data> </openerp> diff --git a/addons/sale_crm/i18n/ru.po b/addons/sale_crm/i18n/ru.po index 6585d3294e4..139b68e75c7 100644 --- a/addons/sale_crm/i18n/ru.po +++ b/addons/sale_crm/i18n/ru.po @@ -6,202 +6,231 @@ msgid "" 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-09-30 06:39+0000\n" +"POT-Creation-Date: 2010-10-18 17:46+0000\n" +"PO-Revision-Date: 2010-10-26 11:20+0000\n" "Last-Translator: Chertykov Denis <chertykov@gmail.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-10-01 08:47+0000\n" +"X-Launchpad-Export-Date: 2010-10-27 04:58+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: sale_crm -#: model:process.transition,name:sale_crm.process_transition_crmopportunityquotation -msgid "Crm opportunity quotation" -msgstr "CRM предложение цен в сделках" +#: field:crm.make.sale,partner_id:0 +msgid "Customer" +msgstr "Покупатель" #. module: sale_crm -#: model:process.transition,name:sale_crm.process_transition_opportunityanalytic0 -msgid "Opportunity Analytic" -msgstr "Аналитика по сделкам" +#: constraint:ir.model:0 +msgid "" +"The Object name must start with x_ and not contain any special character !" +msgstr "" +"Название объекта должно начинаться с x_ и не должно содержать специальных " +"символов !" #. module: sale_crm -#: help:crm.case.make_order,init,partner_id:0 -msgid "Use this partner if there is no partner on the case" -msgstr "Использовать этого партнера, если нет партнера в вопросе." +#: view:account.invoice.report:0 +#: view:board.board:0 +msgid "Monthly Turnover" +msgstr "Ежемесячный оборот" #. module: sale_crm -#: wizard_button:sale_crm.make_case,init,create:0 -msgid "Create" -msgstr "Создать" +#: view:crm.make.sale:0 +msgid "Convert to Quotation" +msgstr "Преобразовать в предложение" #. module: sale_crm -#: selection:crm.case.make_order,init,picking_policy:0 -msgid "All at once" -msgstr "Все сразу" +#: code:addons/sale_crm/wizard/crm_make_sale.py:0 +#, python-format +msgid "is converted to Quotation." +msgstr "преобразовано в предложение." #. module: sale_crm -#: constraint:ir.ui.view:0 -msgid "Invalid XML for View Architecture!" -msgstr "Неправильный XML для просмотра архитектуры!" +#: code:addons/sale_crm/wizard/crm_make_sale.py:0 +#, python-format +msgid "Data Insufficient!" +msgstr "Недостаточно данных!" #. module: sale_crm -#: model:process.transition,note:sale_crm.process_transition_crmopportunityquotation -msgid "Opportunity goes into the quotation" -msgstr "Сделка переходит в предложение цен" +#: code:addons/sale_crm/wizard/crm_make_sale.py:0 +#, python-format +msgid "Customer has no addresses defined!" +msgstr "Не определен адрес заказчика!" #. module: sale_crm -#: model:process.node,name:sale_crm.process_node_contractanalytic0 -msgid "Analytic account" -msgstr "Счет аналитики" +#: constraint:ir.actions.act_window:0 +msgid "Invalid model name in the action definition." +msgstr "Недопустимое имя модели в определении действия." #. module: sale_crm -#: model:process.node,note:sale_crm.process_node_crmquotation0 -msgid "Convert opportunity to quotation" -msgstr "Превратить сделку в предложение цен" +#: view:crm.make.sale:0 +msgid "_Create" +msgstr "_Создать" #. module: sale_crm -#: wizard_field:sale_crm.make_case,init,description:0 -msgid "Your action" -msgstr "Ваши действия" +#: help:crm.make.sale,close:0 +msgid "" +"Check this to close the opportunity after having created the sale order." +msgstr "Отметьте для закрытия предложения после создания заказа на продажу." #. module: sale_crm -#: wizard_field:crm.case.make_order,init,picking_policy:0 -msgid "Packing Policy" -msgstr "" +#: view:crm.lead:0 +msgid "Convert to Quote" +msgstr "Превратить в предложение цен" #. module: sale_crm -#: wizard_button:crm.case.make_order,init,order:0 -msgid "Create Quote" -msgstr "Создать предложение цен" +#: constraint:ir.ui.view:0 +msgid "Invalid XML for View Architecture!" +msgstr "Неправильный XML для просмотра архитектуры!" #. module: sale_crm -#: model:process.node,note:sale_crm.process_node_contractpricelist0 -msgid "Contract Volume (pricelist)" -msgstr "" +#: code:addons/sale_crm/wizard/crm_make_sale.py:0 +#, python-format +msgid "Converted to Sales Quotation(id: %s)." +msgstr "Преобразовано в коммерческое предложение(id: %s)." #. module: sale_crm -#: model:process.node,name:sale_crm.process_node_crmopportunity0 -msgid "CRM Opportunity" -msgstr "CRM сделка" +#: model:ir.model,name:sale_crm.model_crm_make_sale +msgid "Make sale" +msgstr "Продать" #. module: sale_crm -#: model:ir.module.module,shortdesc:sale_crm.module_meta_information -msgid "Sale CRM Stuff" -msgstr "" +#: code:addons/sale_crm/wizard/crm_make_sale.py:0 +#, python-format +msgid "Opportunity " +msgstr "Сделка " #. module: sale_crm -#: model:process.transition,note:sale_crm.process_transition_opportunityquotation0 -msgid "Opportunity convert into quotation" -msgstr "Превратить сделку в предложение цен" +#: code:addons/sale_crm/wizard/crm_make_sale.py:0 +#, python-format +msgid "Opportunity: %s" +msgstr "Сделка: %s" #. module: sale_crm -#: selection:crm.case.make_order,init,picking_policy:0 -msgid "Direct Delivery" -msgstr "Прямая доставка" +#: model:ir.model,name:sale_crm.model_sale_order +msgid "Sale Order" +msgstr "Заказ на продажу" #. module: sale_crm -#: model:process.transition,name:sale_crm.process_transition_opportunityquotation0 -msgid "Opportunity Quotation" -msgstr "Сделка - предложение цен" +#: model:ir.module.module,shortdesc:sale_crm.module_meta_information +msgid "Creates Sales order from Opportunity" +msgstr "Создает заказ на продажу из сделки" #. module: sale_crm -#: model:process.node,name:sale_crm.process_node_crmquotation0 -msgid "Quotation" -msgstr "Предложение цен" +#: model:ir.actions.act_window,name:sale_crm.action_quotation_for_sale_crm +msgid "Quotations" +msgstr "Предложения" #. module: sale_crm -#: view:crm.case:0 -#: wizard_view:crm.case.make_order,init:0 -msgid "Convert to Quote" -msgstr "Превратить в предложение цен" +#: field:crm.make.sale,shop_id:0 +msgid "Shop" +msgstr "Магазин" #. module: sale_crm -#: help:crm.case.make_order,init,close:0 -msgid "Check this to close the case after having created the sale order." -msgstr "" -"Отметьте, если хотите закрыть вопрос после создания заказа на продажу." +#: view:board.board:0 +msgid "My Quotations" +msgstr "Мои предложения" #. module: sale_crm -#: wizard_field:crm.case.make_order,init,partner_id:0 -msgid "Customer" -msgstr "Покупатель" +#: field:crm.make.sale,close:0 +msgid "Close Opportunity" +msgstr "Закрыть предложение" #. module: sale_crm -#: model:process.transition,note:sale_crm.process_transition_opportunitypricelist0 -msgid "Opporunity convert to the Pricelist" -msgstr "Преобразовать сделку в прайс-лист" +#: view:sale.order:0 +#: field:sale.order,section_id:0 +msgid "Sales Team" +msgstr "Отдел продаж" #. module: sale_crm -#: wizard_field:sale_crm.make_case,init,user:0 -msgid "User Responsible" -msgstr "Ответственный пользователь" +#: model:ir.actions.act_window,name:sale_crm.action_crm_make_sale +msgid "Make Quotation" +msgstr "Сделать предложение цен" #. module: sale_crm -#: model:process.node,note:sale_crm.process_node_contractanalytic0 -msgid "Reflect the contract made with customer" -msgstr "" +#: view:crm.make.sale:0 +msgid "Cancel" +msgstr "Отмена" -#. module: sale_crm -#: wizard_field:crm.case.make_order,init,products:0 -msgid "Products" -msgstr "Продукция" +#~ msgid "Create" +#~ msgstr "Создать" -#. module: sale_crm -#: wizard_field:crm.case.make_order,init,close:0 -msgid "Close Case" -msgstr "Закрыть вопрос" +#~ msgid "Analytic account" +#~ msgstr "Счет аналитики" -#. module: sale_crm -#: model:ir.actions.wizard,name:sale_crm.sale_crm_make_case_wizard -#: wizard_view:sale_crm.make_case,init:0 -msgid "Make Case" -msgstr "Сделать Вопрос" +#~ msgid "Your action" +#~ msgstr "Ваши действия" -#. module: sale_crm -#: wizard_field:crm.case.make_order,init,shop_id:0 -msgid "Shop" -msgstr "Магазин" +#~ msgid "User Responsible" +#~ msgstr "Ответственный пользователь" -#. module: sale_crm -#: model:process.node,note:sale_crm.process_node_crmopportunity0 -msgid "The CRM Opportunity can lead to a quotation." -msgstr "CRM Сделка может привести к предложению цен" +#~ msgid "Products" +#~ msgstr "Продукция" -#. module: sale_crm -#: model:process.transition,name:sale_crm.process_transition_opportunitypricelist0 -msgid "Opportunity Pricelist" -msgstr "Прайс-лист сделки" +#~ msgid "All at once" +#~ msgstr "Все сразу" -#. module: sale_crm -#: model:process.node,name:sale_crm.process_node_contractpricelist0 -msgid "Contract Pricelist" -msgstr "Прайс-лист договора" +#~ msgid "Direct Delivery" +#~ msgstr "Прямая доставка" -#. module: sale_crm -#: wizard_field:sale_crm.make_case,init,name:0 -msgid "Case Description" -msgstr "Описание вопроса" +#~ msgid "Analytic Account" +#~ msgstr "Счет аналитического учета" -#. module: sale_crm -#: wizard_field:crm.case.make_order,init,analytic_account:0 -#: model:process.transition,note:sale_crm.process_transition_opportunityanalytic0 -msgid "Analytic Account" -msgstr "Счет аналитического учета" +#~ msgid "Case Section" +#~ msgstr "Секция вопроса" -#. module: sale_crm -#: model:ir.actions.wizard,name:sale_crm.sale_crm_wizard -msgid "Make Quotation" -msgstr "Сделать предложение цен" +#~ msgid "Case Description" +#~ msgstr "Описание вопроса" -#. module: sale_crm -#: wizard_button:crm.case.make_order,init,end:0 -#: wizard_button:sale_crm.make_case,init,end:0 -msgid "Cancel" -msgstr "Отмена" +#~ msgid "Opportunity Pricelist" +#~ msgstr "Прайс-лист сделки" -#. module: sale_crm -#: wizard_field:sale_crm.make_case,init,section:0 -msgid "Case Section" -msgstr "Секция вопроса" +#~ msgid "Opportunity Analytic" +#~ msgstr "Аналитика по сделкам" + +#~ msgid "CRM Opportunity" +#~ msgstr "CRM сделка" + +#~ msgid "Close Case" +#~ msgstr "Закрыть вопрос" + +#~ msgid "Check this to close the case after having created the sale order." +#~ msgstr "" +#~ "Отметьте, если хотите закрыть вопрос после создания заказа на продажу." + +#~ msgid "Use this partner if there is no partner on the case" +#~ msgstr "Использовать этого партнера, если нет партнера в вопросе." + +#~ msgid "Opporunity convert to the Pricelist" +#~ msgstr "Преобразовать сделку в прайс-лист" + +#~ msgid "Contract Pricelist" +#~ msgstr "Прайс-лист договора" + +#~ msgid "Make Case" +#~ msgstr "Сделать Вопрос" + +#~ msgid "Crm opportunity quotation" +#~ msgstr "CRM предложение цен в сделках" + +#~ msgid "The CRM Opportunity can lead to a quotation." +#~ msgstr "CRM Сделка может привести к предложению цен" + +#~ msgid "Opportunity Quotation" +#~ msgstr "Сделка - предложение цен" + +#~ msgid "Quotation" +#~ msgstr "Предложение цен" + +#~ msgid "Opportunity convert into quotation" +#~ msgstr "Превратить сделку в предложение цен" + +#~ msgid "Create Quote" +#~ msgstr "Создать предложение цен" + +#~ msgid "Convert opportunity to quotation" +#~ msgstr "Превратить сделку в предложение цен" + +#~ msgid "Opportunity goes into the quotation" +#~ msgstr "Сделка переходит в предложение цен" diff --git a/addons/sale_crm/wizard/crm_make_sale.py b/addons/sale_crm/wizard/crm_make_sale.py index c5317950f1a..0c72c3205cd 100644 --- a/addons/sale_crm/wizard/crm_make_sale.py +++ b/addons/sale_crm/wizard/crm_make_sale.py @@ -71,7 +71,6 @@ class crm_make_sale(osv.osv_memory): case_obj = self.pool.get('crm.lead') sale_obj = self.pool.get('sale.order') partner_obj = self.pool.get('res.partner') - data = context and context.get('active_ids', []) or [] for make in self.browse(cr, uid, ids, context=context): @@ -81,7 +80,6 @@ class crm_make_sale(osv.osv_memory): pricelist = partner.property_product_pricelist.id fpos = partner.property_account_position and partner.property_account_position.id or False new_ids = [] - for case in case_obj.browse(cr, uid, data, context=context): if not partner and case.partner_id: partner = case.partner_id @@ -89,7 +87,6 @@ class crm_make_sale(osv.osv_memory): partner_addr = partner_obj.address_get(cr, uid, [partner.id], ['default', 'invoice', 'delivery', 'contact']) pricelist = partner.property_product_pricelist.id - if False in partner_addr.values(): raise osv.except_osv(_('Data Insufficient!'), _('Customer has no addresses defined!')) @@ -105,10 +102,8 @@ class crm_make_sale(osv.osv_memory): 'date_order': time.strftime('%Y-%m-%d'), 'fiscal_position': fpos, } - if partner.id: vals['user_id'] = partner.user_id and partner.user_id.id or uid - new_id = sale_obj.create(cr, uid, vals) case_obj.write(cr, uid, [case.id], {'ref': 'sale.order,%s' % new_id}) new_ids.append(new_id) @@ -118,7 +113,6 @@ class crm_make_sale(osv.osv_memory): if make.close: case_obj.case_close(cr, uid, data) - if not new_ids: return {} if len(new_ids)<=1: @@ -157,7 +151,7 @@ class crm_make_sale(osv.osv_memory): } _defaults = { 'shop_id': _get_shop_id, - 'close': lambda *args: 1, + 'close': True, 'partner_id': _selectPartner, } diff --git a/addons/sale_journal/i18n/ru.po b/addons/sale_journal/i18n/ru.po index 8efa5e4ff40..ae41f7827ba 100644 --- a/addons/sale_journal/i18n/ru.po +++ b/addons/sale_journal/i18n/ru.po @@ -6,549 +6,294 @@ msgid "" 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 06:02+0000\n" -"Last-Translator: mga (Open ERP) <Unknown>\n" +"POT-Creation-Date: 2010-10-18 17:46+0000\n" +"PO-Revision-Date: 2010-10-26 11:39+0000\n" +"Last-Translator: Chertykov Denis <chertykov@gmail.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-09-29 05:07+0000\n" +"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: sale_journal -#: model:ir.actions.act_window,name:sale_journal.act_sale_journal_sale_journal_2_sale_journal_sale_stats -msgid "Monthly sales" -msgstr "Продажи в месяце" - -#. module: sale_journal -#: model:ir.actions.act_window,name:sale_journal.act_sale_journal_picking_journal_2_stock_picking_assigned -#: model:ir.actions.act_window,name:sale_journal.act_sale_journal_sale_journal_2_stock_picking_assigned -msgid "Assigned packing" -msgstr "" - -#. module: sale_journal -#: selection:sale_journal.invoice.type.stats,state:0 -#: selection:sale_journal.picking.stats,state:0 -msgid "assigned" -msgstr "назначено" - -#. module: sale_journal -#: constraint:ir.actions.act_window:0 -msgid "Invalid model name in the action definition." -msgstr "Недопустимое имя модели в определении действия." - -#. module: sale_journal -#: selection:sale_journal.sale.stats,state:0 -msgid "Waiting Schedule" -msgstr "В ожидании расписания" - -#. module: sale_journal -#: selection:sale_journal.invoice.type.stats,invoice_state:0 -msgid "to be invoiced" -msgstr "выставить счет" - -#. module: sale_journal -#: model:ir.model,name:sale_journal.model_sale_journal_sale_journal -#: view:sale_journal.sale.journal:0 -#: field:stock.picking,sale_journal_id:0 -msgid "Sale Journal" -msgstr "Журнал продаж" - -#. module: sale_journal -#: field:sale_journal.sale.journal,sale_stats_ids:0 -msgid "Sale Stats" -msgstr "" - -#. module: sale_journal -#: selection:sale_journal.invoice.type.stats,state:0 -#: selection:sale_journal.picking.stats,state:0 -msgid "waiting" -msgstr "ожидание" - -#. module: sale_journal -#: view:sale_journal.picking.journal:0 -#: view:sale_journal.sale.journal:0 -msgid "Set to Draft" -msgstr "Установить в 'Черновик'" +#: field:sale_journal.invoice.type,note:0 +msgid "Note" +msgstr "Примечание" #. module: sale_journal -#: field:sale_journal.picking.journal,date:0 -#: field:sale_journal.sale.journal,date:0 -msgid "Journal date" -msgstr "Дата журнала" +#: constraint:ir.ui.view:0 +msgid "Invalid XML for View Architecture!" +msgstr "Неправильный XML для просмотра архитектуры!" #. module: sale_journal -#: model:ir.ui.menu,name:sale_journal.menu_definition_journal_picking_invoice_method -#: model:ir.ui.menu,name:sale_journal.menu_invoice_type_picking_stats_open_all -#: model:ir.ui.menu,name:sale_journal.menu_invoice_type_picking_stats_open_menu -msgid "Packing by Invoice Method" -msgstr "" +#: model:ir.model,name:sale_journal.model_sale_order +msgid "Sale Order" +msgstr "Заказ на продажу" #. module: sale_journal -#: model:ir.ui.menu,name:sale_journal.menu_definition_journal_picking -msgid "Packing Journals" +#: constraint:ir.model:0 +msgid "" +"The Object name must start with x_ and not contain any special character !" msgstr "" +"Название объекта должно начинаться с x_ и не должно содержать специальных " +"символов !" #. module: sale_journal -#: view:sale_journal.picking.journal:0 -#: view:sale_journal.sale.journal:0 -msgid "Notes" -msgstr "Примечания" - -#. module: sale_journal -#: model:ir.actions.act_window,name:sale_journal.action_definition_journal_tree_my -msgid "My open journals" -msgstr "Мои открытые книги" - -#. module: sale_journal -#: field:sale_journal.invoice.type.stats,count:0 -#: field:sale_journal.picking.stats,count:0 -#: field:sale_journal.sale.stats,count:0 -msgid "# of Lines" -msgstr "Кол-во позиций" +#: constraint:ir.actions.act_window:0 +msgid "Invalid model name in the action definition." +msgstr "Недопустимое имя модели в определении действия." #. module: sale_journal -#: model:ir.ui.menu,name:sale_journal.menu_definition_journal_picking_byjournal_all -#: model:ir.ui.menu,name:sale_journal.menu_definition_journal_sales_all_open -msgid "All Open Journals" -msgstr "Все открытые книги" +#: view:res.partner:0 +msgid "Sales & Purchases" +msgstr "Продажи и закупки" #. module: sale_journal #: model:ir.module.module,shortdesc:sale_journal.module_meta_information msgid "Managing sales and deliveries by journal" -msgstr "" +msgstr "Управление продажами и доставками по журналам" #. module: sale_journal -#: selection:sale_journal.invoice.type.stats,state:0 -#: selection:sale_journal.picking.stats,state:0 -msgid "done" -msgstr "завершено" +#: field:res.partner,property_invoice_type:0 +msgid "Invoicing Method" +msgstr "Метод выставления счета" #. module: sale_journal -#: field:sale_journal.invoice.type.stats,price_average:0 -#: field:sale_journal.picking.stats,price_average:0 -#: field:sale_journal.sale.stats,price_average:0 -msgid "Average Price" -msgstr "Средняя цена" +#: help:res.partner,property_invoice_type:0 +msgid "The type of journal used for sales and picking." +msgstr "Тип журнала для продаж и комплектации." #. module: sale_journal -#: constraint:ir.ui.view:0 -msgid "Invalid XML for View Architecture!" -msgstr "Неправильный XML для просмотра архитектуры!" +#: model:ir.actions.act_window,name:sale_journal.action_definition_journal_invoice_type +#: model:ir.model,name:sale_journal.model_sale_journal_invoice_type +#: model:ir.ui.menu,name:sale_journal.menu_definition_journal_invoice_type +msgid "Invoice Types" +msgstr "Типы счетов" #. module: sale_journal #: selection:sale_journal.invoice.type,invoicing_method:0 -msgid "Grouped" -msgstr "Сгруппировано" - -#. module: sale_journal -#: field:sale_journal.invoice.type.stats,state:0 -#: field:sale_journal.picking.stats,state:0 -#: field:sale_journal.sale.journal,state:0 -msgid "State" -msgstr "Состояние" - -#. module: sale_journal -#: model:ir.ui.menu,name:sale_journal.menu_definition_journal_reporting_all -#: model:ir.ui.menu,name:sale_journal.menu_definition_report_sales_all_month -msgid "All Months" -msgstr "Все месяцы" - -#. module: sale_journal -#: field:sale_journal.invoice.type.stats,price_total:0 -#: field:sale_journal.picking.stats,price_total:0 -#: field:sale_journal.sale.stats,price_total:0 -msgid "Total Price" -msgstr "Итоговая цена" - -#. module: sale_journal -#: model:ir.actions.act_window,name:sale_journal.action_definition_picking_journal -msgid "Packing journals" -msgstr "" - -#. module: sale_journal -#: model:ir.ui.menu,name:sale_journal.menu_definition_report_sales -msgid "Reporting" -msgstr "Отчетность" - -#. module: sale_journal -#: model:ir.actions.act_window,name:sale_journal.action_definition_picking_journal_tree_my -msgid "My open packing journals" -msgstr "" +msgid "Non grouped" +msgstr "Не сгруппировано" #. module: sale_journal -#: model:ir.model,name:sale_journal.model_sale_journal_sale_stats -msgid "Sales Orders by Journal" -msgstr "Заказы по книгам" +#: selection:sale_journal.invoice.type,invoicing_method:0 +msgid "Grouped" +msgstr "Сгруппировано" #. module: sale_journal -#: model:ir.actions.act_window,name:sale_journal.action_definition_journal_tree_all -msgid "Open journals" -msgstr "" +#: field:sale_journal.invoice.type,invoicing_method:0 +msgid "Invoicing method" +msgstr "Метод выставления счета" #. module: sale_journal -#: view:sale_journal.picking.journal:0 -msgid "Packing" -msgstr "Упаковка" +#: constraint:ir.ui.menu:0 +msgid "Error ! You can not create recursive Menu." +msgstr "Ошибка ! Нельзя создать зацикленные меню." #. module: sale_journal -#: help:res.partner,property_invoice_type:0 -msgid "The type of journal used for sales and packing." -msgstr "" +#: field:sale.order,invoice_type_id:0 +#: view:sale_journal.invoice.type:0 +#: field:sale_journal.invoice.type,name:0 +#: field:stock.picking,invoice_type_id:0 +msgid "Invoice Type" +msgstr "Тип счета" #. module: sale_journal -#: selection:sale_journal.invoice.type.stats,invoice_state:0 -msgid "None" -msgstr "Нет" +#: field:sale_journal.invoice.type,active:0 +msgid "Active" +msgstr "Активен" #. module: sale_journal -#: model:ir.actions.act_window,name:sale_journal.action_sale_sale_stats_open_menu_month -msgid "Sales by journal (this month)" -msgstr "Продажи по книгам (тек.м-ц)" +#: model:ir.model,name:sale_journal.model_res_partner +msgid "Partner" +msgstr "Партнер" #. module: sale_journal -#: selection:sale_journal.sale.stats,state:0 -msgid "Manual in progress" -msgstr "Выполняется вручную" +#: model:ir.model,name:sale_journal.model_stock_picking +msgid "Picking List" +msgstr "Комплектовочный лист" #. module: sale_journal -#: model:ir.actions.act_window,name:sale_journal.action_definition_picking_journal_tree -#: model:ir.actions.act_window,name:sale_journal.action_definition_picking_journal_tree_all -#: model:ir.actions.act_window,name:sale_journal.action_picking_picking_stats_open_menu_all -#: model:ir.actions.act_window,name:sale_journal.action_picking_picking_stats_open_menu_month -msgid "Packing by journal" -msgstr "" +#: view:sale_journal.invoice.type:0 +msgid "Notes" +msgstr "Примечания" #. module: sale_journal -#: view:sale_journal.picking.journal:0 -msgid "Cancel Packing" +#: help:sale_journal.invoice.type,active:0 +msgid "" +"If the active field is set to true, it will allow you to hide the invoice " +"type without removing it." msgstr "" +"если поле \"Активно\" установлено в \"истина\", то это позволит вам скрыть " +"тип счета без его удаления." #. module: sale_journal -#: model:ir.actions.act_window,name:sale_journal.act_sale_journal_picking_journal_2_stock_picking_confirmed -#: model:ir.actions.act_window,name:sale_journal.act_sale_journal_sale_journal_2_stock_picking_confirmed -msgid "Confirmed packing" -msgstr "" +#: view:res.partner:0 +msgid "Invoicing" +msgstr "Выставление счета" -#. module: sale_journal -#: selection:sale_journal.sale.stats,state:0 -msgid "In progress" -msgstr "Выполняется" +#~ msgid "Monthly sales" +#~ msgstr "Продажи в месяце" -#. module: sale_journal -#: view:sale_journal.picking.stats:0 -msgid "Packing by journals" -msgstr "" +#~ msgid "assigned" +#~ msgstr "назначено" -#. module: sale_journal -#: field:sale_journal.invoice.type.stats,name:0 -#: field:sale_journal.picking.stats,name:0 -#: field:sale_journal.sale.stats,name:0 -msgid "Month" -msgstr "Месяц" +#~ msgid "Waiting Schedule" +#~ msgstr "В ожидании расписания" -#. module: sale_journal -#: field:sale_journal.invoice.type.stats,invoice_state:0 -msgid "Invoice state" -msgstr "Состояние счета" +#~ msgid "to be invoiced" +#~ msgstr "выставить счет" -#. module: sale_journal -#: model:ir.actions.act_window,name:sale_journal.action_invoice_type_picking_stats_open_menu_all -#: model:ir.actions.act_window,name:sale_journal.action_invoice_type_picking_stats_open_menu_month -#: view:sale_journal.invoice.type.stats:0 -msgid "Packing by invoice method" -msgstr "" +#~ msgid "Sale Journal" +#~ msgstr "Журнал продаж" -#. module: sale_journal -#: field:sale_journal.sale.stats,state:0 -msgid "Order State" -msgstr "Состояние заказа" +#~ msgid "waiting" +#~ msgstr "ожидание" -#. module: sale_journal -#: selection:sale_journal.sale.stats,state:0 -msgid "Shipping Exception" -msgstr "Исключительная ситуация поставки" +#~ msgid "Set to Draft" +#~ msgstr "Установить в 'Черновик'" -#. module: sale_journal -#: field:sale_journal.invoice.type,note:0 -#: field:sale_journal.picking.journal,note:0 -#: field:sale_journal.sale.journal,note:0 -msgid "Note" -msgstr "Примечание" +#~ msgid "Journal date" +#~ msgstr "Дата журнала" -#. module: sale_journal -#: selection:sale_journal.picking.journal,state:0 -#: selection:sale_journal.sale.journal,state:0 -msgid "Draft" -msgstr "Черновик" +#~ msgid "My open journals" +#~ msgstr "Мои открытые книги" -#. module: sale_journal -#: selection:sale_journal.invoice.type.stats,state:0 -#: selection:sale_journal.picking.stats,state:0 -msgid "cancel" -msgstr "отменить" +#~ msgid "# of Lines" +#~ msgstr "Кол-во позиций" -#. module: sale_journal -#: selection:sale_journal.sale.stats,state:0 -msgid "Invoice Exception" -msgstr "Исключительная ситуация счета" +#~ msgid "All Open Journals" +#~ msgstr "Все открытые книги" -#. module: sale_journal -#: field:sale_journal.picking.journal,date_validation:0 -#: field:sale_journal.sale.journal,date_validation:0 -msgid "Validation date" -msgstr "Дата проверки" +#~ msgid "done" +#~ msgstr "завершено" -#. module: sale_journal -#: selection:sale_journal.invoice.type.stats,state:0 -#: selection:sale_journal.picking.stats,state:0 -msgid "draft" -msgstr "черновик" +#~ msgid "Average Price" +#~ msgstr "Средняя цена" -#. module: sale_journal -#: field:sale_journal.invoice.type,active:0 -msgid "Active" -msgstr "Активен" +#~ msgid "State" +#~ msgstr "Состояние" -#. module: sale_journal -#: model:ir.actions.act_window,name:sale_journal.act_sale_journal_sale_journal_2_sale_order_draft -msgid "Draft sales" -msgstr "Неподтвержденные продажи" +#~ msgid "All Months" +#~ msgstr "Все месяцы" -#. module: sale_journal -#: selection:sale_journal.sale.stats,state:0 -msgid "Quotation" -msgstr "Предложение" +#~ msgid "Total Price" +#~ msgstr "Итоговая цена" -#. module: sale_journal -#: model:ir.ui.menu,name:sale_journal.menu_definition_journal -msgid "Sales Journals" -msgstr "Книги продаж" +#~ msgid "Reporting" +#~ msgstr "Отчетность" -#. module: sale_journal -#: model:ir.actions.act_window,name:sale_journal.action_invoice_type_tree -msgid "sale_journal.invoice.type.tree" -msgstr "" +#~ msgid "Sales Orders by Journal" +#~ msgstr "Заказы по книгам" -#. module: sale_journal -#: view:sale_journal.sale.journal:0 -msgid "Confirm Sales" -msgstr "Подтвердить продажи" +#~ msgid "None" +#~ msgstr "Нет" -#. module: sale_journal -#: field:sale_journal.picking.journal,date_created:0 -#: field:sale_journal.picking.journal,state:0 -#: field:sale_journal.sale.journal,date_created:0 -msgid "Creation date" -msgstr "Дата создания" +#~ msgid "Sales by journal (this month)" +#~ msgstr "Продажи по книгам (тек.м-ц)" -#. module: sale_journal -#: field:res.partner,property_invoice_type:0 -msgid "Invoicing Method" -msgstr "" +#~ msgid "Manual in progress" +#~ msgstr "Выполняется вручную" -#. module: sale_journal -#: field:sale_journal.picking.journal,code:0 -#: field:sale_journal.sale.journal,code:0 -msgid "Code" -msgstr "Код" +#~ msgid "In progress" +#~ msgstr "Выполняется" -#. module: sale_journal -#: view:sale_journal.picking.journal:0 -#: view:sale_journal.sale.journal:0 -msgid "Open Journal" -msgstr "Открыть журнал" +#~ msgid "Month" +#~ msgstr "Месяц" -#. module: sale_journal -#: view:sale_journal.sale.journal:0 -msgid "Sales" -msgstr "Продажи" +#~ msgid "Invoice state" +#~ msgstr "Состояние счета" -#. module: sale_journal -#: model:ir.model,name:sale_journal.model_sale_journal_picking_journal -#: model:ir.ui.menu,name:sale_journal.menu_definition_journal_reporting -#: view:sale_journal.picking.journal:0 -msgid "Packing Journal" -msgstr "" +#~ msgid "Order State" +#~ msgstr "Состояние заказа" -#. module: sale_journal -#: selection:sale_journal.picking.journal,state:0 -#: selection:sale_journal.sale.journal,state:0 -#: selection:sale_journal.sale.stats,state:0 -msgid "Done" -msgstr "Выполнено" +#~ msgid "Shipping Exception" +#~ msgstr "Исключительная ситуация поставки" -#. module: sale_journal -#: selection:sale_journal.sale.stats,state:0 -msgid "Cancel" -msgstr "Отмена" +#~ msgid "Draft" +#~ msgstr "Черновик" -#. module: sale_journal -#: field:sale_journal.picking.journal,picking_stats_ids:0 -msgid "Journal Stats" -msgstr "Состояния книги" +#~ msgid "cancel" +#~ msgstr "отменить" -#. module: sale_journal -#: selection:sale_journal.picking.journal,state:0 -#: selection:sale_journal.sale.journal,state:0 -msgid "Open" -msgstr "Открыть" +#~ msgid "Invoice Exception" +#~ msgstr "Исключительная ситуация счета" -#. module: sale_journal -#: constraint:ir.model:0 -msgid "" -"The Object name must start with x_ and not contain any special character !" -msgstr "" -"Название объекта должно начинаться с x_ и не должно содержать специальных " -"символов !" +#~ msgid "Validation date" +#~ msgstr "Дата проверки" -#. module: sale_journal -#: view:res.partner:0 -msgid "Sales & Purchases" -msgstr "Продажи и закупки" +#~ msgid "draft" +#~ msgstr "черновик" -#. module: sale_journal -#: field:sale_journal.picking.journal,user_id:0 -#: field:sale_journal.sale.journal,user_id:0 -msgid "Responsible" -msgstr "Ответственный" +#~ msgid "Draft sales" +#~ msgstr "Неподтвержденные продажи" -#. module: sale_journal -#: model:ir.ui.menu,name:sale_journal.menu_definition_journal_picking_byjournal_my -#: model:ir.ui.menu,name:sale_journal.menu_definition_journal_sales_my_open -msgid "My Open Journals" -msgstr "Мои открытые книги" +#~ msgid "Quotation" +#~ msgstr "Предложение" -#. module: sale_journal -#: model:ir.actions.act_window,name:sale_journal.action_invoice_type_picking_stats_open -msgid "Statistics on packing to invoice" -msgstr "" +#~ msgid "Sales Journals" +#~ msgstr "Книги продаж" -#. module: sale_journal -#: view:sale_journal.sale.journal:0 -msgid "Cancel Sales" -msgstr "Отменить продажи" +#~ msgid "Confirm Sales" +#~ msgstr "Подтвердить продажи" -#. module: sale_journal -#: field:sale.order,invoice_type_id:0 -#: view:sale_journal.invoice.type:0 -#: field:sale_journal.invoice.type,name:0 -#: field:stock.picking,invoice_type_id:0 -msgid "Invoice Type" -msgstr "Тип счета" +#~ msgid "Creation date" +#~ msgstr "Дата создания" -#. module: sale_journal -#: selection:sale_journal.invoice.type.stats,invoice_state:0 -msgid "invoiced" -msgstr "счет выставлен" +#~ msgid "Code" +#~ msgstr "Код" -#. module: sale_journal -#: selection:sale_journal.invoice.type.stats,state:0 -#: selection:sale_journal.picking.stats,state:0 -msgid "confirmed" -msgstr "подтверждено" +#~ msgid "Sales" +#~ msgstr "Продажи" -#. module: sale_journal -#: model:ir.model,name:sale_journal.model_sale_journal_picking_stats -msgid "Packing lists by Journal" -msgstr "" +#~ msgid "Done" +#~ msgstr "Выполнено" -#. module: sale_journal -#: field:sale_journal.invoice.type.stats,quantity:0 -#: field:sale_journal.picking.stats,quantity:0 -#: field:sale_journal.sale.stats,quantity:0 -msgid "Quantities" -msgstr "Количество" +#~ msgid "Cancel" +#~ msgstr "Отмена" -#. module: sale_journal -#: field:sale.order,journal_id:0 -#: view:sale_journal.picking.journal:0 -#: field:sale_journal.picking.journal,name:0 -#: field:sale_journal.picking.stats,journal_id:0 -#: view:sale_journal.sale.journal:0 -#: field:sale_journal.sale.journal,name:0 -#: field:sale_journal.sale.stats,journal_id:0 -#: field:stock.picking,journal_id:0 -msgid "Journal" -msgstr "Книга" +#~ msgid "Journal Stats" +#~ msgstr "Состояния книги" -#. module: sale_journal -#: field:sale_journal.invoice.type,invoicing_method:0 -#: field:sale_journal.invoice.type.stats,invoice_type_id:0 -msgid "Invoicing method" -msgstr "" +#~ msgid "Open" +#~ msgstr "Открыть" -#. module: sale_journal -#: model:ir.ui.menu,name:sale_journal.menu_definition_journal_reporting_this -#: model:ir.ui.menu,name:sale_journal.menu_definition_report_sales_this_month -msgid "This Month" -msgstr "Данный месяц" +#~ msgid "Responsible" +#~ msgstr "Ответственный" -#. module: sale_journal -#: model:ir.ui.menu,name:sale_journal.menu_definition_journal_sales -#: model:ir.ui.menu,name:sale_journal.menu_sale_sale_stats_open_all -#: model:ir.ui.menu,name:sale_journal.menu_sale_sale_stats_open_menu -#: view:sale_journal.sale.stats:0 -msgid "Sales by Journal" -msgstr "Продажи по книгам" +#~ msgid "My Open Journals" +#~ msgstr "Мои открытые книги" -#. module: sale_journal -#: model:ir.ui.menu,name:sale_journal.menu_definition_journal_invoice_type -msgid "Invoicing Methods" -msgstr "" +#~ msgid "Cancel Sales" +#~ msgstr "Отменить продажи" -#. module: sale_journal -#: selection:sale_journal.invoice.type,invoicing_method:0 -msgid "Non grouped" -msgstr "Не сгруппировано" +#~ msgid "invoiced" +#~ msgstr "счет выставлен" -#. module: sale_journal -#: model:ir.actions.act_window,name:sale_journal.action_invoice_type_picking_open -msgid "Packing to invoice" -msgstr "" +#~ msgid "confirmed" +#~ msgstr "подтверждено" -#. module: sale_journal -#: view:sale_journal.picking.journal:0 -#: view:sale_journal.sale.journal:0 -msgid "Journal Information" -msgstr "" +#~ msgid "Quantities" +#~ msgstr "Количество" -#. module: sale_journal -#: model:ir.model,name:sale_journal.model_sale_journal_invoice_type_stats -msgid "Stats on packing by invoice method" -msgstr "" +#~ msgid "Journal" +#~ msgstr "Книга" -#. module: sale_journal -#: model:ir.model,name:sale_journal.model_sale_journal_invoice_type -msgid "Invoice Types" -msgstr "Типы счетов" +#~ msgid "This Month" +#~ msgstr "Данный месяц" -#. module: sale_journal -#: view:sale_journal.picking.journal:0 -#: view:sale_journal.sale.journal:0 -msgid "States" -msgstr "Cостояния" +#~ msgid "Sales by Journal" +#~ msgstr "Продажи по книгам" -#. module: sale_journal -#: model:ir.ui.menu,name:sale_journal.menu_definition_journal_picking_byjournal -#: model:ir.ui.menu,name:sale_journal.menu_picking_picking_stats_open_all -#: model:ir.ui.menu,name:sale_journal.menu_picking_picking_stats_open_menu -msgid "Packing by Journal" -msgstr "" +#~ msgid "States" +#~ msgstr "Cостояния" -#. module: sale_journal -#: view:sale_journal.picking.journal:0 -#: view:sale_journal.sale.journal:0 -msgid "Close Journal" -msgstr "" +#~ msgid "Approved sales" +#~ msgstr "Утвержденные продажи" -#. module: sale_journal -#: model:ir.ui.menu,name:sale_journal.menu_definition_journal_picking_invoice -msgid "Packing to Invoice" -msgstr "" +#~ msgid "Packing" +#~ msgstr "Упаковка" -#. module: sale_journal -#: model:ir.actions.act_window,name:sale_journal.act_sale_journal_sale_journal_2_sale_order_approved -msgid "Approved sales" -msgstr "Утвержденные продажи" +#~ msgid "Open Journal" +#~ msgstr "Открыть журнал" diff --git a/addons/sale_journal/sale_journal.py b/addons/sale_journal/sale_journal.py index 00c3a77126d..5434df1725e 100644 --- a/addons/sale_journal/sale_journal.py +++ b/addons/sale_journal/sale_journal.py @@ -18,11 +18,8 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # ############################################################################## -import time from osv import osv, fields -import netsvc -from tools.translate import _ class sale_journal_invoice_type(osv.osv): _name = 'sale_journal.invoice.type' @@ -31,7 +28,7 @@ class sale_journal_invoice_type(osv.osv): 'name': fields.char('Invoice Type', size=64, required=True), 'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the invoice type without removing it."), 'note': fields.text('Note'), - 'invoicing_method': fields.selection([('simple','Non grouped'),('grouped','Grouped')], 'Invoicing method', required=True), + 'invoicing_method': fields.selection([('simple', 'Non grouped'), ('grouped', 'Grouped')], 'Invoicing method', required=True), } _defaults = { 'active': True, diff --git a/addons/sale_layout/i18n/ru.po b/addons/sale_layout/i18n/ru.po new file mode 100644 index 00000000000..bb913f22a5f --- /dev/null +++ b/addons/sale_layout/i18n/ru.po @@ -0,0 +1,281 @@ +# Russian 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 <EMAIL@ADDRESS>, 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2010-10-18 17:47+0000\n" +"PO-Revision-Date: 2010-10-26 11:55+0000\n" +"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n" +"Language-Team: Russian <ru@li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n" +"X-Generator: Launchpad (build Unknown)\n" + +#. module: sale_layout +#: selection:sale.order.line,layout_type:0 +msgid "Sub Total" +msgstr "Подитог" + +#. module: sale_layout +#: constraint:ir.model:0 +msgid "" +"The Object name must start with x_ and not contain any special character !" +msgstr "" +"Название объекта должно начинаться с x_ и не должно содержать специальных " +"символов !" + +#. module: sale_layout +#: selection:sale.order.line,layout_type:0 +msgid "Title" +msgstr "" + +#. module: sale_layout +#: report:sale.order.layout:0 +msgid "Disc. (%)" +msgstr "" + +#. module: sale_layout +#: selection:sale.order.line,layout_type:0 +msgid "Note" +msgstr "Примечания" + +#. module: sale_layout +#: report:sale.order.layout:0 +msgid "Unit Price" +msgstr "Цена единицы" + +#. module: sale_layout +#: report:sale.order.layout:0 +msgid "Order N°" +msgstr "Заказ №" + +#. module: sale_layout +#: field:sale.order,abstract_line_ids:0 +msgid "Order Lines" +msgstr "Позиции заказа" + +#. module: sale_layout +#: report:sale.order.layout:0 +msgid "Disc.(%)" +msgstr "" + +#. module: sale_layout +#: field:sale.order.line,layout_type:0 +msgid "Layout Type" +msgstr "Тип макета" + +#. module: sale_layout +#: model:ir.model,name:sale_layout.model_sale_order_line +msgid "Sale Order Line" +msgstr "Позиция заказа на продажу" + +#. module: sale_layout +#: view:sale.order:0 +msgid "Seq." +msgstr "Посл." + +#. module: sale_layout +#: selection:sale.order.line,layout_type:0 +msgid "Product" +msgstr "Продукция" + +#. module: sale_layout +#: report:sale.order.layout:0 +msgid "Description" +msgstr "Описание" + +#. module: sale_layout +#: view:sale.order:0 +msgid "Manual Description" +msgstr "" + +#. module: sale_layout +#: report:sale.order.layout:0 +msgid "Our Salesman" +msgstr "" + +#. module: sale_layout +#: view:sale.order:0 +msgid "Automatic Declaration" +msgstr "" + +#. module: sale_layout +#: view:sale.order:0 +msgid "Invoice Lines" +msgstr "Позиции счета" + +#. module: sale_layout +#: report:sale.order.layout:0 +msgid "Quantity" +msgstr "Количество" + +#. module: sale_layout +#: report:sale.order.layout:0 +msgid "Quotation N°" +msgstr "Предложение №" + +#. module: sale_layout +#: report:sale.order.layout:0 +msgid "VAT" +msgstr "НДС" + +#. module: sale_layout +#: view:sale.order:0 +msgid "Make Invoice" +msgstr "Сделать счет" + +#. module: sale_layout +#: view:sale.order:0 +msgid "Properties" +msgstr "Свойства" + +#. module: sale_layout +#: report:sale.order.layout:0 +msgid "Invoice address :" +msgstr "Адрес счета:" + +#. module: sale_layout +#: model:ir.module.module,shortdesc:sale_layout.module_meta_information +msgid "Sale Order Layout" +msgstr "Шаблон заказа на продажу" + +#. module: sale_layout +#: constraint:ir.ui.view:0 +msgid "Invalid XML for View Architecture!" +msgstr "Неправильный XML для просмотра архитектуры!" + +#. module: sale_layout +#: model:ir.model,name:sale_layout.model_sale_order +msgid "Sale Order" +msgstr "Заказ на продажу" + +#. module: sale_layout +#: selection:sale.order.line,layout_type:0 +msgid "Page Break" +msgstr "Разделитель страниц" + +#. module: sale_layout +#: view:sale.order:0 +msgid "Notes" +msgstr "Примечания" + +#. module: sale_layout +#: report:sale.order.layout:0 +msgid "Date Ordered" +msgstr "Дата заказа" + +#. module: sale_layout +#: report:sale.order.layout:0 +msgid "Shipping address :" +msgstr "Адрес доставки:" + +#. module: sale_layout +#: report:sale.order.layout:0 +msgid "Taxes" +msgstr "Налоги" + +#. module: sale_layout +#: report:sale.order.layout:0 +msgid "Net Total :" +msgstr "Чисный итог:" + +#. module: sale_layout +#: report:sale.order.layout:0 +msgid "Tel. :" +msgstr "Тел. :" + +#. module: sale_layout +#: report:sale.order.layout:0 +msgid "Total :" +msgstr "Всего:" + +#. module: sale_layout +#: report:sale.order.layout:0 +msgid "Payment Terms" +msgstr "Условия оплаты" + +#. module: sale_layout +#: view:sale.order:0 +msgid "History" +msgstr "История" + +#. module: sale_layout +#: view:sale.order:0 +msgid "Sale Order Lines" +msgstr "Позиции заказа на продажу" + +#. module: sale_layout +#: selection:sale.order.line,layout_type:0 +msgid "Separator Line" +msgstr "Разделитель" + +#. module: sale_layout +#: report:sale.order.layout:0 +msgid "Your Reference" +msgstr "Ваша ссылка" + +#. module: sale_layout +#: view:sale.order:0 +msgid "Sales order lines" +msgstr "Позиции заказа на продажу" + +#. module: sale_layout +#: view:sale.order:0 +msgid "Qty" +msgstr "Кол-во" + +#. module: sale_layout +#: view:sale.order:0 +msgid "States" +msgstr "Состояния" + +#. module: sale_layout +#: report:sale.order.layout:0 +msgid "TVA :" +msgstr "НДС:" + +#. module: sale_layout +#: model:ir.actions.report.xml,name:sale_layout.sale_order_1 +msgid "Order with Layout" +msgstr "Заказ по шаблону" + +#. module: sale_layout +#: view:sale.order:0 +msgid "Extra Info" +msgstr "Доп. инфо." + +#. module: sale_layout +#: view:sale.order:0 +msgid "UoM" +msgstr "Ед. изм." + +#. module: sale_layout +#: report:sale.order.layout:0 +msgid "Fax :" +msgstr "Факс:" + +#. module: sale_layout +#: view:sale.order:0 +msgid "Order Line" +msgstr "Позиция заказа" + +#. module: sale_layout +#: report:sale.order.layout:0 +msgid "Price" +msgstr "Цена" + +#. module: sale_layout +#: report:sale.order.layout:0 +msgid "Taxes :" +msgstr "Налоги:" + +#. module: sale_layout +#: view:sale.order:0 +msgid "Stock Moves" +msgstr "Перемещения ТМЦ" diff --git a/addons/sale_layout/report/report_sale_layout.py b/addons/sale_layout/report/report_sale_layout.py index 847c2cb4834..94b10c8ebf9 100755 --- a/addons/sale_layout/report/report_sale_layout.py +++ b/addons/sale_layout/report/report_sale_layout.py @@ -21,7 +21,6 @@ import time from report import report_sxw - rml_parents = { 'tr': 1, 'li': 1, @@ -29,7 +28,6 @@ rml_parents = { 'section': 0 } - class sale_order_1(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): super(sale_order_1, self).__init__(cr, uid, name, context) @@ -131,6 +129,7 @@ class sale_order_1(report_sxw.rml_parse): result.append(res) return result + report_sxw.report_sxw('report.sale.order.layout', 'sale.order', 'addons/sale_layout/report/report_sale_layout.rml', parser=sale_order_1) # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/sale_layout/sale_layout.py b/addons/sale_layout/sale_layout.py index 6144ea13d05..e5554aba07c 100755 --- a/addons/sale_layout/sale_layout.py +++ b/addons/sale_layout/sale_layout.py @@ -20,22 +20,19 @@ # ############################################################################## -from osv import fields,osv -from tools import config +from osv import fields, osv import decimal_precision as dp -from tools.translate import _ class sale_order_line(osv.osv): def _amount_line(self, cr, uid, ids, field_name, arg, context=None): - tax_obj = self.pool.get('account.tax') - cur_obj = self.pool.get('res.currency') res = {} context = context or {} for line in self.browse(cr, uid, ids, context=context): - if line.layout_type=='article': + if line.layout_type == 'article': return super(sale_order_line, self)._amount_line(cr, uid, ids, field_name, arg, context) return res + def invoice_line_create(self, cr, uid, ids, context={}): new_ids = [] list_seq = [] @@ -52,33 +49,33 @@ class sale_order_line(osv.osv): return invoice_line_ids def onchange_sale_order_line_view(self, cr, uid, id, type, context={}, *args): - temp ={} - temp['value']= {} - if (not type): - return {} - if type != 'article': - temp = { - 'value': { - 'product_id': False, - 'uos_id': False, - 'account_id': False, - 'price_unit': 0.0, - 'price_subtotal': 0.0, - 'quantity': 0, - 'discount': 0.0, - 'invoice_line_tax_id': False, - 'account_analytic_id': False, - 'product_uom_qty':0.0, - }, - } - if type == 'line': - temp['value']['name'] = ' ' - if type == 'break': - temp['value']['name'] = ' ' - if type == 'subtotal': - temp['value']['name'] = 'Sub Total' - return temp + temp = {} + temp['value'] = {} + if (not type): return {} + if type != 'article': + temp = { + 'value': { + 'product_id': False, + 'uos_id': False, + 'account_id': False, + 'price_unit': 0.0, + 'price_subtotal': 0.0, + 'quantity': 0, + 'discount': 0.0, + 'invoice_line_tax_id': False, + 'account_analytic_id': False, + 'product_uom_qty': 0.0, + }, + } + if type == 'line': + temp['value']['name'] = ' ' + if type == 'break': + temp['value']['name'] = ' ' + if type == 'subtotal': + temp['value']['name'] = 'Sub Total' + return temp + return {} def create(self, cr, user, vals, context=None): if vals.has_key('layout_type'): @@ -104,28 +101,26 @@ class sale_order_line(osv.osv): default['layout_type'] = self.browse(cr, uid, id).layout_type return super(sale_order_line, self).copy(cr, uid, id, default, context) - - _name = "sale.order.line" _order = "order_id, sequence asc" _description = "Sale Order line" _inherit = "sale.order.line" _columns = { 'layout_type': fields.selection([ - ('article','Product'), - ('title','Title'), - ('text','Note'), - ('subtotal','Sub Total'), - ('line','Separator Line'), - ('break','Page Break'),] + ('article', 'Product'), + ('title', 'Title'), + ('text', 'Note'), + ('subtotal', 'Sub Total'), + ('line', 'Separator Line'), + ('break', 'Page Break'),] ,'Layout Type', select=True, required=True), 'sequence': fields.integer('Sequence Number'), - 'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Sale Price'), readonly=True, states={'draft':[('readonly',False)]}), + 'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Sale Price'), readonly=True, states={'draft': [('readonly', False)]}), 'product_uom_qty': fields.float('Quantity (UoM)', digits=(16,2)), 'product_uom': fields.many2one('product.uom', 'Product UoM'), } _defaults = { - 'layout_type': lambda *a: 'article', + 'layout_type': 'article', } sale_order_line() @@ -139,7 +134,7 @@ class one2many_mod2(fields.one2many): res = {} for id in ids: res[id] = [] - ids2 = obj.pool.get(self._obj).search(cr, user, [(self._fields_id,'in',ids),('layout_type','=','article')], limit=self._limit) + ids2 = obj.pool.get(self._obj).search(cr, user, [(self._fields_id, 'in', ids), ('layout_type', '=', 'article')], limit=self._limit) for r in obj.pool.get(self._obj)._read_flat(cr, user, ids2, [self._fields_id], context=context, load='_classic_write'): res[r[self._fields_id]].append( r['id'] ) return res @@ -155,8 +150,8 @@ class sale_order(osv.osv): _inherit = "sale.order" _columns = { - 'abstract_line_ids': fields.one2many('sale.order.line', 'order_id', 'Order Lines',readonly=True, states={'draft':[('readonly',False)]}), - 'order_line': one2many_mod2('sale.order.line', 'order_id', 'Order Lines',readonly=True, states={'draft':[('readonly',False)]}), + 'abstract_line_ids': fields.one2many('sale.order.line', 'order_id', 'Order Lines', readonly=True, states={'draft': [('readonly', False)]}), + 'order_line': one2many_mod2('sale.order.line', 'order_id', 'Order Lines', readonly=True, states={'draft': [('readonly', False)]}), } sale_order() diff --git a/addons/sale_margin/i18n/ru.po b/addons/sale_margin/i18n/ru.po index abad08b62ea..bad98199feb 100644 --- a/addons/sale_margin/i18n/ru.po +++ b/addons/sale_margin/i18n/ru.po @@ -7,32 +7,27 @@ msgid "" msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" -"POT-Creation-Date: 2009-11-25 14:28+0000\n" -"PO-Revision-Date: 2010-07-10 21:13+0000\n" -"Last-Translator: Pomazan Bogdan <Unknown>\n" +"POT-Creation-Date: 2010-10-18 17:47+0000\n" +"PO-Revision-Date: 2010-10-26 11:32+0000\n" +"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n" "Language-Team: Russian <ru@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-09-29 05:17+0000\n" +"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: sale_margin -#: selection:report.account.invoice,type:0 -#: selection:report.account.invoice.category,type:0 -#: selection:report.account.invoice.partner,type:0 -#: selection:report.account.invoice.partner.product,type:0 +#: view:report.account.invoice.product:0 +msgid "Category" +msgstr "Категория" + +#. module: sale_margin #: selection:report.account.invoice.product,type:0 -#: selection:stock.invoice_onshipping,init,type:0 msgid "Customer Refund" msgstr "Возврат денег клиенту" #. module: sale_margin -#: model:ir.model,name:sale_margin.model_report_account_invoice_product -msgid "report.account.invoice.product" -msgstr "" - -#. module: sale_margin #: constraint:ir.model:0 msgid "" "The Object name must start with x_ and not contain any special character !" @@ -41,51 +36,32 @@ msgstr "" "символов !" #. module: sale_margin -#: model:ir.ui.menu,name:sale_margin.menu_report_account_all_invoice_by_product -#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_by_product -msgid "Invoices by Product" -msgstr "" +#: constraint:ir.actions.act_window:0 +msgid "Invalid model name in the action definition." +msgstr "Недопустимое имя модели в определении действия." #. module: sale_margin -#: selection:report.account.invoice,type:0 -#: selection:report.account.invoice.category,type:0 -#: selection:report.account.invoice.partner,type:0 -#: selection:report.account.invoice.partner.product,type:0 #: selection:report.account.invoice.product,type:0 -#: selection:stock.invoice_onshipping,init,type:0 msgid "Customer Invoice" msgstr "Счета клиентам" #. module: sale_margin -#: wizard_view:stock.invoice_onshipping,init:0 -msgid "Create invoices" -msgstr "Создать счета" - -#. module: sale_margin -#: constraint:ir.ui.view:0 -msgid "Invalid XML for View Architecture!" -msgstr "Неправильный XML для просмотра структуры!" +#: selection:report.account.invoice.product,month:0 +msgid "February" +msgstr "Февраль" #. module: sale_margin -#: model:ir.model,name:sale_margin.model_report_account_invoice_partner_product -msgid "report.account.invoice.partner.product" -msgstr "" +#: view:report.account.invoice.product:0 +msgid "Current" +msgstr "Текущий" #. module: sale_margin -#: selection:report.account.invoice,type:0 -#: selection:report.account.invoice.category,type:0 -#: selection:report.account.invoice.partner,type:0 -#: selection:report.account.invoice.partner.product,type:0 -#: selection:report.account.invoice.product,type:0 -#: selection:stock.invoice_onshipping,init,type:0 -msgid "Supplier Invoice" -msgstr "Счета поставщиков" +#: view:report.account.invoice.product:0 +msgid "Group By..." +msgstr "Объединять по..." #. module: sale_margin -#: field:report.account.invoice,state:0 -#: field:report.account.invoice.category,state:0 -#: field:report.account.invoice.partner,state:0 -#: field:report.account.invoice.partner.product,state:0 +#: view:report.account.invoice.product:0 #: field:report.account.invoice.product,state:0 msgid "State" msgstr "Состояние" @@ -96,192 +72,203 @@ msgid "Create Invoice" msgstr "Создать счет" #. module: sale_margin -#: selection:report.account.invoice,state:0 -#: selection:report.account.invoice.category,state:0 -#: selection:report.account.invoice.partner,state:0 -#: selection:report.account.invoice.partner.product,state:0 +#: view:report.account.invoice.product:0 #: selection:report.account.invoice.product,state:0 msgid "Draft" msgstr "Черновик" #. module: sale_margin -#: constraint:ir.actions.act_window:0 -msgid "Invalid model name in the action definition." -msgstr "Недопустимое имя модели в определении действия." +#: selection:report.account.invoice.product,state:0 +msgid "Paid" +msgstr "Оплачено" #. module: sale_margin -#: model:ir.ui.menu,name:sale_margin.menu_report_account_all_month_product -msgid "All Months" -msgstr "Все месяцы" +#: constraint:ir.ui.menu:0 +msgid "Error ! You can not create recursive Menu." +msgstr "Ошибка ! Нельзя создать зацикленные меню." #. module: sale_margin -#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_partner_product_tree -#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_partner_product_tree_all -msgid "report.account.invoice.partner.product.tree" -msgstr "" +#: model:ir.model,name:sale_margin.model_stock_picking +msgid "Picking List" +msgstr "Комплектовочный лист" #. module: sale_margin -#: field:report.account.invoice,type:0 -#: field:report.account.invoice.category,type:0 -#: field:report.account.invoice.partner,type:0 -#: field:report.account.invoice.partner.product,type:0 #: field:report.account.invoice.product,type:0 -#: wizard_field:stock.invoice_onshipping,init,type:0 msgid "Type" msgstr "Тип" #. module: sale_margin -#: wizard_field:stock.invoice_onshipping,init,journal_id:0 -msgid "Destination Journal" -msgstr "" +#: model:ir.model,name:sale_margin.model_sale_order_line +msgid "Sale Order Line" +msgstr "Позиция заказа на продажу" #. module: sale_margin -#: view:stock.picking:0 -msgid "Supplier Invoices" -msgstr "Счета поставщиков" +#: model:ir.model,name:sale_margin.model_report_account_invoice_product +msgid "Invoice Statistics" +msgstr "Статистика по счетам" #. module: sale_margin -#: field:report.account.invoice.partner.product,product_id:0 +#: view:report.account.invoice.product:0 #: field:report.account.invoice.product,product_id:0 msgid "Product" msgstr "Продукция" #. module: sale_margin -#: view:report.account.invoice.partner:0 -msgid "Invoices by partner" -msgstr "" +#: view:report.account.invoice.product:0 +msgid "Invoice by Partner" +msgstr "Счет по партнеру" #. module: sale_margin -#: view:report.account.invoice.category:0 -msgid "Invoices by category" -msgstr "" +#: selection:report.account.invoice.product,month:0 +msgid "August" +msgstr "Август" #. module: sale_margin -#: selection:report.account.invoice,state:0 -#: selection:report.account.invoice.category,state:0 -#: selection:report.account.invoice.partner,state:0 -#: selection:report.account.invoice.partner.product,state:0 +#: view:report.account.invoice.product:0 #: selection:report.account.invoice.product,state:0 -msgid "Paid" -msgstr "Оплачено" +msgid "Pro-forma" +msgstr "Проформа" #. module: sale_margin -#: model:ir.actions.wizard,name:sale_margin.wizard_picking_invoice_create -#: wizard_button:stock.invoice_onshipping,init,create_invoice:0 -msgid "Create invoice" -msgstr "Создать счет" +#: selection:report.account.invoice.product,month:0 +msgid "May" +msgstr "Май" #. module: sale_margin -#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_category_tree -#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_category_tree_all -msgid "report.account.invoice.category.tree" -msgstr "" +#: selection:report.account.invoice.product,month:0 +msgid "June" +msgstr "Июнь" #. module: sale_margin -#: model:ir.ui.menu,name:sale_margin.menu_report_account_all_invoice_by_partner_product -#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_by_partner_product -msgid "Invoices by Partner and Product" -msgstr "" +#: view:report.account.invoice.product:0 +msgid "Date Invoiced" +msgstr "Дата выставления счета" #. module: sale_margin -#: model:ir.model,name:sale_margin.model_report_account_invoice_category -msgid "report.account.invoice.category" -msgstr "" +#: model:ir.module.module,shortdesc:sale_margin.module_meta_information +msgid "Margins in Sales Order" +msgstr "Наценки в заказах на продажу" + +#. module: sale_margin +#: view:report.account.invoice.product:0 +msgid "Search Margin" +msgstr "Искать наценку" + +#. module: sale_margin +#: view:report.account.invoice.product:0 +msgid "This Year" +msgstr "Этот год" + +#. module: sale_margin +#: field:report.account.invoice.product,date:0 +msgid "Date" +msgstr "Дата" + +#. module: sale_margin +#: selection:report.account.invoice.product,month:0 +msgid "July" +msgstr "Июль" + +#. module: sale_margin +#: view:report.account.invoice.product:0 +msgid "Extended Filters..." +msgstr "Расширенные фильтры..." #. module: sale_margin -#: model:ir.ui.menu,name:sale_margin.menu_report_account_this_month_product +#: view:report.account.invoice.product:0 msgid "This Month" msgstr "Этот месяц" #. module: sale_margin -#: field:report.account.invoice.category,categ_id:0 +#: view:report.account.invoice.product:0 +#: field:report.account.invoice.product,day:0 +msgid "Day" +msgstr "День" + +#. module: sale_margin +#: field:report.account.invoice.product,categ_id:0 msgid "Categories" msgstr "Категории" #. module: sale_margin +#: help:sale.order,margin:0 +msgid "" +"It gives profitability by calculating the difference between the Unit Price " +"and Cost Price" +msgstr "" +"Дает рентабельность, вычисляется разница между ценой продажи и закупки." + +#. module: sale_margin #: field:account.invoice.line,cost_price:0 -#: field:report.account.invoice,cost_price:0 -#: field:report.account.invoice.category,cost_price:0 -#: field:report.account.invoice.partner,cost_price:0 -#: field:report.account.invoice.partner.product,cost_price:0 #: field:report.account.invoice.product,cost_price:0 #: field:sale.order.line,purchase_price:0 msgid "Cost Price" msgstr "Себестоимость" #. module: sale_margin -#: wizard_field:stock.invoice_onshipping,init,group:0 -msgid "Group by partner" -msgstr "Группировать по партнерам" +#: selection:report.account.invoice.product,month:0 +msgid "October" +msgstr "Октябрь" #. module: sale_margin -#: model:ir.model,name:sale_margin.model_report_account_invoice_partner -msgid "report.account.invoice.partner" -msgstr "" +#: view:report.account.invoice.product:0 +#: field:report.account.invoice.product,year:0 +msgid "Year" +msgstr "Год" #. module: sale_margin -#: model:ir.ui.menu,name:sale_margin.menu_report_account_all_invoice_by_partner -#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_by_partner -msgid "Invoices by Partner" -msgstr "" +#: selection:report.account.invoice.product,month:0 +msgid "January" +msgstr "Январь" #. module: sale_margin -#: model:ir.ui.menu,name:sale_margin.menu_report_account_all_invoice_by_category -#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_by_category -msgid "Invoices by Category" -msgstr "" +#: model:ir.model,name:sale_margin.model_sale_order +msgid "Sale Order" +msgstr "Заказ на продажу" #. module: sale_margin -#: view:report.account.invoice.partner.product:0 -msgid "Invoices by partner and product" -msgstr "" +#: selection:report.account.invoice.product,month:0 +msgid "September" +msgstr "Сентябрь" + +#. module: sale_margin +#: selection:report.account.invoice.product,month:0 +msgid "April" +msgstr "Апрель" #. module: sale_margin -#: field:report.account.invoice,amount:0 -#: field:report.account.invoice.category,amount:0 -#: field:report.account.invoice.partner,amount:0 -#: field:report.account.invoice.partner.product,amount:0 #: field:report.account.invoice.product,amount:0 msgid "Amount" msgstr "Количество" #. module: sale_margin -#: wizard_field:stock.invoice_onshipping,init,invoice_date:0 -msgid "Invoiced date" -msgstr "" - -#. module: sale_margin -#: selection:report.account.invoice,type:0 -#: selection:report.account.invoice.category,type:0 -#: selection:report.account.invoice.partner,type:0 -#: selection:report.account.invoice.partner.product,type:0 #: selection:report.account.invoice.product,type:0 -#: selection:stock.invoice_onshipping,init,type:0 msgid "Supplier Refund" msgstr "Возврат средств от поставщика" #. module: sale_margin -#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_partner_tree -#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_partner_tree_all -msgid "report.account.invoice.partner.tree" -msgstr "" +#: constraint:ir.ui.view:0 +msgid "Invalid XML for View Architecture!" +msgstr "Неправильный XML для просмотра структуры!" + +#. module: sale_margin +#: selection:report.account.invoice.product,month:0 +msgid "March" +msgstr "Март" #. module: sale_margin -#: field:report.account.invoice,margin:0 -#: field:report.account.invoice.category,margin:0 -#: field:report.account.invoice.partner,margin:0 -#: field:report.account.invoice.partner.product,margin:0 #: field:report.account.invoice.product,margin:0 #: field:sale.order,margin:0 #: field:sale.order.line,margin:0 msgid "Margin" -msgstr "Отступ" +msgstr "Наценка" + +#. module: sale_margin +#: selection:report.account.invoice.product,month:0 +msgid "November" +msgstr "Ноябрь" #. module: sale_margin -#: field:report.account.invoice,quantity:0 -#: field:report.account.invoice.category,quantity:0 -#: field:report.account.invoice.partner,quantity:0 -#: field:report.account.invoice.partner.product,quantity:0 #: field:report.account.invoice.product,quantity:0 msgid "Quantity" msgstr "Количество" @@ -289,87 +276,89 @@ msgstr "Количество" #. module: sale_margin #: view:report.account.invoice.product:0 msgid "Invoices by product" -msgstr "" +msgstr "Счета по продукции" #. module: sale_margin -#: model:ir.module.module,shortdesc:sale_margin.module_meta_information -msgid "Margins in Sale Orders" -msgstr "" - -#. module: sale_margin -#: model:ir.model,name:sale_margin.model_report_account_invoice -msgid "report.account.invoice" -msgstr "" +#: selection:report.account.invoice.product,type:0 +msgid "Supplier Invoice" +msgstr "Счета поставщиков" #. module: sale_margin -#: model:ir.ui.menu,name:sale_margin.menu_report_account_all_invoice_by_invoices -#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_by_invoices -#: view:report.account.invoice:0 -#: view:stock.picking:0 #: field:stock.picking,invoice_ids:0 msgid "Invoices" -msgstr "Счета-фактуры" +msgstr "Счета" #. module: sale_margin -#: selection:report.account.invoice,state:0 -#: selection:report.account.invoice.category,state:0 -#: selection:report.account.invoice.partner,state:0 -#: selection:report.account.invoice.partner.product,state:0 -#: selection:report.account.invoice.product,state:0 -msgid "Pro-forma" -msgstr "Проформа" +#: selection:report.account.invoice.product,month:0 +msgid "December" +msgstr "Декабрь" + +#. module: sale_margin +#: model:ir.model,name:sale_margin.model_account_invoice_line +msgid "Invoice Line" +msgstr "Позиция счета" #. module: sale_margin -#: field:report.account.invoice,name:0 -#: field:report.account.invoice.category,name:0 -#: field:report.account.invoice.partner,name:0 -#: field:report.account.invoice.partner.product,name:0 -#: field:report.account.invoice.product,name:0 +#: view:report.account.invoice.product:0 +#: field:report.account.invoice.product,month:0 msgid "Month" msgstr "Месяц" #. module: sale_margin -#: selection:report.account.invoice,state:0 -#: selection:report.account.invoice.category,state:0 -#: selection:report.account.invoice.partner,state:0 -#: selection:report.account.invoice.partner.product,state:0 #: selection:report.account.invoice.product,state:0 msgid "Canceled" msgstr "Отменено" #. module: sale_margin #: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_product +msgid "Invoice Report" +msgstr "Отчет по счету" + +#. module: sale_margin +#: view:report.account.invoice.product:0 +msgid "Done" +msgstr "Сделано" + +#. module: sale_margin +#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_reoirt msgid "Invoice" msgstr "Счет" #. module: sale_margin -#: wizard_button:stock.invoice_onshipping,init,end:0 -msgid "Cancel" -msgstr "Отмена" +#: view:stock.picking:0 +msgid "Customer Invoices" +msgstr "Счета заказчика" #. module: sale_margin -#: field:report.account.invoice.partner,partner_id:0 -#: field:report.account.invoice.partner.product,partner_id:0 +#: view:report.account.invoice.product:0 +#: field:report.account.invoice.product,partner_id:0 msgid "Partner" msgstr "Партнер" #. module: sale_margin -#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_tree -#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_tree_all -msgid "report.account.invoice.tree" -msgstr "" - -#. module: sale_margin -#: selection:report.account.invoice,state:0 -#: selection:report.account.invoice.category,state:0 -#: selection:report.account.invoice.partner,state:0 -#: selection:report.account.invoice.partner.product,state:0 #: selection:report.account.invoice.product,state:0 msgid "Open" msgstr "Открыть" #. module: sale_margin -#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_product_tree -#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_product_tree_all -msgid "report.account.invoice.product.tree" -msgstr "" +#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_report +msgid "Invoice Analysis" +msgstr "Анализ счета" + +#~ msgid "Create invoices" +#~ msgstr "Создать счета" + +#~ msgid "All Months" +#~ msgstr "Все месяцы" + +#~ msgid "Supplier Invoices" +#~ msgstr "Счета поставщиков" + +#~ msgid "Create invoice" +#~ msgstr "Создать счет" + +#~ msgid "Group by partner" +#~ msgstr "Группировать по партнерам" + +#~ msgid "Cancel" +#~ msgstr "Отмена" diff --git a/addons/sale_margin/sale_margin.py b/addons/sale_margin/sale_margin.py index 03b16962a71..2f756d5ecda 100644 --- a/addons/sale_margin/sale_margin.py +++ b/addons/sale_margin/sale_margin.py @@ -18,9 +18,7 @@ # ############################################################################## -from osv import fields,osv -import pooler -from tools import config +from osv import fields, osv class sale_order_line(osv.osv): _inherit = "sale.order.line" @@ -33,7 +31,7 @@ class sale_order_line(osv.osv): lang=lang, update_tax=update_tax, date_order=date_order, packaging=packaging, fiscal_position=fiscal_position, flag=flag) if product: purchase_price = self.pool.get('product.product').browse(cr, uid, product).standard_price - res['value'].update({'purchase_price':purchase_price}) + res['value'].update({'purchase_price': purchase_price}) return res def _product_margin(self, cr, uid, ids, field_name, arg, context=None): @@ -42,9 +40,9 @@ class sale_order_line(osv.osv): res[line.id] = 0 if line.product_id: if line.purchase_price: - res[line.id] = round((line.price_unit*line.product_uos_qty*(100.0-line.discount)/100.0) -(line.purchase_price*line.product_uos_qty),2) + res[line.id] = round((line.price_unit*line.product_uos_qty*(100.0-line.discount)/100.0) -(line.purchase_price*line.product_uos_qty), 2) else: - res[line.id] = round((line.price_unit*line.product_uos_qty*(100.0-line.discount)/100.0) -(line.product_id.standard_price*line.product_uos_qty),2) + res[line.id] = round((line.price_unit*line.product_uos_qty*(100.0-line.discount)/100.0) -(line.product_id.standard_price*line.product_uos_qty), 2) return res _columns = { @@ -75,7 +73,7 @@ class stock_picking(osv.osv): _inherit = 'stock.picking' _columns = { - 'invoice_ids': fields.many2many('account.invoice', 'picking_invoice_rel', 'picking_id', 'invoice_id', 'Invoices', domain=[('type','=','out_invoice')]), + 'invoice_ids': fields.many2many('account.invoice', 'picking_invoice_rel', 'picking_id', 'invoice_id', 'Invoices', domain=[('type', '=', 'out_invoice')]), } def create_invoice(self, cr, uid, ids, *args): @@ -86,7 +84,7 @@ class stock_picking(osv.osv): picking_obj.write(cr, uid, ids, {'invoice_state': '2binvoiced'}) res = picking_obj.action_invoice_create(cr, uid, ids, type='out_invoice', context={}) invoice_ids = res.values() - picking_obj.write(cr, uid, ids,{'invoice_ids': [[6,0,invoice_ids]]}) + picking_obj.write(cr, uid, ids, {'invoice_ids': [[6, 0, invoice_ids]]}) return True stock_picking() @@ -109,4 +107,5 @@ class account_invoice_line(osv.osv): return super(account_invoice_line, self).create(cr, uid, vals, context) account_invoice_line() -# 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/sale_mrp/i18n/ru.po b/addons/sale_mrp/i18n/ru.po new file mode 100644 index 00000000000..01899682ff7 --- /dev/null +++ b/addons/sale_mrp/i18n/ru.po @@ -0,0 +1,61 @@ +# Russian 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 <EMAIL@ADDRESS>, 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2010-10-18 17:47+0000\n" +"PO-Revision-Date: 2010-10-26 11:44+0000\n" +"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n" +"Language-Team: Russian <ru@li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n" +"X-Generator: Launchpad (build Unknown)\n" + +#. module: sale_mrp +#: help:mrp.production,sale_ref:0 +msgid "Indicate the Customer Reference from sale order." +msgstr "" + +#. module: sale_mrp +#: help:mrp.production,sale_name:0 +msgid "Indicate the name of sale order." +msgstr "" + +#. module: sale_mrp +#: constraint:ir.ui.view:0 +msgid "Invalid XML for View Architecture!" +msgstr "Неправильный XML для просмотра архитектуры!" + +#. module: sale_mrp +#: constraint:ir.model:0 +msgid "" +"The Object name must start with x_ and not contain any special character !" +msgstr "" +"Название объекта должно начинаться с x_ и не должно содержать специальных " +"символов !" + +#. module: sale_mrp +#: field:mrp.production,sale_name:0 +msgid "Sale Name" +msgstr "Название продажи" + +#. module: sale_mrp +#: model:ir.model,name:sale_mrp.model_mrp_production +msgid "Manufacturing Order" +msgstr "Производственный заказ" + +#. module: sale_mrp +#: field:mrp.production,sale_ref:0 +msgid "Sale Reference" +msgstr "Ссылка на продажу" + +#. module: sale_mrp +#: model:ir.module.module,shortdesc:sale_mrp.module_meta_information +msgid "Sales and MRP Management" +msgstr "Управление продажами и план. произв. рес." diff --git a/addons/sale_mrp/sale_mrp.py b/addons/sale_mrp/sale_mrp.py index c278ef98db1..c11f62a1f03 100644 --- a/addons/sale_mrp/sale_mrp.py +++ b/addons/sale_mrp/sale_mrp.py @@ -62,9 +62,9 @@ class mrp_production(osv.osv): for production in productions: res[production.id] = False if production.move_prod_id: - parent_move_line = get_parent_move(production.move_prod_id) + parent_move_line = get_parent_move(production.move_prod_id.id) if parent_move_line: - move = move_obj.browse(cr,uid,parent_move_line) + move = move_obj.browse(cr, uid, parent_move_line) if field_name == 'name': res[production.id] = move.sale_line_id and move.sale_line_id.order_id.name or False if field_name == 'client_order_ref': @@ -73,7 +73,7 @@ class mrp_production(osv.osv): _columns = { 'sale_name': fields.function(_ref_calc, method=True, multi='sale_name', type='char', string='Sale Name', help='Indicate the name of sale order.'), - 'sale_ref': fields.function(_ref_calc, method=True, multi='sale_ref', type='char', string='Sale Reference', help='Indicate the Customer Reference from sale order.'), + 'sale_ref': fields.function(_ref_calc, method=True, multi='sale_name', type='char', string='Sale Reference', help='Indicate the Customer Reference from sale order.'), } mrp_production() diff --git a/addons/sale_order_dates/sale_order_dates.py b/addons/sale_order_dates/sale_order_dates.py index beca56b838e..2877ba0967d 100644 --- a/addons/sale_order_dates/sale_order_dates.py +++ b/addons/sale_order_dates/sale_order_dates.py @@ -19,7 +19,6 @@ # ############################################################################## -import time from datetime import datetime from dateutil.relativedelta import relativedelta @@ -27,9 +26,8 @@ from osv import fields, osv class sale_order_dates(osv.osv): _inherit = 'sale.order' - _name = 'sale.order' - def _get_effective_date(self, cr, uid, ids, name, arg, context={}): + def _get_effective_date(self, cr, uid, ids, name, arg, context=None): res = {} dates_list = [] for order in self.browse(cr, uid, ids): @@ -39,10 +37,10 @@ class sale_order_dates(osv.osv): if dates_list: res[order.id] = min(dates_list) else: - res[order.id] =False - return res + res[order.id] = False + return res - def _get_commitment_date(self, cr, uid, ids, name, arg, context={}): + def _get_commitment_date(self, cr, uid, ids, name, arg, context=None): res = {} dates_list = [] for order in self.browse(cr, uid, ids): @@ -53,12 +51,12 @@ class sale_order_dates(osv.osv): dates_list.append(dt_s) if dates_list: res[order.id] = min(dates_list) - return res + return res _columns = { - 'commitment_date': fields.function(_get_commitment_date, method=True,store=True, type='date', string='Commitment Date', help="Date on which delivery of products is to be made"), + 'commitment_date': fields.function(_get_commitment_date, method=True, store=True, type='date', string='Commitment Date', help="Date on which delivery of products is to be made"), 'requested_date': fields.date('Requested Date', help="Date on which customer has requested for sales"), - 'effective_date': fields.function(_get_effective_date, method=True, type='date', store=True,string='Effective Date',help="Date on which picking is created"), + 'effective_date': fields.function(_get_effective_date, method=True, type='date', store=True, string='Effective Date',help="Date on which picking is created"), } sale_order_dates() diff --git a/addons/sale_order_dates/sale_order_dates_view.xml b/addons/sale_order_dates/sale_order_dates_view.xml index 5bb53fe52ce..c6544d5238f 100644 --- a/addons/sale_order_dates/sale_order_dates_view.xml +++ b/addons/sale_order_dates/sale_order_dates_view.xml @@ -17,5 +17,6 @@ </field> </field> </record> + </data> -</openerp> +</openerp>
\ No newline at end of file diff --git a/addons/share/wizard/share_wizard.py b/addons/share/wizard/share_wizard.py index 2d1fd252ecf..9349980933f 100644 --- a/addons/share/wizard/share_wizard.py +++ b/addons/share/wizard/share_wizard.py @@ -290,7 +290,7 @@ class share_create(osv.osv_memory): user_obj = self.pool.get('res.users') result_obj = self.pool.get('share.wizard.result.line') share_root_url = wizard_data.share_root_url - format_url = '%(login)' in share_root_url and '%(password)' in share_root_url + format_url = '%(login)s' in share_root_url and '%(password)s' in share_root_url existing_passwd_str = _('*usual password*') if wizard_data.user_type == 'new': for email in wizard_data.new_users.split('\n'): @@ -430,7 +430,7 @@ class share_create(osv.osv_memory): else: body += _("This additional data has been automatically added to your current access.\n") body += _("You may use your existing login and password to view it. As a reminder, your login is %s.\n") % result_line.login - + if not tools.email_send( user.user_email, email_to, diff --git a/addons/share/wizard/share_wizard_view.xml b/addons/share/wizard/share_wizard_view.xml index e6cade91c84..95fbc983c84 100644 --- a/addons/share/wizard/share_wizard_view.xml +++ b/addons/share/wizard/share_wizard_view.xml @@ -90,7 +90,7 @@ - 'action_id' (id of action) - 'domain' (string expression for full domain to apply as sent to server, with dynamic data like 'uid' replaced by actual value (i.e. after eval)!) - - 'share_root_url' : URL for direct access to share page (may include %(login) and %(password) placeholders) + - 'share_root_url' : URL for direct access to share page (may include %(login)s and %(password)s placeholders) --> <record id="action_share_wizard" model="ir.actions.act_window"> <field name="name">Share Wizard</field> @@ -106,7 +106,7 @@ - 'action_id' (id of action) - 'domain' (string expression for full domain to apply as sent to server, with dynamic data like 'uid' replaced by actual value (i.e. after eval)!) - - 'share_root_url' : URL for direct access to share page (may include %(login) and %(password) placeholders) + - 'share_root_url' : URL for direct access to share page (may include %(login)s and %(password)s placeholders) --> <record id="action_share_wizard_step1" model="ir.actions.act_window"> <field name="name">Share Wizard</field> diff --git a/addons/stock/i18n/ru.po b/addons/stock/i18n/ru.po index ad29f1a3d1f..b2c82948d8a 100644 --- a/addons/stock/i18n/ru.po +++ b/addons/stock/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: 2010-10-18 17:47+0000\n" -"PO-Revision-Date: 2010-10-24 15:35+0000\n" +"PO-Revision-Date: 2010-10-26 05:28+0000\n" "Last-Translator: Chertykov Denis <chertykov@gmail.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-10-25 04:38+0000\n" +"X-Launchpad-Export-Date: 2010-10-27 04:58+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: stock @@ -319,7 +319,7 @@ msgstr "Партия изделий" #. module: stock #: help:stock.incoterms,code:0 msgid "Code for Incoterms" -msgstr "" +msgstr "Код ИНКОТЕРМС" #. module: stock #: field:stock.tracking,move_ids:0 diff --git a/addons/survey/wizard/survey_answer.py b/addons/survey/wizard/survey_answer.py index 109f4509d81..8248359a928 100644 --- a/addons/survey/wizard/survey_answer.py +++ b/addons/survey/wizard/survey_answer.py @@ -49,7 +49,7 @@ class survey_question_wiz(osv.osv_memory): @param context: A standard dictionary for contextual values @return : Dictionary value for created view of particular survey pages. """ - + result = super(survey_question_wiz, self).fields_view_get(cr, uid, view_id, \ view_type, context, toolbar,submenu) @@ -61,7 +61,8 @@ class survey_question_wiz(osv.osv_memory): sur_response_obj = self.pool.get('survey.response') que_col_head = self.pool.get('survey.question.column.heading') user_obj = self.pool.get('res.users') - + if context is None: + context = {} if view_type in ['form']: wiz_id = 0 if not context.has_key('sur_name_id'): @@ -82,6 +83,8 @@ class survey_question_wiz(osv.osv_memory): context.pop('active_id') survey_id = context.get('survey_id', False) + if not survey_id: + return {} sur_rec = survey_obj.browse(cr, uid, survey_id) p_id = map(lambda x:x.id, sur_rec.page_ids) total_pages = len(p_id) diff --git a/addons/wiki_faq/i18n/ru.po b/addons/wiki_faq/i18n/ru.po new file mode 100644 index 00000000000..c27b7e82540 --- /dev/null +++ b/addons/wiki_faq/i18n/ru.po @@ -0,0 +1,27 @@ +# Russian 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 <EMAIL@ADDRESS>, 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2010-10-18 17:47+0000\n" +"PO-Revision-Date: 2010-10-26 08:56+0000\n" +"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n" +"Language-Team: Russian <ru@li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2010-10-27 04:59+0000\n" +"X-Generator: Launchpad (build Unknown)\n" + +#. module: wiki_faq +#: model:ir.module.module,description:wiki_faq.module_meta_information +msgid "" +"This module provides a wiki FAQ Template\n" +" " +msgstr "" +"Этот модуль предоставляет шаблон ЧаВо\n" +" " |