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

[MERGE] merge with lp:openobject-addons 

bzr revid: sbh@tinyerp.com-20101229070055-l8rf6xlk6pjyrur0
bzr revid: sbh@tinyerp.com-20101229083843-83ypw4f0ecxfv68e
bzr revid: sbh@tinyerp.com-20101229091103-mkxpoao8otcyyux5
This commit is contained in:
Sbh (OpenERP) 2010-12-29 14:41:03 +05:30
parent bfd2cce0b3 20ab1d1df4
commit 42001ee76f
586 changed files with 5200 additions and 2690 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
addons/account/account.py
View File

@ -204,7 +204,7 @@ class account_account(osv.osv):
args[pos] = ('id', 'in', ids1)
pos += 1
if context and context.has_key('consolidate_childs'): #add consolidated childs of accounts
if context and context.has_key('consolidate_children'): #add consolidated children of accounts
ids = super(account_account, self).search(cr, uid, args, offset, limit,
order, context=context, count=count)
for consolidate_child in self.browse(cr, uid, context['account_id'], context=context).child_consol_ids:
@ -285,6 +285,7 @@ class account_account(osv.osv):
children_and_consolidated.reverse()
brs = list(self.browse(cr, uid, children_and_consolidated, context=context))
sums = {}
currency_obj = self.pool.get('res.currency')
while brs:
current = brs[0]
# can_compute = True
@ -299,8 +300,11 @@ class account_account(osv.osv):
brs.pop(0)
for fn in field_names:
sums.setdefault(current.id, {})[fn] = accounts.get(current.id, {}).get(fn, 0.0)
if current.child_id:
sums[current.id][fn] += sum(sums[child.id][fn] for child in current.child_id)
for child in current.child_id:
if child.company_id.currency_id.id == current.company_id.currency_id.id:
sums[current.id][fn] += sums[child.id][fn]
else:
sums[current.id][fn] += currency_obj.compute(cr, uid, child.company_id.currency_id.id, current.company_id.currency_id.id, sums[child.id][fn], context=context)
res = {}
null_result = dict((fn, 0.0) for fn in field_names)
for id in ids:
@ -607,8 +611,8 @@ class account_journal(osv.osv):
}
_defaults = {
'user_id': lambda self,cr,uid,context: uid,
'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
'user_id': lambda self, cr, uid, context: uid,
'company_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
}
_sql_constraints = [
('code_company_uniq', 'unique (code, company_id)', 'The code of the journal must be unique per company !'),
@ -708,7 +712,6 @@ class account_journal(osv.osv):
return self.name_get(cr, user, ids, context=context)
def onchange_type(self, cr, uid, ids, type, currency, context=None):
obj_data = self.pool.get('ir.model.data')
user_pool = self.pool.get('res.users')
@ -1278,6 +1281,8 @@ class account_move(osv.osv):
return super(account_move, self).copy(cr, uid, id, default, context)
def unlink(self, cr, uid, ids, context=None, check=True):
if context is None:
context = {}
toremove = []
obj_move_line = self.pool.get('account.move.line')
for move in self.browse(cr, uid, ids, context=context):
@ -1916,7 +1921,7 @@ class account_tax(osv.osv):
RETURN:
[ tax ]
tax = {'name':'', 'amount':0.0, 'account_collected_id':1, 'account_paid_id':2}
one tax for each tax id in IDS and their childs
one tax for each tax id in IDS and their children
"""
res = self._unit_compute(cr, uid, taxes, price_unit, address_id, product, partner, quantity)
total = 0.0
@ -2011,7 +2016,7 @@ class account_tax(osv.osv):
RETURN:
[ tax ]
tax = {'name':'', 'amount':0.0, 'account_collected_id':1, 'account_paid_id':2}
one tax for each tax id in IDS and their childs
one tax for each tax id in IDS and their children
"""
res = self._unit_compute_inv(cr, uid, taxes, price_unit, address_id, product, partner=None)
total = 0.0
@ -2611,11 +2616,12 @@ class wizard_multi_charts_accounts(osv.osv_memory):
cr.execute("SELECT company_id FROM account_account WHERE active = 't' AND account_account.parent_id IS NULL AND name != %s", ("Chart For Automated Tests",))
configured_cmp = [r[0] for r in cr.fetchall()]
unconfigured_cmp = list(set(company_ids)-set(configured_cmp))
if unconfigured_cmp:
cmp_select = [(line.id, line.name) for line in self.pool.get('res.company').browse(cr, uid, unconfigured_cmp)]
for field in res['fields']:
if field == 'company_id':
res['fields'][field]['domain'] = unconfigured_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
return res

7
addons/account/account_analytic_line.py
View File

@ -50,11 +50,10 @@ class account_analytic_line(osv.osv):
if context is None:
context = {}
if context.get('from_date',False):
args.append(['date', '>=',context['from_date']])
args.append(['date', '>=', context['from_date']])
if context.get('to_date',False):
args.append(['date','<=',context['to_date']])
args.append(['date','<=', context['to_date']])
return super(account_analytic_line, self).search(cr, uid, args, offset, limit,
order, context=context, count=count)
@ -158,4 +157,4 @@ class res_partner(osv.osv):
res_partner()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

2
addons/account/account_end_fy.xml
View File

@ -14,7 +14,7 @@
action="action_account_period_tree"
id="menu_action_account_period_close_tree"
parent="account.menu_account_end_year_treatments"
sequence="0" groups="base.group_extended,group_account_manager,group_account_user"/>
sequence="0" groups="base.group_extended"/>
</data>
</openerp>

13
addons/account/account_menuitem.xml
View File

@ -26,14 +26,19 @@
<menuitem id="menu_finance_accounting" name="Financial Accounting" parent="menu_finance_configuration"/>
<menuitem id="menu_analytic_accounting" name="Analytic Accounting" parent="menu_finance_configuration" groups="analytic.group_analytic_accounting"/>
<menuitem id="menu_analytic" parent="menu_analytic_accounting" name="Accounts" groups="analytic.group_analytic_accounting"/>
<menuitem id="menu_journals" sequence="9" name="Journals" parent="menu_finance_accounting" groups="base.group_extended,group_account_manager"/>
<menuitem id="menu_configuration_misc" name="Miscellaneous" parent="menu_finance_configuration" sequence="30" groups="group_account_manager"/>
<menuitem id="menu_journals" sequence="9" name="Journals" parent="menu_finance_accounting" groups="group_account_manager"/>
<menuitem id="menu_configuration_misc" name="Miscellaneous" parent="menu_finance_configuration" sequence="30"/>
<menuitem id="base.menu_action_currency_form" parent="menu_configuration_misc" sequence="20"/>
<menuitem id="menu_finance_generic_reporting" name="Generic Reporting" parent="menu_finance_reporting" sequence="100"/>
<menuitem id="menu_finance_entries" name="Journal Entries" parent="menu_finance" sequence="5" groups="group_account_user,group_account_manager"/>
<menuitem id="account.menu_finance_recurrent_entries" name="Recurring Entries" parent="menu_finance_periodical_processing" sequence="15" groups="base.group_extended,group_account_manager,group_account_user"/>
<menuitem id="menu_account_end_year_treatments" name="End of Period" parent="menu_finance_periodical_processing" groups="group_account_manager,group_account_user" sequence="25"/>
<menuitem id="account.menu_finance_recurrent_entries" name="Recurring Entries"
parent="menu_finance_periodical_processing" sequence="15"
groups="base.group_extended"/>
<menuitem id="menu_account_end_year_treatments"
name="End of Period" parent="menu_finance_periodical_processing"
sequence="25"/>
<menuitem id="menu_finance_periodical_processing_billing" name="Billing" parent="menu_finance_periodical_processing" sequence="35"/>
<menuitem id="menu_finance_statistic_report_statement" name="Statistic Reports" parent="menu_finance_reporting" sequence="300"/>

17
addons/account/account_move_line.py
View File

@ -309,7 +309,7 @@ class account_move_line(osv.osv):
context = {}
c = context.copy()
c['initital_bal'] = True
sql = """SELECT l2.id, SUM(l1.debit-l1.credit)
sql = """SELECT l2.id, SUM(l1.debit-l1.credit)
FROM account_move_line l1, account_move_line l2
WHERE l2.account_id = l1.account_id
AND l1.id <= l2.id
@ -318,8 +318,7 @@ class account_move_line(osv.osv):
" GROUP BY l2.id"
cr.execute(sql, [tuple(ids)])
res = dict(cr.fetchall())
return res
return dict(cr.fetchall())
def _invoice(self, cursor, user, ids, name, arg, context=None):
invoice_obj = self.pool.get('account.invoice')
@ -887,7 +886,7 @@ class account_move_line(osv.osv):
fld = []
fields = {}
flds = []
title = "Accounting Entries" #self.view_header_get(cr, uid, view_id, view_type, context)
title = _("Accounting Entries") #self.view_header_get(cr, uid, view_id, view_type, context)
xml = '''<?xml version="1.0"?>\n<tree string="%s" editable="top" refresh="5" on_write="on_create_write" colors="red:state==\'draft\';black:state==\'valid\'">\n\t''' % (title)
ids = journal_pool.search(cr, uid, [])
@ -906,8 +905,8 @@ class account_move_line(osv.osv):
else:
fields.get(field.field).append(journal.id)
common_fields[field.field] = common_fields[field.field] + 1
fld.append(('period_id', 3, 'Period'))
fld.append(('journal_id', 10, 'Journal'))
fld.append(('period_id', 3, _('Period')))
fld.append(('journal_id', 10, _('Journal')))
flds.append('period_id')
flds.append('journal_id')
fields['period_id'] = all_journal
@ -927,10 +926,10 @@ class account_move_line(osv.osv):
# state = 'colors="red:state==\'draft\'"'
attrs = []
if field == 'debit':
attrs.append('sum = "Total debit"')
attrs.append('sum = "%s"' % _("Total debit"))
elif field == 'credit':
attrs.append('sum = "Total credit"')
attrs.append('sum = "%s"' % _("Total credit"))
elif field == 'move_id':
attrs.append('required = "False"')
@ -1284,4 +1283,4 @@ class account_move_line(osv.osv):
account_move_line()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

26
addons/account/account_view.xml
View File

@ -276,6 +276,7 @@
<field name="company_currency_id"/>
<field name="company_id" groups="base.group_multi_company"/>
<field name="type"/>
<field name="parent_id" invisible="1"/>
</tree>
</field>
</record>
@ -762,7 +763,7 @@
<field name="search_view_id" ref="view_account_type_search"/>
<field name="help">An account type is used to determine how an account is used in each journal. The deferral method of an account type determines the process for the annual closing. Reports such as the Balance Sheet and the Profit and Loss report use the category (profit/loss or balance sheet). For example, the account type could be linked to an asset account, expense account or payable account. From this view, you can create and manage the account types you need for your company.</field>
</record>
<menuitem action="action_account_type_form" groups="base.group_extended,group_account_manager" sequence="6" id="menu_action_account_type_form" parent="account_account_menu"/>
<menuitem action="action_account_type_form" sequence="6" id="menu_action_account_type_form" parent="account_account_menu"/>
<!--
Entries
-->
@ -1227,7 +1228,7 @@
id="menu_action_account_moves_all"
parent="account.menu_finance_entries"
sequence="1"
groups="group_account_user,group_account_manager"
groups="group_account_user"
/>
<record id="action_move_line_select" model="ir.actions.act_window">
@ -1475,7 +1476,7 @@
action="action_move_journal_line"
id="menu_action_move_journal_line_form"
parent="account.menu_finance_entries"
groups="group_account_user,group_account_manager"
groups="group_account_user"
sequence="5"/>
<record id="action_move_line_form" model="ir.actions.act_window">
@ -1742,7 +1743,7 @@
</record>
<menuitem
action="action_model_form" id="menu_action_model_form" sequence="5"
parent="account.menu_configuration_misc" groups="base.group_extended,group_account_manager"/>
parent="account.menu_configuration_misc" groups="base.group_extended"/>
<!--
# Payment Terms
@ -1842,8 +1843,7 @@
<field name="search_view_id" ref="view_payment_term_search"/>
</record>
<menuitem action="action_payment_term_form"
id="menu_action_payment_term_form" parent="menu_configuration_misc"
groups="group_account_manager"/>
id="menu_action_payment_term_form" parent="menu_configuration_misc"/>
<!--
# Account Subscriptions
@ -1958,7 +1958,7 @@
</record>
<menuitem
name="Define Recurring Entries" action="action_subscription_form"
groups="base.group_extended,group_account_manager,group_account_user"
groups="base.group_extended"
id="menu_action_subscription_form" sequence="1"
parent="account.menu_finance_recurrent_entries"/>
@ -2063,7 +2063,7 @@
<act_window context="{'search_default_reconcile_id':False, 'search_default_partner_id':[active_id]}" domain="[('account_id.reconcile', '=', True),('account_id.type', 'in', ['receivable', 'payable'])]" id="act_account_partner_account_move_all" name="Receivables &amp; Payables" res_model="account.move.line" src_model="res.partner" groups="base.group_extended"/>
<act_window context="{'search_default_partner_id':[active_id]}" id="act_account_partner_account_move" name="Journal Items" res_model="account.move.line" src_model="res.partner"/>
<act_window context="{'search_default_partner_id':[active_id]}" id="act_account_partner_account_move" name="Journal Items" res_model="account.move.line" src_model="res.partner" groups="account.group_account_user"/>
<record id="view_account_addtmpl_wizard_form" model="ir.ui.view">
<field name="name">Create Account</field>
@ -2095,17 +2095,17 @@
id="account_template_folder"
name="Templates"
parent="menu_finance_accounting"
groups="base.group_multi_company,group_account_manager"/>
groups="base.group_multi_company"/>
<menuitem
id="account_template_taxes"
name="Taxes"
parent="account_template_folder"
groups="base.group_multi_company,group_account_manager" sequence="2"/>
sequence="2"/>
<menuitem
id="account_template_accounts"
name="Accounts"
parent="account_template_folder"
groups="base.group_multi_company,group_account_manager" sequence="1"/>
sequence="1"/>
<record id="view_account_template_form" model="ir.ui.view">
@ -2751,8 +2751,8 @@ action = self.pool.get('res.config').next(cr, uid, [], context)
<field name="view_id" ref="account_cash_statement_graph"/>
<field name="act_window_id" ref="action_view_bank_statement_tree"/>
</record>
<menuitem action="action_view_bank_statement_tree" id="journal_cash_move_lines" parent="menu_finance_bank_and_cash"
groups="group_account_user,group_account_manager"/>
<menuitem action="action_view_bank_statement_tree" id="journal_cash_move_lines"
parent="menu_finance_bank_and_cash"/>
<record id="action_partner_all" model="ir.actions.act_window">
<field name="name">Partners</field>

2
addons/account/i18n/account.pot
View File

@ -7426,7 +7426,7 @@ msgstr ""
#. module: account
#: help:account.bs.report,reserve_account_id:0
msgid "This Account is used for trasfering Profit/Loss(If It is Profit: Amount will be added, Loss : Amount will be duducted.), Which is calculated from Profilt & Loss Report"
msgid "This Account is used for transferring Profit/Loss(If It is Profit: Amount will be added, Loss : Amount will be duducted.), Which is calculated from Profilt & Loss Report"
msgstr ""
#. module: account

8
addons/account/i18n/ar.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: 2010-12-24 05:16+0000\n"
"X-Launchpad-Export-Date: 2010-12-29 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@ -7845,9 +7845,9 @@ msgstr ""
#. module: account
#: help:account.bs.report,reserve_account_id:0
msgid ""
"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
"& Loss Report"
"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
"will be added, Loss : Amount will be duducted.), Which is calculated from "
"Profilt & Loss Report"
msgstr ""
#. module: account

8
addons/account/i18n/bg.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: 2010-12-24 05:17+0000\n"
"X-Launchpad-Export-Date: 2010-12-29 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@ -7876,9 +7876,9 @@ msgstr "Вид отпратка"
#. module: account
#: help:account.bs.report,reserve_account_id:0
msgid ""
"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
"& Loss Report"
"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
"will be added, Loss : Amount will be duducted.), Which is calculated from "
"Profilt & Loss Report"
msgstr ""
#. module: account

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

@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-12-24 05:17+0000\n"
"X-Launchpad-Export-Date: 2010-12-29 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@ -7843,9 +7843,9 @@ msgstr ""
#. module: account
#: help:account.bs.report,reserve_account_id:0
msgid ""
"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
"& Loss Report"
"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
"will be added, Loss : Amount will be duducted.), Which is calculated from "
"Profilt & Loss Report"
msgstr ""
#. module: account

8
addons/account/i18n/bs.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: 2010-12-24 05:16+0000\n"
"X-Launchpad-Export-Date: 2010-12-29 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@ -7900,9 +7900,9 @@ msgstr "Tip reference"
#. module: account
#: help:account.bs.report,reserve_account_id:0
msgid ""
"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
"& Loss Report"
"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
"will be added, Loss : Amount will be duducted.), Which is calculated from "
"Profilt & Loss Report"
msgstr ""
#. module: account

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

@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-12-24 05:17+0000\n"
"X-Launchpad-Export-Date: 2010-12-29 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@ -7935,9 +7935,9 @@ msgstr "Tipus referència"
#. module: account
#: help:account.bs.report,reserve_account_id:0
msgid ""
"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
"& Loss Report"
"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
"will be added, Loss : Amount will be duducted.), Which is calculated from "
"Profilt & Loss Report"
msgstr ""
#. module: account

8
addons/account/i18n/cs.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: 2010-12-24 05:17+0000\n"
"X-Launchpad-Export-Date: 2010-12-29 04:44+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@ -7842,9 +7842,9 @@ msgstr ""
#. module: account
#: help:account.bs.report,reserve_account_id:0
msgid ""
"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
"& Loss Report"
"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
"will be added, Loss : Amount will be duducted.), Which is calculated from "
"Profilt & Loss Report"
msgstr ""
#. module: account

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

@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-12-24 05:17+0000\n"
"X-Launchpad-Export-Date: 2010-12-29 04:44+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@ -7862,9 +7862,9 @@ msgstr ""
#. module: account
#: help:account.bs.report,reserve_account_id:0
msgid ""
"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
"& Loss Report"
"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
"will be added, Loss : Amount will be duducted.), Which is calculated from "
"Profilt & Loss Report"
msgstr ""
#. module: account

10
addons/account/i18n/de.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: 2010-12-21 19:43+0000\n"
"PO-Revision-Date: 2010-12-25 20:08+0000\n"
"PO-Revision-Date: 2010-12-28 21:39+0000\n"
"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
"consulting.net>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-12-26 04:50+0000\n"
"X-Launchpad-Export-Date: 2010-12-29 04:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@ -8408,9 +8408,9 @@ msgstr "Referenztyp"
#. module: account
#: help:account.bs.report,reserve_account_id:0
msgid ""
"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
"& Loss Report"
"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
"will be added, Loss : Amount will be duducted.), Which is calculated from "
"Profilt & Loss Report"
msgstr ""
"Dieses Konto wird als vorläufiges Konto für einen Gewinn oder Verlust aus "
"dem Geschäftsjahr verwendet (Bei vorläufigem Gewinn: Betrag wird "

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

@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2010-12-21 19:43+0000\n"
"PO-Revision-Date: 2010-12-27 14:04+0000\n"
"PO-Revision-Date: 2010-12-28 07:19+0000\n"
"Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
"Language-Team: Greek <el@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-12-28 04:41+0000\n"
"X-Launchpad-Export-Date: 2010-12-29 04:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@ -7966,9 +7966,9 @@ msgstr "Τύπος Παραπομπής"
#. module: account
#: help:account.bs.report,reserve_account_id:0
msgid ""
"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
"& Loss Report"
"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
"will be added, Loss : Amount will be duducted.), Which is calculated from "
"Profilt & Loss Report"
msgstr ""
#. module: account

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

@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:43+0000\n"
"PO-Revision-Date: 2010-12-27 10:40+0000\n"
"PO-Revision-Date: 2010-12-28 19:28+0000\n"
"Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-12-28 04:41+0000\n"
"X-Launchpad-Export-Date: 2010-12-29 04:49+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@ -399,9 +399,9 @@ msgid ""
"OpenERP. Journal items are created by OpenERP if you use Bank Statements, "
"Cash Registers, or Customer/Supplier payments."
msgstr ""
"Los contables utilizan esta vista para introducir asientos masivamente en "
"OpenERP. OpenERP crea los asientos contables si utiliza extractos bancarios, "
"registros de caja o pagos de cliente/proveedor."
"Los contables utilizan esta vista para introducir apuntes masivamente en "
"OpenERP. Cuando utiliza los extractos bancarios, hojas de caja, o pagos de "
"cliente/proveedor OpenERP crea automáticamente apuntes contables."
#. module: account
#: model:ir.model,name:account.model_account_tax_template
@ -2153,7 +2153,7 @@ msgstr "Descripción"
#: code:addons/account/installer.py:0
#, python-format
msgid "ECNJ"
msgstr ""
msgstr "ACOMPRA"
#. module: account
#: view:account.subscription:0
@ -2412,7 +2412,7 @@ msgstr "Contabilidad. Líneas de modelo"
#: code:addons/account/installer.py:0
#, python-format
msgid "EXJ"
msgstr "GASTO"
msgstr "COMPRA"
#. module: account
#: field:product.template,supplier_taxes_id:0
@ -4754,6 +4754,15 @@ msgid ""
"calendar year gives many companies an advantage, allowing them to close "
"their books at a time which is most convenient for them."
msgstr ""
"Defina el ejercicio fiscal de su compañía según la periodicidad que ha "
"decidido seguir. Un ejercicio fiscal es un periodo de 1 año sobre el cual la "
"compañía presupuesta sus gastos. Puede incluir cualquier periodo de 12 "
"meses. El ejercicio fiscal suele denominarse según la fecha en la que acaba. "
"Así, si el ejercicio fiscal de una compañía finaliza el 30 de noviembre de "
"2011, entonces todo lo comprendido entre el 1 de diciembre de 2010 y el 30 "
"de noviembre de 2011 será considerado como el EF 2011. No usar el calendario "
"natural es una ventaja para muchas compañías, ya que les permite cerrar sus "
"libros en el momento más conveniente para ellas."
#. module: account
#: model:ir.actions.act_window,name:account.action_payment_term_form
@ -6389,6 +6398,9 @@ msgid ""
"o.journal_id.id) - sum_credit(o.period_id.id, o.journal_id.id))) ]] [[ "
"o.journal_id.currency and o.journal_id.currency.symbol"
msgstr ""
"o.journal_id.currency and formatLang((sum_debit(o.period_id.id, "
"o.journal_id.id) - sum_credit(o.period_id.id, o.journal_id.id))) ]] [[ "
"o.journal_id.currency and o.journal_id.currency.symbol"
#. module: account
#: view:account.vat.declaration:0
@ -6694,6 +6706,12 @@ msgid ""
"Create and manage them from here and decide whether a period should be left "
"open or closed depending on your company's activities over a specific period."
msgstr ""
"Aquí puede definir un periodo, un intervalo de tiempo entre cierres "
"consecutivos de los libros de su compañía. Un periodo contable es "
"típicamente un mes o un trimestre, correspondientemente al régimen "
"impositivo usado en el negocio. Creelos y gestionelos desde aquí, y decida "
"si un periodo debe permanecer abierto o cerrado según las actividades de su "
"compañía en un plazo específico."
#. module: account
#: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
@ -7054,6 +7072,11 @@ msgid ""
"line of the expense account, OpenERP will propose to you automatically the "
"Tax related to this account and the counter-part \"Account Payable\"."
msgstr ""
"Esta vista es usada por los contables para registrar apuntes masivamente en "
"OpenERP. Si quiere registrar una factura de proveedor, comience "
"introduciendo el apunte de la cuenta de gastos. OpenERP le propondrá "
"automáticamente el impuesto asociado a esta cuenta, y la \"cuenta a pagar\" "
"de contrapartida."
#. module: account
#: help:res.company,property_reserve_and_surplus_account:0
@ -7118,6 +7141,12 @@ msgid ""
"Situation' to be used at the time of new fiscal year creation or end of year "
"entries generation."
msgstr ""
"Seleccione 'Ventas' para el diario de ventas que será usado cuando se creen "
"facturas. Seleccione 'Compras' para el diario a usar cuando se aprueben "
"pedidos de compra. Seleccione 'Efectivo' (Caja) para que se use a la hora de "
"hacer pagos. Seleccione 'General' para operaciones misceláneas. Seleccione "
"'Situación apertura/cierre' para usarlo cuando se crea un nuevo ejercicio "
"fiscal o la generación del asiento de cierre."
#. module: account
#: report:account.invoice:0
@ -7806,6 +7835,13 @@ msgid ""
"useful because it enables you to preview at any time the tax that you owe at "
"the start and end of the month or quarter."
msgstr ""
"Este menú imprime una declaración de IVA basada en facturas o pagos. Puede "
"seleccionar uno o varios periodos del ejercicio fiscal. La información "
"necesaria para la declaración de impuestos es generada por OpenERP a partir "
"de las facturas (o pagos, en algunos países). Esta información se actualiza "
"en tiempo real; lo cual es muy útil porque le permite previsualizar en "
"cualquier momento los impuestos a pagar al principio y al final del mes o "
"trimestre."
#. module: account
#: report:account.invoice:0
@ -7875,6 +7911,10 @@ msgid ""
"of it. You can easily generate refunds and reconcile them from the invoice "
"form."
msgstr ""
"Este menú le permite gestionar notas de crédito (reembolsos) emitidas/a "
"emitir a sus clientes. Una factura rectificativa es un documento que anula "
"una factura o parte de ella. Puede generar reembolsos fácilmente y "
"reconciliarlos desde el formulario de factura."
#. module: account
#: model:process.transition,name:account.process_transition_filestatement0
@ -7907,7 +7947,7 @@ msgstr "No se puede crear asiento factura en el diario centralizado"
#. module: account
#: field:account.account.type,report_type:0
msgid "P&L / BS Category"
msgstr ""
msgstr "Categoría Balance / PyG"
#. module: account
#: view:account.automatic.reconcile:0
@ -8306,9 +8346,9 @@ msgstr "Tipo de referencia"
#. module: account
#: help:account.bs.report,reserve_account_id:0
msgid ""
"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
"& Loss Report"
"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
"will be added, Loss : Amount will be duducted.), Which is calculated from "
"Profilt & Loss Report"
msgstr ""
"Esta cuenta se utiliza para transferir las Pérdidas/Ganancias (si es una "
"Ganancia: Importe será añadido, Pérdida: Importe será deducido), que se "
@ -8488,7 +8528,7 @@ msgstr ""
#: code:addons/account/installer.py:0
#, python-format
msgid "SCNJ"
msgstr ""
msgstr "AVENTA"
#. module: account
#: model:process.transition,note:account.process_transition_analyticinvoice0
@ -8507,6 +8547,10 @@ msgid ""
"in which order. You can create your own view for a faster encoding in each "
"journal."
msgstr ""
"Establece la vista usada cuando se escriben o consultan apuntes en este "
"diario. La vista le dice a OpenERP qué campos deben ser visibles, requeridos "
"o de sólo lectura, y en qué orden. Puede crear su propia vista en cada "
"diario para introducir apuntes más rápido."
#. module: account
#: field:account.period,date_stop:0
@ -8735,6 +8779,12 @@ msgid ""
"the income account. OpenERP will propose to you automatically the Tax "
"related to this account and the counter-part \"Account receivable\"."
msgstr ""
"Esta vista es usada por los contables para registrar apuntes masivamente en "
"OpenERP. Si quiere registrar una factura de cliente, seleccione el diario y "
"el periodo en la barra de herramientas de búsqueda. Luego, comience "
"introduciendo el apunte de la cuenta de ingresos. OpenERP le propondrá "
"automáticamente el impuesto asociado a esta cuenta, y la \"cuenta a cobrar\" "
"de contrapartida."
#. module: account
#: code:addons/account/account_bank_statement.py:0
@ -9056,6 +9106,10 @@ msgid ""
"Make sure you have configured Payment Term properly !\n"
"It should contain atleast one Payment Term Line with type \"Balance\" !"
msgstr ""
"¡ No se puede confirmar un asiento descuadrado !\n"
"¡ Asegúrese de haber configurado el plazo de pago correctamente !\n"
"¡ Debería contener al menos una línea de plazo de pago con de tipo \"Saldo\" "
"!"
#. module: account
#: help:res.partner,property_account_payable:0

8
addons/account/i18n/es_AR.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: 2010-12-24 05:25+0000\n"
"X-Launchpad-Export-Date: 2010-12-29 04:51+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@ -7937,9 +7937,9 @@ msgstr "Tipo de referencia"
#. module: account
#: help:account.bs.report,reserve_account_id:0
msgid ""
"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
"& Loss Report"
"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
"will be added, Loss : Amount will be duducted.), Which is calculated from "
"Profilt & Loss Report"
msgstr ""
#. module: account

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

@ -16,7 +16,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-12-24 05:25+0000\n"
"X-Launchpad-Export-Date: 2010-12-29 04:52+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@ -8249,13 +8249,10 @@ msgstr "Tipo de referencia"
#. module: account
#: help:account.bs.report,reserve_account_id:0
msgid ""
"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
"& Loss Report"
"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
"will be added, Loss : Amount will be duducted.), Which is calculated from "
"Profilt & Loss Report"
msgstr ""
"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
"& Loss Report"
#. module: account
#: view:account.analytic.cost.ledger.journal.report:0
@ -11819,6 +11816,15 @@ msgstr "You cannot remove an account which has account entries!. "
#~ " def create_entries(self, cr, uid, ids, context=None):\n"
#~ " account_model_obj = self.pool.get('account.model"
#~ msgid ""
#~ "This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
#~ "be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
#~ "& Loss Report"
#~ msgstr ""
#~ "This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
#~ "be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
#~ "& Loss Report"
#~ msgid "Liability View"
#~ msgstr "Vista de Pasivo"

8
addons/account/i18n/et.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: 2010-12-24 05:18+0000\n"
"X-Launchpad-Export-Date: 2010-12-29 04:44+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@ -7843,9 +7843,9 @@ msgstr "Viite tüüp"
#. module: account
#: help:account.bs.report,reserve_account_id:0
msgid ""
"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
"& Loss Report"
"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
"will be added, Loss : Amount will be duducted.), Which is calculated from "
"Profilt & Loss Report"
msgstr ""
#. module: account

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

@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-12-24 05:16+0000\n"
"X-Launchpad-Export-Date: 2010-12-29 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@ -7843,9 +7843,9 @@ msgstr ""
#. module: account
#: help:account.bs.report,reserve_account_id:0
msgid ""
"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
"& Loss Report"
"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
"will be added, Loss : Amount will be duducted.), Which is calculated from "
"Profilt & Loss Report"
msgstr ""
#. module: account

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

@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-12-24 05:21+0000\n"
"X-Launchpad-Export-Date: 2010-12-29 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@ -7843,9 +7843,9 @@ msgstr ""
#. module: account
#: help:account.bs.report,reserve_account_id:0
msgid ""
"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
"& Loss Report"
"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
"will be added, Loss : Amount will be duducted.), Which is calculated from "
"Profilt & Loss Report"
msgstr ""
#. module: account

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

@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-12-24 05:18+0000\n"
"X-Launchpad-Export-Date: 2010-12-29 04:44+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@ -7907,9 +7907,9 @@ msgstr "Viitetyyppi"
#. module: account
#: help:account.bs.report,reserve_account_id:0
msgid ""
"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
"& Loss Report"
"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
"will be added, Loss : Amount will be duducted.), Which is calculated from "
"Profilt & Loss Report"
msgstr ""
#. module: account

8
addons/account/i18n/fr.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: 2010-12-27 04:39+0000\n"
"X-Launchpad-Export-Date: 2010-12-29 04:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@ -8353,9 +8353,9 @@ msgstr "Type de référence"
#. module: account
#: help:account.bs.report,reserve_account_id:0
msgid ""
"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
"& Loss Report"
"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
"will be added, Loss : Amount will be duducted.), Which is calculated from "
"Profilt & Loss Report"
msgstr ""
#. module: account

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

@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-12-24 05:18+0000\n"
"X-Launchpad-Export-Date: 2010-12-29 04:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@ -7843,9 +7843,9 @@ msgstr ""
#. module: account
#: help:account.bs.report,reserve_account_id:0
msgid ""
"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
"& Loss Report"
"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
"will be added, Loss : Amount will be duducted.), Which is calculated from "
"Profilt & Loss Report"
msgstr ""
#. module: account

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

@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-12-24 05:19+0000\n"
"X-Launchpad-Export-Date: 2010-12-29 04:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@ -7843,9 +7843,9 @@ msgstr ""
#. module: account
#: help:account.bs.report,reserve_account_id:0
msgid ""
"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
"& Loss Report"
"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
"will be added, Loss : Amount will be duducted.), Which is calculated from "
"Profilt & Loss Report"
msgstr ""
#. module: account

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

@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-12-24 05:19+0000\n"
"X-Launchpad-Export-Date: 2010-12-29 04:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@ -7843,9 +7843,9 @@ msgstr ""
#. module: account
#: help:account.bs.report,reserve_account_id:0
msgid ""
"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
"& Loss Report"
"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
"will be added, Loss : Amount will be duducted.), Which is calculated from "
"Profilt & Loss Report"
msgstr ""
#. module: account

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

@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-12-24 05:19+0000\n"
"X-Launchpad-Export-Date: 2010-12-29 04:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@ -7844,9 +7844,9 @@ msgstr ""
#. module: account
#: help:account.bs.report,reserve_account_id:0
msgid ""
"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
"& Loss Report"
"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
"will be added, Loss : Amount will be duducted.), Which is calculated from "
"Profilt & Loss Report"
msgstr ""
#. module: account

8
addons/account/i18n/hr.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: 2010-12-24 05:22+0000\n"
"X-Launchpad-Export-Date: 2010-12-29 04:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@ -7872,9 +7872,9 @@ msgstr "Tip veze"
#. module: account
#: help:account.bs.report,reserve_account_id:0
msgid ""
"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
"& Loss Report"
"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
"will be added, Loss : Amount will be duducted.), Which is calculated from "
"Profilt & Loss Report"
msgstr ""
#. module: account

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

@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:43+0000\n"
"PO-Revision-Date: 2010-12-25 18:32+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"PO-Revision-Date: 2010-12-28 20:26+0000\n"
"Last-Translator: NOVOTRADE SYSTEMHOUSE <openerp@novotrade.hu>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-12-26 04:50+0000\n"
"X-Launchpad-Export-Date: 2010-12-29 04:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@ -4575,7 +4575,7 @@ msgstr ""
#: field:account.invoice.tax,account_id:0
#: field:account.move.line,tax_code_id:0
msgid "Tax Account"
msgstr "Adó számla"
msgstr "Adószámla"
#. module: account
#: view:account.automatic.reconcile:0
@ -4678,7 +4678,7 @@ msgstr ""
#: field:account.tax,child_depend:0
#: field:account.tax.template,child_depend:0
msgid "Tax on Children"
msgstr ""
msgstr "Gyermekek utáni adó"
#. module: account
#: constraint:account.move.line:0
@ -6965,6 +6965,9 @@ msgid ""
"positive, it gives the day of the next month. Set 0 for net days (otherwise "
"it's based on the beginning of the month)."
msgstr ""
"Hónap napja, állíts -1 -et az utolsó napnak az aktuális hónapban. Ha ez "
"pozitív, akkor megadja a következő hónap napját. Állíts 0 -t netto napoknak "
"(máskülönben a hónap eleje alapján lesz meghatározva )"
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_legal_statement
@ -7109,7 +7112,7 @@ msgstr ""
#. module: account
#: field:account.tax.template,type_tax_use:0
msgid "Tax Use In"
msgstr ""
msgstr "Használt adó"
#. module: account
#: model:ir.actions.act_window,help:account.action_account_journal_form
@ -7846,9 +7849,9 @@ msgstr ""
#. module: account
#: help:account.bs.report,reserve_account_id:0
msgid ""
"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
"& Loss Report"
"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
"will be added, Loss : Amount will be duducted.), Which is calculated from "
"Profilt & Loss Report"
msgstr ""
#. module: account

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

@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-12-24 05:19+0000\n"
"X-Launchpad-Export-Date: 2010-12-29 04:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@ -7847,9 +7847,9 @@ msgstr ""
#. module: account
#: help:account.bs.report,reserve_account_id:0
msgid ""
"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
"& Loss Report"
"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
"will be added, Loss : Amount will be duducted.), Which is calculated from "
"Profilt & Loss Report"
msgstr ""
#. module: account

8
addons/account/i18n/it.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: 2010-12-28 04:41+0000\n"
"X-Launchpad-Export-Date: 2010-12-29 04:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@ -8139,9 +8139,9 @@ msgstr "Tipo riferimento"
#. module: account
#: help:account.bs.report,reserve_account_id:0
msgid ""
"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
"& Loss Report"
"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
"will be added, Loss : Amount will be duducted.), Which is calculated from "
"Profilt & Loss Report"
msgstr ""
#. module: account

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

@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-12-24 05:20+0000\n"
"X-Launchpad-Export-Date: 2010-12-29 04:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@ -7843,9 +7843,9 @@ msgstr ""
#. module: account
#: help:account.bs.report,reserve_account_id:0
msgid ""
"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
"& Loss Report"
"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
"will be added, Loss : Amount will be duducted.), Which is calculated from "
"Profilt & Loss Report"
msgstr ""
#. module: account

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

@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-12-24 05:20+0000\n"
"X-Launchpad-Export-Date: 2010-12-29 04:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@ -7843,9 +7843,9 @@ msgstr ""
#. module: account
#: help:account.bs.report,reserve_account_id:0
msgid ""
"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
"& Loss Report"
"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
"will be added, Loss : Amount will be duducted.), Which is calculated from "
"Profilt & Loss Report"
msgstr ""
#. module: account

8
addons/account/i18n/lt.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: 2010-12-24 05:20+0000\n"
"X-Launchpad-Export-Date: 2010-12-29 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@ -7886,9 +7886,9 @@ msgstr "Nuorodos tipas"
#. module: account
#: help:account.bs.report,reserve_account_id:0
msgid ""
"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
"& Loss Report"
"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
"will be added, Loss : Amount will be duducted.), Which is calculated from "
"Profilt & Loss Report"
msgstr ""
#. module: account

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

@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-12-24 05:20+0000\n"
"X-Launchpad-Export-Date: 2010-12-29 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@ -7855,9 +7855,9 @@ msgstr ""
#. module: account
#: help:account.bs.report,reserve_account_id:0
msgid ""
"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
"& Loss Report"
"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
"will be added, Loss : Amount will be duducted.), Which is calculated from "
"Profilt & Loss Report"
msgstr ""
#. module: account

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

@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-12-24 05:20+0000\n"
"X-Launchpad-Export-Date: 2010-12-29 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@ -8039,9 +8039,9 @@ msgstr "Дугаарлалтын төрөл"
#. module: account
#: help:account.bs.report,reserve_account_id:0
msgid ""
"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
"& Loss Report"
"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
"will be added, Loss : Amount will be duducted.), Which is calculated from "
"Profilt & Loss Report"
msgstr ""
#. module: account

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

@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-12-24 05:20+0000\n"
"X-Launchpad-Export-Date: 2010-12-29 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@ -7843,9 +7843,9 @@ msgstr ""
#. module: account
#: help:account.bs.report,reserve_account_id:0
msgid ""
"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
"& Loss Report"
"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
"will be added, Loss : Amount will be duducted.), Which is calculated from "
"Profilt & Loss Report"
msgstr ""
#. module: account

8
addons/account/i18n/nl.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: 2010-12-24 05:17+0000\n"
"X-Launchpad-Export-Date: 2010-12-29 04:44+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@ -7968,9 +7968,9 @@ msgstr "Referentietype"
#. module: account
#: help:account.bs.report,reserve_account_id:0
msgid ""
"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
"& Loss Report"
"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
"will be added, Loss : Amount will be duducted.), Which is calculated from "
"Profilt & Loss Report"
msgstr ""
#. module: account

8
addons/account/i18n/nl_BE.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: 2010-12-24 05:25+0000\n"
"X-Launchpad-Export-Date: 2010-12-29 04:52+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@ -7874,9 +7874,9 @@ msgstr "Referentietype"
#. module: account
#: help:account.bs.report,reserve_account_id:0
msgid ""
"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
"& Loss Report"
"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
"will be added, Loss : Amount will be duducted.), Which is calculated from "
"Profilt & Loss Report"
msgstr ""
#. module: account

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

@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-12-24 05:21+0000\n"
"X-Launchpad-Export-Date: 2010-12-29 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@ -7843,9 +7843,9 @@ msgstr ""
#. module: account
#: help:account.bs.report,reserve_account_id:0
msgid ""
"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
"& Loss Report"
"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
"will be added, Loss : Amount will be duducted.), Which is calculated from "
"Profilt & Loss Report"
msgstr ""
#. module: account

8
addons/account/i18n/pl.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: 2010-12-24 05:21+0000\n"
"X-Launchpad-Export-Date: 2010-12-29 04:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@ -7970,9 +7970,9 @@ msgstr "Typ odnośnika"
#. module: account
#: help:account.bs.report,reserve_account_id:0
msgid ""
"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
"& Loss Report"
"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
"will be added, Loss : Amount will be duducted.), Which is calculated from "
"Profilt & Loss Report"
msgstr ""
#. module: account

8
addons/account/i18n/pt.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: 2010-12-24 05:21+0000\n"
"X-Launchpad-Export-Date: 2010-12-29 04:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@ -7985,9 +7985,9 @@ msgstr "Tipo de referência"
#. module: account
#: help:account.bs.report,reserve_account_id:0
msgid ""
"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
"& Loss Report"
"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
"will be added, Loss : Amount will be duducted.), Which is calculated from "
"Profilt & Loss Report"
msgstr ""
#. module: account

8
addons/account/i18n/pt_BR.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: 2010-12-24 05:24+0000\n"
"X-Launchpad-Export-Date: 2010-12-29 04:51+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@ -7938,9 +7938,9 @@ msgstr "Tipo de referência"
#. module: account
#: help:account.bs.report,reserve_account_id:0
msgid ""
"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
"& Loss Report"
"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
"will be added, Loss : Amount will be duducted.), Which is calculated from "
"Profilt & Loss Report"
msgstr ""
#. module: account

8
addons/account/i18n/ro.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: 2010-12-24 05:21+0000\n"
"X-Launchpad-Export-Date: 2010-12-29 04:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@ -7919,9 +7919,9 @@ msgstr "Tipul referinţei"
#. module: account
#: help:account.bs.report,reserve_account_id:0
msgid ""
"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
"& Loss Report"
"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
"will be added, Loss : Amount will be duducted.), Which is calculated from "
"Profilt & Loss Report"
msgstr ""
#. module: account

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

@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:43+0000\n"
"PO-Revision-Date: 2010-12-21 14:14+0000\n"
"PO-Revision-Date: 2010-12-28 14:42+0000\n"
"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-12-24 05:21+0000\n"
"X-Launchpad-Export-Date: 2010-12-29 04:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@ -3828,7 +3828,7 @@ msgstr "Счет расходов не определен для этого то
#. module: account
#: view:res.partner:0
msgid "Customer Accounting Properties"
msgstr "Настройки бух. учета для заказчика"
msgstr "Настройки бухучета для заказчика"
#. module: account
#: field:account.invoice.tax,name:0
@ -4741,7 +4741,7 @@ msgstr ""
#. module: account
#: report:account.partner.balance:0
msgid "(Account/Partner) Name"
msgstr "Имя счета/контрагента"
msgstr "Название счета/партнера"
#. module: account
#: view:account.bank.statement:0
@ -7645,7 +7645,7 @@ msgstr "Разрешенные типы счетов (оставьте пуст
#. module: account
#: view:res.partner:0
msgid "Supplier Accounting Properties"
msgstr "Настройки бухгалтерского учета для контрагента-поставщика"
msgstr "Настройки бухучета для поставщика"
#. module: account
#: view:account.payment.term.line:0
@ -7897,9 +7897,9 @@ msgstr "Тип ссылки"
#. module: account
#: help:account.bs.report,reserve_account_id:0
msgid ""
"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
"& Loss Report"
"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
"will be added, Loss : Amount will be duducted.), Which is calculated from "
"Profilt & Loss Report"
msgstr ""
#. module: account

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

@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-12-24 05:22+0000\n"
"X-Launchpad-Export-Date: 2010-12-29 04:49+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@ -7843,9 +7843,9 @@ msgstr ""
#. module: account
#: help:account.bs.report,reserve_account_id:0
msgid ""
"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
"& Loss Report"
"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
"will be added, Loss : Amount will be duducted.), Which is calculated from "
"Profilt & Loss Report"
msgstr ""
#. module: account

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

@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-12-24 05:22+0000\n"
"X-Launchpad-Export-Date: 2010-12-29 04:49+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@ -7846,9 +7846,9 @@ msgstr ""
#. module: account
#: help:account.bs.report,reserve_account_id:0
msgid ""
"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
"& Loss Report"
"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
"will be added, Loss : Amount will be duducted.), Which is calculated from "
"Profilt & Loss Report"
msgstr ""
#. module: account

8
addons/account/i18n/sl.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: 2010-12-24 05:22+0000\n"
"X-Launchpad-Export-Date: 2010-12-29 04:49+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@ -7864,9 +7864,9 @@ msgstr "Vrsta sklica"
#. module: account
#: help:account.bs.report,reserve_account_id:0
msgid ""
"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
"& Loss Report"
"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
"will be added, Loss : Amount will be duducted.), Which is calculated from "
"Profilt & Loss Report"
msgstr ""
#. module: account

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

@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-12-24 05:16+0000\n"
"X-Launchpad-Export-Date: 2010-12-29 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@ -7859,9 +7859,9 @@ msgstr ""
#. module: account
#: help:account.bs.report,reserve_account_id:0
msgid ""
"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
"& Loss Report"
"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
"will be added, Loss : Amount will be duducted.), Which is calculated from "
"Profilt & Loss Report"
msgstr ""
#. module: account

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

@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-12-24 05:22+0000\n"
"X-Launchpad-Export-Date: 2010-12-29 04:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@ -7901,9 +7901,9 @@ msgstr "Tip reference"
#. module: account
#: help:account.bs.report,reserve_account_id:0
msgid ""
"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
"& Loss Report"
"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
"will be added, Loss : Amount will be duducted.), Which is calculated from "
"Profilt & Loss Report"
msgstr ""
#. module: account

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

@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-12-25 04:52+0000\n"
"X-Launchpad-Export-Date: 2010-12-29 04:52+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@ -7901,9 +7901,9 @@ msgstr "Tip reference"
#. module: account
#: help:account.bs.report,reserve_account_id:0
msgid ""
"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
"& Loss Report"
"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
"will be added, Loss : Amount will be duducted.), Which is calculated from "
"Profilt & Loss Report"
msgstr ""
#. module: account

8
addons/account/i18n/sv.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: 2010-12-24 05:23+0000\n"
"X-Launchpad-Export-Date: 2010-12-29 04:49+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@ -7946,9 +7946,9 @@ msgstr "Referenstyp"
#. module: account
#: help:account.bs.report,reserve_account_id:0
msgid ""
"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
"& Loss Report"
"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
"will be added, Loss : Amount will be duducted.), Which is calculated from "
"Profilt & Loss Report"
msgstr ""
#. module: account

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

@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-12-24 05:23+0000\n"
"X-Launchpad-Export-Date: 2010-12-29 04:50+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@ -7843,9 +7843,9 @@ msgstr ""
#. module: account
#: help:account.bs.report,reserve_account_id:0
msgid ""
"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
"& Loss Report"
"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
"will be added, Loss : Amount will be duducted.), Which is calculated from "
"Profilt & Loss Report"
msgstr ""
#. module: account

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

@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-12-24 05:23+0000\n"
"X-Launchpad-Export-Date: 2010-12-29 04:50+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@ -7843,9 +7843,9 @@ msgstr ""
#. module: account
#: help:account.bs.report,reserve_account_id:0
msgid ""
"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
"& Loss Report"
"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
"will be added, Loss : Amount will be duducted.), Which is calculated from "
"Profilt & Loss Report"
msgstr ""
#. module: account

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

@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-12-24 05:23+0000\n"
"X-Launchpad-Export-Date: 2010-12-29 04:50+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@ -7843,9 +7843,9 @@ msgstr ""
#. module: account
#: help:account.bs.report,reserve_account_id:0
msgid ""
"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
"& Loss Report"
"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
"will be added, Loss : Amount will be duducted.), Which is calculated from "
"Profilt & Loss Report"
msgstr ""
#. module: account

8
addons/account/i18n/tlh.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: 2010-12-24 05:23+0000\n"
"X-Launchpad-Export-Date: 2010-12-29 04:50+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@ -7842,9 +7842,9 @@ msgstr ""
#. module: account
#: help:account.bs.report,reserve_account_id:0
msgid ""
"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
"& Loss Report"
"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
"will be added, Loss : Amount will be duducted.), Which is calculated from "
"Profilt & Loss Report"
msgstr ""
#. module: account

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

@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:43+0000\n"
"PO-Revision-Date: 2010-12-02 07:52+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"PO-Revision-Date: 2010-12-28 19:06+0000\n"
"Last-Translator: François Degrave (OpenERP) <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-12-24 05:24+0000\n"
"X-Launchpad-Export-Date: 2010-12-29 04:50+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@ -8115,13 +8115,13 @@ msgstr "Referans Tipi"
#. module: account
#: help:account.bs.report,reserve_account_id:0
msgid ""
"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
"& Loss Report"
"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
"will be added, Loss : Amount will be duducted.), Which is calculated from "
"Profilt & Loss Report"
msgstr ""
"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
"& Loss Report"
"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
"will be added, Loss : Amount will be duducted.), Which is calculated from "
"Profilt & Loss Report"
#. module: account
#: view:account.analytic.cost.ledger.journal.report:0

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

@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-12-24 05:24+0000\n"
"X-Launchpad-Export-Date: 2010-12-29 04:50+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@ -7843,9 +7843,9 @@ msgstr ""
#. module: account
#: help:account.bs.report,reserve_account_id:0
msgid ""
"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
"& Loss Report"
"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
"will be added, Loss : Amount will be duducted.), Which is calculated from "
"Profilt & Loss Report"
msgstr ""
#. module: account

8
addons/account/i18n/uk.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: 2010-12-24 05:24+0000\n"
"X-Launchpad-Export-Date: 2010-12-29 04:51+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@ -7848,9 +7848,9 @@ msgstr "Тип посилання"
#. module: account
#: help:account.bs.report,reserve_account_id:0
msgid ""
"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
"& Loss Report"
"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
"will be added, Loss : Amount will be duducted.), Which is calculated from "
"Profilt & Loss Report"
msgstr ""
#. module: account

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

@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:43+0000\n"
"PO-Revision-Date: 2010-12-21 14:38+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"PO-Revision-Date: 2010-12-28 20:26+0000\n"
"Last-Translator: François Degrave (OpenERP) <Unknown>\n"
"Language-Team: Vietnamese <vi@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-12-24 05:24+0000\n"
"X-Launchpad-Export-Date: 2010-12-29 04:51+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@ -2428,7 +2428,7 @@ msgstr ""
#. module: account
#: constraint:product.category:0
msgid "Error ! You can not create recursive categories."
msgstr ""
msgstr "Lỗi ! Bạn không thể tạo ra loại đệ quy."
#. module: account
#: model:account.account.type,name:account.account_type_tax
@ -4112,7 +4112,7 @@ msgstr "Account Journal Select"
#. module: account
#: view:account.invoice:0
msgid "Print Invoice"
msgstr ""
msgstr "In hóa đơn"
#. module: account
#: view:account.tax.template:0
@ -8238,13 +8238,13 @@ msgstr "Lọai tham chiếu"
#. module: account
#: help:account.bs.report,reserve_account_id:0
msgid ""
"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
"& Loss Report"
"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
"will be added, Loss : Amount will be duducted.), Which is calculated from "
"Profilt & Loss Report"
msgstr ""
"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
"& Loss Report"
"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
"will be added, Loss : Amount will be duducted.), Which is calculated from "
"Profilt & Loss Report"
#. module: account
#: view:account.analytic.cost.ledger.journal.report:0

8
addons/account/i18n/zh_CN.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: 2010-12-25 04:51+0000\n"
"X-Launchpad-Export-Date: 2010-12-29 04:52+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@ -7849,9 +7849,9 @@ msgstr "关联类型"
#. module: account
#: help:account.bs.report,reserve_account_id:0
msgid ""
"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
"& Loss Report"
"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
"will be added, Loss : Amount will be duducted.), Which is calculated from "
"Profilt & Loss Report"
msgstr ""
#. module: account

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

@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-12-24 05:24+0000\n"
"X-Launchpad-Export-Date: 2010-12-29 04:51+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@ -7843,9 +7843,9 @@ msgstr ""
#. module: account
#: help:account.bs.report,reserve_account_id:0
msgid ""
"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
"& Loss Report"
"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
"will be added, Loss : Amount will be duducted.), Which is calculated from "
"Profilt & Loss Report"
msgstr ""
#. module: account

8
addons/account/i18n/zh_TW.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: 2010-12-24 05:25+0000\n"
"X-Launchpad-Export-Date: 2010-12-29 04:52+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@ -7842,9 +7842,9 @@ msgstr ""
#. module: account
#: help:account.bs.report,reserve_account_id:0
msgid ""
"This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
"& Loss Report"
"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
"will be added, Loss : Amount will be duducted.), Which is calculated from "
"Profilt & Loss Report"
msgstr ""
#. module: account

13
addons/account/installer.py
View File

@ -95,7 +95,7 @@ class account_installer(osv.osv_memory):
'bank_accounts_id': _get_default_accounts,
'charts': _get_default_charts
}
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 = []
@ -106,11 +106,12 @@ class account_installer(osv.osv_memory):
cr.execute("SELECT company_id FROM account_account WHERE active = 't' AND account_account.parent_id IS NULL AND name != %s", ("Chart For Automated Tests",))
configured_cmp = [r[0] for r in cr.fetchall()]
unconfigured_cmp = list(set(company_ids)-set(configured_cmp))
if unconfigured_cmp:
cmp_select = [(line.id, line.name) for line in self.pool.get('res.company').browse(cr, uid, unconfigured_cmp)]
for field in res['fields']:
if field == 'company_id':
res['fields'][field]['domain'] = unconfigured_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
return res

