[MERGE] from trunk

bzr revid: rco@openerp.com-20110523111405-3hvhfaelqxg7d4yn

addons/account/account.py

@@ -102,7 +102,7 @@ class account_payment_term_line(osv.osv):
                                    ('fixed', 'Fixed Amount')], 'Valuation',
                                    required=True, help="""Select here the kind of valuation related to this payment term line. Note that you should have your last line with the type 'Balance' to ensure that the whole amount will be threated."""),
 
-        'value_amount': fields.float('Value Amount', help="For Value percent enter % ratio between 0-1."),
+        'value_amount': fields.float('Value Amount', digits_compute=dp.get_precision('Payment Term'), help="For Value percent enter % ratio between 0-1."),
         'days': fields.integer('Number of Days', required=True, help="Number of days to add before computation of the day of month." \
             "If Date=15/01, Number of Days=22, Day of Month=-1, then the due date is 28/02."),
         'days2': fields.integer('Day of the Month', required=True, help="Day of the month, set -1 for the last day of the current month. If it's positive, it gives the day of the next month. Set 0 for net days (otherwise it's based on the beginning of the month)."),
@@ -879,7 +879,7 @@ class account_period(osv.osv):
     _defaults = {
         'state': 'draft',
     }
-    _order = "date_start"
+    _order = "date_start, special desc"
 
     def _check_duration(self,cr,uid,ids,context=None):
         obj_period = self.browse(cr, uid, ids[0], context=context)
@@ -926,9 +926,8 @@ class account_period(osv.osv):
 
     def action_draft(self, cr, uid, ids, *args):
         mode = 'draft'
-        for id in ids:
-            cr.execute('update account_journal_period set state=%s where period_id=%s', (mode, id))
-            cr.execute('update account_period set state=%s where id=%s', (mode, id))
+        cr.execute('update account_journal_period set state=%s where period_id in %s', (mode, tuple(ids),))
+        cr.execute('update account_period set state=%s where id in %s', (mode, tuple(ids),))
         return True
 
     def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=100):
@@ -961,7 +960,10 @@ class account_period(osv.osv):
             raise osv.except_osv(_('Error'), _('You should have chosen periods that belongs to the same company'))
         if period_date_start > period_date_stop:
             raise osv.except_osv(_('Error'), _('Start period should be smaller then End period'))
-        return self.search(cr, uid, [('date_start', '>=', period_date_start), ('date_stop', '<=', period_date_stop), ('company_id', '=', company1_id)])
+        #for period from = january, we want to exclude the opening period (but it has same date_from, so we have to check if period_from is special or not to include that clause or not in the search).
+        if period_from.special:
+            return self.search(cr, uid, [('date_start', '>=', period_date_start), ('date_stop', '<=', period_date_stop), ('company_id', '=', company1_id)])
+        return self.search(cr, uid, [('date_start', '>=', period_date_start), ('date_stop', '<=', period_date_stop), ('company_id', '=', company1_id), ('special', '=', False)])
 
 account_period()
 
@@ -1562,14 +1564,15 @@ class account_tax_code(osv.osv):
                        (parent_ids,) + where_params)
         res=dict(cr.fetchall())
         obj_precision = self.pool.get('decimal.precision')
+        res2 = {} 
         for record in self.browse(cr, uid, ids, context=context):
             def _rec_get(record):
                 amount = res.get(record.id, 0.0)
                 for rec in record.child_ids:
                     amount += _rec_get(rec) * rec.sign
                 return amount
-            res[record.id] = round(_rec_get(record), obj_precision.precision_get(cr, uid, 'Account'))
-        return res
+            res2[record.id] = round(_rec_get(record), obj_precision.precision_get(cr, uid, 'Account'))
+        return res2
 
     def _sum_year(self, cr, uid, ids, name, args, context=None):
         if context is None:
@@ -2659,8 +2662,6 @@ class wizard_multi_charts_accounts(osv.osv_memory):
 
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
         res = super(wizard_multi_charts_accounts, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
-        configured_cmp = []
-        unconfigured_cmp = []
         cmp_select = []
         company_ids = self.pool.get('res.company').search(cr, uid, [], context=context)
         #display in the widget selection of companies, only the companies that haven't been configured yet (but don't care about the demo chart of accounts)
@@ -2668,12 +2669,12 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         configured_cmp = [r[0] for r in cr.fetchall()]
         unconfigured_cmp = list(set(company_ids)-set(configured_cmp))
         for field in res['fields']:
-           if field == 'company_id':
-               res['fields'][field]['domain'] = unconfigured_cmp
-               res['fields'][field]['selection'] = [('', '')]
-               if unconfigured_cmp:
-                   cmp_select = [(line.id, line.name) for line in self.pool.get('res.company').browse(cr, uid, unconfigured_cmp)]
-                   res['fields'][field]['selection'] = cmp_select
+            if field == 'company_id':
+                res['fields'][field]['domain'] = unconfigured_cmp
+                res['fields'][field]['selection'] = [('', '')]
+                if unconfigured_cmp:
+                    cmp_select = [(line.id, line.name) for line in self.pool.get('res.company').browse(cr, uid, unconfigured_cmp)]
+                    res['fields'][field]['selection'] = cmp_select
         return res
 
     def execute(self, cr, uid, ids, context=None):
@@ -2681,7 +2682,6 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         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_template = self.pool.get('account.account.template')
         obj_fiscal_position_template = self.pool.get('account.fiscal.position.template')
         obj_fiscal_position = self.pool.get('account.fiscal.position')
@@ -2689,9 +2689,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         analytic_journal_obj = self.pool.get('account.analytic.journal')
         obj_tax_code = self.pool.get('account.tax.code')
         obj_tax_code_template = self.pool.get('account.tax.code.template')
-        obj_acc_journal_view = self.pool.get('account.journal.view')
-        ir_values = self.pool.get('ir.values')
-        obj_product = self.pool.get('product.product')
+        ir_values_obj = self.pool.get('ir.values')
         # Creating Account
         obj_acc_root = obj_multi.chart_template_id.account_root_id
         tax_code_root_id = obj_multi.chart_template_id.tax_code_root_id.id
@@ -2924,15 +2922,20 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         ref_acc_bank = obj_multi.chart_template_id.bank_account_view_id
 
         current_num = 1
+        valid = True
         for line in obj_multi.bank_accounts_id:
             #create the account_account for this bank journal
             tmp = line.acc_name
             dig = obj_multi.code_digits
-            if ref_acc_bank.code:
-                try:
-                    new_code = str(int(ref_acc_bank.code.ljust(dig,'0')) + current_num)
-                except:
-                    new_code = str(ref_acc_bank.code.ljust(dig-len(str(current_num)),'0')) + str(current_num)
+            if not ref_acc_bank.code:
+                raise osv.except_osv(_('Configuration Error !'), _('The bank account defined on the selected chart of account hasn\'t a code.'))
+            while True:
+                new_code = str(ref_acc_bank.code.ljust(dig-len(str(current_num)), '0')) + str(current_num)
+                ids = obj_acc.search(cr, uid, [('code', '=', new_code), ('company_id', '=', company_id)])
+                if not ids:
+                    break
+                else:
+                    current_num += 1
             vals = {
                 'name': tmp,
                 'currency_id': line.currency_id and line.currency_id.id or False,
@@ -2946,8 +2949,6 @@ class wizard_multi_charts_accounts(osv.osv_memory):
             acc_cash_id  = obj_acc.create(cr,uid,vals)
 
             #create the bank journal
-            analytical_bank_ids = analytic_journal_obj.search(cr,uid,[('type','=','situation')])
-            analytical_journal_bank = analytical_bank_ids and analytical_bank_ids[0] or False
             vals_journal = {
                 'name': vals['name'],
                 'code': _('BNK') + str(current_num),
@@ -2965,6 +2966,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
             vals_journal['default_debit_account_id'] = acc_cash_id
             obj_journal.create(cr, uid, vals_journal)
             current_num += 1
+            valid = True
 
         #create the properties
         property_obj = self.pool.get('ir.property')
@@ -3029,10 +3031,10 @@ class wizard_multi_charts_accounts(osv.osv_memory):
                     obj_ac_fp.create(cr, uid, vals_acc)
 
         if obj_multi.sale_tax:
-            ir_values.set(cr, uid, key='default', key2=False, name="taxes_id", company=obj_multi.company_id.id,
+            ir_values_obj.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,
+            ir_values_obj.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()

addons/account/account_invoice_view.xml

@@ -123,6 +123,7 @@
                     <field name="date_invoice"/>
                     <field name="number"/>
                     <field name="partner_id" groups="base.group_user"/>
+                    <field name="reference" invisible="1"/>
                     <field name="name"/>
                     <field name="journal_id" invisible="1"/>
                     <field name="period_id" invisible="1" groups="account.group_account_user"/>
@@ -377,6 +378,10 @@
                         <field name="period_id" select='1' string="Period"/>
                     </group>
                     <newline/>
+                    <group expand="0" string="Extended Filters..." name = "extended filter" >
+                        <field name="reference" select="1" string="Invoice Reference"/>
+                    </group>
+                    <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Responsible" icon="terp-personal" domain="[]"  context="{'group_by':'user_id'}"/>

addons/account/account_move_line.py

@@ -68,7 +68,6 @@ class account_move_line(osv.osv):
         if state:
             if state.lower() not in ['all']:
                 where_move_state= " AND "+obj+".move_id IN (SELECT id FROM account_move WHERE account_move.state = '"+state+"')"
-
         if context.get('period_from', False) and context.get('period_to', False) and not context.get('periods', False):
             if initial_bal:
                 period_company_id = fiscalperiod_obj.browse(cr, uid, context['period_from'], context=context).company_id.id
@@ -82,17 +81,20 @@ class account_move_line(osv.osv):
                 period_ids = fiscalperiod_obj.search(cr, uid, [('id', 'in', context['periods'])], order='date_start', limit=1)
                 if period_ids and period_ids[0]:
                     first_period = fiscalperiod_obj.browse(cr, uid, period_ids[0], context=context)
-                    # Find the old periods where date start of those periods less then Start period
-                    periods = fiscalperiod_obj.search(cr, uid, [('date_start', '<', first_period.date_start)])
-                    periods = ','.join([str(x) for x in periods])
-                    if periods:
-                        query = obj+".state <> 'draft' AND "+obj+".period_id IN (SELECT id FROM account_period WHERE fiscalyear_id IN (%s) AND id IN (%s)) %s %s" % (fiscalyear_clause, periods, where_move_state, where_move_lines_by_date)
+                    ids = ','.join([str(x) for x in context['periods']])
+                    query = obj+".state <> 'draft' AND "+obj+".period_id IN (SELECT id FROM account_period WHERE fiscalyear_id IN (%s) AND date_start <= '%s' AND id NOT IN (%s)) %s %s" % (fiscalyear_clause, first_period.date_start, ids, where_move_state, where_move_lines_by_date)
             else:
                 ids = ','.join([str(x) for x in context['periods']])
                 query = obj+".state <> 'draft' AND "+obj+".period_id IN (SELECT id FROM account_period WHERE fiscalyear_id IN (%s) AND id IN (%s)) %s %s" % (fiscalyear_clause, ids, where_move_state, where_move_lines_by_date)
         else:
             query = obj+".state <> 'draft' AND "+obj+".period_id IN (SELECT id FROM account_period WHERE fiscalyear_id IN (%s)) %s %s" % (fiscalyear_clause, where_move_state, where_move_lines_by_date)
 
+        if initial_bal and not context.get('periods', False) and not where_move_lines_by_date:
+            #we didn't pass any filter in the context, and the initial balance can't be computed using only the fiscalyear otherwise entries will be summed twice
+            #so we have to invalidate this query
+            raise osv.except_osv(_('Warning !'),_("You haven't supplied enough argument to compute the initial balance"))
+
+
         if context.get('journal_ids', False):
             query += ' AND '+obj+'.journal_id IN (%s)' % ','.join(map(str, context['journal_ids']))
 

addons/account/data/account_data2.xml

@@ -21,7 +21,10 @@
             <field eval="-1" name="days2"/>
             <field eval="account_payment_term" name="payment_id"/>
         </record>
-
+        <record forcecreate="True" id="decimal_payment" model="decimal.precision">
+            <field name="name">Payment Term</field>
+            <field name="digits">6</field>
+        </record>
         <!--
         Account Journal View
         -->

addons/account/i18n/pt_BR.po

@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-05-01 19:01+0000\n"
+"PO-Revision-Date: 2011-05-04 03:16+0000\n"
 "Last-Translator: Emerson <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: 2011-05-02 04:37+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-05-05 04:40+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -5759,7 +5759,7 @@ msgstr ""
 #: code:addons/account/invoice.py:997
 #, python-format
 msgid "Invoice  '%s' is validated."
-msgstr ""
+msgstr "A fatura '%s' está validada."
 
 #. module: account
 #: view:account.chart.template:0
@@ -7119,6 +7119,9 @@ msgid ""
 "will be added, Loss : Amount will be deducted.), Which is calculated from "
 "Profit & Loss Report"
 msgstr ""
+"Essa conta é usada para a transferência de Lucro/Perdas (se for lucro: O "
+"valor será adicionado, Perda: O valor será deduzido), que é calculado a "
+"partir de Relatório de Lucos e Perdas"
 
 #. module: account
 #: view:account.invoice.line:0
@@ -8042,6 +8045,10 @@ msgid ""
 "sales orders or deliveries. You should only confirm them before sending them "
 "to your customers."
 msgstr ""
+"Com as Faturas de Clientes você pode criar e gerenciar notas de vendas "
+"emitidas para seus clientes. O OpenERP pode também gerar faturas provisórias "
+"automaticamente a partir de pedidos de venda ou entregas. Você deve apenas "
+"confirma-las antes de enviar para os seus clientes."
 
 #. module: account
 #: view:account.entries.report:0
@@ -8087,7 +8094,7 @@ msgstr "Subtotal"
 #. module: account
 #: view:account.vat.declaration:0
 msgid "Print Tax Statement"
-msgstr ""
+msgstr "Imprimir Declaração de Imposto"
 
 #. module: account
 #: view:account.model.line:0
@@ -8436,6 +8443,9 @@ msgid ""
 "the amount of this case into its parent. For example, set 1/-1 if you want "
 "to add/substract it."
 msgstr ""
+"Você pode especificar o coeficiente que será usado para consolidação do "
+"valor desta taxa no seu item pai. Por exemplo, defina 1/-1 se quiser "
+"adicionar/subtrair o valor."
 
 #. module: account
 #: view:account.invoice:0
@@ -8832,6 +8842,12 @@ msgid ""
 "closed or left open depending on your company's activities over a specific "
 "period."
 msgstr ""
+"Aqui você pode definir um período financeiro, ou seja, um intervalo de tempo "
+"no ano fiscal da sua empresa. Um período contábil é normalmente um mês ou um "
+"quadrimestre. Ele geralmente corresponde ao período de declaração de "
+"impostos. Crie e administre os períodos a partir daqui e decida se um "
+"período deve ser fechado ou deixado aberto dependendo das atividades da sua "
+"empresa sobre um período específico."
 
 #. module: account
 #: report:account.move.voucher:0
@@ -9512,7 +9528,7 @@ msgstr "JNRL"
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  value amount: 0.02"
-msgstr ""
+msgstr "  valor total: 0.02"
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -9606,7 +9622,7 @@ msgstr "Criar períodos mensais"
 #. module: account
 #: field:account.tax.code.template,sign:0
 msgid "Sign For Parent"
-msgstr ""
+msgstr "Sinal Para o Pai"
 
 #. module: account
 #: model:ir.model,name:account.model_account_balance_report
@@ -9623,6 +9639,8 @@ msgstr "Demonstrativos provisórios"
 msgid ""
 "Manual or automatic creation of payment entries according to the statements"
 msgstr ""
+"Criação manual ou automática dos lançamentos de pagamento de acordo com a "
+"declaração"
 
 #. module: account
 #: view:account.invoice:0

addons/account/i18n/vi.po

@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-01-19 21:51+0000\n"
+"PO-Revision-Date: 2011-05-04 19:28+0000\n"
 "Last-Translator: Phong Nguyen-Thanh <Unknown>\n"
 "Language-Team: Vietnamese <vi@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: 2011-04-29 05:12+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-05-05 04:39+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -2923,7 +2923,7 @@ msgstr "View"
 #: code:addons/account/account.py:2951
 #, python-format
 msgid "BNK%s"
-msgstr ""
+msgstr "BNK%s"
 
 #. module: account
 #: code:addons/account/account.py:2906
@@ -3904,7 +3904,7 @@ msgstr "Tháng"
 #. module: account
 #: field:account.invoice.report,uom_name:0
 msgid "Reference UoM"
-msgstr ""
+msgstr "ĐVĐ Tham chiếu"
 
 #. module: account
 #: field:account.account,note:0
@@ -5673,7 +5673,7 @@ msgstr ""
 #: code:addons/account/invoice.py:997
 #, python-format
 msgid "Invoice  '%s' is validated."
-msgstr ""
+msgstr "Hóa đơn  '%s' đã được kiểm tra."
 
 #. module: account
 #: view:account.chart.template:0
@@ -9759,7 +9759,7 @@ msgstr "Các báo cáo thống kê"
 #: field:account.installer.modules,progress:0
 #: field:wizard.multi.charts.accounts,progress:0
 msgid "Configuration Progress"
-msgstr "Configuration Progress"
+msgstr "Tiến trình cấu hình"
 
 #. module: account
 #: view:account.fiscal.position.template:0
@@ -9770,7 +9770,7 @@ msgstr "Accounts Mapping"
 #: code:addons/account/invoice.py:346
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
-msgstr "Invoice '%s' is waiting for validation."
+msgstr "Hóa đơn '%s' đang chờ kiểm tra."
 
 #. module: account
 #: selection:account.entries.report,month:0

addons/account/installer.py

@@ -90,8 +90,6 @@ class account_installer(osv.osv_memory):
 
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
         res = super(account_installer, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
-        configured_cmp = []
-        unconfigured_cmp = []
         cmp_select = []
         company_ids = self.pool.get('res.company').search(cr, uid, [], context=context)
         #display in the widget selection of companies, only the companies that haven't been configured yet (but don't care about the demo chart of accounts)
@@ -99,12 +97,12 @@ class account_installer(osv.osv_memory):
         configured_cmp = [r[0] for r in cr.fetchall()]
         unconfigured_cmp = list(set(company_ids)-set(configured_cmp))
         for field in res['fields']:
-           if field == 'company_id':
-               res['fields'][field]['domain'] = unconfigured_cmp
-               res['fields'][field]['selection'] = [('', '')]
-               if unconfigured_cmp:
-                   cmp_select = [(line.id, line.name) for line in self.pool.get('res.company').browse(cr, uid, unconfigured_cmp)]
-                   res['fields'][field]['selection'] = cmp_select
+            if field == 'company_id':
+                res['fields'][field]['domain'] = unconfigured_cmp
+                res['fields'][field]['selection'] = [('', '')]
+                if unconfigured_cmp:
+                    cmp_select = [(line.id, line.name) for line in self.pool.get('res.company').browse(cr, uid, unconfigured_cmp)]
+                    res['fields'][field]['selection'] = cmp_select
         return res
 
     def on_change_tax(self, cr, uid, id, tax):
@@ -126,11 +124,8 @@ class account_installer(osv.osv_memory):
         obj_acc_temp = self.pool.get('account.account.template')
         obj_tax_code_temp = self.pool.get('account.tax.code.template')
         obj_tax_temp = self.pool.get('account.tax.template')
-        obj_product = self.pool.get('product.product')
-        ir_values = self.pool.get('ir.values')
         obj_acc_chart_temp = self.pool.get('account.chart.template')
         record = self.browse(cr, uid, ids, context=context)[0]
-        company_id = record.company_id
         for res in self.read(cr, uid, ids, context=context):
             if record.charts == 'configurable':
                 fp = tools.file_open(opj('account', 'configurable_account_chart.xml'))

addons/account/invoice.py

@@ -312,13 +312,20 @@ class account_invoice(osv.osv):
                 journal_select = journal_obj._name_search(cr, uid, '', [('type', '=', type)], context=context, limit=None, name_get_uid=1)
                 res['fields'][field]['selection'] = journal_select
 
+        doc = etree.XML(res['arch'])
+        if view_type == 'search':
+            if context.get('type', 'in_invoice') in ('out_invoice', 'out_refund'):
+                for node in doc.xpath("//group[@name='extended filter']"):
+                    doc.remove(node)
+            res['arch'] = etree.tostring(doc)
+
         if view_type == 'tree':
-            doc = etree.XML(res['arch'])
-            nodes = doc.xpath("//field[@name='partner_id']")
             partner_string = _('Customer')
             if context.get('type', 'out_invoice') in ('in_invoice', 'in_refund'):
                 partner_string = _('Supplier')
-            for node in nodes:
+                for node in doc.xpath("//field[@name='reference']"):
+                    node.set('invisible', '0')
+            for node in doc.xpath("//field[@name='partner_id']"):
                 node.set('string', partner_string)
             res['arch'] = etree.tostring(doc)
         return res
@@ -542,7 +549,8 @@ class account_invoice(osv.osv):
             journal_ids = obj_journal.search(cr, uid, [('company_id','=',company_id), ('type', '=', journal_type)])
             if journal_ids:
                 val['journal_id'] = journal_ids[0]
-            res_journal_default = self.pool.get('ir.values').get(cr, uid, 'default', 'type=%s' % (type), ['account.invoice'])
+            ir_values_obj = self.pool.get('ir.values')
+            res_journal_default = ir_values_obj.get(cr, uid, 'default', 'type=%s' % (type), ['account.invoice'])
             for r in res_journal_default:
                 if r[1] == 'journal_id' and r[2] in journal_ids:
                     val['journal_id'] = r[2]
@@ -1258,7 +1266,7 @@ class account_invoice_line(osv.osv):
                     t = t - (p * l[2].get('quantity'))
                     taxes = l[2].get('invoice_line_tax_id')
                     if len(taxes[0]) >= 3 and taxes[0][2]:
-                        taxes = tax_obj.browse(cr, uid, taxes[0][2])
+                        taxes = tax_obj.browse(cr, uid, list(taxes[0][2]))
                         for tax in tax_obj.compute_all(cr, uid, taxes, p,l[2].get('quantity'), context.get('address_invoice_id', False), l[2].get('product_id', False), context.get('partner_id', False))['taxes']:
                             t = t - tax['amount']
             return t
@@ -1609,17 +1617,17 @@ class res_partner(osv.osv):
     _columns = {
         'invoice_ids': fields.one2many('account.invoice.line', 'partner_id', 'Invoices', readonly=True),
     }
-    
+
     def copy(self, cr, uid, id, default=None, context=None):
         if default is None:
             default = {}
-            
+
         if context is None:
-            context = {}   
-             
+            context = {}
+
         default.update({'invoice_ids' : []})
         return super(res_partner, self).copy(cr, uid, id, default, context)
-      
+
 res_partner()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account/project/wizard/account_analytic_balance_report.py

@@ -38,7 +38,6 @@ class account_analytic_balance(osv.osv_memory):
     }
 
     def check_report(self, cr, uid, ids, context=None):
-        datas = {}
         if context is None:
             context = {}
         data = self.read(cr, uid, ids)[0]

addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report.py

@@ -38,7 +38,6 @@ class account_analytic_cost_ledger_journal_report(osv.osv_memory):
     }
 
     def check_report(self, cr, uid, ids, context=None):
-        datas = {}
         if context is None:
             context = {}
         data = self.read(cr, uid, ids)[0]

addons/account/project/wizard/account_analytic_cost_ledger_report.py

@@ -37,7 +37,6 @@ class account_analytic_cost_ledger(osv.osv_memory):
     }
 
     def check_report(self, cr, uid, ids, context=None):
-        datas = {}
         if context is None:
             context = {}
         data = self.read(cr, uid, ids)[0]

addons/account/project/wizard/account_analytic_inverted_balance_report.py

@@ -37,7 +37,6 @@ class account_analytic_inverted_balance(osv.osv_memory):
     }
 
     def check_report(self, cr, uid, ids, context=None):
-        datas = {}
         if context is None:
             context = {}
         data = self.read(cr, uid, ids)[0]

addons/account/project/wizard/account_analytic_journal_report.py

@@ -37,7 +37,6 @@ class account_analytic_journal_report(osv.osv_memory):
     }
 
     def check_report(self, cr, uid, ids, context=None):
