odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] merge with main addons branch 

bzr revid: qdp-launchpad@openerp.com-20110630133009-i0qxzrn9up9e0bog
This commit is contained in:
Quentin (OpenERP) 2011-06-30 15:30:09 +02:00
parent 6e6e7b8896 fe98d57143
commit 664ba7bba3
5224 changed files with 134843 additions and 48492 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
addons/account/__openerp__.py
View File

@ -59,6 +59,7 @@ module named account_voucher.
'account_menuitem.xml',
'report/account_invoice_report_view.xml',
'report/account_entries_report_view.xml',
'report/account_treasury_report_view.xml',
'report/account_report_view.xml',
'report/account_analytic_entries_report_view.xml',
'wizard/account_move_bank_reconcile_view.xml',

89
addons/account/account.py
View File

@ -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()
@ -1329,6 +1331,7 @@ class account_move(osv.osv):
def _centralise(self, cr, uid, move, mode, context=None):
assert mode in ('debit', 'credit'), 'Invalid Mode' #to prevent sql injection
currency_obj = self.pool.get('res.currency')
if context is None:
context = {}
@ -1379,6 +1382,34 @@ class account_move(osv.osv):
cr.execute('SELECT SUM(%s) FROM account_move_line WHERE move_id=%%s AND id!=%%s' % (mode,), (move.id, line_id2))
result = cr.fetchone()[0] or 0.0
cr.execute('update account_move_line set '+mode2+'=%s where id=%s', (result, line_id))
#adjust also the amount in currency if needed
cr.execute("select currency_id, sum(amount_currency) as amount_currency from account_move_line where move_id = %s and currency_id is not null group by currency_id", (move.id,))
for row in cr.dictfetchall():
currency_id = currency_obj.browse(cr, uid, row['currency_id'], context=context)
if not currency_obj.is_zero(cr, uid, currency_id, row['amount_currency']):
amount_currency = row['amount_currency'] * -1
account_id = amount_currency > 0 and move.journal_id.default_debit_account_id.id or move.journal_id.default_credit_account_id.id
cr.execute('select id from account_move_line where move_id=%s and centralisation=\'currency\' and currency_id = %slimit 1', (move.id, row['currency_id']))
res = cr.fetchone()
if res:
cr.execute('update account_move_line set amount_currency=%s , account_id=%s where id=%s', (amount_currency, account_id, res[0]))
else:
context.update({'journal_id': move.journal_id.id, 'period_id': move.period_id.id})
line_id = self.pool.get('account.move.line').create(cr, uid, {
'name': _('Currency Adjustment'),
'centralisation': 'currency',
'account_id': account_id,
'move_id': move.id,
'journal_id': move.journal_id.id,
'period_id': move.period_id.id,
'date': move.period_id.date_stop,
'debit': 0.0,
'credit': 0.0,
'currency_id': row['currency_id'],
'amount_currency': amount_currency,
}, context)
return True
#
@ -1562,14 +1593,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 +2691,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 +2698,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 +2711,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 +2718,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 +2951,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 +2978,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 +2995,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 +3060,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()

2
addons/account/account_analytic_line.py
View File

@ -32,7 +32,7 @@ class account_analytic_line(osv.osv):
'product_uom_id': fields.many2one('product.uom', 'UoM'),
'product_id': fields.many2one('product.product', 'Product'),
'general_account_id': fields.many2one('account.account', 'General Account', required=True, ondelete='restrict'),
'move_id': fields.many2one('account.move.line', 'Move Line', ondelete='restrict', select=True),
'move_id': fields.many2one('account.move.line', 'Move Line', ondelete='cascade', select=True),
'journal_id': fields.many2one('account.analytic.journal', 'Analytic Journal', required=True, ondelete='restrict', select=True),
'code': fields.char('Code', size=8),
'ref': fields.char('Ref.', size=64),

2
addons/account/account_bank_statement.py
View File

@ -461,7 +461,7 @@ class account_bank_statement_line(osv.osv):
select=True, required=True, ondelete='cascade'),
'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account'),
'move_ids': fields.many2many('account.move',
'account_bank_statement_line_move_rel', 'statement_id','move_id',
'account_bank_statement_line_move_rel', 'statement_line_id','move_id',
'Moves'),
'ref': fields.char('Reference', size=32),
'note': fields.text('Notes'),

5
addons/account/account_invoice_view.xml
View File

@ -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'}"/>

21
addons/account/account_move_line.py
View File

@ -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']))
@ -501,7 +503,7 @@ class account_move_line(osv.osv):
}),
'date_created': fields.date('Creation date', select=True),
'analytic_lines': fields.one2many('account.analytic.line', 'move_id', 'Analytic lines'),
'centralisation': fields.selection([('normal','Normal'),('credit','Credit Centralisation'),('debit','Debit Centralisation')], 'Centralisation', size=6),
'centralisation': fields.selection([('normal','Normal'),('credit','Credit Centralisation'),('debit','Debit Centralisation'),('currency','Currency Adjustment')], 'Centralisation', size=8),
'balance': fields.function(_balance, fnct_search=_balance_search, method=True, string='Balance'),
'state': fields.selection([('draft','Unbalanced'), ('valid','Valid')], 'State', readonly=True,
help='When new move line is created the state will be \'Draft\'.\n* When all the payments are done it will be in \'Valid\' state.'),
@ -1198,10 +1200,11 @@ class account_move_line(osv.osv):
def _update_check(self, cr, uid, ids, context=None):
done = {}
for line in self.browse(cr, uid, ids, context=context):
err_msg = _('Move name (id): %s (%s)') % (line.move_id.name, str(line.move_id.id))
if line.move_id.state <> 'draft' and (not line.journal_id.entry_posted):
raise osv.except_osv(_('Error !'), _('You can not do this modification on a confirmed entry ! Please note that you can just change some non important fields !'))
raise osv.except_osv(_('Error !'), _('You can not do this modification on a confirmed entry ! Please note that you can just change some non important fields ! \n%s') % err_msg)
if line.reconcile_id:
raise osv.except_osv(_('Error !'), _('You can not do this modification on a reconciled entry ! Please note that you can just change some non important fields !'))
raise osv.except_osv(_('Error !'), _('You can not do this modification on a reconciled entry ! Please note that you can just change some non important fields ! \n%s') % err_msg)
t = (line.journal_id.id, line.period_id.id)
if t not in done:
self._update_journal_check(cr, uid, line.journal_id.id, line.period_id.id, context)

1
addons/account/account_report.xml
View File

@ -19,7 +19,6 @@
rml="account/report/account_print_invoice.rml"
string="Invoices"
attachment="(object.state in ('open','paid')) and ('INV'+(object.number or '').replace('/',''))"
attachment_use="1"
multi="True"/>
<report id="account_transfers" model="account.transfer" name="account.transfer" string="Transfers" xml="account/report/transfer.xml" xsl="account/report/transfer.xsl"/>
<report auto="False" id="account_intracom" menu="False" model="account.move.line" name="account.intracom" string="IntraCom"/>

5
addons/account/data/account_data2.xml
View File

@ -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
-->

392
addons/account/i18n/ar.po
View File

File diff suppressed because it is too large Load Diff

28
addons/account/i18n/bg.po
View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-03-18 04:48+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:05+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@ -1804,7 +1804,7 @@ msgstr "Записи по ред"
#. module: account
#: report:account.tax.code.entries:0
msgid "A/c Code"
msgstr ""
msgstr "Код на сметка"
#. module: account
#: field:account.invoice,move_id:0
@ -3970,7 +3970,7 @@ msgstr ""
#. module: account
#: field:account.journal,view_id:0
msgid "Display Mode"
msgstr ""
msgstr "Режим на екрана"
#. module: account
#: model:process.node,note:account.process_node_importinvoice0
@ -4036,7 +4036,7 @@ msgstr "Приключващ баланс"
#: code:addons/account/report/common_report_header.py:92
#, python-format
msgid "Not implemented"
msgstr ""
msgstr "Не е реализирано"
#. module: account
#: model:ir.model,name:account.model_account_journal_select
@ -4051,7 +4051,7 @@ msgstr "Отпечатване на фактура"
#. module: account
#: view:account.tax.template:0
msgid "Credit Notes"
msgstr "Бележки по кредит"
msgstr "кредитни известия"
#. module: account
#: code:addons/account/account.py:2067
@ -5485,7 +5485,7 @@ msgstr ""
#: code:addons/account/wizard/account_report_common.py:126
#, python-format
msgid "not implemented"
msgstr ""
msgstr "не е реализирано"
#. module: account
#: help:account.journal,company_id:0
@ -6238,7 +6238,7 @@ msgstr ""
#: view:account.move:0
#: field:account.move,to_check:0
msgid "To Review"
msgstr ""
msgstr "За преглед"
#. module: account
#: view:account.bank.statement:0
@ -6869,7 +6869,7 @@ msgstr " ден от месеца= -1"
#. module: account
#: constraint:res.partner:0
msgid "Error ! You can not create recursive associated members."
msgstr ""
msgstr "Грешка ! Не може да създадете рекурсивно свързани членове"
#. module: account
#: help:account.journal,type:0
@ -8482,7 +8482,7 @@ msgstr ""
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
msgid "Filters By"
msgstr ""
msgstr "Филтри по"
#. module: account
#: model:process.node,note:account.process_node_manually0
@ -9001,7 +9001,7 @@ msgstr ""
#: selection:account.account.template,type:0
#: selection:account.entries.report,type:0
msgid "Regular"
msgstr ""
msgstr "Редовен"
#. module: account
#: view:account.account:0
@ -9126,7 +9126,7 @@ msgstr "Няма зададена приходна сметка за проду
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
msgid "JNRL"
msgstr ""
msgstr "Журнал"
#. module: account
#: view:account.payment.term.line:0
@ -9159,7 +9159,7 @@ msgstr "Общо"
#: code:addons/account/wizard/account_move_journal.py:97
#, python-format
msgid "Journal: All"
msgstr ""
msgstr "Журнал: Всички"
#. module: account
#: field:account.account,company_id:0
@ -9475,7 +9475,7 @@ msgstr ""
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_periodical_processing_billing
msgid "Billing"
msgstr ""
msgstr "За плащане"
#. module: account
#: view:account.account:0

4
addons/account/i18n/br.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-03-18 04:47+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:04+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0

4
addons/account/i18n/bs.po
View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-03-18 04:47+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:04+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0

4
addons/account/i18n/ca.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-03-27 04:53+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:05+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0

6
addons/account/i18n/cs.po
View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-03-18 04:48+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:05+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@ -181,7 +181,7 @@ msgstr ""
#: code:addons/account/invoice.py:1421
#, python-format
msgid "Warning!"
msgstr ""
msgstr "Varování!"
#. module: account
#: field:account.fiscal.position.account,account_src_id:0

4
addons/account/i18n/da.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-03-18 04:48+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:05+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0

2
addons/account/i18n/de.po
View File

@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-04-22 04:38+0000\n"
"X-Launchpad-Export-Date: 2011-04-29 05:06+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account

8
addons/account/i18n/el.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-03-18 04:49+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:06+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@ -10799,6 +10799,10 @@ msgstr ""
#~ msgid "Number of entries are generated"
#~ msgstr "ο αριθμός των εγγραφών δημιουργήθηκε"
#, python-format
#~ msgid "Can not pay draft/proforma/cancel invoice."
#~ msgstr "Αδύνατη η πληρωμή πρόχειρου/προφόρμας/τιμολογίου"
#~ msgid "Entries Encoding by Move"
#~ msgstr "Κωδικοποίηση Εγγραφών ανά Κίνηση"

4
addons/account/i18n/en_US.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-03-18 04:56+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:13+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0

4
addons/account/i18n/es.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-03-28 04:36+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:11+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0

4
addons/account/i18n/es_AR.po
View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-03-18 04:56+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:13+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0

9641
addons/account/i18n/es_CL.po Normal file
View File

File diff suppressed because it is too large Load Diff

4
addons/account/i18n/es_EC.po
View File

@ -16,8 +16,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-03-18 04:57+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:14+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0

4
addons/account/i18n/es_PY.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-03-18 04:57+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:14+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0

4
addons/account/i18n/et.po
View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-03-18 04:49+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:05+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0

4
addons/account/i18n/eu.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-03-18 04:47+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:04+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0

4
addons/account/i18n/fa.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-03-18 04:52+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:09+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0

4
addons/account/i18n/fa_AF.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-03-18 04:57+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:14+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0

4
addons/account/i18n/fi.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-03-18 04:49+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:06+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0

405
addons/account/i18n/fr.po
View File

File diff suppressed because it is too large Load Diff

4
addons/account/i18n/fr_BE.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-03-18 04:56+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:13+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0

10
addons/account/i18n/gl.po
View File

@ -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-02-02 10:14+0000\n"
"Last-Translator: Alberto Luengo Cabanillas (Pexego) <alberto@pexego.es>\n"
"PO-Revision-Date: 2011-04-27 15:37+0000\n"
"Last-Translator: Xosé <Unknown>\n"
"Language-Team: Galician <gl@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-03-18 04:49+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:06+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@ -2140,7 +2140,7 @@ msgstr ""
#: field:analytic.entries.report,name:0
#: field:report.invoice.created,name:0
msgid "Description"
msgstr "Descripción"
msgstr "Descrición"
#. module: account
#: code:addons/account/account.py:2844

4
addons/account/i18n/gu.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-03-18 04:50+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:06+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0

385
addons/account/i18n/he.po
View File

File diff suppressed because it is too large Load Diff

4
addons/account/i18n/hi.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-03-18 04:50+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:07+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0

4
addons/account/i18n/hr.po
View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-03-18 04:53+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:10+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0

4
addons/account/i18n/hu.po
View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-03-19 05:19+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:07+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0

4
addons/account/i18n/id.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-03-18 04:50+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:07+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0

19
addons/account/i18n/it.po
View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-04-06 04:39+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:07+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@ -5170,6 +5170,8 @@ msgid ""
"According value related accounts will be display on respective reports "
"(Balance Sheet Profit & Loss Account)"
msgstr ""
"I valori di raccordo dei conti saranno mostrati nei rispettivi rapporti "
"(Conto Economico)"
#. module: account
#: field:account.report.general.ledger,sortby:0
@ -10639,6 +10641,10 @@ msgstr ""
#~ msgid "Confirm statement from draft"
#~ msgstr "Conferma il rendiconto da bozza"
#, python-format
#~ msgid "No Data Available"
#~ msgstr "Nessun dato disponibile"
#~ msgid "Keep empty if the fiscal year belongs to several companies."
#~ msgstr "Lasciare vuoto se l'anno fiscale appartiene a più aziende"
@ -11098,3 +11104,12 @@ msgstr ""
#~ msgstr ""
#~ "Questo conto verra' usato per le fatture al posto del conto di ricavo per la "
#~ "categoria prodotto"
#~ msgid "Header"
#~ msgstr "Intestazione"
#~ msgid "<drawRightString x=\"19.8cm\" y=\"28cm\">"
#~ msgstr "<drawRightString x=\"19.8cm\" y=\"28cm\">"
#~ msgid "</drawRightString>"
#~ msgstr "</drawRightString>"

4
addons/account/i18n/kab.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-03-18 04:51+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:07+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0

4
addons/account/i18n/ko.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-03-18 04:51+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:08+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0

4
addons/account/i18n/lo.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-03-18 04:51+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:08+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0

21
addons/account/i18n/lt.po
View File

@ -8,13 +8,14 @@ msgstr ""
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
"PO-Revision-Date: 2010-12-11 22:27+0000\n"
"Last-Translator: Giedrius Slavinskas <giedrius.slavinskas@gmail.com>\n"
"Last-Translator: Giedrius Slavinskas - inovera.lt "
"<giedrius.slavinskas@gmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-03-18 04:51+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:08+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@ -289,7 +290,7 @@ msgstr ""
#: model:ir.actions.act_window,name:account.action_view_account_use_model
#: model:ir.ui.menu,name:account.menu_action_manual_recurring
msgid "Manual Recurring"
msgstr ""
msgstr "Pasirinktinas pasikartojančių įrašų kūrimas"
#. module: account
#: view:account.fiscalyear.close.state:0
@ -1422,7 +1423,7 @@ msgstr "Uždaryta"
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
msgid "Recurring Entries"
msgstr ""
msgstr "Pasikartojantys įrašai"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
@ -3579,7 +3580,7 @@ msgstr "Nustatyti kaip juodraštį"
#. module: account
#: model:ir.actions.act_window,name:account.action_subscription_form
msgid "Recurring Lines"
msgstr ""
msgstr "Pasikartojančios eilutės"
#. module: account
#: field:account.partner.balance,display_partner:0
@ -4054,7 +4055,7 @@ msgstr ""
#: model:ir.actions.act_window,name:account.action_model_form
#: model:ir.ui.menu,name:account.menu_action_model_form
msgid "Recurring Models"
msgstr ""
msgstr "Pasikartojantys modeliai"
#. module: account
#: selection:account.automatic.reconcile,power:0
@ -5995,7 +5996,7 @@ msgstr "Įrašai: "
#. module: account
#: view:account.use.model:0
msgid "Create manual recurring entries in a chosen journal."
msgstr ""
msgstr "Sukurti pasikartojančius įrašus pasirinktame žurnale."
#. module: account
#: code:addons/account/account.py:1393
@ -9090,7 +9091,7 @@ msgstr "Įmonė"
#. module: account
#: model:ir.ui.menu,name:account.menu_action_subscription_form
msgid "Define Recurring Entries"
msgstr ""
msgstr "Apibrėžti pasikartojančius įrašus"
#. module: account
#: field:account.entries.report,date_maturity:0
@ -9263,7 +9264,7 @@ msgstr ""
#. module: account
#: view:account.subscription:0
msgid "Recurring"
msgstr ""
msgstr "Pasikartojantis"
#. module: account
#: code:addons/account/account_move_line.py:805

4
addons/account/i18n/lv.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-04-02 04:55+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:08+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0

9625
addons/account/i18n/mk.po Normal file
View File

File diff suppressed because it is too large Load Diff

4
addons/account/i18n/mn.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-03-18 04:51+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:08+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0

2584
addons/account/i18n/nb.po
View File

File diff suppressed because it is too large Load Diff

4
addons/account/i18n/nl.po
View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-03-18 04:48+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:05+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: code:addons/account/account.py:1167

4
addons/account/i18n/nl_BE.po
View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-03-18 04:56+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:13+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0

4
addons/account/i18n/oc.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-03-18 04:52+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:09+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0

4
addons/account/i18n/pl.po
View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-03-18 04:52+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:09+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0

796
addons/account/i18n/pt.po
View File

File diff suppressed because it is too large Load Diff

103
addons/account/i18n/pt_BR.po
View File

@ -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-04-21 21:39+0000\n"
"Last-Translator: Nédio Batista Marques <Unknown>\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-04-22 04:38+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
@ -675,7 +675,7 @@ msgstr "Valor do Código do Imposto"
#: code:addons/account/installer.py:434
#, python-format
msgid "SAJ"
msgstr "SAJ"
msgstr "DV"
#. module: account
#: help:account.bank.statement,balance_end_real:0
@ -948,7 +948,7 @@ msgstr "Diário Centralizador"
#. module: account
#: selection:account.journal,type:0
msgid "Sale Refund"
msgstr "Reembolso de Vendas"
msgstr "Devolução de Venda"
#. module: account
#: model:process.node,note:account.process_node_accountingstatemententries0
@ -1549,7 +1549,7 @@ msgstr "Conta pagável"
#: field:account.tax,account_paid_id:0
#: field:account.tax.template,account_paid_id:0
msgid "Refund Tax Account"
msgstr "Conta reembolso da taxa"
msgstr "Conta de Reembolso de Imposto"
#. module: account
#: view:account.bank.statement:0
@ -1639,8 +1639,8 @@ msgid ""
"Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
"cancel the current invoice."
msgstr ""
"Cancelar Fatura: Cria uma Fatura de Reembolso, Valide e Reconcilie a mesma "
"para cancelar a Fatura Corrente."
"Cancelar Fatura: Crie a fatura de devolução, valide e a reconcilie para "
"cancelar a fatura atual."
#. module: account
#: model:ir.ui.menu,name:account.periodical_processing_invoicing
@ -2148,7 +2148,7 @@ msgstr "Descrição"
#: code:addons/account/installer.py:498
#, python-format
msgid "ECNJ"
msgstr ""
msgstr "DRC"
#. module: account
#: view:account.subscription:0
@ -2397,7 +2397,7 @@ msgstr "Modelo de entrada de contas"
#: code:addons/account/installer.py:454
#, python-format
msgid "EXJ"
msgstr "EXJ"
msgstr "DC"
#. module: account
#: field:product.template,supplier_taxes_id:0
@ -2567,7 +2567,7 @@ msgstr "Pago/Reconciliado"
#: field:account.tax,ref_base_code_id:0
#: field:account.tax.template,ref_base_code_id:0
msgid "Refund Base Code"
msgstr "Código base p/reembolso"
msgstr "Código Base para Devolução"
#. module: account
#: model:ir.actions.act_window,name:account.action_bank_statement_periodic_tree
@ -2966,14 +2966,14 @@ msgstr "Visualizar"
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
msgstr ""
msgstr "BCO%s"
#. module: account
#: code:addons/account/account.py:2906
#: code:addons/account/installer.py:296
#, python-format
msgid "BNK"
msgstr "BNK"
msgstr "BCO"
#. module: account
#: field:account.move.line,analytic_lines:0
@ -4396,7 +4396,7 @@ msgstr "Data da operação"
#: field:account.tax,ref_tax_code_id:0
#: field:account.tax.template,ref_tax_code_id:0
msgid "Refund Tax Code"
msgstr "Código da taxa de reembolso"
msgstr "Código do Imposto para Reembolso"
#. module: account
#: view:validate.account.move:0
@ -4620,7 +4620,8 @@ msgstr ""
#. module: account
#: help:account.journal,refund_journal:0
msgid "Fill this if the journal is to be used for refunds of invoices."
msgstr "Preencha se o diário for usado para reembolso de faturas."
msgstr ""
"Preencha este campo se o diário deve ser usado para reembolsos de faturas."
#. module: account
#: view:account.fiscalyear.close:0
@ -5076,7 +5077,7 @@ msgstr "Contabilidade Analítica"
#: selection:account.invoice.report,type:0
#: selection:report.invoice.created,type:0
msgid "Customer Refund"
msgstr "Reembolso do cliente"
msgstr "Reembolso a Cliente"
#. module: account
#: view:account.account:0
@ -5643,7 +5644,7 @@ msgstr " 365 dias "
#: model:ir.actions.act_window,name:account.action_invoice_tree3
#: model:ir.ui.menu,name:account.menu_action_invoice_tree3
msgid "Customer Refunds"
msgstr "Reembolso a clientes"
msgstr "Reembolsos para Cliente"
#. module: account
#: view:account.payment.term.line:0
@ -5758,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
@ -5982,7 +5983,7 @@ msgstr "Energia"
#. module: account
#: field:account.invoice.refund,filter_refund:0
msgid "Refund Type"
msgstr "Tipo de Reembolso"
msgstr "Tipo de Devolução"
#. module: account
#: report:account.invoice:0
@ -6122,7 +6123,7 @@ msgstr "Entre com a Data Inicial !"
#: selection:account.invoice.report,type:0
#: selection:report.invoice.created,type:0
msgid "Supplier Refund"
msgstr "Reembolso a fornecedor"
msgstr "Devolução para Fornecedor"
#. module: account
#: model:ir.ui.menu,name:account.menu_dashboard_acc
@ -6786,6 +6787,8 @@ msgid ""
"This date will be used as the invoice date for Refund Invoice and Period "
"will be chosen accordingly!"
msgstr ""
"Esta data será usada como a data da Fatura de Devolução e o período será "
"escolhido apropriadamente!"
#. module: account
#: field:account.aged.trial.balance,period_length:0
@ -7012,9 +7015,9 @@ msgid ""
"Bank Account Number, Company bank account if Invoice is customer or supplier "
"refund, otherwise Partner bank account number."
msgstr ""
"Número da Conta Bancária. Conta bancária da Empresa se a fatura é um "
"reembolso de cliente ou fornecedor, senão é o número da conta bancária do "
"Parceiro."
"Número da Conta Bancária. Será a conta bancária da Empresa se for uma fatura "
"de devolução de cliente ou para fornecedor, senão será o número da conta "
"bancária do Parceiro."
#. module: account
#: help:account.tax,domain:0
@ -7116,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
@ -7764,7 +7770,7 @@ msgstr "Escolha o Ano Fiscal"
#: code:addons/account/installer.py:495
#, python-format
msgid "Purchase Refund Journal"
msgstr "Diário de Reembolso de Compra"
msgstr "Diário de Devolução de Compra"
#. module: account
#: help:account.tax.template,amount:0
@ -7871,10 +7877,10 @@ msgid ""
"can easily generate refunds and reconcile them directly from the invoice "
"form."
msgstr ""
"Com o Reembolso de Clientes você pode gerenciar as notas de crédito para "
"Com os Reembolsos para Cliente você pode gerenciar as notas de crédito para "
"seus clientes. Um reembolso é um documento que credita completamente ou "
"parcialmente uma fatura. Você pode facilmente gerar reembolsos e reconciliá-"
"los diretamente da tela de faturamento."
"los diretamente a partir da tela de faturamento."
#. module: account
#: model:ir.actions.act_window,help:account.action_account_vat_declaration
@ -8021,7 +8027,7 @@ msgstr ""
#: field:account.invoice.refund,journal_id:0
#: field:account.journal,refund_journal:0
msgid "Refund Journal"
msgstr "Diário de reembolso"
msgstr "Diário de Devolução"
#. module: account
#: report:account.account.balance:0
@ -8039,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
@ -8074,7 +8084,7 @@ msgstr "Diário de compras"
#. module: account
#: view:account.invoice.refund:0
msgid "Refund Invoice: Creates the refund invoice, ready for editing."
msgstr "Fatura de Reembolso: Cria a fatura de reembolso pronta para edição."
msgstr "Fatura de Devolução: Cria a fatura de devolução pronta para edição."
#. module: account
#: field:account.invoice.line,price_subtotal:0
@ -8084,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
@ -8433,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
@ -8470,7 +8483,7 @@ msgstr "Período de"
#: code:addons/account/installer.py:476
#, python-format
msgid "Sales Refund Journal"
msgstr "Diário de Reembolso de Vendas"
msgstr "Diário de Devolução de Vendas"
#. module: account
#: code:addons/account/account.py:927
@ -8544,7 +8557,7 @@ msgstr "Configure sua Aplicação Contábil"
#: code:addons/account/installer.py:479
#, python-format
msgid "SCNJ"
msgstr ""
msgstr "DRV"
#. module: account
#: model:process.transition,note:account.process_transition_analyticinvoice0
@ -8673,10 +8686,10 @@ msgid ""
"partially. You can easily generate refunds and reconcile them directly from "
"the invoice form."
msgstr ""
"Com os Reembolsos de Fornecedor, você pode gerenciar as notas de créditos "
"que recebe dos seus fornecedores. Um reembolso é um documento que credita "
"uma fatura completamente ou parcialmente. Você pode facilmente gerar "
"reembolsos e reconciliá-los diretamente a partir da tela de faturas."
"Com os Reembolsos de Fornecedor você pode gerenciar as notas de crédito que "
"recebe dos seus fornecedores. Um reembolso é um documento que credita "
"completamente ou parcialmente uma fatura. Você pode facilmente gerar "
"reembolsos e reconciliá-los diretamente a partir da tela de faturamento."
#. module: account
#: view:account.account.template:0
@ -8829,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
@ -9189,7 +9208,7 @@ msgid ""
"created. If you leave that field empty, it will use the same journal as the "
"current invoice."
msgstr ""
"Aqui você pode selecionar o diário para usar na fatura de reembolso a ser "
"Aqui você pode selecionar o diário para usar na fatura de devolução a ser "
"criada. Se você deixar em branco, será usado o mesmo diário da fatura atual."
#. module: account
@ -9301,7 +9320,7 @@ msgid ""
"Refund invoice base on this type. You can not Modify and Cancel if the "
"invoice is already reconciled"
msgstr ""
"Faturas de Reembolso se baseiam neste tipo. Você não pode Modificar e "
"A faturas de devolução é baseada neste tipo. Você não pode Modificar e "
"Cancelar se a fatura já estiver reconciliada"
#. module: account
@ -9509,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
@ -9603,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
@ -9620,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
@ -9969,7 +9990,7 @@ msgstr "Pesquisar Fatura"
#: view:account.invoice.report:0
#: model:ir.actions.act_window,name:account.action_account_invoice_refund
msgid "Refund"
msgstr "Reembolso"
msgstr "Devolução"
#. module: account
#: field:wizard.multi.charts.accounts,bank_accounts_id:0

4
addons/account/i18n/ro.po
View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-03-28 04:35+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:09+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0

808
addons/account/i18n/ru.po
View File

File diff suppressed because it is too large Load Diff

4
addons/account/i18n/si.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-03-18 04:53+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:10+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0

4
addons/account/i18n/sk.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-03-18 04:53+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:10+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0

4
addons/account/i18n/sl.po
View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-03-18 04:54+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:10+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0

4
addons/account/i18n/sq.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-03-18 04:47+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:04+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0

4
addons/account/i18n/sr.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-03-18 04:53+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:10+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0

4
addons/account/i18n/sr@latin.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-03-18 04:58+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:14+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0