35
addons/account/invoice.py
View File

@ -95,7 +95,7 @@ class account_invoice(osv.osv):
cur_obj = self.pool.get('res.currency')
data_inv = self.browse(cr, uid, ids, context=context)
for inv in data_inv:
if inv.reconciled:
if inv.reconciled:
res[inv.id] = 0.0
continue
inv_total = inv.amount_total
@ -111,7 +111,7 @@ class account_invoice(osv.osv):
amount_in_invoice_currency = cur_obj.compute(cr, uid, inv.company_id.currency_id.id, inv.currency_id.id,abs(lines.debit-lines.credit),round=False,context=context_unreconciled)
inv_total -= amount_in_invoice_currency
result = inv_total
result = inv_total
res[inv.id] = self.pool.get('res.currency').round(cr, uid, inv.currency_id, result)
return res
@ -246,7 +246,7 @@ class account_invoice(osv.osv):
'invoice_line': fields.one2many('account.invoice.line', 'invoice_id', 'Invoice Lines', readonly=True, states={'draft':[('readonly',False)]}),
'tax_line': fields.one2many('account.invoice.tax', 'invoice_id', 'Tax Lines', readonly=True, states={'draft':[('readonly',False)]}),
'move_id': fields.many2one('account.move', 'Journal Entry', readonly=True, select=1, help="Link to the automatically generated Journal Items."),
'move_id': fields.many2one('account.move', 'Journal Entry', readonly=True, select=1, ondelete='restrict', help="Link to the automatically generated Journal Items."),
'amount_untaxed': fields.function(_amount_all, method=True, digits_compute=dp.get_precision('Account'), string='Untaxed',
store={
'account.invoice': (lambda self, cr, uid, ids, c={}: ids, ['invoice_line'], 20),
@ -947,22 +947,22 @@ class account_invoice(osv.osv):
def line_get_convert(self, cr, uid, x, part, date, context=None):
return {
'date_maturity': x.get('date_maturity', False),
'partner_id':part,
'name':x['name'][:64],
'partner_id': part,
'name': x['name'][:64],
'date': date,
'debit':x['price']>0 and x['price'],
'credit':x['price']<0 and -x['price'],
'account_id':x['account_id'],
'analytic_lines':x.get('analytic_lines', []),
'amount_currency':x['price']>0 and abs(x.get('amount_currency', False)) or -abs(x.get('amount_currency', False)),
'currency_id':x.get('currency_id', False),
'debit': x['price']>0 and x['price'],
'credit': x['price']<0 and -x['price'],
'account_id': x['account_id'],
'analytic_lines': x.get('analytic_lines', []),
'amount_currency': x['price']>0 and abs(x.get('amount_currency', False)) or -abs(x.get('amount_currency', False)),
'currency_id': x.get('currency_id', False),
'tax_code_id': x.get('tax_code_id', False),
'tax_amount': x.get('tax_amount', False),
'ref':x.get('ref',False),
'quantity':x.get('quantity',1.00),
'product_id':x.get('product_id', False),
'product_uom_id':x.get('uos_id',False),
'analytic_account_id':x.get('account_analytic_id',False),
'ref': x.get('ref', False),
'quantity': x.get('quantity',1.00),
'product_id': x.get('product_id', False),
'product_uom_id': x.get('uos_id', False),
'analytic_account_id': x.get('account_analytic_id', False),
}
def action_number(self, cr, uid, ids, context=None):
@ -1132,6 +1132,7 @@ class account_invoice(osv.osv):
invoice[field] = invoice[field] and invoice[field][0]
# create the new invoice
new_ids.append(self.create(cr, uid, invoice))
return new_ids
def pay_and_reconcile(self, cr, uid, ids, pay_amount, pay_account_id, period_id, pay_journal_id, writeoff_acc_id, writeoff_period_id, writeoff_journal_id, context=None, name=''):
@ -1232,6 +1233,7 @@ class account_invoice(osv.osv):
# Update the stored value (fields.function), so we write to trigger recompute
self.pool.get('account.invoice').write(cr, uid, ids, {}, context=context)
return True
account_invoice()
class account_invoice_line(osv.osv):
@ -1643,6 +1645,7 @@ class account_invoice_tax(osv.osv):
'tax_amount': t['tax_amount']
})
return res
account_invoice_tax()