-        datas = {}
         if context is None:
             context = {}
         data = self.read(cr, uid, ids)[0]

addons/account/project/wizard/project_account_analytic_line.py

@@ -22,36 +22,36 @@ from osv import fields, osv
 from tools.translate import _
 
 class project_account_analytic_line(osv.osv_memory):
-     _name = "project.account.analytic.line"
-     _description = "Analytic Entries by line"
-     _columns = {
-         'from_date': fields.date('From'),
+    _name = "project.account.analytic.line"
+    _description = "Analytic Entries by line"
+    _columns = {
+        'from_date': fields.date('From'),
          'to_date': fields.date('To'),
-     }
+    }
 
-     def action_open_window(self, cr, uid, ids, context=None):
-          mod_obj =self.pool.get('ir.model.data')
-          domain = []
-          data = self.read(cr, uid, ids, [])[0]
-          from_date = data['from_date']
-          to_date = data['to_date']
-          if from_date and to_date:
-                domain = [('date','>=',from_date), ('date','<=',to_date)]
-          elif from_date:
-                domain = [('date','>=',from_date)]
-          elif to_date:
-                domain = [('date','<=',to_date)]
-          result = mod_obj.get_object_reference(cr, uid, 'account', 'view_account_analytic_line_filter')
-          id = result and result[1] or False
-          return {
-                'name': _('Analytic Entries by line'),
-                'view_type': 'form',
-                "view_mode": 'tree,form',
-                'res_model': 'account.analytic.line',
-                'type': 'ir.actions.act_window',
-                'domain': domain,
-                'search_view_id': id['res_id'],
-                }
+    def action_open_window(self, cr, uid, ids, context=None):
+        mod_obj =self.pool.get('ir.model.data')
+        domain = []
+        data = self.read(cr, uid, ids, [])[0]
+        from_date = data['from_date']
+        to_date = data['to_date']
+        if from_date and to_date:
+            domain = [('date','>=',from_date), ('date','<=',to_date)]
+        elif from_date:
+            domain = [('date','>=',from_date)]
+        elif to_date:
+            domain = [('date','<=',to_date)]
+        result = mod_obj.get_object_reference(cr, uid, 'account', 'view_account_analytic_line_filter')
+        id = result and result[1] or False
+        return {
+              'name': _('Analytic Entries by line'),
+              'view_type': 'form',
+              "view_mode": 'tree,form',
+              'res_model': 'account.analytic.line',
+              'type': 'ir.actions.act_window',
+              'domain': domain,
+              'search_view_id': id['res_id'],
+              }
 
 project_account_analytic_line()
 

addons/account/report/account_balance_landscape.py

@@ -98,7 +98,6 @@ class account_balance_landscape(report_sxw.rml_parse):
             ref_bal='nothing'
 
 
-        total_for_perc=[]
         self.done_total=1
         self.total_for_perc=self.linesForTotal(form, ids={}, doneAccount={}, level=1)
         self.done_total=0
@@ -116,9 +115,7 @@ class account_balance_landscape(report_sxw.rml_parse):
 
 
     def linesForTotal(self, form, ids={}, doneAccount={}, level=1):
-        if self.done_total==1:
-            self.done_total==1
-        else:
+        if not self.done_total==1:
             return [self.result_total]
         accounts=[]
         if not ids:
@@ -127,7 +124,6 @@ class account_balance_landscape(report_sxw.rml_parse):
             return []
 
         ctx = self.context.copy()
-        result_total_parent=[]
 
         for id in form['fiscalyear']:
             tmp=[]
@@ -142,7 +138,7 @@ class account_balance_landscape(report_sxw.rml_parse):
                 accounts.append(tmp)
 
         merged_accounts=zip(*accounts)
-         # used to check for the frst record so all sum_credit and sum_debit r set to 0.00
+        # used to check for the frst record so all sum_credit and sum_debit r set to 0.00
         if level==1:
             doneAccount={}
         for entry in merged_accounts:
@@ -345,7 +341,6 @@ class account_balance_landscape(report_sxw.rml_parse):
 
     def get_lines(self, year_dict, form):
         final_result = []
-        line_l =[]
         res = {}
         line_l = self.lines(form)
         self.cal_total(year_dict)
@@ -357,21 +352,21 @@ class account_balance_landscape(report_sxw.rml_parse):
                 res['level'] = l['level']
                 for k,v in l.items():
                     if k.startswith('debit'+str(year_dict['last_str'])):
-                     res['debit'] = v
+                        res['debit'] = v
                     if k.startswith('credit'+str(year_dict['last_str'])):
-                     res['credit'] = v
+                        res['credit'] = v
                     if k.startswith('balance'+str(year_dict['last_str'])) and not k.startswith('balance_perc'+str(year_dict['last_str'])):
-                     res['balance'] =v
+                        res['balance'] =v
                     if k.startswith('balance_perc'+str(year_dict['last_str'])) and not k.startswith('balance'+str(year_dict['last_str'])):
-                     res['balance_perc'] = v
+                        res['balance_perc'] = v
                     if form['compare_pattern'] == 'bal_perc':
                         if k.startswith('bal_perc'+str(year_dict['last_str'])):
-                         res['pattern'] = v
+                            res['pattern'] = v
                     elif form['compare_pattern'] == 'bal_cash':
                         if k.startswith('bal_cash'+str(year_dict['last_str'])):
-                         res['pattern'] = v
+                            res['pattern'] = v
                     else:
-                         res['pattern'] = ''
+                        res['pattern'] = ''
                 final_result.append(res)
         return final_result
 

addons/account/report/account_balance_sheet.py

@@ -214,4 +214,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:

addons/account/report/account_general_ledger.py

@@ -40,9 +40,10 @@ class general_ledger(report_sxw.rml_parse, common_report_header):
         self.sortby = data['form'].get('sortby', 'sort_date')
         self.query = obj_move._query_get(self.cr, self.uid, obj='l', context=data['form'].get('used_context',{}))
         ctx2 = data['form'].get('used_context',{}).copy()
-        ctx2.update({'initial_bal': True})
+        self.init_balance = data['form'].get('initial_balance', True)
+        if self.init_balance:
+            ctx2.update({'initial_bal': True})
         self.init_query = obj_move._query_get(self.cr, self.uid, obj='l', context=ctx2)
-        self.init_balance = data['form']['initial_balance']
         self.display_account = data['form']['display_account']
         self.target_move = data['form'].get('target_move', 'all')
         ctx = self.context.copy()

addons/account/report/account_invoice_report.py

@@ -47,7 +47,6 @@ class account_invoice_report(osv.osv):
         'company_id': fields.many2one('res.company', 'Company', readonly=True),
         'user_id': fields.many2one('res.users', 'Salesman', readonly=True),
         'price_total': fields.float('Total Without Tax', readonly=True),
-        'price_total_tax': fields.float('Total With Tax', readonly=True),
         'price_average': fields.float('Average Price', readonly=True, group_operator="avg"),
         'currency_rate': fields.float('Currency Rate', readonly=True),
         'nbr':fields.integer('# of Lines', readonly=True),
@@ -69,6 +68,7 @@ class account_invoice_report(osv.osv):
         'address_contact_id': fields.many2one('res.partner.address', 'Contact Address Name', readonly=True),
         'address_invoice_id': fields.many2one('res.partner.address', 'Invoice Address Name', readonly=True),
         'account_id': fields.many2one('account.account', 'Account',readonly=True),
+        'account_line_id': fields.many2one('account.account', 'Account Line',readonly=True),
         'partner_bank_id': fields.many2one('res.partner.bank', 'Bank Account',readonly=True),
         'residual': fields.float('Total Residual', readonly=True),
         'delay_to_pay': fields.float('Avg. Delay To Pay', readonly=True, group_operator="avg"),
@@ -89,7 +89,7 @@ class account_invoice_report(osv.osv):
                     ai.payment_term as payment_term,
                     ai.period_id as period_id,
                     (case when u.uom_type not in ('reference') then
-                        (select name from product_uom where uom_type='reference' and category_id=u.category_id)
+                        (select name from product_uom where uom_type='reference' and active and category_id=u.category_id LIMIT 1)
                     else
                         u.name
                     end) as uom_name,
@@ -106,44 +106,30 @@ class account_invoice_report(osv.osv):
                     ai.address_contact_id as address_contact_id,
                     ai.address_invoice_id as address_invoice_id,
                     ai.account_id as account_id,
+                    ail.account_id as account_line_id,
                     ai.partner_bank_id as partner_bank_id,
                     sum(case when ai.type in ('out_refund','in_invoice') then
-                         ail.quantity / u.factor * -1
+                         -ail.quantity / u.factor
                         else
                          ail.quantity / u.factor
                         end) as product_qty,
+
                     sum(case when ai.type in ('out_refund','in_invoice') then
-                         ail.quantity*ail.price_unit * -1
+                         -ail.price_subtotal
                         else
-                         ail.quantity*ail.price_unit
+                          ail.price_subtotal
                         end) / cr.rate as price_total,
-                    sum(case when ai.type in ('out_refund','in_invoice') then
-                         ai.amount_total * -1
-                        else
-                         ai.amount_total
-                         end) / (CASE WHEN 
-                              (select count(l.id) from account_invoice_line as l
-                               left join account_invoice as a ON (a.id=l.invoice_id)
-                               where a.id=ai.id) <> 0 
-                            THEN 
-                              (select count(l.id) from account_invoice_line as l
-                               left join account_invoice as a ON (a.id=l.invoice_id)
-                               where a.id=ai.id) 
-                            ELSE 1 
-                            END) / cr.rate as price_total_tax,
+
                     (case when ai.type in ('out_refund','in_invoice') then
-                      sum(ail.quantity*ail.price_unit*-1)
+                      sum(-ail.price_subtotal)
                     else
-                      sum(ail.quantity*ail.price_unit)
-                    end) / (CASE WHEN
-                         (case when ai.type in ('out_refund','in_invoice') 
-                          then sum(ail.quantity/u.factor*-1)
-                          else sum(ail.quantity/u.factor) end) <> 0 
-                       THEN 
-                         (case when ai.type in ('out_refund','in_invoice') 
-                          then sum(ail.quantity/u.factor*-1)
-                          else sum(ail.quantity/u.factor) end) 
-                       ELSE 1 
+                      sum(ail.price_subtotal)
+                    end) / (CASE WHEN sum(ail.quantity/u.factor) <> 0
+                       THEN
+                         (case when ai.type in ('out_refund','in_invoice')
+                          then sum(-ail.quantity/u.factor)
+                          else sum(ail.quantity/u.factor) end)
+                       ELSE 1
                        END)
                      / cr.rate as price_average,
 
@@ -159,22 +145,23 @@ class account_invoice_report(osv.osv):
                         left join account_invoice_line as l ON (a.id=l.invoice_id)
                         where a.id=ai.id)) as due_delay,
                     (case when ai.type in ('out_refund','in_invoice') then
-                      ai.residual * -1
+                      -ai.residual
                     else
                       ai.residual
-                    end)/ (CASE WHEN 
+                    end)/ (CASE WHEN
                         (select count(l.id) from account_invoice_line as l
                          left join account_invoice as a ON (a.id=l.invoice_id)
-                         where a.id=ai.id) <> 0 
+                         where a.id=ai.id) <> 0
                        THEN
                         (select count(l.id) from account_invoice_line as l
                          left join account_invoice as a ON (a.id=l.invoice_id)
-                         where a.id=ai.id) 
-                       ELSE 1 
+                         where a.id=ai.id)
+                       ELSE 1
                        END) / cr.rate as residual
                 from account_invoice_line as ail
                 left join account_invoice as ai ON (ai.id=ail.invoice_id)