46
addons/account/i18n/sv.po
View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-03-18 04:54+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:11+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@ -30,7 +30,7 @@ msgstr "Övrig konfiguration"
#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
#, python-format
msgid "No End of year journal defined for the fiscal year"
msgstr "Inget slutdatum definierat för bokföringsåret"
msgstr "Slutdatum saknas för bokföringsåret"
#. module: account
#: code:addons/account/account.py:506
@ -44,12 +44,12 @@ msgstr ""
#. module: account
#: view:account.move.reconcile:0
msgid "Journal Entry Reconcile"
msgstr "Gournal transaktion avstämning"
msgstr "Avstämning av journalpost"
#. module: account
#: field:account.installer.modules,account_voucher:0
msgid "Voucher Management"
msgstr "Kuponghantering"
msgstr "Verifikatregistrering"
#. module: account
#: view:account.account:0
@ -69,7 +69,7 @@ msgstr "Kvarvarande"
#: code:addons/account/invoice.py:785
#, python-format
msgid "Please define sequence on invoice journal"
msgstr "Vänligen definera en sekvens på fakturajournalen"
msgstr "Vänligen definiera en nummerserie för fakturajournalen"
#. module: account
#: constraint:account.period:0
@ -471,11 +471,11 @@ msgid ""
"amount of each area of the tax declaration for your country. It’s presented "
"in a hierarchical structure, which can be modified to fit your needs."
msgstr ""
"Diagram på Skatter är en trädvy som återspeglar strukturen i Skatter (eller "
"skatt koder) och visar den aktuella skattesituationen. Skattediagrammet "
"representerar den mängd varje område i deklarationen för ditt land. Det "
"presenteras i en hierarkisk struktur, som kan modifieras för att passa dina "
"behov."
"Momstabell är en trädvy som återspeglar strukturen i momssatser (eller "
"momskoder) och visar den aktuella skattesituationen. Momstabellen "
"representerar de avsnitt som skall redovisas på skattedeklarationen för ditt "
"land. Den presenteras i en hierarkisk struktur, som kan modifieras för att "
"passa dina behov."
#. module: account
#: view:account.analytic.line:0
@ -736,7 +736,7 @@ msgstr "Procent"
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_charts
msgid "Charts"
msgstr "Grafer"
msgstr "Kontoplaner"
#. module: account
#: code:addons/account/project/wizard/project_account_analytic_line.py:47
@ -869,7 +869,7 @@ msgstr ""
#: model:ir.actions.act_window,name:account.action_tax_code_tree
#: model:ir.ui.menu,name:account.menu_action_tax_code_tree
msgid "Chart of Taxes"
msgstr "Chart of Taxes"
msgstr "Momssatser"
#. module: account
#: view:account.fiscalyear:0
@ -1640,9 +1640,9 @@ msgid ""
"Have a complete tree view of all journal items per account code by clicking "
"on an account."
msgstr ""
"Visa ditt företagskontoplan per bokföringsår och selektera på period. Du "
"får en komplett trädvy över alla verifikationer per konto genom att klicka "
"på ett konto."
"Visar företagets kontoplan per bokföringsår och selekterat på period. Du får "
"en komplett trädvy över alla verifikationer per konto genom att klicka på "
"ett konto."
#. module: account
#: constraint:account.fiscalyear:0
@ -1706,7 +1706,7 @@ msgstr "Ref. :"
#. module: account
#: view:account.analytic.chart:0
msgid "Analytic Account Charts"
msgstr "Analytic Account Charts"
msgstr "Objektkontoplan"
#. module: account
#: view:account.analytic.line:0
@ -2005,7 +2005,7 @@ msgstr "Innevarande bokf.år"
#. module: account
#: view:account.tax.chart:0
msgid "Account tax charts"
msgstr ""
msgstr "Momskonton"
#. module: account
#: constraint:account.period:0
@ -3161,7 +3161,7 @@ msgstr ""
#. module: account
#: view:account.chart:0
msgid "Account charts"
msgstr "Account charts"
msgstr "Kontoplan"
#. module: account
#: report:account.vat.declaration:0
@ -3271,7 +3271,7 @@ msgstr "VAT :"
#: model:ir.actions.act_window,name:account.action_account_tree
#: model:ir.ui.menu,name:account.menu_action_account_tree2
msgid "Chart of Accounts"
msgstr "Kontotabell"
msgstr "Kontoplan"
#. module: account
#: view:account.tax.chart:0
@ -3356,7 +3356,7 @@ msgstr "The journal must have default credit and debit account"
#. module: account
#: view:account.chart.template:0
msgid "Chart of Accounts Template"
msgstr "Kontotabell template"
msgstr "Förlaga för kontoplan"
#. module: account
#: code:addons/account/account.py:2095
@ -3979,7 +3979,7 @@ msgstr " dag i månaden: 0"
#. module: account
#: model:ir.model,name:account.model_account_chart
msgid "Account chart"
msgstr "Konto plan"
msgstr "Kontoplan"
#. module: account
#: report:account.account.balance.landscape:0
@ -4629,7 +4629,7 @@ msgstr "År"
#. module: account
#: field:account.bank.statement,starting_details_ids:0
msgid "Opening Cashbox"
msgstr ""
msgstr "Öppna kassalåda"
#. module: account
#: view:account.payment.term.line:0

4
addons/account/i18n/ta.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-03-18 04:54+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:11+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0

4
addons/account/i18n/te.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-03-18 04:54+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:11+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0

4
addons/account/i18n/th.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-03-18 04:54+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:11+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0

4
addons/account/i18n/tlh.po
View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-03-18 04:54+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:11+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0

1290
addons/account/i18n/tr.po
View File

File diff suppressed because it is too large Load Diff

4
addons/account/i18n/ug.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-03-18 04:55+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:12+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0

4
addons/account/i18n/uk.po
View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-03-18 04:55+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:12+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0

4
addons/account/i18n/ur.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-03-18 04:55+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:12+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0

658
addons/account/i18n/vi.po
View File

File diff suppressed because it is too large Load Diff

4
addons/account/i18n/zh_CN.po
View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-03-18 04:57+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:14+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0

4
addons/account/i18n/zh_HK.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-03-18 04:56+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:12+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0

4
addons/account/i18n/zh_TW.po
View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-03-18 04:57+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:13+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0

19
addons/account/installer.py
View File

@ -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):
@ -120,17 +118,13 @@ class account_installer(osv.osv_memory):
def execute(self, cr, uid, ids, context=None):
if context is None:
context = {}
super(account_installer, self).execute(cr, uid, ids, context=context)
fy_obj = self.pool.get('account.fiscalyear')
mod_obj = self.pool.get('ir.model.data')
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'))
@ -231,6 +225,7 @@ class account_installer(osv.osv_memory):
fy_obj.create_period(cr, uid, [fiscal_id])
elif res['period'] == '3months':
fy_obj.create_period3(cr, uid, [fiscal_id])
super(account_installer, self).execute(cr, uid, ids, context=context)
def modules_to_install(self, cr, uid, ids, context=None):
modules = super(account_installer, self).modules_to_install(

30
addons/account/invoice.py
View File

@ -263,7 +263,7 @@ class account_invoice(osv.osv):
'move_lines':fields.function(_get_lines, method=True, type='many2many', relation='account.move.line', string='Entry Lines'),
'residual': fields.function(_amount_residual, method=True, digits_compute=dp.get_precision('Account'), string='Residual',
store={
'account.invoice': (lambda self, cr, uid, ids, c={}: ids, ['invoice_line'], 50),
'account.invoice': (lambda self, cr, uid, ids, c={}: ids, ['invoice_line','move_id'], 50),
'account.invoice.tax': (_get_invoice_tax, None, 50),
'account.invoice.line': (_get_invoice_line, ['price_unit','invoice_line_tax_id','quantity','discount','invoice_id'], 50),
'account.move.line': (_get_invoice_from_line, None, 50),
@ -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:

9
addons/account/project/project_view.xml
View File

@ -17,6 +17,7 @@
<field name="user_id" invisible="1"/>
<field name="parent_id" invisible="1"/>
<field name="partner_id" invisible="1"/>
<field name="state" invisible="1"/>
</tree>
</field>
</record>
@ -44,6 +45,7 @@
<filter string="Associated Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
<separator orientation="vertical"/>
<filter string="Parent" icon="terp-folder-orange" domain="[]" context="{'group_by':'parent_id'}"/>
<filter string="State" icon="terp-folder-green" domain="[]" context="{'group_by':'state'}"/>
</group>
</search>
</field>
@ -88,11 +90,12 @@
</group>
<notebook colspan="4">
<page string="Account Data">
<field name="partner_id" select="1"/>
<field name="currency_id" select="1"/>
<field name="partner_id"/>
<field name="contact_id"/>
<field name="currency_id"/>
<newline/>
<field name="date_start"/>
<field name="date" select="2"/>
<field name="date"/>
<newline/>
<field name="quantity_max"/>
<field name="user_id"/>

1
addons/account/project/wizard/account_analytic_balance_report.py
View File

@ -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]

1
addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report.py
View File

@ -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]

1
addons/account/project/wizard/account_analytic_cost_ledger_report.py
View File

@ -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]

1
addons/account/project/wizard/account_analytic_inverted_balance_report.py
View File

@ -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]

9
addons/account/project/wizard/account_analytic_journal_report.py
View File

@ -22,8 +22,8 @@ import time
from osv import osv, fields
class account_analytic_Journal_report(osv.osv_memory):
_name = 'account.analytic.Journal.report'
class account_analytic_journal_report(osv.osv_memory):
_name = 'account.analytic.journal.report'
_description = 'Account Analytic Journal'
_columns = {
@ -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]
@ -52,5 +51,5 @@ class account_analytic_Journal_report(osv.osv_memory):
'datas': datas,
}
account_analytic_Journal_report()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
account_analytic_journal_report()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

6
addons/account/project/wizard/account_analytic_journal_report_view.xml
View File

@ -4,7 +4,7 @@
<record id="account_analytic_journal_view" model="ir.ui.view">
<field name="name">Account Analytic Journal</field>
<field name="model">account.analytic.Journal.report</field>
<field name="model">account.analytic.journal.report</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Select Period">
@ -24,7 +24,7 @@
<record id="action_account_analytic_journal" model="ir.actions.act_window">
<field name="name">Analytic Journal</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">account.analytic.Journal.report</field>
<field name="res_model">account.analytic.journal.report</field>
<field name="view_type">form</field>
<field name="view_mode">form</field>
<field name="view_id" ref="account_analytic_journal_view"/>
@ -42,4 +42,4 @@
</record>
</data>
</openerp>
</openerp>

56
addons/account/project/wizard/project_account_analytic_line.py
View File

@ -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()

1
addons/account/report/__init__.py
View File

@ -41,6 +41,7 @@ import account_entries_report
import account_analytic_entries_report
import account_balance_sheet
import account_profit_loss
import account_treasury_report
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

4
addons/account/report/account_balance.py
View File

@ -88,10 +88,10 @@ class account_balance(report_sxw.rml_parse, common_report_header):
}
self.sum_debit += account_rec['debit']
self.sum_credit += account_rec['credit']
if disp_acc == 'bal_movement':
if disp_acc == 'movement':
if not currency_obj.is_zero(self.cr, self.uid, currency, res['credit']) or not currency_obj.is_zero(self.cr, self.uid, currency, res['debit']) or not currency_obj.is_zero(self.cr, self.uid, currency, res['balance']):
self.result_acc.append(res)
elif disp_acc == 'bal_solde':
elif disp_acc == 'not_zero':
if not currency_obj.is_zero(self.cr, self.uid, currency, res['balance']):
self.result_acc.append(res)
else:

2
addons/account/report/account_balance.rml
View File

@ -233,7 +233,7 @@
<td>
<para style="terp_default_Centre_8">[[ get_fiscalyear(data) or '' ]]</para>
</td>
<td><para style="terp_default_Centre_8">[[ (data['form']['display_account']=='bal_all' and 'All') or (data['form']['display_account']=='bal_movement' and 'With movements') or 'With balance is not equal to 0']]</para></td>
<td><para style="terp_default_Centre_8">[[ (data['form']['display_account']=='all' and 'All') or (data['form']['display_account']=='movement' and 'With movements') or 'With balance is not equal to 0']]</para></td>
<td> <para style="terp_default_Centre_8">[[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]] </para>
<blockTable colWidths="60.0,60.0" style="Table5">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
<tr>

23
addons/account/report/account_balance_landscape.py
View File

@ -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

13
addons/account/report/account_balance_sheet.py
View File