3
addons/account/project/project.py
View File

@ -24,6 +24,7 @@ from osv import osv
class account_analytic_journal(osv.osv):
_name = 'account.analytic.journal'
_description = 'Analytic Journal'
_columns = {
'name': fields.char('Journal Name', size=64, required=True),
'code': fields.char('Journal Code', size=8),
@ -49,4 +50,4 @@ class account_journal(osv.osv):
account_journal()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

24
addons/account/project/project_report.xml
View File

@ -1,15 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<report auto="False" id="analytic_journal_print" menu="False" model="account.analytic.journal" name="account.analytic.account.journal" rml="account/project/report/analytic_journal.rml" string="Analytic Journal"/>
<report auto="False" id="analytic_journal_print" menu="False"
model="account.analytic.journal" name="account.analytic.account.journal"
rml="account/project/report/analytic_journal.rml" string="Analytic Journal"/>
<report auto="False" id="account_analytic_account_balance" menu="False" model="account.analytic.account" name="account.analytic.account.balance" rml="account/project/report/analytic_balance.rml" string="Analytic Balance"/>
<report auto="False" id="account_analytic_account_balance" menu="False"
model="account.analytic.account" name="account.analytic.account.balance"
rml="account/project/report/analytic_balance.rml" string="Analytic Balance"/>
<report auto="False" id="account_analytic_account_inverted_balance" menu="False" model="account.analytic.account" name="account.analytic.account.inverted.balance" rml="account/project/report/inverted_analytic_balance.rml" string="Inverted Analytic Balance"/>
<report auto="False" id="account_analytic_account_inverted_balance"
menu="False" model="account.analytic.account"
name="account.analytic.account.inverted.balance"
rml="account/project/report/inverted_analytic_balance.rml"
string="Inverted Analytic Balance"/>
<report auto="False" id="account_analytic_account_cost_ledger" menu="False" model="account.analytic.account" name="account.analytic.account.cost_ledger" rml="account/project/report/cost_ledger.rml" string="Cost Ledger"/>
<report auto="False" id="account_analytic_account_cost_ledger" menu="False"
model="account.analytic.account" name="account.analytic.account.cost_ledger"
rml="account/project/report/cost_ledger.rml" string="Cost Ledger"/>
<report auto="False" id="account_analytic_account_quantity_cost_ledger" menu="False" model="account.analytic.account" name="account.analytic.account.quantity_cost_ledger" rml="account/project/report/quantity_cost_ledger.rml" string="Cost Ledger (Only quantities)"/>
<report auto="False" id="account_analytic_account_quantity_cost_ledger"
menu="False" model="account.analytic.account"
name="account.analytic.account.quantity_cost_ledger"
rml="account/project/report/quantity_cost_ledger.rml"
string="Cost Ledger (Only quantities)"/>
</data>
</openerp>

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

@ -82,12 +82,13 @@
<field name="name" select="1" colspan="4"/>
<field name="code" select="1"/>
<field name="parent_id" on_change="on_change_parent(parent_id)" groups="base.group_extended"/>
<field name="company_id" select="2" widget="selection" groups="base.group_multi_company"/>
<field name="company_id" on_change="on_change_company(company_id)" select="2" widget="selection" groups="base.group_multi_company" attrs="{'required': [('type','&lt;&gt;','view')]}"/>
<field name="type" select="2"/>
</group>
<notebook colspan="4">
<page string="Account Data">
<field name="partner_id" select="1"/>
<field name="currency_id" select="1"/>
<newline/>
<field name="date_start"/>
<field name="date" select="2"/>
@ -112,7 +113,9 @@
<field name="view_id" ref="view_account_analytic_account_tree"/>
<field name="search_view_id" ref="account.view_account_analytic_account_search"/>
</record>
<menuitem action="action_account_analytic_account_form" id="account_analytic_def_account" parent="menu_analytic_accounting" groups="analytic.group_analytic_accounting,group_account_manager"/>
<menuitem action="action_account_analytic_account_form" id="account_analytic_def_account"
parent="menu_analytic_accounting"
groups="analytic.group_analytic_accounting"/>
<record id="act_account_renew_view" model="ir.actions.act_window">
<field name="name">Accounts to Renew</field>
@ -133,7 +136,9 @@
<field name="help">The normal chart of accounts has a structure defined by the legal requirement of the country. The analytic chart of account structure should reflect your own business needs in term of costs/revenues reporting. They are usually structured by contracts, projects, products or departements. Most of the OpenERP operations (invoices, timesheets, expenses, etc) generate analytic entries on the related account.</field>
</record>
<menuitem groups="analytic.group_analytic_accounting,group_account_manager,group_account_user" id="next_id_40" name="Analytic" parent="account.menu_finance_generic_reporting" sequence="4"/>
<menuitem groups="analytic.group_analytic_accounting" id="next_id_40"
name="Analytic" parent="account.menu_finance_generic_reporting"
sequence="4"/>
<record id="view_account_analytic_line_form" model="ir.ui.view">
<field name="name">account.analytic.line.form</field>
@ -340,7 +345,7 @@
<field name="view_mode">tree,form</field>
<field name="search_view_id" ref="view_analytic_journal_search" />
</record>
<menuitem groups="analytic.group_analytic_accounting,group_account_manager" action="action_account_analytic_journal_form" id="account_def_analytic_journal" parent="menu_analytic_accounting" sequence="5"/>
<menuitem groups="analytic.group_analytic_accounting" action="action_account_analytic_journal_form" id="account_def_analytic_journal" parent="menu_analytic_accounting" sequence="5"/>
#
# Open journal entries
@ -352,7 +357,10 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
</record>
<menuitem groups="analytic.group_analytic_accounting,group_account_manager,group_account_user" action="action_account_analytic_journal_open_form" id="account_analytic_journal_entries" parent="menu_finance_entries"/>
<menuitem groups="analytic.group_analytic_accounting"
action="action_account_analytic_journal_open_form"
id="account_analytic_journal_entries"
parent="menu_finance_entries"/>
#
# Reporting
@ -364,7 +372,9 @@
<field name="view_type">tree</field>
<field name="help">To print an analytics (or costs) journal for a given period. The report give code, move name, account number, general amount and analytic amount.</field>
</record>
<menuitem groups="analytic.group_analytic_accounting,group_account_manager,group_account_user" action="action_account_analytic_journal_tree" id="account_analytic_journal_print" parent="account.next_id_40"/>
<menuitem groups="analytic.group_analytic_accounting"
action="action_account_analytic_journal_tree"
id="account_analytic_journal_print" parent="account.next_id_40"/>
#
# Statistics

2
addons/account/project/wizard/account_analytic_chart_view.xml
View File

@ -39,7 +39,7 @@
action="action_account_analytic_chart"
id="menu_action_analytic_account_tree2"
icon="STOCK_INDENT"
groups="analytic.group_analytic_accounting,group_account_manager,group_account_user"/>
groups="analytic.group_analytic_accounting"/>
</data>
</openerp>

2
addons/account/report/account_analytic_entries_report_view.xml
View File

@ -100,7 +100,7 @@
<menuitem action="action_analytic_entries_report"
id="menu_action_analytic_entries_report"
groups="analytic.group_analytic_accounting,group_account_manager"
groups="analytic.group_analytic_accounting"
parent="account.menu_finance_statistic_report_statement" sequence="4"/>
</data>

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

@ -70,6 +70,9 @@ class account_balance(report_sxw.rml_parse, common_report_header):
def lines(self, form, ids=[], done=None):#, level=1):
def _process_child(accounts, disp_acc, parent):
account_rec = [acct for acct in accounts if acct['id']==parent][0]
currency_obj = self.pool.get('res.currency')
acc_id = self.pool.get('account.account').browse(self.cr, self.uid, account_rec['id'])
currency = acc_id.currency_id and acc_id.currency_id or acc_id.company_id.currency_id
res = {
'id': account_rec['id'],
'type': account_rec['type'],
@ -84,12 +87,11 @@ class account_balance(report_sxw.rml_parse, common_report_header):
}
self.sum_debit += account_rec['debit']
self.sum_credit += account_rec['credit']
acc_digit = self.pool.get('decimal.precision').precision_get(self.cr, 1, 'Account')
if disp_acc == 'bal_movement':
if round(res['credit'], acc_digit) > 0 or round(res['debit'], acc_digit) > 0 or round(res['balance'], acc_digit) != 0:
if currency_obj.is_zero(self.cr, self.uid, currency, res['credit']) > 0 or currency_obj.is_zero(self.cr, self.uid, currency, res['debit']) > 0 or currency_obj.is_zero(self.cr, self.uid, currency, res['balance']) != 0:
self.result_acc.append(res)
elif disp_acc == 'bal_solde':
if round(res['balance'], acc_digit) != 0:
if currency_obj.is_zero(self.cr, self.uid, currency, res['debit']) != 0:
self.result_acc.append(res)
else:
self.result_acc.append(res)

0
addons/account/report/account_balance_landscape_old_backup.rml Executable file → Normal file
View File

0
addons/account/report/account_balance_old_backup.rml Executable file → Normal file
View File

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

@ -89,6 +89,7 @@ class report_balancesheet_horizontal(report_sxw.rml_parse, common_report_header)
self.res_bl = self.obj_pl.final_result()
account_pool = db_pool.get('account.account')
currency_pool = db_pool.get('res.currency')
types = [
'liability',
@ -136,16 +137,16 @@ class report_balancesheet_horizontal(report_sxw.rml_parse, common_report_header)
'level': account.level,
'balance':account.balance,
}
acc_digit = self.pool.get('decimal.precision').precision_get(self.cr, 1, 'Account')
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 round(account.credit, acc_digit) > 0 or round(account.debit, acc_digit) > 0 or round(account.balance, acc_digit) != 0:
if currency_pool.is_zero(self.cr, self.uid, currency, account.credit) > 0 or currency_pool.is_zero(self.cr, self.uid, currency, account.debit) > 0 or currency_pool.is_zero(self.cr, self.uid, currency, account.balance) != 0:
accounts_temp.append(account_dict)
elif data['form']['display_account'] == 'bal_solde':
if round(account.balance, acc_digit) != 0:
if currency_pool.is_zero(self.cr, self.uid, currency, account.balance) != 0:
accounts_temp.append(account_dict)
else:
accounts_temp.append(account_dict)

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

@ -341,7 +341,7 @@
<para style="terp_default_8">
<font color="white"> </font>
</para>
<blockTable colWidths="82.0,82.0,82.0,128.0,82.0,82.0" style="Table13">
<blockTable colWidths="102.0,102.0,102.0,130.0,102.0" style="Table13">
<tr>
<td>
<para style="terp_tblheader_General_Centre">Chart of Account</para>
@ -355,15 +355,12 @@
<td>
<para style="terp_tblheader_General_Centre">Filters By [[ get_filter(data)!='No Filter' and get_filter(data) ]]</para>
</td>
<td>
<para style="terp_tblheader_General_Centre">Partner's</para>
</td>
<td>
<para style="terp_tblheader_General_Centre">Target Moves</para>
</td>
</tr>
</blockTable>
<blockTable colWidths="82.0,82.0,82.0,128.0,82.0,82.0" style="Table1">
<blockTable colWidths="102.0,102.0,102.0,130.0,102.0" style="Table1">
<tr>
<td>
<para style="terp_default_Centre_8">[[ get_account(data) or '' ]]</para>
@ -420,9 +417,6 @@
<font color="white"> </font>
</para>
</td>
<td>
<para style="terp_default_Centre_8">[[ get_partners() ]]</para>
</td>
<td>
<para style="terp_default_Centre_8">[[ get_target_move(data) ]]</para>
</td>

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

@ -36,7 +36,7 @@ class account_invoice_report(osv.osv):
('10','October'), ('11','November'), ('12','December')], 'Month', readonly=True),
'product_id': fields.many2one('product.product', 'Product', readonly=True),
'product_qty':fields.float('Qty', readonly=True),
'uom_name': fields.char('Default UoM', size=128, readonly=True),
'uom_name': fields.char('Reference UoM', size=128, readonly=True),
'payment_term': fields.many2one('account.payment.term', 'Payment Term', readonly=True),
'period_id': fields.many2one('account.period', 'Force Period', domain=[('state','<>','done')], readonly=True),
'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position', readonly=True),
@ -88,7 +88,11 @@ class account_invoice_report(osv.osv):
ai.partner_id as partner_id,
ai.payment_term as payment_term,
ai.period_id as period_id,
u.name as uom_name,
(case when u.uom_type not in ('reference') then
(select name from product_uom where uom_type='reference' and category_id=u.category_id)
else
u.name
end) as uom_name,
ai.currency_id as currency_id,
ai.journal_id as journal_id,
ai.fiscal_position as fiscal_position,
@ -104,9 +108,9 @@ class account_invoice_report(osv.osv):
ai.account_id as account_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 * -1
else
ail.quantity * u.factor
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
@ -125,9 +129,9 @@ class account_invoice_report(osv.osv):
else
sum(ail.quantity*ail.price_unit)
end)/(case when ai.type in ('out_refund','in_invoice') then
sum(ail.quantity*u.factor*-1)
sum(ail.quantity/u.factor*-1)
else
sum(ail.quantity*u.factor)
sum(ail.quantity/u.factor)
end) / cr.rate as price_average,
cr.rate as currency_rate,
sum((select extract(epoch from avg(date_trunc('day',aml.date_created)-date_trunc('day',l.create_date)))/(24*60*60)::decimal(16,2)
@ -179,7 +183,9 @@ class account_invoice_report(osv.osv):
ai.account_id,
ai.partner_bank_id,
ai.residual,
ai.amount_total
ai.amount_total,
u.uom_type,
u.category_id
)
""")

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

@ -82,6 +82,7 @@ class report_pl_account_horizontal(report_sxw.rml_parse, common_report_header):
db_pool = pooler.get_pool(self.cr.dbname)
account_pool = db_pool.get('account.account')
currency_pool = db_pool.get('res.currency')
types = [
'expense',
@ -106,16 +107,16 @@ class report_pl_account_horizontal(report_sxw.rml_parse, common_report_header):
accounts_temp = []
for account in accounts:
if (account.user_type.report_type) and (account.user_type.report_type == typ):
acc_digit = self.pool.get('decimal.precision').precision_get(self.cr, 1, 'Account')
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)
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':
if round(account.credit, acc_digit) > 0 or round(account.debit, acc_digit) > 0 or round(account.balance, acc_digit) != 0:
if currency_pool.is_zero(self.cr, self.uid, currency, account.credit) > 0 or currency_pool.is_zero(self.cr, self.uid, currency, account.debit) > 0 or currency_pool.is_zero(self.cr, self.uid, currency, account.balance) != 0:
accounts_temp.append(account)
elif data['form']['display_account'] == 'bal_solde':
if round(account.balance, acc_digit) != 0:
if currency_pool.is_zero(self.cr, self.uid, currency, account.balance) != 0:
accounts_temp.append(account)
else:
accounts_temp.append(account)

10
addons/account/security/ir.model.access.csv
View File

@ -31,7 +31,7 @@
"access_account_tax_code_template","account.tax.code.template","model_account_tax_code_template","account.group_account_manager",1,1,1,1
"access_account_chart_template","account.chart.template","model_account_chart_template","account.group_account_manager",1,1,1,1
"access_account_tax_template","account.tax.template","model_account_tax_template","account.group_account_manager",1,1,1,1
"access_account_bank_statement","account.bank.statement","model_account_bank_statement","account.group_account_user",1,0,0,0
"access_account_bank_statement","account.bank.statement","model_account_bank_statement","account.group_account_user",1,1,1,1
"access_account_bank_statement_line","account.bank.statement.line","model_account_bank_statement_line","account.group_account_user",1,1,1,1
"access_account_analytic_line","account.analytic.line","model_account_analytic_line","account.group_account_user",1,1,1,1
"access_account_analytic_line_manager","account.analytic.line manager","model_account_analytic_line","account.group_account_manager",1,0,0,0
@ -69,8 +69,8 @@
"access_account_invoice_user","account.invoice.line user","model_account_invoice_line","base.group_user",1,0,0,0
"access_account_payment_term_partner_manager","account.payment.term partner manager","model_account_payment_term","base.group_user",1,0,0,0
"access_account_payment_term_line_partner_manager","account.payment.term.line partner manager","model_account_payment_term_line","base.group_user",1,0,0,0
"access_account_account_product_manager","account.account product manager","model_account_account","product.group_product_manager",1,0,0,0
"access_account_journal_product_manager","account.journal product manager","model_account_journal","product.group_product_manager",1,0,0,0
"access_account_account_sale_manager","account.account sale manager","model_account_account","base.group_sale_manager",1,0,0,0
"access_account_journal_sale_manager","account.journal sale manager","model_account_journal","base.group_sale_manager",1,0,0,0
"access_account_fiscal_position_product_manager","account.fiscal.position account.manager","model_account_fiscal_position","account.group_account_manager",1,1,1,1
"access_account_fiscal_position_tax_product_manager","account.fiscal.position.tax account.manager","model_account_fiscal_position_tax","account.group_account_manager",1,1,1,1
"access_account_fiscal_position_account_product_manager","account.fiscal.position account.manager","model_account_fiscal_position_account","account.group_account_manager",1,1,1,1
@ -97,6 +97,7 @@
"access_account_invoice_manager","account.invoice manager","model_account_invoice","account.group_account_manager",1,0,0,0
"access_account_bank_statement_manager","account.bank.statement manager","model_account_bank_statement","account.group_account_manager",1,1,1,1
"access_account_entries_report_manager","account.entries.report","model_account_entries_report","account.group_account_manager",1,1,1,1
"access_account_entries_report_user","account.entries.report","model_account_entries_report","account.group_account_user",1,0,0,0
"access_analytic_entries_report_manager","analytic.entries.report","model_analytic_entries_report","account.group_account_manager",1,0,0,0
"access_account_cashbox_line","account.cashbox.line","model_account_cashbox_line","account.group_account_manager",1,1,1,1
"access_account_cashbox_line","account.cashbox.line","model_account_cashbox_line","account.group_account_user",1,1,1,1
@ -116,5 +117,8 @@
"access_report_account_receivable_invoice","report.account.receivable.invoice","model_report_account_receivable","account.group_account_invoice",1,1,1,1
"access_report_account_receivable_user","report.account.receivable.user","model_report_account_receivable","account.group_account_user",1,1,1,1
"access_account_sequence_fiscal_year_invoice","account.sequence.fiscalyear invoice","model_account_sequence_fiscalyear","account.group_account_invoice",1,1,1,1
"access_account_tax_sale_manager","account.tax sale manager","model_account_tax","base.group_sale_salesman",1,0,0,0
"access_account_journal_sale_manager","account.journal sale manager","model_account_journal","base.group_sale_salesman",1,0,0,0
"access_account_invoice_tax_sale_manager","account.invoice.tax sale manager","model_account_invoice_tax","base.group_sale_salesman",1,0,0,0
"access_account_sequence_fiscal_year_sale_user","account.sequence.fiscalyear.sale.user","model_account_sequence_fiscalyear","base.group_sale_salesman",1,1,1,0
"access_account_sequence_fiscal_year_sale_manager","account.sequence.fiscalyear.sale.manager","model_account_sequence_fiscalyear","base.group_sale_manager",1,1,1,1

1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
31 access_account_tax_code_template account.tax.code.template model_account_tax_code_template account.group_account_manager 1 1 1 1
32 access_account_chart_template account.chart.template model_account_chart_template account.group_account_manager 1 1 1 1
33 access_account_tax_template account.tax.template model_account_tax_template account.group_account_manager 1 1 1 1
34 access_account_bank_statement account.bank.statement model_account_bank_statement account.group_account_user 1 0 1 0 1 0 1
35 access_account_bank_statement_line account.bank.statement.line model_account_bank_statement_line account.group_account_user 1 1 1 1
36 access_account_analytic_line account.analytic.line model_account_analytic_line account.group_account_user 1 1 1 1
37 access_account_analytic_line_manager account.analytic.line manager model_account_analytic_line account.group_account_manager 1 0 0 0
69 access_account_invoice_user account.invoice.line user model_account_invoice_line base.group_user 1 0 0 0
70 access_account_payment_term_partner_manager account.payment.term partner manager model_account_payment_term base.group_user 1 0 0 0
71 access_account_payment_term_line_partner_manager account.payment.term.line partner manager model_account_payment_term_line base.group_user 1 0 0 0
72 access_account_account_product_manager access_account_account_sale_manager account.account product manager account.account sale manager model_account_account product.group_product_manager base.group_sale_manager 1 0 0 0
73 access_account_journal_product_manager access_account_journal_sale_manager account.journal product manager account.journal sale manager model_account_journal product.group_product_manager base.group_sale_manager 1 0 0 0
74 access_account_fiscal_position_product_manager account.fiscal.position account.manager model_account_fiscal_position account.group_account_manager 1 1 1 1
75 access_account_fiscal_position_tax_product_manager account.fiscal.position.tax account.manager model_account_fiscal_position_tax account.group_account_manager 1 1 1 1
76 access_account_fiscal_position_account_product_manager account.fiscal.position account.manager model_account_fiscal_position_account account.group_account_manager 1 1 1 1
97 access_account_invoice_manager account.invoice manager model_account_invoice account.group_account_manager 1 0 0 0
98 access_account_bank_statement_manager account.bank.statement manager model_account_bank_statement account.group_account_manager 1 1 1 1
99 access_account_entries_report_manager account.entries.report model_account_entries_report account.group_account_manager 1 1 1 1
100 access_account_entries_report_user account.entries.report model_account_entries_report account.group_account_user 1 0 0 0
101 access_analytic_entries_report_manager analytic.entries.report model_analytic_entries_report account.group_account_manager 1 0 0 0
102 access_account_cashbox_line account.cashbox.line model_account_cashbox_line account.group_account_manager 1 1 1 1
103 access_account_cashbox_line account.cashbox.line model_account_cashbox_line account.group_account_user 1 1 1 1
117 access_report_account_receivable_invoice report.account.receivable.invoice model_report_account_receivable account.group_account_invoice 1 1 1 1
118 access_report_account_receivable_user report.account.receivable.user model_report_account_receivable account.group_account_user 1 1 1 1
119 access_account_sequence_fiscal_year_invoice account.sequence.fiscalyear invoice model_account_sequence_fiscalyear account.group_account_invoice 1 1 1 1
120 access_account_tax_sale_manager account.tax sale manager model_account_tax base.group_sale_salesman 1 0 0 0
121 access_account_journal_sale_manager account.journal sale manager model_account_journal base.group_sale_salesman 1 0 0 0
122 access_account_invoice_tax_sale_manager account.invoice.tax sale manager model_account_invoice_tax base.group_sale_salesman 1 0 0 0
123 access_account_sequence_fiscal_year_sale_user account.sequence.fiscalyear.sale.user model_account_sequence_fiscalyear base.group_sale_salesman 1 1 1 0
124 access_account_sequence_fiscal_year_sale_manager account.sequence.fiscalyear.sale.manager model_account_sequence_fiscalyear base.group_sale_manager 1 1 1 1

2
addons/account/wizard/account_automatic_reconcile_view.xml
View File

@ -52,7 +52,7 @@
action="action_account_automatic_reconcile"
id="menu_automatic_reconcile"
parent="periodical_processing_reconciliation"
groups="base.group_extended,group_account_manager,group_account_user"/>
groups="base.group_extended"/>
<record id="account_automatic_reconcile_view1" model="ir.ui.view">
<field name="name">Automatic reconcile unreconcile</field>

12
addons/account/wizard/account_move_journal.py
View File

@ -92,12 +92,14 @@ class account_move_journal(osv.osv_memory):
journal = False
if journal_id:
journal = journal_pool.read(cr, uid, [journal_id], ['name'])[0]['name']
journal_string = _("Journal: %s") % tools.ustr(journal)
else:
journal = "All"
journal_string = _("Journal: All")
period = False
if period_id:
period = period_pool.browse(cr, uid, [period_id], ['name'])[0]['name']
period_string = _("Period: %s") % tools.ustr(period)
view = """<?xml version="1.0" encoding="utf-8"?>
<form string="Standard entries">
@ -105,16 +107,16 @@ class account_move_journal(osv.osv_memory):
<field name="target_move" />
<newline/>
<group colspan="4" >
<label width="300" string="Journal: %s"/>
<label width="300" string="%s"/>
<newline/>
<label width="300" string="Period: %s"/>
<label width="300" string="%s"/>
</group>
<group colspan="4" col="4">
<label string ="" colspan="2"/>
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button icon="terp-gtk-go-back-rtl" string="Open" name="action_open_window" default_focus="1" type="object"/>
</group>
</form>""" % (tools.ustr(journal), tools.ustr(period))
</form>""" % (journal_string, period_string)
view = etree.fromstring(view.encode('utf8'))
xarch, xfields = self._view_look_dom_arch(cr, uid, view, view_id, context=context)
@ -190,4 +192,4 @@ class account_move_journal(osv.osv_memory):
account_move_journal()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

2
addons/account/wizard/account_move_line_select.py
View File

@ -63,7 +63,7 @@ class account_move_line_select(osv.osv_memory):
if context['active_id']:
acc_data = account_obj.browse(cr, uid, context['active_id']).child_consol_ids
if acc_data:
result['context'].update({'consolidate_childs': True})
result['context'].update({'consolidate_children': True})
result['domain']=result['domain'][0:-1]+','+domain+result['domain'][-1]
return result

11
addons/account/wizard/account_report_account_balance.py
View File

@ -32,17 +32,6 @@ class account_balance_report(osv.osv_memory):
'journal_ids': [],
}
def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
mod_obj = self.pool.get('ir.model.data')
res = super(account_balance_report, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=False)
doc = etree.XML(res['arch'])
nodes = doc.xpath("//field[@name='journal_ids']")
for node in nodes:
node.set('readonly', '1')
node.set('required', '0')
res['arch'] = etree.tostring(doc)
return res
def _print_report(self, cr, uid, ids, data, context=None):
data = self.pre_print_report(cr, uid, ids, data, context=context)
return {'type': 'ir.actions.report.xml', 'report_name': 'account.account.balance', 'datas': data}