-                left join product_template pt on (pt.id=ail.product_id)
+                left join product_product pr on (pr.id=ail.product_id)
+                left join product_template pt on (pt.id=pr.product_tmpl_id)
                 left join product_uom u on (u.id=ail.uos_id),
                 res_currency_rate cr
                 where cr.id in (select id from res_currency_rate cr2  where (cr2.currency_id = ai.currency_id)
@@ -202,6 +189,7 @@ class account_invoice_report(osv.osv):
                     ai.address_contact_id,
                     ai.address_invoice_id,
                     ai.account_id,
+                    ail.account_id,
                     ai.partner_bank_id,
                     ai.residual,
                     ai.amount_total,

addons/account/report/account_invoice_report_view.xml

@@ -27,12 +27,11 @@
                 <field name="partner_bank_id" invisible="1"/>
                 <field name="date_due" invisible="1"/>
                 <field name="account_id" invisible="1"/>
+                <field name="account_line_id" invisible="1"/>
                 <field name="nbr" sum="# of Lines"/>
                 <field name="product_qty" sum="Qty"/>
                 <!-- <field name="reconciled"  sum="# Reconciled"/> -->
-                <field name="price_average" sum="Average Price"/>
                 <field name="price_total" sum="Total Without Tax"/>
-                <field name="price_total_tax" sum="Total With Tax"/>
                 <field name="residual"  sum="Total Residual" invisible="context.get('residual_invisible',False)"/>
                 <field name="due_delay"  sum="Avg. Due Delay" invisible="context.get('residual_invisible',False)"/>
                 <field name="delay_to_pay"  sum="Avg. Delay To Pay" invisible="context.get('residual_invisible',False)"/>
@@ -103,6 +102,7 @@
                     <separator orientation="vertical"/>
                     <field name="journal_id" widget="selection"/>
                     <field name="account_id"/>
+                    <field name="account_line_id"/>
                     <separator orientation="vertical"/>
                     <field name="date_due"/>
                     <separator orientation="vertical" groups="base.group_multi_company"/>
@@ -120,6 +120,7 @@
                     <filter string="Type" icon="terp-stock_symbol-selection" context="{'group_by':'type'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
+                    <filter string="Account" icon="terp-folder-orange" context="{'group_by':'account_line_id'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Due Date" icon="terp-go-today" context="{'group_by':'date_due'}"/>
                     <filter string="Period" icon="terp-go-month" context="{'group_by':'period_id'}"/>

addons/account/report/account_partner_balance.py

@@ -242,7 +242,6 @@ class partner_balance(report_sxw.rml_parse, common_report_header):
 
         if not self.ids:
             return 0.0
-        temp_res = 0.0
         self.cr.execute(
                 "SELECT sum(debit) " \
                 "FROM account_move_line AS l " \
@@ -261,7 +260,6 @@ class partner_balance(report_sxw.rml_parse, common_report_header):
 
         if not self.ids:
             return 0.0
-        temp_res = 0.0
         self.cr.execute(
                 "SELECT sum(credit) " \
                 "FROM account_move_line AS l " \
@@ -281,7 +279,6 @@ class partner_balance(report_sxw.rml_parse, common_report_header):
 
         if not self.ids:
             return 0.0
-        temp_res = 0.0
         self.cr.execute(
                 "SELECT sum(debit-credit) " \
                 "FROM account_move_line AS l " \
@@ -295,7 +292,6 @@ class partner_balance(report_sxw.rml_parse, common_report_header):
         return temp_res
 
     def _get_partners(self):
-        cr, uid = self.cr, self.uid
 
         if self.result_selection == 'customer':
             return _('Receivable Accounts')

addons/account/report/account_partner_ledger.py

@@ -23,6 +23,7 @@ import time
 import re
 from report import report_sxw
 from common_report_header import common_report_header
+from tools.translate import _
 
 class third_party_ledger(report_sxw.rml_parse, common_report_header):
 
@@ -53,15 +54,23 @@ class third_party_ledger(report_sxw.rml_parse, common_report_header):
             'get_target_move': self._get_target_move,
         })
 
+    def _get_filter(self, data):
+        if data['form']['filter'] == 'unreconciled':
+            return _('Unreconciled Entries')
+        return super(third_party_ledger, self)._get_filter(data)
+
     def set_context(self, objects, data, ids, report_type=None):
         obj_move = self.pool.get('account.move.line')
         obj_partner = self.pool.get('res.partner')
         self.query = obj_move._query_get(self.cr, self.uid, obj='l', context=data['form'].get('used_context', {}))
         ctx2 = data['form'].get('used_context',{}).copy()
-        ctx2.update({'initial_bal': True})
-        self.init_query = obj_move._query_get(self.cr, self.uid, obj='l', context=ctx2)
-        self.reconcil = data['form'].get('reconcil', True)
         self.initial_balance = data['form'].get('initial_balance', True)
+        if self.initial_balance:
+            ctx2.update({'initial_bal': True})
+        self.init_query = obj_move._query_get(self.cr, self.uid, obj='l', context=ctx2)
+        self.reconcil = True
+        if data['form']['filter'] == 'unreconciled':
+            self.reconcil = False
         self.result_selection = data['form'].get('result_selection', 'customer')
         self.amount_currency = data['form'].get('amount_currency', False)
         self.target_move = data['form'].get('target_move', 'all')
@@ -118,7 +127,7 @@ class third_party_ledger(report_sxw.rml_parse, common_report_header):
         else:
             amount = str(amount)
         if (amount == '0'):
-             return ' '
+            return ' '
         orig = amount
         new = re.sub("^(-?\d+)(\d{3})", "\g<1>'\g<2>", amount)
         if orig == new:
@@ -169,7 +178,6 @@ class third_party_ledger(report_sxw.rml_parse, common_report_header):
             RECONCILE_TAG = " "
         else:
             RECONCILE_TAG = "AND l.reconcile_id IS NULL"
-
         self.cr.execute(
             "SELECT COALESCE(SUM(l.debit),0.0), COALESCE(SUM(l.credit),0.0), COALESCE(sum(debit-credit), 0.0) " \
             "FROM account_move_line AS l,  " \
@@ -402,14 +410,14 @@ class third_party_ledger(report_sxw.rml_parse, common_report_header):
             return currency_total
 
     def _display_initial_balance(self, data):
-         if self.initial_balance:
-             return True
-         return False
+        if self.initial_balance:
+            return True
+        return False
 
     def _display_currency(self, data):
-         if self.amount_currency:
-             return True
-         return False
+        if self.amount_currency:
+            return True
+        return False
 
 report_sxw.report_sxw('report.account.third_party_ledger', 'res.partner',
         'addons/account/report/account_partner_ledger.rml',parser=third_party_ledger,

addons/account/report/account_partner_ledger.rml

@@ -355,7 +355,7 @@
           <para style="terp_tblheader_General_Centre">Journal</para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Centre">Filters By [[ get_filter(data)!='No Filter' and get_filter(data) ]]</para>
+          <para style="terp_tblheader_General_Centre">Filters By [[ data['form']['filter'] not in ('filter_no','unreconciled') and get_filter(data) ]]</para>
         </td>
         <td>
           <para style="terp_tblheader_General_Centre">Partner's</para>
@@ -377,7 +377,7 @@
           <para style="terp_default_Centre_8">[[', '.join([ lt or '' for lt in get_journal(data) ]) ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]]</para>
+          <para style="terp_default_Centre_8">[[ data['form']['filter'] in ('filter_no','unreconciled') and get_filter(data) or removeParentNode('para') ]]</para>
           <blockTable colWidths="58.0,58.0" style="Table7">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
             <tr>
               <td>

addons/account/report/account_partner_ledger_other.rml

@@ -356,7 +356,7 @@
           <para style="terp_tblheader_General_Centre">Journal</para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Centre">Filters By [[ get_filter(data)!='No Filter' and get_filter(data) ]]</para>
+          <para style="terp_tblheader_General_Centre">Filters By [[ data['form']['filter'] not in ('filter_no','unreconciled') and get_filter(data) ]]</para>
         </td>
         <td>
           <para style="terp_tblheader_General_Centre">Partner's</para>
@@ -378,7 +378,7 @@
           <para style="terp_default_Centre_8">[[', '.join([ lt or '' for lt in get_journal(data) ]) ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]]</para>
+          <para style="terp_default_Centre_8">[[ data['form']['filter'] in ('filter_no','unreconciled') and get_filter(data) or removeParentNode('para') ]]</para>
           <blockTable colWidths="58.0,58.0" style="Table7">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
             <tr>
               <td>

addons/account/report/account_report.py

@@ -101,14 +101,14 @@ class report_aged_receivable(osv.osv):
     def _calc_bal(self, cr, uid, ids, name, args, context=None):
         res = {}
         for period in self.read(cr, uid, ids, ['name'], context=context):
-           date1,date2 = period['name'].split(' to ')
-           cr.execute("SELECT SUM(credit-debit) FROM account_move_line AS line, account_account as ac  \
+            date1,date2 = period['name'].split(' to ')
+            cr.execute("SELECT SUM(credit-debit) FROM account_move_line AS line, account_account as ac  \
                         WHERE (line.account_id=ac.id) AND ac.type='receivable' \
                             AND (COALESCE(line.date,date) BETWEEN %s AND  %s) \
                             AND (reconcile_id IS NULL) AND ac.active",(str(date2),str(date1),))
-           amount = cr.fetchone()
-           amount = amount[0] or 0.00
-           res[period['id']] = amount
+            amount = cr.fetchone()
+            amount = amount[0] or 0.00
+            res[period['id']] = amount
 
         return res
 

addons/account/report/account_tax_code.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ##############################################################################
 #

addons/account/wizard/account_change_currency.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- encoding: utf-8 -*-
 ##############################################################################
 #

addons/account/wizard/account_report_balance_sheet.py

@@ -44,7 +44,7 @@ class account_bs_report(osv.osv_memory):
                                       help='This Account is used for transfering Profit/Loss ' \
                                            '(Profit: Amount will be added, Loss: Amount will be duducted), ' \
                                            'which is calculated from Profilt & Loss Report',
-                                      domain = [('type','=','payable')]),
+                                      domain = [('type','=','other')]),
     }
 
     _defaults={

addons/account/wizard/account_report_common.py

@@ -56,7 +56,7 @@ class account_common_report(osv.osv_memory):
         return res
 
     def onchange_filter(self, cr, uid, ids, filter='filter_no', fiscalyear_id=False, context=None):
-        res = {}
+        res = {'value': {}}
         if filter == 'filter_no':
             res['value'] = {'period_from': False, 'period_to': False, 'date_from': False ,'date_to': False}
         if filter == 'filter_date':
@@ -68,7 +68,7 @@ class account_common_report(osv.osv_memory):
                                FROM account_period p
                                LEFT JOIN account_fiscalyear f ON (p.fiscalyear_id = f.id)
                                WHERE f.id = %s
-                               ORDER BY p.date_start ASC
+                               ORDER BY p.date_start ASC, p.special ASC
                                LIMIT 1) AS period_start
                 UNION
                 SELECT * FROM (SELECT p.id

addons/account/wizard/account_report_general_ledger.py

@@ -28,8 +28,8 @@ class account_report_general_ledger(osv.osv_memory):
 
     _columns = {
         'landscape': fields.boolean("Landscape Mode"),
-        'initial_balance': fields.boolean("Include Initial Balances",
-                                          help='It adds initial balance row on report which display previous sum amount of debit/credit/balance'),
+        'initial_balance': fields.boolean('Include Initial Balances',
+                                    help='If you selected to filter by date or period, this field allow you to add a row to display the amount of debit/credit/balance that precedes the filter you\'ve set.'),
         'amount_currency': fields.boolean("With Currency", help="It adds the currency column if the currency is different then the company currency"),
         'sortby': fields.selection([('sort_date', 'Date'), ('sort_journal_partner', 'Journal & Partner')], 'Sort by', required=True),
     }

addons/account/wizard/account_report_general_ledger_view.xml

@@ -17,10 +17,12 @@
                 <field name="display_account"/>
                 <field name="sortby"/>
                 <field name="landscape"/>
-                <field name="initial_balance" attrs="{'readonly':[('fiscalyear_id','=', False)]}"/>
                 <field name="amount_currency"/>
                 <newline/>
             </xpath>
+            <xpath expr="//field[@name='filter']" position="after">
+                <field name="initial_balance" attrs="{'readonly':[('filter', 'in', ('filter_no'))]}" />
+            </xpath>
             </data>
             </field>
         </record>

addons/account/wizard/account_report_partner_ledger.py

@@ -31,23 +31,29 @@ class account_partner_ledger(osv.osv_memory):
 
     _columns = {
         'initial_balance': fields.boolean('Include Initial Balances',
-                                    help='It adds initial balance row on report which display previous sum amount of debit/credit/balance'),
-        'reconcil': fields.boolean('Include Reconciled Entries', help='Consider reconciled entries'),
-        'page_split': fields.boolean('One Partner per Page', help='Display Ledger Report with One partner per page'),
+                                    help='If you selected to filter by date or period, this field allow you to add a row to display the amount of debit/credit/balance that precedes the filter you\'ve set.'),
+        'filter': fields.selection([('filter_no', 'No Filters'), ('filter_date', 'Date'), ('filter_period', 'Periods'), ('unreconciled', 'Unreconciled Entries')], "Filter by", required=True),
+        'page_split': fields.boolean('One Partner Per Page', help='Display Ledger Report with One partner per page'),
         'amount_currency': fields.boolean("With Currency", help="It adds the currency column if the currency is different then the company currency"),
-
     }
     _defaults = {
-       'reconcil': True,
-       'initial_balance': True,
+       'initial_balance': False,
        'page_split': False,
     }
 
+    def onchange_filter(self, cr, uid, ids, filter='filter_no', fiscalyear_id=False, context=None):
+        res = super(account_partner_ledger, self).onchange_filter(cr, uid, ids, filter=filter, fiscalyear_id=fiscalyear_id, context=context)
+        if filter in ['filter_no', 'unreconciled']:
+            if filter  == 'unreconciled':
+                 res['value'].update({'fiscalyear_id': False})
+            res['value'].update({'initial_balance': False, 'period_from': False, 'period_to': False, 'date_from': False ,'date_to': False})
+        return res
+
     def _print_report(self, cr, uid, ids, data, context=None):
         if context is None:
             context = {}
         data = self.pre_print_report(cr, uid, ids, data, context=context)
-        data['form'].update(self.read(cr, uid, ids, ['initial_balance', 'reconcil', 'page_split', 'amount_currency'])[0])
+        data['form'].update(self.read(cr, uid, ids, ['initial_balance', 'filter', 'page_split', 'amount_currency'])[0])
         if data['form']['page_split']:
             return {
                 'type': 'ir.actions.report.xml',
@@ -62,4 +68,4 @@ class account_partner_ledger(osv.osv_memory):
 
 account_partner_ledger()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account/wizard/account_report_partner_ledger_view.xml

@@ -15,12 +15,14 @@
             </xpath>
             <xpath expr="//field[@name='target_move']" position="after">
                 <field name="result_selection"/>
-                <field name="initial_balance"/>
-                <field name="reconcil"/>
                 <field name="amount_currency"/>
                 <field name="page_split"/>
                 <newline/>
             </xpath>
+            <xpath expr="//field[@name='filter']" position="replace">
+                <field name="filter" on_change="onchange_filter(filter, fiscalyear_id)" colspan="4"/>
+                <field name="initial_balance" attrs="{'readonly':[('filter', 'in', ('filter_no', 'unreconciled'))]}" />
+            </xpath>
             </data>
             </field>
         </record>

addons/account/wizard/account_subscription_generate.py

@@ -38,10 +38,10 @@ class account_subscription_generate(osv.osv_memory):
         act_obj = self.pool.get('ir.actions.act_window')
         moves_created=[]
         for data in  self.read(cr, uid, ids, context=context):
-             cr.execute('select id from account_subscription_line where date<%s and move_id is null', (data['date'],))
-             line_ids = map(lambda x: x[0], cr.fetchall())
-             moves = self.pool.get('account.subscription.line').move_create(cr, uid, line_ids, context=context)
-             moves_created.extend(moves)
+            cr.execute('select id from account_subscription_line where date<%s and move_id is null', (data['date'],))
+            line_ids = map(lambda x: x[0], cr.fetchall())
+            moves = self.pool.get('account.subscription.line').move_create(cr, uid, line_ids, context=context)
+            moves_created.extend(moves)
         result = mod_obj.get_object_reference(cr, uid, 'account', 'action_move_line_form')
         id = result and result[1] or False
         result = act_obj.read(cr, uid, [id], context=context)[0]

addons/account/wizard/account_tax_chart.py

@@ -51,7 +51,6 @@ class account_tax_chart(osv.osv_memory):
         """
         mod_obj = self.pool.get('ir.model.data')
         act_obj = self.pool.get('ir.actions.act_window')
-        period_obj = self.pool.get('account.period')
         if context is None:
             context = {}
         data = self.browse(cr, uid, ids, context=context)[0]

addons/account_accountant/i18n/bs.po

@@ -0,0 +1,38 @@
+# Bosnian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-05-08 08:24+0000\n"
+"Last-Translator: Bojan Markovic <Unknown>\n"
+"Language-Team: Bosnian <bs@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: 2011-05-09 04:36+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
+
+#. module: account_accountant
+#: model:ir.module.module,description:account_accountant.module_meta_information
+msgid ""
+"\n"
+"This module gives the admin user the access to all the accounting features "
+"like the journal\n"
+"items and the chart of accounts.\n"
+"    "
+msgstr ""
+"\n"
+"Ovaj modul daje administratoru pristup računovodstvenim mogućnostima kao što "
+"su\n"
+"knjiženja i kontni plan\n"
+"    "
+
+#. module: account_accountant
+#: model:ir.module.module,shortdesc:account_accountant.module_meta_information
+msgid "Accountant"
+msgstr "Računovođa"

addons/account_accountant/i18n/ko.po

@@ -0,0 +1,36 @@
+# Korean translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-05-10 14:38+0000\n"
+"Last-Translator: Gang Sung-jin <potopro@gmail.com>\n"
+"Language-Team: Korean <ko@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: 2011-05-11 04:37+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
+
+#. module: account_accountant
+#: model:ir.module.module,description:account_accountant.module_meta_information
+msgid ""
+"\n"
+"This module gives the admin user the access to all the accounting features "
+"like the journal\n"
+"items and the chart of accounts.\n"
+"    "
+msgstr ""
+"\n"
+"이 모듈은 관리자에게 업무 일지 항목 및 계정의 차트와 같은 회계 기능들을 접근 할 수 있습니다.\n"
+"    "
+
+#. module: account_accountant
+#: model:ir.module.module,shortdesc:account_accountant.module_meta_information
+msgid "Accountant"
+msgstr "회계사"

addons/account_accountant/i18n/mk.po

@@ -0,0 +1,33 @@
+# Macedonian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-05-06 12:05+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Macedonian <mk@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: 2011-05-07 04:53+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
+
+#. module: account_accountant
+#: model:ir.module.module,description:account_accountant.module_meta_information
+msgid ""
+"\n"
+"This module gives the admin user the access to all the accounting features "
+"like the journal\n"
+"items and the chart of accounts.\n"
+"    "
+msgstr ""
+
+#. module: account_accountant
+#: model:ir.module.module,shortdesc:account_accountant.module_meta_information
+msgid "Accountant"
+msgstr "Сметководител"

addons/account_accountant/i18n/sr@latin.po

@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2010-12-23 15:11+0000\n"
-"Last-Translator: Olivier Dony (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2011-05-18 21:24+0000\n"
+"Last-Translator: Milan Milosevic <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-05-19 04:40+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
 
 #. module: account_accountant
 #: model:ir.module.module,description:account_accountant.module_meta_information
@@ -26,8 +26,13 @@ msgid ""
 "items and the chart of accounts.\n"
 "    "
 msgstr ""
+"\n"
+"Ovaj modul daje korisniku administratoru pristup svim korisničkim opcijama "
+"poput dnevnika\n"
+"raznih stavki i statistici korisničkih naloga.\n"
+"    "
 
 #. module: account_accountant
 #: model:ir.module.module,shortdesc:account_accountant.module_meta_information
 msgid "Accountant"
-msgstr "Knjigovodja"
+msgstr "Knjigovođa"

addons/account_accountant/i18n/tr.po

@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-01-13 11:29+0000\n"
-"Last-Translator: Arif Aydogmus <arifaydogmus@gmail.com>\n"
+"PO-Revision-Date: 2011-05-10 17:31+0000\n"
+"Last-Translator: Ayhan KIZILTAN <Unknown>\n"
 "Language-Team: Turkish <tr@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: 2011-04-29 05:51+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-05-11 04:37+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
 
 #. module: account_accountant
 #: model:ir.module.module,description:account_accountant.module_meta_information
@@ -34,7 +34,7 @@ msgstr ""
 #. module: account_accountant
 #: model:ir.module.module,shortdesc:account_accountant.module_meta_information
 msgid "Accountant"
-msgstr "Muhasebeci"
+msgstr "Accountant"
 
 #~ msgid "The name of the module must be unique !"
 #~ msgstr "Modülün adı benzersiz olmalıdır!"

addons/account_analytic_analysis/i18n/bs.po

@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2010-08-02 20:29+0000\n"
-"Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2011-05-08 08:39+0000\n"
+"Last-Translator: Bojan Markovic <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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-05-09 04:36+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_invoiced:0
@@ -41,12 +41,12 @@ msgstr "Izračunato korištenjem forume: Maksimalna količina - Ukupno sati"
 #: code:addons/account_analytic_analysis/account_analytic_analysis.py:703
 #, python-format
 msgid "AccessError"
-msgstr ""
+msgstr "AccessError"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
 msgid "Date of the last invoice created for this analytic account."
-msgstr "Datum zadnje fakture stvorene za ovaj analitički račun."
+msgstr "Datum zadnje fakture kreirane za ovaj analitički račun."
 
 #. module: account_analytic_analysis
 #: model:ir.module.module,description:account_analytic_analysis.module_meta_information
@@ -59,6 +59,13 @@ msgid ""
 "You can also view the report of account analytic summary\n"
 "user-wise as well as month wise.\n"
 msgstr ""
+"\n"
+"Ovaj modul služi za modificiranje analitičkih računovodstvenih pogleda\n"
+"da prikažu bitne podatke projektnim managerima uslužnih poduzeća.\n"
+"Dodaje meni za prikaz relevantnih informacija za svakog managera.\n"
+"\n"
+"Takođe, možete vidjeti izvještaje analitičke rekapitulacija za svakog\n"
+"korisnika ili po mjesecu.\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_invoice_date:0
@@ -73,12 +80,12 @@ msgstr "Izračunato korištenjem formule: Teorijski prihod - Ukupni troškovi"
 #. module: account_analytic_analysis
 #: field:account.analytic.account,real_margin_rate:0
 msgid "Real Margin Rate (%)"
-msgstr "Stopa stvarne granice (%)"
+msgstr "Realna stopa marže (%)"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_theorical:0
 msgid "Theoretical Revenue"
-msgstr ""
+msgstr "Teoretski prihod"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_worked_invoiced_date:0
@@ -92,7 +99,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_invoicing
 msgid "Billing"
-msgstr ""
+msgstr "Fakturiranje"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_worked_date:0
@@ -121,7 +128,7 @@ msgstr "Preostali sati"
 #. module: account_analytic_analysis
 #: field:account.analytic.account,theorical_margin:0
 msgid "Theoretical Margin"
-msgstr ""
+msgstr "Teoretska marža"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_theorical:0
@@ -162,7 +169,7 @@ msgstr "Datum posljednje izmjene/rada na ovom kontu"
 #. module: account_analytic_analysis
 #: model:ir.module.module,shortdesc:account_analytic_analysis.module_meta_information
 msgid "report_account_analytic"
-msgstr ""
+msgstr "report_account_analytic"
 
 #. module: account_analytic_analysis
 #: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_user
@@ -179,7 +186,7 @@ msgstr "Fakturirani iznos"
 #: code:addons/account_analytic_analysis/account_analytic_analysis.py:704
 #, python-format
 msgid "You try to bypass an access rule (Document type: %s)."
-msgstr ""
+msgstr "Pokušavate zaobići pravilo za pristup (Dokument tipa: %s)."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_worked_invoiced_date:0
@@ -296,7 +303,7 @@ msgstr "Ukupno sati"
 #. module: account_analytic_analysis
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "Greška! Ne možete kreirati rekurzivna analitička konta."
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,total_cost:0

addons/account_analytic_analysis/i18n/sr@latin.po

@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2010-12-23 16:25+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2011-05-19 16:47+0000\n"
+"Last-Translator: Milan Milosevic <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-05-20 04:34+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_invoiced:0
@@ -23,17 +23,17 @@ msgid ""
 "Number of hours that can be invoiced plus those that already have been "
 "invoiced."
 msgstr ""
-"Broj sati koji mogu biti fakturirani zajedno s onima koji su već fakturisana."
+"Broj sati koji mogu biti obračunati zajedno s onima koji su već obračunati."
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_ca:0
 msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
-msgstr "Izračunato pomoću formule: Max Cijena Iznos - Iznos dostavnice."
+msgstr "Izračunato pomoću formule: Max cena obračuna - Iznos obračuna."
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_hours:0
 msgid "Computed using the formula: Maximum Quantity - Hours Tot."
-msgstr "Izračunato pomoću formule: Najveća količina - Ukupno vrijeme"
+msgstr "Izračunato pomoću formule: Najveća količina - Ukupno vreme"
 
 #. module: account_analytic_analysis
 #: code:addons/account_analytic_analysis/account_analytic_analysis.py:532
@@ -45,7 +45,7 @@ msgstr "Greška u pristupu"
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
 msgid "Date of the last invoice created for this analytic account."
-msgstr "Datum zadnje fakture kreirana za ovaj analitički račun."
+msgstr "Datum poslednjeg obračuna napravljenoh za ovaj analitički nalog."
 
 #. module: account_analytic_analysis
 #: model:ir.module.module,description:account_analytic_analysis.module_meta_information
@@ -58,26 +58,30 @@ msgid ""
 "You can also view the report of account analytic summary\n"
 "user-wise as well as month wise.\n"
 msgstr ""
+"\n"
+"Ovaj modul je za izmenu pregleda analitičkog naloga da bi se prikazali\n"
+"važni podaci vođi projekta servisnih kompanija.\n"
+"Dodaje meni da pokaže relevantne informacije o svakom vođi.\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_invoice_date:0
 msgid "Last Invoice Date"
-msgstr "Zadnji Datum fakture"
+msgstr "Datum poslednjeg obračuna"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,theorical_margin:0
 msgid "Computed using the formula: Theorial Revenue - Total Costs"
-msgstr "Izračunato pomoću formule: Prihodi Teorijski - Ukupni troškovi"
+msgstr "Izračunato pomoću formule: Teoretski prihodi - Ukupni troškovi"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,real_margin_rate:0
 msgid "Real Margin Rate (%)"
-msgstr "Realna Stopa Margine (%)"
+msgstr "Realna Stopa Marže (%)"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_theorical:0
 msgid "Theoretical Revenue"
-msgstr ""
+msgstr "Teoretski prihod"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_worked_invoiced_date:0
@@ -85,18 +89,18 @@ msgid ""
 "If invoice from the costs, this is the date of the latest work or cost that "
 "have been invoiced."
 msgstr ""
-"Ako račun od troškova, to je datum najnoviji rad ili cijene koje su "
-"fakturirane."
+"Ako je faktura izvedena iz troškova, to je datum poslednjeg rada ili već "
+"fakturisani računi."
 
 #. module: account_analytic_analysis
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_invoicing
 msgid "Billing"
-msgstr "Obracunavanje"
+msgstr "Obračunavanje"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_worked_date:0
 msgid "Date of Last Cost/Work"
-msgstr "Datum poslednjeg  Cena / Posao"
+msgstr "Datum poslednje  Cene / Rada"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,total_cost:0
@@ -109,8 +113,8 @@ msgid ""
 "Number of hours you spent on the analytic account (from timesheet). It "
 "computes on all journal of type 'general'."
 msgstr ""
-"Broj sati provedenih na tom analitičkom račun (iz timesheet). Izračunava se "
-"iz svih dnevnih knjiga za tip 'Generalno'."
+"Broj sati potrošenih na tom analitičkom nalogu (prema vremenskoj tablici). "
+"Izračunava se u svim dnevnicima za tip 'Opšte'."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,remaining_hours:0
@@ -120,7 +124,7 @@ msgstr "Preostali Sati"
 #. module: account_analytic_analysis
 #: field:account.analytic.account,theorical_margin:0
 msgid "Theoretical Margin"
-msgstr ""
+msgstr "Teoretska stopa marže"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_theorical:0
@@ -129,9 +133,8 @@ msgid ""
 "if all these costs have been invoiced at the normal sale price provided by "
 "the pricelist."
 msgstr ""
-"Na temelju troškova koje ste imali na projektu, što bi bio prihod ako su svi "
-"ovi troškovi su obračunati po normalnoj prodajnoj cijeni proistekli iz "
-"cenovnika."
+"S obzirom na troškove koje ste imali na projektu, koliki bi bio prihod ako "
+"su svi ovi troškovi obračunati po normalnoj prodajnoj ceni, prema cenovniku."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,user_ids:0
@@ -142,27 +145,27 @@ msgstr "Korisnik"
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_to_invoice:0
 msgid "Uninvoiced Amount"
-msgstr "Nefakturirani iznos"
+msgstr "Neobračunati iznos"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,real_margin:0
 msgid "Computed using the formula: Invoiced Amount - Total Costs."
-msgstr "Izračunato korištenjem formule: Fakturirani iznos - Ukupni troškovi."
+msgstr "Izračunato pomoću formule: Fakturisani iznos - Ukupni troškovi."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_qtt_non_invoiced:0
 msgid "Uninvoiced Hours"
-msgstr "Nefakturirani sati"
+msgstr "Neobračunati sati"
 
 #. 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."
+msgstr "Datum poslednjeg rada obavljenog na ovom nalogu."
 
 #. module: account_analytic_analysis
 #: model:ir.module.module,shortdesc:account_analytic_analysis.module_meta_information
 msgid "report_account_analytic"
-msgstr "izvestaj_analitickog_konta"
+msgstr "izveštaj_analitičkog_naloga"
 
 #. module: account_analytic_analysis
 #: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_user
@@ -172,7 +175,7 @@ msgstr "Ukupno sati po Korisniku"
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_invoiced:0
 msgid "Invoiced Amount"
-msgstr "Fakturirani iznos"
+msgstr "Obračunati iznos"
 
 #. module: account_analytic_analysis
 #: code:addons/account_analytic_analysis/account_analytic_analysis.py:533
@@ -184,40 +187,39 @@ 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
 msgid "Date of Last Invoiced Cost"
-msgstr "Datum zadnje fakturiranog troška"
+msgstr "Datum poslednjeg obračunatog troška"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_qtt_invoiced:0
 msgid "Invoiced Hours"
-msgstr "Fakturirani sati"
+msgstr "Obračunati sati"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,real_margin:0
 msgid "Real Margin"
-msgstr "Realna marza"
+msgstr "Realna marža"
 
 #. module: account_analytic_analysis
 #: constraint:account.analytic.account:0
 msgid ""
 "Error! The currency has to be the same as the currency of the selected "
 "company"
-msgstr ""
+msgstr "Greška! Valuta mora biti ista kao i valuta izabranog preduzeća"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_invoiced:0
 msgid "Total customer invoiced amount for this account."
-msgstr "Ukupni iznos izlaznih faktura za ovaj račun."
+msgstr "Ukupni iznos korisničkih obračuna za ovaj nalog."
 
 #. module: account_analytic_analysis
 #: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_month
 msgid "Hours summary by month"
-msgstr "Ukupno sati po mjesecu"
+msgstr "Ukupno sati po mesecu"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,real_margin_rate:0
 msgid "Computes using the formula: (Real Margin / Total Costs) * 100."
-msgstr ""
-"Računa se korištenjem formule: (Stvarna granica / Ukupni troškovi) * 100"
+msgstr "Izračunava se pomoću formule: (Realna marža / ukupni troškovi) * 100"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_non_invoiced:0
@@ -225,13 +227,13 @@ msgid ""
 "Number of hours (from journal of type 'general') that can be invoiced if you "
 "invoice based on analytic account."
 msgstr ""
-"Broj sati (iz dnevnika ' generalnog' tipa) koji mogu biti fakturirani ako "
-"fakturirate na osnovu analitičkog računa."
+"Broj sati (iz dnevnika, tip 'opšte') koji mogu biti obračunati ako vršite "
+"obračun na osnovu analitičkog naloga."
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Analytic accounts"
-msgstr "Analitički računi"
+msgstr "Analitički nalozi"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,remaining_ca:0
@@ -244,18 +246,18 @@ msgid ""
 "If invoice from analytic account, the remaining amount you can invoice to "
 "the customer based on the total costs."
 msgstr ""
-"Ako fakturirate iz analitičkog računa, preostali iznos kojeg možete "
-"fakturirati kupcu je zasnovan na ukupnim troškovima."
+"Ako je obračun iz analitičkog naloga, preostali iznos za obračunavanje "
+"korisniku bazira se na ukupnim troškovima."
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,revenue_per_hour:0
 msgid "Computed using the formula: Invoiced Amount / Hours Tot."
-msgstr "Izračunato korištenjem formule: Fakturirani iznos / Ukupno sati"
+msgstr "Izračunato pomoću formule: Iznos obračuna / Ukupno sati"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
 msgid "Revenue per Hours (real)"
-msgstr "Prihod po satiima ( stvarni)"
+msgstr "Prihod po satima (stvarni)"
 
 #. module: account_analytic_analysis
 #: field:account_analytic_analysis.summary.month,unit_amount:0
@@ -274,19 +276,19 @@ msgstr "Mesec"
 #: field:account_analytic_analysis.summary.user,account_id:0
 #: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
 msgid "Analytic Account"
-msgstr "Analitički konto"
+msgstr "Analitički nalog"
 
 #. 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 "Prekoračeni računi"
+msgstr "Prekoračeni nalozi"
 
 #. 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 "Sve nefakturirane stavke"
+msgstr "Sve neobračunate stavke"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_quantity:0
@@ -296,7 +298,7 @@ msgstr "Ukupno sati"
 #. module: account_analytic_analysis
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "Greška! Ne možete praviti rekurzivne analitičke naloge."
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,total_cost:0
@@ -304,8 +306,8 @@ 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."
+"Suma troškova za ovaj naloga. Uključuje stvarne troškove (iz obračunâ) i "
+"indirektne troškove, kao, npr. vreme potrošeno na vremenskim tablicama."
 
 #~ msgid "Theorical Revenue"
 #~ msgstr "Teorijski Prihod"

addons/account_analytic_analysis/i18n/tr.po

@@ -7,32 +7,32 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-01-22 23:00+0000\n"
-"Last-Translator: Ahmet Altınışık <Unknown>\n"
+"PO-Revision-Date: 2011-05-22 13:35+0000\n"
+"Last-Translator: Ayhan KIZILTAN <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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-05-23 04:37+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_invoiced:0
 msgid ""
 "Number of hours that can be invoiced plus those that already have been "
 "invoiced."
-msgstr "Faturalanabilecek saatler ve artı şimdiye kadar faturalanmış olanlar"
+msgstr "Faturalanabilecek saatler artı şimdiye kadar faturalanmış olanlar"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_ca:0
 msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
 msgstr ""
-"Formül kullanılarak hesaplandı:En yüksek fatura fiyatı - Faturalanmış tutar."
+"Hesaplamada kullanılan formül: En Yüksek Fatura Fiyatı - Faturalanmış Tutar."
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_hours:0
 msgid "Computed using the formula: Maximum Quantity - Hours Tot."
-msgstr ""
+msgstr "Hesaplamada kullanılan formül: Enfazla Miktar -  Saatler Toplamı"
 
 #. module: account_analytic_analysis
 #: code:addons/account_analytic_analysis/account_analytic_analysis.py:532
@@ -57,6 +57,13 @@ msgid ""
 "You can also view the report of account analytic summary\n"
 "user-wise as well as month wise.\n"
 msgstr ""
+"\n"
+"Bu modül, servis şirketleri proje müdürlerinin önemli bilgileri\n"
+"görebilmeleri için analiz hesabı görünümünde değişiklikler yapmak\n"
+"için kullanılır. Her yöneticinin ilgili bilgiyi görmesi için menü eklenir..\n"
+"\n"
+"Hem kullanıcıya göre hem de aylara göre analiz hesabı özetini\n"
+"görebilirsiniz.\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_invoice_date:0
@@ -66,17 +73,17 @@ msgstr "Son Fatura Tarihi"
 #. module: account_analytic_analysis
 #: help:account.analytic.account,theorical_margin:0
 msgid "Computed using the formula: Theorial Revenue - Total Costs"
-msgstr "Computed using the formula: Theorial Revenue - Total Costs"
+msgstr "Hesaplamada kullanılan formül: Teorik Ciro - Toplam Maliyetler"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,real_margin_rate:0
 msgid "Real Margin Rate (%)"
-msgstr "Gerçek Teminat Oranı (%)"
+msgstr "Gerçek Kar Oranı (%)"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_theorical:0
 msgid "Theoretical Revenue"
-msgstr ""
+msgstr "Teorik Gelir"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_worked_invoiced_date:0
@@ -84,6 +91,8 @@ msgid ""
 "If invoice from the costs, this is the date of the latest work or cost that "
 "have been invoiced."
 msgstr ""
+"Eğer fatura maliyetlerden çıkarılmışsa, bu en son işin yada faturalandırılan "
+"maliyetin tarihidir."
 
 #. module: account_analytic_analysis
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_invoicing
@@ -93,7 +102,7 @@ msgstr "Faturalandırma"
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_worked_date:0
 msgid "Date of Last Cost/Work"
-msgstr ""
+msgstr "Son Maliyet/İş Tarihi"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,total_cost:0
@@ -106,6 +115,8 @@ msgid ""
 "Number of hours you spent on the analytic account (from timesheet). It "
 "computes on all journal of type 'general'."
 msgstr ""
+"Analiz hesabı üzerinde çalışarak harcadığınız süredir (zaman "
+"çizelgelerinden). 'Genel' tipteki bütün yevmiyeleri hesaplar."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,remaining_hours:0
@@ -115,7 +126,7 @@ msgstr "Kalan Saat"
 #. module: account_analytic_analysis
 #: field:account.analytic.account,theorical_margin:0
 msgid "Theoretical Margin"
-msgstr ""
+msgstr "Kuramsal Sınır"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_theorical:0
@@ -124,6 +135,9 @@ msgid ""
 "if all these costs have been invoiced at the normal sale price provided by "
 "the pricelist."
 msgstr ""
+"Bu maliyetlerden elde edilen gelir, fiyat listesindeki normal satış "
+"fiyatlarına göre faturalandırılmış ise projedeki maliyetleriniz temel "
+"alınmıştır."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,user_ids:0
@@ -155,12 +169,12 @@ msgstr "Bu hesapta yapılan son işlem tarihi"
 #. module: account_analytic_analysis
 #: model:ir.module.module,shortdesc:account_analytic_analysis.module_meta_information
 msgid "report_account_analytic"
-msgstr ""
+msgstr "analiz_hesabı_raporu"
 
 #. module: account_analytic_analysis
 #: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_user
 msgid "Hours Summary by User"
-msgstr ""
+msgstr "Kullanıcıya göre Saatlik Özet"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_invoiced:0
@@ -177,7 +191,7 @@ msgstr "Bir giriş kuralını atlamayı deneyin (Döküman Türü: %s)."
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_worked_invoiced_date:0
 msgid "Date of Last Invoiced Cost"
-msgstr ""
+msgstr "Son Faturalanmış Maliyet Tarihi"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_qtt_invoiced:0
@@ -194,7 +208,7 @@ msgstr "Gerçek Teminat"
 msgid ""
 "Error! The currency has to be the same as the currency of the selected "
 "company"
-msgstr ""
+msgstr "Hata! Para birimi seçilen firmanın para birimiyle aynı olmalı"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_invoiced:0
@@ -204,7 +218,7 @@ msgstr "Bu hesap için toplam müşteri faturası miktarı."
 #. module: account_analytic_analysis
 #: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_month
 msgid "Hours summary by month"
-msgstr ""
+msgstr "Aya göre saatlil özet"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,real_margin_rate:0
@@ -218,11 +232,13 @@ msgid ""
 "Number of hours (from journal of type 'general') that can be invoiced if you "
 "invoice based on analytic account."
 msgstr ""
+"Eğer analiz hesabı temel alınmışsa faturalandırılacak saat (türü 'genel' "
+"olan yevmiyelerden alınan) sayılarıdır."
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Analytic accounts"
-msgstr ""
+msgstr "Analiz hesapları"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,remaining_ca:0
@@ -235,6 +251,8 @@ msgid ""
 "If invoice from analytic account, the remaining amount you can invoice to "
 "the customer based on the total costs."
 msgstr ""
+"Eğer analiz hesabından fatura edilecekse, müşteriye keseceğiniz fatura "
+"bakiye tutarı toplam maliyetlere dayanır."
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,revenue_per_hour:0
@@ -269,7 +287,7 @@ msgstr "Analitik Hesap"
 #: 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 "Görmezden Gelinen Hesaplar"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_hr_tree_invoiced_all
@@ -285,7 +303,7 @@ msgstr "Toplam Saat"
 #. module: account_analytic_analysis
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "Hata! Yinelenen çözümleme hesabı oluşturamazsınız."
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,total_cost:0
@@ -293,6 +311,8 @@ msgid ""
 "Total of costs for this account. It includes real costs (from invoices) and "
 "indirect costs, like time spent on timesheets."
 msgstr ""
+"Bu hesap için toplam maliyetler. Gerçek maliyetleri (faturalardan) ve "
+"dolaylı maliyetleri, zaman çizelgelerindeki harcanan süreler gibi, içerir."
 
 #~ msgid "All Analytic Accounts"
 #~ msgstr "Tüm Analitik Hesaplar"

addons/account_analytic_default/i18n/tr.po

@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2010-09-09 07:16+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2011-05-22 13:43+0000\n"
+"Last-Translator: Ayhan KIZILTAN <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: 2011-04-29 05:25+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-05-23 04:38+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
 
 #. module: account_analytic_default
 #: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information
@@ -28,6 +28,9 @@ msgid ""
 "default (eg. create new cutomer invoice or Sale order if we select this "
 "partner, it will automatically take this as an analytical account)"
 msgstr ""
+"Varsayılan analizde belirlenen analiz hesabında kullanacak bir paydaş seçin "
+"(örneğin; yeni bir müşteri faturası oluşturun ya da Satış sipariş, eğer bu "
+"paydaşı seçersek bu otomatik olarak analiz hesabı olarak alınır)"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
@@ -39,7 +42,7 @@ msgstr "Analiz Kuralları"
 #. module: account_analytic_default
 #: help:account.analytic.default,analytic_id:0
 msgid "Analytical Account"
-msgstr ""
+msgstr "Analitik Hesap"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -54,7 +57,7 @@ msgstr "Grupla..."
 #. module: account_analytic_default
 #: help:account.analytic.default,date_stop:0
 msgid "Default end date for this Analytical Account"
-msgstr ""
+msgstr "Bu analitik hesap için varsayılan bitiş tarihi"
 
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
@@ -73,11 +76,14 @@ msgid ""
 "default (eg. create new cutomer invoice or Sale order if we select this "
 "company, it will automatically take this as an analytical account)"
 msgstr ""
+"Varsayılan analizde belirlenen analiz hesabında kullanacak bir firma seçin "
+"(örneğin; yeni bir müşteri faturası oluşturun ya da Satış sipariş, eğer bu "
+"paydaşı seçersek bu otomatik olarak analiz hesabı olarak alınır)"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,date_start:0
 msgid "Default start date for this Analytical Account"
-msgstr ""
+msgstr "Bu analitik hesap için varsayılan başlangıç tarihi"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -117,6 +123,7 @@ msgstr "Bitiş Tarihi"
 msgid ""
 "select a user which will use analytical account specified in analytic default"
 msgstr ""
+"Varsayılan analizde belilenen analiz hesabı kullanacak bir kullanıcı seçin"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -137,6 +144,15 @@ msgid ""
 "* Date\n"
 "    "
 msgstr ""
+"\n"
+"Aşağıda belirtilen kriterlere göre otomatik olarak analiz hesabı seçilmesini "
+"sağlar:\n"
+"* Ürün\n"
+"* Paydaş\n"
+"* Kullanıcı\n"
+"* Firma\n"
+"* Tarih\n"
+"    "
 
 #. module: account_analytic_default
 #: help:account.analytic.default,product_id:0
@@ -145,6 +161,9 @@ msgid ""
 "default (eg. create new cutomer invoice or Sale order if we select this "
 "product, it will automatically take this as an analytical account)"
 msgstr ""
+"Varsayılan analizde belirlenen analiz hesabında kullanacak bir ürün seçin "
+"(örneğin; yeni bir müşteri faturası oluşturun ya da Satış sipariş, eğer bu "
+"paydaşı seçersek bu otomatik olarak analiz hesabı olarak alınır)"
 
 #. module: account_analytic_default
 #: field:account.analytic.default,sequence:0
@@ -154,7 +173,7 @@ msgstr "Sıra No"
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_account_invoice_line
 msgid "Invoice Line"
-msgstr ""
+msgstr "Fatura Kalemi"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -165,7 +184,7 @@ msgstr "Analiz Hesabı"
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 msgid "Accounts"
-msgstr ""
+msgstr "Hesaplar"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -182,12 +201,12 @@ msgstr "Baş. Tarihi"
 #: help:account.analytic.default,sequence:0
 msgid ""
 "Gives the sequence order when displaying a list of analytic distribution"
-msgstr ""
+msgstr "Analiz dağılımı listesi gösteriminde diziliş sırasını belirtir."
 
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_sale_order_line
 msgid "Sales Order Line"
-msgstr ""
+msgstr "Satış Siparişi Kalemi"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Görüntüleme mimarisi için Geçersiz XML"

addons/account_analytic_default/i18n/vi.po

@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2010-11-27 14:47+0000\n"
+"PO-Revision-Date: 2011-05-18 23:54+0000\n"
 "Last-Translator: Phong Nguyen-Thanh <Unknown>\n"
 "Language-Team: Vietnamese <vi@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: 2011-04-29 05:25+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-05-20 04:34+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
 
 #. module: account_analytic_default
 #: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information
@@ -45,12 +45,12 @@ msgstr ""
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 msgid "Current"
-msgstr ""
+msgstr "Hiện hành"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 msgid "Group By..."
-msgstr ""
+msgstr "Nhóm theo..."
 
 #. module: account_analytic_default
 #: help:account.analytic.default,date_stop:0
@@ -65,7 +65,7 @@ msgstr ""
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 msgid "Conditions"
-msgstr ""
+msgstr "Các điều kiện"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,company_id:0
@@ -84,7 +84,7 @@ msgstr ""
 #: view:account.analytic.default:0
 #: field:account.analytic.default,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Sản phẩm"
 
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_account_analytic_default
@@ -101,7 +101,7 @@ msgstr "Công ty"
 #: view:account.analytic.default:0
 #: field:account.analytic.default,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Người sử dụng"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.act_account_acount_move_line_open
@@ -111,7 +111,7 @@ msgstr ""
 #. module: account_analytic_default
 #: field:account.analytic.default,date_stop:0
 msgid "End Date"
-msgstr ""
+msgstr "Ngày kết thúc"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
@@ -150,29 +150,29 @@ msgstr ""
 #. module: account_analytic_default
 #: field:account.analytic.default,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Trình tự"
 
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_account_invoice_line
 msgid "Invoice Line"
-msgstr ""
+msgstr "Dòng hóa đơn"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,analytic_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "Tài khoản KTQT"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 msgid "Accounts"
-msgstr ""
+msgstr "Các tài khoản"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Đối tác"
 
 #. module: account_analytic_default
 #: field:account.analytic.default,date_start:0

addons/account_analytic_plans/i18n/tr.po

@@ -7,30 +7,30 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-03 16:56+0000\n"
-"PO-Revision-Date: 2010-09-09 07:09+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2011-05-22 16:29+0000\n"
+"Last-Translator: Ayhan KIZILTAN <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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-05-23 04:37+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
 
 #. 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 ""
+msgstr "Dağıtım modeli kaydedildi. Daha sonra tekrar kullanabilirsiniz."
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance.line,plan_id:0
 msgid "Plan Id"
-msgstr ""
+msgstr "Plan No"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "From Date"
-msgstr "Baş. Tarihi"
+msgstr "Tarihinden"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
@@ -38,7 +38,7 @@ msgstr "Baş. Tarihi"
 #: 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
 msgid "Crossovered Analytic"
-msgstr ""
+msgstr "Çarpraz Analiz"
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan:0
@@ -48,12 +48,12 @@ msgstr ""
 #: 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 ""
+msgstr "Analiz Planı"
 
 #. module: account_analytic_plans
 #: model:ir.module.module,shortdesc:account_analytic_plans.module_meta_information
 msgid "Multiple-plans management in Analytic Accounting"
-msgstr ""
+msgstr "Analiz Hesabında çoklu plan yönetimi"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,journal_id:0
@@ -66,73 +66,73 @@ msgstr "Yevmiye Analizi"
 #: view:account.analytic.plan.line:0
 #: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_line
 msgid "Analytic Plan Line"
-msgstr ""
+msgstr "Analiz Planı Kalemi"
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:60
 #, python-format
 msgid "User Error"
-msgstr ""
+msgstr "Kullanıcı Hatası"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance
 msgid "Analytic Plan Instance"
-msgstr ""
+msgstr "Analiz Planı Durumu"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
 msgid "Ok"
-msgstr ""
+msgstr "Tamam"
 
 #. module: account_analytic_plans
 #: constraint:account.move.line:0
 msgid "You can not create move line on closed account."
-msgstr ""
+msgstr "Kapalı hesaplarda hareket satırı oluşturamazsınız."
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,plan_id:0
 msgid "Model's Plan"
-msgstr ""
+msgstr "Model Planı"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account2_ids:0
 msgid "Account2 Id"
-msgstr ""
+msgstr "Hesap2 No"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account_ids:0
 msgid "Account Id"
-msgstr ""
+msgstr "Hesap No"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "Amount"
-msgstr "Miktar"
+msgstr "Tutar"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "Code"
-msgstr "Kodu"
+msgstr "Kod"
 
 #. module: account_analytic_plans
 #: sql_constraint:account.move.line:0
 msgid "Wrong credit or debit value in accounting entry !"
-msgstr ""
+msgstr "Hesap girişindeki alacak borç değeri hatalı !"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account6_ids:0
 msgid "Account6 Id"
-msgstr ""
+msgstr "Hesap6 No"
 
 #. module: account_analytic_plans
 #: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_multi_plan_action
 msgid "Multi Plans"
-msgstr ""
+msgstr "Çoklu Plan"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_bank_statement_line
 msgid "Bank Statement Line"
-msgstr ""
+msgstr "Banka Ekstresi Kalemi"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance.line,analytic_account_id:0
@@ -142,35 +142,36 @@ msgstr "Analiz Hesabı"
 #. module: account_analytic_plans
 #: sql_constraint:account.journal:0
 msgid "The code of the journal must be unique per company !"
-msgstr ""
+msgstr "Yevmiye kodu her firma için benzersiz olmalı."
 
 #. module: account_analytic_plans
 #: field:account.crossovered.analytic,ref:0
 msgid "Analytic Account Reference"
-msgstr ""
+msgstr "Analiz Hesabı Referansı"
 
 #. module: account_analytic_plans
 #: constraint:account.move.line:0
 msgid ""
 "You can not create move line on receivable/payable account without partner"
 msgstr ""
+"Bir paydaş belirtmeden borç/alacak hesabı için hareket işlemi yapamazsınız."
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_sale_order_line
 msgid "Sales Order Line"
-msgstr ""
+msgstr "Satış Siparişi Kalemi"
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:47
 #: view:analytic.plan.create.model:0
 #, python-format
 msgid "Distribution Model Saved"
-msgstr ""
+msgstr "Kayıtlı Dağıtım Modeli"
 
 #. module: account_analytic_plans
 #: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_instance_action
 msgid "Analytic Distribution's Models"
-msgstr ""
+msgstr "Dağıtım Analiz Modeli"
 
 #. module: account_analytic_plans
 #: view:account.crossovered.analytic:0
@@ -186,35 +187,35 @@ msgstr "Yüzde"
 #: code:addons/account_analytic_plans/account_analytic_plans.py:201
 #, python-format
 msgid "A model having this name and code already exists !"
-msgstr ""
+msgstr "Bu isimde ve kodda bir model zaten var !"
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41
 #, python-format
 msgid "No analytic plan defined !"
-msgstr ""
+msgstr "Tanımlanmış bir analiz planı yok !"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance.line,rate:0
 msgid "Rate (%)"
-msgstr ""
+msgstr "Oran (%)"
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan:0
 #: field:account.analytic.plan,plan_ids:0
 #: field:account.journal,plan_id:0
 msgid "Analytic Plans"
-msgstr ""
+msgstr "Analiz Planları"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "Perc(%)"
-msgstr ""
+msgstr "Yüzde(%)"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,max_required:0
 msgid "Maximum Allowed (%)"
-msgstr ""
+msgstr "Ençok İzin verilen (%)"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
@@ -224,76 +225,76 @@ msgstr "Yazdırma Tarihi"
 #. module: account_analytic_plans
 #: view:account.analytic.plan.line:0
 msgid "Analytic Plan Lines"
-msgstr ""
+msgstr "Analiz Planı Kalemleri"
 
 #. module: account_analytic_plans
 #: constraint:account.bank.statement.line:0
 msgid ""
 "The amount of the voucher must be the same amount as the one on the "
 "statement line"
-msgstr ""
+msgstr "Fiş tutarı banka ekstresi tutarı ile aynı olmalı"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_invoice_line
 msgid "Invoice Line"
-msgstr ""
+msgstr "Fatura Kalemi"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "Currency"
-msgstr ""
+msgstr "Para Birimi"
 
 #. module: account_analytic_plans
 #: field:account.crossovered.analytic,date1:0
 msgid "Start Date"
-msgstr "Baş. Tarihi"
+msgstr "Başlangıç Tarihi"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "Company"
-msgstr ""
+msgstr "Firma"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account5_ids:0
 msgid "Account5 Id"
-msgstr ""
+msgstr "Hesap5 No"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance_line
 msgid "Analytic Instance Line"
-msgstr ""
+msgstr "Analiz Durumu Kalemi"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,root_analytic_id:0
 msgid "Root Account"
-msgstr ""
+msgstr "Kök Hesap"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "To Date"
-msgstr "Bitiş Tarihi"
+msgstr "Tarihine kadar"
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/account_analytic_plans.py:321
 #: code:addons/account_analytic_plans/account_analytic_plans.py:462
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
-msgstr ""
+msgstr "'%s' Yevmiyesinde bir analiz yevmiyesi tanımlamalısınız!"
 
 #. module: account_analytic_plans
 #: field:account.crossovered.analytic,empty_line:0
 msgid "Dont show empty lines"
-msgstr ""
+msgstr "Boş satırları gösterme"
 
 #. module: account_analytic_plans
 #: model:ir.actions.act_window,name:account_analytic_plans.action_analytic_plan_create_model
 msgid "analytic.plan.create.model.action"
-msgstr ""
+msgstr "analiz.plan.oluştur.model.eylem"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "Analytic Account :"
-msgstr ""
+msgstr "Analiz Hesabı:"
 
 #. module: account_analytic_plans
 #: model:ir.module.module,description:account_analytic_plans.module_meta_information
@@ -332,46 +333,78 @@ msgid ""
 "of distribution models.\n"
 "        "
 msgstr ""
+"Bu modül yevmiye defterine uygun olarak birkaç analiz planı kullanılmasına "
+"izin verir,\n"
+"böylece fatura ya da girişler onaylanırken çoklu analiz kalemlerinin "
+"oluşması\n"
+"sağlanır.\n"
+"\n"
+"Örneğin, aşağıdaki analitik yapıyı tanımlayabilirsiniz:\n"
+"  Projeler\n"
+"      Proje 1\n"
+"          AltProjj 1.1\n"
+"          AltProj 1.2\n"
+"      Proje 2\n"
+"  Satış Elemanı\n"
+"      Eric\n"
+"      Fabien\n"
+"\n"
+"Burada 2 planımız var: Projeler ve Satış Elemanı. Bir fatura satırına \n"
+"2 planda analitik girişler yapılabilmelidir: AltProj 1.1 ve\n"
+"Fabien. Tutar da bölünebilmeli. Aşağıdaki örnek iki projeye \n"
+"değinen ve bir satış elemanına atana bir faturadır:\n"
+"\n"
+"Plan1:\n"
+"    AltProje 1.1 : 50%\n"
+"    AltProje 1.2 : 50%\n"
+"Plan2:\n"
+"    Eric: 100%\n"
+"\n"
+"Faturanın bu kalemi onaylanırsa, bir hesap girişi için\n"
+"3 analitik satır oluşur.\n"
+"Analitik plan, dağıtım modelleri oluşturulurken enaz ve ençok yüzdeleri\n"
+"doğrular.\n"
+"        "
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "Analytic Account Reference:"
-msgstr ""
+msgstr "Analiz Hesap Referansı:"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,name:0
 msgid "Plan Name"
-msgstr ""
+msgstr "Plan Adı"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan,default_instance_id:0
 msgid "Default Entries"
-msgstr ""
+msgstr "Varsayılan Girişler"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_move_line
 msgid "Journal Items"
-msgstr ""
+msgstr "Yevmiye Kalemleri"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account1_ids:0
 msgid "Account1 Id"
-msgstr ""
+msgstr "Hesap1 No"
 
 #. module: account_analytic_plans
 #: constraint:account.move.line:0
 msgid "Company must be same for its related account and period."
-msgstr ""
+msgstr "Firma bağlı olduğu hesap ve dönemle aynı olmalıdır."
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,min_required:0
 msgid "Minimum Allowed (%)"
-msgstr ""
+msgstr "İzin verilen enaz (%)"
 
 #. module: account_analytic_plans
 #: help:account.analytic.plan.line,root_analytic_id:0
 msgid "Root account of this plan."
-msgstr ""
+msgstr "Bu planın kök hesabı."
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/account_analytic_plans.py:201
@@ -379,12 +412,12 @@ msgstr ""
 #: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "Hata"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
 msgid "Save This Distribution as a Model"
-msgstr ""
+msgstr "Bu dağıtımı Model olarak kaydet"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
@@ -395,45 +428,45 @@ msgstr "Miktar"
 #: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:38
 #, python-format
 msgid "Please put a name and a code before saving the model !"
-msgstr ""
+msgstr "Modeli kaydetmeden önce lütfen bir isim ve kod verin !"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_crossovered_analytic
 msgid "Print Crossovered Analytic"
-msgstr ""
+msgstr "Çarpraz Analiz Yazdır"
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/account_analytic_plans.py:321
 #: code:addons/account_analytic_plans/account_analytic_plans.py:462
 #, python-format
 msgid "No Analytic Journal !"
-msgstr ""
+msgstr "Analiz Yevmiyesi yok !"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_bank_statement
 msgid "Bank Statement"
-msgstr ""
+msgstr "Banka Ekstresi"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account3_ids:0
 msgid "Account3 Id"
-msgstr ""
+msgstr "Hesap3 No"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_invoice
 msgid "Invoice"
-msgstr ""
+msgstr "Fatura"
 
 #. module: account_analytic_plans
 #: view:account.crossovered.analytic:0
 #: view:analytic.plan.create.model:0
 msgid "Cancel"
-msgstr "İptal"
+msgstr "Vazgeç"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account4_ids:0
 msgid "Account4 Id"
-msgstr ""
+msgstr "Hesap4 No"
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan.instance.line:0
@@ -444,12 +477,12 @@ msgstr "Analiz Dağılım Kalemleri"
 #: code:addons/account_analytic_plans/account_analytic_plans.py:214
 #, python-format
 msgid "The Total Should be Between %s and %s"
-msgstr ""
+msgstr "Toplam %s ve %s arasında olmalı"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "at"
-msgstr ""
+msgstr "de"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
@@ -464,17 +497,17 @@ msgstr "Analiz Dağılım Kalemi"
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,code:0
 msgid "Distribution Code"
-msgstr ""
+msgstr "Dağıtım Kodu"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "%"
-msgstr ""
+msgstr "%"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "100.00%"
-msgstr ""
+msgstr "100.00%"
 
 #. module: account_analytic_plans
 #: field:account.analytic.default,analytics_id:0
@@ -490,12 +523,12 @@ msgstr "Analiz Dağılımı"
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_journal
 msgid "Journal"
-msgstr ""
+msgstr "Yevmiye"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_analytic_plan_create_model
 msgid "analytic.plan.create.model"
-msgstr ""
+msgstr "analitik.plan.oluştur.model"
 
 #. module: account_analytic_plans
 #: field:account.crossovered.analytic,date2:0
@@ -505,7 +538,7 @@ msgstr "Bitiş Tarihi"
 #. module: account_analytic_plans
 #: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_instance_model_open
 msgid "Distribution Models"
-msgstr ""
+msgstr "Dağıtım Modelleri"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,sequence:0
@@ -515,18 +548,18 @@ msgstr "Sıra No"
 #. module: account_analytic_plans
 #: sql_constraint:account.journal:0
 msgid "The name of the journal must be unique per company !"
-msgstr ""
+msgstr "Yevmiye adı her firmada benzersiz olmalı."
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/account_analytic_plans.py:214
 #, python-format
 msgid "Value Error"
-msgstr ""
+msgstr "Değer Hatası"
 
 #. module: account_analytic_plans
 #: constraint:account.move.line:0
 msgid "You can not create move line on view account."
-msgstr ""
+msgstr "Hesap Görünümünde hareket oluşturamazsınız."
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Görüntüleme mimarisi için Geçersiz XML"

addons/account_analytic_plans/i18n/vi.po

@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-03 16:56+0000\n"
-"PO-Revision-Date: 2010-08-02 20:56+0000\n"
-"Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2011-05-19 13:54+0000\n"
+"Last-Translator: Phong Nguyen-Thanh <Unknown>\n"
 "Language-Team: Vietnamese <vi@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: 2011-04-29 05:20+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-05-20 04:34+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
@@ -26,12 +26,12 @@ msgstr ""
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance.line,plan_id:0
 msgid "Plan Id"
-msgstr ""
+msgstr "Mã kế hoạch"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "From Date"
-msgstr ""
+msgstr "Từ ngày"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
@@ -73,7 +73,7 @@ msgstr ""
 #: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:60
 #, python-format
 msgid "User Error"
-msgstr ""
+msgstr "Lỗi người dùng"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance
@@ -83,7 +83,7 @@ msgstr ""
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
 msgid "Ok"
-msgstr ""
+msgstr "Đồng ý"
 
 #. module: account_analytic_plans
 #: constraint:account.move.line:0
@@ -108,12 +108,12 @@ msgstr ""
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "Amount"
-msgstr ""
+msgstr "Số tiền"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "Code"
-msgstr ""
+msgstr "Mã"
 
 #. module: account_analytic_plans
 #: sql_constraint:account.move.line:0
@@ -138,12 +138,12 @@ msgstr ""
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance.line,analytic_account_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "Tài khoản KTQT"
 
 #. module: account_analytic_plans
 #: sql_constraint:account.journal:0
 msgid "The code of the journal must be unique per company !"
-msgstr ""
+msgstr "Mã của sổ nhật ký phải duy nhất cho mỗi công ty !"
 
 #. module: account_analytic_plans
 #: field:account.crossovered.analytic,ref:0
@@ -176,12 +176,12 @@ msgstr ""
 #. module: account_analytic_plans
 #: view:account.crossovered.analytic:0
 msgid "Print"
-msgstr ""
+msgstr "In"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "Percentage"
-msgstr ""
+msgstr "Phần trăm"
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/account_analytic_plans.py:201
@@ -220,7 +220,7 @@ msgstr ""
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "Printing date"
-msgstr ""
+msgstr "Ngày in"
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan.line:0
@@ -237,22 +237,22 @@ msgstr ""
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_invoice_line
 msgid "Invoice Line"
-msgstr ""
+msgstr "Dòng hóa đơn"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "Currency"
-msgstr ""
+msgstr "Loại tiền tệ"
 
 #. module: account_analytic_plans
 #: field:account.crossovered.analytic,date1:0
 msgid "Start Date"
-msgstr ""
+msgstr "Ngày bắt đầu"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "Company"
-msgstr ""
+msgstr "Công ty"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account5_ids:0
@@ -267,12 +267,12 @@ msgstr ""
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,root_analytic_id:0
 msgid "Root Account"
-msgstr ""
+msgstr "Tài khoản gốc"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "To Date"
-msgstr ""
+msgstr "Đến ngày"
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/account_analytic_plans.py:321
@@ -289,7 +289,7 @@ msgstr ""
 #. module: account_analytic_plans
 #: model:ir.actions.act_window,name:account_analytic_plans.action_analytic_plan_create_model
 msgid "analytic.plan.create.model.action"
-msgstr ""
+msgstr "analytic.plan.create.model.action"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
@@ -380,7 +380,7 @@ msgstr ""
 #: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "Lỗi"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
@@ -390,7 +390,7 @@ msgstr ""
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "Quantity"
-msgstr ""
+msgstr "Số lượng"
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:38
@@ -408,12 +408,12 @@ msgstr ""
 #: code:addons/account_analytic_plans/account_analytic_plans.py:462
 #, python-format
 msgid "No Analytic Journal !"
-msgstr ""
+msgstr "Không có Sổ nhật ký Phân tích !"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_bank_statement
 msgid "Bank Statement"
-msgstr ""
+msgstr "Sổ phụ ngân hàng"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account3_ids:0
@@ -423,13 +423,13 @@ msgstr ""
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_invoice
 msgid "Invoice"
-msgstr ""
+msgstr "Hóa đơn"
 
 #. module: account_analytic_plans
 #: view:account.crossovered.analytic:0
 #: view:analytic.plan.create.model:0
 msgid "Cancel"
-msgstr ""
+msgstr "Hủy bỏ"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account4_ids:0
@@ -455,7 +455,7 @@ msgstr ""
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "Account Name"
-msgstr ""
+msgstr "Tên Tài khoản"
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan.instance.line:0
@@ -470,12 +470,12 @@ msgstr ""
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "%"
-msgstr ""
+msgstr "%"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "100.00%"
-msgstr ""
+msgstr "100,00%"
 
 #. module: account_analytic_plans
 #: field:account.analytic.default,analytics_id:0
@@ -491,17 +491,17 @@ msgstr ""
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_journal
 msgid "Journal"
-msgstr ""
+msgstr "Nhật ký"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_analytic_plan_create_model
 msgid "analytic.plan.create.model"
-msgstr ""
+msgstr "analytic.plan.create.model"
 
 #. module: account_analytic_plans
 #: field:account.crossovered.analytic,date2:0
 msgid "End Date"
-msgstr ""
+msgstr "Ngày kết thúc"
 
 #. module: account_analytic_plans
 #: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_instance_model_open
@@ -511,7 +511,7 @@ msgstr ""
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Trình tự"
 
 #. module: account_analytic_plans
 #: sql_constraint:account.journal:0

addons/account_budget/account_budget.py

@@ -190,7 +190,7 @@ class crossovered_budget_lines(osv.osv):
     _description = "Budget Line"
     _columns = {
         'crossovered_budget_id': fields.many2one('crossovered.budget', 'Budget', ondelete='cascade', select=True, required=True),
-        'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account',required=False),
+        'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account',required=True),
         'general_budget_id': fields.many2one('account.budget.post', 'Budgetary Position',required=True),
         'date_from': fields.date('Start Date', required=True),
         'date_to': fields.date('End Date', required=True),

addons/account_budget/i18n/tr.po

@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2010-09-09 07:04+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2011-05-22 16:37+0000\n"
+"Last-Translator: Ayhan KIZILTAN <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: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-05-23 04:38+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
@@ -36,12 +36,12 @@ msgstr "Bütçe Durumları"
 #: code:addons/account_budget/account_budget.py:119
 #, python-format
 msgid "The General Budget '%s' has no Accounts!"
-msgstr ""
+msgstr "Genel Bütçe '%s' a ait Hesap yok!"
 
 #. module: account_budget
 #: report:account.budget:0
 msgid "Printed at:"
-msgstr ""
+msgstr "de Yazıldı"
 
 #. module: account_budget
 #: view:crossovered.budget:0
@@ -51,12 +51,12 @@ msgstr "Onayla"
 #. module: account_budget
 #: field:crossovered.budget,validating_user_id:0
 msgid "Validate User"
-msgstr ""
+msgstr "Kullanıcıyı Doğrula"
 
 #. module: account_budget
 #: model:ir.actions.act_window,name:account_budget.action_account_budget_crossvered_summary_report
 msgid "Print Summary"
-msgstr ""
+msgstr "Özeti Yazdır"
 
 #. module: account_budget
 #: field:crossovered.budget.lines,paid_date:0
@@ -80,7 +80,7 @@ msgstr "Taslak"
 #. module: account_budget
 #: report:account.budget:0
 msgid "at"
-msgstr ""
+msgstr "de"
 
 #. module: account_budget
 #: view:account.budget.report:0
@@ -97,7 +97,7 @@ msgstr "Döviz:"
 #. module: account_budget
 #: model:ir.model,name:account_budget.model_account_budget_crossvered_report
 msgid "Account Budget crossvered report"
-msgstr ""
+msgstr "Bütçe Hesabı Çarpraz Raporu"
 
 #. module: account_budget
 #: selection:crossovered.budget,state:0
@@ -112,7 +112,7 @@ msgstr "Yüzde"
 #. module: account_budget
 #: report:crossovered.budget.report:0
 msgid "to"
-msgstr ""
+msgstr "nereye"
 
 #. module: account_budget
 #: field:crossovered.budget,state:0
@@ -135,13 +135,13 @@ msgstr ""
 #. module: account_budget
 #: view:account.budget.crossvered.summary.report:0
 msgid "This wizard is used to print summary of budgets"
-msgstr ""
+msgstr "Bu sihirbaz bütçe özetlerini yazdırmak için kullanılır"
 
 #. module: account_budget
 #: report:account.budget:0
 #: report:crossovered.budget.report:0
 msgid "%"
-msgstr ""
+msgstr "%"
 
 #. module: account_budget
 #: report:account.budget:0
@@ -152,7 +152,7 @@ msgstr "Açıklama"
 #. module: account_budget
 #: report:crossovered.budget.report:0
 msgid "Currency"
-msgstr ""
+msgstr "Para Birimi"
 
 #. module: account_budget
 #: report:crossovered.budget.report:0
@@ -164,17 +164,17 @@ msgstr "Toplam :"
 #: field:crossovered.budget,company_id:0
 #: field:crossovered.budget.lines,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Firma"
 
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "To Approve"
-msgstr ""
+msgstr "Onaylamak"
 
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "Reset to Draft"
-msgstr ""
+msgstr "Taslağa Geri Dönüştür"
 
 #. module: account_budget
 #: view:account.budget.post:0
@@ -187,7 +187,7 @@ msgstr "Planlanan Tutar"
 #: report:account.budget:0
 #: report:crossovered.budget.report:0
 msgid "Perc(%)"
-msgstr ""
+msgstr "Yüzde(%)"
 
 #. module: account_budget
 #: view:crossovered.budget:0
@@ -199,7 +199,7 @@ msgstr "Bitti"
 #: report:account.budget:0
 #: report:crossovered.budget.report:0
 msgid "Practical Amt"
-msgstr ""
+msgstr "Pratik Mik"
 
 #. module: account_budget
 #: view:account.analytic.account:0
@@ -219,13 +219,10 @@ msgstr "Bitiş Tarihi"
 #: 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 ""
+msgstr "Analiz hesap için Bütçe Hesabı raporu"
 
 #. module: account_budget
 #: view:account.analytic.account:0
-#: view:account.budget.post:0
-#: view:crossovered.budget:0
-#: field:crossovered.budget.lines,theoritical_amount:0
 msgid "Theoritical Amount"
 msgstr "Kurumsal Tutar"
 
@@ -238,13 +235,13 @@ msgstr "Adı"
 #. module: account_budget
 #: model:ir.model,name:account_budget.model_crossovered_budget_lines
 msgid "Budget Line"
-msgstr ""
+msgstr "Bütçe Kalemi"
 
 #. module: account_budget
 #: view:account.analytic.account:0
 #: view:account.budget.post:0
 msgid "Lines"
-msgstr ""
+msgstr "Satırlar"
 
 #. module: account_budget
 #: report:account.budget:0
@@ -260,7 +257,7 @@ msgstr "Bütçe"
 #: code:addons/account_budget/account_budget.py:119
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Hata!"
 
 #. module: account_budget
 #: field:account.budget.post,code:0
@@ -272,7 +269,7 @@ msgstr "Kodu"
 #: view:account.budget.analytic:0
 #: view:account.budget.crossvered.report:0
 msgid "This wizard is used to print budget"
-msgstr ""
+msgstr "Bu sihirbaz bütçeyi yazdırır"
 
 #. module: account_budget
 #: model:ir.actions.act_window,name:account_budget.act_crossovered_budget_view
@@ -291,7 +288,7 @@ msgstr "Bütçeler"
 msgid ""
 "Error! The currency has to be the same as the currency of the selected "
 "company"
-msgstr ""
+msgstr "Hata! Para birimi seçilen firmanın para birimiyle aynı olmalı"
 
 #. module: account_budget
 #: selection:crossovered.budget,state:0
@@ -301,7 +298,7 @@ msgstr "İptal Edildi"
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "Approve"
-msgstr ""
+msgstr "Onayla"
 
 #. module: account_budget
 #: field:crossovered.budget,date_from:0
@@ -333,7 +330,7 @@ msgstr ""
 #: report:account.budget:0
 #: report:crossovered.budget.report:0
 msgid "Theoretical Amt"
-msgstr ""
+msgstr "Teorik Mik"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
@@ -395,13 +392,13 @@ msgstr "Bütçe :"
 #: report:account.budget:0
 #: report:crossovered.budget.report:0
 msgid "Planned Amt"
-msgstr ""
+msgstr "Planlanan Mik"
 
 #. module: account_budget
 #: view:account.budget.post:0
 #: field:account.budget.post,account_ids:0
 msgid "Accounts"
-msgstr ""
+msgstr "Hesaplar"
 
 #. module: account_budget
 #: view:account.analytic.account:0
@@ -434,13 +431,13 @@ msgstr "Bütçe Yönetimi"
 #. module: account_budget
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "Hata! Yinelenen analiz hesabı oluşturamazsınız."
 
 #. module: account_budget
 #: report:account.budget:0
 #: report:crossovered.budget.report:0
 msgid "Analysis from"
-msgstr ""
+msgstr "den Analiz"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Görüntüleme mimarisi için Geçersiz XML"

addons/account_budget/wizard/account_budget_analytic.py

@@ -36,7 +36,6 @@ class account_budget_analytic(osv.osv_memory):
     }
 
     def check_report(self, cr, uid, ids, context=None):
-        datas = {}
         if context is None:
             context = {}
         data = self.read(cr, uid, ids, context=context)[0]

addons/account_budget/wizard/account_budget_crossovered_report.py

@@ -36,7 +36,6 @@ class account_budget_crossvered_report(osv.osv_memory):
     }
 
     def check_report(self, cr, uid, ids, context=None):
-        datas = {}
         if context is None:
             context = {}
         data = self.read(cr, uid, ids, context=context)[0]

addons/account_budget/wizard/account_budget_crossovered_summary_report.py

@@ -38,7 +38,6 @@ class account_budget_crossvered_summary_report(osv.osv_memory):
     }
 
     def check_report(self, cr, uid, ids, context=None):
-        datas = {}
         if context is None:
             context = {}
         data = self.read(cr, uid, ids, context=context)[0]

addons/account_budget/wizard/account_budget_report.py

@@ -37,7 +37,6 @@ class account_budget_report(osv.osv_memory):
     }
 
     def check_report(self, cr, uid, ids, context=None):
-        datas = {}
         if context is None:
             context = {}
         data = self.read(cr, uid, ids, context=context)[0]

addons/account_cancel/i18n/mk.po

@@ -0,0 +1,32 @@
+# Macedonian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-05-06 14:47+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Macedonian <mk@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: 2011-05-07 04:53+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
+
+#. module: account_cancel
+#: model:ir.module.module,description:account_cancel.module_meta_information
+msgid ""
+"\n"
+"    Module adds 'Allow cancelling entries' field on form view of account "
+"journal. If set to true it allows user to cancel entries & invoices.\n"
+"    "
+msgstr ""
+
+#. module: account_cancel
+#: model:ir.module.module,shortdesc:account_cancel.module_meta_information
+msgid "Account Cancel"
+msgstr "Откажи сметка"

addons/account_chart/i18n/mk.po

@@ -0,0 +1,28 @@
+# Macedonian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-05-07 08:06+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Macedonian <mk@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: 2011-05-08 04:37+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
+
+#. module: account_chart
+#: model:ir.module.module,description:account_chart.module_meta_information
+msgid "Remove minimal account chart"
+msgstr "Отстрани го минималниот график за сметка"
+
+#. module: account_chart
+#: model:ir.module.module,shortdesc:account_chart.module_meta_information
+msgid "Charts of Accounts"
+msgstr "Графици на сметки"

addons/account_chart/i18n/tr.po

@@ -7,21 +7,21 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2009-11-17 09:33+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2011-05-16 21:17+0000\n"
+"Last-Translator: Ayhan KIZILTAN <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: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-05-17 04:40+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
 msgid "Remove minimal account chart"
-msgstr "Minimal hesap grafiğini temizle"
+msgstr "Minimal hesap grafiğini kaldır"
 
 #. module: account_chart
 #: model:ir.module.module,shortdesc:account_chart.module_meta_information
 msgid "Charts of Accounts"
-msgstr "Muhasebe Hesap Planı"
+msgstr "Hesap Planı"

addons/account_coda/i18n/tr.po

@@ -0,0 +1,259 @@
+# Turkish translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-05-15 10:34+0000\n"
+"Last-Translator: Ayhan KIZILTAN <Unknown>\n"
+"Language-Team: Turkish <tr@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: 2011-05-16 04:39+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
+
+#. module: account_coda
+#: help:account.coda,journal_id:0
+#: field:account.coda.import,journal_id:0
+msgid "Bank Journal"
+msgstr "Banka Yevmiyesi"
+
+#. module: account_coda
+#: view:account.coda:0
+#: field:account.coda.import,note:0
+msgid "Log"
+msgstr "Günlük"
+
+#. module: account_coda
+#: model:ir.model,name:account_coda.model_account_coda_import
+msgid "Account Coda Import"
+msgstr "Coda Hesabı İçeaktar"
+
+#. module: account_coda
+#: field:account.coda,name:0
+msgid "Coda file"
+msgstr "Coda dosyası"
+
+#. module: account_coda
+#: view:account.coda:0
+msgid "Group By..."
+msgstr "Grupla..."
+
+#. module: account_coda
+#: field:account.coda.import,awaiting_account:0
+msgid "Default Account for Unrecognized Movement"
+msgstr "Bilinmeyen hareket için Varsayılan Hesap"
+
+#. module: account_coda
+#: help:account.coda,date:0
+msgid "Import Date"
+msgstr "İçeaktarım Tarihi"
+
+#. module: account_coda
+#: field:account.coda,note:0
+msgid "Import log"
+msgstr "İçeaktarım günlüğü"
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Import"
+msgstr "İçeaktar"
+
+#. module: account_coda
+#: view:account.coda:0
+msgid "Coda import"
+msgstr "Coda İçeaktar"
+
+#. module: account_coda
+#: code:addons/account_coda/account_coda.py:51
+#, python-format
+msgid "Coda file not found for bank statement !!"
+msgstr "Banka ekstresi için Coda dosyası bulunamadı !!"
+
+#. module: account_coda
+#: help:account.coda.import,awaiting_account:0
+msgid ""
+"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
+#: view:account.coda:0
+#: field:account.coda,company_id:0
+msgid "Company"
+msgstr "Firma"
+
+#. module: account_coda
+#: 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
+msgid "Search Coda"
+msgstr "Coda Araştır"
+
+#. module: account_coda
+#: view:account.coda:0
+#: field:account.coda,user_id:0
+msgid "User"
+msgstr ""
+
+#. 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
+#: model:ir.model,name:account_coda.model_account_coda
+msgid "coda for an Account"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda.import,def_payable:0
+msgid "Default Payable Account"
+msgstr ""
+
+#. module: account_coda
+#: help:account.coda,name:0
+msgid "Store the detail of bank statements"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Open Statements"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:167
+#, python-format
+msgid "The bank account %s is not defined for the partner %s.\n"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.ui.menu,name:account_coda.menu_account_coda_import
+msgid "Import Coda Statements"
+msgstr ""
+
+#. 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 ""
+
+#. module: account_coda
+#: model:ir.module.module,description:account_coda.module_meta_information
+msgid ""
+"\n"
+"    Module provides functionality to import\n"
+"    bank statements from coda files.\n"
+"    "
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+msgid "Statements"
+msgstr ""
+
+#. module: account_coda
+#: field:account.bank.statement,coda_id:0
+msgid "Coda"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Results :"
+msgstr ""
+
+#. 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
+#: field:account.coda.import,coda:0
+#: model:ir.actions.act_window,name:account_coda.act_account_payment_account_bank_statement
+msgid "Coda File"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.model,name:account_coda.model_account_bank_statement
+msgid "Bank Statement"
+msgstr ""
+
+#. module: account_coda
+#: 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:311
+#, 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
+#: 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
+#: view:account.coda:0
+#: field:account.coda,journal_id:0
+msgid "Journal"
+msgstr ""

addons/account_invoice_layout/report/report_account_invoice_layout.py

@@ -38,7 +38,6 @@ class account_invoice_1(report_sxw.rml_parse):
         result = []
         sub_total = {}
         info = []
-        invoice_list = []
         res = {}
         list_in_seq = {}
         ids = self.pool.get('account.invoice.line').search(self.cr, self.uid, [('invoice_id', '=', invoice.id)])

addons/account_invoice_layout/report/special_message_invoice.py

@@ -46,7 +46,6 @@ class account_invoice_with_message(report_sxw.rml_parse):
         result = []
         sub_total = {}
         info = []
-        invoice_list = []
         res = {}
         list_in_seq = {}
         ids = self.pool.get('account.invoice.line').search(self.cr, self.uid, [('invoice_id', '=', invoice.id)])

addons/account_invoice_layout/wizard/account_invoice_special_message.py

@@ -30,7 +30,6 @@ class account_invoice_special_msg(osv.osv_memory):
         }
 
     def check_report(self, cr, uid, ids, context=None):
-        datas = {}
         if context is None:
             context = {}
 

addons/account_payment/account_payment.py

@@ -66,6 +66,7 @@ class payment_order(osv.osv):
     _name = 'payment.order'
     _description = 'Payment Order'
     _rec_name = 'reference'
+    _order = 'id desc'
 
     def get_wizard(self, type):
         logger = netsvc.Logger()

addons/account_payment/account_payment_view.xml

@@ -150,6 +150,7 @@
                         <tree string="Payment Line">
                             <field name="ml_inv_ref" />
                             <field name="partner_id" select="1"/>
+                            <field name="communication"/>
                             <field name="bank_id" domain="[('partner_id', '=', partner_id)]"/>
                             <field name="ml_maturity_date"/>
                             <field name="date"/>
@@ -291,6 +292,7 @@
                     <field name="ml_inv_ref" />
                     <field name="ml_maturity_date"/>
                     <field name="partner_id" select="1"/>
+                    <field name="communication"/>
                     <field name="amount" sum="Amount Total"/>
                     <field name="amount_currency" sum="Currency Amount Total"/>
                     <field name="currency"/>

addons/account_payment/i18n/tr.po

@@ -7,24 +7,24 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2010-09-09 07:16+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2011-05-16 21:36+0000\n"
+"Last-Translator: Ayhan KIZILTAN <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: 2011-04-29 05:21+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-05-17 04:40+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
 msgid "Scheduled date if fixed"
-msgstr ""
+msgstr "Sabitlenmişse Planlanan tarih"
 
 #. module: account_payment
 #: field:payment.line,currency:0
 msgid "Partner Currency"
-msgstr ""
+msgstr "Paydaş Para Birimi"
 
 #. module: account_payment
 #: view:payment.order:0
@@ -34,13 +34,13 @@ msgstr "Taslak olarak Ayarla"
 #. module: account_payment
 #: help:payment.order,mode:0
 msgid "Select the Payment Mode to be applied."
-msgstr ""
+msgstr "Uygulanacak Ödeme Şeklini Seç"
 
 #. module: account_payment
 #: view:payment.mode:0
 #: view:payment.order:0
 msgid "Group By..."
-msgstr ""
+msgstr "Gruplandır..."
 
 #. module: account_payment
 #: model:ir.module.module,description:account_payment.module_meta_information
@@ -51,18 +51,23 @@ msgid ""
 "* a basic mechanism to easily plug various automated payment.\n"
 "    "
 msgstr ""
+"\n"
+"Bu modül şunları sağlar :\n"
+"* a fatura ödemelerini daha verimli yönetmek.\n"
+"* a çeşitli otomatik ödemeleri kolaylıkla uygulayan bir temel mekanizma.\n"
+"    "
 
 #. module: account_payment
 #: field:payment.order,line_ids:0
 msgid "Payment lines"
-msgstr ""
+msgstr "Ödeme kalemleri"
 
 #. module: account_payment
 #: view:payment.line:0
 #: field:payment.line,info_owner:0
 #: view:payment.order:0
 msgid "Owner Account"
-msgstr ""
+msgstr "Hesap Sahibi"
 
 #. module: account_payment
 #: help:payment.order,state:0
@@ -71,6 +76,9 @@ msgid ""
 " Once the bank is confirmed the state is set to 'Confirmed'.\n"
 " Then the order is paid the state is 'Done'."
 msgstr ""
+"Bir emir durumu 'Taslak' olarak belirlenmişse.\n"
+" Banka durumun 'Onaylı' olarak ayarlanmasını onaylamışsa.\n"
+" Sonra emir ödendi ve durum 'Bitti' olur."
 
 #. module: account_payment
 #: help:account.invoice,amount_to_pay:0
@@ -82,27 +90,27 @@ msgstr ""
 #. module: account_payment
 #: field:payment.mode,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Firma"
 
 #. module: account_payment
 #: field:payment.order,date_prefered:0
 msgid "Preferred date"
-msgstr ""
+msgstr "İstenen Tarih"
 
 #. module: account_payment
 #: selection:payment.line,state:0
 msgid "Free"
-msgstr ""
+msgstr "Boş"
 
 #. module: account_payment
 #: field:payment.order.create,entries:0
 msgid "Entries"
-msgstr "Kayıtlar"
+msgstr "Girişler"
 
 #. module: account_payment
 #: report:payment.order:0
 msgid "Used Account"
-msgstr ""
+msgstr "Kullanılmış Hesap"
 
 #. module: account_payment
 #: field:payment.line,ml_maturity_date:0
@@ -113,17 +121,17 @@ msgstr "Vade Tarihi"
 #. module: account_payment
 #: constraint:account.move.line:0
 msgid "You can not create move line on closed account."
-msgstr ""
+msgstr "Kapalı hesaplarda hareket satırı oluşturamazsınız."
 
 #. module: account_payment
 #: view:account.move.line:0
 msgid "Account Entry Line"
-msgstr ""
+msgstr "Hesap Giriş Satırı"
 
 #. module: account_payment
 #: view:payment.order.create:0
 msgid "_Add to payment order"
-msgstr ""
+msgstr "_Ödeme emrine ekle"
 
 #. module: account_payment
 #: model:ir.actions.act_window,name:account_payment.action_account_payment_populate_statement

addons/account_sequence/account_sequence_installer.py

@@ -75,7 +75,8 @@ class account_sequence_installer(osv.osv_memory):
                 j_ids.append(journal.id)
         if j_ids:
             jou_obj.write(cr, uid, j_ids, {'internal_sequence_id': ir_seq})
-        self.pool.get('ir.values').set(cr, uid, key='default', key2=False, name='internal_sequence_id', models =[('account.journal', False)], value=ir_seq)
+        ir_values_obj = self.pool.get('ir.values')
+        ir_values_obj.set(cr, uid, key='default', key2=False, name='internal_sequence_id', models =[('account.journal', False)], value=ir_seq)
         return res
 
 account_sequence_installer()

addons/account_voucher/voucher_payment_receipt_view.xml

@@ -162,6 +162,7 @@
                         <field name="date" select="1" invisible="context.get('line_type', False)" on_change="onchange_date(partner_id, journal_id, amount, currency_id, type, date)"/>
                         <field name="reference" select="1" invisible="context.get('line_type', False)" string="Payment Ref"/>
                         <field name="name" colspan="2" invisible="context.get('line_type', False)"/>
+                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                         <field name="account_id"
                             widget="selection"
                             invisible="True"/>
@@ -221,7 +222,6 @@
                         </page>
                         <page string="Journal Items" groups="base.group_extended" attrs="{'invisible': [('state','!=','posted')]}">
                             <group col="6" colspan="4">
-                                <field name="company_id" select="1" widget="selection" groups="base.group_multi_company"/>
                                 <field name="period_id"/>
                                 <field name="audit"/>
                             </group>
@@ -303,6 +303,7 @@
                         <field name="date" select="1" invisible="context.get('line_type', False)" on_change="onchange_date(partner_id, journal_id, amount, currency_id, type, date)"/>
                         <field name="reference" select="1" invisible="context.get('line_type', False)" string="Payment Ref"/>
                         <field name="name" colspan="2" invisible="context.get('line_type', False)"/>
+                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                         <field name="account_id"
                             widget="selection"
                             invisible="True"/>
@@ -362,7 +363,6 @@
                         </page>
                         <page string="Journal Items" groups="base.group_extended" attrs="{'invisible': [('state','!=','posted')]}">
                             <group col="6" colspan="4">
-                                <field name="company_id" select="1" widget="selection" groups="base.group_multi_company"/>
                                 <field name="period_id"/>
                                 <field name="audit"/>
                             </group>

addons/account_voucher/voucher_sales_purchase_view.xml

@@ -100,7 +100,8 @@
                         <field name="date" on_change="onchange_date(partner_id, journal_id, amount, currency_id, type, date)"/>
                         <field name="journal_id" domain="[('type','in',['sale','sale_refund'])]" widget="selection" on_change="onchange_journal(journal_id, line_cr_ids, tax_id, partner_id)"/>
                         <field name="number"/>
-                        <field name="name" colspan="4"/>
+                        <field name="name" colspan="2"/>
+                        <field name="company_id" select="1" widget="selection" groups="base.group_multi_company"/>
                         <field name="type" invisible="True"/>
                         <field name="currency_id"/>
                     </group>
@@ -140,7 +141,6 @@
                         </page>
                         <page string="Journal Items" groups="base.group_extended" attrs="{'invisible': [('state','!=','posted')]}">
                             <group col="6" colspan="4">
-                                <field name="company_id" select="1" widget="selection" groups="base.group_multi_company"/>
                                 <field name="period_id"/>
                                 <field name="audit"/>
                             </group>
@@ -228,6 +228,7 @@
                         <field name="number"/>
                         <field name="name" colspan="2"/>
                         <field name="reference" select="1"/>
+                        <field name="company_id" select="1" widget="selection" groups="base.group_multi_company"/>
                         <field name="account_id" domain="[('type','=','other')]"  invisible="True"/>
                         <field name="type" invisible="True"/>
                         <field name="currency_id"/>
@@ -260,7 +261,6 @@
                         </page>
                         <page string="Journal Items" groups="base.group_extended" attrs="{'invisible': [('state','!=','posted')]}">
                             <group col="6" colspan="4">
-                                <field name="company_id" select="1" widget="selection" groups="base.group_multi_company"/>
                                 <field name="period_id"/>
                                 <field name="audit"/>
                             </group>

addons/analytic_journal_billing_rate/analytic_journal_billing_rate.py

@@ -20,7 +20,6 @@
 ##############################################################################
 
 from osv import fields,osv
-from osv import orm
 
 class analytic_journal_rate_grid(osv.osv):
 
@@ -103,7 +102,6 @@ class account_invoice(osv.osv):
 
     def _get_analytic_lines(self, cr, uid, id):
         iml = super(account_invoice, self)._get_analytic_lines(cr, uid, id)
-        inv = self.browse(cr, uid, [id])[0]
         for il in iml:
             if il['account_analytic_id'] and il.get('analytic_lines', False):
 

addons/analytic_user_function/analytic_user_function.py

@@ -20,7 +20,6 @@
 ##############################################################################
 
 from osv import fields,osv
-from osv import orm
 from tools.translate import _
 
 class analytic_user_funct_grid(osv.osv):
@@ -98,11 +97,11 @@ class hr_analytic_timesheet(osv.osv):
                                 'for this product: "%s" (id:%d)') % \
                                 (r.product_id.name, r.product_id.id,))
             # Compute based on pricetype
-            amount_unit = self.on_change_unit_amount(cr, uid, ids,
-                r.product_id.id, unit_amount, False, r.product_id.uom_id.id)['value']['amount']
-
-            amount = unit_amount *  amount_unit
-            res ['value']['amount']= - round(amount, 2)
+            if unit_amount:
+                amount_unit = self.on_change_unit_amount(cr, uid, ids,
+                            r.product_id.id, unit_amount, False, r.product_id.uom_id.id)['value']['amount']
+                amount = unit_amount *  amount_unit
+                res ['value']['amount']= - round(amount, 2)
             res ['value']['general_account_id']= a
         return res
 
@@ -133,11 +132,12 @@ class hr_analytic_timesheet(osv.osv):
                                     'for this product: "%s" (id:%d)') % \
                                     (r.product_id.name, r.product_id.id,))
                 # Compute based on pricetype
-                amount_unit = self.on_change_unit_amount(cr, uid, ids,
-                    r.product_id.id, unit_amount, False, r.product_id.uom_id.id)['value']['amount']
+                if unit_amount:
+                    amount_unit = self.on_change_unit_amount(cr, uid, ids,
+                        r.product_id.id, unit_amount, False, r.product_id.uom_id.id)['value']['amount']
 
-                amount = unit_amount * amount_unit
-                res ['value']['amount']= - round(amount, 2)
+                    amount = unit_amount * amount_unit
+                    res ['value']['amount']= - round(amount, 2)
                 res ['value']['general_account_id']= a
         return res
 

addons/analytic_user_function/i18n/tr.po

@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-03 16:56+0000\n"
-"PO-Revision-Date: 2010-10-30 14:34+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2011-05-08 17:12+0000\n"
+"Last-Translator: Ayhan KIZILTAN <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: 2011-04-29 05:35+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-05-09 04:36+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
 
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,product_id:0
@@ -31,7 +31,7 @@ msgstr "Hata !"
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
 msgid "Timesheet Line"
-msgstr ""
+msgstr "Mesai Kartı Satırı"
 
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,account_id:0
@@ -55,14 +55,14 @@ msgstr "Kullanıcı"
 msgid ""
 "Error! The currency has to be the same as the currency of the selected "
 "company"
-msgstr ""
+msgstr "Hata! Para birim seçilen şirketin para birimiyle aynı olmalı"
 
 #. module: analytic_user_function
 #: code:addons/analytic_user_function/analytic_user_function.py:97
 #: code:addons/analytic_user_function/analytic_user_function.py:132
 #, python-format
 msgid "There is no expense account define for this product: \"%s\" (id:%d)"
-msgstr ""
+msgstr "Bu ürün için tanımlı masraf hesabı yok: \"%s\" (id:%d)"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
@@ -85,6 +85,18 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"\n"
+"    Bu modül, belirli bir kullanıcının varsayılan işlevinin ne olduğunu "
+"tanımlamanızı sağlar. Bu çoğunlukla bir kullanıcı zaman çizelgesi kodlaması "
+"yaparken kullanılır: değerler alınır ve alanlar otomatik doldurulur ... "
+"ancak bu değerleri değiştirme olasılığı hala mevcuttur.\n"
+"\n"
+"    Mevcut hesap için hiçbir veri kaydedilmemişse, varsayılan değer genel "
+"olarak personel bilgisi olarak verilir ki; bu modülün eski yapılandırmalarla "
+"ne mükemmel bir uyum içinde olduğunu gösterir.\n"
+"\n"
+"    "
 
 #. module: analytic_user_function
 #: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
@@ -94,7 +106,7 @@ msgstr "Analitik Kullanıcı Fonksiyonu"
 #. module: analytic_user_function
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "Hata! Yinelenen çözümleme hesabı oluşturamazsınız."
 
 #. module: analytic_user_function
 #: view:analytic_user_funct_grid:0

addons/anonymization/anonymization.py

@@ -295,9 +295,8 @@ class ir_model_fields_anonymize_wizard(osv.osv_memory):
 
         eview = etree.fromstring(res['arch'])
         placeholder = eview.xpath("group[@name='placeholder1']")
-        placeholder = len(placeholder) and placeholder[0] or None
-
-        if placeholder:
+        if len(placeholder):
+            placeholder = placeholder[0]
             if step == 'new_window' and state == 'clear':
                 # clicked in the menu and the fields are not anonymized: warn the admin that backuping the db is very important
                 placeholder.addnext(etree.Element('field', {'name': 'msg', 'colspan': '4', 'nolabel': '1'}))

addons/anonymization/i18n/pt_BR.po

@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-03-08 21:32+0000\n"
-"Last-Translator: Emerson <Unknown>\n"
+"PO-Revision-Date: 2011-05-20 02:08+0000\n"
+"Last-Translator: Gustavo T <Unknown>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@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: 2011-04-29 05:56+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-05-21 05:02+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
@@ -51,7 +51,7 @@ msgstr "ir.model.fields.anonymization"
 #. module: anonymization
 #: model:ir.module.module,shortdesc:anonymization.module_meta_information
 msgid "Database anonymization module"
-msgstr ""
+msgstr "Módulo de anonimização do banco de dados"
 
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,direction:0
@@ -63,25 +63,25 @@ msgstr "Direção"
 #: view:ir.model.fields.anonymization:0
 #: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_fields
 msgid "Anonymized Fields"
-msgstr ""
+msgstr "Campos anonimizados"
 
 #. module: anonymization
 #: model:ir.ui.menu,name:anonymization.menu_administration_anonymization
 msgid "Database anonymization"
-msgstr ""
+msgstr "Anonimização de banco de dados"
 
 #. module: anonymization
 #: code:addons/anonymization/anonymization.py:55
 #: sql_constraint:ir.model.fields.anonymization:0
 #, python-format
 msgid "You cannot have two records having the same model and the same field"
-msgstr ""
+msgstr "Não é possível ter dois registros com o mesmo modelo e mesmo campo"
 
 #. module: anonymization
 #: selection:ir.model.fields.anonymization,state:0
 #: selection:ir.model.fields.anonymize.wizard,state:0
 msgid "Anonymized"
-msgstr ""
+msgstr "Anonimizado"
 
 #. module: anonymization
 #: field:ir.model.fields.anonymization,state:0
@@ -111,17 +111,17 @@ msgstr "Exportar"
 #. module: anonymization
 #: view:ir.model.fields.anonymize.wizard:0
 msgid "Reverse the Database Anonymization"
-msgstr ""
+msgstr "Reverter a Anonimização do Banco de dados"
 
 #. module: anonymization
 #: view:ir.model.fields.anonymize.wizard:0
 msgid "Database Anonymization"
-msgstr ""
+msgstr "Anonimização do Banco de dados"
 
 #. module: anonymization
 #: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_wizard
 msgid "Anonymize database"
-msgstr ""
+msgstr "Anonimizar banco de dados"
 
 #. module: anonymization
 #: view:ir.model.fields.anonymization.history:0

addons/auction/auction.py

@@ -293,13 +293,13 @@ class auction_lots(osv.osv):
                         result = lot.buyer_price - lot.seller_price - lot.costs
 
                 elif name == "gross_margin":
-                   if ((lot.obj_price==0) and (lot.state=='draft')):
-                     amount = lot.lot_est1
-                   else:
-                     amount = lot.obj_price
-                   if amount > 0:
-                     result = (lot.gross_revenue * 100) / amount
-                     result = round(result,2)
+                    if ((lot.obj_price==0) and (lot.state=='draft')):
+                        amount = lot.lot_est1
+                    else:
+                        amount = lot.obj_price
+                    if amount > 0:
+                        result = (lot.gross_revenue * 100) / amount
+                        result = round(result,2)
 
                 elif name == "net_margin":
                     if ((lot.obj_price==0) and (lot.state=='draft')):

addons/auction/auction_view.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
 <data>
-    <menuitem name="Auction" id="auction_menu_root" icon="terp-purchase" sequence="26" 
+    <menuitem name="Auction" id="auction_menu_root" icon="terp-purchase" sequence="26"
                 groups="group_auction_manager,group_auction_user"/>
     <menuitem name="Configuration" parent="auction_menu_root" id="auction_config_menu" sequence="7" groups="group_auction_manager"/>
     <menuitem name="Tools Bar Codes" id="auction_outils_menu" parent="auction_menu_root" sequence="5" />
@@ -39,6 +39,7 @@
         </field>
     </record>
     <record model="ir.actions.act_window" id="action_auction_artist">
+        <field name="name">Auction Artists</field>
         <field name="res_model">auction.artists</field>
         <field name="view_type">form</field>
         <field name="view_id" ref="view_auction_artist_tree"/>
@@ -76,12 +77,13 @@
     </record>
 
     <record model="ir.actions.act_window" id="action_auction_object_categories">
+        <field name="name">Auction object Categories</field>
         <field name="res_model">auction.lot.category</field>
         <field name="view_type">form</field>
         <field name="view_id" ref="view_auction_object_categories_tree"/>
     </record>
 
-    <menuitem name="Object Categories" parent="auction_config_menu" action="action_auction_object_categories" 
+    <menuitem name="Object Categories" parent="auction_config_menu" action="action_auction_object_categories"
                 id="menu_auction_object_cat" groups="group_auction_manager"/>
 
    <!--  Auction Management/Auction Dates/New Auction Dates  -->
@@ -759,6 +761,7 @@
     </record>
 
     <record model="ir.actions.act_window" id="action_bid_open">
+        <field name="name">Open Bids</field>
         <field name="res_model">auction.bid</field>
         <field name="view_mode">tree,form</field>
     </record>

addons/auction/board_auction_view.xml

@@ -6,12 +6,14 @@
         </record>
 
         <record model="ir.actions.act_window" id="action_report_latest_objects_tree">
+            <field name="name">Latest objects</field>
             <field name="res_model">auction.lots</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
 
         <record model="ir.actions.act_window" id="action_report_latest_doposit_tree">
+            <field name="name">Latest Deposits</field>
             <field name="res_model">auction.deposit</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
@@ -38,7 +40,7 @@
         <field name="type">graph</field>
         <field name="arch" type="xml">
             <graph string="Min est/Adj/Max est" orientation="vertical" type="bar">
-                <field name="lot_type" select="1"/>
+                <field name="lot_type"/>
                 <field name="lot_est1" operator="+"/>
                 <field name="obj_price" operator="+"/>
                 <field name="lot_est2" operator="+"/>
@@ -110,7 +112,7 @@
             action="open_board_auction"
             sequence="1"
             id="menu_board_auction_open"  icon="terp-graph" parent="menu_board_auction"/>
-        
+
         <menuitem name="Auction" id="auction.auction_menu_root" icon="terp-purchase" sequence="26" action="open_board_auction"/>
 
     </data>

addons/auction/report/auction_artists.py

@@ -20,7 +20,6 @@
 ##############################################################################
 
 
-import pooler
 import time
 from report import report_sxw
 

addons/auction/report/auction_bids.py

@@ -20,7 +20,6 @@
 ##############################################################################
 
 
-import pooler
 import time
 from report import report_sxw
 

addons/auction/report/auction_buyer_result.py

@@ -20,7 +20,6 @@
 ##############################################################################
 
 
-import pooler
 import time
 from report import report_sxw
 

addons/auction/report/auction_catelog.py

@@ -19,7 +19,6 @@
 #
 ##############################################################################
 
-import pooler
 import time
 from report import report_sxw
 

addons/auction/report/auction_objects.py

@@ -19,7 +19,6 @@
 #
 ##############################################################################
 
-import pooler
 import time
 from report import report_sxw
 

addons/auction/report/auction_result.py

@@ -20,7 +20,6 @@
 ##############################################################################
 
 
-import pooler
 import time
 from report import report_sxw
 

addons/auction/report/auction_total_rml.py

@@ -20,7 +20,6 @@
 ##############################################################################
 
 
-import pooler
 import time
 from report import report_sxw
 

addons/auction/report/bids_lots.py

@@ -20,7 +20,6 @@
 ##############################################################################
 
 
-import pooler
 import time
 from report import report_sxw
 

addons/auction/report/bids_phones_details.py

@@ -20,7 +20,6 @@
 ##############################################################################
 
 
-import pooler
 import time
 from report import report_sxw
 

addons/auction/report/buyer_form_report.py

@@ -20,10 +20,8 @@
 ##############################################################################
 
 
-import pooler
 import time
 from report import report_sxw
-from osv import osv
 
 class buyer_form_report(report_sxw.rml_parse):
     count=0
@@ -51,7 +49,6 @@ class buyer_form_report(report_sxw.rml_parse):
     def buyer_info(self):
         objects = [object for object in self.localcontext.get('objects')]
         ret_dict = {}
-        ret_list = []
         for object in objects:
             partner = ret_dict.get(object.ach_uid.id,False)
             if not partner:

addons/auction/report/buyer_list.py

@@ -19,11 +19,8 @@
 #
 ##############################################################################
 
-import pooler
 import time
 from report import report_sxw
-from osv import osv
-from tools.translate import _
 
 class buyer_list(report_sxw.rml_parse):
     auc_lot_ids=[]
@@ -66,7 +63,6 @@ class buyer_list(report_sxw.rml_parse):
         return auct_dat
 
     def lines_lots_auct_lot(self,obj):
-        auc_lot_ids = []
 
         auc_date_ids = self.pool.get('auction.dates').search(self.cr, self.uid, ([('name','like',obj['name'])]))
 

addons/auction/report/catalog2.py

@@ -19,22 +19,12 @@
 #
 ##############################################################################
 
-import datetime
-import time
 from report.interface import report_rml
-from report.interface import toxml
 import pooler
-from osv import osv,orm
-from time import strptime
 from xml.dom import minidom
-import sys
-import os
 import re
-import netsvc
 import base64
-import wizard
 import photo_shadow
-from tools import config
 import addons
 
 def _to_unicode(s):
@@ -75,11 +65,6 @@ class auction_catalog(report_rml):
         catalog=doc.createElement('catalog')
         doc.documentElement.appendChild(catalog)
 
-
-        infodb='info'
-        commdb='comm'
-        tab_avoid = []
-        tab_no_photo=[]
         auction_lot_pool = pooler.get_pool(cr.dbname).get('auction.lots')
         auction_dates_pool = pooler.get_pool(cr.dbname).get('auction.dates')
         for auction in auction_dates_pool.browse(cr, uid, ids, context=context):
@@ -89,7 +74,7 @@ class auction_catalog(report_rml):
             categ.appendChild(doc.createTextNode(_to_decode(auction.name)))
             catalog.appendChild(categ)
 
-             #Auctuion Date element
+            #Auctuion Date element
             categ = doc.createElement("AuctionDate1")
             categ.appendChild(doc.createTextNode(_to_decode(auction.auction1)))
             catalog.appendChild(categ)
@@ -133,7 +118,6 @@ class auction_catalog(report_rml):
                         infos.appendChild(lnum)
 
                     if cat.image:
-                        import random
                         import tempfile
                         limg = doc.createElement('photo_small')
 

addons/auction/report/catelogwithpictures.py

@@ -19,7 +19,6 @@
 #
 ##############################################################################
 
-import pooler
 import time
 from report import report_sxw
 

addons/auction/report/deposit_seller.py

@@ -20,7 +20,6 @@
 ##############################################################################
 
 
-import pooler
 import time
 from report import report_sxw
 

addons/auction/report/huissier.py

@@ -20,7 +20,6 @@
 ##############################################################################
 
 import pooler
-from osv.osv import osv, orm
 from report.interface import report_rml
 #FIXME: use the one from tools and delete the one from report
 from report.int_to_text import int_to_text

addons/auction/report/lots_list.py

@@ -19,7 +19,6 @@
 #
 ##############################################################################
 
-import pooler
 import time
 from report import report_sxw
 

addons/auction/report/lots_list_inventory.py

@@ -19,7 +19,6 @@
 #
 ##############################################################################
 
-import pooler
 import time
 from report import report_sxw
 

addons/auction/report/lots_list_landscape.py

@@ -19,7 +19,6 @@
 #
 ##############################################################################
 
-import pooler
 import time
 from report import report_sxw
 

addons/auction/report/report_auction_view.xml

@@ -159,7 +159,7 @@ Objects per Day
         <field name="type">graph</field>
         <field name="arch" type="xml">
             <graph string="Objects per day"  type="bar">
-                <field name="name" select="1"/>
+                <field name="name"/>
                 <field name="obj_num" operator="+"/>
                 <field name="user_id" group="True"/>
             </graph>
@@ -168,12 +168,14 @@ Objects per Day
 
 
     <record model="ir.actions.act_window" id="action_report_auction_object_date_tree_my">
+        <field name="name">My Auction Object Date</field>
         <field name="res_model">report.auction.object.date</field>
         <field name="view_type">form</field>
         <field name="view_mode">graph,tree</field>
         <field name="domain">[('user_id','=',uid),('month','=',time.strftime('%Y-%m-01'))]</field>
     </record>
     <record model="ir.actions.act_window" id="action_report_auction_object_date_tree">
+        <field name="name">Auction Object Date</field>
         <field name="res_model">report.auction.object.date</field>
         <field name="view_type">form</field>
         <field name="view_mode">graph,tree</field>
@@ -203,14 +205,15 @@ Auction adjudication
         <field name="type">graph</field>
         <field name="arch" type="xml">
             <graph string="Total adjudication" type="bar">
-                <field name="name" select="1"/>
-                <field name="adj_total" select="1" />
+                <field name="name"/>
+                <field name="adj_total"/>
                 <field name="user_id" group="True"/>
             </graph>
         </field>
     </record>
 
     <record model="ir.actions.act_window" id="action_report_auction_adjudication_tree">
+        <field name="name">Auction Adjudication Report</field>
         <field name="res_model">report.auction.adjudication</field>
         <field name="view_type">form</field>
         <field name="view_mode">graph,tree</field>
@@ -246,7 +249,7 @@ Object encoded
         <field name="type">graph</field>
         <field name="arch" type="xml">
             <graph string="Object statistic" type="bar">
-                <field name="user_id" select="1"/>
+                <field name="user_id"/>
                 <field name="obj_ret"  operator="+" />
                 <field name="obj_num"  operator="+" />
                 <field name="obj_margin"  operator="+" />

addons/auction/report/report_lot_bar_code.py

@@ -19,7 +19,6 @@
 #
 ##############################################################################
 
-import pooler
 import time
 from report import report_sxw
 

addons/auction/report/seller_form_report.py

@@ -20,15 +20,12 @@
 ##############################################################################
 
 
-import pooler
 import time
 from report import report_sxw
-from osv import osv
 
 class seller_form_report(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
         super(seller_form_report, self).__init__(cr, uid, name, context=context)
-        lot=self.pool.get('auction.lots').browse(cr, uid, uid)
 
         self.localcontext.update({
             'time': time,
@@ -52,7 +49,6 @@ class seller_form_report(report_sxw.rml_parse):
     def seller_info(self):
         objects = [object for object in self.localcontext.get('objects')]
         ret_dict = {}
-        ret_list = []
         for object in objects:
 
             partner = ret_dict.get(object.bord_vnd_id.partner_id.id,False)

addons/auction/report/total.py

@@ -19,13 +19,9 @@
 #
 ##############################################################################
 
-import os, time, datetime
+import time
+import netsvc
 
-import netsvc, tools
-
-import report.print_xml
-import report.render
-import report.common
 from report.interface import report_rml
 
 def toxml(val):
@@ -47,7 +43,6 @@ class report_custom(report_rml):
         unpaid_ids = []
         buyer = {}
         seller = {}
-        debit = 0
 
         for l in lots:
             if l['lot_est2']: