pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Merge]: merge with trunk addons

Browse Source 
bzr revid: rpa@tinyerp.com-20091124073028-ti0erem7cpnzd68r
This commit is contained in:
rpa (Open ERP)
2009-11-24 13:00:28 +05:30
parent cfb5290996 fc896c18e1
commit c87beca6f8
7144 changed files with 2262363 additions and 1277683 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/account.py
+15 -1
View File
@@ -77,7 +77,10 @@ class account_payment_term_line(osv.osv):
_columns = {
'name': fields.char('Line Name', size=32, required=True),
'sequence': fields.integer('Sequence', required=True, help="The sequence field is used to order the payment term lines from the lowest sequences to the higher ones"),
'value': fields.selection([('procent', 'Percent'), ('balance', 'Balance'), ('fixed', 'Fixed Amount')], 'Value',required=True),
'value': fields.selection([('procent', 'Percent'), ('balance', 'Balance'), ('fixed', 'Fixed Amount')], 'Value', required=True, help="""Example: 14 days 2%, 30 days net
1. Line 1: percent 0.02 14 days
2. Line 2: balance 30 days"""),
'value_amount': fields.float('Value Amount', help="For Value percent enter % ratio between 0-1."),
'days': fields.integer('Number of Days', required=True, help="Number of days to add before computation of the day of month." \
"If Date=15/01, Number of Days=22, Day of Month=-1, then the due date is 28/02."),
@@ -90,6 +93,17 @@ class account_payment_term_line(osv.osv):
'days2': lambda *a: 0,
}
_order = "sequence"
def _check_percent(self, cr, uid, ids, context={}):
obj = self.browse(cr, uid, ids[0])
if obj.value == 'procent' and ( obj.value_amount < 0.0 or obj.value_amount > 1.0):
return False
return True
_constraints = [
(_check_percent, _('Percentages for Payment Term Line must be between 0 and 1, Example: 0.02 for 2% '), ['value_amount']),
]
account_payment_term_line()
addons/account/account_bank_statement.py
+11 -3
View File
@@ -170,7 +170,9 @@ class account_bank_statement(osv.osv):
if line.state <> 'valid':
raise osv.except_osv(_('Error !'),
_('The account entries lines are not in valid state.'))
# for bank.statement.lines
# In line we get reconcile_id on bank.ste.rec.
# in bank stat.rec we get line_new_ids on bank.stat.rec.line
for move in st.line_ids:
move_id = account_move_obj.create(cr, uid, {
'journal_id': st.journal_id.id,
@@ -209,7 +211,7 @@ class account_bank_statement(osv.osv):
'period_id': st.period_id.id,
'currency_id': st.currency.id,
}
amount = res_currency_obj.compute(cr, uid, st.currency.id,
company_currency_id, move.amount, context=context,
account=acc_cur)
@@ -245,6 +247,8 @@ class account_bank_statement(osv.osv):
'statement_id': st.id,
'journal_id': st.journal_id.id,
'period_id': st.period_id.id,
'analytic_account_id':newline.analytic_id and newline.analytic_id.id or False,
}, context=context)
# Fill the secondary amount/currency
@@ -491,10 +495,14 @@ class account_bank_statement_reconcile_line(osv.osv):
_name = "account.bank.statement.reconcile.line"
_description = "Statement reconcile line"
_columns = {
'name': fields.char('Description', size=64),
'name': fields.char('Description', size=64, required=True),
'account_id': fields.many2one('account.account', 'Account', required=True),
'line_id': fields.many2one('account.bank.statement.reconcile', 'Reconcile'),
'amount': fields.float('Amount', required=True),
'analytic_id': fields.many2one('account.analytic.account',"Analytic Account")
}
_defaults = {
'name': lambda *a: 'Write-Off',
}
account_bank_statement_reconcile_line()
addons/account/account_invoice_view.xml
+10 -10
View File
@@ -209,7 +209,7 @@
<field name="date_invoice"/>
<field name="period_id"/>
<label align="0.0" colspan="2" string="(keep empty to use the current period)"/>
<separator colspan="4" string="Additionnal Information"/>
<separator colspan="4" string="Additional Information"/>
<field colspan="4" name="comment" nolabel="1"/>
</page>
<page string="Payments">
@@ -484,7 +484,7 @@
<field name="act_window_id" ref="action_invoice_tree5"/>
</record>
<menuitem action="action_invoice_tree5" id="menu_invoice_draft" parent="menu_action_invoice_tree1" groups="base.group_extended_menu"/>
<menuitem action="action_invoice_tree5" id="menu_invoice_draft" parent="menu_action_invoice_tree1" groups="base.group_useability_extended"/>
<record id="action_invoice_tree6" model="ir.actions.act_window">
<field name="name">PRO-FORMA Customer Invoices</field>
@@ -508,7 +508,7 @@
<field name="act_window_id" ref="action_invoice_tree6"/>
</record>
<menuitem action="action_invoice_tree6" id="menu_action_invoice_tree6" parent="menu_action_invoice_tree1" groups="base.group_extended_menu"/>
<menuitem action="action_invoice_tree6" id="menu_action_invoice_tree6" parent="menu_action_invoice_tree1" groups="base.group_useability_extended"/>
<record id="action_invoice_tree7" model="ir.actions.act_window">
<field name="name">Unpaid Customer Invoices</field>
@@ -532,7 +532,7 @@
<field name="act_window_id" ref="action_invoice_tree7"/>
</record>
<menuitem action="action_invoice_tree7" id="menu_action_invoice_tree7" parent="menu_action_invoice_tree1" groups="base.group_extended_menu"/>
<menuitem action="action_invoice_tree7" id="menu_action_invoice_tree7" parent="menu_action_invoice_tree1" groups="base.group_useability_extended"/>
<record id="action_invoice_tree8" model="ir.actions.act_window">
<field name="name">Draft Supplier Invoices</field>
@@ -556,7 +556,7 @@
<field name="act_window_id" ref="action_invoice_tree8"/>
</record>
<menuitem action="action_invoice_tree8" id="menu_action_invoice_tree8" parent="menu_action_invoice_tree2" groups="base.group_extended_menu"/>
<menuitem action="action_invoice_tree8" id="menu_action_invoice_tree8" parent="menu_action_invoice_tree2" groups="base.group_useability_extended"/>
<record id="action_invoice_tree9" model="ir.actions.act_window">
<field name="name">Unpaid Supplier Invoices</field>
@@ -580,7 +580,7 @@
<field name="act_window_id" ref="action_invoice_tree9"/>
</record>
<menuitem action="action_invoice_tree9" id="menu_action_invoice_tree9" parent="menu_action_invoice_tree2" groups="base.group_extended_menu"/>
<menuitem action="action_invoice_tree9" id="menu_action_invoice_tree9" parent="menu_action_invoice_tree2" groups="base.group_useability_extended"/>
<record id="action_invoice_tree10" model="ir.actions.act_window">
<field name="name">Draft Customer Refunds</field>
@@ -604,7 +604,7 @@
<field name="act_window_id" ref="action_invoice_tree10"/>
</record>
<menuitem action="action_invoice_tree10" id="menu_action_invoice_tree10" parent="menu_action_invoice_tree3" groups="base.group_extended_menu"/>
<menuitem action="action_invoice_tree10" id="menu_action_invoice_tree10" parent="menu_action_invoice_tree3" groups="base.group_useability_extended"/>
<record id="action_invoice_tree11" model="ir.actions.act_window">
<field name="name">Unpaid Customer Refunds</field>
@@ -628,7 +628,7 @@
<field name="act_window_id" ref="action_invoice_tree11"/>
</record>
<menuitem action="action_invoice_tree11" id="menu_action_invoice_tree11" parent="menu_action_invoice_tree3" groups="base.group_extended_menu"/>
<menuitem action="action_invoice_tree11" id="menu_action_invoice_tree11" parent="menu_action_invoice_tree3" groups="base.group_useability_extended"/>
<record id="action_invoice_tree12" model="ir.actions.act_window">
<field name="name">Draft Supplier Refunds</field>
@@ -652,7 +652,7 @@
<field name="act_window_id" ref="action_invoice_tree12"/>
</record>
<menuitem action="action_invoice_tree12" id="menu_action_invoice_tree12" parent="menu_action_invoice_tree4" groups="base.group_extended_menu"/>
<menuitem action="action_invoice_tree12" id="menu_action_invoice_tree12" parent="menu_action_invoice_tree4" groups="base.group_useability_extended"/>
<record id="action_invoice_tree13" model="ir.actions.act_window">
<field name="name">Unpaid Supplier Refunds</field>
@@ -676,7 +676,7 @@
<field name="act_window_id" ref="action_invoice_tree13"/>
</record>
<menuitem action="action_invoice_tree13" id="menu_action_invoice_tree13" parent="menu_action_invoice_tree4" groups="base.group_extended_menu"/>
<menuitem action="action_invoice_tree13" id="menu_action_invoice_tree13" parent="menu_action_invoice_tree4" groups="base.group_useability_extended"/>
<act_window domain="[('partner_id','=',active_id)]" id="act_res_partner_2_account_invoice_opened" name="Invoices" res_model="account.invoice" src_model="res.partner"/>
addons/account/account_move_line.py
+8 -7
View File
@@ -351,8 +351,8 @@ class account_move_line(osv.osv):
'quantity': fields.float('Quantity', digits=(16,2), help="The optional quantity expressed by this line, eg: number of product sold. The quantity is not a legal requirement but is very usefull for some reports."),
'product_uom_id': fields.many2one('product.uom', 'UoM'),
'product_id': fields.many2one('product.product', 'Product'),
'debit': fields.float('Debit', digits=(16,2)),
'credit': fields.float('Credit', digits=(16,2)),
'debit': fields.float('Debit', digits=(16,int(tools.config['price_accuracy']))),
'credit': fields.float('Credit', digits=(16,int(tools.config['price_accuracy']))),
'account_id': fields.many2one('account.account', 'Account', required=True, ondelete="cascade", domain=[('type','<>','view'), ('type', '<>', 'closed')], select=2),
'move_id': fields.many2one('account.move', 'Move', ondelete="cascade", states={'valid':[('readonly',True)]}, help="The move of this entry line.", select=2),
@@ -360,7 +360,7 @@ class account_move_line(osv.osv):
'statement_id': fields.many2one('account.bank.statement', 'Statement', help="The bank statement used for bank reconciliation", select=1),
'reconcile_id': fields.many2one('account.move.reconcile', 'Reconcile', readonly=True, ondelete='set null', select=2),
'reconcile_partial_id': fields.many2one('account.move.reconcile', 'Partial Reconcile', readonly=True, ondelete='set null', select=2),
'amount_currency': fields.float('Amount Currency', help="The amount expressed in an optional other currency if it is a multi-currency entry."),
'amount_currency': fields.float('Amount Currency', help="The amount expressed in an optional other currency if it is a multi-currency entry.", digits=(16,int(tools.config['price_accuracy']))),
'currency_id': fields.many2one('res.currency', 'Currency', help="The optional other currency if it is a multi-currency entry."),
'period_id': fields.many2one('account.period', 'Period', required=True, select=2),
@@ -379,14 +379,14 @@ class account_move_line(osv.osv):
'balance': fields.function(_balance, fnct_search=_balance_search, method=True, string='Balance'),
'state': fields.selection([('draft','Draft'), ('valid','Valid')], 'Status', readonly=True),
'tax_code_id': fields.many2one('account.tax.code', 'Tax Account', help="The Account can either be a base tax code or tax code account."),
'tax_amount': fields.float('Tax/Base Amount', digits=(16,2), select=True, help="If the Tax account is tax code account, this field will contain the taxed amount.If the tax account is base tax code,\
'tax_amount': fields.float('Tax/Base Amount', digits=(16,int(tools.config['price_accuracy'])), select=True, help="If the Tax account is tax code account, this field will contain the taxed amount.If the tax account is base tax code,\
this field will contain the basic amount(without tax)."),
'invoice': fields.function(_invoice, method=True, string='Invoice',
type='many2one', relation='account.invoice', fnct_search=_invoice_search),
'account_tax_id':fields.many2one('account.tax', 'Tax'),
'analytic_account_id' : fields.many2one('account.analytic.account', 'Analytic Account'),
#TODO: remove this
'amount_taxed':fields.float("Taxed Amount",digits=(16,2)),
'amount_taxed':fields.float("Taxed Amount",digits=(16,int(tools.config['price_accuracy']))),
}
@@ -626,6 +626,7 @@ class account_move_line(osv.osv):
'debit':debit,
'credit':credit,
'account_id':writeoff_acc_id,
'analytic_account_id': context.get('analytic_id', False),
'date':date,
'partner_id':partner_id
})
@@ -634,7 +635,7 @@ class account_move_line(osv.osv):
writeoff_move_id = self.pool.get('account.move').create(cr, uid, {
'period_id': writeoff_period_id,
'journal_id': writeoff_journal_id,
'date':date,
'state': 'draft',
'line_id': writeoff_lines
})
@@ -879,7 +880,7 @@ class account_move_line(osv.osv):
'amount': vals['debit'] or vals['credit'],
'general_account_id': vals['account_id'],
'journal_id': journal.analytic_journal_id.id,
'ref': vals['ref'],
'ref': vals.get('ref', False),
})]
#else:
# raise osv.except_osv(_('No analytic journal !'), _('Please set an analytic journal on this financial journal !'))
addons/account/account_view.xml
+4 -2
View File
@@ -336,6 +336,7 @@
<field name="date"/>
<field name="ref"/>
<field name="name"/>
<field name="account_id"/>
<field name="type"/>
<field name="partner_id" on_change="onchange_partner_id(partner_id, type, parent.currency)"/>
<field domain="[('journal_id','=',parent.journal_id)]" name="account_id"/>
@@ -346,6 +347,7 @@
<form string="Statement lines">
<field name="date"/>
<field name="name"/>
<field name="account_id"/>
<field name="type"/>
<field name="partner_id" on_change="onchange_partner_id(partner_id, type, parent.currency)"/>
<field domain="[('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id"/>
@@ -388,7 +390,7 @@
<field name="domain">[('state','=','draft')]</field>
<field name="filter" eval="True"/>
</record>
<menuitem action="action_bank_statement_draft_tree" id="menu_bank_statement_draft_tree" parent="account.menu_bank_statement_tree" groups="base.group_extended_menu"/>
<menuitem action="action_bank_statement_draft_tree" id="menu_bank_statement_draft_tree" parent="account.menu_bank_statement_tree" groups="base.group_useability_extended"/>
<record id="action_bank_statement_tree2" model="ir.actions.act_window">
<field name="name">New Statement</field>
@@ -1341,7 +1343,7 @@
<field name="domain">[('state','=','running')]</field>
<field name="filter" eval="True"/>
</record>
<menuitem action="action_subscription_form_running" id="menu_action_subscription_form_running" parent="menu_action_subscription_form" groups="base.group_extended_menu"/>
<menuitem action="action_subscription_form_running" id="menu_action_subscription_form_running" parent="menu_action_subscription_form" groups="base.group_useability_extended"/>
<record id="action_subscription_form_new" model="ir.actions.act_window">
<field name="name">New Subscription</field>
addons/account/i18n/ar.po
+5928
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/ar_AR.po
-5800
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/bg.po
+5960
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/bg_BG.po
-5800
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/bs.po
+5928
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/bs_BS.po
-5800
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/ca.po
+6079
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/ca_ES.po
-5809
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/cs.po
+5928
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/cs_CZ.po
-5800
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/da.po
+5942
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/de.po
+6070
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/de_DE.po
-5804
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/el.po
+6415
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/es.po
+6016
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/es_AR.po
+1620 -849
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/es_EC.po
+5968
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/es_ES.po
-5800
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/et.po
+5933
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/et_EE.po
-5800
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/fa.po
+5942
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/fi.po
+6181
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/fi_FI.po
-5800
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/fr.po
+6090
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/fr_FR.po
-5809
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/gl.po
+5936
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/gu.po
+5947
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/hr.po
+5928
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/hr_HR.po
-5800
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/hu.po
+5928
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/hu_HU.po
-5800
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/id.po
+5931
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/id_ID.po
-5800
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/it.po
+5944
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/it_IT.po
-5800
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/kab.po
+5929
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/kab_KAB.po
-6497
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/ko.po
+5961
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/ko_KO.po
-6497
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/lt.po
+5998
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/lt_LT.po
-5800
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/lv.po
+6013
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/mn.po
+5929
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/nb.po
+5933
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/nl.po
+5996
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/nl_BE.po
+200 -63
View File
@@ -4,16 +4,17 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 15:34:14+0000\n"
"PO-Revision-Date: 2009-08-28 15:34:14+0000\n"
"Last-Translator: <>\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2009-04-24 15:00+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2009-11-17 05:00+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
#: field:account.tax.template,description:0
@@ -68,7 +69,9 @@ msgstr ""
#. module: account
#: help:product.category,property_account_income_categ:0
msgid "This account will be used to value incoming stock for the current product category"
msgid ""
"This account will be used to value incoming stock for the current product "
"category"
msgstr ""
#. module: account
@@ -160,7 +163,10 @@ msgstr ""
#. module: account
#: help:account.payment.term.line,days2:0
msgid "Day of the month, set -1 for the last day of the current month. If it's positive, it gives the day of the next month. Set 0 for net days (otherwise it's based on the beginning of the month)."
msgid ""
"Day of the month, set -1 for the last day of the current month. If it's "
"positive, it gives the day of the next month. Set 0 for net days (otherwise "
"it's based on the beginning of the month)."
msgstr ""
#. module: account
@@ -255,13 +261,21 @@ msgstr ""
#. module: account
#: help:account.journal,view_id:0
msgid "Gives the view used when writing or browsing entries in this journal. The view tell Open ERP which fields should be visible, required or readonly and in which order. You can create your own view for a faster encoding in each journal."
msgid ""
"Gives the view used when writing or browsing entries in this journal. The "
"view tell Open ERP which fields should be visible, required or readonly and "
"in which order. You can create your own view for a faster encoding in each "
"journal."
msgstr ""
#. module: account
#: help:account.invoice,date_due:0
#: help:account.invoice,payment_term:0
msgid "If you use payment terms, the due date will be computed automatically at the generation of accounting entries. If you keep the payment term and the due date empty, it means direct payment. The payment term may compute several due dates, for example 50% now, 50% in one month."
msgid ""
"If you use payment terms, the due date will be computed automatically at the "
"generation of accounting entries. If you keep the payment term and the due "
"date empty, it means direct payment. The payment term may compute several "
"due dates, for example 50% now, 50% in one month."
msgstr ""
#. module: account
@@ -468,7 +482,9 @@ msgstr ""
#. module: account
#: help:account.tax.template,include_base_amount:0
msgid "Set if the amount of tax must be included in the base amount before computing the next taxes."
msgid ""
"Set if the amount of tax must be included in the base amount before "
"computing the next taxes."
msgstr ""
#. module: account
@@ -548,7 +564,9 @@ msgstr ""
#. module: account
#: help:account.payment.term.line,days:0
msgid "Number of days to add before computation of the day of month.If Date=15/01, Number of Days=22, Day of Month=-1, then the due date is 28/02."
msgid ""
"Number of days to add before computation of the day of month.If Date=15/01, "
"Number of Days=22, Day of Month=-1, then the due date is 28/02."
msgstr ""
#. module: account
@@ -579,7 +597,9 @@ msgstr ""
#. module: account
#: help:account.model.line,sequence:0
msgid "The sequence field is used to order the resources from lower sequences to higher ones"
msgid ""
"The sequence field is used to order the resources from lower sequences to "
"higher ones"
msgstr ""
#. module: account
@@ -798,7 +818,9 @@ msgstr ""
#. module: account
#: help:account.account.template,user_type:0
msgid "These types are defined according to your country. The type contain more information about the account and it's specificities."
msgid ""
"These types are defined according to your country. The type contain more "
"information about the account and it's specificities."
msgstr ""
#. module: account
@@ -880,7 +902,9 @@ msgstr ""
#. module: account
#: help:account.tax,tax_group:0
msgid "If a default tax is given in the partner it only overrides taxes from accounts (or products) in the same group."
msgid ""
"If a default tax is given in the partner it only overrides taxes from "
"accounts (or products) in the same group."
msgstr ""
#. module: account
@@ -1051,7 +1075,9 @@ msgstr ""
#. module: account
#: help:account.payment.term.line,sequence:0
msgid "The sequence field is used to order the payment term lines from the lowest sequences to the higher ones"
msgid ""
"The sequence field is used to order the payment term lines from the lowest "
"sequences to the higher ones"
msgstr ""
#. module: account
@@ -1175,7 +1201,12 @@ msgstr ""
#. module: account
#: help:account.account,currency_mode:0
msgid "This will select how the current currency rate for outgoing transactions is computed. In most countries the legal method is \"average\" but only a few software systems are able to manage this. So if you import from another software system you may have to use the rate at date. Incoming transactions always use the rate at date."
msgid ""
"This will select how the current currency rate for outgoing transactions is "
"computed. In most countries the legal method is \"average\" but only a few "
"software systems are able to manage this. So if you import from another "
"software system you may have to use the rate at date. Incoming transactions "
"always use the rate at date."
msgstr ""
#. module: account
@@ -1331,7 +1362,9 @@ msgstr ""
#. module: account
#: wizard_view:account.move.line.unreconcile,init:0
#: wizard_view:account.reconcile.unreconcile,init:0
msgid "If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable"
msgid ""
"If you unreconciliate transactions, you must also verify all the actions "
"that are linked to those transactions because they will not be disable"
msgstr ""
#. module: account
@@ -1425,7 +1458,8 @@ msgstr ""
#. module: account
#: help:account.invoice,partner_bank:0
msgid "The partner bank account to pay\n"
msgid ""
"The partner bank account to pay\n"
"Keep empty to use the default"
msgstr ""
@@ -1759,7 +1793,9 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_position:0
msgid "The fiscal position will determine taxes and the accounts used for the the partner."
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"partner."
msgstr ""
#. module: account
@@ -1977,7 +2013,10 @@ msgstr ""
#. module: account
#: help:account.journal,entry_posted:0
msgid "Check this box if you don't want new account moves to pass through the 'draft' state and instead goes directly to the 'posted state' without any manual validation."
msgid ""
"Check this box if you don't want new account moves to pass through the "
"'draft' state and instead goes directly to the 'posted state' without any "
"manual validation."
msgstr ""
#. module: account
@@ -1994,7 +2033,9 @@ msgstr ""
#. module: account
#: help:account.invoice,number:0
msgid "Unique number of the invoice, computed automatically when the invoice is created."
msgid ""
"Unique number of the invoice, computed automatically when the invoice is "
"created."
msgstr ""
#. module: account
@@ -2161,7 +2202,10 @@ msgstr ""
#. module: account
#: rml:account.overdue:0
msgid "Exception made of a mistake of our side, it seems that the following bills stay unpaid. Please, take appropriate measures in order to carry out this payment in the next 8 days."
msgid ""
"Exception made of a mistake of our side, it seems that the following bills "
"stay unpaid. Please, take appropriate measures in order to carry out this "
"payment in the next 8 days."
msgstr ""
#. module: account
@@ -2340,7 +2384,9 @@ msgstr ""
#. module: account
#: help:account.tax,child_depend:0
msgid "Set if the tax computation is based on the computation of child taxes rather than on the total amount."
msgid ""
"Set if the tax computation is based on the computation of child taxes rather "
"than on the total amount."
msgstr ""
#. module: account
@@ -2350,7 +2396,9 @@ msgstr ""
#. module: account
#: help:account.tax,applicable_type:0
msgid "If not applicable (computed through a Python code), the tax won't appear on the invoice."
msgid ""
"If not applicable (computed through a Python code), the tax won't appear on "
"the invoice."
msgstr ""
#. module: account
@@ -2552,7 +2600,8 @@ msgstr ""
#. module: account
#: help:account.account.template,reconcile:0
msgid "Check this option if you want the user to reconcile entries in this account."
msgid ""
"Check this option if you want the user to reconcile entries in this account."
msgstr ""
#. module: account
@@ -2590,7 +2639,12 @@ msgstr ""
#. module: account
#: help:account.account.template,type:0
msgid "This type is used to differenciate types with special effects in Open ERP: view can not have entries, consolidation are accounts that can have children accounts for multi-company consolidations, payable/receivable are for partners accounts (for debit/credit computations), closed for deprecated accounts."
msgid ""
"This type is used to differenciate types with special effects in Open ERP: "
"view can not have entries, consolidation are accounts that can have children "
"accounts for multi-company consolidations, payable/receivable are for "
"partners accounts (for debit/credit computations), closed for deprecated "
"accounts."
msgstr ""
#. module: account
@@ -2730,7 +2784,10 @@ msgstr ""
#. module: account
#: help:account.tax.template,sequence:0
msgid "The sequence field is used to order the taxes lines from lower sequences to higher ones. The order is important if you have a tax that has several tax children. In this case, the evaluation order is important."
msgid ""
"The sequence field is used to order the taxes lines from lower sequences to "
"higher ones. The order is important if you have a tax that has several tax "
"children. In this case, the evaluation order is important."
msgstr ""
#. module: account
@@ -2941,7 +2998,10 @@ msgstr ""
#. module: account
#: help:account.model.line,date_maturity:0
msgid "The maturity date of the generated entries for this model. You can chosse between the date of the creation action or the the date of the creation of the entries plus the partner payment terms."
msgid ""
"The maturity date of the generated entries for this model. You can chosse "
"between the date of the creation action or the the date of the creation of "
"the entries plus the partner payment terms."
msgstr ""
#. module: account
@@ -2973,7 +3033,9 @@ msgstr ""
#. module: account
#: help:account.journal,group_invoice_lines:0
msgid "If this box is checked, the system will try to group the accounting lines when generating them from invoices."
msgid ""
"If this box is checked, the system will try to group the accounting lines "
"when generating them from invoices."
msgstr ""
#. module: account
@@ -3120,7 +3182,9 @@ msgstr ""
#. module: account
#: help:account.invoice,reconciled:0
msgid "The account moves of the invoice have been reconciled with account moves of the payment(s)."
msgid ""
"The account moves of the invoice have been reconciled with account moves of "
"the payment(s)."
msgstr ""
#. module: account
@@ -3287,7 +3351,9 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_receivable:0
msgid "This account will be used instead of the default one as the receivable account for the current partner"
msgid ""
"This account will be used instead of the default one as the receivable "
"account for the current partner"
msgstr ""
#. module: account
@@ -3314,7 +3380,9 @@ msgstr ""
#. module: account
#: help:account.tax.template,tax_group:0
msgid "If a default tax if given in the partner it only override taxes from account (or product) of the same group."
msgid ""
"If a default tax if given in the partner it only override taxes from account "
"(or product) of the same group."
msgstr ""
#. module: account
@@ -3352,7 +3420,9 @@ msgstr ""
#. module: account
#: wizard_view:account.move.validate,init:0
msgid "All draft account entries in this journal and period will be validated. It means you won't be able to modify their accouting fields."
msgid ""
"All draft account entries in this journal and period will be validated. It "
"means you won't be able to modify their accouting fields."
msgstr ""
#. module: account
@@ -3363,7 +3433,9 @@ msgstr ""
#. module: account
#: help:account.move.line,amount_currency:0
msgid "The amount expressed in an optional other currency if it is a multi-currency entry."
msgid ""
"The amount expressed in an optional other currency if it is a multi-currency "
"entry."
msgstr ""
#. module: account
@@ -3520,7 +3592,9 @@ msgstr ""
#. module: account
#: help:res.partner,property_payment_term:0
msgid "This payment term will be used instead of the default one for the current partner"
msgid ""
"This payment term will be used instead of the default one for the current "
"partner"
msgstr ""
#. module: account
@@ -3537,7 +3611,9 @@ msgstr ""
#. module: account
#: help:account.tax.code,notprintable:0
#: help:account.tax.code.template,notprintable:0
msgid "Check this box if you don't want any VAT related to this Tax Code to appear on invoices"
msgid ""
"Check this box if you don't want any VAT related to this Tax Code to appear "
"on invoices"
msgstr ""
#. module: account
@@ -3591,7 +3667,9 @@ msgstr ""
#. module: account
#: help:account.account,check_history:0
msgid "Check this box if you want to print all entries when printing the General Ledger, otherwise it will only print its balance."
msgid ""
"Check this box if you want to print all entries when printing the General "
"Ledger, otherwise it will only print its balance."
msgstr ""
#. module: account
@@ -3679,7 +3757,8 @@ msgstr ""
#. module: account
#: model:ir.module.module,description:account.module_meta_information
msgid "Financial and accounting module that covers:\n"
msgid ""
"Financial and accounting module that covers:\n"
" General accounting\n"
" Cost / Analytic accounting\n"
" Third party accounting\n"
@@ -3713,7 +3792,9 @@ msgstr ""
#. module: account
#: help:account.automatic.reconcile,init,account_ids:0
msgid "If no account is specified, the reconciliation will be made using every accounts that can be reconcilied"
msgid ""
"If no account is specified, the reconciliation will be made using every "
"accounts that can be reconcilied"
msgstr ""
#. module: account
@@ -3753,7 +3834,9 @@ msgstr ""
#. module: account
#: help:product.template,property_account_expense:0
msgid "This account will be used instead of the default one to value outgoing stock for the current product"
msgid ""
"This account will be used instead of the default one to value outgoing stock "
"for the current product"
msgstr ""
#. module: account
@@ -3797,7 +3880,10 @@ msgstr ""
#. module: account
#: help:account.analytic.journal,type:0
msgid "Gives the type of the analytic journal. When a document (eg: an invoice) needs to create analytic entries, Open ERP will look for a matching journal of the same type."
msgid ""
"Gives the type of the analytic journal. When a document (eg: an invoice) "
"needs to create analytic entries, Open ERP will look for a matching journal "
"of the same type."
msgstr ""
#. module: account
@@ -3889,7 +3975,9 @@ msgstr ""
#. module: account
#: help:account.tax.template,child_depend:0
msgid "Indicate if the tax computation is based on the value computed for the computation of child taxes or based on the total amount."
msgid ""
"Indicate if the tax computation is based on the value computed for the "
"computation of child taxes or based on the total amount."
msgstr ""
#. module: account
@@ -3937,7 +4025,9 @@ msgstr ""
#. module: account
#: help:account.move.line,quantity:0
msgid "The optional quantity expressed by this line, eg: number of product sold. The quantity is not a legal requirement but is very usefull for some reports."
msgid ""
"The optional quantity expressed by this line, eg: number of product sold. "
"The quantity is not a legal requirement but is very usefull for some reports."
msgstr ""
#. module: account
@@ -3947,7 +4037,9 @@ msgstr ""
#. module: account
#: help:account.move.line,blocked:0
msgid "You can check this box to mark the entry line as a litigation with the associated partner"
msgid ""
"You can check this box to mark the entry line as a litigation with the "
"associated partner"
msgstr ""
#. module: account
@@ -4058,12 +4150,17 @@ msgstr ""
#. module: account
#: constraint:ir.model:0
msgid "The Object name must start with x_ and not contain any special character !"
msgstr "De objectnaam moet beginnen met x_ en mag geen speciale karakters bevatten !"
msgid ""
"The Object name must start with x_ and not contain any special character !"
msgstr ""
"De objectnaam moet beginnen met x_ en mag geen speciale karakters bevatten !"
#. module: account
#: help:account.account.type,sign:0
msgid "Allows you to change the sign of the balance amount displayed in the reports, so that you can see positive figures instead of negative ones in expenses accounts."
msgid ""
"Allows you to change the sign of the balance amount displayed in the "
"reports, so that you can see positive figures instead of negative ones in "
"expenses accounts."
msgstr ""
#. module: account
@@ -4073,7 +4170,9 @@ msgstr ""
#. module: account
#: help:account.move.line,date_maturity:0
msgid "This field is used for payable and receivable entries. You can put the limit date for the payment of this entry line."
msgid ""
"This field is used for payable and receivable entries. You can put the limit "
"date for the payment of this entry line."
msgstr ""
#. module: account
@@ -4258,7 +4357,10 @@ msgstr ""
#. module: account
#: help:account.tax,sequence:0
msgid "The sequence field is used to order the tax lines from the lowest sequences to the higher ones. The order is important if you have a tax with several tax children. In this case, the evaluation order is important."
msgid ""
"The sequence field is used to order the tax lines from the lowest sequences "
"to the higher ones. The order is important if you have a tax with several "
"tax children. In this case, the evaluation order is important."
msgstr ""
#. module: account
@@ -4431,7 +4533,9 @@ msgstr ""
#. module: account
#: view:wizard.multi.charts.accounts:0
msgid "This will automatically configure your chart of accounts, bank accounts, taxes and journals according to the selected template"
msgid ""
"This will automatically configure your chart of accounts, bank accounts, "
"taxes and journals according to the selected template"
msgstr ""
#. module: account
@@ -4506,7 +4610,9 @@ msgstr ""
#. module: account
#: help:account.tax,include_base_amount:0
msgid "Indicate if the amount of tax must be included in the base amount for the computation of the next taxes"
msgid ""
"Indicate if the amount of tax must be included in the base amount for the "
"computation of the next taxes"
msgstr ""
#. module: account
@@ -4600,7 +4706,10 @@ msgstr ""
#. module: account
#: help:account.journal,centralisation:0
msgid "Check this box to determine that each entry of this journal won't create a new counterpart but will share the same counterpart. This is used in fiscal year closing."
msgid ""
"Check this box to determine that each entry of this journal won't create a "
"new counterpart but will share the same counterpart. This is used in fiscal "
"year closing."
msgstr ""
#. module: account
@@ -4733,7 +4842,9 @@ msgstr ""
#. module: account
#: help:account.tax,domain:0
#: help:account.tax.template,domain:0
msgid "This field is only used if you develop your own module allowing developers to create specific taxes in a custom domain."
msgid ""
"This field is only used if you develop your own module allowing developers "
"to create specific taxes in a custom domain."
msgstr ""
#. module: account
@@ -4938,7 +5049,9 @@ msgstr ""
#. module: account
#: help:wizard.multi.charts.accounts,seq_journal:0
msgid "Check this box if you want to use a different sequence for each created journal. Otherwise, all will use the same sequence."
msgid ""
"Check this box if you want to use a different sequence for each created "
"journal. Otherwise, all will use the same sequence."
msgstr ""
#. module: account
@@ -5226,7 +5339,10 @@ msgstr ""
#. module: account
#: help:account.move.line,tax_amount:0
msgid "If the Tax account is tax code account, this field will contain the taxed amount.If the tax account is base tax code, this field will contain the basic amount(without tax)."
msgid ""
"If the Tax account is tax code account, this field will contain the taxed "
"amount.If the tax account is base tax code, this field "
"will contain the basic amount(without tax)."
msgstr ""
#. module: account
@@ -5334,7 +5450,9 @@ msgstr ""
#. module: account
#: constraint:account.period:0
msgid "Invalid period ! Some periods overlap or the date period is not in the scope of the fiscal year. "
msgid ""
"Invalid period ! Some periods overlap or the date period is not in the scope "
"of the fiscal year. "
msgstr ""
#. module: account
@@ -5353,7 +5471,10 @@ msgstr ""
#. module: account
#: help:populate_statement_from_inv,init,journal_id:0
msgid "This field allow you to choose the accounting journals you want for filtering the invoices. If you left this field empty, it will search on all sale, purchase and cash journals."
msgid ""
"This field allow you to choose the accounting journals you want for "
"filtering the invoices. If you left this field empty, it will search on all "
"sale, purchase and cash journals."
msgstr ""
#. module: account
@@ -5491,7 +5612,9 @@ msgstr ""
#. module: account
#: help:product.template,property_account_income:0
msgid "This account will be used instead of the default one to value incoming stock for the current product"
msgid ""
"This account will be used instead of the default one to value incoming stock "
"for the current product"
msgstr ""
#. module: account
@@ -5521,7 +5644,9 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_payable:0
msgid "This account will be used instead of the default one as the payable account for the current partner"
msgid ""
"This account will be used instead of the default one as the payable account "
"for the current partner"
msgstr ""
#. module: account
@@ -5691,7 +5816,9 @@ msgstr ""
#. module: account
#: help:product.category,property_account_expense_categ:0
msgid "This account will be used to value outgoing stock for the current product category"
msgid ""
"This account will be used to value outgoing stock for the current product "
"category"
msgstr ""
#. module: account
@@ -5767,7 +5894,9 @@ msgstr ""
#. module: account
#: help:account.tax,price_include:0
msgid "Check this if the price you use on the product and invoices includes this tax."
msgid ""
"Check this if the price you use on the product and invoices includes this "
"tax."
msgstr ""
#. module: account
@@ -5790,7 +5919,8 @@ msgstr ""
#. module: account
#: help:account.account,reconcile:0
msgid "Check this if the user is allowed to reconcile entries in this account."
msgid ""
"Check this if the user is allowed to reconcile entries in this account."
msgstr ""
#. module: account
@@ -5798,3 +5928,10 @@ msgstr ""
msgid "Compute Entry Dates"
msgstr ""
#~ msgid ""
#~ "Would your payment have been carried out after this mail was sent, please "
#~ "consider the present one as void. Do not hesitate to contact our accounting "
#~ "departement at +32 81 81 37 00."
#~ msgstr ""
#~ "Indien dit schrijven uw betaling mocht kruisen, mag u dit negeren. Aarzel "
#~ "niet om contact op te nemen met onze boekhouding voor eventuele vragen."
addons/account/i18n/nl_NL.po
-5800
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/oc.po
+5935
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/pl.po
+6042
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/pl_PL.po
-5800
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/pt.po
+5978
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/pt_BR.po
+550 -362
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/pt_PT.po
-5800
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/ro.po
+6071
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/ro_RO.po
-5800
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/ru.po
+5940
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/ru_RU.po
-5800
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/si.po
+5929
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/si_SI.po
-6497
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/sl.po
+5944
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/sl_SL.po
-5800
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/sq.po
+11600
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/sq_AL.po
-5800
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/sr.po
+5959
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/sv.po
+5929
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/sv_SE.po
-5800
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/te.po
+5955
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/th.po
+5933
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/tlh.po
+5928
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/tr.po
+5928
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/tr_TR.po
-5800
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/uk.po
+6006
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/uk_UA.po
-5800
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/vi.po
+6000
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/vi_VN.po
-5800
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/zh_CN.po
+233 -101
View File
@@ -4,16 +4,17 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 15:29:32+0000\n"
"PO-Revision-Date: 2009-08-28 15:29:32+0000\n"
"Last-Translator: <>\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2009-11-17 09:40+0000\n"
"Last-Translator: Luke Meng <mengfanlu@gmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2009-11-18 04:38+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
#: field:account.tax.template,description:0
@@ -29,17 +30,17 @@ msgstr "税务科目代码"
#: model:ir.actions.act_window,name:account.action_invoice_tree9
#: model:ir.ui.menu,name:account.menu_action_invoice_tree9
msgid "Unpaid Supplier Invoices"
msgstr ""
msgstr "未支付的采购发票"
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_entries
msgid "Entries Encoding"
msgstr ""
msgstr "科目编码"
#. module: account
#: model:ir.actions.todo,note:account.config_wizard_account_base_setup_form
msgid "Specify The Message for the Overdue Payment Report."
msgstr ""
msgstr "为滞纳款项报告指定通知信息。"
#. module: account
#: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
@@ -59,22 +60,24 @@ msgstr ""
#. module: account
#: help:account.journal,currency:0
msgid "The currency used to enter statement"
msgstr ""
msgstr "输入分录时所使用的币种"
#. module: account
#: wizard_view:account_use_models,init_form:0
msgid "Select Message"
msgstr ""
msgstr "选择消息"
#. module: account
#: help:product.category,property_account_income_categ:0
msgid "This account will be used to value incoming stock for the current product category"
msgid ""
"This account will be used to value incoming stock for the current product "
"category"
msgstr ""
#. module: account
#: help:account.invoice,period_id:0
msgid "Keep empty to use the period of the validation(invoice) date."
msgstr ""
msgstr "不填则使用有效（发票）日期的期间。"
#. module: account
#: wizard_view:account.automatic.reconcile,reconcile:0
@@ -84,7 +87,7 @@ msgstr "对帐结果"
#. module: account
#: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
msgid "Unreconciled entries"
msgstr "未经对帐的条目"
msgstr "未经对帐的凭证"
#. module: account
#: field:account.invoice.tax,base_code_id:0
@@ -102,22 +105,22 @@ msgstr ""
#: model:ir.actions.wizard,name:account.wizard_vat_declaration
#: model:ir.ui.menu,name:account.menu_wizard_vat_declaration
msgid "Print Taxes Report"
msgstr ""
msgstr "打印税金报表"
#. module: account
#: field:account.account,parent_id:0
msgid "Parent"
msgstr "父科目"
msgstr "上级"
#. module: account
#: selection:account.move,type:0
msgid "Journal Voucher"
msgstr ""
msgstr "记账凭证"
#. module: account
#: field:account.invoice,residual:0
msgid "Residual"
msgstr ""
msgstr "残余"
#. module: account
#: field:account.tax,base_sign:0
@@ -136,7 +139,7 @@ msgstr "非对帐条目"
#. module: account
#: constraint:account.period:0
msgid "Error ! The duration of the Period(s) is/are invalid. "
msgstr ""
msgstr "错误！期间的长短不合规定。 "
#. module: account
#: view:account.bank.statement.reconcile:0
@@ -160,18 +163,21 @@ msgstr ""
#. module: account
#: help:account.payment.term.line,days2:0
msgid "Day of the month, set -1 for the last day of the current month. If it's positive, it gives the day of the next month. Set 0 for net days (otherwise it's based on the beginning of the month)."
msgstr ""
msgid ""
"Day of the month, set -1 for the last day of the current month. If it's "
"positive, it gives the day of the next month. Set 0 for net days (otherwise "
"it's based on the beginning of the month)."
msgstr "日，如果是本月的最后一天则设置-1。如果是正数，则指定下个月的日期。净日数设置0（否则将基于本月第一天）。"
#. module: account
#: view:account.move:0
msgid "Total Credit"
msgstr ""
msgstr "贷方合计"
#. module: account
#: field:account.config.wizard,charts:0
msgid "Charts of Account"
msgstr ""
msgstr "会计科目表"
#. module: account
#: model:ir.actions.wizard,name:account.wizard_move_line_select
@@ -206,17 +212,17 @@ msgstr "计算代码"
#: view:account.move:0
#: view:account.move.line:0
msgid "Account Entry Line"
msgstr ""
msgstr "分录行"
#. module: account
#: wizard_view:account.aged.trial.balance,init:0
msgid "Aged Trial Balance"
msgstr ""
msgstr "过期的试算平衡"
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
msgid "Recurrent Entries"
msgstr ""
msgstr "重复出现的分录"
#. module: account
#: field:account.analytic.line,amount:0
@@ -236,7 +242,7 @@ msgstr "金额"
#: model:ir.actions.wizard,name:account.wizard_third_party_ledger
#: model:ir.ui.menu,name:account.menu_third_party_ledger
msgid "Partner Ledger"
msgstr ""
msgstr "往来账户"
#. module: account
#: field:product.template,supplier_taxes_id:0
@@ -246,23 +252,35 @@ msgstr "供应商税"
#. module: account
#: view:account.move:0
msgid "Total Debit"
msgstr ""
msgstr "借方合计"
#. module: account
#: rml:account.tax.code.entries:0
msgid "Accounting Entries-"
msgstr ""
msgstr "会计分录"
#. module: account
#: help:account.journal,view_id:0
msgid "Gives the view used when writing or browsing entries in this journal. The view tell Open ERP which fields should be visible, required or readonly and in which order. You can create your own view for a faster encoding in each journal."
msgid ""
"Gives the view used when writing or browsing entries in this journal. The "
"view tell Open ERP which fields should be visible, required or readonly and "
"in which order. You can create your own view for a faster encoding in each "
"journal."
msgstr ""
"指定在输入或者浏览的时候所使用的视图。视图告诉OpenERP哪些字段是需要显示的，哪些字段是必须的，或者是只读的，还有，这些字段按照什么顺序排列。你可以自"
"定一个你自己的视图，让记账更快捷。"
#. module: account
#: help:account.invoice,date_due:0
#: help:account.invoice,payment_term:0
msgid "If you use payment terms, the due date will be computed automatically at the generation of accounting entries. If you keep the payment term and the due date empty, it means direct payment. The payment term may compute several due dates, for example 50% now, 50% in one month."
msgid ""
"If you use payment terms, the due date will be computed automatically at the "
"generation of accounting entries. If you keep the payment term and the due "
"date empty, it means direct payment. The payment term may compute several "
"due dates, for example 50% now, 50% in one month."
msgstr ""
"如果你使用付款期，那么到期日会根据入账日期自动计算。如果付款期和到期日都不填，则为直接付款。付款期可能会计算出几个到期日，例如50%立刻到期，另外50%在"
"一个月以后到期。"
#. module: account
#: selection:account.tax,type:0
@@ -274,7 +292,7 @@ msgstr "固定"
#: model:ir.actions.report.xml,name:account.account_overdue
#: view:res.company:0
msgid "Overdue Payments"
msgstr ""
msgstr "滞纳款项"
#. module: account
#: wizard_view:account.account.balance.report,checktype:0
@@ -311,7 +329,7 @@ msgstr ""
#. module: account
#: rml:account.central.journal:0
msgid "Account Num."
msgstr ""
msgstr "科目编码"
#. module: account
#: rml:account.analytic.account.analytic.check:0
@@ -328,7 +346,7 @@ msgstr ""
#. module: account
#: rml:account.general.journal:0
msgid "Debit Trans."
msgstr ""
msgstr "借方业务"
#. module: account
#: field:account.analytic.line,account_id:0
@@ -349,7 +367,7 @@ msgstr ""
#: rml:account.general.journal:0
#: field:account.journal,name:0
msgid "Journal Name"
msgstr ""
msgstr "账簿名称"
#. module: account
#: view:account.payment.term:0
@@ -359,29 +377,29 @@ msgstr "发票说明"
#. module: account
#: constraint:account.analytic.account:0
msgid "Error! You can not create recursive analytic accounts."
msgstr ""
msgstr "错误！你不能创建一个循环的分析帐户。"
#. module: account
#: field:account.bank.statement.reconcile,total_entry:0
msgid "Total entries"
msgstr ""
msgstr "总分录数"
#. module: account
#: field:account.fiscal.position.account,account_src_id:0
#: field:account.fiscal.position.account.template,account_src_id:0
msgid "Account Source"
msgstr ""
msgstr "帐户来源"
#. module: account
#: field:account.journal,update_posted:0
msgid "Allow Cancelling Entries"
msgstr ""
msgstr "循序取消分录"
#. module: account
#: model:process.transition,name:account.process_transition_paymentorderbank0
#: model:process.transition,name:account.process_transition_paymentorderreconcilation0
msgid "Payment Reconcilation"
msgstr ""
msgstr "付款调整"
#. module: account
#: model:account.journal,name:account.expenses_journal
@@ -391,7 +409,7 @@ msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.act_acc_analytic_acc_5_report_hr_timesheet_invoice_journal
msgid "All Analytic Entries"
msgstr ""
msgstr "所有的分析条目"
#. module: account
#: rml:account.overdue:0
@@ -406,7 +424,7 @@ msgstr ""
#. module: account
#: rml:account.partner.balance:0
msgid "(Account/Partner) Name"
msgstr ""
msgstr "（帐户/业务伙伴）名称"
#. module: account
#: selection:account.move,type:0
@@ -427,13 +445,13 @@ msgstr ""
#: model:ir.actions.act_window,name:account.action_invoice_tree13
#: model:ir.ui.menu,name:account.menu_action_invoice_tree13
msgid "Unpaid Supplier Refunds"
msgstr ""
msgstr "未付的采购退款"
#. module: account
#: view:account.tax:0
#: view:account.tax.template:0
msgid "Special Computation"
msgstr ""
msgstr "特殊预算"
#. module: account
#: model:process.transition,note:account.process_transition_confirmstatementfromdraft0
@@ -445,7 +463,7 @@ msgstr ""
#: model:ir.actions.wizard,name:account.action_account_bank_reconcile_tree
#: model:ir.ui.menu,name:account.menu_action_account_bank_reconcile_check_tree
msgid "Bank reconciliation"
msgstr ""
msgstr "银行对账"
#. module: account
#: rml:account.invoice:0
@@ -468,13 +486,15 @@ msgstr ""
#. module: account
#: help:account.tax.template,include_base_amount:0
msgid "Set if the amount of tax must be included in the base amount before computing the next taxes."
msgstr ""
msgid ""
"Set if the amount of tax must be included in the base amount before "
"computing the next taxes."
msgstr "如果在计算下一个税之前税额必须包含在计税金额以内，则需要设置。"
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
msgid "Periodical Processing"
msgstr ""
msgstr "周期性处理"
#. module: account
#: view:report.hr.timesheet.invoice.journal:0
@@ -548,7 +568,9 @@ msgstr ""
#. module: account
#: help:account.payment.term.line,days:0
msgid "Number of days to add before computation of the day of month.If Date=15/01, Number of Days=22, Day of Month=-1, then the due date is 28/02."
msgid ""
"Number of days to add before computation of the day of month.If Date=15/01, "
"Number of Days=22, Day of Month=-1, then the due date is 28/02."
msgstr ""
#. module: account
@@ -579,7 +601,9 @@ msgstr ""
#. module: account
#: help:account.model.line,sequence:0
msgid "The sequence field is used to order the resources from lower sequences to higher ones"
msgid ""
"The sequence field is used to order the resources from lower sequences to "
"higher ones"
msgstr ""
#. module: account
@@ -798,7 +822,9 @@ msgstr ""
#. module: account
#: help:account.account.template,user_type:0
msgid "These types are defined according to your country. The type contain more information about the account and it's specificities."
msgid ""
"These types are defined according to your country. The type contain more "
"information about the account and it's specificities."
msgstr ""
#. module: account
@@ -880,7 +906,9 @@ msgstr ""
#. module: account
#: help:account.tax,tax_group:0
msgid "If a default tax is given in the partner it only overrides taxes from accounts (or products) in the same group."
msgid ""
"If a default tax is given in the partner it only overrides taxes from "
"accounts (or products) in the same group."
msgstr ""
#. module: account
@@ -1051,7 +1079,9 @@ msgstr ""
#. module: account
#: help:account.payment.term.line,sequence:0
msgid "The sequence field is used to order the payment term lines from the lowest sequences to the higher ones"
msgid ""
"The sequence field is used to order the payment term lines from the lowest "
"sequences to the higher ones"
msgstr ""
#. module: account
@@ -1175,7 +1205,12 @@ msgstr ""
#. module: account
#: help:account.account,currency_mode:0
msgid "This will select how the current currency rate for outgoing transactions is computed. In most countries the legal method is \"average\" but only a few software systems are able to manage this. So if you import from another software system you may have to use the rate at date. Incoming transactions always use the rate at date."
msgid ""
"This will select how the current currency rate for outgoing transactions is "
"computed. In most countries the legal method is \"average\" but only a few "
"software systems are able to manage this. So if you import from another "
"software system you may have to use the rate at date. Incoming transactions "
"always use the rate at date."
msgstr ""
#. module: account
@@ -1331,7 +1366,9 @@ msgstr ""
#. module: account
#: wizard_view:account.move.line.unreconcile,init:0
#: wizard_view:account.reconcile.unreconcile,init:0
msgid "If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable"
msgid ""
"If you unreconciliate transactions, you must also verify all the actions "
"that are linked to those transactions because they will not be disable"
msgstr ""
#. module: account
@@ -1425,7 +1462,8 @@ msgstr ""
#. module: account
#: help:account.invoice,partner_bank:0
msgid "The partner bank account to pay\n"
msgid ""
"The partner bank account to pay\n"
"Keep empty to use the default"
msgstr ""
@@ -1759,7 +1797,9 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_position:0
msgid "The fiscal position will determine taxes and the accounts used for the the partner."
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"partner."
msgstr ""
#. module: account
@@ -1977,7 +2017,10 @@ msgstr ""
#. module: account
#: help:account.journal,entry_posted:0
msgid "Check this box if you don't want new account moves to pass through the 'draft' state and instead goes directly to the 'posted state' without any manual validation."
msgid ""
"Check this box if you don't want new account moves to pass through the "
"'draft' state and instead goes directly to the 'posted state' without any "
"manual validation."
msgstr ""
#. module: account
@@ -1994,7 +2037,9 @@ msgstr ""
#. module: account
#: help:account.invoice,number:0
msgid "Unique number of the invoice, computed automatically when the invoice is created."
msgid ""
"Unique number of the invoice, computed automatically when the invoice is "
"created."
msgstr ""
#. module: account
@@ -2161,7 +2206,10 @@ msgstr ""
#. module: account
#: rml:account.overdue:0
msgid "Exception made of a mistake of our side, it seems that the following bills stay unpaid. Please, take appropriate measures in order to carry out this payment in the next 8 days."
msgid ""
"Exception made of a mistake of our side, it seems that the following bills "
"stay unpaid. Please, take appropriate measures in order to carry out this "
"payment in the next 8 days."
msgstr ""
#. module: account
@@ -2340,7 +2388,9 @@ msgstr ""
#. module: account
#: help:account.tax,child_depend:0
msgid "Set if the tax computation is based on the computation of child taxes rather than on the total amount."
msgid ""
"Set if the tax computation is based on the computation of child taxes rather "
"than on the total amount."
msgstr ""
#. module: account
@@ -2350,7 +2400,9 @@ msgstr ""
#. module: account
#: help:account.tax,applicable_type:0
msgid "If not applicable (computed through a Python code), the tax won't appear on the invoice."
msgid ""
"If not applicable (computed through a Python code), the tax won't appear on "
"the invoice."
msgstr ""
#. module: account
@@ -2552,7 +2604,8 @@ msgstr ""
#. module: account
#: help:account.account.template,reconcile:0
msgid "Check this option if you want the user to reconcile entries in this account."
msgid ""
"Check this option if you want the user to reconcile entries in this account."
msgstr ""
#. module: account
@@ -2590,7 +2643,12 @@ msgstr ""
#. module: account
#: help:account.account.template,type:0
msgid "This type is used to differenciate types with special effects in Open ERP: view can not have entries, consolidation are accounts that can have children accounts for multi-company consolidations, payable/receivable are for partners accounts (for debit/credit computations), closed for deprecated accounts."
msgid ""
"This type is used to differenciate types with special effects in Open ERP: "
"view can not have entries, consolidation are accounts that can have children "
"accounts for multi-company consolidations, payable/receivable are for "
"partners accounts (for debit/credit computations), closed for deprecated "
"accounts."
msgstr ""
#. module: account
@@ -2730,7 +2788,10 @@ msgstr ""
#. module: account
#: help:account.tax.template,sequence:0
msgid "The sequence field is used to order the taxes lines from lower sequences to higher ones. The order is important if you have a tax that has several tax children. In this case, the evaluation order is important."
msgid ""
"The sequence field is used to order the taxes lines from lower sequences to "
"higher ones. The order is important if you have a tax that has several tax "
"children. In this case, the evaluation order is important."
msgstr ""
#. module: account
@@ -2815,7 +2876,7 @@ msgstr ""
#: field:account.invoice.tax,account_id:0
#: field:account.move.line,tax_code_id:0
msgid "Tax Account"
msgstr "增值税科目"
msgstr "税金科目"
#. module: account
#: model:process.transition,note:account.process_transition_statemententries0
@@ -2941,7 +3002,10 @@ msgstr ""
#. module: account
#: help:account.model.line,date_maturity:0
msgid "The maturity date of the generated entries for this model. You can chosse between the date of the creation action or the the date of the creation of the entries plus the partner payment terms."
msgid ""
"The maturity date of the generated entries for this model. You can chosse "
"between the date of the creation action or the the date of the creation of "
"the entries plus the partner payment terms."
msgstr ""
#. module: account
@@ -2973,7 +3037,9 @@ msgstr ""
#. module: account
#: help:account.journal,group_invoice_lines:0
msgid "If this box is checked, the system will try to group the accounting lines when generating them from invoices."
msgid ""
"If this box is checked, the system will try to group the accounting lines "
"when generating them from invoices."
msgstr ""
#. module: account
@@ -3120,7 +3186,9 @@ msgstr ""
#. module: account
#: help:account.invoice,reconciled:0
msgid "The account moves of the invoice have been reconciled with account moves of the payment(s)."
msgid ""
"The account moves of the invoice have been reconciled with account moves of "
"the payment(s)."
msgstr ""
#. module: account
@@ -3287,7 +3355,9 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_receivable:0
msgid "This account will be used instead of the default one as the receivable account for the current partner"
msgid ""
"This account will be used instead of the default one as the receivable "
"account for the current partner"
msgstr ""
#. module: account
@@ -3314,7 +3384,9 @@ msgstr ""
#. module: account
#: help:account.tax.template,tax_group:0
msgid "If a default tax if given in the partner it only override taxes from account (or product) of the same group."
msgid ""
"If a default tax if given in the partner it only override taxes from account "
"(or product) of the same group."
msgstr ""
#. module: account
@@ -3352,7 +3424,9 @@ msgstr ""
#. module: account
#: wizard_view:account.move.validate,init:0
msgid "All draft account entries in this journal and period will be validated. It means you won't be able to modify their accouting fields."
msgid ""
"All draft account entries in this journal and period will be validated. It "
"means you won't be able to modify their accouting fields."
msgstr ""
#. module: account
@@ -3363,7 +3437,9 @@ msgstr ""
#. module: account
#: help:account.move.line,amount_currency:0
msgid "The amount expressed in an optional other currency if it is a multi-currency entry."
msgid ""
"The amount expressed in an optional other currency if it is a multi-currency "
"entry."
msgstr ""
#. module: account
@@ -3520,7 +3596,9 @@ msgstr ""
#. module: account
#: help:res.partner,property_payment_term:0
msgid "This payment term will be used instead of the default one for the current partner"
msgid ""
"This payment term will be used instead of the default one for the current "
"partner"
msgstr ""
#. module: account
@@ -3537,7 +3615,9 @@ msgstr ""
#. module: account
#: help:account.tax.code,notprintable:0
#: help:account.tax.code.template,notprintable:0
msgid "Check this box if you don't want any VAT related to this Tax Code to appear on invoices"
msgid ""
"Check this box if you don't want any VAT related to this Tax Code to appear "
"on invoices"
msgstr ""
#. module: account
@@ -3591,7 +3671,9 @@ msgstr ""
#. module: account
#: help:account.account,check_history:0
msgid "Check this box if you want to print all entries when printing the General Ledger, otherwise it will only print its balance."
msgid ""
"Check this box if you want to print all entries when printing the General "
"Ledger, otherwise it will only print its balance."
msgstr ""
#. module: account
@@ -3679,7 +3761,8 @@ msgstr ""
#. module: account
#: model:ir.module.module,description:account.module_meta_information
msgid "Financial and accounting module that covers:\n"
msgid ""
"Financial and accounting module that covers:\n"
" General accounting\n"
" Cost / Analytic accounting\n"
" Third party accounting\n"
@@ -3713,7 +3796,9 @@ msgstr ""
#. module: account
#: help:account.automatic.reconcile,init,account_ids:0
msgid "If no account is specified, the reconciliation will be made using every accounts that can be reconcilied"
msgid ""
"If no account is specified, the reconciliation will be made using every "
"accounts that can be reconcilied"
msgstr ""
#. module: account
@@ -3753,7 +3838,9 @@ msgstr ""
#. module: account
#: help:product.template,property_account_expense:0
msgid "This account will be used instead of the default one to value outgoing stock for the current product"
msgid ""
"This account will be used instead of the default one to value outgoing stock "
"for the current product"
msgstr ""
#. module: account
@@ -3797,7 +3884,10 @@ msgstr ""
#. module: account
#: help:account.analytic.journal,type:0
msgid "Gives the type of the analytic journal. When a document (eg: an invoice) needs to create analytic entries, Open ERP will look for a matching journal of the same type."
msgid ""
"Gives the type of the analytic journal. When a document (eg: an invoice) "
"needs to create analytic entries, Open ERP will look for a matching journal "
"of the same type."
msgstr ""
#. module: account
@@ -3889,7 +3979,9 @@ msgstr ""
#. module: account
#: help:account.tax.template,child_depend:0
msgid "Indicate if the tax computation is based on the value computed for the computation of child taxes or based on the total amount."
msgid ""
"Indicate if the tax computation is based on the value computed for the "
"computation of child taxes or based on the total amount."
msgstr ""
#. module: account
@@ -3937,7 +4029,9 @@ msgstr ""
#. module: account
#: help:account.move.line,quantity:0
msgid "The optional quantity expressed by this line, eg: number of product sold. The quantity is not a legal requirement but is very usefull for some reports."
msgid ""
"The optional quantity expressed by this line, eg: number of product sold. "
"The quantity is not a legal requirement but is very usefull for some reports."
msgstr ""
#. module: account
@@ -3947,7 +4041,9 @@ msgstr ""
#. module: account
#: help:account.move.line,blocked:0
msgid "You can check this box to mark the entry line as a litigation with the associated partner"
msgid ""
"You can check this box to mark the entry line as a litigation with the "
"associated partner"
msgstr ""
#. module: account
@@ -4058,12 +4154,16 @@ msgstr ""
#. module: account
#: constraint:ir.model:0
msgid "The Object name must start with x_ and not contain any special character !"
msgid ""
"The Object name must start with x_ and not contain any special character !"
msgstr ""
#. module: account
#: help:account.account.type,sign:0
msgid "Allows you to change the sign of the balance amount displayed in the reports, so that you can see positive figures instead of negative ones in expenses accounts."
msgid ""
"Allows you to change the sign of the balance amount displayed in the "
"reports, so that you can see positive figures instead of negative ones in "
"expenses accounts."
msgstr ""
#. module: account
@@ -4073,7 +4173,9 @@ msgstr ""
#. module: account
#: help:account.move.line,date_maturity:0
msgid "This field is used for payable and receivable entries. You can put the limit date for the payment of this entry line."
msgid ""
"This field is used for payable and receivable entries. You can put the limit "
"date for the payment of this entry line."
msgstr ""
#. module: account
@@ -4258,7 +4360,10 @@ msgstr ""
#. module: account
#: help:account.tax,sequence:0
msgid "The sequence field is used to order the tax lines from the lowest sequences to the higher ones. The order is important if you have a tax with several tax children. In this case, the evaluation order is important."
msgid ""
"The sequence field is used to order the tax lines from the lowest sequences "
"to the higher ones. The order is important if you have a tax with several "
"tax children. In this case, the evaluation order is important."
msgstr ""
#. module: account
@@ -4431,7 +4536,9 @@ msgstr ""
#. module: account
#: view:wizard.multi.charts.accounts:0
msgid "This will automatically configure your chart of accounts, bank accounts, taxes and journals according to the selected template"
msgid ""
"This will automatically configure your chart of accounts, bank accounts, "
"taxes and journals according to the selected template"
msgstr ""
#. module: account
@@ -4506,7 +4613,9 @@ msgstr ""
#. module: account
#: help:account.tax,include_base_amount:0
msgid "Indicate if the amount of tax must be included in the base amount for the computation of the next taxes"
msgid ""
"Indicate if the amount of tax must be included in the base amount for the "
"computation of the next taxes"
msgstr ""
#. module: account
@@ -4600,7 +4709,10 @@ msgstr ""
#. module: account
#: help:account.journal,centralisation:0
msgid "Check this box to determine that each entry of this journal won't create a new counterpart but will share the same counterpart. This is used in fiscal year closing."
msgid ""
"Check this box to determine that each entry of this journal won't create a "
"new counterpart but will share the same counterpart. This is used in fiscal "
"year closing."
msgstr ""
#. module: account
@@ -4733,7 +4845,9 @@ msgstr ""
#. module: account
#: help:account.tax,domain:0
#: help:account.tax.template,domain:0
msgid "This field is only used if you develop your own module allowing developers to create specific taxes in a custom domain."
msgid ""
"This field is only used if you develop your own module allowing developers "
"to create specific taxes in a custom domain."
msgstr ""
#. module: account
@@ -4938,7 +5052,9 @@ msgstr ""
#. module: account
#: help:wizard.multi.charts.accounts,seq_journal:0
msgid "Check this box if you want to use a different sequence for each created journal. Otherwise, all will use the same sequence."
msgid ""
"Check this box if you want to use a different sequence for each created "
"journal. Otherwise, all will use the same sequence."
msgstr ""
#. module: account
@@ -5226,7 +5342,10 @@ msgstr ""
#. module: account
#: help:account.move.line,tax_amount:0
msgid "If the Tax account is tax code account, this field will contain the taxed amount.If the tax account is base tax code, this field will contain the basic amount(without tax)."
msgid ""
"If the Tax account is tax code account, this field will contain the taxed "
"amount.If the tax account is base tax code, this field "
"will contain the basic amount(without tax)."
msgstr ""
#. module: account
@@ -5334,7 +5453,9 @@ msgstr ""
#. module: account
#: constraint:account.period:0
msgid "Invalid period ! Some periods overlap or the date period is not in the scope of the fiscal year. "
msgid ""
"Invalid period ! Some periods overlap or the date period is not in the scope "
"of the fiscal year. "
msgstr ""
#. module: account
@@ -5353,7 +5474,10 @@ msgstr ""
#. module: account
#: help:populate_statement_from_inv,init,journal_id:0
msgid "This field allow you to choose the accounting journals you want for filtering the invoices. If you left this field empty, it will search on all sale, purchase and cash journals."
msgid ""
"This field allow you to choose the accounting journals you want for "
"filtering the invoices. If you left this field empty, it will search on all "
"sale, purchase and cash journals."
msgstr ""
#. module: account
@@ -5491,7 +5615,9 @@ msgstr ""
#. module: account
#: help:product.template,property_account_income:0
msgid "This account will be used instead of the default one to value incoming stock for the current product"
msgid ""
"This account will be used instead of the default one to value incoming stock "
"for the current product"
msgstr ""
#. module: account
@@ -5521,7 +5647,9 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_payable:0
msgid "This account will be used instead of the default one as the payable account for the current partner"
msgid ""
"This account will be used instead of the default one as the payable account "
"for the current partner"
msgstr ""
#. module: account
@@ -5691,7 +5819,9 @@ msgstr ""
#. module: account
#: help:product.category,property_account_expense_categ:0
msgid "This account will be used to value outgoing stock for the current product category"
msgid ""
"This account will be used to value outgoing stock for the current product "
"category"
msgstr ""
#. module: account
@@ -5767,7 +5897,9 @@ msgstr ""
#. module: account
#: help:account.tax,price_include:0
msgid "Check this if the price you use on the product and invoices includes this tax."
msgid ""
"Check this if the price you use on the product and invoices includes this "
"tax."
msgstr ""
#. module: account
@@ -5790,11 +5922,11 @@ msgstr ""
#. module: account
#: help:account.account,reconcile:0
msgid "Check this if the user is allowed to reconcile entries in this account."
msgid ""
"Check this if the user is allowed to reconcile entries in this account."
msgstr ""
#. module: account
#: wizard_button:account.subscription.generate,init,generate:0
msgid "Compute Entry Dates"
msgstr ""
addons/account/i18n/zh_HK.po
+5942
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/zh_TW.po
+191 -63
View File
@@ -4,16 +4,17 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 15:30:43+0000\n"
"PO-Revision-Date: 2009-08-28 15:30:43+0000\n"
"Last-Translator: <>\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2009-09-16 17:14+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2009-11-17 05:00+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
#: field:account.tax.template,description:0
@@ -68,7 +69,9 @@ msgstr ""
#. module: account
#: help:product.category,property_account_income_categ:0
msgid "This account will be used to value incoming stock for the current product category"
msgid ""
"This account will be used to value incoming stock for the current product "
"category"
msgstr ""
#. module: account
@@ -160,7 +163,10 @@ msgstr ""
#. module: account
#: help:account.payment.term.line,days2:0
msgid "Day of the month, set -1 for the last day of the current month. If it's positive, it gives the day of the next month. Set 0 for net days (otherwise it's based on the beginning of the month)."
msgid ""
"Day of the month, set -1 for the last day of the current month. If it's "
"positive, it gives the day of the next month. Set 0 for net days (otherwise "
"it's based on the beginning of the month)."
msgstr ""
#. module: account
@@ -255,13 +261,21 @@ msgstr ""
#. module: account
#: help:account.journal,view_id:0
msgid "Gives the view used when writing or browsing entries in this journal. The view tell Open ERP which fields should be visible, required or readonly and in which order. You can create your own view for a faster encoding in each journal."
msgid ""
"Gives the view used when writing or browsing entries in this journal. The "
"view tell Open ERP which fields should be visible, required or readonly and "
"in which order. You can create your own view for a faster encoding in each "
"journal."
msgstr ""
#. module: account
#: help:account.invoice,date_due:0
#: help:account.invoice,payment_term:0
msgid "If you use payment terms, the due date will be computed automatically at the generation of accounting entries. If you keep the payment term and the due date empty, it means direct payment. The payment term may compute several due dates, for example 50% now, 50% in one month."
msgid ""
"If you use payment terms, the due date will be computed automatically at the "
"generation of accounting entries. If you keep the payment term and the due "
"date empty, it means direct payment. The payment term may compute several "
"due dates, for example 50% now, 50% in one month."
msgstr ""
#. module: account
@@ -468,7 +482,9 @@ msgstr ""
#. module: account
#: help:account.tax.template,include_base_amount:0
msgid "Set if the amount of tax must be included in the base amount before computing the next taxes."
msgid ""
"Set if the amount of tax must be included in the base amount before "
"computing the next taxes."
msgstr ""
#. module: account
@@ -548,7 +564,9 @@ msgstr ""
#. module: account
#: help:account.payment.term.line,days:0
msgid "Number of days to add before computation of the day of month.If Date=15/01, Number of Days=22, Day of Month=-1, then the due date is 28/02."
msgid ""
"Number of days to add before computation of the day of month.If Date=15/01, "
"Number of Days=22, Day of Month=-1, then the due date is 28/02."
msgstr ""
#. module: account
@@ -579,7 +597,9 @@ msgstr ""
#. module: account
#: help:account.model.line,sequence:0
msgid "The sequence field is used to order the resources from lower sequences to higher ones"
msgid ""
"The sequence field is used to order the resources from lower sequences to "
"higher ones"
msgstr ""
#. module: account
@@ -798,7 +818,9 @@ msgstr ""
#. module: account
#: help:account.account.template,user_type:0
msgid "These types are defined according to your country. The type contain more information about the account and it's specificities."
msgid ""
"These types are defined according to your country. The type contain more "
"information about the account and it's specificities."
msgstr ""
#. module: account
@@ -880,7 +902,9 @@ msgstr ""
#. module: account
#: help:account.tax,tax_group:0
msgid "If a default tax is given in the partner it only overrides taxes from accounts (or products) in the same group."
msgid ""
"If a default tax is given in the partner it only overrides taxes from "
"accounts (or products) in the same group."
msgstr ""
#. module: account
@@ -1051,7 +1075,9 @@ msgstr ""
#. module: account
#: help:account.payment.term.line,sequence:0
msgid "The sequence field is used to order the payment term lines from the lowest sequences to the higher ones"
msgid ""
"The sequence field is used to order the payment term lines from the lowest "
"sequences to the higher ones"
msgstr ""
#. module: account
@@ -1175,7 +1201,12 @@ msgstr ""
#. module: account
#: help:account.account,currency_mode:0
msgid "This will select how the current currency rate for outgoing transactions is computed. In most countries the legal method is \"average\" but only a few software systems are able to manage this. So if you import from another software system you may have to use the rate at date. Incoming transactions always use the rate at date."
msgid ""
"This will select how the current currency rate for outgoing transactions is "
"computed. In most countries the legal method is \"average\" but only a few "
"software systems are able to manage this. So if you import from another "
"software system you may have to use the rate at date. Incoming transactions "
"always use the rate at date."
msgstr ""
#. module: account
@@ -1331,7 +1362,9 @@ msgstr ""
#. module: account
#: wizard_view:account.move.line.unreconcile,init:0
#: wizard_view:account.reconcile.unreconcile,init:0
msgid "If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable"
msgid ""
"If you unreconciliate transactions, you must also verify all the actions "
"that are linked to those transactions because they will not be disable"
msgstr ""
#. module: account
@@ -1425,7 +1458,8 @@ msgstr ""
#. module: account
#: help:account.invoice,partner_bank:0
msgid "The partner bank account to pay\n"
msgid ""
"The partner bank account to pay\n"
"Keep empty to use the default"
msgstr ""
@@ -1759,7 +1793,9 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_position:0
msgid "The fiscal position will determine taxes and the accounts used for the the partner."
msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"partner."
msgstr ""
#. module: account
@@ -1977,7 +2013,10 @@ msgstr ""
#. module: account
#: help:account.journal,entry_posted:0
msgid "Check this box if you don't want new account moves to pass through the 'draft' state and instead goes directly to the 'posted state' without any manual validation."
msgid ""
"Check this box if you don't want new account moves to pass through the "
"'draft' state and instead goes directly to the 'posted state' without any "
"manual validation."
msgstr ""
#. module: account
@@ -1994,7 +2033,9 @@ msgstr ""
#. module: account
#: help:account.invoice,number:0
msgid "Unique number of the invoice, computed automatically when the invoice is created."
msgid ""
"Unique number of the invoice, computed automatically when the invoice is "
"created."
msgstr ""
#. module: account
@@ -2161,7 +2202,10 @@ msgstr ""
#. module: account
#: rml:account.overdue:0
msgid "Exception made of a mistake of our side, it seems that the following bills stay unpaid. Please, take appropriate measures in order to carry out this payment in the next 8 days."
msgid ""
"Exception made of a mistake of our side, it seems that the following bills "
"stay unpaid. Please, take appropriate measures in order to carry out this "
"payment in the next 8 days."
msgstr ""
#. module: account
@@ -2340,7 +2384,9 @@ msgstr ""
#. module: account
#: help:account.tax,child_depend:0
msgid "Set if the tax computation is based on the computation of child taxes rather than on the total amount."
msgid ""
"Set if the tax computation is based on the computation of child taxes rather "
"than on the total amount."
msgstr ""
#. module: account
@@ -2350,7 +2396,9 @@ msgstr ""
#. module: account
#: help:account.tax,applicable_type:0
msgid "If not applicable (computed through a Python code), the tax won't appear on the invoice."
msgid ""
"If not applicable (computed through a Python code), the tax won't appear on "
"the invoice."
msgstr ""
#. module: account
@@ -2552,7 +2600,8 @@ msgstr ""
#. module: account
#: help:account.account.template,reconcile:0
msgid "Check this option if you want the user to reconcile entries in this account."
msgid ""
"Check this option if you want the user to reconcile entries in this account."
msgstr ""
#. module: account
@@ -2590,7 +2639,12 @@ msgstr ""
#. module: account
#: help:account.account.template,type:0
msgid "This type is used to differenciate types with special effects in Open ERP: view can not have entries, consolidation are accounts that can have children accounts for multi-company consolidations, payable/receivable are for partners accounts (for debit/credit computations), closed for deprecated accounts."
msgid ""
"This type is used to differenciate types with special effects in Open ERP: "
"view can not have entries, consolidation are accounts that can have children "
"accounts for multi-company consolidations, payable/receivable are for "
"partners accounts (for debit/credit computations), closed for deprecated "
"accounts."
msgstr ""
#. module: account
@@ -2730,7 +2784,10 @@ msgstr "日期"
#. module: account
#: help:account.tax.template,sequence:0
msgid "The sequence field is used to order the taxes lines from lower sequences to higher ones. The order is important if you have a tax that has several tax children. In this case, the evaluation order is important."
msgid ""
"The sequence field is used to order the taxes lines from lower sequences to "
"higher ones. The order is important if you have a tax that has several tax "
"children. In this case, the evaluation order is important."
msgstr ""
#. module: account
@@ -2941,7 +2998,10 @@ msgstr ""
#. module: account
#: help:account.model.line,date_maturity:0
msgid "The maturity date of the generated entries for this model. You can chosse between the date of the creation action or the the date of the creation of the entries plus the partner payment terms."
msgid ""
"The maturity date of the generated entries for this model. You can chosse "
"between the date of the creation action or the the date of the creation of "
"the entries plus the partner payment terms."
msgstr ""
#. module: account
@@ -2973,7 +3033,9 @@ msgstr ""
#. module: account
#: help:account.journal,group_invoice_lines:0
msgid "If this box is checked, the system will try to group the accounting lines when generating them from invoices."
msgid ""
"If this box is checked, the system will try to group the accounting lines "
"when generating them from invoices."
msgstr ""
#. module: account
@@ -3120,7 +3182,9 @@ msgstr ""
#. module: account
#: help:account.invoice,reconciled:0
msgid "The account moves of the invoice have been reconciled with account moves of the payment(s)."
msgid ""
"The account moves of the invoice have been reconciled with account moves of "
"the payment(s)."
msgstr ""
#. module: account
@@ -3287,7 +3351,9 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_receivable:0
msgid "This account will be used instead of the default one as the receivable account for the current partner"
msgid ""
"This account will be used instead of the default one as the receivable "
"account for the current partner"
msgstr ""
#. module: account
@@ -3314,7 +3380,9 @@ msgstr ""
#. module: account
#: help:account.tax.template,tax_group:0
msgid "If a default tax if given in the partner it only override taxes from account (or product) of the same group."
msgid ""
"If a default tax if given in the partner it only override taxes from account "
"(or product) of the same group."
msgstr ""
#. module: account
@@ -3352,7 +3420,9 @@ msgstr ""
#. module: account
#: wizard_view:account.move.validate,init:0
msgid "All draft account entries in this journal and period will be validated. It means you won't be able to modify their accouting fields."
msgid ""
"All draft account entries in this journal and period will be validated. It "
"means you won't be able to modify their accouting fields."
msgstr ""
#. module: account
@@ -3363,7 +3433,9 @@ msgstr ""
#. module: account
#: help:account.move.line,amount_currency:0
msgid "The amount expressed in an optional other currency if it is a multi-currency entry."
msgid ""
"The amount expressed in an optional other currency if it is a multi-currency "
"entry."
msgstr ""
#. module: account
@@ -3520,7 +3592,9 @@ msgstr ""
#. module: account
#: help:res.partner,property_payment_term:0
msgid "This payment term will be used instead of the default one for the current partner"
msgid ""
"This payment term will be used instead of the default one for the current "
"partner"
msgstr ""
#. module: account
@@ -3537,7 +3611,9 @@ msgstr ""
#. module: account
#: help:account.tax.code,notprintable:0
#: help:account.tax.code.template,notprintable:0
msgid "Check this box if you don't want any VAT related to this Tax Code to appear on invoices"
msgid ""
"Check this box if you don't want any VAT related to this Tax Code to appear "
"on invoices"
msgstr ""
#. module: account
@@ -3591,7 +3667,9 @@ msgstr ""
#. module: account
#: help:account.account,check_history:0
msgid "Check this box if you want to print all entries when printing the General Ledger, otherwise it will only print its balance."
msgid ""
"Check this box if you want to print all entries when printing the General "
"Ledger, otherwise it will only print its balance."
msgstr ""
#. module: account
@@ -3679,7 +3757,8 @@ msgstr ""
#. module: account
#: model:ir.module.module,description:account.module_meta_information
msgid "Financial and accounting module that covers:\n"
msgid ""
"Financial and accounting module that covers:\n"
" General accounting\n"
" Cost / Analytic accounting\n"
" Third party accounting\n"
@@ -3713,7 +3792,9 @@ msgstr ""
#. module: account
#: help:account.automatic.reconcile,init,account_ids:0
msgid "If no account is specified, the reconciliation will be made using every accounts that can be reconcilied"
msgid ""
"If no account is specified, the reconciliation will be made using every "
"accounts that can be reconcilied"
msgstr ""
#. module: account
@@ -3753,7 +3834,9 @@ msgstr ""
#. module: account
#: help:product.template,property_account_expense:0
msgid "This account will be used instead of the default one to value outgoing stock for the current product"
msgid ""
"This account will be used instead of the default one to value outgoing stock "
"for the current product"
msgstr ""
#. module: account
@@ -3797,7 +3880,10 @@ msgstr ""
#. module: account
#: help:account.analytic.journal,type:0
msgid "Gives the type of the analytic journal. When a document (eg: an invoice) needs to create analytic entries, Open ERP will look for a matching journal of the same type."
msgid ""
"Gives the type of the analytic journal. When a document (eg: an invoice) "
"needs to create analytic entries, Open ERP will look for a matching journal "
"of the same type."
msgstr ""
#. module: account
@@ -3889,7 +3975,9 @@ msgstr ""
#. module: account
#: help:account.tax.template,child_depend:0
msgid "Indicate if the tax computation is based on the value computed for the computation of child taxes or based on the total amount."
msgid ""
"Indicate if the tax computation is based on the value computed for the "
"computation of child taxes or based on the total amount."
msgstr ""
#. module: account
@@ -3937,7 +4025,9 @@ msgstr ""
#. module: account
#: help:account.move.line,quantity:0
msgid "The optional quantity expressed by this line, eg: number of product sold. The quantity is not a legal requirement but is very usefull for some reports."
msgid ""
"The optional quantity expressed by this line, eg: number of product sold. "
"The quantity is not a legal requirement but is very usefull for some reports."
msgstr ""
#. module: account
@@ -3947,7 +4037,9 @@ msgstr ""
#. module: account
#: help:account.move.line,blocked:0
msgid "You can check this box to mark the entry line as a litigation with the associated partner"
msgid ""
"You can check this box to mark the entry line as a litigation with the "
"associated partner"
msgstr ""
#. module: account
@@ -4058,12 +4150,16 @@ msgstr ""
#. module: account
#: constraint:ir.model:0
msgid "The Object name must start with x_ and not contain any special character !"
msgid ""
"The Object name must start with x_ and not contain any special character !"
msgstr ""
#. module: account
#: help:account.account.type,sign:0
msgid "Allows you to change the sign of the balance amount displayed in the reports, so that you can see positive figures instead of negative ones in expenses accounts."
msgid ""
"Allows you to change the sign of the balance amount displayed in the "
"reports, so that you can see positive figures instead of negative ones in "
"expenses accounts."
msgstr ""
#. module: account
@@ -4073,7 +4169,9 @@ msgstr ""
#. module: account
#: help:account.move.line,date_maturity:0
msgid "This field is used for payable and receivable entries. You can put the limit date for the payment of this entry line."
msgid ""
"This field is used for payable and receivable entries. You can put the limit "
"date for the payment of this entry line."
msgstr ""
#. module: account
@@ -4258,7 +4356,10 @@ msgstr ""
#. module: account
#: help:account.tax,sequence:0
msgid "The sequence field is used to order the tax lines from the lowest sequences to the higher ones. The order is important if you have a tax with several tax children. In this case, the evaluation order is important."
msgid ""
"The sequence field is used to order the tax lines from the lowest sequences "
"to the higher ones. The order is important if you have a tax with several "
"tax children. In this case, the evaluation order is important."
msgstr ""
#. module: account
@@ -4431,7 +4532,9 @@ msgstr ""
#. module: account
#: view:wizard.multi.charts.accounts:0
msgid "This will automatically configure your chart of accounts, bank accounts, taxes and journals according to the selected template"
msgid ""
"This will automatically configure your chart of accounts, bank accounts, "
"taxes and journals according to the selected template"
msgstr ""
#. module: account
@@ -4506,7 +4609,9 @@ msgstr ""
#. module: account
#: help:account.tax,include_base_amount:0
msgid "Indicate if the amount of tax must be included in the base amount for the computation of the next taxes"
msgid ""
"Indicate if the amount of tax must be included in the base amount for the "
"computation of the next taxes"
msgstr ""
#. module: account
@@ -4600,7 +4705,10 @@ msgstr ""
#. module: account
#: help:account.journal,centralisation:0
msgid "Check this box to determine that each entry of this journal won't create a new counterpart but will share the same counterpart. This is used in fiscal year closing."
msgid ""
"Check this box to determine that each entry of this journal won't create a "
"new counterpart but will share the same counterpart. This is used in fiscal "
"year closing."
msgstr ""
#. module: account
@@ -4733,7 +4841,9 @@ msgstr ""
#. module: account
#: help:account.tax,domain:0
#: help:account.tax.template,domain:0
msgid "This field is only used if you develop your own module allowing developers to create specific taxes in a custom domain."
msgid ""
"This field is only used if you develop your own module allowing developers "
"to create specific taxes in a custom domain."
msgstr ""
#. module: account
@@ -4938,7 +5048,9 @@ msgstr ""
#. module: account
#: help:wizard.multi.charts.accounts,seq_journal:0
msgid "Check this box if you want to use a different sequence for each created journal. Otherwise, all will use the same sequence."
msgid ""
"Check this box if you want to use a different sequence for each created "
"journal. Otherwise, all will use the same sequence."
msgstr ""
#. module: account
@@ -5226,7 +5338,10 @@ msgstr ""
#. module: account
#: help:account.move.line,tax_amount:0
msgid "If the Tax account is tax code account, this field will contain the taxed amount.If the tax account is base tax code, this field will contain the basic amount(without tax)."
msgid ""
"If the Tax account is tax code account, this field will contain the taxed "
"amount.If the tax account is base tax code, this field "
"will contain the basic amount(without tax)."
msgstr ""
#. module: account
@@ -5334,7 +5449,9 @@ msgstr ""
#. module: account
#: constraint:account.period:0
msgid "Invalid period ! Some periods overlap or the date period is not in the scope of the fiscal year. "
msgid ""
"Invalid period ! Some periods overlap or the date period is not in the scope "
"of the fiscal year. "
msgstr ""
#. module: account
@@ -5353,7 +5470,10 @@ msgstr ""
#. module: account
#: help:populate_statement_from_inv,init,journal_id:0
msgid "This field allow you to choose the accounting journals you want for filtering the invoices. If you left this field empty, it will search on all sale, purchase and cash journals."
msgid ""
"This field allow you to choose the accounting journals you want for "
"filtering the invoices. If you left this field empty, it will search on all "
"sale, purchase and cash journals."
msgstr ""
#. module: account
@@ -5491,7 +5611,9 @@ msgstr ""
#. module: account
#: help:product.template,property_account_income:0
msgid "This account will be used instead of the default one to value incoming stock for the current product"
msgid ""
"This account will be used instead of the default one to value incoming stock "
"for the current product"
msgstr ""
#. module: account
@@ -5521,7 +5643,9 @@ msgstr ""
#. module: account
#: help:res.partner,property_account_payable:0
msgid "This account will be used instead of the default one as the payable account for the current partner"
msgid ""
"This account will be used instead of the default one as the payable account "
"for the current partner"
msgstr ""
#. module: account
@@ -5691,7 +5815,9 @@ msgstr ""
#. module: account
#: help:product.category,property_account_expense_categ:0
msgid "This account will be used to value outgoing stock for the current product category"
msgid ""
"This account will be used to value outgoing stock for the current product "
"category"
msgstr ""
#. module: account
@@ -5767,7 +5893,9 @@ msgstr ""
#. module: account
#: help:account.tax,price_include:0
msgid "Check this if the price you use on the product and invoices includes this tax."
msgid ""
"Check this if the price you use on the product and invoices includes this "
"tax."
msgstr ""
#. module: account
@@ -5790,11 +5918,11 @@ msgstr ""
#. module: account
#: help:account.account,reconcile:0
msgid "Check this if the user is allowed to reconcile entries in this account."
msgid ""
"Check this if the user is allowed to reconcile entries in this account."
msgstr ""
#. module: account
#: wizard_button:account.subscription.generate,init,generate:0
msgid "Compute Entry Dates"
msgstr ""
addons/account/invoice.py
+56 -10
View File
@@ -102,15 +102,44 @@ class account_invoice(osv.osv):
def _amount_residual(self, cr, uid, ids, name, args, context=None):
res = {}
data_inv = self.browse(cr, uid, ids)
cur_obj = self.pool.get('res.currency')
for inv in data_inv:
paid_amt = 0.0
to_pay = inv.amount_total
debit = credit = 0.0
context.update({'date':inv.date_invoice})
context_unreconciled=context.copy()
for lines in inv.move_lines:
if lines.amount_currency and lines.currency_id:
paid_amt += lines.amount_currency
debit_tmp = lines.debit
credit_tmp = lines.credit
# If currency conversion needed
if inv.company_id.currency_id.id <> inv.currency_id.id:
# If invoice paid, compute currency amount according to invoice date
# otherwise, take the line date
if not inv.reconciled:
context.update({'date':lines.date})
context_unreconciled.update({'date':lines.date})
# If amount currency setted, compute for debit and credit in company currency
if lines.amount_currency < 0:
credit_tmp=abs(cur_obj.compute(cr, uid, lines.currency_id.id, inv.company_id.currency_id.id, lines.amount_currency, round=False,context=context_unreconciled))
elif lines.amount_currency > 0:
debit_tmp=abs(cur_obj.compute(cr, uid, lines.currency_id.id, inv.company_id.currency_id.id, lines.amount_currency, round=False,context=context_unreconciled))
# Then, recomput into invoice currency to avoid rounding trouble !
debit += cur_obj.compute(cr, uid, inv.company_id.currency_id.id, inv.currency_id.id, debit_tmp, round=False,context=context)
credit += cur_obj.compute(cr, uid, inv.company_id.currency_id.id, inv.currency_id.id, credit_tmp, round=False,context=context)
else:
paid_amt += lines.credit + lines.debit
res[inv.id] = round(to_pay - abs(paid_amt),int(config['price_accuracy']))
debit+=debit_tmp
credit+=credit_tmp
if not inv.amount_total:
result = 0.0
elif inv.type in ('out_invoice','in_refund'):
amount = credit-debit
result = inv.amount_total - amount
else:
amount = debit-credit
result = inv.amount_total - amount
# Use is_zero function to avoid rounding trouble => should be fixed into ORM
res[inv.id] = not self.pool.get('res.currency').is_zero(cr, uid, inv.company_id.currency_id,result) and result or 0.0
return res
def _get_lines(self, cr, uid, ids, name, arg, context=None):
@@ -860,6 +889,16 @@ class account_invoice(osv.osv):
date=context['date_p']
else:
date=time.strftime('%Y-%m-%d')
# Take the amount in currency and the currency of the payment
if 'amount_currency' in context and context['amount_currency'] and 'currency_id' in context and context['currency_id']:
amount_currency = context['amount_currency']
currency_id = context['currency_id']
else:
amount_currency = False
currency_id = False
# Pay attention to the sign for both debit/credit AND amount_currency
l1 = {
'debit': direction * pay_amount>0 and direction * pay_amount,
'credit': direction * pay_amount<0 and - direction * pay_amount,
@@ -867,6 +906,8 @@ class account_invoice(osv.osv):
'partner_id': invoice.partner_id.id,
'ref':invoice.number,
'date': date,
'currency_id':currency_id,
'amount_currency':amount_currency and direction * amount_currency or 0.0,
}
l2 = {
'debit': direction * pay_amount<0 and - direction * pay_amount,
@@ -875,6 +916,8 @@ class account_invoice(osv.osv):
'partner_id': invoice.partner_id.id,
'ref':invoice.number,
'date': date,
'currency_id':currency_id,
'amount_currency':amount_currency and - direction * amount_currency or 0.0,
}
if not name:
@@ -1109,24 +1152,27 @@ class account_invoice_tax(osv.osv):
'tax_code_id': fields.many2one('account.tax.code', 'Tax Code', help="The tax basis of the tax declaration."),
'tax_amount': fields.float('Tax Code Amount', digits=(16,int(config['price_accuracy']))),
}
def base_change(self, cr, uid, ids, base,currency_id=False,company_id=False,date_invoice=False):
cur_obj = self.pool.get('res.currency')
company_obj = self.pool.get('res.company')
company_currency=False
if company_id:
company_currency=company_obj.browse(cr,uid,company_id).id
company_currency = company_obj.read(cr,uid,[company_id],['currency_id'])[0]['currency_id'][0]
if currency_id and company_currency:
base=cur_obj.compute(cr, uid, currency_id, company_currency, base, context={'date': date_invoice or time.strftime('%Y-%m-%d')}, round=False)
base = cur_obj.compute(cr, uid, currency_id, company_currency, base, context={'date': date_invoice or time.strftime('%Y-%m-%d')}, round=False)
return {'value': {'base_amount':base}}
def amount_change(self, cr, uid, ids, amount,currency_id=False,company_id=False,date_invoice=False):
cur_obj = self.pool.get('res.currency')
company_obj = self.pool.get('res.company')
company_currency=False
if company_id:
company_currency=company_obj.browse(cr,uid,company_id).id
company_currency = company_obj.read(cr,uid,[company_id],['currency_id'])[0]['currency_id'][0]
if currency_id and company_currency:
amount=cur_obj.compute(cr, uid, currency_id, company_currency, amount, context={'date': date_invoice or time.strftime('%Y-%m-%d')}, round=False)
amount = cur_obj.compute(cr, uid, currency_id, company_currency, amount, context={'date': date_invoice or time.strftime('%Y-%m-%d')}, round=False)
return {'value': {'tax_amount':amount}}
_order = 'sequence'
_defaults = {
'manual': lambda *a: 1,
addons/account/project/project.py
+23 -4
View File
@@ -65,9 +65,16 @@ class account_analytic_account(osv.osv):
return r
def _balance_calc(self, cr, uid, ids, name, arg, context={}):
res = {}
ids2 = self.search(cr, uid, [('parent_id', 'child_of', ids)])
acc_set = ",".join(map(str, ids2))
for i in ids:
res.setdefault(i,0.0)
if not acc_set:
return res
where_date = ''
if context.get('from_date',False):
where_date += " AND l.date >= '" + context['from_date'] + "'"
@@ -75,7 +82,7 @@ class account_analytic_account(osv.osv):
where_date += " AND l.date <= '" + context['to_date'] + "'"
cr.execute("SELECT a.id, COALESCE(SUM(l.amount),0) FROM account_analytic_account a LEFT JOIN account_analytic_line l ON (a.id=l.account_id %s) WHERE a.id IN (%s) GROUP BY a.id" % (where_date,acc_set))
res = {}
for account_id, sum in cr.fetchall():
res[account_id] = sum
@@ -85,10 +92,12 @@ class account_analytic_account(osv.osv):
res_currency= self.pool.get('res.currency')
for id in ids:
if id not in ids2:
continue
for child in self.search(cr, uid, [('parent_id', 'child_of', [id])]):
if child <> id:
res.setdefault(id, 0.0)
if currency[child]<>currency[id] :
if currency[child]<>currency[id]:
res[id] += res_currency.compute(cr, uid, currency[child], currency[id], res.get(child, 0.0), context=context)
else:
res[id] += res.get(child, 0.0)
@@ -96,15 +105,23 @@ class account_analytic_account(osv.osv):
cur_obj = res_currency.browse(cr,uid,currency.values(),context)
cur_obj = dict([(o.id, o) for o in cur_obj])
for id in ids:
res[id] = res_currency.round(cr,uid,cur_obj[currency[id]],res.get(id,0.0))
if id in ids2:
res[id] = res_currency.round(cr,uid,cur_obj[currency[id]],res.get(id,0.0))
return dict([(i, res[i]) for i in ids ])
def _quantity_calc(self, cr, uid, ids, name, arg, context={}):
#XXX must convert into one uom
res = {}
ids2 = self.search(cr, uid, [('parent_id', 'child_of', ids)])
acc_set = ",".join(map(str, ids2))
for i in ids:
res.setdefault(i,0.0)
if not acc_set:
return res
where_date = ''
if context.get('from_date',False):
where_date += " AND l.date >= '" + context['from_date'] + "'"
@@ -115,11 +132,13 @@ class account_analytic_account(osv.osv):
FROM account_analytic_account a \
LEFT JOIN account_analytic_line l ON (a.id = l.account_id ' + where_date + ') \
WHERE a.id IN ('+acc_set+') GROUP BY a.id')
res = {}
for account_id, sum in cr.fetchall():
res[account_id] = sum
for id in ids:
if id not in ids2:
continue
for child in self.search(cr, uid, [('parent_id', 'child_of', [id])]):
if child <> id:
res.setdefault(id, 0.0)
addons/account/project/project_view.xml
+1 -1
View File
@@ -189,7 +189,7 @@
<record id="action_account_tree1" model="ir.actions.act_window">
<field name="name"></field>
<field name="name">Analytic Entries</field>
<field name="res_model">account.analytic.line</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
addons/account/project/report/account_journal.py
+1 -1
View File
@@ -36,7 +36,7 @@ class journal_print(report_sxw.rml_parse):
self.cr.execute('select sum(amount) from account_analytic_line where journal_id=%s', (journal_id,))
return self.cr.fetchone()[0] or 0.0
def __init__(self, cr, uid, name, context):
super(journal_print, self).__init__(cr, uid, name, context)
super(journal_print, self).__init__(cr, uid, name, context=context)
self.localcontext = {
'time': time,
'lines': self.lines,
addons/account/project/report/analytic_balance.py
+1 -1
View File
@@ -26,7 +26,7 @@ from report import report_sxw
class account_analytic_balance(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):
super(account_analytic_balance, self).__init__(cr, uid, name, context)
super(account_analytic_balance, self).__init__(cr, uid, name, context=context)
self.localcontext.update( {
'time': time,
'get_objects': self._get_objects,
addons/account/project/report/analytic_check.py
+1 -1
View File
@@ -25,7 +25,7 @@ from report import report_sxw
class account_analytic_analytic_check(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):
super(account_analytic_analytic_check, self).__init__(cr, uid, name, context)
super(account_analytic_analytic_check, self).__init__(cr, uid, name, context=context)
self.sum_gen_deb = 0.0
self.sum_gen_cred = 0.0
self.sum_ana_deb = 0.0
addons/account/project/report/analytic_journal.py
+1 -1
View File
@@ -28,7 +28,7 @@ from report import report_sxw
#
class account_analytic_journal(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):
super(account_analytic_journal, self).__init__(cr, uid, name, context)
super(account_analytic_journal, self).__init__(cr, uid, name, context=context)
self.localcontext.update( {
'time': time,
'lines': self._lines,
addons/account/project/report/cost_ledger.py
+1 -1
View File
@@ -25,7 +25,7 @@ from report import report_sxw
class account_analytic_cost_ledger(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):
super(account_analytic_cost_ledger, self).__init__(cr, uid, name, context)
super(account_analytic_cost_ledger, self).__init__(cr, uid, name, context=context)
self.localcontext.update( {
'time': time,
'lines_g': self._lines_g,
addons/account/project/report/inverted_analytic_balance.py
+1 -1
View File
@@ -25,7 +25,7 @@ from report import report_sxw
class account_inverted_analytic_balance(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):
super(account_inverted_analytic_balance, self).__init__(cr, uid, name, context)
super(account_inverted_analytic_balance, self).__init__(cr, uid, name, context=context)
self.localcontext.update( {
'time': time,
'lines_g': self._lines_g,
addons/account/project/report/quantity_cost_ledger.py
+1 -2
View File
@@ -25,8 +25,7 @@ from report import report_sxw
class account_analytic_quantity_cost_ledger(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):
super(account_analytic_quantity_cost_ledger, self).__init__(cr, uid,
name, context)
super(account_analytic_quantity_cost_ledger, self).__init__(cr, uid, name, context=context)
self.localcontext.update( {
'time': time,
'lines_g': self._lines_g,
addons/account/report/account_balance.py
+1 -1
View File
@@ -29,7 +29,7 @@ from report import report_sxw
class account_balance(report_sxw.rml_parse):
_name = 'report.account.account.balance'
def __init__(self, cr, uid, name, context):
super(account_balance, self).__init__(cr, uid, name, context)
super(account_balance, self).__init__(cr, uid, name, context=context)
self.sum_debit = 0.00
self.sum_credit = 0.00
self.date_lst = []
addons/account/report/account_journal.py
+1 -1
View File
@@ -28,7 +28,7 @@ from report import report_sxw
#
class journal_print(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):
super(journal_print, self).__init__(cr, uid, name, context)
super(journal_print, self).__init__(cr, uid, name, context=context)
self.localcontext.update( {
'time': time,
'lines': self.lines,
addons/account/report/account_tax_code.py
+1 -1
View File
@@ -30,7 +30,7 @@ class account_tax_code_report(rml_parse.rml_parse):
#_name = 'report.account.tax.code.entries'
def __init__(self, cr, uid, name, context):
super(account_tax_code_report, self).__init__(cr, uid, name, context)
super(account_tax_code_report, self).__init__(cr, uid, name, context=context)
self.localcontext.update({
'time': time,
'get_line':self.get_line,
addons/account/report/aged_trial_balance.py
+1 -1
View File
@@ -27,7 +27,7 @@ from report import report_sxw
class aged_trial_report(rml_parse.rml_parse):
def __init__(self, cr, uid, name, context):
super(aged_trial_report, self).__init__(cr, uid, name, context)
super(aged_trial_report, self).__init__(cr, uid, name, context=context)
self.line_query = ''
self.total_account = []
addons/account/report/central_journal.py
+1 -1
View File
@@ -27,7 +27,7 @@ from report import report_sxw
#
class journal_print(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):
super(journal_print, self).__init__(cr, uid, name, context)
super(journal_print, self).__init__(cr, uid, name, context=context)
self.localcontext.update({
'time': time,
'lines': self.lines,
addons/account/report/general_journal.py
+1 -1
View File
@@ -28,7 +28,7 @@ from report import report_sxw
#
class journal_print(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):
super(journal_print, self).__init__(cr, uid, name, context)
super(journal_print, self).__init__(cr, uid, name, context=context)
self.localcontext.update( {
'time': time,
'lines': self.lines,
addons/account/report/general_ledger.py
+1 -1
View File
@@ -51,7 +51,7 @@ class general_ledger(rml_parse.rml_parse):
super(general_ledger, self).set_context(objects, data, new_ids, report_type)
def __init__(self, cr, uid, name, context):
super(general_ledger, self).__init__(cr, uid, name, context)
super(general_ledger, self).__init__(cr, uid, name, context=context)
self.date_borne = {}
self.query = ""
self.child_ids = ""

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