3
addons/account/wizard/account_report_account_balance_view.xml
View File

@ -10,6 +10,9 @@
<field name="inherit_id" ref="account_common_report_view" />
<field name="arch" type="xml">
<data>
<xpath expr="//field[@name='journal_ids']" position="replace">
<field name="journal_ids" colspan="4" nolabel="1" required="0" readonly="1"/>
</xpath>
<xpath expr="/form/label[@string='']" position="replace">
<separator string="Trial Balance" colspan="4"/>
<label nolabel="1" colspan="4" string="This report allows you to print or generate a pdf of your trial balance allowing you to quickly check the balance of each of your accounts in a single report"/>

10
addons/account/wizard/account_report_aged_partner_balance.py
View File

@ -44,16 +44,6 @@ class account_aged_trial_balance(osv.osv_memory):
'direction_selection': 'past',
}
def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
res = super(account_aged_trial_balance, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=False)
doc = etree.XML(res['arch'])
nodes = doc.xpath("//field[@name='journal_ids']")
for node in nodes:
node.set('invisible', '1')
node.set('required', '0')
res['arch'] = etree.tostring(doc)
return res
def _print_report(self, cr, uid, ids, data, context=None):
res = {}
if context is None:

2
addons/account/wizard/account_report_aged_partner_balance_view.xml
View File