@ -137,16 +137,17 @@ class report_balancesheet_horizontal(report_sxw.rml_parse, common_report_header)
'name': account.name,
'level': account.level,
'balance':account.balance,
'type': account.type,
}
currency = account.currency_id and account.currency_id or account.company_id.currency_id
if typ == 'liability' and account.type <> 'view' and (account.debit <> account.credit):
self.result_sum_dr += account.balance
if typ == 'asset' and account.type <> 'view' and (account.debit <> account.credit):
self.result_sum_cr += account.balance
if data['form']['display_account'] == 'bal_movement':
if data['form']['display_account'] == 'movement':
if not currency_pool.is_zero(self.cr, self.uid, currency, account.credit) or not currency_pool.is_zero(self.cr, self.uid, currency, account.debit) or not currency_pool.is_zero(self.cr, self.uid, currency, account.balance):
accounts_temp.append(account_dict)
elif data['form']['display_account'] == 'bal_solde':
elif data['form']['display_account'] == 'not_zero':
if not currency_pool.is_zero(self.cr, self.uid, currency, account.balance):
accounts_temp.append(account_dict)
else:
@ -163,10 +164,12 @@ class report_balancesheet_horizontal(report_sxw.rml_parse, common_report_header)
for i in range(0,max(len(cal_list['liability']),len(cal_list['asset']))):
if i < len(cal_list['liability']) and i < len(cal_list['asset']):
temp={
'type': cal_list['liability'][i]['type'],
'code': cal_list['liability'][i]['code'],
'name': cal_list['liability'][i]['name'],
'level': cal_list['liability'][i]['level'],
'balance':cal_list['liability'][i]['balance'],
'type1': cal_list['asset'][i]['type'],
'code1': cal_list['asset'][i]['code'],
'name1': cal_list['asset'][i]['name'],
'level1': cal_list['asset'][i]['level'],
@ -176,10 +179,12 @@ class report_balancesheet_horizontal(report_sxw.rml_parse, common_report_header)
else:
if i < len(cal_list['asset']):
temp={
'type': '',
'code': '',
'name': '',
'level': False,
'balance':False,
'type1': cal_list['asset'][i]['type'],
'code1': cal_list['asset'][i]['code'],
'name1': cal_list['asset'][i]['name'],
'level1': cal_list['asset'][i]['level'],
@ -188,10 +193,12 @@ class report_balancesheet_horizontal(report_sxw.rml_parse, common_report_header)
self.result_temp.append(temp)
if i < len(cal_list['liability']):
temp={
'type': cal_list['liability'][i]['type'],
'code': cal_list['liability'][i]['code'],
'name': cal_list['liability'][i]['name'],
'level': cal_list['liability'][i]['level'],
'balance':cal_list['liability'][i]['balance'],
'type1': '',
'code1': '',
'name1': '',
'level1': False,
@ -214,4 +221,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:

83
addons/account/report/account_balance_sheet.rml
View File

@ -26,7 +26,6 @@
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
<lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,1" stop="-1,-1"/>
</blockTableStyle>
<blockTableStyle id="Table5">
<blockAlignment value="LEFT"/>
@ -115,7 +114,7 @@
<paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="terp_header_Left" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
@ -124,6 +123,36 @@
<paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_level_1_code" fontName="Helvetica-Bold" fontSize="9.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_level_1_name" fontName="Helvetica-Bold" fontSize="9.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_level_1_balance" fontName="Helvetica-Bold" fontSize="9.0" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_level_2_code" fontName="Helvetica-Bold" fontSize="8.0" leftIndent="0.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_level_2_name" fontName="Helvetica-Bold" fontSize="8.0" leftIndent="10.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_level_2_balance" fontName="Helvetica-Bold" fontSize="8.0" leftIndent=".0" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_level_3_code" fontName="Helvetica" fontSize="8.0" leftIndent="0.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_level_3_code_bold" fontName="Helvetica-Bold" fontSize="8.0" leftIndent="0.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_level_3_name" fontName="Helvetica" fontSize="8.0" leftIndent="20.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_level_3_name_bold" fontName="Helvetica-Bold" fontSize="8.0" leftIndent="20.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_level_3_balance" fontName="Helvetica" fontSize="8.0" leftIndent="0.0" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_level_3_balance_bold" fontName="Helvetica-Bold" fontSize="8.0" leftIndent="0.0" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_level_4_name" fontName="Helvetica" fontSize="8.0" leftIndent="30.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_level_4_name_bold" fontName="Helvetica-Bold" fontSize="8.0" leftIndent="30.0" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<blockTableStyle id="Table1">
<blockTopPadding start="0,0" stop="-1,0" length="15"/>
<blockFont name="Helvetica-Bold" size="10.0" />
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,1" thickness="1"/>
</blockTableStyle>
<blockTableStyle id="Table2">
<blockTopPadding start="0,0" stop="-1,0" length="10"/>
<blockAlignment value="LEFT"/>
<lineStyle kind="LINEBELOW" colorName="#666666" start="1,1" stop="1,1"/>
</blockTableStyle>
<blockTableStyle id="Table3">
<blockValign value="TOP"/>
</blockTableStyle>
</stylesheet>
<images/>
<story>
@ -174,7 +203,7 @@
</tr>
</blockTable>
</td>
<td><para style="terp_default_Centre_8">[[ (data['form']['display_account']=='bal_all' and 'All') or (data['form']['display_account']=='bal_movement' and 'With movements') or 'With balance is not equal to 0']]</para></td>
<td><para style="terp_default_Centre_8">[[ (data['form']['display_account']=='all' and 'All') or (data['form']['display_account']=='movement' and 'With movements') or 'With balance is not equal to 0']]</para></td>
<td><para style="terp_default_Centre_8">[[ get_target_move(data) ]] </para></td>
</tr>
</blockTable>
@ -187,35 +216,32 @@
<blockTable colWidths="539.0" style="Table_Company_Name">
<tr>
<td>
<para style="terp_header_Centre">Assets</para>
<para style="terp_header_Left">Assets</para>
</td>
</tr>
</blockTable>
<para style="terp_default_9">
<font color="white"> </font>
</para>
<blockTable colWidths="100.0,326.0,113.0" style="Table1" repeatRows="1">
<blockTable colWidths="100.0,326.0,113.0" style="Table_Account_Line_Title" repeatRows="1">
<tr>
<td>
<para style="terp_default_Bold_9">Code</para>
</td>
<td>
<para style="terp_default_Bold_9">Assets</para>
<para style="terp_default_Bold_9">Account</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Balance</para>
</td>
</tr>
<tr>
<td>
<para style="terp_default_9"><font face="Times-Roman">[[ repeatIn(get_lines_another('asset'), 'a') ]]</font>[[ a['code'] ]]<font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]]</font></para>
</td>
<td>
<para style="terp_default_9"><font color="white">[[ '. '*(a['level']-1) ]]</font><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['name'] ]]</font></para>
</td>
<td>
<para style="terp_default_Right_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font><font>[[ formatLang(abs(a['balance'])) ]] [[ company.currency_id.symbol ]]</font></para>
</td>
<tr style="Table3">
[[ repeatIn(get_lines_another('asset'),'a' ) ]]
[[ setTag('tr','tr',{'style': 'Table'+str(min(3,a['level']))}) ]]
<td><para style="terp_level_3_code">[[ (a['type'] =='view' and a['level'] &gt;= 3) and setTag('para','para',{'style': 'terp_level_3_code_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a['level']))+'_code'}) ]]<i>[[ a['code'] ]]</i></para></td>
<td><para style="terp_level_3_name">[[ (a['type'] =='view' and a['level'] &gt;= 3) and setTag('para','para',{'style': 'terp_level_'+str(min(3,a['level']))+'_name_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(4,a['level']))+'_name'}) ]][[ a['name'] ]]</para></td>
<td>[[ (a['level'] &lt;&gt;2) or removeParentNode('td') ]]<para style="terp_level_3_balance">[[ (a['type'] =='view' and a['level'] &gt;= 3) and setTag('para','para',{'style': 'terp_level_3_balance_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a['level']))+'_balance'}) ]][[ formatLang(a['balance']) ]] [[company.currency_id.symbol ]]</para></td>
<td>[[ a['level'] == 2 or removeParentNode('td') ]]<para style="terp_level_2_balance"><u>[[ formatLang(a['balance']) ]] [[company.currency_id.symbol ]]</u></para></td>
</tr>
</blockTable>
<blockTable colWidths="426.0,113.0" style="Table_Net_Profit_Loss">
@ -224,7 +250,7 @@
<para style="terp_default_Bold_9">Balance:</para>
</td>
<td>
<para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_cr())) ]] [[ company.currency_id.symbol ]]</u></para>
<para style="terp_default_Right_9_Bold"><u>[[ formatLang(sum_cr()) ]] [[ company.currency_id.symbol ]]</u></para>
</td>
</tr>
</blockTable>
@ -235,7 +261,7 @@
<blockTable colWidths="539.0" style="Table_Company_Name">
<tr>
<td>
<para style="terp_header_Centre">Liabilities</para>
<para style="terp_header_Left">Liabilities</para>
</td>
</tr>
</blockTable>
@ -245,22 +271,19 @@
<para style="terp_default_Bold_9">Code</para>
</td>
<td>
<para style="terp_default_Bold_9">Liabilities</para>
<para style="terp_default_Bold_9">Account</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Balance</para>
</td>
</tr>
<tr>
<td>
<para style="terp_default_9"><font face="Times-Roman">[[ repeatIn(get_lines_another('liability'), 'a') ]]</font>[[ a['code'] ]]<font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]] </font><font>[[ a['name']=='Net Profit' and setTag('para','para',{'style':'terp_default_Bold_9'}) or removeParentNode('font') ]]</font></para>
</td>
<td>
<para style="terp_default_9"><font color="white">[[ '. '*(a['level']-1) ]]</font><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['name'] ]]</font><font>[[ a['name']=='Net Profit' and setTag('para','para',{'style':'terp_default_Bold_9'}) or removeParentNode('font') ]]</font></para>
</td>
<td>
<para style="terp_default_Right_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font><font>[[ formatLang(abs(a['balance'])) ]] [[ company.currency_id.symbol ]]</font><font>[[ a['name']=='Net Profit' and setTag('para','para',{'style':'terp_default_Right_9_Bold'}) or removeParentNode('font') ]]</font></para>
</td>
<tr style="Table3">
[[ repeatIn(get_lines_another('liability'),'a' ) ]]
[[ setTag('tr','tr',{'style': 'Table'+str(min(3,a['level']))}) ]]
<td><para style="terp_level_3_code">[[ (a['type'] =='view' and a['level'] &gt;= 3) and setTag('para','para',{'style': 'terp_level_3_code_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a['level']))+'_code'}) ]]<i>[[ a['code'] ]]</i></para></td>
<td><para style="terp_level_3_name">[[ (a['type'] =='view' and a['level'] &gt;= 3) and setTag('para','para',{'style': 'terp_level_'+str(min(3,a['level']))+'_name_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(4,a['level']))+'_name'}) ]][[ a['name'] ]]</para></td>
<td>[[ (a['level'] &lt;&gt;2) or removeParentNode('td') ]]<para style="terp_level_3_balance">[[ (a['type'] =='view' and a['level'] &gt;= 3) and setTag('para','para',{'style': 'terp_level_3_balance_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a['level']))+'_balance'}) ]][[ formatLang(a['balance']) ]] [[company.currency_id.symbol ]]</para></td>
<td>[[ a['level'] == 2 or removeParentNode('td') ]]<para style="terp_level_2_balance"><u>[[ formatLang(a['balance']) ]] [[company.currency_id.symbol ]]</u></para></td>
</tr>
</blockTable>
<blockTable colWidths="426.0,113.0" style="Table_Net_Profit_Loss">
@ -269,7 +292,7 @@
<para style="terp_default_Bold_9">Balance:</para>
</td>
<td>
<para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_dr())) ]] [[ company.currency_id.symbol ]]</u></para>
<para style="terp_default_Right_9_Bold"><u>[[ formatLang(sum_dr()) ]] [[ company.currency_id.symbol ]]</u></para>
</td>
</tr>
</blockTable>

10
addons/account/report/account_balance_sheet_horizontal.rml
View File

@ -163,7 +163,7 @@
</tr>
</blockTable>
</td>
<td><para style="terp_default_Centre_8">[[ (data['form']['display_account']=='bal_all' and 'All') or (data['form']['display_account']=='bal_movement' and 'With movements') or 'With balance is not equal to 0']]</para></td>
<td><para style="terp_default_Centre_8">[[ (data['form']['display_account']=='all' and 'All') or (data['form']['display_account']=='movement' and 'With movements') or 'With balance is not equal to 0']]</para></td>
<td><para style="terp_default_Centre_8">[[ get_target_move(data) ]]</para></td>
</tr>
</blockTable>
@ -202,7 +202,7 @@
<para style="terp_default_9"><font color="white">[[ '. '*(a['level1']-1) ]]</font><font>[[ a['level1']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['name1'] ]]</font></para>
</td>
<td>
<para style="terp_default_Right_9"><font>[[ a['level1']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font><font>[[ formatLang(abs(a['balance1'])) ]] [[ company.currency_id.symbol ]]</font></para>
<para style="terp_default_Right_9"><font>[[ a['level1']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font><font>[[ formatLang(a['balance1']) ]] [[ company.currency_id.symbol ]]</font></para>
</td>
<td>
<para style="terp_default_9"><font face="Times-Roman">[[ repeatIn(get_lines(), 'a') ]]</font> <font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]]</font><font>[[ a['code'] ]]</font><font>[[ a['name']=='Net Profit' and setTag('para','para',{'style':'terp_default_Bold_9'}) or removeParentNode('font') ]]</font></para>
@ -213,7 +213,7 @@
<td>
<para style="terp_default_Right_9"><font>[[ a['level1']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font>
<font>[[ a['name']=='Net Profit' and setTag('para','para',{'style':'terp_default_Right_9_Bold'}) or removeParentNode('font') ]]</font>
<font> [[(a['code'] and a['name']) and formatLang(abs(a['balance'])) or removeParentNode('font')]] [[ company.currency_id.symbol ]]</font></para>
<font> [[(a['code'] and a['name']) and formatLang(a['balance']) or removeParentNode('font')]] [[ company.currency_id.symbol ]]</font></para>
</td>
</tr>
</blockTable>
@ -223,13 +223,13 @@
<para style="terp_default_Bold_9">Balance:</para>
</td>
<td>
<para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_cr())) ]] [[ company.currency_id.symbol ]]</u></para>
<para style="terp_default_Right_9_Bold"><u>[[ formatLang(sum_cr()) ]] [[ company.currency_id.symbol ]]</u></para>
</td>
<td>
<para style="terp_default_Bold_9">Balance:</para>
</td>
<td>
<para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_dr())) ]] [[ company.currency_id.symbol ]]</u></para>
<para style="terp_default_Right_9_Bold"><u>[[ formatLang(sum_dr()) ]] [[ company.currency_id.symbol ]]</u></para>
</td>
</tr>
</blockTable>

9
addons/account/report/account_general_ledger.py
View File

@ -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()
@ -116,10 +117,10 @@ class general_ledger(report_sxw.rml_parse, common_report_header):
num_entry = self.cr.fetchone()[0] or 0
sold_account = self._sum_balance_account(child_account)
self.sold_accounts[child_account.id] = sold_account
if self.display_account == 'bal_movement':
if self.display_account == 'movement':
if child_account.type != 'view' and num_entry <> 0:
res.append(child_account)
elif self.display_account == 'bal_solde':
elif self.display_account == 'not_zero':
if child_account.type != 'view' and num_entry <> 0:
if not currency_obj.is_zero(self.cr, self.uid, currency, sold_account):
res.append(child_account)

2
addons/account/report/account_general_ledger_landscape.rml
View File

@ -395,7 +395,7 @@
<para style="terp_default_Centre_7">[[', '.join([ lt or '' for lt in get_journal(data) ]) ]]</para>
</td>
<td>
<para style="terp_default_Centre_7">[[ (data['form']['display_account']=='bal_all' and 'All') or (data['form']['display_account']=='bal_movement' and 'With movements') or 'With balance is not equal to 0']]</para>
<para style="terp_default_Centre_7">[[ (data['form']['display_account']=='all' and 'All') or (data['form']['display_account']=='movement' and 'With movements') or 'With balance is not equal to 0']]</para>
</td>
<td>
<para style="terp_default_Centre_7">[[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]]</para>

60
addons/account/report/account_invoice_report.py
View File

@ -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,

5
addons/account/report/account_invoice_report_view.xml
View File

@ -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'}"/>

4
addons/account/report/account_partner_balance.py
View File

@ -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')

30
addons/account/report/account_partner_ledger.py
View File

@ -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,

4
addons/account/report/account_partner_ledger.rml
View File

@ -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>

4
addons/account/report/account_partner_ledger_other.rml
View File

@ -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>

2
addons/account/report/account_profit_horizontal.rml
View File

@ -180,7 +180,7 @@
</tr>
</blockTable>
</td>
<td><para style="terp_default_Centre_8">[[ (data['form']['display_account']=='bal_all' and 'All') or (data['form']['display_account']=='bal_movement' and 'With movements') or 'With balance is not equal to 0']]</para></td>
<td><para style="terp_default_Centre_8">[[ (data['form']['display_account']=='all' and 'All') or (data['form']['display_account']=='movement' and 'With movements') or 'With balance is not equal to 0']]</para></td>
<td><para style="terp_default_Centre_8">[[ get_target_move(data) ]]</para></td>
</tr>
</blockTable>

14
addons/account/report/account_profit_loss.py
View File

@ -101,6 +101,7 @@ class report_pl_account_horizontal(report_sxw.rml_parse, common_report_header):
cal_list = {}
account_id = data['form'].get('chart_account_id', False)
company_currency = account_pool.browse(self.cr, self.uid, account_id).company_id.currency_id
account_ids = account_pool._get_children_and_consol(cr, uid, account_id, context=ctx)
accounts = account_pool.browse(cr, uid, account_ids, context=ctx)
@ -110,18 +111,21 @@ class report_pl_account_horizontal(report_sxw.rml_parse, common_report_header):
if (account.user_type.report_type) and (account.user_type.report_type == typ):
currency = account.currency_id and account.currency_id or account.company_id.currency_id
if typ == 'expense' and account.type <> 'view' and (account.debit <> account.credit):
self.result_sum_dr += abs(account.debit - account.credit)
self.result_sum_dr += account.debit - account.credit
if typ == 'income' and account.type <> 'view' and (account.debit <> account.credit):
self.result_sum_cr += abs(account.debit - account.credit)
if data['form']['display_account'] == 'bal_movement':
self.result_sum_cr += account.credit - account.debit
if data['form']['display_account'] == 'movement':
if not currency_pool.is_zero(self.cr, self.uid, currency, account.credit) or not currency_pool.is_zero(self.cr, self.uid, currency, account.debit) or not currency_pool.is_zero(self.cr, self.uid, currency, account.balance):
accounts_temp.append(account)
elif data['form']['display_account'] == 'bal_solde':
elif data['form']['display_account'] == 'not_zero':
if not currency_pool.is_zero(self.cr, self.uid, currency, account.balance):
accounts_temp.append(account)
else:
accounts_temp.append(account)
if self.result_sum_dr > self.result_sum_cr:
if currency_pool.is_zero(self.cr, self.uid, company_currency, (self.result_sum_dr-self.result_sum_cr)):
self.res_pl['type'] = None
self.res_pl['balance'] = 0.0
elif self.result_sum_dr > self.result_sum_cr:
self.res_pl['type'] = _('Net Loss')
self.res_pl['balance'] = (self.result_sum_dr - self.result_sum_cr)
else:

Some files were not shown because too many files have changed in this diff Show More