@ -20,7 +20,7 @@
<newline/>
<field name="result_selection"/>
<field name="direction_selection"/>
<field name="journal_ids"/>
<field name="journal_ids" required="0" invisible="1"/>
<newline/>
<separator colspan="4"/>
<group col="4" colspan="4">

43
addons/account/wizard/account_report_balance_sheet.py
View File

@ -32,36 +32,45 @@ class account_bs_report(osv.osv_memory):
_inherit = "account.common.account.report"
_description = 'Account Balance Sheet Report'
def _get_def_reserve_account(self, cr, uid, context=None):
chart_id = self._get_account(cr, uid, context=context)
res = self.onchange_chart_id(cr, uid, [], chart_id, context=context)
if not res:
return False
return res['value']['reserve_account_id']
_columns = {
'display_type': fields.boolean("Landscape Mode"),
'reserve_account_id': fields.many2one('account.account', 'Reserve & Profit/Loss Account',required = True,
help='This Account is used for trasfering Profit/Loss(If It is Profit: Amount will be added, Loss : Amount will be duducted.), Which is calculated from Profilt & Loss Report', domain = [('type','=','payable')]),
'reserve_account_id': fields.many2one('account.account', 'Reserve & Profit/Loss Account',
required=True,
help='This Account is used for transfering Profit/Loss ' \
'(Profit: Amount will be added, Loss: Amount will be duducted), ' \
'which is calculated from Profilt & Loss Report',
domain = [('type','=','payable')]),
}
_defaults={
'display_type': True,
'journal_ids': [],
'reserve_account_id': _get_def_reserve_account,
}
def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
res = super(account_bs_report, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=False)
doc = etree.XML(res['arch'])
nodes = doc.xpath("//field[@name='journal_ids']")
for node in nodes:
node.set('readonly', '1')
node.set('required', '0')
res['arch'] = etree.tostring(doc)
return res
def onchange_chart_id(self, cr, uid, ids, chart_id, context=None):
if not chart_id:
return {}
account = self.pool.get('account.account').browse(cr, uid, chart_id , context=context)
if not account.company_id.property_reserve_and_surplus_account:
return {'value': {'reserve_account_id': False}}
return {'value': {'reserve_account_id': account.company_id.property_reserve_and_surplus_account.id}}
def _print_report(self, cr, uid, ids, data, context=None):
if context is None:
context = {}
data = self.pre_print_report(cr, uid, ids, data, context=context)
account = self.pool.get('account.account').browse(cr, uid, data['form']['chart_account_id'], context=context)
if not account.company_id.property_reserve_and_surplus_account:
data['form'].update(self.read(cr, uid, ids, ['display_type','reserve_account_id'])[0])
if not data['form']['reserve_account_id']:
raise osv.except_osv(_('Warning'),_('Please define the Reserve and Profit/Loss account for current user company !'))
data['form']['reserve_account_id'] = account.company_id.property_reserve_and_surplus_account.id
data['form'].update(self.read(cr, uid, ids, ['display_type'])[0])
data = self.pre_print_report(cr, uid, ids, data, context=context)
if data['form']['display_type']:
return {
'type': 'ir.actions.report.xml',
@ -77,4 +86,4 @@ class account_bs_report(osv.osv_memory):
account_bs_report()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

8
addons/account/wizard/account_report_balance_sheet_view.xml
View File

@ -9,14 +9,20 @@
<field name="inherit_id" ref="account.account_common_report_view" />
<field name="arch" type="xml">
<data>
<xpath expr="//field[@name='chart_account_id']" position="replace">
<field name="chart_account_id" widget="selection" on_change="onchange_chart_id(chart_account_id)"/>
</xpath>
<xpath expr="//field[@name='journal_ids']" position="replace">
<field name="journal_ids" colspan="4" nolabel="1" required="0" readonly="1"/>
</xpath>
<xpath expr="/form/label[@string='']" position="replace">
<separator string="Balance Sheet" colspan="4"/>
<label nolabel="1" colspan="4" string="This report allows you to print or generate a pdf of your trial balance allowing you to quickly check the balance of each of your accounts in a single report"/>
</xpath>
<xpath expr="//field[@name='target_move']" position="after">
<field name="display_account"/>
<field name="reserve_account_id" required="1"/>
<field name="display_type"/>
<field name="reserve_account_id" required="0" invisible="1"/>
<newline/>
</xpath>
</data>

2
addons/account/wizard/account_report_common.py
View File

@ -86,7 +86,7 @@ class account_common_report(osv.osv_memory):
return res
def _get_account(self, cr, uid, context=None):
accounts = self.pool.get('account.account').search(cr, uid, [], limit=1)
accounts = self.pool.get('account.account').search(cr, uid, [('parent_id', '=', False)], limit=1)
return accounts and accounts[0] or False
def _get_fiscalyear(self, cr, uid, context=None):

15
addons/account/wizard/account_report_profit_loss.py
View File

@ -40,21 +40,6 @@ class account_pl_report(osv.osv_memory):
'target_move': False
}
def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
mod_obj = self.pool.get('ir.model.data')
res = super(account_pl_report, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=False)
doc = etree.XML(res['arch'])
nodes = doc.xpath("//field[@name='journal_ids']")
for node in nodes:
node.set('readonly', '1')
node.set('required', '0')
nodes = doc.xpath("//field[@name='target_move']")
for node in nodes:
node.set('readonly', '1')
node.set('required', '0')
res['arch'] = etree.tostring(doc)
return res
def _print_report(self, cr, uid, ids, data, context=None):
if context is None:
context = {}

6
addons/account/wizard/account_report_profit_loss_view.xml
View File

@ -9,6 +9,12 @@
<field name="inherit_id" ref="account.account_common_report_view" />
<field name="arch" type="xml">
<data>
<xpath expr="//field[@name='target_move']" position="replace">
<field name="target_move" required="0" readonly="1"/>
</xpath>
<xpath expr="//field[@name='journal_ids']" position="replace">
<field name="journal_ids" required="0" colspan="4" nolabel="1" readonly="1"/>
</xpath>
<xpath expr="/form/label[@string='']" position="replace">
<separator string="Profit And Loss" colspan="4"/>
<label nolabel="1" colspan="4" string="The Profit and Loss report gives you an overview of your company profit and loss in a single document"/>

9
addons/account_accountant/i18n/el.po
View File

@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2010-12-21 19:43+0000\n"
"PO-Revision-Date: 2010-11-14 07:49+0000\n"
"PO-Revision-Date: 2010-12-28 17:22+0000\n"
"Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
"Language-Team: Greek <el@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-12-24 05:57+0000\n"
"X-Launchpad-Export-Date: 2010-12-29 04:58+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_accountant
@ -26,6 +26,11 @@ msgid ""
"items and the chart of accounts.\n"
" "
msgstr ""
"\n"
"Αυτό το άρθωμα δίνει στον Διαχειριστή πρόσβαση σε όλες τις δυνατότητες της "
"λογιστικής όπως το ημερολόγιο\n"
"και το Λογιστικό Σχέδιο.\n"
" "
#. module: account_accountant
#: model:ir.module.module,shortdesc:account_accountant.module_meta_information

9
addons/account_accountant/i18n/es_EC.po
View File

@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2010-12-21 19:43+0000\n"
"PO-Revision-Date: 2010-11-22 20:40+0000\n"
"PO-Revision-Date: 2010-12-28 05:07+0000\n"
"Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\n"
"Language-Team: Spanish (Ecuador) <es_EC@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-12-24 05:57+0000\n"
"X-Launchpad-Export-Date: 2010-12-29 04:58+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_accountant
@ -26,6 +26,11 @@ msgid ""
"items and the chart of accounts.\n"
" "
msgstr ""
"\n"
"Este módulo proporciona al usuario admin el acceso a todas las "
"funcionalidades de contabilidad como\n"
"los asientos y el plan contable.\n"
" "
#. module: account_accountant
#: model:ir.module.module,shortdesc:account_accountant.module_meta_information

6
addons/account_analytic_default/account_analytic_default_view.xml
View File

@ -96,7 +96,7 @@
res_model="account.analytic.default"
src_model="res.partner"
context="{'search_default_partner_id': [active_id]}"
groups="base.group_extended"/>
groups="analytic.group_analytic_accounting"/>
<act_window
name="Analytic Rules"
@ -104,7 +104,7 @@
res_model="account.analytic.default"
src_model="res.users"
context="{'search_default_user_id': [active_id]}"
groups="base.group_extended"/>
groups="analytic.group_analytic_accounting"/>
<act_window
name="Analytic Rules"
@ -112,7 +112,7 @@
id="analytic_rule_action_product"
src_model="product.product"
context="{'search_default_product_id': [active_id]}"
groups="base.group_extended"/>
groups="analytic.group_analytic_accounting"/>
</data>
</openerp>

12
addons/account_analytic_default/i18n/el.po
View File

@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2010-12-21 19:43+0000\n"
"PO-Revision-Date: 2010-11-14 08:17+0000\n"
"PO-Revision-Date: 2010-12-28 17:24+0000\n"
"Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
"Language-Team: Greek <el@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-12-24 05:35+0000\n"
"X-Launchpad-Export-Date: 2010-12-29 04:54+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_default
@ -60,7 +60,7 @@ msgstr "Προκαθορισμένη Ημερομηνία Λήξης γι' αυ
#. module: account_analytic_default
#: model:ir.model,name:account_analytic_default.model_stock_picking
msgid "Picking List"
msgstr ""
msgstr "Λίστα Παραλαβής"
#. module: account_analytic_default
#: view:account.analytic.default:0
@ -89,7 +89,7 @@ msgstr "Προϊόν"
#. module: account_analytic_default
#: model:ir.model,name:account_analytic_default.model_account_analytic_default
msgid "Analytic Distribution"
msgstr ""
msgstr "Αναλυτική Κατανομή"
#. module: account_analytic_default
#: view:account.analytic.default:0
@ -155,7 +155,7 @@ msgstr "Αλληλουχία"
#. module: account_analytic_default
#: model:ir.model,name:account_analytic_default.model_account_invoice_line
msgid "Invoice Line"
msgstr ""
msgstr "Γραμμή Τιμολογίου"
#. module: account_analytic_default
#: view:account.analytic.default:0
@ -166,7 +166,7 @@ msgstr "Αναλυτικός Λογαριασμός"
#. module: account_analytic_default
#: view:account.analytic.default:0
msgid "Accounts"
msgstr ""
msgstr "Λογαριασμοί"
#. module: account_analytic_default
#: view:account.analytic.default:0

2
addons/account_analytic_plans/account_analytic_plans.py
View File

@ -171,7 +171,7 @@ class account_analytic_plan_instance(osv.osv):
"""% (tools.to_xml(plan_id.name), wiz_id[0])
for line in plan_id.plan_ids:
res['arch']+="""
<field name="account%d_ids" string="%s" colspan="4">
<field name="account%d_ids" string="%s" nolabel="1" colspan="4">
<tree string="%s" editable="bottom">
<field name="rate"/>
<field name="analytic_account_id" domain="[('parent_id','child_of',[%d])]" groups="base.group_extended"/>

14
addons/account_analytic_plans/i18n/el.po
View File

@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2010-12-21 19:43+0000\n"
"PO-Revision-Date: 2010-11-19 13:31+0000\n"
"Last-Translator: Kontaxis Panagiotis <Unknown>\n"
"PO-Revision-Date: 2010-12-28 17:26+0000\n"
"Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
"Language-Team: Greek <el@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-12-24 05:31+0000\n"
"X-Launchpad-Export-Date: 2010-12-29 04:54+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_plans
@ -139,7 +139,7 @@ msgstr "Λογαριασμος Αναλυτικής"
#. module: account_analytic_plans
#: sql_constraint:account.journal:0
msgid "The code of the journal must be unique per company !"
msgstr ""
msgstr "Ο κωδικός του ημερολογίου πρέπει να είναι μοναδικός ανά εταιρία !"
#. module: account_analytic_plans
#: field:account.crossovered.analytic,ref:0
@ -155,7 +155,7 @@ msgstr ""
#. module: account_analytic_plans
#: model:ir.model,name:account_analytic_plans.model_sale_order_line
msgid "Sales Order Line"
msgstr ""
msgstr "Γραμμή Παραγγελίας"
#. module: account_analytic_plans
#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:0
@ -502,7 +502,7 @@ msgstr "Κώδικας Διανομής"
#. module: account_analytic_plans
#: report:account.analytic.account.crossovered.analytic:0
msgid "%"
msgstr ""
msgstr "%"
#. module: account_analytic_plans
#: report:account.analytic.account.crossovered.analytic:0
@ -548,7 +548,7 @@ msgstr "Αλληλουχία"
#. module: account_analytic_plans
#: sql_constraint:account.journal:0
msgid "The name of the journal must be unique per company !"
msgstr ""
msgstr "Το όνομα του ημερολογίου πρέπει να είναι μοναδικός ανά εταιρία !"
#. module: account_analytic_plans
#: code:addons/account_analytic_plans/account_analytic_plans.py:0

9
addons/account_anglo_saxon/i18n/hi.po
View File

@ -8,19 +8,19 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2010-12-21 19:43+0000\n"
"PO-Revision-Date: 2010-12-21 11:14+0000\n"
"PO-Revision-Date: 2010-12-28 08:00+0000\n"
"Last-Translator: Sanjay Kumar <Unknown>\n"
"Language-Team: Hindi <hi@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-12-24 05:52+0000\n"
"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_anglo_saxon
#: view:product.category:0
msgid " Accounting Property"
msgstr ""
msgstr " लेखांकन संपत्ति"
#. module: account_anglo_saxon
#: model:ir.model,name:account_anglo_saxon.model_product_category
@ -56,7 +56,7 @@ msgstr "उत्पाद प्रारूप"
#. module: account_anglo_saxon
#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information
msgid "Stock Accounting for Anglo Saxon countries"
msgstr ""
msgstr "अंग्लो Saxon देशों के लिए भण्डार लेखा"
#. module: account_anglo_saxon
#: field:product.category,property_account_creditor_price_difference_categ:0
@ -100,6 +100,7 @@ msgid ""
"This account will be used to value price difference between purchase price "
"and cost price."
msgstr ""
"इस खाता का उपयोग क्रय मूल्य और विक्रय मूल्य का अंतर निकालने में किया जायेगा"
#~ msgid "Invalid XML for View Architecture!"
#~ msgstr "संरचना देखने के लिए अमान्य XML!"

6
addons/account_anglo_saxon/i18n/it.po
View File

@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2010-12-21 19:43+0000\n"
"PO-Revision-Date: 2010-12-27 07:56+0000\n"
"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
"PO-Revision-Date: 2010-12-28 09:17+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: Italian <it@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_anglo_saxon

13
addons/account_anglo_saxon/invoice.py
View File

@ -29,6 +29,15 @@ class account_invoice_line(osv.osv):
def move_line_get(self, cr, uid, invoice_id, context=None):
res = super(account_invoice_line,self).move_line_get(cr, uid, invoice_id, context=context)
inv = self.pool.get('account.invoice').browse(cr, uid, invoice_id, context=context)
company_currency = inv.company_id.currency_id.id
def get_price(cr, uid, inv, company_currency,i_line):
cur_obj = self.pool.get('res.currency')
if inv.currency_id.id != company_currency:
price = cur_obj.compute(cr, uid, company_currency, inv.currency_id.id, i_line.product_id.product_tmpl_id.standard_price * i_line.quantity, context={'date': inv.date_invoice})
else:
price = i_line.product_id.product_tmpl_id.standard_price * i_line.quantity
return price
if inv.type in ('out_invoice','out_refund'):
for i_line in inv.invoice_line:
if i_line.product_id:
@ -56,7 +65,7 @@ class account_invoice_line(osv.osv):
'name': i_line.name[:64],
'price_unit':i_line.product_id.product_tmpl_id.standard_price,
'quantity':i_line.quantity,
'price':i_line.product_id.product_tmpl_id.standard_price * i_line.quantity,
'price':get_price(cr, uid, inv, company_currency, i_line),
'account_id':dacc,
'product_id':i_line.product_id.id,
'uos_id':i_line.uos_id.id,
@ -69,7 +78,7 @@ class account_invoice_line(osv.osv):
'name': i_line.name[:64],
'price_unit':i_line.product_id.product_tmpl_id.standard_price,
'quantity':i_line.quantity,
'price': -1 * i_line.product_id.product_tmpl_id.standard_price * i_line.quantity,
'price': -1 * get_price(cr, uid, inv, company_currency, i_line),
'account_id':cacc,
'product_id':i_line.product_id.id,
'uos_id':i_line.uos_id.id,

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