diff --git a/addons/account/__terp__.py b/addons/account/__terp__.py
index 3fabb495ba1..1fe6bd355bd 100644
--- a/addons/account/__terp__.py
+++ b/addons/account/__terp__.py
@@ -25,15 +25,19 @@
"version" : "1.1",
"depends" : ["product", "analytic", "process"],
"author" : "Tiny",
+ "category": 'Generic Modules/Accounting',
"description": """Financial and accounting module that covers:
- General accounting
+ General accountings
Cost / Analytic accounting
Third party accounting
Taxes management
Budgets
Customer and Supplier Invoices
Bank statements
- Account Balance Report
+
+The processes like maintaining of general ledger is done through the defined financial Journals (entry move line or
+grouping is maintained through journal) for a particular financial year and for preparation of vouchers there is a
+module named account_voucherss
""",
'website': 'http://www.openerp.com',
'init_xml': [],
@@ -42,7 +46,17 @@
'security/account_security.xml',
'security/ir.model.access.csv',
'account_menuitem.xml',
+ 'wizard/account_invoice_refund_view.xml',
+ 'wizard/account_period_close_view.xml',
+ 'wizard/account_fiscalyear_close_state.xml',
+ 'wizard/account_chart_view.xml',
+ 'wizard/account_move_bank_reconcile_view.xml',
+ 'wizard/account_move_line_reconcile_select_view.xml',
+ 'wizard/account_move_journal_view.xml',
'account_wizard.xml',
+ 'wizard/account_move_line_unreconcile_select_view.xml',
+ 'wizard/account_subscription_generate_view.xml',
+ 'project/wizard/project_account_analytic_line_view.xml',
'account_view.xml',
'account_end_fy.xml',
'account_invoice_view.xml',
diff --git a/addons/account/account.py b/addons/account/account.py
index 84e7e0c74c5..12868487c49 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -2182,6 +2182,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
#create all the tax code
children_tax_code_template = self.pool.get('account.tax.code.template').search(cr, uid, [('parent_id','child_of',[tax_code_root_id])], order='id')
+ children_tax_code_template.sort()
for tax_code_template in self.pool.get('account.tax.code.template').browse(cr, uid, children_tax_code_template):
vals={
'name': (tax_code_root_id == tax_code_template.id) and obj_multi.company_id.name or tax_code_template.name,
diff --git a/addons/account/account_analytic_line.py b/addons/account/account_analytic_line.py
index 18f63733ff6..c42597e785d 100644
--- a/addons/account/account_analytic_line.py
+++ b/addons/account/account_analytic_line.py
@@ -147,8 +147,9 @@ class account_analytic_line(osv.osv):
# Compute based on pricetype
pricetype=self.pool.get('product.price.type').browse(cr,uid,company_obj.browse(cr,uid,company_id).property_valuation_price_type.id)
+ # Take the company currency as the reference one
+ context['currency_id']=company_obj.browse(cr,uid,company_id).currency_id.id
amount_unit=prod.price_get(pricetype.field, context)[prod.id]
-
amount=amount_unit*unit_amount or 1.0
return {'value': {
'amount': - round(amount, 2),
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 4e042a77ca8..feeb38dd51b 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -144,20 +144,26 @@
-
+
-
+
+
+
+
+
+
+
-
-
+
+
-
+
@@ -200,19 +206,17 @@
+
+
-
-
-
-
diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml
index 260d14e38e8..37d539a4b25 100644
--- a/addons/account/account_menuitem.xml
+++ b/addons/account/account_menuitem.xml
@@ -24,3 +24,4 @@
+
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 0adc85a942e..07d8e1a02ac 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -278,7 +278,7 @@ class account_move_line(osv.osv):
data['amount_currency'] = v
return data
- def _on_create_write(self, cr, uid, id, context={}):
+ def on_create_write(self, cr, uid, id, context={}):
ml = self.browse(cr, uid, id, context)
return map(lambda x: x.id, ml.move_id.line_id)
@@ -733,7 +733,7 @@ class account_move_line(osv.osv):
state = ' colors="red:state==\'draft\'"'
#xml = '''\n\n\t''' % (title, state)
- xml = '''\n\n\t''' % (title, state)
+ xml = '''\n\n\t''' % (title, state)
fields = []
widths = {
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index d865823e9cd..88462098852 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -159,7 +159,7 @@
-
+
List of Accounts
account.account
@@ -668,9 +668,9 @@
-
+
@@ -681,7 +681,7 @@
tree
-
+
@@ -1007,9 +1007,9 @@
-
+
@@ -1079,8 +1079,14 @@
groups="group_account_user"/>
-
-
+
+
+
+
+
+
-
+
diff --git a/addons/account/account_wizard.xml b/addons/account/account_wizard.xml
index ebfed02eb3c..1597ec8898e 100644
--- a/addons/account/account_wizard.xml
+++ b/addons/account/account_wizard.xml
@@ -7,7 +7,14 @@
name="account.balance.account.balance.report"
keyword="client_print_multi"
id="wizard_account_balance_compare_report"/>
-
+
+
+
+
+
+
+
+
@@ -21,8 +28,9 @@
type="wizard"
sequence="1"/>
-
+
+
-
+
+
@@ -57,19 +72,24 @@
-
+
+
+
diff --git a/addons/account/i18n/ar.po b/addons/account/i18n/ar.po
index f12a778f019..05d04492af0 100644
--- a/addons/account/i18n/ar.po
+++ b/addons/account/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/bg.po b/addons/account/i18n/bg.po
index 909300df8ce..9a2a840dd23 100644
--- a/addons/account/i18n/bg.po
+++ b/addons/account/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/bs.po b/addons/account/i18n/bs.po
index 6e5d4506a5e..2b1c2ae8c8c 100644
--- a/addons/account/i18n/bs.po
+++ b/addons/account/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/ca.po b/addons/account/i18n/ca.po
index 12c56d998ce..40039ff8925 100644
--- a/addons/account/i18n/ca.po
+++ b/addons/account/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/cs.po b/addons/account/i18n/cs.po
index 932d4e3cf3d..faff571118c 100644
--- a/addons/account/i18n/cs.po
+++ b/addons/account/i18n/cs.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-17 20:55+0000\n"
+"PO-Revision-Date: 2010-04-01 22:39+0000\n"
"Last-Translator: mitev.dmitry \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-18 04:34+0000\n"
+"X-Launchpad-Export-Date: 2010-04-03 03:54+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -45,7 +45,7 @@ msgstr ""
#. module: account
#: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
msgid "Confirm statement from draft"
-msgstr ""
+msgstr "Potvrdit výpis z návrhu"
#. module: account
#: model:account.account.type,name:account.account_type_asset
@@ -110,7 +110,7 @@ msgstr "Vytištěné reporty o daních"
#. module: account
#: field:account.account,parent_id:0
msgid "Parent"
-msgstr ""
+msgstr "Rodič"
#. module: account
#: selection:account.move,type:0
@@ -415,7 +415,7 @@ msgstr "Datum:"
#. module: account
#: selection:account.account.type,sign:0
msgid "Negative"
-msgstr ""
+msgstr "Negativ"
#. module: account
#: rml:account.partner.balance:0
diff --git a/addons/account/i18n/da.po b/addons/account/i18n/da.po
index a415a92ecba..bc70bb1a51f 100644
--- a/addons/account/i18n/da.po
+++ b/addons/account/i18n/da.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/de.po b/addons/account/i18n/de.po
index 7581077f729..deca642f62a 100644
--- a/addons/account/i18n/de.po
+++ b/addons/account/i18n/de.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-02-28 09:03+0000\n"
+"PO-Revision-Date: 2010-04-02 07:16+0000\n"
"Last-Translator: Ferdinand @ ChriCar \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:50+0000\n"
+"X-Launchpad-Export-Date: 2010-04-03 03:54+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -3802,7 +3802,7 @@ msgstr "Wähle Kontenplan"
#: selection:account.chart,init,target_move:0
#: model:ir.actions.report.xml,name:account.account_move_line_list
msgid "All Entries"
-msgstr "Gebucht"
+msgstr "Alle Einträge"
#. module: account
#: model:process.node,name:account.process_node_draftinvoices0
@@ -4947,7 +4947,7 @@ msgstr "Konto OP Ausgleich"
#: view:account.bank.statement:0
#: selection:account.bank.statement,state:0
msgid "Confirm"
-msgstr "Gebucht"
+msgstr "Bestätigen"
#. module: account
#: wizard_view:account.account.balance.report,account_selection:0
diff --git a/addons/account/i18n/el.po b/addons/account/i18n/el.po
index 14da9e7ab1e..a0d1b48c02c 100644
--- a/addons/account/i18n/el.po
+++ b/addons/account/i18n/el.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:50+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:02+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/es.po b/addons/account/i18n/es.po
index efe515429ca..197a6988060 100644
--- a/addons/account/i18n/es.po
+++ b/addons/account/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:03+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/es_AR.po b/addons/account/i18n/es_AR.po
index 20719a1a258..bfdfdb0e2e0 100644
--- a/addons/account/i18n/es_AR.po
+++ b/addons/account/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:04+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/es_EC.po b/addons/account/i18n/es_EC.po
index 94599a59f21..a695b23a38e 100644
--- a/addons/account/i18n/es_EC.po
+++ b/addons/account/i18n/es_EC.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:04+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/et.po b/addons/account/i18n/et.po
index af839298328..24d1ac79460 100644
--- a/addons/account/i18n/et.po
+++ b/addons/account/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:50+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:02+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/fa.po b/addons/account/i18n/fa.po
index ce146a5c65f..8b424a58ea9 100644
--- a/addons/account/i18n/fa.po
+++ b/addons/account/i18n/fa.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:03+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/fi.po b/addons/account/i18n/fi.po
index c26e1b0416a..b15135c8e14 100644
--- a/addons/account/i18n/fi.po
+++ b/addons/account/i18n/fi.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-18 14:20+0000\n"
+"PO-Revision-Date: 2010-03-22 15:02+0000\n"
"Last-Translator: Henri Kovalainen \n"
"Language-Team: Finnish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-19 07:50+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:02+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -90,7 +90,7 @@ msgstr "Suoritusajon tulos"
#. module: account
#: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
msgid "Unreconciled entries"
-msgstr "Suorittamattomat tapahtumat"
+msgstr "Suorittamattomat merkinnät"
#. module: account
#: field:account.invoice.tax,base_code_id:0
@@ -370,7 +370,7 @@ msgstr "Analyyttinen tili"
#: field:account.tax,child_depend:0
#: field:account.tax.template,child_depend:0
msgid "Tax on Children"
-msgstr "Verotus lapsille"
+msgstr "Vero alemmille"
#. module: account
#: rml:account.central.journal:0
@@ -409,7 +409,7 @@ msgstr "Salli merkintöjen poisto"
#: model:process.transition,name:account.process_transition_paymentorderbank0
#: model:process.transition,name:account.process_transition_paymentorderreconcilation0
msgid "Payment Reconcilation"
-msgstr "Maksutapahtuman kirjaus"
+msgstr "Maksun suoritusmerkinnät"
#. module: account
#: model:account.journal,name:account.expenses_journal
@@ -466,14 +466,14 @@ msgstr "Erikoislaskenta"
#. module: account
#: model:process.transition,note:account.process_transition_confirmstatementfromdraft0
msgid "Confirm statement with/without reconciliation from draft statement"
-msgstr "Vahvista ote käsin kirjaten luonnosotteesta tai automaattisesti"
+msgstr "Vahvista tiliote suorituksilla tai ilman luonnoksesta"
#. module: account
#: wizard_view:account.move.bank.reconcile,init:0
#: 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 "Pankkitapahtumien kirjaus"
+msgstr "Pankkitapahtumien suoritusmerkinnät"
#. module: account
#: rml:account.invoice:0
@@ -653,7 +653,7 @@ msgstr "Tilimerkintöjen suoritus"
#. module: account
#: wizard_button:account.move.bank.reconcile,init,open:0
msgid "Open for bank reconciliation"
-msgstr "Avoin pankkisovittelulle"
+msgstr "Avoin pankkisuoritukselle"
#. module: account
#: field:account.invoice.line,discount:0
@@ -767,7 +767,7 @@ msgstr "Ostojen ominaisuudet"
#. module: account
#: model:process.node,note:account.process_node_paymententries0
msgid "Can be draft or validated"
-msgstr "Voidaan luonnostella tai validoida"
+msgstr "Voi olla luonnos tai voidaan hyväksyä"
#. module: account
#: wizard_button:account.invoice.pay,init,reconcile:0
@@ -824,7 +824,7 @@ msgstr "(Jätä tyhjäksi käyttääksesi kaikkia avoimia tilikausia)"
#. module: account
#: field:account.invoice,move_lines:0
msgid "Move Lines"
-msgstr "Siirtymärivit"
+msgstr "Siirron rivit"
#. module: account
#: model:ir.model,name:account.model_account_config_wizard
@@ -854,7 +854,7 @@ msgstr "6"
#. module: account
#: model:ir.ui.menu,name:account.next_id_30
msgid "Bank Reconciliation"
-msgstr "Pankki sovinto"
+msgstr "Pankin suoritusmerkinnät"
#. module: account
#: model:ir.model,name:account.model_account_account_template
@@ -1041,12 +1041,12 @@ msgstr "Talouskanta"
#: field:account.analytic.line,product_uom_id:0
#: field:account.move.line,product_uom_id:0
msgid "UoM"
-msgstr "Yksikkö"
+msgstr "Mittayksikkö"
#. module: account
#: wizard_field:account.third_party_ledger.report,init,page_split:0
msgid "One Partner Per Page"
-msgstr "Yksi kumppani sivulla"
+msgstr "Yksi kumppani per sivu"
#. module: account
#: field:account.account,child_parent_ids:0
@@ -1398,8 +1398,8 @@ 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 ""
-"Jos poistat suorituksia siirroista, sinun tulee myös varmistaa kaikki "
-"siirtoihin liittyvät toiminnot koska niitä ei poisteta"
+"Jos poistat suorituksia tapahtumista, sinun tulee myös varmistaa kaikki "
+"tapahtumiin liittyvät toiminnot koska niitä ei poisteta"
#. module: account
#: model:process.node,name:account.process_node_electronicfile0
@@ -1453,7 +1453,7 @@ msgstr "Päiväkirja"
#: field:account.account,child_id:0
#: field:account.analytic.account,child_ids:0
msgid "Child Accounts"
-msgstr "Lapsitilit"
+msgstr "Alemmat tilit"
#. module: account
#: field:account.account,check_history:0
@@ -1577,7 +1577,7 @@ msgstr "Luo tilikartta mallista"
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_legal_statement
msgid "Legal Statements"
-msgstr "Lailliset lausunnot"
+msgstr "Lakimääräiset tiliotteet"
#. module: account
#: field:account.tax.code,parent_id:0
@@ -1588,7 +1588,7 @@ msgstr "Ylempi koodi"
#. module: account
#: wizard_button:account.move.line.reconcile.select,init,open:0
msgid "Open for reconciliation"
-msgstr "Avaa sovitukselle"
+msgstr "Avaa suorituksille"
#. module: account
#: model:account.journal,name:account.bilan_journal
@@ -1787,7 +1787,7 @@ msgstr "Mistä"
#: model:process.node,note:account.process_node_reconciliation0
#: model:process.node,note:account.process_node_supplierreconciliation0
msgid "Reconciliation of entries from invoice(s) and payment(s)"
-msgstr "Kohtien sovittelu lasku(i)lta ja maksu(i)sta"
+msgstr "Maksusuoritusmerkinnät laskuilta ja makuista"
#. module: account
#: wizard_view:account.central.journal.report,init:0
@@ -1934,7 +1934,7 @@ msgstr "Virhe: Virheellinen BVR-numero (väärä tarkistussumma)."
#: model:ir.actions.act_window,name:account.action_invoice_tree5
#: model:ir.ui.menu,name:account.menu_invoice_draft
msgid "Draft Customer Invoices"
-msgstr "Luonnos asiakaslaskuista"
+msgstr "Asiakkaiden luonnoslaskut"
#. module: account
#: model:ir.model,name:account.model_account_subscription_line
@@ -2054,9 +2054,8 @@ msgid ""
"'draft' state and instead goes directly to the 'posted state' without any "
"manual validation."
msgstr ""
-"Valitse tämä jos et halua uusien tilisiirtojen menevän \"luonnostilaan\" "
-"vaan, että ne menevät suoraan \"postitettu\" -tilaan ilman manuaalista "
-"tarkistamista."
+"Valitse tämä, jos et halua uusien tilisiirtojen menevän luonnostilaan vaan "
+"käsitellä ne ilman manuaalista hyväksymistä."
#. module: account
#: field:account.bank.statement.line,partner_id:0
@@ -2080,7 +2079,7 @@ msgstr "Laskunnumero, lasketaan automaattisesti kun laskua luodaan."
#. module: account
#: rml:account.invoice:0
msgid "Draft Invoice"
-msgstr "Laskun luonnos"
+msgstr "Luonnoslasku"
#. module: account
#: model:account.account.type,name:account.account_type_expense
@@ -2157,7 +2156,7 @@ msgstr "Maksun suoritusmerkinnät"
#: model:ir.actions.act_window,name:account.action_bank_statement_reconciliation_form
#: model:ir.ui.menu,name:account.menu_action_account_bank_reconcile_tree
msgid "Statements reconciliation"
-msgstr "Tiliotteiden sovittelu"
+msgstr "Tiliotteiden maksusuoritukset"
#. module: account
#: model:ir.actions.act_window,name:account.action_subscription_form_new
@@ -2215,7 +2214,7 @@ msgstr "(Jätä tyhjäksi käyttääksesi nykyistä jaksoa)"
#: model:ir.actions.act_window,name:account.action_invoice_tree8
#: model:ir.ui.menu,name:account.menu_action_invoice_tree8
msgid "Draft Supplier Invoices"
-msgstr "Luonnos toimittajan laskuista"
+msgstr "Luonnokset toimittajien laskuista"
#. module: account
#: wizard_field:account.invoice.refund,init,period:0
@@ -2395,7 +2394,7 @@ msgstr "Kuitti nro"
#: model:ir.actions.wizard,name:account.wizard_automatic_reconcile
#: model:ir.ui.menu,name:account.menu_automatic_reconcile
msgid "Automatic reconciliation"
-msgstr "Automaattinen sovitus"
+msgstr "Automaattiset suoritusmerkinnät"
#. module: account
#: view:account.bank.statement:0
@@ -2808,7 +2807,7 @@ msgstr "Nimi"
#: wizard_view:account.move.line.reconcile,init_full:0
#: wizard_view:account.move.line.reconcile,init_partial:0
msgid "Reconciliation transactions"
-msgstr "Sovitus transaktio"
+msgstr "Suoritustapahtumat"
#. module: account
#: wizard_field:account.aged.trial.balance,init,direction_selection:0
@@ -2917,7 +2916,7 @@ msgstr "Avoin tila"
#. module: account
#: field:account.journal,entry_posted:0
msgid "Skip 'Draft' State for Created Entries"
-msgstr "Ohita \"luonnostila\" luoduille kohdille"
+msgstr "Ohita luonnostila luoduille merkinnöille"
#. module: account
#: field:account.invoice.tax,account_id:0
@@ -2953,7 +2952,7 @@ msgstr "1cm 27.7cm 20cm 27.7cm"
#: model:ir.actions.act_window,name:account.action_invoice_tree12
#: model:ir.ui.menu,name:account.menu_action_invoice_tree12
msgid "Draft Supplier Refunds"
-msgstr "Luonnos toimittajan hyvityksistä"
+msgstr "Luonnokset toimittajien hyvityksistä"
#. module: account
#: model:process.node,name:account.process_node_accountingstatemententries0
@@ -2981,7 +2980,7 @@ msgstr "Verokartoitus"
#: wizard_view:account.move.line.unreconcile,init:0
#: wizard_view:account.reconcile.unreconcile,init:0
msgid "Unreconciliation transactions"
-msgstr "Sovittamattomat tapahtumat"
+msgstr "Suoritusten poiston tapahtumat"
#. module: account
#: model:process.transition,note:account.process_transition_paymentorderbank0
@@ -3005,7 +3004,7 @@ msgstr "Merkintärivit"
#: model:process.node,name:account.process_node_reconciliation0
#: model:process.node,name:account.process_node_supplierreconciliation0
msgid "Reconciliation"
-msgstr "Sovitus"
+msgstr "Suoritusmerkinnät"
#. module: account
#: field:account.move.line,centralisation:0
@@ -3040,7 +3039,7 @@ msgstr "Ulkomaalaisten valuuttojen kurssi(t)"
#: model:ir.actions.act_window,name:account.action_invoice_tree10
#: model:ir.ui.menu,name:account.menu_action_invoice_tree10
msgid "Draft Customer Refunds"
-msgstr "Luonnos asiakashyvityksistä"
+msgstr "Luonnokset asiakkaiden hyvityksistä"
#. module: account
#: field:account.journal.column,readonly:0
@@ -3122,7 +3121,7 @@ msgstr "Merkinnän nimike"
#. module: account
#: model:process.transition,note:account.process_transition_paymentreconcile0
msgid "Reconcilate the entries from payment"
-msgstr "Sovita kohdata maksusta"
+msgstr "Maksusuoritukset merkinnöille maksuita"
#. module: account
#: rml:account.tax.code.entries:0
@@ -3798,7 +3797,7 @@ msgstr "Kaikki merkinnät"
#: model:process.node,name:account.process_node_draftinvoices0
#: model:process.node,name:account.process_node_supplierdraftinvoices0
msgid "Draft Invoices"
-msgstr "Luonnostele Laskut"
+msgstr "Luonnoslaskut"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
@@ -3871,8 +3870,8 @@ msgid ""
"If no account is specified, the reconciliation will be made using every "
"accounts that can be reconcilied"
msgstr ""
-"Jos tiliä ei ole määritelty, sovittelu tehdään kaikille tileille jotka on "
-"mahdollista sovitella"
+"Jos tiliä ei ole määritetty, maksusuoritukset kirjataan kaikille tileille "
+"joissa se on mahdollista"
#. module: account
#: model:ir.actions.act_window,name:account.action_wizard_company_setup_form
@@ -4589,7 +4588,7 @@ msgstr "Luo merkinnät malleista"
#. module: account
#: field:account.account.template,reconcile:0
msgid "Allow Reconciliation"
-msgstr "Salli sovittelu"
+msgstr "Salli suoritusmerkinnät"
#. module: account
#: selection:account.account.balance.report,checktype,state:0
@@ -4618,7 +4617,7 @@ msgstr "Muokkaa Laskua"
#. module: account
#: view:res.partner:0
msgid "Supplier Accounting Properties"
-msgstr "Toimittajan Kirjanpidon Asetukset"
+msgstr "Toimittajan kirjanpidon asetukset"
#. module: account
#: view:account.analytic.account:0
@@ -4759,7 +4758,7 @@ msgstr "Muuta"
#. module: account
#: field:account.journal.period,icon:0
msgid "Icon"
-msgstr "Kuvake"
+msgstr "Icon"
#. module: account
#: model:ir.model,name:account.model_account_journal_period
@@ -4849,7 +4848,7 @@ msgstr "Saatavat tilit"
#. module: account
#: wizard_button:account.move.line.unreconcile.select,init,open:0
msgid "Open for unreconciliation"
-msgstr "Avaa sovittelemattomaksi"
+msgstr "Avaa suoritusten poistolle"
#. module: account
#: field:account.bank.statement.reconcile,statement_line:0
@@ -4922,7 +4921,7 @@ msgstr "Myyntiverot"
#. module: account
#: model:ir.model,name:account.model_account_move_reconcile
msgid "Account Reconciliation"
-msgstr "Tili sovittelu"
+msgstr "Tilien suoritusmerkinnät"
#. module: account
#: view:account.bank.statement:0
@@ -5169,7 +5168,7 @@ msgstr "Tuo laskut"
#: wizard_view:account.move.line.unreconcile.select,init:0
#: wizard_view:account.reconcile.unreconcile,init:0
msgid "Unreconciliation"
-msgstr "Sovittelematon"
+msgstr "Suoritusten poisto"
#. module: account
#: model:ir.model,name:account.model_fiscalyear_seq
@@ -5393,7 +5392,7 @@ msgstr "Normaali"
#. module: account
#: model:process.process,name:account.process_process_supplierinvoiceprocess0
msgid "Supplier Invoice Process"
-msgstr "Toimittajan laskutus prosessi"
+msgstr "Toimittajan laskutusprosessi"
#. module: account
#: rml:account.account.balance:0
@@ -5435,7 +5434,7 @@ msgstr ":"
#. module: account
#: field:account.bank.statement.line,reconcile_amount:0
msgid "Amount reconciled"
-msgstr "Suoritettu määrä"
+msgstr "Suoritukset yhteensä"
#. module: account
#: selection:account.account,currency_mode:0
@@ -5898,7 +5897,7 @@ msgstr "Toimittajan hyvitys"
#: model:process.transition,note:account.process_transition_entriesreconcile0
#: model:process.transition,note:account.process_transition_supplierentriesreconcile0
msgid "Reconcile Entries."
-msgstr "Suorita merkinnät."
+msgstr "Suoritusmerkinnät."
#. module: account
#: field:account.subscription.line,move_id:0
diff --git a/addons/account/i18n/fr.po b/addons/account/i18n/fr.po
index 4fbfdd8a8f6..ed4e446c505 100644
--- a/addons/account/i18n/fr.po
+++ b/addons/account/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:50+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:02+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -2636,8 +2636,8 @@ msgstr "2"
#: wizard_view:account.chart,init:0
msgid "(If you do not select Fiscal year it will take all open fiscal years)"
msgstr ""
-"(Si vous ne sélectionnez pas d'année Fiscale, il prendra toutes les années "
-"fiscales ouvertes)"
+"(Si vous ne sélectionnez pas d'année fiscale, toutes les années fiscales "
+"ouvertes seront prises en compte)"
#. module: account
#: help:account.invoice.tax,base_code_id:0
@@ -4035,7 +4035,7 @@ msgstr "Factures en brouillon"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
-msgstr "Correspondances des Modèles de Taxe des Positions Fiscales"
+msgstr "Affectation des taxes dans le modèle de régime fiscal"
#. module: account
#: rml:account.invoice:0
@@ -4667,7 +4667,7 @@ msgstr "Fichier de relevé"
#. module: account
#: view:ir.sequence:0
msgid "Fiscal Year Sequences"
-msgstr "Séquences des exercices"
+msgstr "Séquences des exercices fiscaux"
#. module: account
#: view:account.model.line:0
@@ -4976,9 +4976,9 @@ msgid ""
"new counterpart but will share the same counterpart. This is used in fiscal "
"year closing."
msgstr ""
-"Cochez cette case pour spécifier que chaque entrée de ce journal ne créera "
+"Cochez cette case pour spécifier que chaque écriture de ce journal ne créera "
"pas une nouvelle contrepartie mais partagera la même contrepartie. Cela est "
-"utilisé dans la clôture des années fiscales."
+"utilisé dans la clôture des exercices fiscaux."
#. module: account
#: selection:account.invoice,state:0
@@ -5073,7 +5073,7 @@ msgstr "Journal analytique"
#: field:account.fiscal.position,account_ids:0
#: field:account.fiscal.position.template,account_ids:0
msgid "Account Mapping"
-msgstr "Mapping de Compte"
+msgstr "Affectation des comptes"
#. module: account
#: view:product.product:0
@@ -5692,8 +5692,8 @@ msgid ""
"Invalid period ! Some periods overlap or the date period is not in the scope "
"of the fiscal year. "
msgstr ""
-"Période non valide ! Certaines périodes se chevauchent ou la date de la "
-"période n'est pas incluse dans l'année fiscale. "
+"Période incorrecte ! Certaines périodes se chevauchent ou la période n'est "
+"pas incluse dans l'exercice fiscal. "
#. module: account
#: help:account.journal,invoice_sequence_id:0
@@ -5723,7 +5723,7 @@ msgstr ""
#. module: account
#: constraint:account.fiscalyear:0
msgid "Error ! The duration of the Fiscal Year is invalid. "
-msgstr "Erreur ! La durée de l'Année Fiscale n'est pas valide. "
+msgstr "Erreur ! La durée de l'exercice fiscal est incorrecte. "
#. module: account
#: selection:account.analytic.account,state:0
diff --git a/addons/account/i18n/gl.po b/addons/account/i18n/gl.po
index edae8d7835e..1bdf36f4f2a 100644
--- a/addons/account/i18n/gl.po
+++ b/addons/account/i18n/gl.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:50+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:02+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/gu.po b/addons/account/i18n/gu.po
index 908a6084d35..5d1eeafaeb5 100644
--- a/addons/account/i18n/gu.po
+++ b/addons/account/i18n/gu.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:50+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:02+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/hr.po b/addons/account/i18n/hr.po
index bfb6e64b17f..97e852826b5 100644
--- a/addons/account/i18n/hr.po
+++ b/addons/account/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:03+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/hu.po b/addons/account/i18n/hu.po
index 27a156d94ad..79173201627 100644
--- a/addons/account/i18n/hu.po
+++ b/addons/account/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:50+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:02+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/id.po b/addons/account/i18n/id.po
index 16ebde17ecd..8fd404dcb4a 100644
--- a/addons/account/i18n/id.po
+++ b/addons/account/i18n/id.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:50+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:02+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/it.po b/addons/account/i18n/it.po
index d2d6aea2e25..3d3cbc954e8 100644
--- a/addons/account/i18n/it.po
+++ b/addons/account/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-02-03 19:01+0000\n"
-"Last-Translator: Davide Corio \n"
+"PO-Revision-Date: 2010-03-29 15:32+0000\n"
+"Last-Translator: Carlo Vettore \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:50+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:02+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -653,7 +653,7 @@ msgstr "Riconcilia la registrazione contabile"
#. module: account
#: wizard_button:account.move.bank.reconcile,init,open:0
msgid "Open for bank reconciliation"
-msgstr ""
+msgstr "Apri per la riconciliazione bancaria"
#. module: account
#: field:account.invoice.line,discount:0
@@ -762,12 +762,12 @@ msgstr "Voci di Giornale di Fine Anno"
#: view:product.product:0
#: view:product.template:0
msgid "Purchase Properties"
-msgstr ""
+msgstr "Proprietà acquisti"
#. module: account
#: model:process.node,note:account.process_node_paymententries0
msgid "Can be draft or validated"
-msgstr ""
+msgstr "Può essere bozza o confermato"
#. module: account
#: wizard_button:account.invoice.pay,init,reconcile:0
@@ -829,7 +829,7 @@ msgstr "Righe Movimentate"
#. module: account
#: model:ir.model,name:account.model_account_config_wizard
msgid "account.config.wizard"
-msgstr ""
+msgstr "account.config.wizard"
#. module: account
#: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree
@@ -892,7 +892,7 @@ msgstr "Cancella fattura"
#. module: account
#: field:account.journal.column,required:0
msgid "Required"
-msgstr ""
+msgstr "Richiesto"
#. module: account
#: field:product.category,property_account_expense_categ:0
@@ -927,6 +927,8 @@ msgid ""
"If a default tax is given in the partner it only overrides taxes from "
"accounts (or products) in the same group."
msgstr ""
+"Se per il partner è impostata una tassa di default, essa ha solo la "
+"precedenza sulle tasse dei conti (o prodotti) dello stesso gruppo"
#. module: account
#: wizard_field:account.open_closed_fiscalyear,init,fyear_id:0
@@ -1042,7 +1044,7 @@ msgstr "Unità di Misura"
#. module: account
#: wizard_field:account.third_party_ledger.report,init,page_split:0
msgid "One Partner Per Page"
-msgstr ""
+msgstr "Un partner per pagina"
#. module: account
#: field:account.account,child_parent_ids:0
@@ -1071,7 +1073,7 @@ msgstr "Importo pagato"
#: model:process.transition,name:account.process_transition_customerinvoice0
#: model:process.transition,name:account.process_transition_suppliercustomerinvoice0
msgid "Customer Invoice"
-msgstr ""
+msgstr "Fattura cliente"
#. module: account
#: wizard_view:account.open_closed_fiscalyear,init:0
@@ -1081,7 +1083,7 @@ msgstr "Seleziona l'Anno Fiscale"
#. module: account
#: field:account.sequence.fiscalyear,sequence_main_id:0
msgid "Main Sequence"
-msgstr ""
+msgstr "Sequenza principale"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_analytic_journal_tree
diff --git a/addons/account/i18n/kab.po b/addons/account/i18n/kab.po
index 96ca28eb2b2..ee1ad776c89 100644
--- a/addons/account/i18n/kab.po
+++ b/addons/account/i18n/kab.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:50+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:02+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/ko.po b/addons/account/i18n/ko.po
index 5a763e21b71..c446f87351a 100644
--- a/addons/account/i18n/ko.po
+++ b/addons/account/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:50+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:02+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/lt.po b/addons/account/i18n/lt.po
index c723908112b..d264385f50e 100644
--- a/addons/account/i18n/lt.po
+++ b/addons/account/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:03+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/lv.po b/addons/account/i18n/lv.po
index bb0e185e0c6..bf1f411e1e0 100644
--- a/addons/account/i18n/lv.po
+++ b/addons/account/i18n/lv.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:02+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/mn.po b/addons/account/i18n/mn.po
index 1b2cb4015a3..4fc0e27c353 100644
--- a/addons/account/i18n/mn.po
+++ b/addons/account/i18n/mn.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:03+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/nb.po b/addons/account/i18n/nb.po
index 9c2334ac567..1aa65154364 100644
--- a/addons/account/i18n/nb.po
+++ b/addons/account/i18n/nb.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:03+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/nl.po b/addons/account/i18n/nl.po
index cde5e75ab8a..35744c95e2c 100644
--- a/addons/account/i18n/nl.po
+++ b/addons/account/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:50+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:02+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/nl_BE.po b/addons/account/i18n/nl_BE.po
index a14bef3c80c..754e25e6db7 100644
--- a/addons/account/i18n/nl_BE.po
+++ b/addons/account/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:04+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/oc.po b/addons/account/i18n/oc.po
index a2415951ef5..76be8f5bd5c 100644
--- a/addons/account/i18n/oc.po
+++ b/addons/account/i18n/oc.po
@@ -9,12 +9,12 @@ msgstr ""
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-03-13 10:33+0000\n"
-"Last-Translator: Cédric VALMARY \n"
+"Last-Translator: Cédric VALMARY (Per Tot en òc) \n"
"Language-Team: Occitan (post 1500) \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-14 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:03+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/pl.po b/addons/account/i18n/pl.po
index 859ab68dfdc..b6de147aaae 100644
--- a/addons/account/i18n/pl.po
+++ b/addons/account/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:03+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/pt.po b/addons/account/i18n/pt.po
index 37f08c52c99..797e320727b 100644
--- a/addons/account/i18n/pt.po
+++ b/addons/account/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:03+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/pt_BR.po b/addons/account/i18n/pt_BR.po
index 45ef33f37ce..ad56e423751 100644
--- a/addons/account/i18n/pt_BR.po
+++ b/addons/account/i18n/pt_BR.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-04 15:48+0000\n"
-"Last-Translator: JCF \n"
+"PO-Revision-Date: 2010-03-24 00:57+0000\n"
+"Last-Translator: Pedro_Maschio \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:04+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -911,7 +911,7 @@ msgstr "Diário de Baixas"
#: field:account.model.line,amount_currency:0
#: field:account.move.line,amount_currency:0
msgid "Amount Currency"
-msgstr ""
+msgstr "Moeda do valor"
#. module: account
#: field:account.chart.template,property_account_expense_categ:0
@@ -1415,7 +1415,7 @@ msgstr "Crédito do cliente"
#. module: account
#: field:account.invoice,tax_line:0
msgid "Tax Lines"
-msgstr "Linhas de taxa"
+msgstr "Linhas de Impostos"
#. module: account
#: field:ir.sequence,fiscal_ids:0
@@ -1464,7 +1464,7 @@ msgstr "Exibir histórico"
#. module: account
#: wizard_field:account.third_party_ledger.report,init,date1:0
msgid " Start date"
-msgstr " Data de inicío"
+msgstr " Data de início"
#. module: account
#: wizard_field:account.account.balance.report,checktype,display_account:0
@@ -1475,13 +1475,13 @@ msgstr "Exibir contas "
#. module: account
#: model:ir.model,name:account.model_account_bank_statement_reconcile_line
msgid "Statement reconcile line"
-msgstr "Linha de procecimentos de conciliação"
+msgstr "Linha de reconciliação do Demonstrativo"
#. module: account
#: view:account.tax:0
#: view:account.tax.template:0
msgid "Keep empty to use the income account"
-msgstr "Manter vazio para usar a conta da fatura"
+msgstr "Manter vazio para usar a conta de receita"
#. module: account
#: view:account.bank.statement.reconcile:0
@@ -1489,7 +1489,7 @@ msgstr "Manter vazio para usar a conta da fatura"
#: wizard_view:account.move.line.reconcile,init_full:0
#: wizard_view:account.move.line.reconcile,init_partial:0
msgid "Write-Off"
-msgstr "Amortização"
+msgstr "Baixa ou exclusão"
#. module: account
#: help:account.invoice,partner_bank:0
@@ -1543,7 +1543,7 @@ msgstr "Tel. :"
#. module: account
#: field:account.invoice.tax,tax_amount:0
msgid "Tax Code Amount"
-msgstr "Quantia de taxa"
+msgstr "Valor do Código do Imposto"
#. module: account
#: selection:account.account.type,sign:0
@@ -1566,7 +1566,7 @@ msgstr "Modelo de plano de contas"
#. module: account
#: field:account.invoice,move_id:0
msgid "Invoice Movement"
-msgstr "Movimento da fatura"
+msgstr "Movimento de Faturas"
#. module: account
#: model:ir.actions.act_window,name:account.action_wizard_multi_chart
@@ -1578,18 +1578,18 @@ msgstr "Gerar plano de contas de um modelo de plano"
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_legal_statement
msgid "Legal Statements"
-msgstr "Procedimentos legais"
+msgstr "Demonstrativos Legais"
#. module: account
#: field:account.tax.code,parent_id:0
#: field:account.tax.code.template,parent_id:0
msgid "Parent Code"
-msgstr "Código pai"
+msgstr "Código da Conta-pai"
#. module: account
#: wizard_button:account.move.line.reconcile.select,init,open:0
msgid "Open for reconciliation"
-msgstr "Abrir para conciliação"
+msgstr "Abrir para reconciliação"
#. module: account
#: model:account.journal,name:account.bilan_journal
@@ -1600,7 +1600,7 @@ msgstr "Diário de abertura"
#: selection:account.tax,tax_group:0
#: selection:account.tax.template,tax_group:0
msgid "VAT"
-msgstr "Imposto"
+msgstr "VAT (imposto europeu)"
#. module: account
#: rml:account.analytic.account.journal:0
@@ -1629,7 +1629,7 @@ msgstr "Código parceiro"
#: selection:account.partner.balance.report,init,result_selection:0
#: selection:account.third_party_ledger.report,init,result_selection:0
msgid "Receivable and Payable Accounts"
-msgstr "Contas a receber e a pagar"
+msgstr "Contas a Pagar e Receber"
#. module: account
#: view:account.subscription:0
@@ -1643,7 +1643,7 @@ msgstr "Linhas de inscrição"
#: selection:account.tax,type_tax_use:0
#: selection:account.tax.template,type_tax_use:0
msgid "Purchase"
-msgstr "Compras"
+msgstr "Compra"
#. module: account
#: view:account.analytic.line:0
@@ -1674,12 +1674,12 @@ msgstr "Terceiros"
#. module: account
#: view:account.journal:0
msgid "Accounts Type Allowed (empty for no control)"
-msgstr "Tipo de contas permitidas (vazio para não controlar)"
+msgstr "Tipos de contas permitidas (vazio para não controlar)"
#. module: account
#: field:account.bank.statement,balance_start:0
msgid "Starting Balance"
-msgstr "Iniciar balanço"
+msgstr "Saldo Inicial"
#. module: account
#: wizard_field:account.analytic.account.quantity_cost_ledger.report,init,journal:0
@@ -1697,7 +1697,7 @@ msgstr "Qtd máx:"
#. module: account
#: wizard_button:account.invoice.refund,init,refund:0
msgid "Refund Invoice"
-msgstr "Reembolso da fatura"
+msgstr "Fatura de Devolução"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_period_tree
@@ -1734,7 +1734,7 @@ msgstr "Forçar período"
#. module: account
#: help:account.account.type,sequence:0
msgid "Gives the sequence order when displaying a list of account types."
-msgstr "Dá a ordem da seqüência ao indicar uma lista de tipos de conta."
+msgstr "Dá a ordem sequencial ao mostrar uma lista de tipos de conta."
#. module: account
#: view:account.invoice:0
@@ -1765,7 +1765,7 @@ msgstr "Desfazer reconciliação de Lançamentos"
#. module: account
#: model:process.node,note:account.process_node_supplierdraftinvoices0
msgid "Pre-generated invoice from control"
-msgstr "Fatura pré-gerada pelo controle"
+msgstr "Fatura pré-gerada do controle"
#. module: account
#: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0
@@ -1776,7 +1776,7 @@ msgstr "Custo Razão para um período"
#: model:ir.actions.act_window,name:account.action_bank_statement_tree2
#: model:ir.ui.menu,name:account.menu_bank_statement_tree2
msgid "New Statement"
-msgstr "Novo procedimento"
+msgstr "Novo Demonstrativo"
#. module: account
#: wizard_field:account.analytic.account.chart,init,from_date:0
@@ -1788,7 +1788,7 @@ msgstr "De"
#: model:process.node,note:account.process_node_reconciliation0
#: model:process.node,note:account.process_node_supplierreconciliation0
msgid "Reconciliation of entries from invoice(s) and payment(s)"
-msgstr "Conciliação de entradas de fatura(s) e pagamento(s)"
+msgstr "Reconciliação dos lançamentos das fatura(s) e pagamento(s)"
#. module: account
#: wizard_view:account.central.journal.report,init:0
@@ -1820,7 +1820,7 @@ msgstr "Planos"
#: selection:account.tax,type_tax_use:0
#: selection:account.tax.template,type_tax_use:0
msgid "Sale"
-msgstr "vender"
+msgstr "Venda"
#. module: account
#: wizard_button:account.account.balance.report,account_selection,checktype:0
@@ -1834,7 +1834,7 @@ msgid ""
"The fiscal position will determine taxes and the accounts used for the the "
"partner."
msgstr ""
-"A posição fiscal poderá determinar as taxas e as contas usadas para o "
+"A posição fiscal irá determinar os impostos e as contas usadas para o "
"parceiro."
#. module: account
@@ -1845,7 +1845,7 @@ msgstr "Data ou Código"
#. module: account
#: field:account.analytic.account,user_id:0
msgid "Account Manager"
-msgstr "Administrar contas"
+msgstr "Gerente de Contas"
#. module: account
#: rml:account.analytic.account.journal:0
@@ -1856,7 +1856,7 @@ msgstr "para:"
#: wizard_field:account.move.line.reconcile,init_full,debit:0
#: wizard_field:account.move.line.reconcile,init_partial,debit:0
msgid "Debit amount"
-msgstr "Quantia de débito"
+msgstr "Valor do débito"
#. module: account
#: selection:account.subscription,period_type:0
@@ -1904,18 +1904,18 @@ msgstr "Tipo"
#. module: account
#: view:account.journal:0
msgid "Accounts Allowed (empty for no control)"
-msgstr "Contas permitidas(Vazio para não controlar)"
+msgstr "Contas permitidas (Vazio para não controlar)"
#. module: account
#: view:account.invoice:0
msgid "Untaxed amount"
-msgstr "Quantia não taxada"
+msgstr "Valor não tributado"
#. module: account
#: field:account.tax,account_collected_id:0
#: field:account.tax.template,account_collected_id:0
msgid "Invoice Tax Account"
-msgstr "Conta de taxa da fatura"
+msgstr "Conta de Impostos da Fatura"
#. module: account
#: view:account.move.line:0
@@ -1937,7 +1937,7 @@ msgstr "Erro: Número Bvr Inválido (erro dígito verificador)."
#: model:ir.actions.act_window,name:account.action_invoice_tree5
#: model:ir.ui.menu,name:account.menu_invoice_draft
msgid "Draft Customer Invoices"
-msgstr "Esboço de faturas de clientes"
+msgstr "Fatura de Clientes Provisória"
#. module: account
#: model:ir.model,name:account.model_account_subscription_line
@@ -2006,7 +2006,7 @@ msgstr "Este nome será exibido nos relatórios"
#: rml:account.analytic.account.cost_ledger:0
#: rml:account.analytic.account.quantity_cost_ledger:0
msgid "Printing date"
-msgstr "Imprimindo data"
+msgstr "Data de impressão"
#. module: account
#: constraint:ir.ui.view:0
@@ -2161,7 +2161,7 @@ msgstr "Conciliar pagamento"
#: model:ir.actions.act_window,name:account.action_bank_statement_reconciliation_form
#: model:ir.ui.menu,name:account.menu_action_account_bank_reconcile_tree
msgid "Statements reconciliation"
-msgstr "Procedimento de conciliação"
+msgstr "Reconciliação dos Demonstrativos"
#. module: account
#: model:ir.actions.act_window,name:account.action_subscription_form_new
@@ -2198,7 +2198,7 @@ msgstr "Quantia"
#. module: account
#: model:ir.actions.act_window,name:account.act_account_acount_move_line_reconcile_open
msgid "Reconciled entries"
-msgstr "Lançamentos conciliados"
+msgstr "Lançamentos reconciliados"
#. module: account
#: field:account.invoice,address_contact_id:0
@@ -2219,7 +2219,7 @@ msgstr "(Mantenha vazio para usar o período atual)"
#: model:ir.actions.act_window,name:account.action_invoice_tree8
#: model:ir.ui.menu,name:account.menu_action_invoice_tree8
msgid "Draft Supplier Invoices"
-msgstr "Esboço de faturas de fornecedores"
+msgstr "Fatura Provisória de Fornecedores"
#. module: account
#: wizard_field:account.invoice.refund,init,period:0
@@ -2276,7 +2276,7 @@ msgstr "x Conferências diárias"
#: model:ir.actions.wizard,name:account.wizard_generate_subscription
#: model:ir.ui.menu,name:account.menu_generate_subscription
msgid "Create subscription entries"
-msgstr "Crie entradas da subscrição"
+msgstr "Criar lançamentos de inscrição"
#. module: account
#: wizard_field:account.fiscalyear.close,init,journal_id:0
@@ -2286,7 +2286,7 @@ msgstr "Diário de Abertura de Lançamentos"
#. module: account
#: view:account.config.wizard:0
msgid "Create a Fiscal Year"
-msgstr "Criar ano fiscal"
+msgstr "Criar um ano fiscal"
#. module: account
#: field:product.template,taxes_id:0
@@ -2369,7 +2369,7 @@ msgstr "Tipo de taxa"
#. module: account
#: model:process.transition,name:account.process_transition_statemententries0
msgid "Statement Entries"
-msgstr "Procedimentos para lançamentos"
+msgstr "Lançamentos do Demonstrativo"
#. module: account
#: field:account.analytic.line,user_id:0
@@ -2381,7 +2381,7 @@ msgstr "Usuário"
#: model:ir.actions.act_window,name:account.action_account_template_form
#: model:ir.ui.menu,name:account.menu_action_account_template_form
msgid "Account Templates"
-msgstr "Modelos de contas"
+msgstr "Modelos de conta"
#. module: account
#: view:account.chart.template:0
@@ -2523,7 +2523,7 @@ msgstr "Informação adicional"
#: model:process.transition,name:account.process_transition_entriesreconcile0
#: model:process.transition,name:account.process_transition_supplierentriesreconcile0
msgid "Entries Reconcile"
-msgstr "Conciliar lançamentos"
+msgstr "Reconciliar lançamentos"
#. module: account
#: help:account.bank.statement.reconcile,total_second_amount:0
@@ -2879,7 +2879,7 @@ msgstr "ID do parceiro"
#: wizard_view:account.invoice.pay,addendum:0
#: wizard_view:account.move.line.reconcile,addendum:0
msgid "Write-Off Move"
-msgstr "Mover amortização"
+msgstr "Movimentação de Baixa ou Exclusão"
#. module: account
#: view:account.move.line:0
@@ -2927,7 +2927,7 @@ msgstr "Abrir estado"
#. module: account
#: field:account.journal,entry_posted:0
msgid "Skip 'Draft' State for Created Entries"
-msgstr "Saltar o estado 'Esboço' para criar novas entradas"
+msgstr "Pular a forma 'Provisório' para lançamentos criados"
#. module: account
#: field:account.invoice.tax,account_id:0
@@ -2963,12 +2963,12 @@ msgstr "1cm 27.7cm 20cm 27.7cm"
#: model:ir.actions.act_window,name:account.action_invoice_tree12
#: model:ir.ui.menu,name:account.menu_action_invoice_tree12
msgid "Draft Supplier Refunds"
-msgstr "Esboço de reembolso a fornecedor"
+msgstr "Reembolso a Fornecedores Provisório"
#. module: account
#: model:process.node,name:account.process_node_accountingstatemententries0
msgid "Accounting Statement"
-msgstr "Procedimento para contas"
+msgstr "Demonstrativo de Contas"
#. module: account
#: rml:account.overdue:0
@@ -2997,7 +2997,7 @@ msgstr "Transações não conciliadas"
#: model:process.transition,note:account.process_transition_paymentorderbank0
#: model:process.transition,note:account.process_transition_paymentorderreconcilation0
msgid "Reconcilation of entries from payment order."
-msgstr "Conciliação de lançamentos para ordem de pagamento"
+msgstr "Reconciliação de lançamentos da ordem de pagamento"
#. module: account
#: field:account.bank.statement,move_line_ids:0
@@ -3050,7 +3050,7 @@ msgstr "Taxa de moedas correntes de partida"
#: model:ir.actions.act_window,name:account.action_invoice_tree10
#: model:ir.ui.menu,name:account.menu_action_invoice_tree10
msgid "Draft Customer Refunds"
-msgstr "Esboço de reembolso a cliente"
+msgstr "Reembolso a Clientes Provisório"
#. module: account
#: field:account.journal.column,readonly:0
@@ -3127,12 +3127,12 @@ msgstr "Diário analítico"
#. module: account
#: rml:account.general.ledger:0
msgid "Entry Label"
-msgstr "Etiqueta de lançamento"
+msgstr "Aba de lançamento"
#. module: account
#: model:process.transition,note:account.process_transition_paymentreconcile0
msgid "Reconcilate the entries from payment"
-msgstr "Conciliação de lançamentos de pagamento"
+msgstr "Reconciliar os lançamentos do pagamento"
#. module: account
#: rml:account.tax.code.entries:0
@@ -3144,7 +3144,7 @@ msgstr "("
#: view:account.period:0
#: view:account.subscription:0
msgid "Set to Draft"
-msgstr "Definir como esboço"
+msgstr "Definir como Provisório"
#. module: account
#: help:account.invoice,origin:0
@@ -3279,7 +3279,7 @@ msgstr "Taxa média"
#: model:process.node,note:account.process_node_bankstatement0
#: model:process.node,note:account.process_node_supplierbankstatement0
msgid "Statement encoding produces payment entries"
-msgstr "Codificação de procedimentos de lançamentos de pagamento"
+msgstr "Codificação de demonstrativos para lançamentos de pagamento"
#. module: account
#: field:account.account,code:0
@@ -3321,7 +3321,7 @@ msgstr "Gerar Lançamentos Iniciais de Abertura do Ano Fiscal"
#. module: account
#: model:ir.actions.wizard,name:account.wizard_reconcile
msgid "Reconcile Entries"
-msgstr "Conciliar lançamentos"
+msgstr "Reconciliar lançamentos"
#. module: account
#: wizard_view:account.wizard_paid_open,init:0
@@ -3460,7 +3460,7 @@ msgstr ""
#. module: account
#: view:account.bank.statement:0
msgid "Real Entries"
-msgstr "Lançamento real"
+msgstr "Lançamentos Reais"
#. module: account
#: model:process.node,name:account.process_node_importinvoice0
@@ -3518,7 +3518,7 @@ msgstr ""
#: field:account.tax,parent_id:0
#: field:account.tax.template,parent_id:0
msgid "Parent Tax Account"
-msgstr "Conta pai da taxa"
+msgstr "Conta-pai de Impostos"
#. module: account
#: field:account.account,user_type:0
@@ -3649,7 +3649,7 @@ msgstr "Linha do projeto"
#. module: account
#: wizard_field:account.automatic.reconcile,init,max_amount:0
msgid "Maximum write-off amount"
-msgstr "Monante máximo de amortização"
+msgstr "Valor máximo da Baixa ou Exclusão"
#. module: account
#: field:account.invoice.tax,manual:0
@@ -3732,7 +3732,7 @@ msgstr "Definir ano fiscal e selecionar plano de contas"
#. module: account
#: wizard_field:account.move.line.reconcile,addendum,period_id:0
msgid "Write-Off Period"
-msgstr "Amortização do período"
+msgstr "Período de Baixa ou Exclusão"
#. module: account
#: selection:account.config.wizard,period:0
@@ -3756,7 +3756,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_payment_term_line
msgid "Payment Term Line"
-msgstr "Linha do termo de pagamento"
+msgstr "Linha da forma de pagamento"
#. module: account
#: selection:account.config.wizard,period:0
@@ -3789,7 +3789,7 @@ msgstr "Por data"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_config_wizard_form
msgid "Account Configure Wizard "
-msgstr "Assistente de configurção de conga "
+msgstr "Assistente de configuração de conta "
#. module: account
#: field:account.config.wizard,date1:0
@@ -3813,7 +3813,7 @@ msgstr "Todos lançamentos"
#: model:process.node,name:account.process_node_draftinvoices0
#: model:process.node,name:account.process_node_supplierdraftinvoices0
msgid "Draft Invoices"
-msgstr "Esboço de faturas"
+msgstr "Faturas Provisórias"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
@@ -3909,7 +3909,7 @@ msgstr "Outro"
#: model:ir.actions.wizard,name:account.wizard_general_ledger_report
#: model:ir.ui.menu,name:account.menu_general_ledger
msgid "General Ledger"
-msgstr "Ficha geral"
+msgstr "Livro Razão"
#. module: account
#: field:account.journal.view,columns_id:0
@@ -3938,7 +3938,7 @@ msgstr ""
#. module: account
#: model:process.node,note:account.process_node_manually0
msgid "Encode manually the statement"
-msgstr "Codifique manualmente o procedimento"
+msgstr "Codifique manualmente o demonstrativo"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_journal_form
@@ -4152,7 +4152,7 @@ msgstr ""
#: model:ir.actions.act_window,name:account.action_invoice_tree1
#: model:ir.ui.menu,name:account.menu_action_invoice_tree1
msgid "Customer Invoices"
-msgstr "Faturas de clients"
+msgstr "Faturas de Clientes"
#. module: account
#: field:res.partner,debit_limit:0
@@ -4502,7 +4502,7 @@ msgstr "Linha Modelo de lançamento"
#. module: account
#: view:account.tax.template:0
msgid "Account Tax Template"
-msgstr "Modelo de conta de taxa"
+msgstr "Modelo de conta de impostos"
#. module: account
#: help:account.model,name:0
@@ -4517,7 +4517,7 @@ msgstr "Abrir fatura"
#. module: account
#: model:process.node,note:account.process_node_draftstatement0
msgid "Set starting and ending balance for control"
-msgstr "Definir início e fim para o controle do balanço"
+msgstr "Defina o saldo inicial e final para controle"
#. module: account
#: wizard_view:account.wizard_paid_open,init:0
@@ -4556,7 +4556,7 @@ msgstr "Estado"
#: model:process.node,name:account.process_node_accountingentries0
#: model:process.node,name:account.process_node_supplieraccountingentries0
msgid "Accounting Entries"
-msgstr "Lançando contas"
+msgstr "Lançamentos Contábeis"
#. module: account
#: model:ir.actions.act_window,name:account.act_account_partner_account_move_unreconciled
@@ -4566,7 +4566,7 @@ msgstr "Receber & Pagar"
#. module: account
#: rml:account.general.ledger:0
msgid "General Ledger -"
-msgstr "Ficha geral -"
+msgstr "Livro Razão -"
#. module: account
#: field:report.hr.timesheet.invoice.journal,quantity:0
@@ -4592,20 +4592,20 @@ msgstr "Total"
#: model:process.transition,note:account.process_transition_customerinvoice0
#: model:process.transition,note:account.process_transition_suppliercustomerinvoice0
msgid "Number of entries are generated"
-msgstr "Numero de lançamentos a ser gerado"
+msgstr "Numero de lançamentos são gerados"
#. module: account
#: model:process.transition,name:account.process_transition_suppliervalidentries0
#: model:process.transition,name:account.process_transition_validentries0
msgid "Valid Entries"
-msgstr "Validar lançamentos"
+msgstr "Lançamentos Válidos"
#. module: account
#: model:ir.actions.wizard,name:account.wizard_account_use_model
#: model:ir.actions.wizard,name:account.wizard_line_account_use_model
#: model:ir.ui.menu,name:account.menu_account_use_model
msgid "Create Entries From Models"
-msgstr "Criar lançamentos de modelos"
+msgstr "Criar lançamentos dos modelos"
#. module: account
#: field:account.account.template,reconcile:0
@@ -4624,7 +4624,7 @@ msgstr "Por data"
#: model:ir.actions.act_window,name:account.action_invoice_tree4
#: model:ir.ui.menu,name:account.menu_action_invoice_tree4
msgid "Supplier Refunds"
-msgstr "reembolsos do fornecedor"
+msgstr "Reembolsos de Fornecedor"
#. module: account
#: help:account.model.line,date:0
@@ -4737,7 +4737,7 @@ msgstr ""
#. module: account
#: model:process.node,name:account.process_node_draftstatement0
msgid "Draft statement"
-msgstr "Procedimento de esboço"
+msgstr "Demonstrativo provisório"
#. module: account
#: field:account.analytic.journal,name:0
@@ -4843,7 +4843,7 @@ msgstr "Cancelado"
#: model:ir.actions.act_window,name:account.action_bank_statement_draft_tree
#: model:ir.ui.menu,name:account.menu_bank_statement_draft_tree
msgid "Draft statements"
-msgstr "Esboço de procedimentos"
+msgstr "Demonstrativos provisórios"
#. module: account
#: wizard_field:populate_statement_from_inv,init,date:0
@@ -4959,7 +4959,7 @@ msgstr "Selecione a conta-pai"
#. module: account
#: field:account.account.template,parent_id:0
msgid "Parent Account Template"
-msgstr "Modelo de conta pai"
+msgstr "Modelo de conta-pai"
#. module: account
#: help:account.tax,domain:0
@@ -5224,7 +5224,7 @@ msgstr "Modelo de codificação da conta de impostos"
#. module: account
#: view:account.subscription:0
msgid "Subscription Periods"
-msgstr "Inscrever períodos"
+msgstr "Períodos de Inscrição"
#. module: account
#: model:process.node,name:account.process_node_manually0
@@ -5286,7 +5286,7 @@ msgstr "Taxa de troca"
#: model:process.transition,note:account.process_transition_invoicemanually0
msgid "Encode manually statement comes into the draft statement"
msgstr ""
-"Codifique manualmente o procedimento dentro do procedimento de esboço"
+"O demonstrativo codificado manualmente entra no demonstrativo provisório"
#. module: account
#: model:ir.ui.menu,name:account.next_id_43
@@ -5359,7 +5359,7 @@ msgstr "Escolha diário e data de pagamento"
#: selection:account.period,state:0
#: selection:account.subscription,state:0
msgid "Draft"
-msgstr "Esboço"
+msgstr "Provisório"
#. module: account
#: rml:account.overdue:0
@@ -5774,7 +5774,7 @@ msgstr "Contas financeiras"
#. module: account
#: model:ir.model,name:account.model_account_chart_template
msgid "Templates for Account Chart"
-msgstr "Modelo de plano de contas"
+msgstr "Modelos para plano de contas"
#. module: account
#: view:account.config.wizard:0
@@ -5912,7 +5912,7 @@ msgstr "Futuro"
#: help:account.partner.balance.report,init,fiscalyear:0
#: help:account.third_party_ledger.report,init,fiscalyear:0
msgid "Keep empty for all open fiscal year"
-msgstr "Mantenha vazia para abrir todos os anos fiscais"
+msgstr "Mantenha vazia para todos os anos fiscais abertos"
#. module: account
#: rml:account.invoice:0
@@ -6072,4 +6072,4 @@ msgstr ""
#. module: account
#: wizard_button:account.subscription.generate,init,generate:0
msgid "Compute Entry Dates"
-msgstr "Calcular datas de entrada"
+msgstr "Processar Datas de Lançamento"
diff --git a/addons/account/i18n/ro.po b/addons/account/i18n/ro.po
index 67e7d9a8076..d2e837753f4 100644
--- a/addons/account/i18n/ro.po
+++ b/addons/account/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:03+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/ru.po b/addons/account/i18n/ru.po
index b9066bf67f7..abc9d069167 100644
--- a/addons/account/i18n/ru.po
+++ b/addons/account/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-02 15:44+0000\n"
-"Last-Translator: Nikolay Chesnokov \n"
+"PO-Revision-Date: 2010-04-03 16:42+0000\n"
+"Last-Translator: Alexandr Mitev \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-04-04 03:52+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -323,7 +323,7 @@ msgstr "Происхождение"
#. module: account
#: rml:account.analytic.account.journal:0
msgid "Move Name"
-msgstr ""
+msgstr "Имя перемещения"
#. module: account
#: xsl:account.transfer:0
@@ -355,7 +355,7 @@ msgstr "Налог"
#. module: account
#: rml:account.general.journal:0
msgid "Debit Trans."
-msgstr ""
+msgstr "Дебитовая сделка"
#. module: account
#: field:account.analytic.line,account_id:0
@@ -608,7 +608,7 @@ msgstr ""
#. module: account
#: view:account.journal:0
msgid "Entry Controls"
-msgstr ""
+msgstr "Контроль проводки"
#. module: account
#: help:account.model.line,sequence:0
@@ -642,7 +642,7 @@ msgstr "Условия платежа партнера"
#. module: account
#: view:account.move.reconcile:0
msgid "Account Entry Reconcile"
-msgstr ""
+msgstr "Согласование проводки по счету"
#. module: account
#: wizard_button:account.move.bank.reconcile,init,open:0
@@ -734,7 +734,7 @@ msgstr "Строки финансового документа"
#. module: account
#: model:process.transition,name:account.process_transition_supplieranalyticcost0
msgid "Analytic Invoice"
-msgstr ""
+msgstr "Аналитический счет"
#. module: account
#: field:account.journal.column,field:0
@@ -981,7 +981,7 @@ msgstr "Проводки по выражениям"
#. module: account
#: model:process.transition,name:account.process_transition_analyticinvoice0
msgid "analytic Invoice"
-msgstr ""
+msgstr "aналитический счет"
#. module: account
#: wizard_field:account.automatic.reconcile,init,period_id:0
diff --git a/addons/account/i18n/si.po b/addons/account/i18n/si.po
index 0f3e068e12d..18d9c8d9dd1 100644
--- a/addons/account/i18n/si.po
+++ b/addons/account/i18n/si.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:03+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/sk.po b/addons/account/i18n/sk.po
index 1e5b41c4ee7..a77e6acb015 100644
--- a/addons/account/i18n/sk.po
+++ b/addons/account/i18n/sk.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:03+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/sl.po b/addons/account/i18n/sl.po
index 34881317c10..4d7be78fa98 100644
--- a/addons/account/i18n/sl.po
+++ b/addons/account/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:03+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/sq.po b/addons/account/i18n/sq.po
index cd6961969e6..98dbcd66459 100644
--- a/addons/account/i18n/sq.po
+++ b/addons/account/i18n/sq.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/sr.po b/addons/account/i18n/sr.po
index be7a379eb54..f5b0253dfdd 100644
--- a/addons/account/i18n/sr.po
+++ b/addons/account/i18n/sr.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:03+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/sv.po b/addons/account/i18n/sv.po
index 071d06f1483..e49764b15f5 100644
--- a/addons/account/i18n/sv.po
+++ b/addons/account/i18n/sv.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-15 14:11+0000\n"
-"Last-Translator: Anders Wallenquist \n"
+"PO-Revision-Date: 2010-03-24 14:33+0000\n"
+"Last-Translator: Anders Eriksson (Mobila System) \n"
"Language-Team: <> <>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-16 04:46+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:04+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -24,7 +24,7 @@ msgstr "Internt namn"
#. module: account
#: view:account.tax.code:0
msgid "Account Tax Code"
-msgstr "Skattekontokod"
+msgstr "Konto, skattekod"
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree9
@@ -45,7 +45,7 @@ msgstr "Ange meddelande till rapporten försenade betalningar."
#. module: account
#: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
msgid "Confirm statement from draft"
-msgstr "Bekräfta verifikat från utkast"
+msgstr "Bekräfta preliminära verifikat"
#. module: account
#: model:account.account.type,name:account.account_type_asset
@@ -55,7 +55,7 @@ msgstr "Tillgång"
#. module: account
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
-msgstr "Ogiltigt modellnamn i åtgärdsdefinitionen."
+msgstr "Felaktigt namn för modell i händelsedefinitionen."
#. module: account
#: help:account.journal,currency:0
@@ -112,7 +112,7 @@ msgstr "Skriv ut momsrapport"
#. module: account
#: field:account.account,parent_id:0
msgid "Parent"
-msgstr "Ovanliggande"
+msgstr "Överliggande"
#. module: account
#: selection:account.move,type:0
@@ -141,7 +141,7 @@ msgstr "Ej avstämda transaktioner"
#. module: account
#: constraint:account.period:0
msgid "Error ! The duration of the Period(s) is/are invalid. "
-msgstr "Fel ! Varaktigheten i perioden/erna är felaktig "
+msgstr "Fel! Fel periodintervall. "
#. module: account
#: view:account.bank.statement.reconcile:0
@@ -262,7 +262,7 @@ msgstr "Summa Debet"
#. module: account
#: rml:account.tax.code.entries:0
msgid "Accounting Entries-"
-msgstr "Bokföringstransaktioner"
+msgstr "Bokföringstransaktioner-"
#. module: account
#: help:account.journal,view_id:0
@@ -272,6 +272,10 @@ msgid ""
"in which order. You can create your own view for a faster encoding in each "
"journal."
msgstr ""
+"Ger vyn som används när du skriver eller bläddrar poster i journalen. Vyn "
+"berättar för OpenERP vilka fält som ska synas, krävs eller skrivskyddas och "
+"i vilken ordning. Du kan skapa din egen vy för en snabbare kodning i varje "
+"journal."
#. module: account
#: help:account.invoice,date_due:0
@@ -282,6 +286,11 @@ msgid ""
"date empty, it means direct payment. The payment term may compute several "
"due dates, for example 50% now, 50% in one month."
msgstr ""
+"Om du använder betalningsvillkor, förfallodagen kommer att beräknas "
+"automatiskt vid generering av bokföringsposter. Om du lämnar "
+"betalningsvillkor och förfallodagen tomma betyder det direkt betalning. "
+"Betalningsvillkor kan beräkna flera förfallodatum, till exempel 50% nu, 50% "
+"efter en månad."
#. module: account
#: selection:account.tax,type:0
@@ -310,7 +319,7 @@ msgstr "Välj period"
#: field:account.invoice,origin:0
#: field:account.invoice.line,origin:0
msgid "Origin"
-msgstr "Ursprung"
+msgstr "Orginal"
#. module: account
#: rml:account.analytic.account.journal:0
@@ -355,7 +364,7 @@ msgstr "Debettransaktion"
#: field:account.move.line,analytic_account_id:0
#: field:report.hr.timesheet.invoice.journal,account_id:0
msgid "Analytic Account"
-msgstr "Objektkonto"
+msgstr "Objekt"
#. module: account
#: field:account.tax,child_depend:0
@@ -373,7 +382,7 @@ msgstr "Journalnamn"
#. module: account
#: view:account.payment.term:0
msgid "Description on invoices"
-msgstr "Beskrivning på faktura"
+msgstr "Beskrivning på fakturor"
#. module: account
#: constraint:account.analytic.account:0
@@ -425,7 +434,7 @@ msgstr "Negativ"
#. module: account
#: rml:account.partner.balance:0
msgid "(Account/Partner) Name"
-msgstr "(Konto/Företag) namn"
+msgstr "(Konto/Partner) namn"
#. module: account
#: selection:account.move,type:0
@@ -446,7 +455,7 @@ msgstr "Status"
#: 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 "Obetald Leverantörskredit"
#. module: account
#: view:account.tax:0
@@ -500,7 +509,7 @@ msgstr ""
#. module: account
#: view:report.hr.timesheet.invoice.journal:0
msgid "Analytic Entries Stats"
-msgstr "Objektposter"
+msgstr "Objektposter statistikKredit ber"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_tax_code_template_form
@@ -517,7 +526,7 @@ msgstr "Leverantörsfaktura"
#: model:process.transition,name:account.process_transition_reconcilepaid0
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
msgid "Reconcile Paid"
-msgstr ""
+msgstr "Kreditering betald"
#. module: account
#: wizard_field:account.chart,init,target_move:0
@@ -533,7 +542,7 @@ msgstr "Momsmallar"
#. module: account
#: field:account.invoice,reconciled:0
msgid "Paid/Reconciled"
-msgstr ""
+msgstr "Betald/Återbetald"
#. module: account
#: field:account.account.type,close_method:0
@@ -543,7 +552,7 @@ msgstr ""
#. module: account
#: field:account.tax.template,include_base_amount:0
msgid "Include in Base Amount"
-msgstr ""
+msgstr "Inkluder i basbeloppet"
#. module: account
#: field:account.tax,ref_base_code_id:0
@@ -573,6 +582,8 @@ 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 ""
+"Antal dagar för att lägga före beräkning av dagen i månaden. Om Datum = "
+"15/01, antal dagar = 22, Dag i månaden =- 1, blir sedan förfallodagen 28/02."
#. module: account
#: model:ir.model,name:account.model_account_tax
@@ -1337,7 +1348,7 @@ msgstr "Meddelande"
#. module: account
#: model:process.node,note:account.process_node_supplierpaymentorder0
msgid "Select invoices you want to pay and manages advances"
-msgstr ""
+msgstr "Välj fakturor du vill betala och hantera förväg"
#. module: account
#: selection:account.account,type:0
@@ -1674,7 +1685,7 @@ msgstr "Max antal:"
#. module: account
#: wizard_button:account.invoice.refund,init,refund:0
msgid "Refund Invoice"
-msgstr ""
+msgstr "Kreditera Faktura"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_period_tree
@@ -2060,7 +2071,7 @@ msgstr "Preliminär faktura"
#. module: account
#: model:account.account.type,name:account.account_type_expense
msgid "Expense"
-msgstr "Kostnad"
+msgstr "Utgift"
#. module: account
#: field:account.journal,invoice_sequence_id:0
@@ -2190,7 +2201,7 @@ msgstr "(lämna blank för aktuell period)"
#: model:ir.actions.act_window,name:account.action_invoice_tree8
#: model:ir.ui.menu,name:account.menu_action_invoice_tree8
msgid "Draft Supplier Invoices"
-msgstr ""
+msgstr "Preliminära kundfakturor"
#. module: account
#: wizard_field:account.invoice.refund,init,period:0
@@ -3057,6 +3068,8 @@ msgid ""
"If this box is checked, the system will try to group the accounting lines "
"when generating them from invoices."
msgstr ""
+"Om denna ruta är markerad, kommer systemet att försöka gruppera redovisning "
+"raderna när du skapar dem från fakturor."
#. module: account
#: wizard_field:account.move.line.reconcile,init_full,trans_nbr:0
@@ -3255,7 +3268,7 @@ msgstr "Kod"
#. module: account
#: model:ir.ui.menu,name:account.menu_finance
msgid "Financial Management"
-msgstr "Bokföring"
+msgstr "Redovisning"
#. module: account
#: selection:account.account.type,close_method:0
@@ -3316,7 +3329,7 @@ msgstr ""
#: field:account.tax.code,notprintable:0
#: field:account.tax.code.template,notprintable:0
msgid "Not Printable in Invoice"
-msgstr ""
+msgstr "Inte utskrivbar i faktura"
#. module: account
#: field:account.move.line,move_id:0
@@ -3637,6 +3650,8 @@ msgid ""
"Check this box if you don't want any VAT related to this Tax Code to appear "
"on invoices"
msgstr ""
+"Markera rutan om du inte vill att någon moms i samband med detta skattelagen "
+"att visas på fakturor"
#. module: account
#: field:account.account.type,sequence:0
@@ -3649,7 +3664,7 @@ msgstr ""
#: field:account.tax.template,sequence:0
#: field:fiscalyear.seq,sequence_id:0
msgid "Sequence"
-msgstr "Nummerserie"
+msgstr "Sekvens"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
@@ -4053,7 +4068,7 @@ msgstr "Nettobelopp"
#. module: account
#: field:account.invoice.line,invoice_id:0
msgid "Invoice Ref"
-msgstr ""
+msgstr "Fakturaref"
#. module: account
#: field:account.analytic.line,general_account_id:0
@@ -4125,7 +4140,7 @@ msgstr "Valuta för boken"
#: view:account.journal.column:0
#: model:ir.model,name:account.model_account_journal_column
msgid "Journal Column"
-msgstr ""
+msgstr "Journalkolumn"
#. module: account
#: selection:account.fiscalyear,state:0
diff --git a/addons/account/i18n/te.po b/addons/account/i18n/te.po
index 1db4863bfeb..081257a0bc2 100644
--- a/addons/account/i18n/te.po
+++ b/addons/account/i18n/te.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:04+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/th.po b/addons/account/i18n/th.po
index 33077b537c0..b39fc960c96 100644
--- a/addons/account/i18n/th.po
+++ b/addons/account/i18n/th.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-16 04:46+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:04+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/tlh.po b/addons/account/i18n/tlh.po
index e6b2c926af1..d6efbb8c4bb 100644
--- a/addons/account/i18n/tlh.po
+++ b/addons/account/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:04+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/tr.po b/addons/account/i18n/tr.po
index 00447bb4e06..31b7274f430 100644
--- a/addons/account/i18n/tr.po
+++ b/addons/account/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:04+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/uk.po b/addons/account/i18n/uk.po
index 72df1012db1..d85415dd4ca 100644
--- a/addons/account/i18n/uk.po
+++ b/addons/account/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:04+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/vi.po b/addons/account/i18n/vi.po
index b3fb7a12ee6..c2332e4d4a6 100644
--- a/addons/account/i18n/vi.po
+++ b/addons/account/i18n/vi.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:04+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po
index 8939ed15837..247ae5c4ab4 100644
--- a/addons/account/i18n/zh_CN.po
+++ b/addons/account/i18n/zh_CN.po
@@ -4,16 +4,16 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-01-09 08:50+0000\n"
+"PO-Revision-Date: 2010-03-29 00:34+0000\n"
"Last-Translator: digitalsatori \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:04+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -40,7 +40,7 @@ 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
@@ -115,7 +115,7 @@ msgstr "上级科目"
#. module: account
#: selection:account.move,type:0
msgid "Journal Voucher"
-msgstr "日记账原始凭证"
+msgstr "原始凭证分类帐"
#. module: account
#: field:account.invoice,residual:0
@@ -139,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
@@ -182,7 +182,7 @@ msgstr "科目表"
#. module: account
#: model:ir.actions.wizard,name:account.wizard_move_line_select
msgid "Move line select"
-msgstr "选择凭证明细"
+msgstr "选择凭证行"
#. module: account
#: rml:account.journal.period.print:0
@@ -266,7 +266,7 @@ msgid ""
"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 "给出日记账凭证浏览和写入时使用的视图.这视图规定系统那个字段可见、必须或者只读.你能为每个日记账创建你自己的快速视图"
+msgstr "给出分类帐的凭证浏览和写入的视图.这视图规定系统那个字段可见、必须或只读.你能为每个分类帐创建你自己的视图"
#. module: account
#: help:account.invoice,date_due:0
@@ -313,7 +313,7 @@ msgstr "来源"
#. module: account
#: rml:account.analytic.account.journal:0
msgid "Move Name"
-msgstr "过帐名称"
+msgstr "凭证名称"
#. module: account
#: xsl:account.transfer:0
@@ -323,7 +323,7 @@ msgstr "参考"
#. module: account
#: wizard_view:account.subscription.generate,init:0
msgid "Subscription Compute"
-msgstr "预定计算"
+msgstr "周期性计算"
#. module: account
#: rml:account.central.journal:0
@@ -353,7 +353,7 @@ msgstr "借方交易"
#: field:account.move.line,analytic_account_id:0
#: field:report.hr.timesheet.invoice.journal,account_id:0
msgid "Analytic Account"
-msgstr "核算科目"
+msgstr "辅助核算项目"
#. module: account
#: field:account.tax,child_depend:0
@@ -366,7 +366,7 @@ msgstr "子税"
#: rml:account.general.journal:0
#: field:account.journal,name:0
msgid "Journal Name"
-msgstr "日记账名称"
+msgstr "分类帐名称"
#. module: account
#: view:account.payment.term:0
@@ -376,7 +376,7 @@ 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
@@ -387,7 +387,7 @@ msgstr "分录合计"
#: 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
@@ -423,12 +423,12 @@ msgstr "负数"
#. module: account
#: rml:account.partner.balance:0
msgid "(Account/Partner) Name"
-msgstr "(帐户/业务伙伴)名称"
+msgstr "(业务伙伴/科目)名称"
#. module: account
#: selection:account.move,type:0
msgid "Contra"
-msgstr "抵销"
+msgstr "反向"
#. module: account
#: field:account.analytic.account,state:0
@@ -444,7 +444,7 @@ 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
@@ -462,12 +462,12 @@ 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
msgid "Disc.(%)"
-msgstr "降价(%)"
+msgstr "折扣(%)"
#. module: account
#: rml:account.general.ledger:0
@@ -493,18 +493,18 @@ 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
msgid "Analytic Entries Stats"
-msgstr "核算凭证统计"
+msgstr "辅助核算凭证统计"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_tax_code_template_form
#: model:ir.ui.menu,name:account.menu_action_account_tax_code_template_form
msgid "Tax Code Templates"
-msgstr "税代码模板"
+msgstr "税务模板"
#. module: account
#: view:account.invoice:0
@@ -515,7 +515,7 @@ msgstr "供应商发票"
#: model:process.transition,name:account.process_transition_reconcilepaid0
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
msgid "Reconcile Paid"
-msgstr "对账已付"
+msgstr "对账的付款"
#. module: account
#: wizard_field:account.chart,init,target_move:0
@@ -541,13 +541,13 @@ msgstr "递延方法"
#. module: account
#: field:account.tax.template,include_base_amount:0
msgid "Include in Base Amount"
-msgstr "含基本金额"
+msgstr "基础金额"
#. module: account
#: field:account.tax,ref_base_code_id:0
#: field:account.tax.template,ref_base_code_id:0
msgid "Refund Base Code"
-msgstr "退税基础的代码"
+msgstr "退税基于"
#. module: account
#: view:account.invoice.line:0
@@ -570,7 +570,7 @@ msgstr "真"
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 "天数在计算月日期前加入,如果日期=15/01,天数=22,月=1,到期日期是28/02"
+msgstr "天数在计算前加入月的天数,如日期为01/15,天数是22,月是1,则应付日期是02/28"
#. module: account
#: model:ir.model,name:account.model_account_tax
@@ -591,7 +591,7 @@ msgstr "过帐"
#: model:ir.actions.wizard,name:account.wizard_aged_trial_balance
#: model:ir.ui.menu,name:account.menu_aged_trial_balance
msgid "Aged Partner Balance"
-msgstr "旧的业务伙伴余额"
+msgstr "账龄分析表"
#. module: account
#: view:account.journal:0
@@ -635,7 +635,7 @@ msgstr "凭证对账"
#. module: account
#: wizard_button:account.move.bank.reconcile,init,open:0
msgid "Open for bank reconciliation"
-msgstr "打开银行对账单"
+msgstr "打开银行对账"
#. module: account
#: field:account.invoice.line,discount:0
@@ -646,7 +646,7 @@ msgstr "折扣(%)"
#: wizard_field:account.move.line.reconcile,init_full,writeoff:0
#: wizard_field:account.move.line.reconcile,init_partial,writeoff:0
msgid "Write-Off amount"
-msgstr "勾销金额"
+msgstr "补差额金额"
#. module: account
#: help:account.fiscalyear,company_id:0
@@ -656,12 +656,12 @@ msgstr "如果这会计年度属于几个公司留空"
#. module: account
#: model:ir.ui.menu,name:account.menu_analytic_accounting
msgid "Analytic Accounting"
-msgstr "核算会计"
+msgstr "成本会计"
#. module: account
#: rml:account.overdue:0
msgid "Sub-Total :"
-msgstr "小计 :"
+msgstr "小计 :"
#. module: account
#: field:account.analytic.account,line_ids:0
@@ -669,7 +669,7 @@ msgstr "小计 :"
#: model:ir.actions.act_window,name:account.action_account_analytic_line_form
#: model:ir.ui.menu,name:account.next_id_41
msgid "Analytic Entries"
-msgstr "核算凭证"
+msgstr "辅助核算凭证"
#. module: account
#: selection:account.subscription,period_type:0
@@ -679,7 +679,7 @@ msgstr "月"
#. module: account
#: field:account.analytic.account,partner_id:0
msgid "Associated Partner"
-msgstr "相关的业务伙伴"
+msgstr "相关业务伙伴"
#. module: account
#: field:account.invoice,comment:0
@@ -712,17 +712,17 @@ msgstr "客户欠款金额合计"
#. module: account
#: view:account.move.line:0
msgid "St."
-msgstr "状态"
+msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_tax_code_line_open
msgid "account.move.line"
-msgstr "account.move.line"
+msgstr "科目.凭证.明细"
#. module: account
#: model:process.transition,name:account.process_transition_supplieranalyticcost0
msgid "Analytic Invoice"
-msgstr "核算发票"
+msgstr "辅助核算发票"
#. module: account
#: field:account.journal.column,field:0
@@ -738,7 +738,7 @@ msgstr "上级符号"
#. module: account
#: field:account.fiscalyear,end_journal_period_id:0
msgid "End of Year Entries Journal"
-msgstr "年度期末日记账凭证"
+msgstr "年度期末分类帐"
#. module: account
#: view:product.product:0
@@ -811,20 +811,20 @@ msgstr "凭证明细"
#. module: account
#: model:ir.model,name:account.model_account_config_wizard
msgid "account.config.wizard"
-msgstr "向导"
+msgstr "科目.设置.向导"
#. module: account
#: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree
#: model:ir.ui.menu,name:account.report_account_analytic_journal_print
msgid "Account cost and revenue by journal"
-msgstr "成本和收入日记账"
+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."
-msgstr "这定义的类型根据你的国家.这类型包含更多的信息如:科目和特定的信息"
+msgstr "这定义的类型根据你的国家.这类型包含更多的信息如:科目和特定的信息"
#. module: account
#: selection:account.automatic.reconcile,init,power:0
@@ -834,7 +834,7 @@ msgstr "6"
#. module: account
#: model:ir.ui.menu,name:account.next_id_30
msgid "Bank Reconciliation"
-msgstr "银行对账单"
+msgstr "银行对账"
#. module: account
#: model:ir.model,name:account.model_account_account_template
@@ -846,19 +846,19 @@ msgstr "科目模板"
#: model:ir.model,name:account.model_account_analytic_account
#: model:ir.ui.menu,name:account.account_analytic_def_account
msgid "Analytic Accounts"
-msgstr "核算科目"
+msgstr "辅助核算项目"
#. module: account
#: wizard_view:account.print.journal.report,init:0
#: model:ir.actions.wizard,name:account.wizard_print_journal
#: model:ir.ui.menu,name:account.menu_print_journal
msgid "Print Journal"
-msgstr "打印日记账"
+msgstr "打印分类帐"
#. module: account
#: model:ir.model,name:account.model_account_bank_accounts_wizard
msgid "account.bank.accounts.wizard"
-msgstr "银行.科目.向导"
+msgstr "科目.银行.科目.向导"
#. module: account
#: field:account.move.line,date_created:0
@@ -874,7 +874,7 @@ msgstr "取消发票"
#. module: account
#: field:account.journal.column,required:0
msgid "Required"
-msgstr "必需项"
+msgstr "必须的"
#. module: account
#: field:product.category,property_account_expense_categ:0
@@ -885,7 +885,7 @@ msgstr "费用科目"
#. module: account
#: wizard_field:account.move.line.reconcile,addendum,journal_id:0
msgid "Write-Off Journal"
-msgstr "勾销日记账"
+msgstr "补差额分类帐"
#. module: account
#: field:account.model.line,amount_currency:0
@@ -896,7 +896,7 @@ msgstr "货币金额"
#. module: account
#: field:account.chart.template,property_account_expense_categ:0
msgid "Expense Category Account"
-msgstr "费用分类科目"
+msgstr "费用类科目"
#. module: account
#: wizard_field:account.fiscalyear.close,init,fy2_id:0
@@ -949,7 +949,7 @@ msgstr "基础代码金额"
#. module: account
#: help:account.journal,user_id:0
msgid "The user responsible for this journal"
-msgstr "这日记账的责任用户"
+msgstr "这分类帐的责任用户"
#. module: account
#: field:account.journal,default_debit_account_id:0
@@ -960,7 +960,7 @@ msgstr "默认借方科目"
#: model:ir.actions.act_window,name:account.action_bank_statement_tree
#: model:ir.ui.menu,name:account.menu_bank_statement_tree
msgid "Entries by Statements"
-msgstr "输入银行结算单凭证"
+msgstr "银行对账单"
#. module: account
#: model:process.transition,name:account.process_transition_analyticinvoice0
@@ -1069,7 +1069,7 @@ msgstr "主序列"
#: model:ir.actions.act_window,name:account.action_account_analytic_journal_tree
#: model:ir.ui.menu,name:account.account_analytic_journal_print
msgid "Print Analytic Journals"
-msgstr "打印核算日记账"
+msgstr "打印辅助核算分类帐"
#. module: account
#: rml:account.tax.code.entries:0
@@ -1086,7 +1086,7 @@ msgstr "序列字段用于付款条款行的排序从低到高."
#. module: account
#: field:account.bank.statement.reconcile,total_new:0
msgid "Total write-off"
-msgstr "勾销金额合计"
+msgstr "补差额金额合计"
#. module: account
#: view:account.tax.template:0
@@ -1105,18 +1105,18 @@ msgstr "税代码"
#: field:account.tax.template,chart_template_id:0
#: field:wizard.multi.charts.accounts,chart_template_id:0
msgid "Chart Template"
-msgstr "图表模板"
+msgstr "列表模板"
#. module: account
#: field:account.chart.template,property_account_income_categ:0
msgid "Income Category Account"
-msgstr "收入分类科目"
+msgstr "收入类科目"
#. module: account
#: model:ir.actions.act_window,name:account.analytic_account_form
#: model:ir.ui.menu,name:account.account_analytic_form
msgid "New Analytic Account"
-msgstr "新的核算科目"
+msgstr "新的辅助核算项目"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
@@ -1133,7 +1133,7 @@ msgstr "单价"
#. module: account
#: rml:account.analytic.account.journal:0
msgid "Period from :"
-msgstr "时期从"
+msgstr "会计期间从:"
#. module: account
#: model:ir.model,name:account.model_wizard_multi_charts_accounts
@@ -1211,8 +1211,7 @@ msgid ""
"software system you may have to use the rate at date. Incoming transactions "
"always use the rate at date."
msgstr ""
-"这将选择将要结束的交易的当前汇率计算.在大多数国家法定为平均但是只有少数软件系统能够管理.所以如果你导入另一个软件系统你必须使用当日汇率导入的交易总是使用"
-"这当日汇率"
+"这将选择将要兑换的当前计算汇率.在大多数国家法定为\"平均\"但只有少数软件系统能够管理.所以如果你导入另一个软件系统,你可能需要使用当日汇率"
#. module: account
#: field:account.account,company_currency_id:0
@@ -1227,12 +1226,12 @@ msgstr "财务结构模板科目一览"
#. module: account
#: field:account.analytic.account,parent_id:0
msgid "Parent Analytic Account"
-msgstr "上级核算科目"
+msgstr "上级辅助核算项目"
#. module: account
#: wizard_button:account.move.line.reconcile,init_partial,addendum:0
msgid "Reconcile With Write-Off"
-msgstr "勾销时对账"
+msgstr "补差额时对账"
#. module: account
#: field:account.move.line,tax_amount:0
@@ -1247,7 +1246,7 @@ msgstr "科目代码使用数字"
#. module: account
#: field:account.bank.statement,balance_end_real:0
msgid "Ending Balance"
-msgstr "期末余额"
+msgstr "期末结余"
#. module: account
#: view:product.product:0
@@ -1267,7 +1266,7 @@ msgstr "固定金额"
#. module: account
#: rml:account.analytic.account.analytic.check:0
msgid "Analytic Credit"
-msgstr "核算贷方"
+msgstr "辅助核算贷方"
#. module: account
#: field:account.move.line,reconcile_partial_id:0
@@ -1278,7 +1277,7 @@ msgstr "部分对账"
#. module: account
#: wizard_field:account.automatic.reconcile,reconcile,unreconciled:0
msgid "Not reconciled transactions"
-msgstr "没对账的交易"
+msgstr "没对账的业务"
#. module: account
#: view:account.fiscal.position:0
@@ -1301,7 +1300,7 @@ msgstr "值"
#: wizard_field:account.invoice.pay,addendum,writeoff_acc_id:0
#: wizard_field:account.move.line.reconcile,addendum,writeoff_acc_id:0
msgid "Write-Off account"
-msgstr "勾销科目"
+msgstr "补差额科目"
#. module: account
#: field:account.model.line,model_id:0
@@ -1323,7 +1322,7 @@ msgstr "汇总副本"
#. module: account
#: view:wizard.company.setup:0
msgid "Message"
-msgstr "消息"
+msgstr "信息"
#. module: account
#: model:process.node,note:account.process_node_supplierpaymentorder0
@@ -1351,7 +1350,7 @@ msgstr "所有"
#: field:account.move.line,analytic_lines:0
#: model:ir.model,name:account.model_account_analytic_line
msgid "Analytic lines"
-msgstr "核算明细"
+msgstr "辅助核算明细"
#. module: account
#: help:account.tax,type:0
@@ -1362,7 +1361,7 @@ msgstr "税金的计算方法"
#: model:process.node,note:account.process_node_accountingentries0
#: model:process.node,note:account.process_node_supplieraccountingentries0
msgid "Validated accounting entries."
-msgstr "确认凭证"
+msgstr "审核凭证"
#. module: account
#: wizard_view:account.move.line.unreconcile,init:0
@@ -1370,7 +1369,7 @@ msgstr "确认凭证"
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 "如果未对账交易你必须检验交易所有操作.因为他们不会被禁止."
+msgstr "如果进行未对账处理你必须检验处理的所有操作.因为他们不会被禁止."
#. module: account
#: model:process.node,name:account.process_node_electronicfile0
@@ -1418,7 +1417,7 @@ msgstr "科目类型"
#: wizard_field:populate_statement_from_inv,init,journal_id:0
#: field:report.hr.timesheet.invoice.journal,journal_id:0
msgid "Journal"
-msgstr "日记账"
+msgstr "分类帐"
#. module: account
#: field:account.account,child_id:0
@@ -1445,7 +1444,7 @@ msgstr "显示科目 "
#. module: account
#: model:ir.model,name:account.model_account_bank_statement_reconcile_line
msgid "Statement reconcile line"
-msgstr "结算单对账明细"
+msgstr "对账单对账明细"
#. module: account
#: view:account.tax:0
@@ -1459,7 +1458,7 @@ msgstr "留空为使用收入科目"
#: wizard_view:account.move.line.reconcile,init_full:0
#: wizard_view:account.move.line.reconcile,init_partial:0
msgid "Write-Off"
-msgstr "勾销"
+msgstr "补差额"
#. module: account
#: help:account.invoice,partner_bank:0
@@ -1483,17 +1482,17 @@ msgstr "关闭状态"
#. module: account
#: model:ir.model,name:account.model_wizard_company_setup
msgid "wizard.company.setup"
-msgstr "wizard.company.setup"
+msgstr "向导.公司.设置"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_analytic_account_line_extended_form
msgid "account.analytic.line.extended"
-msgstr "科目.核算.明细.延伸"
+msgstr "项目.辅助核算.明细.延伸"
#. module: account
#: field:account.journal,refund_journal:0
msgid "Refund Journal"
-msgstr "退款日记账"
+msgstr "退款分类帐"
#. module: account
#: model:account.account.type,name:account.account_type_income
@@ -1525,7 +1524,7 @@ msgstr "正数"
#: model:ir.actions.wizard,name:account.wizard_general_journal
#: model:ir.ui.menu,name:account.menu_general_journal
msgid "Print General Journal"
-msgstr "打印普通日记账"
+msgstr "打印普通分类帐"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_chart_template_form
@@ -1548,7 +1547,7 @@ msgstr "从模板产生科目表"
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_legal_statement
msgid "Legal Statements"
-msgstr "正式报表"
+msgstr "法定报表"
#. module: account
#: field:account.tax.code,parent_id:0
@@ -1559,7 +1558,7 @@ msgstr "上级代码"
#. module: account
#: wizard_button:account.move.line.reconcile.select,init,open:0
msgid "Open for reconciliation"
-msgstr "打开对账凭证"
+msgstr "打开对账"
#. module: account
#: model:account.journal,name:account.bilan_journal
@@ -1605,7 +1604,7 @@ msgstr "应收款与应付款科目"
#: view:account.subscription:0
#: field:account.subscription,lines_id:0
msgid "Subscription Lines"
-msgstr "预定明细"
+msgstr "周期明细"
#. module: account
#: selection:account.analytic.journal,type:0
@@ -1657,7 +1656,7 @@ msgstr "开始余额"
#: model:ir.actions.act_window,name:account.action_account_journal_period_tree
#: model:ir.ui.menu,name:account.menu_action_account_journal_period_tree
msgid "Journals"
-msgstr "日记账"
+msgstr "分类帐"
#. module: account
#: rml:account.analytic.account.quantity_cost_ledger:0
@@ -1684,7 +1683,7 @@ msgstr "成本&收入"
#. module: account
#: constraint:account.account:0
msgid "Error ! You can not create recursive accounts."
-msgstr "错误!你不能创建递归科目。"
+msgstr "错误!你不能创建递归的科目"
#. module: account
#: rml:account.tax.code.entries:0
@@ -1730,7 +1729,7 @@ msgstr "第三贷方"
#: model:ir.actions.wizard,name:account.wizard_reconcile_unreconcile
#: model:ir.actions.wizard,name:account.wizard_unreconcile
msgid "Unreconcile Entries"
-msgstr "未对账凭证"
+msgstr "凭证转为未对账"
#. module: account
#: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -1746,7 +1745,7 @@ msgstr "会计期间的成本分类账"
#: model:ir.actions.act_window,name:account.action_bank_statement_tree2
#: model:ir.ui.menu,name:account.menu_bank_statement_tree2
msgid "New Statement"
-msgstr "新银行结算单"
+msgstr "新银行对账单"
#. module: account
#: wizard_field:account.analytic.account.chart,init,from_date:0
@@ -1765,7 +1764,7 @@ msgstr "发票和付款的对账凭证"
#: model:ir.actions.wizard,name:account.wizard_central_journal
#: model:ir.ui.menu,name:account.menu_central_journal
msgid "Print Central Journal"
-msgstr "打印总账"
+msgstr "打印分类帐(按科目)"
#. module: account
#: wizard_field:account.aged.trial.balance,init,period_length:0
@@ -1782,7 +1781,7 @@ msgstr "百分比"
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_charts
msgid "Charts"
-msgstr "图表"
+msgstr "科目列表"
#. module: account
#: selection:account.analytic.journal,type:0
@@ -1813,12 +1812,12 @@ msgstr "日期或者代码"
#. module: account
#: field:account.analytic.account,user_id:0
msgid "Account Manager"
-msgstr "科目管理"
+msgstr "项目管理员"
#. module: account
#: rml:account.analytic.account.journal:0
msgid "to :"
-msgstr "至:"
+msgstr "到:"
#. module: account
#: wizard_field:account.move.line.reconcile,init_full,debit:0
@@ -1856,7 +1855,7 @@ msgstr "开始日期"
#. module: account
#: model:account.journal,name:account.refund_expenses_journal
msgid "x Expenses Credit Notes Journal"
-msgstr "x 退款费用日记账"
+msgstr "x 费用贷方票据分类帐"
#. module: account
#: field:account.analytic.journal,type:0
@@ -1888,7 +1887,7 @@ msgstr "发票税科目"
#. module: account
#: view:account.move.line:0
msgid "Analytic Lines"
-msgstr "核算明细"
+msgstr "辅助核算凭证明细"
#. module: account
#: wizard_view:account.invoice.pay,init:0
@@ -1910,7 +1909,7 @@ msgstr "客户发票草稿"
#. module: account
#: model:ir.model,name:account.model_account_subscription_line
msgid "Account Subscription Line"
-msgstr "科目预定明细"
+msgstr "科目周期明细"
#. module: account
#: selection:account.account.balance.report,checktype,state:0
@@ -1938,7 +1937,7 @@ msgstr "排序按:"
#. module: account
#: field:account.move,to_check:0
msgid "To Be Verified"
-msgstr "待核实"
+msgstr "待审核"
#. module: account
#: help:res.partner,debit:0
@@ -1989,7 +1988,7 @@ msgstr " 开始日期"
#. module: account
#: wizard_view:account.analytic.account.journal.report,init:0
msgid "Analytic Journal Report"
-msgstr "核算日记账报表"
+msgstr "辅助核算分类帐报表"
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree3
@@ -2010,13 +2009,13 @@ msgstr "成本分类账或凭证名称"
#. module: account
#: field:account.journal.period,name:0
msgid "Journal-Period Name"
-msgstr "日记账-会计期间名称"
+msgstr "分类帐-会计期间名称"
#. module: account
#: field:account.tax.code,name:0
#: field:account.tax.code.template,name:0
msgid "Tax Case Name"
-msgstr "税事务名称"
+msgstr "税务名称"
#. module: account
#: help:account.journal,entry_posted:0
@@ -2024,7 +2023,7 @@ 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 "如果你不想新的凭证从草稿状态来生成而是直接通过手动确认到登账状态勾选此项"
+msgstr "如果你不想新的凭证从草稿状态来生成而是直接通过手动确认到已审核状态"
#. module: account
#: field:account.bank.statement.line,partner_id:0
@@ -2043,7 +2042,7 @@ msgstr "业务伙伴"
msgid ""
"Unique number of the invoice, computed automatically when the invoice is "
"created."
-msgstr "唯一的发票编号计算是发票创建时自动计算"
+msgstr "发票创建时自动计算唯一的发票编号"
#. module: account
#: rml:account.invoice:0
@@ -2073,7 +2072,7 @@ msgstr "客户发票处理"
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Position Remark :"
-msgstr "应税设定备注"
+msgstr "财务结构备注:"
#. module: account
#: wizard_field:account.fiscalyear.close,init,period_id:0
@@ -2085,7 +2084,7 @@ msgstr "会计期间开账凭证"
#: model:ir.actions.wizard,name:account.wizard_validate_account_moves_line
#: model:ir.ui.menu,name:account.menu_validate_account_moves
msgid "Validate Account Moves"
-msgstr "确认凭证"
+msgstr "审核凭证"
#. module: account
#: selection:account.subscription,period_type:0
@@ -2114,7 +2113,7 @@ msgstr "货币"
#. module: account
#: model:ir.actions.act_window,name:account.act_account_journal_2_account_invoice_opened
msgid "Unpaid invoices"
-msgstr "未支付发票"
+msgstr "未支付的发票"
#. module: account
#: model:process.transition,name:account.process_transition_paymentreconcile0
@@ -2125,13 +2124,13 @@ msgstr "付款对账"
#: model:ir.actions.act_window,name:account.action_bank_statement_reconciliation_form
#: model:ir.ui.menu,name:account.menu_action_account_bank_reconcile_tree
msgid "Statements reconciliation"
-msgstr "结算单对账"
+msgstr "对账单对账"
#. module: account
#: model:ir.actions.act_window,name:account.action_subscription_form_new
#: model:ir.ui.menu,name:account.menu_action_subscription_form_new
msgid "New Subscription"
-msgstr "新预定"
+msgstr "新周期性凭证"
#. module: account
#: view:account.payment.term:0
@@ -2141,7 +2140,7 @@ msgstr "计算"
#. module: account
#: view:account.analytic.line:0
msgid "Analytic Entry"
-msgstr "核算凭证"
+msgstr "辅助核算凭证"
#. module: account
#: view:res.company:0 field:res.company,overdue_msg:0
@@ -2157,12 +2156,12 @@ msgstr "税一览表"
#. module: account
#: field:account.payment.term.line,value_amount:0
msgid "Value Amount"
-msgstr "价值金额"
+msgstr "计算金额"
#. module: account
#: model:ir.actions.act_window,name:account.act_account_acount_move_line_reconcile_open
msgid "Reconciled entries"
-msgstr "已对账凭证"
+msgstr "对账的凭证"
#. module: account
#: field:account.invoice,address_contact_id:0
@@ -2231,18 +2230,18 @@ msgstr "科目表"
#. module: account
#: model:account.journal,name:account.check_journal
msgid "x Checks Journal"
-msgstr "x 检查日记账"
+msgstr "x 支票分类帐"
#. module: account
#: model:ir.actions.wizard,name:account.wizard_generate_subscription
#: model:ir.ui.menu,name:account.menu_generate_subscription
msgid "Create subscription entries"
-msgstr "创建预定凭证"
+msgstr "创建周期性凭证"
#. module: account
#: wizard_field:account.fiscalyear.close,init,journal_id:0
msgid "Opening Entries Journal"
-msgstr "日记账开账凭证"
+msgstr "分类帐开账凭证"
#. module: account
#: view:account.config.wizard:0
@@ -2257,7 +2256,7 @@ msgstr "客户税"
#. module: account
#: field:account.invoice,date_invoice:0
msgid "Date Invoiced"
-msgstr "发票日期"
+msgstr "开票日期"
#. module: account
#: help:account.account.balance.report,checktype,periods:0
@@ -2328,7 +2327,7 @@ msgstr "税类型"
#. module: account
#: model:process.transition,name:account.process_transition_statemententries0
msgid "Statement Entries"
-msgstr "结算单凭证"
+msgstr "凭证"
#. module: account
#: field:account.analytic.line,user_id:0
@@ -2371,7 +2370,7 @@ msgstr "进项发票"
#. module: account
#: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0
msgid "and Journals"
-msgstr "和日记账"
+msgstr "和分类帐"
#. module: account
#: view:account.tax:0
@@ -2381,24 +2380,24 @@ msgstr "税"
#. module: account
#: field:account.analytic.line,move_id:0
msgid "Move Line"
-msgstr "凭证明细"
+msgstr "凭证行"
#. module: account
#: field:account.bank.accounts.wizard,acc_no:0
msgid "Account No."
-msgstr "科目号"
+msgstr "科目No"
#. 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."
-msgstr "设置如果税计算是根据子税而不是金额合计"
+msgstr "设置如果税计算是基于子税而不是合计"
#. module: account
#: rml:account.central.journal:0
msgid "Journal Code"
-msgstr "日记账代码"
+msgstr "分类帐代码"
#. module: account
#: help:account.tax,applicable_type:0
@@ -2435,7 +2434,7 @@ msgstr "适用代码(如果类型=代码)"
#. module: account
#: wizard_button:account.move.journal,init,open:0
msgid "Open Journal"
-msgstr "打开日记账"
+msgstr "打开分类帐"
#. module: account
#: rml:account.analytic.account.journal:0
@@ -2448,7 +2447,7 @@ msgstr "KI"
#: model:ir.ui.menu,name:account.account_entries_analytic_entries
#: model:ir.ui.menu,name:account.menu_action_move_journal_line_form
msgid "Entries Encoding by Line"
-msgstr "凭证明细"
+msgstr "凭证"
#. module: account
#: help:account.chart.template,tax_template_ids:0
@@ -2466,7 +2465,7 @@ msgstr "会计期间从"
#: model:process.node,name:account.process_node_bankstatement0
#: model:process.node,name:account.process_node_supplierbankstatement0
msgid "Bank Statement"
-msgstr "银行结算单"
+msgstr "银行对账单"
#. module: account
#: wizard_view:account.invoice.pay,addendum:0
@@ -2483,7 +2482,7 @@ msgstr "凭证对账"
#. module: account
#: help:account.bank.statement.reconcile,total_second_amount:0
msgid "The amount in the currency of the journal"
-msgstr "日记账使用货币的金额"
+msgstr "分类帐使用货币的金额"
#. module: account
#: wizard_field:account.general.ledger.report,checktype,landscape:0
@@ -2494,7 +2493,7 @@ msgstr "横向模式"
#: model:process.transition,note:account.process_transition_analyticinvoice0
#: model:process.transition,note:account.process_transition_supplieranalyticcost0
msgid "From analytic accounts, Create invoice."
-msgstr "从核算科目创建发票"
+msgstr "从辅助核目项目创建发票"
#. module: account
#: wizard_button:account.account.balance.report,account_selection,end:0
@@ -2548,7 +2547,7 @@ msgstr "取消"
#. module: account
#: field:account.account.type,name:0
msgid "Acc. Type Name"
-msgstr "科目类型名"
+msgstr "科目类型名称"
#. module: account
#: help:account.tax,base_code_id:0
@@ -2587,7 +2586,7 @@ msgstr "应付账款"
#. module: account
#: wizard_view:populate_statement_from_inv,init:0
msgid "Import Invoices in Statement"
-msgstr "结算单里的进项发票"
+msgstr "对账单里的进项发票"
#. module: account
#: view:account.invoice:0
@@ -2608,7 +2607,7 @@ msgstr "付款单"
#: help:account.account.template,reconcile:0
msgid ""
"Check this option if you want the user to reconcile entries in this account."
-msgstr "勾选此项使用允许在科目对账凭证"
+msgstr "允许要对账凭证在这科目"
#. module: account
#: rml:account.analytic.account.journal:0
@@ -2616,7 +2615,7 @@ msgstr "勾选此项使用允许在科目对账凭证"
#: model:process.node,name:account.process_node_analytic0
#: model:process.node,name:account.process_node_analyticcost0
msgid "Analytic"
-msgstr "核算"
+msgstr "辅助核算"
#. module: account
#: model:process.node,name:account.process_node_invoiceinvoice0
@@ -2631,7 +2630,7 @@ msgstr "资产净值"
#. module: account
#: field:wizard.company.setup,overdue_msg:0
msgid "Overdue Payment Message"
-msgstr "逾期付款催单"
+msgstr "付款信息"
#. module: account
#: model:ir.model,name:account.model_account_tax_code_template
@@ -2652,13 +2651,13 @@ msgid ""
"partners accounts (for debit/credit computations), closed for deprecated "
"accounts."
msgstr ""
-"这类型是用于特殊类型的不同类型.在系统中:视图能不显示所有条目.合并科目能合并多公司的子科目.业务伙伴的应收/应付账款科目(为借方贷方计算).关闭弃用科目"
+"这类型是用于特殊类型的不同类型.在系统中:视图能不显示所有条目.合并科目能合并多公司的子科目.业务伙伴的应收/应付账款科目(为借方贷方计算).关闭弃用科目"
"."
#. module: account
#: model:ir.ui.menu,name:account.menu_account_end_year_treatments
msgid "End of Year Treatments"
-msgstr "年度期末处理"
+msgstr "期末结账"
#. module: account
#: model:ir.ui.menu,name:account.menu_generic_report
@@ -2673,7 +2672,7 @@ msgstr "强制"
#. module: account
#: wizard_view:account.analytic.line,init:0
msgid "Account Analytic Lines Analysis"
-msgstr "核算明细分析"
+msgstr "辅助核算明细分析"
#. module: account
#: rml:account.invoice:0
@@ -2699,17 +2698,17 @@ msgstr "asgfas"
#: model:ir.ui.menu,name:account.account_analytic_def_chart
#: model:ir.ui.menu,name:account.menu_action_analytic_account_tree2
msgid "Analytic Chart of Accounts"
-msgstr "核算科目表"
+msgstr "辅助核算项目表"
#. module: account
#: wizard_view:account.analytic.line,init:0
msgid "View Account Analytic Lines"
-msgstr "查看科目核算明细"
+msgstr "辅助科目核算明细视图"
#. module: account
#: wizard_view:account.move.validate,init:0
msgid "Select Period and Journal for Validation"
-msgstr "选择会计期间和确认日记账"
+msgstr "选择会计期间和分类帐确认样"
#. module: account
#: field:account.invoice,number:0
@@ -2719,7 +2718,7 @@ msgstr "发票号"
#. module: account
#: field:account.period,date_stop:0
msgid "End of Period"
-msgstr "期末"
+msgstr "期末日期"
#. module: account
#: wizard_button:populate_statement_from_inv,go,finish:0
@@ -2768,7 +2767,7 @@ msgstr "名称"
#: wizard_view:account.move.line.reconcile,init_full:0
#: wizard_view:account.move.line.reconcile,init_partial:0
msgid "Reconciliation transactions"
-msgstr "对账交易"
+msgstr "对账处理"
#. module: account
#: wizard_field:account.aged.trial.balance,init,direction_selection:0
@@ -2804,7 +2803,7 @@ msgstr "序列字段用于税明细的排序从低到高.如果税中有子税
#: field:account.journal.view,name:0
#: model:ir.model,name:account.model_account_journal_view
msgid "Journal View"
-msgstr "日记账视图"
+msgstr "分类帐视图"
#. module: account
#: selection:account.move.line,centralisation:0
@@ -2826,7 +2825,7 @@ msgstr "业务员伙伴ID"
#: wizard_view:account.invoice.pay,addendum:0
#: wizard_view:account.move.line.reconcile,addendum:0
msgid "Write-Off Move"
-msgstr "勾销凭证"
+msgstr "补差额凭证"
#. module: account
#: view:account.move.line:0
@@ -2859,7 +2858,7 @@ msgstr "最好的祝愿"
#. module: account
#: model:ir.model,name:account.model_report_hr_timesheet_invoice_journal
msgid "Analytic account costs and revenues"
-msgstr "核算成本和收入"
+msgstr "辅助核算成本和收入"
#. module: account
#: wizard_view:account.invoice.refund,init:0
@@ -2890,7 +2889,7 @@ msgstr "从报表创建凭证"
#. module: account
#: field:account.analytic.account,complete_name:0
msgid "Full Account Name"
-msgstr "所有科目名称"
+msgstr "所有项目名称"
#. module: account
#: rml:account.account.balance:0
@@ -2920,7 +2919,7 @@ msgstr "会计报表"
#. module: account
#: rml:account.overdue:0
msgid "Document: Customer account statement"
-msgstr "文档:客户科目的表"
+msgstr "文档:客户科目的表"
#. module: account
#: view:product.product:0
@@ -2938,13 +2937,13 @@ msgstr "税一览"
#: wizard_view:account.move.line.unreconcile,init:0
#: wizard_view:account.reconcile.unreconcile,init:0
msgid "Unreconciliation transactions"
-msgstr "未对账交易"
+msgstr "未对账处理"
#. module: account
#: model:process.transition,note:account.process_transition_paymentorderbank0
#: model:process.transition,note:account.process_transition_paymentorderreconcilation0
msgid "Reconcilation of entries from payment order."
-msgstr "付款单的对账凭证"
+msgstr "付款单凭证对账"
#. module: account
#: field:account.bank.statement,move_line_ids:0
@@ -2981,12 +2980,12 @@ msgstr "税代码"
#. module: account
#: rml:account.analytic.account.journal:0
msgid "Analytic Journal -"
-msgstr "核算日记账 -"
+msgstr "辅助核算分类帐 -"
#. module: account
#: rml:account.analytic.account.analytic.check:0
msgid "Analytic Debit"
-msgstr "核算借方"
+msgstr "辅助核算借方"
#. module: account
#: field:account.account,currency_mode:0
@@ -3044,13 +3043,13 @@ msgstr "应收款科目"
msgid ""
"If this box is checked, the system will try to group the accounting lines "
"when generating them from invoices."
-msgstr "如果勾选此项系统将试图在产生发票时把明细分组"
+msgstr "如果勾选此项系统将试图在产生发票时把凭证明细分组"
#. module: account
#: wizard_field:account.move.line.reconcile,init_full,trans_nbr:0
#: wizard_field:account.move.line.reconcile,init_partial,trans_nbr:0
msgid "# of Transaction"
-msgstr "交易号#"
+msgstr "处理号#"
#. module: account
#: model:ir.actions.wizard,name:account.wizard_invoice_state_cancel
@@ -3064,7 +3063,7 @@ msgstr "取消所选发票"
#: model:ir.actions.report.xml,name:account.analytic_journal_print
#: model:ir.actions.wizard,name:account.account_analytic_account_journal_report
msgid "Analytic Journal"
-msgstr "核算日记账"
+msgstr "辅助核算分类帐"
#. module: account
#: rml:account.general.ledger:0
@@ -3074,7 +3073,7 @@ msgstr "凭证标签"
#. module: account
#: model:process.transition,note:account.process_transition_paymentreconcile0
msgid "Reconcilate the entries from payment"
-msgstr "付款的对账凭证"
+msgstr "付款凭证对账"
#. module: account
#: rml:account.tax.code.entries:0
@@ -3092,7 +3091,7 @@ msgstr "设为草稿"
#: help:account.invoice,origin:0
#: help:account.invoice.line,origin:0
msgid "Reference of the document that produced this invoice."
-msgstr "发票上产品票据的参考"
+msgstr "发票上产品单据的参考"
#. module: account
#: selection:account.account,type:0
@@ -3110,7 +3109,7 @@ msgstr "基础"
#. module: account
#: field:account.model,name:0
msgid "Model Name"
-msgstr "名称"
+msgstr "模型名称"
#. module: account
#: selection:account.account,type:0
@@ -3134,7 +3133,7 @@ msgstr "确认"
#: view:account.model:0
#: field:account.model,legend:0
msgid "Legend"
-msgstr "图例"
+msgstr "说明"
#. module: account
#: model:process.node,note:account.process_node_draftinvoices0
@@ -3193,7 +3192,7 @@ msgstr "备注"
msgid ""
"The account moves of the invoice have been reconciled with account moves of "
"the payment(s)."
-msgstr "发票已对账的科目变动跟着付款时的科目变动."
+msgstr "发票对账凭证跟着付款凭证."
#. module: account
#: rml:account.invoice:0
@@ -3219,7 +3218,7 @@ msgstr "平均汇率"
#: model:process.node,note:account.process_node_bankstatement0
#: model:process.node,note:account.process_node_supplierbankstatement0
msgid "Statement encoding produces payment entries"
-msgstr "结算单产生的付款凭证"
+msgstr "对账单产生的付款凭证"
#. module: account
#: field:account.account,code:0
@@ -3256,17 +3255,17 @@ msgstr "无"
#: model:ir.actions.wizard,name:account.wizard_fiscalyear_close
#: model:ir.ui.menu,name:account.menu_wizard_fy_close
msgid "Generate Fiscal Year Opening Entries"
-msgstr "生成会计年度期初凭证"
+msgstr "年度结转"
#. module: account
#: model:ir.actions.wizard,name:account.wizard_reconcile
msgid "Reconcile Entries"
-msgstr "对账凭证"
+msgstr "凭证对账"
#. module: account
#: wizard_view:account.wizard_paid_open,init:0
msgid "(Invoice should be unreconciled if you want to open it)"
-msgstr "(发票也许未对账,如果你想打开它)"
+msgstr "(如果你要打开它"
#. module: account
#: view:account.invoice:0
@@ -3288,7 +3287,7 @@ msgstr " 会计年度和会计期间处于关闭状态"
#. module: account
#: model:account.payment.term,name:account.account_payment_term
msgid "30 Days End of Month"
-msgstr "月只有30天"
+msgstr "每月30天"
#. module: account
#: field:account.chart.template,tax_code_root_id:0
@@ -3304,12 +3303,12 @@ msgstr "错误:需要BVR参照"
#: field:account.tax.code,notprintable:0
#: field:account.tax.code.template,notprintable:0
msgid "Not Printable in Invoice"
-msgstr "没可打印发票"
+msgstr "没可打印的发票"
#. module: account
#: field:account.move.line,move_id:0
msgid "Move"
-msgstr "凭证编号"
+msgstr "凭证"
#. module: account
#: field:account.fiscal.position.tax,tax_src_id:0
@@ -3379,12 +3378,12 @@ msgstr "Python代码"
#. module: account
#: model:ir.actions.act_window,name:account.act_account_journal_2_account_bank_statement
msgid "Bank statements"
-msgstr "银行结算单"
+msgstr "银行对账单"
#. module: account
#: model:ir.ui.menu,name:account.next_id_22
msgid "Partner Accounts"
-msgstr "业务伙伴科目"
+msgstr "应收应付"
#. module: account
#: help:account.tax.template,tax_group:0
@@ -3431,7 +3430,7 @@ msgstr "快捷键"
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 "确认日记账和会计期间的所有凭证草稿.这意味你将不能修改它的会计字段."
+msgstr "确认分类帐和会计期间的所有凭证草稿.这意味你将不能修改它的会计字段."
#. module: account
#: selection:account.model.line,date:0
@@ -3482,7 +3481,7 @@ msgstr "应收账款"
#. module: account
#: wizard_button:account.invoice.pay,addendum,reconcile:0
msgid "Pay and reconcile"
-msgstr "付款和对账"
+msgstr "支付和对账"
#. module: account
#: rml:account.central.journal:0
@@ -3513,7 +3512,7 @@ msgstr "会计年度"
#. module: account
#: rml:account.overdue:0
msgid "Balance :"
-msgstr "余额:"
+msgstr "余额:"
#. module: account
#: selection:account.account.balance.report,checktype,display_account:0
@@ -3560,12 +3559,12 @@ msgstr "科目表"
#. module: account
#: field:account.subscription.line,subscription_id:0
msgid "Subscription"
-msgstr "预定"
+msgstr "周期"
#. module: account
#: field:account.analytic.journal,code:0
msgid "Journal code"
-msgstr "日记账代码"
+msgstr "分类帐代码"
#. module: account
#: wizard_button:account.fiscalyear.close,init,close:0
@@ -3576,12 +3575,12 @@ msgstr "创建凭证"
#. module: account
#: view:account.analytic.line:0
msgid "Project line"
-msgstr "明细"
+msgstr "项目明细"
#. module: account
#: wizard_field:account.automatic.reconcile,init,max_amount:0
msgid "Maximum write-off amount"
-msgstr "最大勾销金额"
+msgstr "最大补差额金额"
#. module: account
#: field:account.invoice.tax,manual:0
@@ -3622,7 +3621,7 @@ msgstr "用在这发票的业务伙伴"
msgid ""
"Check this box if you don't want any VAT related to this Tax Code to appear "
"on invoices"
-msgstr "如果你不想发票显示有关的增值税勾选此项"
+msgstr "如果你不想发票显示有关的增值税"
#. module: account
#: field:account.account.type,sequence:0
@@ -3645,7 +3644,7 @@ msgstr "财务结构模板"
#. module: account
#: view:account.bank.statement:0
msgid "Entry encoding"
-msgstr "凭证"
+msgstr "凭证编号"
#. module: account
#: wizard_view:account.invoice.refund,init:0
@@ -3661,7 +3660,7 @@ msgstr "定义会计年度并选择科目表"
#. module: account
#: wizard_field:account.move.line.reconcile,addendum,period_id:0
msgid "Write-Off Period"
-msgstr "注销周期"
+msgstr "补差额会计期间"
#. module: account
#: selection:account.config.wizard,period:0
@@ -3694,7 +3693,7 @@ msgstr "月"
#. module: account
#: model:ir.model,name:account.model_account_subscription
msgid "Account Subscription"
-msgstr "科目预定"
+msgstr "科目周期"
#. module: account
#: field:account.model.line,date_maturity:0
@@ -3706,7 +3705,7 @@ msgstr "到期日期"
#. module: account
#: view:account.subscription:0
msgid "Entry Subscription"
-msgstr "预定凭证"
+msgstr "凭证周期"
#. module: account
#: selection:account.print.journal.report,init,sort_selection:0
@@ -3776,14 +3775,14 @@ msgid ""
" Bank statements\n"
" "
msgstr ""
-"财务和会计模块包括:\n"
+"财务和会计模块包括:\n"
" 一般会计\n"
" 成本/核算会计\n"
" 第三方会计\n"
" 税务管理\n"
" 预算\n"
" 客户和供应商发票\n"
-" 银行结算单\n"
+" 银行对账单\n"
" "
#. module: account
@@ -3812,13 +3811,13 @@ msgstr "这科目可以选免税科目和不含税科目"
msgid ""
"If no account is specified, the reconciliation will be made using every "
"accounts that can be reconcilied"
-msgstr "如果没有指定科目,对账将需要每个科目都能被已对账."
+msgstr "如果没有指定科目,对账将需要每个科目都能被对账."
#. module: account
#: model:ir.actions.act_window,name:account.action_wizard_company_setup_form
#: view:wizard.company.setup:0
msgid "Overdue Payment Report Message"
-msgstr "逾期付款报告信息"
+msgstr "逾期付款信息"
#. module: account
#: selection:account.tax,tax_group:0
@@ -3865,7 +3864,7 @@ msgstr "手动报表"
#: model:ir.actions.act_window,name:account.action_account_journal_form
#: model:ir.ui.menu,name:account.menu_action_account_journal_form
msgid "Financial Journals"
-msgstr "财务日记账"
+msgstr "帐簿"
#. module: account
#: selection:account.account.balance.report,checktype,state:0
@@ -3893,7 +3892,7 @@ msgstr "最大数量"
#. module: account
#: field:account.period,name:0
msgid "Period Name"
-msgstr "会计期间名称"
+msgstr "会计期间"
#. module: account
#: help:account.analytic.journal,type:0
@@ -3901,7 +3900,7 @@ 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 "给出这核算日记账类型如:(发票)需要创建核算凭证.系统将寻找匹配同一类型的日记账."
+msgstr "给出这辅助核算分类帐类型如:(发票)需要创建辅助核算凭证.系统将寻找匹配同一类型的分类帐."
#. module: account
#: field:account.journal,groups_id:0
@@ -3927,7 +3926,7 @@ msgstr "有效"
#. module: account
#: model:process.node,note:account.process_node_electronicfile0
msgid "Import from your bank statements"
-msgstr "从你的银行结算单导入"
+msgstr "从你的银行对账单导入"
#. module: account
#: view:account.chart.template:0
@@ -3947,7 +3946,7 @@ msgstr "选择凭证"
#. module: account
#: selection:account.chart,init,target_move:0
msgid "All Posted Entries"
-msgstr "所有已登账的凭证"
+msgstr "所有已审核的凭证"
#. module: account
#: wizard_field:account.vat.declaration,init,based_on:0
@@ -3968,7 +3967,7 @@ msgstr "应付款科目"
#: field:account.account,currency_id:0
#: field:account.account.template,currency_id:0
msgid "Secondary Currency"
-msgstr "第二货币"
+msgstr "外币"
#. module: account
#: field:account.account,credit:0
@@ -4018,7 +4017,7 @@ msgstr "凭证编号"
#: view:account.bank.statement:0
#: field:account.bank.statement,line_ids:0
msgid "Statement lines"
-msgstr "结算单明细"
+msgstr "对帐单明细"
#. module: account
#: field:account.move.line,amount_taxed:0
@@ -4057,7 +4056,7 @@ msgstr " 包括已对账凭证"
msgid ""
"You can check this box to mark the entry line as a litigation with the "
"associated partner"
-msgstr "你能通过勾选此项标记与业务伙伴的争议的凭证明细"
+msgstr "你能通过勾选"
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree1
@@ -4094,18 +4093,18 @@ msgstr "贷方交易"
#. module: account
#: field:wizard.multi.charts.accounts,seq_journal:0
msgid "Separated Journal Sequences"
-msgstr "分离的日记账序列"
+msgstr "分散的分类帐的序列"
#. module: account
#: help:account.bank.statement.reconcile,total_second_currency:0
msgid "The currency of the journal"
-msgstr "日记账使用的货币"
+msgstr "分类帐使用的货币"
#. module: account
#: view:account.journal.column:0
#: model:ir.model,name:account.model_account_journal_column
msgid "Journal Column"
-msgstr "日记账栏"
+msgstr "分类帐栏"
#. module: account
#: selection:account.fiscalyear,state:0
@@ -4151,13 +4150,13 @@ msgstr "待处理"
#. module: account
#: model:ir.ui.menu,name:account.next_id_29
msgid "Search Entries"
-msgstr "选择凭证"
+msgstr "凭证查询"
#. module: account
#: model:process.node,note:account.process_node_analytic0
#: model:process.node,note:account.process_node_analyticcost0
msgid "Analytic costs to reinvoice purchases, timesheets, ..."
-msgstr "核算采购再开发票成本、时间表安排"
+msgstr "辅助核算采购再开发票成本"
#. module: account
#: field:account.account,tax_ids:0
@@ -4204,12 +4203,12 @@ msgstr "上级左"
#. module: account
#: help:account.journal,sequence_id:0
msgid "The sequence gives the display order for a list of journals"
-msgstr "这序列给出日记账列表的显示顺序"
+msgstr "这序列给出分类帐列表的显示顺序"
#. module: account
#: field:account.journal,type_control_ids:0
msgid "Type Controls"
-msgstr "控制类型"
+msgstr "类型控制"
#. module: account
#: field:account.analytic.account,name:0
@@ -4271,7 +4270,7 @@ msgstr "会计期间"
#. module: account
#: wizard_field:account.invoice.pay,init,journal_id:0
msgid "Journal/Payment Mode"
-msgstr "日记账/付款方式"
+msgstr "分类帐/付款方式"
#. module: account
#: rml:account.invoice:0
@@ -4303,7 +4302,7 @@ msgstr "年合计"
#. module: account
#: model:process.transition,note:account.process_transition_filestatement0
msgid "Import file from your bank statement"
-msgstr "从你的银行结算单导入文件"
+msgstr "从你的银行对账单导入文件"
#. module: account
#: field:account.account,type:0
@@ -4320,7 +4319,7 @@ msgstr "9"
#: model:ir.actions.act_window,name:account.action_subscription_form_running
#: model:ir.ui.menu,name:account.menu_action_subscription_form_running
msgid "Running Subscriptions"
-msgstr "运行预定"
+msgstr "运行中的周期性凭证"
#. module: account
#: selection:account.move,type:0
@@ -4330,7 +4329,7 @@ msgstr "银行付款"
#. module: account
#: selection:account.move,state:0
msgid "Posted"
-msgstr "已登账"
+msgstr "已审核"
#. module: account
#: view:account.tax:0
@@ -4348,12 +4347,12 @@ msgstr "结束日期"
#: model:ir.actions.wizard,name:account.wizard_open_closed_fiscalyear
#: model:ir.ui.menu,name:account.menu_wizard_open_closed_fy
msgid "Cancel Opening Entries"
-msgstr "取消打开的凭证"
+msgstr "取消开账凭证"
#. module: account
#: model:process.transition,name:account.process_transition_invoicemanually0
msgid "Manually statement"
-msgstr "手动声明"
+msgstr "手动报表"
#. module: account
#: field:account.payment.term.line,days2:0
@@ -4408,7 +4407,7 @@ msgstr "税模板"
#. module: account
#: help:account.model,name:0
msgid "This is a model for recurring accounting entries"
-msgstr "这是一个循环科目分录模板"
+msgstr "这是一个经常性凭证的模型"
#. module: account
#: wizard_view:account.wizard_paid_open,init:0
@@ -4428,7 +4427,7 @@ msgstr "你确定要开这发票?"
#. module: account
#: model:ir.actions.report.xml,name:account.account_3rdparty_ledger_other
msgid "Partner Other Ledger"
-msgstr "业务伙伴其它分类帐"
+msgstr "业务伙伴其它分类账"
#. module: account
#: view:res.partner:0
@@ -4545,32 +4544,32 @@ msgstr "供应商会计属性"
#. module: account
#: view:account.analytic.account:0
msgid "Analytic Account Statistics"
-msgstr "核算科目统计"
+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"
-msgstr "这将根据你选择的模板自动设置你的科目表、银行账号、税和日记账."
+msgstr "这将根据你选择的模板自动设置你的科目表、银行账号、税和分类帐"
#. module: account
#: view:account.bank.statement:0
#: field:account.bank.statement.line,statement_id:0
#: field:account.move.line,statement_id:0
msgid "Statement"
-msgstr "结算单"
+msgstr "对帐单"
#. module: account
#: model:ir.actions.act_window,name:account.action_move_line_form_encode_by_move
#: model:ir.ui.menu,name:account.menu_encode_entries_by_move
msgid "Entries Encoding by Move"
-msgstr "凭证编号"
+msgstr "凭证列表"
#. module: account
#: wizard_view:account.analytic.account.chart,init:0
msgid "Analytic Account Charts"
-msgstr "核算科目表"
+msgstr "辅助核算项目表"
#. module: account
#: wizard_field:account.aged.trial.balance,init,result_selection:0
@@ -4586,7 +4585,7 @@ msgstr "含税价"
#: model:ir.actions.act_window,name:account.action_account_analytic_journal_tree2
#: model:ir.ui.menu,name:account.account_analytic_journal_entries
msgid "Analytic Entries by Journal"
-msgstr "日记账核算凭证"
+msgstr "管理会计凭证列表"
#. module: account
#: model:process.transition,note:account.process_transition_suppliervalidentries0
@@ -4639,12 +4638,12 @@ msgstr "报表草稿"
#. module: account
#: field:account.analytic.journal,name:0
msgid "Journal name"
-msgstr "日记账名称"
+msgstr "分类帐名称"
#. module: account
#: model:process.transition,note:account.process_transition_invoiceimport0
msgid "Import invoice from statement"
-msgstr "来自报表的进项发票"
+msgstr "来自对账单的进项发票"
#. module: account
#: selection:account.automatic.reconcile,init,power:0
@@ -4667,7 +4666,7 @@ msgstr "从发票或者付款导入"
#: model:ir.actions.wizard,name:account.wizard_reconcile_select
#: model:ir.ui.menu,name:account.menu_reconcile_select
msgid "Reconcile entries"
-msgstr "对账凭证"
+msgstr "对账的凭证"
#. module: account
#: xsl:account.transfer:0
@@ -4682,7 +4681,7 @@ msgstr "图标"
#. module: account
#: model:ir.model,name:account.model_account_journal_period
msgid "Journal - Period"
-msgstr "日记账-会计期间"
+msgstr "分类帐-会计期间"
#. module: account
#: wizard_field:account.move.line.reconcile,init_full,credit:0
@@ -4698,7 +4697,7 @@ msgstr "创建月度会计期间"
#. module: account
#: wizard_button:account.aged.trial.balance,init,print:0
msgid "Print Aged Trial Balance"
-msgstr "打印旧的试算表"
+msgstr "打印账龄分析表"
#. module: account
#: field:account.analytic.line,ref:0
@@ -4726,7 +4725,7 @@ 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 "勾选此项日记账的每个凭证不会创建一个新的副本但将共享一个相同的副本.这用于关闭的会计年度里"
+msgstr "勾选此项"
#. module: account
#: selection:account.invoice,state:0
@@ -4737,7 +4736,7 @@ msgstr "已取消"
#: model:ir.actions.act_window,name:account.action_bank_statement_draft_tree
#: model:ir.ui.menu,name:account.menu_bank_statement_draft_tree
msgid "Draft statements"
-msgstr "银行结算单草稿"
+msgstr "银行对账单草稿"
#. module: account
#: wizard_field:populate_statement_from_inv,init,date:0
@@ -4753,7 +4752,7 @@ msgstr "帐号"
#: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree_month
#: model:ir.ui.menu,name:account.report_account_analytic_journal_print_month
msgid "Account cost and revenue by journal (This Month)"
-msgstr "成本与收入日记账(本月)"
+msgstr "辅助核算项目本月统计"
#. module: account
#: selection:account.partner.balance.report,init,result_selection:0
@@ -4764,13 +4763,13 @@ msgstr "应收款科目"
#. module: account
#: wizard_button:account.move.line.unreconcile.select,init,open:0
msgid "Open for unreconciliation"
-msgstr "打开未对账凭证"
+msgstr "打开未对账"
#. module: account
#: field:account.bank.statement.reconcile,statement_line:0
#: model:ir.model,name:account.model_account_bank_statement_line
msgid "Bank Statement Line"
-msgstr "银行结算单明细"
+msgstr "银行对账单明细"
#. module: account
#: wizard_button:account.automatic.reconcile,reconcile,end:0
@@ -4801,7 +4800,7 @@ msgstr "科目余额"
#: model:ir.actions.report.xml,name:account.account_analytic_account_analytic_check
#: model:ir.actions.wizard,name:account.account_analytic_account_analytic_check_report
msgid "Analytic Check"
-msgstr "核算检查"
+msgstr "辅助核算检查"
#. module: account
#: rml:account.overdue:0
@@ -4820,7 +4819,7 @@ msgstr "合计:"
#. module: account
#: model:ir.model,name:account.model_account_analytic_journal
msgid "account.analytic.journal"
-msgstr "核算日记账"
+msgstr "项目.辅助核算.分类帐"
#. module: account
#: view:account.fiscal.position:0
@@ -4837,7 +4836,7 @@ msgstr "销售税"
#. module: account
#: model:ir.model,name:account.model_account_move_reconcile
msgid "Account Reconciliation"
-msgstr "对账"
+msgstr "科目对账"
#. module: account
#: view:account.bank.statement:0
@@ -4872,7 +4871,7 @@ msgstr "付款金额"
#. module: account
#: view:account.analytic.account:0
msgid "Analytic account"
-msgstr "核算科目"
+msgstr "辅助核算项目"
#. module: account
#: rml:account.invoice:0
@@ -4924,7 +4923,7 @@ msgstr "发票明细"
#. module: account
#: field:account.period,date_start:0
msgid "Start of Period"
-msgstr "启动会计期间"
+msgstr "期初日期"
#. module: account
#: wizard_field:account.fiscalyear.close,init,report_name:0
@@ -4950,17 +4949,17 @@ msgstr "税说明"
#. module: account
#: help:account.invoice,move_id:0
msgid "Link to the automatically generated account moves."
-msgstr "连接到自动生成的凭证"
+msgstr "链接动生成的凭证"
#. module: account
#: wizard_field:account.automatic.reconcile,reconcile,reconciled:0
msgid "Reconciled transactions"
-msgstr "已对账交易"
+msgstr "已对账的处理"
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_reporting
msgid "Reporting"
-msgstr "报表"
+msgstr "内部报表"
#. module: account
#: rml:account.third_party_ledger:0
@@ -4977,7 +4976,7 @@ msgstr "生成凭证和一个数字"
#. module: account
#: rml:account.analytic.account.analytic.check:0
msgid "Analytic Check -"
-msgstr "核算检查 -"
+msgstr "辅助核算检查 -"
#. module: account
#: rml:account.account.balance:0
@@ -4987,7 +4986,7 @@ msgstr "科目余额 -"
#. module: account
#: field:account.journal,group_invoice_lines:0
msgid "Group invoice lines"
-msgstr "发票明细组"
+msgstr "分票组"
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_configuration
@@ -4998,17 +4997,17 @@ msgstr "设置"
#: view:account.analytic.line:0
#: view:account.invoice:0
msgid "Total amount"
-msgstr "金额合计"
+msgstr "合计"
#. module: account
#: view:account.journal:0
msgid "Account Journal"
-msgstr "科目日记账"
+msgstr "分类帐"
#. module: account
#: view:account.subscription.line:0
msgid "Subscription lines"
-msgstr "预定明细"
+msgstr "周期明细"
#. module: account
#: field:account.chart.template,property_account_income:0
@@ -5019,7 +5018,7 @@ msgstr "产品收入科目模板"
#: help:account.account,currency_id:0
#: help:account.account.template,currency_id:0
msgid "Force all moves for this account to have this secondary currency."
-msgstr "强制对所有凭证含此第二货币"
+msgstr "强制对所有凭证含此外币"
#. module: account
#: wizard_button:populate_statement_from_inv,go,end:0
@@ -5068,7 +5067,7 @@ msgstr "新的客户退款"
msgid ""
"Check this box if you want to use a different sequence for each created "
"journal. Otherwise, all will use the same sequence."
-msgstr "如果你想每个创建的日记账使用一个不同的序列勾选此项.否则将使用同一序列"
+msgstr "如果你想每个创建的分类帐使用一个不同的序列勾选此项.否则将使用同一序列"
#. module: account
#: model:ir.actions.wizard,name:account.wizard_populate_statement_from_inv
@@ -5097,12 +5096,12 @@ msgstr "一致"
#: field:account.tax,domain:0
#: field:account.tax.template,domain:0
msgid "Domain"
-msgstr "域"
+msgstr "分类"
#. module: account
#: view:account.analytic.account:0
msgid "Account Data"
-msgstr "科目数据"
+msgstr "项目信息"
#. module: account
#: view:account.tax.code.template:0
@@ -5112,7 +5111,7 @@ msgstr "税代码模板"
#. module: account
#: view:account.subscription:0
msgid "Subscription Periods"
-msgstr "预定会计期间"
+msgstr "周期的会计期间"
#. module: account
#: model:process.node,name:account.process_node_manually0
@@ -5147,7 +5146,7 @@ msgstr "发票明细"
#. module: account
#: wizard_field:account.invoice.pay,addendum,writeoff_journal_id:0
msgid "Write-Off journal"
-msgstr "勾销日记账"
+msgstr "补差额分类帐"
#. module: account
#: wizard_button:account.invoice.pay,init,writeoff_check:0
@@ -5157,7 +5156,7 @@ msgstr "全部付款"
#. module: account
#: selection:account.move,type:0
msgid "Journal Purchase"
-msgstr "采购日记账"
+msgstr "采购分类帐"
#. module: account
#: selection:account.move,type:0
@@ -5168,7 +5167,7 @@ msgstr "现金收入"
#: field:account.fiscal.position.tax,tax_dest_id:0
#: field:account.fiscal.position.tax.template,tax_dest_id:0
msgid "Replacement Tax"
-msgstr "更换税"
+msgstr "替代的税"
#. module: account
#: model:process.transition,note:account.process_transition_invoicemanually0
@@ -5178,7 +5177,7 @@ msgstr "从手动生效为草稿"
#. module: account
#: model:ir.ui.menu,name:account.next_id_43
msgid "This Month"
-msgstr "这月"
+msgstr "本月"
#. module: account
#: field:account.account.type,sign:0
@@ -5233,7 +5232,7 @@ msgstr "日期过滤"
#. module: account
#: wizard_view:populate_statement_from_inv,init:0
msgid "Choose Journal and Payment Date"
-msgstr "选择日记账和付款日期"
+msgstr "选择分类帐和付款日期"
#. module: account
#: selection:account.analytic.account,state:0
@@ -5278,7 +5277,7 @@ msgstr "形式发票"
#. module: account
#: field:account.move.reconcile,line_partial_ids:0
msgid "Partial Entry lines"
-msgstr "部分的凭证明细"
+msgstr "部分凭证明细"
#. module: account
#: help:account.move.line,statement_id:0
@@ -5351,7 +5350,7 @@ msgstr "已对账金额"
#. module: account
#: selection:account.account,currency_mode:0
msgid "At Date"
-msgstr "日期"
+msgstr "当日汇率"
#. module: account
#: help:account.move.line,tax_amount:0
@@ -5382,7 +5381,7 @@ msgstr "税应用"
#: model:ir.actions.act_window,name:account.action_subscription_form
#: model:ir.ui.menu,name:account.menu_action_subscription_form
msgid "Subscription Entries"
-msgstr "预定凭证"
+msgstr "周期性凭证"
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree6
@@ -5404,7 +5403,7 @@ msgstr "会计期间数"
#: wizard_field:account.analytic.account.quantity_cost_ledger.report,init,date2:0
#: wizard_field:account.automatic.reconcile,init,date2:0
msgid "End of period"
-msgstr "期末"
+msgstr "期末日期"
#. module: account
#: view:account.move:0
@@ -5416,7 +5415,7 @@ msgstr "凭证"
#: rml:account.general.journal:0
#: model:ir.actions.report.xml,name:account.account_general_journal
msgid "General Journal"
-msgstr "普通日记账"
+msgstr "普通分类帐"
#. module: account
#: field:account.account,balance:0
@@ -5452,7 +5451,7 @@ msgstr "发票税"
#: model:ir.actions.act_window,name:account.action_account_analytic_journal_form
#: model:ir.ui.menu,name:account.account_def_analytic_journal
msgid "Analytic Journal Definition"
-msgstr "定义核算日记账"
+msgstr "定义辅助核算分类帐"
#. module: account
#: model:ir.model,name:account.model_account_tax_template
@@ -5469,12 +5468,12 @@ msgstr "银行账号"
msgid ""
"Invalid period ! Some periods overlap or the date period is not in the scope "
"of the fiscal year. "
-msgstr "无效周期!一些周期重复或者周期不在这会计年度中。 "
+msgstr "无效会计期间!一些会计期间重复或者会计期间不在这会计年度中 "
#. module: account
#: help:account.journal,invoice_sequence_id:0
msgid "The sequence used for invoice numbers in this journal."
-msgstr "这序列用于日记账发票号"
+msgstr "这序列用于这分类帐发票号"
#. module: account
#: view:account.account:0
@@ -5483,7 +5482,7 @@ msgstr "这序列用于日记账发票号"
#: view:account.move:0
#: view:account.move.line:0
msgid "General Information"
-msgstr "普通信息"
+msgstr "一般信息"
#. module: account
#: help:populate_statement_from_inv,init,journal_id:0
@@ -5491,12 +5490,12 @@ 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 "这字段允许你选择会计日记账要过滤的发票.如果你设为空将搜索所有销售采购和现金日记账"
+msgstr "这字段允许你选择会计分类帐要过滤的发票.如果你设为空将搜索所有销售采购和现金分类帐"
#. module: account
#: constraint:account.fiscalyear:0
msgid "Error ! The duration of the Fiscal Year is invalid. "
-msgstr "错误 ! 会计年度持久无效 "
+msgstr "错误!会计年度无效 "
#. module: account
#: selection:account.analytic.account,state:0
@@ -5539,7 +5538,7 @@ msgstr "成本分类账(只有数量)"
#. module: account
#: wizard_view:account.move.validate,init:0
msgid "Validate Account Entries"
-msgstr "确认凭证"
+msgstr "审核凭证"
#. module: account
#: selection:account.print.journal.report,init,sort_selection:0
@@ -5560,7 +5559,7 @@ msgstr "到"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_analytic_journal_open_form
msgid "Entries of Open Analytic Journals"
-msgstr "待处理核算日记账凭证"
+msgstr "待处理辅助核算分类帐"
#. module: account
#: view:account.invoice.tax:0
@@ -5575,7 +5574,7 @@ msgstr "当前日期"
#. module: account
#: selection:account.move,type:0
msgid "Journal Sale"
-msgstr "销售日记账"
+msgstr "销售分类帐"
#. module: account
#: wizard_field:account.fiscalyear.close,init,fy_id:0
@@ -5593,7 +5592,7 @@ msgstr "关闭会计年度"
#: wizard_field:account.analytic.account.quantity_cost_ledger.report,init,date1:0
#: wizard_field:account.automatic.reconcile,init,date1:0
msgid "Start of period"
-msgstr "启动会计期间"
+msgstr "期初日期"
#. module: account
#: model:ir.ui.menu,name:account.account_template_folder
@@ -5646,7 +5645,7 @@ msgstr "上级右"
#. module: account
#: model:ir.ui.menu,name:account.account_account_menu
msgid "Financial Accounts"
-msgstr "财务科目"
+msgstr "会计科目"
#. module: account
#: model:ir.model,name:account.model_account_chart_template
@@ -5685,7 +5684,7 @@ msgstr "收入科目"
#. module: account
#: field:account.period,special:0
msgid "Opening/Closing Period"
-msgstr "开始/关闭会计期间"
+msgstr "开启会计期间"
#. module: account
#: rml:account.analytic.account.balance:0
@@ -5722,7 +5721,7 @@ msgstr "会计属性"
#. module: account
#: model:ir.model,name:account.model_account_sequence_fiscalyear
msgid "account.sequence.fiscalyear"
-msgstr "序号.财务"
+msgstr "科目.序号.会计年度"
#. module: account
#: wizard_field:account.print.journal.report,init,sort_selection:0
@@ -5732,7 +5731,7 @@ msgstr "凭证排序按"
#. module: account
#: rml:account.journal.period.print:0
msgid "Print Journal -"
-msgstr "打印日记账 -"
+msgstr "打印分类帐 -"
#. module: account
#: field:account.bank.accounts.wizard,bank_account_id:0
@@ -5812,13 +5811,13 @@ msgstr "凭证"
#: model:process.transition,note:account.process_transition_reconcilepaid0
#: model:process.transition,note:account.process_transition_supplierreconcilepaid0
msgid "Paid invoice when reconciled."
-msgstr "对账时已支付发票"
+msgstr "支付发票时对账"
#. module: account
#: field:account.tax,python_compute_inv:0
#: field:account.tax.template,python_compute_inv:0
msgid "Python Code (reverse)"
-msgstr "Python代码(反转)"
+msgstr "Python代码(reverse)"
#. module: account
#: model:ir.module.module,shortdesc:account.module_meta_information
@@ -5867,7 +5866,7 @@ msgstr "一般借方"
#. module: account
#: field:account.analytic.account,code:0
msgid "Account Code"
-msgstr "科目代码"
+msgstr "辅助核算代码"
#. module: account
#: help:account.config.wizard,name:0
@@ -5894,12 +5893,12 @@ msgstr "财务结构"
#. module: account
#: model:process.process,name:account.process_process_statementprocess0
msgid "Statement Process"
-msgstr "结算单处理"
+msgstr "对账单处理"
#. module: account
#: model:ir.model,name:account.model_account_bank_statement_reconcile
msgid "Statement reconcile"
-msgstr "结算单对账"
+msgstr "对账单对账"
#. module: account
#: wizard_field:account.fiscalyear.close,init,sure:0
@@ -5913,7 +5912,7 @@ msgstr "勾选此项"
msgid ""
"Check this if the price you use on the product and invoices includes this "
"tax."
-msgstr "勾选此项在产品和发票中使用含税价"
+msgstr "在产品和发票中使用含税价"
#. module: account
#: field:account.journal.column,name:0
@@ -5937,7 +5936,7 @@ msgstr "是"
#: help:account.account,reconcile:0
msgid ""
"Check this if the user is allowed to reconcile entries in this account."
-msgstr "勾选此项使用允许在科目对账凭证"
+msgstr "用户允许在这科目对账凭证"
#. module: account
#: wizard_button:account.subscription.generate,init,generate:0
@@ -5949,3 +5948,30 @@ msgstr "计算日期"
#~ msgid "The bank account to pay to or to be paid from"
#~ msgstr "这银行账号来支付或将要用来支付"
+
+#~ msgid "x Sales Journal"
+#~ msgstr "x 销售分类帐"
+
+#~ msgid "For Value percent enter % ratio between 0-1."
+#~ msgstr "值是一个百分比在0-1之间"
+
+#~ msgid "For Tax Type percent enter % ratio between 0-1."
+#~ msgstr "税类型是百分比在0-1之间"
+
+#~ msgid "Empty Accounts ? "
+#~ msgstr "空科目? "
+
+#~ msgid "x Sales Credit Note Journal"
+#~ msgstr "x 销售贷项票据分类帐"
+
+#~ msgid "Check if you want to display Accounts with 0 balance too."
+#~ msgstr "科目余额为0的科目也显示"
+
+#~ msgid "Select Period"
+#~ msgstr "选会计期间"
+
+#~ msgid "x Bank Journal"
+#~ msgstr "x银行分类帐"
+
+#~ msgid "x Expenses Journal"
+#~ msgstr "x费用分类帐"
diff --git a/addons/account/i18n/zh_HK.po b/addons/account/i18n/zh_HK.po
index d83818522f1..45a2e3de05f 100644
--- a/addons/account/i18n/zh_HK.po
+++ b/addons/account/i18n/zh_HK.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:04+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/zh_TW.po b/addons/account/i18n/zh_TW.po
index 3e793a39db7..cb11473c1ec 100644
--- a/addons/account/i18n/zh_TW.po
+++ b/addons/account/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:04+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 5954c4e80b0..e0854f8d65d 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -139,6 +139,7 @@
form
-
+
-
+
+
Analytic Entries
diff --git a/addons/account/project/wizard/__init__.py b/addons/account/project/wizard/__init__.py
index 21a811ebe5f..f11fa936960 100644
--- a/addons/account/project/wizard/__init__.py
+++ b/addons/account/project/wizard/__init__.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL ().
#
@@ -15,7 +15,7 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
#
##############################################################################
@@ -25,7 +25,7 @@ import wizard_account_analytic_inverted_balance_report
import wizard_account_analytic_cost_ledger_report
import wizard_account_analytic_cost_ledger_for_journal_report
import wizard_account_analytic_analytic_check
-import wizard_account_analytic_line
+import project_account_analytic_line
import wizard_analytic_account_chart
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/project/wizard/project_account_analytic_line.py b/addons/account/project/wizard/project_account_analytic_line.py
new file mode 100644
index 00000000000..d84c199ff40
--- /dev/null
+++ b/addons/account/project/wizard/project_account_analytic_line.py
@@ -0,0 +1,58 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL ().
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+##############################################################################
+from osv import fields, osv
+from tools.translate import _
+
+class project_account_analytic_line(osv.osv_memory):
+ _name = "project.account.analytic.line"
+ _description = "Analytic Entries by line"
+ _columns = {
+ 'from_date': fields.date('From'),
+ 'to_date': fields.date('To'),
+ }
+
+ def action_open_window(self, cr, uid, ids, context={}):
+ mod_obj =self.pool.get('ir.model.data')
+ domain = []
+ for data in self.read(cr, uid, ids, context=context):
+ from_date = data['from_date']
+ to_date = data['to_date']
+ if from_date and to_date:
+ domain = [('date','>=',from_date), ('date','<=',to_date)]
+ elif from_date:
+ domain = [('date','>=',from_date)]
+ elif to_date:
+ domain = [('date','<=',to_date)]
+ result = mod_obj._get_id(cr, uid, 'account', 'view_account_analytic_line_filter')
+ id = mod_obj.read(cr, uid, result, ['res_id'], context=context)
+ return {
+ 'name': _('Analytic Entries by line'),
+ 'view_type': 'form',
+ "view_mode": 'tree,form',
+ 'res_model': 'account.analytic.line',
+ 'type': 'ir.actions.act_window',
+ 'domain': domain,
+ 'search_view_id': id['res_id'],
+ }
+
+project_account_analytic_line()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account/project/wizard/project_account_analytic_line_view.xml b/addons/account/project/wizard/project_account_analytic_line_view.xml
new file mode 100644
index 00000000000..96d9186cfa8
--- /dev/null
+++ b/addons/account/project/wizard/project_account_analytic_line_view.xml
@@ -0,0 +1,36 @@
+
+
+
+
+
+ project.account.analytic.line.form
+ project.account.analytic.line
+ form
+
+
+
+
+
+
+ Entries By Line
+ project.account.analytic.line
+ form
+ tree,form
+
+ new
+
+
+
+
\ No newline at end of file
diff --git a/addons/account/project/wizard/wizard_account_analytic_line.py b/addons/account/project/wizard/wizard_account_analytic_line.py
deleted file mode 100644
index 4d63aff05f5..00000000000
--- a/addons/account/project/wizard/wizard_account_analytic_line.py
+++ /dev/null
@@ -1,84 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2010 Tiny SPRL ().
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
-#
-##############################################################################
-
-import wizard
-import pooler
-import time
-from tools.translate import _
-
-def _action_open_window(self, cr, uid, data, context):
- domain = []
- from_date = data['form']['from_date']
- to_date = data['form']['to_date']
- if from_date and to_date:
- domain = [('date','>=',from_date),('date','<=',to_date)]
- elif from_date:
- domain = [('date','>=',from_date)]
- elif to_date:
- domain = [('date','<=',to_date)]
- mod_obj = pooler.get_pool(cr.dbname).get('ir.model.data')
- result = mod_obj._get_id(cr, uid, 'account', 'view_account_analytic_line_filter')
- id = mod_obj.read(cr, uid, result, ['res_id'])
-
- return {
- 'name': _('Analytic Entries by line'),
- 'view_type': 'form',
- "view_mode": 'tree,form',
- 'res_model': 'account.analytic.line',
- 'type': 'ir.actions.act_window',
- 'domain': domain,
- 'search_view_id': id['res_id'],}
-
-
-class account_analytic_line(wizard.interface):
- form1 = '''
- '''
- form1_fields = {
- 'from_date': {
- 'string': 'From',
- 'type': 'date',
- },
- 'to_date': {
- 'string': 'To',
- 'type': 'date',
- },
- }
-
- states = {
- 'init': {
- 'actions': [],
- 'result': {'type': 'form', 'arch':form1, 'fields':form1_fields, 'state': [('end', 'Cancel','gtk-cancel'),('open', 'Open Entries','gtk-ok')]}
- },
- 'open': {
- 'actions': [],
- 'result': {'type': 'action', 'action': _action_open_window, 'state':'end'}
- }
- }
-account_analytic_line('account.analytic.line')
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/project/wizard/wizard_analytic_account_chart.py b/addons/account/project/wizard/wizard_analytic_account_chart.py
index 354fe6e6046..e011fad15bb 100644
--- a/addons/account/project/wizard/wizard_analytic_account_chart.py
+++ b/addons/account/project/wizard/wizard_analytic_account_chart.py
@@ -65,7 +65,7 @@ class wizard_analytic_account_chart(wizard.interface):
states = {
'init': {
'actions': [],
- 'result': {'type': 'form', 'arch':_account_chart_arch, 'fields':_account_chart_fields, 'state': [('end', 'Cancel'), ('open', 'Open Charts')]}
+ 'result': {'type': 'form', 'arch':_account_chart_arch, 'fields':_account_chart_fields, 'state': [('end', 'Cancel', 'gtk-cancel'), ('open', 'Open Charts', 'gtk-ok')]}
},
'open': {
'actions': [],
diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml
index f551d77ccaa..cd9727d5903 100644
--- a/addons/account/security/account_security.xml
+++ b/addons/account/security/account_security.xml
@@ -46,7 +46,7 @@
child_of
user.company_id.id
- ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]
+ ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]
@@ -60,7 +60,7 @@
child_of
user.company_id.id
- ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]
+ ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]
@@ -72,7 +72,7 @@
child_of
user.company_id.id
- ['|','|',('company_id','=',False),('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])]
+ ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]
@@ -85,7 +85,7 @@
child_of
user.company_id.id
- ['|','|',('company_id','=',False),('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])]
+ ['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]
diff --git a/addons/account/wizard/__init__.py b/addons/account/wizard/__init__.py
index 7d6e7b1226d..f3a05ebe184 100644
--- a/addons/account/wizard/__init__.py
+++ b/addons/account/wizard/__init__.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL ().
#
@@ -15,40 +15,36 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
#
##############################################################################
import wizard_automatic_reconcile
-import wizard_reconcile_select
-import wizard_unreconcile_select
+import account_move_line_reconcile_select
+import account_move_line_unreconcile_select
import wizard_reconcile
import wizard_unreconcile
-import wizard_refund
+import account_invoice_refund
import wizard_pay_invoice
-
-import wizard_journal
+import account_move_journal
import wizard_journal_select
-import wizard_bank_reconcile
-import wizard_subscription_generate
-
+import account_move_bank_reconcile
+import account_subscription_generate
import wizard_aged_trial_balance
import wizard_general_ledger_report
import wizard_third_party_ledger
import wizard_account_balance_report
import wizard_partner_balance_report
-
-import wizard_period_close
+import account_period_close
import wizard_fiscalyear_close
-import wizard_fiscalyear_close_state
+import account_fiscalyear_close_state
import wizard_open_closed_fiscalyear
import wizard_vat
import wizard_compare_account_balance_report
-
import wizard_invoice_state
import wizard_account_duplicate
-import wizard_account_chart
+import account_chart
import wizard_move_line_select
import wizard_validate_account_move
@@ -64,5 +60,4 @@ import wizard_change_currency
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_chart.py b/addons/account/wizard/account_chart.py
new file mode 100644
index 00000000000..7def37807c3
--- /dev/null
+++ b/addons/account/wizard/account_chart.py
@@ -0,0 +1,74 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL ().
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+##############################################################################
+
+from osv import fields, osv
+from tools.translate import _
+import tools
+
+class account_chart(osv.osv_memory):
+ """
+ For Chart of Accounrs
+ """
+ _name = "account.chart"
+ _description = "chart"
+ _columns = {
+ 'fiscalyear': fields.many2one('account.fiscalyear', \
+ 'Fiscal year', \
+ help = 'Keep empty for all open fiscal years'),
+ 'target_move': fields.selection([
+ ('all', 'All Entries'),
+ ('posted', 'All Posted Entries'),
+ ], 'Target Moves', required = True),
+
+ }
+ def _get_defaults(self, cr, uid, context={}):
+ """Return default Fiscalyear value"""
+ fiscalyear_obj = self.pool.get('account.fiscalyear')
+ fiscalyear = fiscalyear_obj.find(cr, uid)
+ return fiscalyear
+
+ def account_chart_open_window(self, cr, uid, ids, context={}):
+ """
+ Opens chart of Accounts
+ @param cr: the current row, from the database cursor,
+ @param uid: the current user’s ID for security checks,
+ @param ids: List of account chart’s IDs
+ @return: dictionary of Open account chart window on given fiscalyear and all Entries or posted entries
+ """
+ mod_obj = self.pool.get('ir.model.data')
+ act_obj = self.pool.get('ir.actions.act_window')
+ for data in self.read(cr, uid, ids,context=context):
+ result = mod_obj._get_id(cr, uid, 'account', 'action_account_tree')
+ id = mod_obj.read(cr, uid, [result], ['res_id'],context=context)[0]['res_id']
+ result = act_obj.read(cr, uid, [id], context=context)[0]
+ result['context'] = str({'fiscalyear': data['fiscalyear'], \
+ 'state': data['target_move']})
+ if data['fiscalyear']:
+ result['name'] += ':' + self.pool.get('account.fiscalyear').read(cr, uid, [data['fiscalyear']],context=context)[0]['code']
+ return result
+
+
+ _defaults = {
+ 'fiscalyear': _get_defaults,
+ 'target_move': lambda * a: 'all'
+ }
+account_chart()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_chart_view.xml b/addons/account/wizard/account_chart_view.xml
new file mode 100644
index 00000000000..66da81d24f6
--- /dev/null
+++ b/addons/account/wizard/account_chart_view.xml
@@ -0,0 +1,40 @@
+
+
+
+
+
+ account.chart.form
+ account.chart
+ form
+
+
+
+
+
+
+ Chart of Accounts
+ account.chart
+ form
+ tree,form
+
+ new
+
+
+
+
+
\ No newline at end of file
diff --git a/addons/account/wizard/account_fiscalyear_close_state.py b/addons/account/wizard/account_fiscalyear_close_state.py
new file mode 100644
index 00000000000..eeb202a0c82
--- /dev/null
+++ b/addons/account/wizard/account_fiscalyear_close_state.py
@@ -0,0 +1,65 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL ().
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+##############################################################################
+
+from osv import fields, osv
+from tools.translate import _
+import tools
+
+class account_fiscalyear_close_state(osv.osv_memory):
+ """
+ Closes Account Fiscalyear
+ """
+ _name = "account.fiscalyear.close.state"
+ _description = "Fiscalyear Close state"
+ _columns = {
+ 'fy_id': fields.many2one('account.fiscalyear', \
+ 'Fiscal Year to close', required=True),
+ 'sure': fields.boolean('Check this box', required=False)
+ }
+
+ def data_save(self, cr, uid, ids, context={}):
+ """
+ This function close account fiscalyear
+ @param cr: the current row, from the database cursor,
+ @param uid: the current user’s ID for security checks,
+ @param ids: List of Account fiscalyear close state’s IDs
+
+ """
+ for data in self.read(cr, uid, ids,context=context):
+ if not data['sure']:
+ raise osv.except_osv(_('UserError'), _('Closing of states \
+cancelled, please check the box !'))
+ fy_id = data['fy_id']
+
+ cr.execute('UPDATE account_journal_period ' \
+ 'SET state = %s ' \
+ 'WHERE period_id IN (SELECT id FROM account_period \
+ WHERE fiscalyear_id = %s)',
+ ('done', fy_id))
+ cr.execute('UPDATE account_period SET state = %s ' \
+ 'WHERE fiscalyear_id = %s', ('done', fy_id))
+ cr.execute('UPDATE account_fiscalyear ' \
+ 'SET state = %s WHERE id = %s', ('done', fy_id))
+ return {}
+
+account_fiscalyear_close_state()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_fiscalyear_close_state.xml b/addons/account/wizard/account_fiscalyear_close_state.xml
new file mode 100644
index 00000000000..370aacbf2e3
--- /dev/null
+++ b/addons/account/wizard/account_fiscalyear_close_state.xml
@@ -0,0 +1,39 @@
+
+
+
+
+ account.fiscalyear.close.state.form
+ account.fiscalyear.close.state
+ form
+
+
+
+
+
+
+ Close a Fiscal Year
+ account.fiscalyear.close.state
+ form
+ tree,form
+
+ new
+
+
+
+
+
+
\ No newline at end of file
diff --git a/addons/account/wizard/account_invoice_refund.py b/addons/account/wizard/account_invoice_refund.py
new file mode 100644
index 00000000000..cc69311b2f7
--- /dev/null
+++ b/addons/account/wizard/account_invoice_refund.py
@@ -0,0 +1,191 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL ().
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+##############################################################################
+
+from osv import fields, osv
+from tools.translate import _
+import tools
+import netsvc
+
+
+class account_invoice_refund(osv.osv_memory):
+
+ """Refunds invoice."""
+
+ _name = "account.invoice.refund"
+ _description = "Invoice Refund"
+ _columns = {
+ 'date': fields.date('Operation date', required=False),
+ 'period': fields.many2one('account.period', 'Force period', required=False),
+ 'description': fields.char('Description', size=150, required=True),
+ }
+
+ def compute_refund(self, cr, uid, ids, mode, context={}):
+ """
+ @param cr: the current row, from the database cursor,
+ @param uid: the current user’s ID for security checks,
+ @param ids: the account invoice refund’s ID or list of IDs
+
+ """
+ inv_obj = self.pool.get('account.invoice')
+ reconcile_obj = self.pool.get('account.move.reconcile')
+ account_m_line_obj = self.pool.get('account.move.line')
+ mod_obj = self.pool.get('ir.model.data')
+ act_obj = self.pool.get('ir.actions.act_window')
+ for form in self.read(cr, uid, ids,context=context):
+ created_inv = []
+ date = False
+ period = False
+ description = False
+ for inv in inv_obj.browse(cr, uid, context['active_ids'],context=context):
+ if inv.state in ['draft', 'proforma2', 'cancel']:
+ raise osv.except_osv(_('Error !'), _('Can not %s draft/proforma/cancel invoice.') % (mode))
+ if form['period'] :
+ period = form['period']
+ else:
+ period = inv.period_id and inv.period_id.id or False
+
+ if form['date'] :
+ date = form['date']
+ if not form['period'] :
+ cr.execute("select name from ir_model_fields \
+ where model = 'account.period' \
+ and name = 'company_id'")
+ result_query = cr.fetchone()
+ if result_query:
+ cr.execute("""SELECT id
+ from account_period where date('%s')
+ between date_start AND date_stop \
+ and company_id = %s limit 1 """,
+ (form['date'], self.pool.get('res.users').browse(cr, uid, uid,context=context).company_id.id,))
+ else:
+ cr.execute("""SELECT id
+ from account_period where date('%s')
+ between date_start AND date_stop \
+ limit 1 """, (form['date'],))
+ res = cr.fetchone()
+ if res:
+ period = res[0]
+ else:
+ date = inv.date_invoice
+
+ if form['description'] :
+ description = form['description']
+ else:
+ description = inv.name
+
+ if not period:
+ raise osv.except_osv(_('Data Insufficient !'), \
+ _('No Period found on Invoice!'))
+
+ refund_id = inv_obj.refund(cr, uid, [inv.id], date, period, description)
+ refund = inv_obj.browse(cr, uid, refund_id[0],context=context)
+ inv_obj.write(cr, uid, [refund.id], {'date_due': date,
+ 'check_total': inv.check_total})
+ inv_obj.button_compute(cr, uid, refund_id)
+
+ created_inv.append(refund_id[0])
+ if mode in ('cancel', 'modify'):
+ movelines = inv.move_id.line_id
+ to_reconcile_ids = {}
+ for line in movelines :
+ if line.account_id.id == inv.account_id.id :
+ to_reconcile_ids[line.account_id.id] = [line.id]
+ if type(line.reconcile_id) != osv.orm.browse_null :
+ reconcile_obj.unlink(cr, uid, line.reconcile_id.id)
+ wf_service = netsvc.LocalService('workflow')
+ wf_service.trg_validate(uid, 'account.invoice', \
+ refund.id, 'invoice_open', cr)
+ refund = inv_obj.browse(cr, uid, refund_id[0],context=context)
+ for tmpline in refund.move_id.line_id :
+ if tmpline.account_id.id == inv.account_id.id :
+ to_reconcile_ids[tmpline.account_id.id].append(tmpline.id)
+ for account in to_reconcile_ids :
+ account_m_line_obj.reconcile(cr, uid, to_reconcile_ids[account],
+ writeoff_period_id=period,
+ writeoff_journal_id=inv.journal_id.id,
+ writeoff_acc_id=inv.account_id.id
+ )
+ if mode == 'modify' :
+ invoice = inv_obj.read(cr, uid, [inv.id],
+ ['name', 'type', 'number', 'reference',
+ 'comment', 'date_due', 'partner_id',
+ 'address_contact_id', 'address_invoice_id',
+ 'partner_insite', 'partner_contact',
+ 'partner_ref', 'payment_term', 'account_id',
+ 'currency_id', 'invoice_line', 'tax_line',
+ 'journal_id', 'period_id'],context=context)
+ invoice = invoice[0]
+ del invoice['id']
+ invoice_lines = self.pool.get('account.invoice.line').read(cr, uid, invoice['invoice_line'],context=context)
+ invoice_lines = inv_obj._refund_cleanup_lines(cr, uid, invoice_lines)
+ tax_lines = self.pool.get('account.invoice.tax').read(
+ cr, uid, invoice['tax_line'],context=context)
+ tax_lines = inv_obj._refund_cleanup_lines(cr, uid, tax_lines)
+
+ invoice.update({
+ 'type': inv.type,
+ 'date_invoice': date,
+ 'state': 'draft',
+ 'number': False,
+ 'invoice_line': invoice_lines,
+ 'tax_line': tax_lines,
+ 'period_id': period,
+ 'name': description
+ })
+
+ for field in ('address_contact_id', 'address_invoice_id', 'partner_id',
+ 'account_id', 'currency_id', 'payment_term', 'journal_id'):
+ invoice[field] = invoice[field] and invoice[field][0]
+
+ inv_id = inv_obj.create(cr, uid, invoice, {})
+ if inv.payment_term.id:
+ data = inv_obj.onchange_payment_term_date_invoice(cr, uid, [inv_id], inv.payment_term.id, date)
+ if 'value' in data and data['value']:
+ inv_obj.write(cr, uid, [inv_id], data['value'])
+ created_inv.append(inv_id)
+
+ if inv.type == 'out_invoice':
+ xml_id = 'action_invoice_tree1'
+ elif inv.type == 'in_invoice':
+ xml_id = 'action_invoice_tree2'
+ elif type == 'out_refund':
+ xml_id = 'action_invoice_tree3'
+ else:
+ xml_id = 'action_invoice_tree4'
+ result = mod_obj._get_id(cr, uid, 'account', xml_id)
+ id = mod_obj.read(cr, uid, result, ['res_id'],context=context)['res_id']
+ result = act_obj.read(cr, uid, id,context=context)
+ result['res_id'] = created_inv
+
+ return result
+
+ def invoice_refund(self, cr, uid, ids, context={}):
+ return self.compute_refund(cr, uid, ids, 'refund', context=context)
+
+ def invoice_cancel(self, cr, uid, ids, context={}):
+ return self.compute_refund(cr, uid, ids, 'cancel', context=context)
+
+ def invoice_modify(self, cr, uid, ids, context={}):
+ return self.compute_refund(cr, uid, ids, 'modify', context=context)
+
+account_invoice_refund()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account/wizard/account_invoice_refund_view.xml b/addons/account/wizard/account_invoice_refund_view.xml
new file mode 100644
index 00000000000..7962bb150cf
--- /dev/null
+++ b/addons/account/wizard/account_invoice_refund_view.xml
@@ -0,0 +1,45 @@
+
+
+
+
+
+ account.invoice.refund.form
+ account.invoice.refund
+ form
+
+
+
+
+
+
+ Credit Note
+ account.invoice.refund
+ form
+ tree,form
+
+ new
+
+
+
+
+
+
\ No newline at end of file
diff --git a/addons/account/wizard/account_move_bank_reconcile.py b/addons/account/wizard/account_move_bank_reconcile.py
new file mode 100644
index 00000000000..e2329bf09d9
--- /dev/null
+++ b/addons/account/wizard/account_move_bank_reconcile.py
@@ -0,0 +1,63 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL ().
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+##############################################################################
+import tools
+from osv import fields, osv
+from tools.translate import _
+
+
+class account_move_bank_reconcile(osv.osv_memory):
+ """
+ Bank Reconciliation
+ """
+ _name = "account.move.bank.reconcile"
+ _description = "Move bank reconcile"
+ _columns = {
+ 'journal_id': fields.many2one('account.journal', 'Journal', required=True),
+ }
+
+ def action_open_window(self, cr, uid, ids, context={}):
+ """
+ @param cr: the current row, from the database cursor,
+ @param uid: the current user’s ID for security checks,
+ @param ids: account move bank reconcile’s ID or list of IDs
+ @return: dictionary of Open account move line on given journal_id.
+ """
+ for data in self.read(cr, uid, ids,context=context):
+ cr.execute('select default_credit_account_id \
+ from account_journal where id=%s', (data['journal_id'],))
+ account_id = cr.fetchone()[0]
+ if not account_id:
+ raise osv.except_osv(_('Error'), _('You have to define \
+the bank account\nin the journal definition for reconciliation.'))
+ return {
+ 'domain': "[('journal_id','=',%d), ('account_id','=',%d), ('state','<>','draft')]" % (data['journal_id'], account_id),
+ 'name': _('Standard Encoding'),
+ 'view_type': 'form',
+ 'view_mode': 'tree,form',
+ 'res_model': 'account.move.line',
+ 'view_id': False,
+ 'context': "{'journal_id': %d}" % (data['journal_id'],),
+ 'type': 'ir.actions.act_window'
+ }
+
+account_move_bank_reconcile()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account/wizard/account_move_bank_reconcile_view.xml b/addons/account/wizard/account_move_bank_reconcile_view.xml
new file mode 100644
index 00000000000..89342803aaf
--- /dev/null
+++ b/addons/account/wizard/account_move_bank_reconcile_view.xml
@@ -0,0 +1,33 @@
+
+
+
+
+ account.move.bank.reconcile.form
+ account.move.bank.reconcile
+ form
+
+
+
+
+
+
+ Bank reconciliation
+ account.move.bank.reconcile
+ form
+ tree,form
+
+ new
+
+
+
+
\ No newline at end of file
diff --git a/addons/account/wizard/account_move_journal.py b/addons/account/wizard/account_move_journal.py
new file mode 100644
index 00000000000..df6e41da566
--- /dev/null
+++ b/addons/account/wizard/account_move_journal.py
@@ -0,0 +1,98 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL ().
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+##############################################################################
+
+from osv import fields, osv
+from tools.translate import _
+import tools
+
+class account_move_journal(osv.osv_memory):
+ _name = "account.move.journal"
+ _description = "Move journal"
+
+ _columns = {
+ 'journal_id': fields.many2one('account.journal', 'Journal', required=True),
+ 'period_id': fields.many2one('account.period', 'Period', required=True),
+ }
+
+
+ def _get_period(self, cr, uid, context={}):
+ """Return default account period value"""
+ ids = self.pool.get('account.period').find(cr, uid, context=context)
+ period_id = False
+ if len(ids):
+ period_id = ids[0]
+ return period_id
+
+ def action_open_window(self, cr, uid, ids, context={}):
+ """
+ This function Open action move line window on given period and Journal/Payment Mode
+ @param cr: the current row, from the database cursor,
+ @param uid: the current user’s ID for security checks,
+ @param ids: account move journal’s ID or list of IDs
+ @return: dictionary of Open action move line window on given period and Journal/Payment Mode
+
+ """
+ jp = self.pool.get('account.journal.period')
+ mod_obj = self.pool.get('ir.model.data')
+ for data in self.read(cr, uid, ids, ['journal_id', 'period_id'],context=context):
+ cr.execute('select id,name from ir_ui_view where model=%s and type=%s', ('account.move.line', 'form'))
+ view_res = cr.fetchone()
+ journal_id = data['journal_id']
+ period_id = data['period_id']
+
+ ids = jp.search(cr, uid, [('journal_id', '=', journal_id), \
+ ('period_id', '=', period_id)],context=context)
+
+ if not len(ids):
+ name = self.pool.get('account.journal').read(cr, uid, [journal_id])[0]['name']
+ state = self.pool.get('account.period').read(cr, uid, [period_id])[0]['state']
+ if state == 'done':
+ raise osv.except_osv(_('UserError'), _('This period is already closed !'))
+ company = self.pool.get('account.period').read(cr, uid, [period_id])[0]['company_id'][0]
+ jp.create(cr, uid, {'name': name, 'period_id': period_id, 'journal_id': journal_id, 'company_id': company},context=context)
+
+ ids = jp.search(cr, uid, [('journal_id', '=', journal_id), ('period_id', '=', period_id)],context=context)
+ jp = jp.browse(cr, uid, ids, context=context)[0]
+ name = (jp.journal_id.code or '') + ':' + (jp.period_id.code or '')
+
+ result = mod_obj._get_id(cr, uid, 'account', 'view_account_move_line_filter')
+ res = mod_obj.read(cr, uid, result, ['res_id'],context=context)
+
+ return {
+ 'domain': "[('journal_id','=',%d), ('period_id','=',%d)]" % (journal_id, period_id),
+ 'name': name,
+ 'view_type': 'form',
+ 'view_mode': 'tree,form',
+ 'res_model': 'account.move.line',
+ 'view_id': view_res,
+ 'context': "{'journal_id': %d, 'period_id': %d}" % (journal_id, period_id),
+ 'type': 'ir.actions.act_window',
+ 'search_view_id': res['res_id']
+ }
+
+
+ _defaults = {
+ 'period_id': _get_period
+ }
+
+account_move_journal()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_move_journal_view.xml b/addons/account/wizard/account_move_journal_view.xml
new file mode 100644
index 00000000000..7a25932bb98
--- /dev/null
+++ b/addons/account/wizard/account_move_journal_view.xml
@@ -0,0 +1,41 @@
+
+
+
+
+
+ account.move.journal.form
+ account.move.journal
+ form
+
+
+
+
+
+
+ Entries by Line
+ account.move.journal
+ form
+ tree,form
+
+ new
+
+
+
+
+
+
\ No newline at end of file
diff --git a/addons/account/wizard/account_move_line_reconcile_select.py b/addons/account/wizard/account_move_line_reconcile_select.py
new file mode 100644
index 00000000000..db0ddb10108
--- /dev/null
+++ b/addons/account/wizard/account_move_line_reconcile_select.py
@@ -0,0 +1,58 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL ().
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+##############################################################################
+
+from osv import fields, osv
+from tools.translate import _
+import tools
+
+
+class account_move_line_reconcile_select(osv.osv_memory):
+ _name = "account.move.line.reconcile.select"
+ _description = "Move line reconcile select"
+ _columns = {
+ 'account_id': fields.many2one('account.account', 'Account', \
+ domain = [('reconcile', '=', 1)], required=True),
+ }
+
+ def action_open_window(self, cr, uid, ids, context={}):
+ """
+ This function Open account move line window for reconcile on given account id
+ @param cr: the current row, from the database cursor,
+ @param uid: the current user’s ID for security checks,
+ @param ids: account move line reconcile select’s ID or list of IDs
+ @return: dictionary of Open account move line window for reconcile on given account id
+
+ """
+ for data in self.read(cr, uid, ids,context=context):
+
+ return {
+ 'domain': "[('account_id','=',%d),('reconcile_id','=',False),('state','<>','draft')]" % data['account_id'],
+ 'name': _('Reconciliation'),
+ 'view_type': 'form',
+ 'view_mode': 'tree,form',
+ 'view_id': False,
+ 'res_model': 'account.move.line',
+ 'type': 'ir.actions.act_window'
+ }
+
+account_move_line_reconcile_select()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account/wizard/account_move_line_reconcile_select_view.xml b/addons/account/wizard/account_move_line_reconcile_select_view.xml
new file mode 100644
index 00000000000..f7fcccddc4c
--- /dev/null
+++ b/addons/account/wizard/account_move_line_reconcile_select_view.xml
@@ -0,0 +1,41 @@
+
+
+
+
+ account.move.line.reconcile.select.form
+ account.move.line.reconcile.select
+ form
+
+
+
+
+
+
+ Reconcile entries
+ account.move.line.reconcile.select
+ form
+ tree,form
+
+ new
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/addons/account/wizard/account_move_line_unreconcile_select.py b/addons/account/wizard/account_move_line_unreconcile_select.py
new file mode 100644
index 00000000000..07fd0017742
--- /dev/null
+++ b/addons/account/wizard/account_move_line_unreconcile_select.py
@@ -0,0 +1,52 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL ().
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+##############################################################################
+
+from osv import fields, osv
+from tools.translate import _
+import tools
+
+
+class account_move_line_unreconcile_select(osv.osv_memory):
+
+ _name = "account.move.line.unreconcile.select"
+ _description = "Unreconciliation"
+ _columns ={
+ 'account_id': fields.many2one('account.account','Account',required=True),
+
+ }
+
+ def action_open_window(self, cr, uid, ids, context={}):
+ for data in self.read(cr, uid, ids):
+ return {
+ 'domain': "[('account_id','=',%d),('reconcile_id','<>',False),('state','<>','draft')]" % data['account_id'],
+ 'name': 'Unreconciliation',
+ 'view_type': 'form',
+ 'view_mode': 'tree,form',
+ 'view_id': False,
+ 'res_model': 'account.move.line',
+ 'type': 'ir.actions.act_window'
+ }
+
+account_move_line_unreconcile_select()
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/account/wizard/account_move_line_unreconcile_select_view.xml b/addons/account/wizard/account_move_line_unreconcile_select_view.xml
new file mode 100644
index 00000000000..06c0a0d1e0e
--- /dev/null
+++ b/addons/account/wizard/account_move_line_unreconcile_select_view.xml
@@ -0,0 +1,38 @@
+
+
+
+
+ account.move.line.unreconcile.select.form
+ account.move.line.unreconcile.select
+ form
+
+
+
+
+
+
+ Unreconcile entries
+ account.move.line.unreconcile.select
+ form
+ tree,form
+
+ new
+
+
+
+
+
+
\ No newline at end of file
diff --git a/addons/account/wizard/account_period_close.py b/addons/account/wizard/account_period_close.py
new file mode 100644
index 00000000000..f4c54263f9a
--- /dev/null
+++ b/addons/account/wizard/account_period_close.py
@@ -0,0 +1,54 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL ().
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+##############################################################################
+
+from osv import fields, osv
+from tools.translate import _
+import tools
+
+class account_period_close(osv.osv_memory):
+ """
+ close period
+ """
+ _name = "account.period.close"
+ _description = "period close"
+ _columns = {
+ 'sure': fields.boolean('Check this box', required=False),
+ }
+
+ def data_save(self, cr, uid, ids, context={}):
+ """
+ This function close period
+ @param cr: the current row, from the database cursor,
+ @param uid: the current user’s ID for security checks,
+ @param ids: account period close’s ID or list of IDs
+ """
+
+ mode = 'done'
+ for form in self.read(cr, uid, ids,context=context):
+ if form['sure']:
+ for id in context['active_ids']:
+ cr.execute('update account_journal_period set state=%s where period_id=%s', (mode, id))
+ cr.execute('update account_period set state=%s where id=%s', (mode, id))
+ return {}
+
+account_period_close()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_period_close_view.xml b/addons/account/wizard/account_period_close_view.xml
new file mode 100644
index 00000000000..0866e64bdb6
--- /dev/null
+++ b/addons/account/wizard/account_period_close_view.xml
@@ -0,0 +1,45 @@
+
+
+
+
+
+ account.period.close.form
+ account.period.close
+ form
+
+
+
+
+
+
+ Close a Period
+ account.period.close
+ form
+ tree,form
+
+ new
+
+
+
+
+
+
+ client_action_multi
+
+ action
+ account.period
+
+
+
+
\ No newline at end of file
diff --git a/addons/account/wizard/account_subscription_generate.py b/addons/account/wizard/account_subscription_generate.py
new file mode 100644
index 00000000000..8d2727478ae
--- /dev/null
+++ b/addons/account/wizard/account_subscription_generate.py
@@ -0,0 +1,43 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL ().
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+##############################################################################
+import time
+
+from osv import fields, osv
+
+class account_subscription_generate(osv.osv_memory):
+
+ _name = "account.subscription.generate"
+ _description = "Subscription Compute"
+ _columns = {
+ 'date': fields.date('Date', required=True),
+ }
+ _defaults = {
+ 'date': lambda *a: time.strftime('%Y-%m-%d'),
+ }
+ def action_generate(self, cr, uid, ids, context={}):
+ for data in self.read(cr, uid, ids, context=context):
+ cr.execute('select id from account_subscription_line where date<%s and move_id is null', (data['date'],))
+ ids = map(lambda x: x[0], cr.fetchall())
+ self.pool.get('account.subscription.line').move_create(cr, uid, ids, context=context)
+ return {}
+
+account_subscription_generate()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account/wizard/account_subscription_generate_view.xml b/addons/account/wizard/account_subscription_generate_view.xml
new file mode 100644
index 00000000000..252865f322e
--- /dev/null
+++ b/addons/account/wizard/account_subscription_generate_view.xml
@@ -0,0 +1,38 @@
+
+
+
+
+
+ account.subscription.generate.form
+ account.subscription.generate
+ form
+
+
+
+
+
+
+ Create Subscription Entries
+ account.subscription.generate
+ form
+ tree,form
+
+ new
+
+
+
+
+
+
diff --git a/addons/account/wizard/wizard_account_chart.py b/addons/account/wizard/wizard_account_chart.py
deleted file mode 100644
index ca8153f3ce7..00000000000
--- a/addons/account/wizard/wizard_account_chart.py
+++ /dev/null
@@ -1,80 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2010 Tiny SPRL ().
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
-#
-##############################################################################
-
-import wizard
-import pooler
-
-class wizard_account_chart(wizard.interface):
- _account_chart_arch = '''
- '''
-
- _account_chart_fields = {
- 'fiscalyear': {
- 'string': 'Fiscal year',
- 'type': 'many2one',
- 'relation': 'account.fiscalyear',
- 'help': 'Keep empty for all open fiscal years',
- },
- 'target_move': {
- 'string': 'Target Moves',
- 'type': 'selection',
- 'selection': [('all','All Entries'),('posted','All Posted Entries')],
- 'required': True,
- 'default': lambda *a:"all",
- },
- }
-
- def _get_defaults(self, cr, uid, data, context):
- fiscalyear_obj = pooler.get_pool(cr.dbname).get('account.fiscalyear')
- data['form']['fiscalyear'] = fiscalyear_obj.find(cr, uid)
- return data['form']
-
-
- def _account_chart_open_window(self, cr, uid, data, context):
- mod_obj = pooler.get_pool(cr.dbname).get('ir.model.data')
- act_obj = pooler.get_pool(cr.dbname).get('ir.actions.act_window')
-
- result = mod_obj._get_id(cr, uid, 'account', 'action_account_tree')
- id = mod_obj.read(cr, uid, [result], ['res_id'])[0]['res_id']
- result = act_obj.read(cr, uid, [id], context=context)[0]
- result['context'] = str({'fiscalyear': data['form']['fiscalyear'],'state':data['form']['target_move']})
- if data['form']['fiscalyear']:
- result['name']+=':'+pooler.get_pool(cr.dbname).get('account.fiscalyear').read(cr,uid,[data['form']['fiscalyear']])[0]['code']
- return result
-
- states = {
- 'init': {
- 'actions': [_get_defaults],
- 'result': {'type': 'form', 'arch':_account_chart_arch, 'fields':_account_chart_fields, 'state': [('end', 'Cancel'), ('open', 'Open Charts')]}
- },
- 'open': {
- 'actions': [],
- 'result': {'type': 'action', 'action':_account_chart_open_window, 'state':'end'}
- }
- }
-wizard_account_chart('account.chart')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/account/wizard/wizard_account_duplicate.py b/addons/account/wizard/wizard_account_duplicate.py
index 17fbad45b6f..abded25e9ad 100644
--- a/addons/account/wizard/wizard_account_duplicate.py
+++ b/addons/account/wizard/wizard_account_duplicate.py
@@ -40,7 +40,7 @@ class wizard_account_duplicate(wizard.interface):
states = {
'init': {
'actions': [],
- 'result': {'type': 'form', 'arch': duplicate_form, 'fields': duplicate_fields, 'state': (('end', 'Cancel'), ('duplicate', 'Duplicate'))},
+ 'result': {'type': 'form', 'arch': duplicate_form, 'fields': duplicate_fields, 'state': (('end', 'Cancel', 'gtk-cancel'), ('duplicate', 'Duplicate', 'gtk-ok'))},
},
'duplicate': {
'actions': [_do_duplicate],
diff --git a/addons/account/wizard/wizard_aged_trial_balance.py b/addons/account/wizard/wizard_aged_trial_balance.py
index 9935811031b..d21a64c0bbf 100755
--- a/addons/account/wizard/wizard_aged_trial_balance.py
+++ b/addons/account/wizard/wizard_aged_trial_balance.py
@@ -28,7 +28,7 @@ from mx.DateTime import *
from tools.translate import _
_aged_trial_form = """
-
@@ -45,7 +45,7 @@
-
+
diff --git a/addons/account_analytic_plans/i18n/ar.po b/addons/account_analytic_plans/i18n/ar.po
index 55d90cfe9a8..36cd8b704be 100644
--- a/addons/account_analytic_plans/i18n/ar.po
+++ b/addons/account_analytic_plans/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/bg.po b/addons/account_analytic_plans/i18n/bg.po
index 4e5611916ec..f6e89daaf0b 100644
--- a/addons/account_analytic_plans/i18n/bg.po
+++ b/addons/account_analytic_plans/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/bs.po b/addons/account_analytic_plans/i18n/bs.po
index 56f41700782..cb7ab96923b 100644
--- a/addons/account_analytic_plans/i18n/bs.po
+++ b/addons/account_analytic_plans/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/ca.po b/addons/account_analytic_plans/i18n/ca.po
index 8fce72ebd51..2b636eb345f 100644
--- a/addons/account_analytic_plans/i18n/ca.po
+++ b/addons/account_analytic_plans/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/cs.po b/addons/account_analytic_plans/i18n/cs.po
index 0da14726466..2d9cfa34cad 100644
--- a/addons/account_analytic_plans/i18n/cs.po
+++ b/addons/account_analytic_plans/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/de.po b/addons/account_analytic_plans/i18n/de.po
index da310a4d8cc..1c528accc43 100644
--- a/addons/account_analytic_plans/i18n/de.po
+++ b/addons/account_analytic_plans/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/el.po b/addons/account_analytic_plans/i18n/el.po
index 8c72489251d..9ab6d570fc9 100644
--- a/addons/account_analytic_plans/i18n/el.po
+++ b/addons/account_analytic_plans/i18n/el.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/es.po b/addons/account_analytic_plans/i18n/es.po
index ab6c7cdd0c4..3d23107d0a8 100644
--- a/addons/account_analytic_plans/i18n/es.po
+++ b/addons/account_analytic_plans/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/es_AR.po b/addons/account_analytic_plans/i18n/es_AR.po
index 25de9ab115f..843c63dcc01 100644
--- a/addons/account_analytic_plans/i18n/es_AR.po
+++ b/addons/account_analytic_plans/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/et.po b/addons/account_analytic_plans/i18n/et.po
index ffb5197671d..cac38c6e6fd 100644
--- a/addons/account_analytic_plans/i18n/et.po
+++ b/addons/account_analytic_plans/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/fi.po b/addons/account_analytic_plans/i18n/fi.po
index 67c424fc082..47dd8f7fa48 100644
--- a/addons/account_analytic_plans/i18n/fi.po
+++ b/addons/account_analytic_plans/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/fr.po b/addons/account_analytic_plans/i18n/fr.po
index 20881d7de29..a28aacef50d 100644
--- a/addons/account_analytic_plans/i18n/fr.po
+++ b/addons/account_analytic_plans/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/gl.po b/addons/account_analytic_plans/i18n/gl.po
index f697013b90e..6ddb31ed0fb 100644
--- a/addons/account_analytic_plans/i18n/gl.po
+++ b/addons/account_analytic_plans/i18n/gl.po
@@ -15,7 +15,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/hr.po b/addons/account_analytic_plans/i18n/hr.po
index 3f9ef1b151c..0edf3e8fd46 100644
--- a/addons/account_analytic_plans/i18n/hr.po
+++ b/addons/account_analytic_plans/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/hu.po b/addons/account_analytic_plans/i18n/hu.po
index 88e5d9ef85d..04c38b922cc 100644
--- a/addons/account_analytic_plans/i18n/hu.po
+++ b/addons/account_analytic_plans/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/id.po b/addons/account_analytic_plans/i18n/id.po
index 578f1e37fc8..bc9dc62c17c 100644
--- a/addons/account_analytic_plans/i18n/id.po
+++ b/addons/account_analytic_plans/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/it.po b/addons/account_analytic_plans/i18n/it.po
index 7d62d22ee91..20fcb8da18e 100644
--- a/addons/account_analytic_plans/i18n/it.po
+++ b/addons/account_analytic_plans/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/ko.po b/addons/account_analytic_plans/i18n/ko.po
index cd77634def5..6de93149132 100644
--- a/addons/account_analytic_plans/i18n/ko.po
+++ b/addons/account_analytic_plans/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/lt.po b/addons/account_analytic_plans/i18n/lt.po
index 1d6cf403dcc..d8c0f5b9575 100644
--- a/addons/account_analytic_plans/i18n/lt.po
+++ b/addons/account_analytic_plans/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/nl.po b/addons/account_analytic_plans/i18n/nl.po
index 6b3f95b50b8..73c2ccb1960 100644
--- a/addons/account_analytic_plans/i18n/nl.po
+++ b/addons/account_analytic_plans/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:55+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/nl_BE.po b/addons/account_analytic_plans/i18n/nl_BE.po
index 8d9205f15d9..a71cbff4b9a 100644
--- a/addons/account_analytic_plans/i18n/nl_BE.po
+++ b/addons/account_analytic_plans/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/oc.po b/addons/account_analytic_plans/i18n/oc.po
new file mode 100644
index 00000000000..58bff162960
--- /dev/null
+++ b/addons/account_analytic_plans/i18n/oc.po
@@ -0,0 +1,376 @@
+# Occitan (post 1500) translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-03-25 12:58+0000\n"
+"Last-Translator: Cédric VALMARY (Per Tot en òc) \n"
+"Language-Team: Occitan (post 1500) \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account4_ids:0
+msgid "Account4 Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Lo nom de l'objècte deu començar amb x_ e conténer pas de caractèrs "
+"especials !"
+
+#. module: account_analytic_plans
+#: model:ir.actions.report.xml,name:account_analytic_plans.account_analytic_account_crossovered_analytic
+#: model:ir.actions.wizard,name:account_analytic_plans.account_analytic_account_inverted_balance_report
+msgid "Crossovered Analytic"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account5_ids:0
+msgid "Account5 Id"
+msgstr "Identificant del Compte5"
+
+#. module: account_analytic_plans
+#: wizard_field:wizard.crossovered.analytic,init,date2:0
+msgid "End Date"
+msgstr "Data de fin"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance.line,rate:0
+msgid "Rate (%)"
+msgstr "Taus (%)"
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan:0
+#: field:account.analytic.plan,name:0
+#: field:account.analytic.plan.line,plan_id:0
+#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_form_action
+#: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_plan_action
+msgid "Analytic Plan"
+msgstr "Plan Analitic"
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance_line
+msgid "Analytic Instance Line"
+msgstr ""
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan.instance.line:0
+msgid "Analytic Distribution Lines"
+msgstr ""
+
+#. module: account_analytic_plans
+#: wizard_button:wizard.crossovered.analytic,init,print:0
+msgid "Print"
+msgstr "Estampar"
+
+#. module: account_analytic_plans
+#: rml:account.analytic.account.crossovered.analytic:0
+msgid "To Date"
+msgstr "Data de Fin"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance.line,plan_id:0
+msgid "Plan Id"
+msgstr "Identificant del Plan"
+
+#. module: account_analytic_plans
+#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_instance_action
+msgid "Analytic Distribution's Models"
+msgstr ""
+
+#. module: account_analytic_plans
+#: rml:account.analytic.account.crossovered.analytic:0
+msgid "Account Name"
+msgstr "Nom del compte"
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan.instance.line:0
+msgid "Analytic Distribution Line"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,code:0
+msgid "Distribution Code"
+msgstr ""
+
+#. module: account_analytic_plans
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nom del Modèl invalid per la definicion de l'accion."
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,name:0
+msgid "Plan Name"
+msgstr "Nom del Plan"
+
+#. module: account_analytic_plans
+#: rml:account.analytic.account.crossovered.analytic:0
+msgid "Printing date"
+msgstr "Data d'estampatge"
+
+#. module: account_analytic_plans
+#: rml:account.analytic.account.crossovered.analytic:0
+msgid "Percentage"
+msgstr "Percentatge"
+
+#. module: account_analytic_plans
+#: wizard_field:wizard.crossovered.analytic,init,empty_line:0
+msgid "Dont show empty lines"
+msgstr ""
+
+#. module: account_analytic_plans
+#: wizard_view:wizard.crossovered.analytic,init:0
+msgid "Select Information"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account3_ids:0
+msgid "Account3 Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,journal_id:0
+#: wizard_field:wizard.crossovered.analytic,init,journal_ids:0
+msgid "Analytic Journal"
+msgstr "Jornal analitic"
+
+#. module: account_analytic_plans
+#: rml:account.analytic.account.crossovered.analytic:0
+msgid "100.00%"
+msgstr "100.00%"
+
+#. module: account_analytic_plans
+#: wizard_field:wizard.crossovered.analytic,init,ref:0
+msgid "Analytic Account Ref."
+msgstr ""
+
+#. module: account_analytic_plans
+#: rml:account.analytic.account.crossovered.analytic:0
+msgid "Analytic Account :"
+msgstr "Compte Analitic :"
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan.line:0
+msgid "Analytic Plan Line"
+msgstr ""
+
+#. module: account_analytic_plans
+#: rml:account.analytic.account.crossovered.analytic:0
+msgid "Analytic Account Reference:"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.actions.wizard,name:account_analytic_plans.create_model
+msgid "Create Model"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan,default_instance_id:0
+msgid "Default Entries"
+msgstr ""
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan:0
+#: field:account.analytic.plan,plan_ids:0
+#: field:account.journal,plan_id:0
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan
+msgid "Analytic Plans"
+msgstr "Plans Analitics"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,min_required:0
+msgid "Minimum Allowed (%)"
+msgstr "Minimum Permés (%)"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account1_ids:0
+msgid "Account1 Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,max_required:0
+msgid "Maximum Allowed (%)"
+msgstr "Maximum Permés (%)"
+
+#. module: account_analytic_plans
+#: wizard_view:create.model,info:0
+msgid "Distribution Model Saved"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance
+msgid "Analytic Plan Instance"
+msgstr ""
+
+#. module: account_analytic_plans
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML invalid per l'arquitectura de la vista"
+
+#. module: account_analytic_plans
+#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_instance_model_open
+msgid "Distribution Models"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.module.module,description:account_analytic_plans.module_meta_information
+msgid ""
+"This module allows to use several analytic plans, according to the general "
+"journal,\n"
+"so that multiple analytic lines are created when the invoice or the entries\n"
+"are confirmed.\n"
+"\n"
+"For example, you can define the following analytic structure:\n"
+" Projects\n"
+" Project 1\n"
+" SubProj 1.1\n"
+" SubProj 1.2\n"
+" Project 2\n"
+" Salesman\n"
+" Eric\n"
+" Fabien\n"
+"\n"
+"Here, we have two plans: Projects and Salesman. An invoice line must\n"
+"be able to write analytic entries in the 2 plans: SubProj 1.1 and\n"
+"Fabien. The amount can also be split. The following example is for\n"
+"an invoice that touches the two subproject and assigned to one salesman:\n"
+"\n"
+"Plan1:\n"
+" SubProject 1.1 : 50%\n"
+" SubProject 1.2 : 50%\n"
+"Plan2:\n"
+" Eric: 100%\n"
+"\n"
+"So when this line of invoice will be confirmed, it will generate 3 analytic "
+"lines,\n"
+"for one account entry.\n"
+" "
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.module.module,shortdesc:account_analytic_plans.module_meta_information
+msgid "Multiple-plans management in Analytic Accounting"
+msgstr ""
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan.line:0
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_line
+msgid "Analytic Plan Lines"
+msgstr ""
+
+#. module: account_analytic_plans
+#: rml:account.analytic.account.crossovered.analytic:0
+msgid "Crossovered Analytic -"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,plan_id:0
+msgid "Model's Plan"
+msgstr "Plan del Modèl"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account2_ids:0
+msgid "Account2 Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: rml:account.analytic.account.crossovered.analytic:0
+msgid "Amount"
+msgstr "Montant"
+
+#. module: account_analytic_plans
+#: help:account.analytic.plan.line,root_analytic_id:0
+msgid "Root account of this plan."
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account6_ids:0
+msgid "Account6 Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: rml:account.analytic.account.crossovered.analytic:0
+msgid "Quantity"
+msgstr "Quantitat"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account_ids:0
+msgid "Account Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: rml:account.analytic.account.crossovered.analytic:0
+msgid "Code"
+msgstr "Còde"
+
+#. module: account_analytic_plans
+#: wizard_button:create.model,info,end:0
+msgid "OK"
+msgstr "D'acòrdi"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,root_analytic_id:0
+msgid "Root Account"
+msgstr ""
+
+#. module: account_analytic_plans
+#: wizard_view:create.model,info:0
+msgid ""
+"This distribution model has been saved. You will be able to reuse it later."
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,sequence:0
+msgid "Sequence"
+msgstr "Sequéncia"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance.line,analytic_account_id:0
+msgid "Analytic Account"
+msgstr "Compte Analitic"
+
+#. module: account_analytic_plans
+#: field:account.analytic.default,analytics_id:0
+#: view:account.analytic.plan.instance:0
+#: field:account.analytic.plan.instance,name:0
+#: field:account.invoice.line,analytics_id:0
+#: field:account.move.line,analytics_id:0
+msgid "Analytic Distribution"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_plan_instance_action
+msgid "Analytic Distribution's models"
+msgstr ""
+
+#. module: account_analytic_plans
+#: wizard_button:wizard.crossovered.analytic,init,end:0
+msgid "Cancel"
+msgstr "Anullar"
+
+#. module: account_analytic_plans
+#: wizard_field:wizard.crossovered.analytic,init,date1:0
+msgid "Start Date"
+msgstr "Data de començament"
+
+#. module: account_analytic_plans
+#: rml:account.analytic.account.crossovered.analytic:0
+msgid "at"
+msgstr "a"
+
+#. module: account_analytic_plans
+#: rml:account.analytic.account.crossovered.analytic:0
+msgid "From Date"
+msgstr ""
diff --git a/addons/account_analytic_plans/i18n/pl.po b/addons/account_analytic_plans/i18n/pl.po
index fb9ddf5816f..653e35363c0 100644
--- a/addons/account_analytic_plans/i18n/pl.po
+++ b/addons/account_analytic_plans/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/pt.po b/addons/account_analytic_plans/i18n/pt.po
index db2708176fb..27a504b3129 100644
--- a/addons/account_analytic_plans/i18n/pt.po
+++ b/addons/account_analytic_plans/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/pt_BR.po b/addons/account_analytic_plans/i18n/pt_BR.po
index 3b6b9dc7421..99e8b88cb81 100644
--- a/addons/account_analytic_plans/i18n/pt_BR.po
+++ b/addons/account_analytic_plans/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-14 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/ro.po b/addons/account_analytic_plans/i18n/ro.po
index 7622f9618e6..fb7691245a6 100644
--- a/addons/account_analytic_plans/i18n/ro.po
+++ b/addons/account_analytic_plans/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/ru.po b/addons/account_analytic_plans/i18n/ru.po
index 6f42102f4ce..0d988fe9077 100644
--- a/addons/account_analytic_plans/i18n/ru.po
+++ b/addons/account_analytic_plans/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/sl.po b/addons/account_analytic_plans/i18n/sl.po
index 51303810cb1..35dbf68230c 100644
--- a/addons/account_analytic_plans/i18n/sl.po
+++ b/addons/account_analytic_plans/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/sv.po b/addons/account_analytic_plans/i18n/sv.po
index b1accfbaf08..2edc1cb11eb 100644
--- a/addons/account_analytic_plans/i18n/sv.po
+++ b/addons/account_analytic_plans/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/tlh.po b/addons/account_analytic_plans/i18n/tlh.po
index 6a77d14bb37..79b051e5499 100644
--- a/addons/account_analytic_plans/i18n/tlh.po
+++ b/addons/account_analytic_plans/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/tr.po b/addons/account_analytic_plans/i18n/tr.po
index d0ceae75272..391fe90e7f2 100644
--- a/addons/account_analytic_plans/i18n/tr.po
+++ b/addons/account_analytic_plans/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/uk.po b/addons/account_analytic_plans/i18n/uk.po
index c46c4af36b2..e7fbcaf8ae3 100644
--- a/addons/account_analytic_plans/i18n/uk.po
+++ b/addons/account_analytic_plans/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/zh_CN.po b/addons/account_analytic_plans/i18n/zh_CN.po
index e256477d77a..b3e917cb6b6 100644
--- a/addons/account_analytic_plans/i18n/zh_CN.po
+++ b/addons/account_analytic_plans/i18n/zh_CN.po
@@ -4,49 +4,49 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-01-30 12:43+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-03-20 06:54+0000\n"
+"Last-Translator: Black Jack \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_plans
#: field:account.analytic.plan.instance,account4_ids:0
msgid "Account4 Id"
-msgstr ""
+msgstr "科目4ID"
#. module: account_analytic_plans
#: constraint:ir.model:0
msgid ""
"The Object name must start with x_ and not contain any special character !"
-msgstr ""
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
#. module: account_analytic_plans
#: model:ir.actions.report.xml,name:account_analytic_plans.account_analytic_account_crossovered_analytic
#: model:ir.actions.wizard,name:account_analytic_plans.account_analytic_account_inverted_balance_report
msgid "Crossovered Analytic"
-msgstr ""
+msgstr "交叉辅助核算"
#. module: account_analytic_plans
#: field:account.analytic.plan.instance,account5_ids:0
msgid "Account5 Id"
-msgstr ""
+msgstr "科目5ID"
#. module: account_analytic_plans
#: wizard_field:wizard.crossovered.analytic,init,date2:0
msgid "End Date"
-msgstr ""
+msgstr "结束日期"
#. module: account_analytic_plans
#: field:account.analytic.plan.instance.line,rate:0
msgid "Rate (%)"
-msgstr ""
+msgstr "比率(%)"
#. module: account_analytic_plans
#: view:account.analytic.plan:0
@@ -55,128 +55,128 @@ msgstr ""
#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_form_action
#: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_plan_action
msgid "Analytic Plan"
-msgstr ""
+msgstr "辅助核算方案"
#. module: account_analytic_plans
#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance_line
msgid "Analytic Instance Line"
-msgstr ""
+msgstr "辅助核算实例明细"
#. module: account_analytic_plans
#: view:account.analytic.plan.instance.line:0
msgid "Analytic Distribution Lines"
-msgstr ""
+msgstr "辅助核算分配明细"
#. module: account_analytic_plans
#: wizard_button:wizard.crossovered.analytic,init,print:0
msgid "Print"
-msgstr ""
+msgstr "打印"
#. module: account_analytic_plans
#: rml:account.analytic.account.crossovered.analytic:0
msgid "To Date"
-msgstr ""
+msgstr "至今为止"
#. module: account_analytic_plans
#: field:account.analytic.plan.instance.line,plan_id:0
msgid "Plan Id"
-msgstr ""
+msgstr "方案ID"
#. module: account_analytic_plans
#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_instance_action
msgid "Analytic Distribution's Models"
-msgstr ""
+msgstr "辅助核算分配模型"
#. module: account_analytic_plans
#: rml:account.analytic.account.crossovered.analytic:0
msgid "Account Name"
-msgstr ""
+msgstr "科目名称"
#. module: account_analytic_plans
#: view:account.analytic.plan.instance.line:0
msgid "Analytic Distribution Line"
-msgstr ""
+msgstr "辅助核算分配明细"
#. module: account_analytic_plans
#: field:account.analytic.plan.instance,code:0
msgid "Distribution Code"
-msgstr ""
+msgstr "分配代码"
#. module: account_analytic_plans
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "在这动作定义中有无效的模块名"
#. module: account_analytic_plans
#: field:account.analytic.plan.line,name:0
msgid "Plan Name"
-msgstr ""
+msgstr "方案名"
#. module: account_analytic_plans
#: rml:account.analytic.account.crossovered.analytic:0
msgid "Printing date"
-msgstr ""
+msgstr "打印日期"
#. module: account_analytic_plans
#: rml:account.analytic.account.crossovered.analytic:0
msgid "Percentage"
-msgstr ""
+msgstr "百分比"
#. module: account_analytic_plans
#: wizard_field:wizard.crossovered.analytic,init,empty_line:0
msgid "Dont show empty lines"
-msgstr ""
+msgstr "不要显示空行"
#. module: account_analytic_plans
#: wizard_view:wizard.crossovered.analytic,init:0
msgid "Select Information"
-msgstr ""
+msgstr "选择信息"
#. module: account_analytic_plans
#: field:account.analytic.plan.instance,account3_ids:0
msgid "Account3 Id"
-msgstr ""
+msgstr "科目3ID"
#. module: account_analytic_plans
#: field:account.analytic.plan.instance,journal_id:0
#: wizard_field:wizard.crossovered.analytic,init,journal_ids:0
msgid "Analytic Journal"
-msgstr ""
+msgstr "辅助核算分类帐"
#. module: account_analytic_plans
#: rml:account.analytic.account.crossovered.analytic:0
msgid "100.00%"
-msgstr ""
+msgstr "100.00%"
#. module: account_analytic_plans
#: wizard_field:wizard.crossovered.analytic,init,ref:0
msgid "Analytic Account Ref."
-msgstr ""
+msgstr "辅助核算项目参考"
#. module: account_analytic_plans
#: rml:account.analytic.account.crossovered.analytic:0
msgid "Analytic Account :"
-msgstr ""
+msgstr "辅助核算项目:"
#. module: account_analytic_plans
#: view:account.analytic.plan.line:0
msgid "Analytic Plan Line"
-msgstr ""
+msgstr "辅助核算方案明细"
#. module: account_analytic_plans
#: rml:account.analytic.account.crossovered.analytic:0
msgid "Analytic Account Reference:"
-msgstr ""
+msgstr "辅助核算项目参考:"
#. module: account_analytic_plans
#: model:ir.actions.wizard,name:account_analytic_plans.create_model
msgid "Create Model"
-msgstr ""
+msgstr "创建模型"
#. module: account_analytic_plans
#: field:account.analytic.plan,default_instance_id:0
msgid "Default Entries"
-msgstr ""
+msgstr "默认凭证"
#. module: account_analytic_plans
#: view:account.analytic.plan:0
@@ -184,42 +184,42 @@ msgstr ""
#: field:account.journal,plan_id:0
#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan
msgid "Analytic Plans"
-msgstr ""
+msgstr "辅助核算方案"
#. module: account_analytic_plans
#: field:account.analytic.plan.line,min_required:0
msgid "Minimum Allowed (%)"
-msgstr ""
+msgstr "最小允许(%)"
#. module: account_analytic_plans
#: field:account.analytic.plan.instance,account1_ids:0
msgid "Account1 Id"
-msgstr ""
+msgstr "科目1ID"
#. module: account_analytic_plans
#: field:account.analytic.plan.line,max_required:0
msgid "Maximum Allowed (%)"
-msgstr ""
+msgstr "最大允许(%)"
#. module: account_analytic_plans
#: wizard_view:create.model,info:0
msgid "Distribution Model Saved"
-msgstr ""
+msgstr "分配模型保存"
#. module: account_analytic_plans
#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance
msgid "Analytic Plan Instance"
-msgstr ""
+msgstr "核算方案实例"
#. module: account_analytic_plans
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "无效XML视图结构!"
#. module: account_analytic_plans
#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_instance_model_open
msgid "Distribution Models"
-msgstr ""
+msgstr "分配模型"
#. module: account_analytic_plans
#: model:ir.module.module,description:account_analytic_plans.module_meta_information
@@ -255,88 +255,115 @@ msgid ""
"for one account entry.\n"
" "
msgstr ""
+"这模块允许使用几个辅助核算方案并根据他们生成分类帐\n"
+"\t所以当开发票或确认凭证时\n"
+"建立多个辅助核算明细\n"
+"\t\n"
+"\t例子:你可以定义以下辅助核算结构:\n"
+"\t项目\n"
+"\t\t项目1\n"
+"\t\t\t子项目1.1 \n"
+"\t\t\t子项目1.2 \n"
+"\t\t项目2\n"
+"\t业务员\n"
+"\t\t小李\n"
+"\t\t小张\n"
+"\n"
+"这里我们有两个项目和业务员.发票必须能够写如:两项目和业务员辅助核算凭证,金额也可以分割.下面的例子是发票涉及两个项目和一个业务员.\n"
+"\n"
+"\n"
+"\t方案1:\n"
+"\t\t子项目1.1 :50%\n"
+"\t\t子项目1.2 :50%\n"
+"\n"
+"\t方案2:\n"
+"\t\t小李:100%\n"
+"\t\n"
+"\t因此当这发票的明细确认时\n"
+"将产生3个辅助核算明细\n"
+" "
#. module: account_analytic_plans
#: model:ir.module.module,shortdesc:account_analytic_plans.module_meta_information
msgid "Multiple-plans management in Analytic Accounting"
-msgstr ""
+msgstr "辅助核算会计的多方案管理"
#. module: account_analytic_plans
#: view:account.analytic.plan.line:0
#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_line
msgid "Analytic Plan Lines"
-msgstr ""
+msgstr "辅助核算方案明细"
#. module: account_analytic_plans
#: rml:account.analytic.account.crossovered.analytic:0
msgid "Crossovered Analytic -"
-msgstr ""
+msgstr "交叉辅助核算-"
#. module: account_analytic_plans
#: field:account.analytic.plan.instance,plan_id:0
msgid "Model's Plan"
-msgstr ""
+msgstr "模型方案"
#. module: account_analytic_plans
#: field:account.analytic.plan.instance,account2_ids:0
msgid "Account2 Id"
-msgstr ""
+msgstr "科目2ID"
#. module: account_analytic_plans
#: rml:account.analytic.account.crossovered.analytic:0
msgid "Amount"
-msgstr ""
+msgstr "金额"
#. module: account_analytic_plans
#: help:account.analytic.plan.line,root_analytic_id:0
msgid "Root account of this plan."
-msgstr ""
+msgstr "这方案的根辅助核算项目"
#. module: account_analytic_plans
#: field:account.analytic.plan.instance,account6_ids:0
msgid "Account6 Id"
-msgstr ""
+msgstr "科目6ID"
#. module: account_analytic_plans
#: rml:account.analytic.account.crossovered.analytic:0
msgid "Quantity"
-msgstr ""
+msgstr "数量"
#. module: account_analytic_plans
#: field:account.analytic.plan.instance,account_ids:0
msgid "Account Id"
-msgstr ""
+msgstr "科目ID"
#. module: account_analytic_plans
#: rml:account.analytic.account.crossovered.analytic:0
msgid "Code"
-msgstr ""
+msgstr "代码"
#. module: account_analytic_plans
#: wizard_button:create.model,info,end:0
msgid "OK"
-msgstr ""
+msgstr "确定"
#. module: account_analytic_plans
#: field:account.analytic.plan.line,root_analytic_id:0
msgid "Root Account"
-msgstr ""
+msgstr "根辅助核算项目"
#. module: account_analytic_plans
#: wizard_view:create.model,info:0
msgid ""
"This distribution model has been saved. You will be able to reuse it later."
-msgstr ""
+msgstr "这分配模型已经保存.你将在以后能重复使用"
#. module: account_analytic_plans
#: field:account.analytic.plan.line,sequence:0
msgid "Sequence"
-msgstr ""
+msgstr "序列"
#. module: account_analytic_plans
#: field:account.analytic.plan.instance.line,analytic_account_id:0
msgid "Analytic Account"
-msgstr ""
+msgstr "辅助核算项目"
#. module: account_analytic_plans
#: field:account.analytic.default,analytics_id:0
@@ -345,29 +372,29 @@ msgstr ""
#: field:account.invoice.line,analytics_id:0
#: field:account.move.line,analytics_id:0
msgid "Analytic Distribution"
-msgstr ""
+msgstr "辅助核算分配"
#. module: account_analytic_plans
#: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_plan_instance_action
msgid "Analytic Distribution's models"
-msgstr ""
+msgstr "辅助核算分配模型"
#. module: account_analytic_plans
#: wizard_button:wizard.crossovered.analytic,init,end:0
msgid "Cancel"
-msgstr ""
+msgstr "取消"
#. module: account_analytic_plans
#: wizard_field:wizard.crossovered.analytic,init,date1:0
msgid "Start Date"
-msgstr ""
+msgstr "开始日期"
#. module: account_analytic_plans
#: rml:account.analytic.account.crossovered.analytic:0
msgid "at"
-msgstr ""
+msgstr "在"
#. module: account_analytic_plans
#: rml:account.analytic.account.crossovered.analytic:0
msgid "From Date"
-msgstr ""
+msgstr "根据日期"
diff --git a/addons/account_analytic_plans/i18n/zh_TW.po b/addons/account_analytic_plans/i18n/zh_TW.po
index e256477d77a..908aa96c645 100644
--- a/addons/account_analytic_plans/i18n/zh_TW.po
+++ b/addons/account_analytic_plans/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_plans
diff --git a/addons/account_anglo_saxon/i18n/bg.po b/addons/account_anglo_saxon/i18n/bg.po
index f4a246285a1..1463c3fee45 100644
--- a/addons/account_anglo_saxon/i18n/bg.po
+++ b/addons/account_anglo_saxon/i18n/bg.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:17+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_anglo_saxon
diff --git a/addons/account_anglo_saxon/i18n/es.po b/addons/account_anglo_saxon/i18n/es.po
new file mode 100644
index 00000000000..eb8abe441ba
--- /dev/null
+++ b/addons/account_anglo_saxon/i18n/es.po
@@ -0,0 +1,66 @@
+# Spanish translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2009-11-24 12:50+0000\n"
+"PO-Revision-Date: 2010-03-24 17:25+0000\n"
+"Last-Translator: relojero \n"
+"Language-Team: Spanish \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:17+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_anglo_saxon
+#: view:product.category:0
+msgid " Accounting Property"
+msgstr " Contabilidad de la propiedad"
+
+#. module: account_anglo_saxon
+#: model:ir.module.module,description:account_anglo_saxon.module_meta_information
+msgid ""
+"This module will support the Anglo-Saxons accounting methodology by \n"
+" changing the accounting logic with stock transactions. The difference "
+"between the Anglo-Saxon accounting countries \n"
+" and the Rhine or also called Continental accounting countries is the "
+"moment of taking the Cost of Goods Sold versus Cost of Sales. \n"
+" Anglo-Saxons accounting does take the cost when sales invoice is "
+"created, Continental accounting will take the cost at he moment the goods "
+"are shipped.\n"
+" This module will add this functionality by using a interim account, to "
+"store the value of shipped goods and will contra book this interim account \n"
+" when the invoice is created to transfer this amount to the debtor or "
+"creditor account."
+msgstr ""
+
+#. module: account_anglo_saxon
+#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information
+msgid "Stock Account"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: field:product.category,property_account_creditor_price_difference_categ:0
+#: field:product.template,property_account_creditor_price_difference:0
+msgid "Price Difference Account"
+msgstr "Precio de la cuenta diferencia"
+
+#. module: account_anglo_saxon
+#: help:product.category,property_account_creditor_price_difference_categ:0
+#: help:product.template,property_account_creditor_price_difference:0
+msgid ""
+"This account will be used to value price difference between purchase price "
+"and cost price."
+msgstr ""
+"Esta cuenta se utilizará para valorar la diferencia de precios entre el "
+"precio de compra y precio de coste"
diff --git a/addons/account_anglo_saxon/i18n/hi.po b/addons/account_anglo_saxon/i18n/hi.po
index e05851e42f0..1d3021be1f9 100644
--- a/addons/account_anglo_saxon/i18n/hi.po
+++ b/addons/account_anglo_saxon/i18n/hi.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-18 04:35+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:17+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_anglo_saxon
diff --git a/addons/account_anglo_saxon/i18n/it.po b/addons/account_anglo_saxon/i18n/it.po
index 8689f0fbc57..4eb9a92a6cc 100644
--- a/addons/account_anglo_saxon/i18n/it.po
+++ b/addons/account_anglo_saxon/i18n/it.po
@@ -9,12 +9,12 @@ msgstr ""
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2009-11-24 12:50+0000\n"
"PO-Revision-Date: 2010-02-27 18:15+0000\n"
-"Last-Translator: phede92 \n"
+"Last-Translator: phede92 \n"
"Language-Team: Italian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:17+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_anglo_saxon
diff --git a/addons/account_anglo_saxon/i18n/oc.po b/addons/account_anglo_saxon/i18n/oc.po
index e40b4ff280d..f3872bc73d4 100644
--- a/addons/account_anglo_saxon/i18n/oc.po
+++ b/addons/account_anglo_saxon/i18n/oc.po
@@ -9,12 +9,12 @@ msgstr ""
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2009-11-24 12:50+0000\n"
"PO-Revision-Date: 2010-03-12 13:37+0000\n"
-"Last-Translator: Cédric VALMARY \n"
+"Last-Translator: Cédric VALMARY (Per Tot en òc) \n"
"Language-Team: Occitan (post 1500) \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-13 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:17+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_anglo_saxon
diff --git a/addons/account_anglo_saxon/i18n/pl.po b/addons/account_anglo_saxon/i18n/pl.po
index 6e71e753216..c3a4faec267 100644
--- a/addons/account_anglo_saxon/i18n/pl.po
+++ b/addons/account_anglo_saxon/i18n/pl.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:17+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_anglo_saxon
diff --git a/addons/account_anglo_saxon/i18n/sl.po b/addons/account_anglo_saxon/i18n/sl.po
index 79cc74e6183..515ec04cc07 100644
--- a/addons/account_anglo_saxon/i18n/sl.po
+++ b/addons/account_anglo_saxon/i18n/sl.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:17+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_anglo_saxon
diff --git a/addons/account_balance/i18n/ar.po b/addons/account_balance/i18n/ar.po
index d38004e5cb9..7a1106da540 100644
--- a/addons/account_balance/i18n/ar.po
+++ b/addons/account_balance/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:04+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_balance
diff --git a/addons/account_balance/i18n/bg.po b/addons/account_balance/i18n/bg.po
index 9b16ac696cc..34b77ef4e53 100644
--- a/addons/account_balance/i18n/bg.po
+++ b/addons/account_balance/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:04+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_balance
diff --git a/addons/account_balance/i18n/bs.po b/addons/account_balance/i18n/bs.po
index 4c2986d8fed..97260dad8ef 100644
--- a/addons/account_balance/i18n/bs.po
+++ b/addons/account_balance/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:04+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_balance
diff --git a/addons/account_balance/i18n/ca.po b/addons/account_balance/i18n/ca.po
index 99b78450101..b2d00752323 100644
--- a/addons/account_balance/i18n/ca.po
+++ b/addons/account_balance/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:04+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_balance
diff --git a/addons/account_balance/i18n/cs.po b/addons/account_balance/i18n/cs.po
index ad915d581a9..6d0b97f64dc 100644
--- a/addons/account_balance/i18n/cs.po
+++ b/addons/account_balance/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_balance
diff --git a/addons/account_balance/i18n/de.po b/addons/account_balance/i18n/de.po
index 7a4e84eab9e..0787b52a6a5 100644
--- a/addons/account_balance/i18n/de.po
+++ b/addons/account_balance/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_balance
diff --git a/addons/account_balance/i18n/el.po b/addons/account_balance/i18n/el.po
index 4dee67d6ce7..44e80b9ab4d 100644
--- a/addons/account_balance/i18n/el.po
+++ b/addons/account_balance/i18n/el.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_balance
diff --git a/addons/account_balance/i18n/es.po b/addons/account_balance/i18n/es.po
index 26fcea5a21c..1f252d206dc 100644
--- a/addons/account_balance/i18n/es.po
+++ b/addons/account_balance/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_balance
diff --git a/addons/account_balance/i18n/es_AR.po b/addons/account_balance/i18n/es_AR.po
index 5775c85fc7b..dbec543342d 100644
--- a/addons/account_balance/i18n/es_AR.po
+++ b/addons/account_balance/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_balance
diff --git a/addons/account_balance/i18n/et.po b/addons/account_balance/i18n/et.po
index 5f2d04a7d66..aca5f45239c 100644
--- a/addons/account_balance/i18n/et.po
+++ b/addons/account_balance/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_balance
diff --git a/addons/account_balance/i18n/fi.po b/addons/account_balance/i18n/fi.po
index 06cf6d3655b..0d07907afdf 100644
--- a/addons/account_balance/i18n/fi.po
+++ b/addons/account_balance/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_balance
diff --git a/addons/account_balance/i18n/fr.po b/addons/account_balance/i18n/fr.po
index b6ff20786b8..d1abec52ef3 100644
--- a/addons/account_balance/i18n/fr.po
+++ b/addons/account_balance/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_balance
diff --git a/addons/account_balance/i18n/gl.po b/addons/account_balance/i18n/gl.po
index 9835d210533..4ac944d8492 100644
--- a/addons/account_balance/i18n/gl.po
+++ b/addons/account_balance/i18n/gl.po
@@ -15,7 +15,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_balance
diff --git a/addons/account_balance/i18n/hr.po b/addons/account_balance/i18n/hr.po
index 1d89d80a1f9..94847f587d7 100644
--- a/addons/account_balance/i18n/hr.po
+++ b/addons/account_balance/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_balance
diff --git a/addons/account_balance/i18n/hu.po b/addons/account_balance/i18n/hu.po
index d38004e5cb9..728d11ee6c3 100644
--- a/addons/account_balance/i18n/hu.po
+++ b/addons/account_balance/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_balance
diff --git a/addons/account_balance/i18n/id.po b/addons/account_balance/i18n/id.po
index b654e97ea8b..3c3f81004ff 100644
--- a/addons/account_balance/i18n/id.po
+++ b/addons/account_balance/i18n/id.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_balance
diff --git a/addons/account_balance/i18n/it.po b/addons/account_balance/i18n/it.po
index a14ee2ea72c..fb0d60fa3cb 100644
--- a/addons/account_balance/i18n/it.po
+++ b/addons/account_balance/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_balance
diff --git a/addons/account_balance/i18n/ko.po b/addons/account_balance/i18n/ko.po
index 3aa34b41981..393a9935274 100644
--- a/addons/account_balance/i18n/ko.po
+++ b/addons/account_balance/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_balance
diff --git a/addons/account_balance/i18n/lt.po b/addons/account_balance/i18n/lt.po
index 1e43c55a7ff..8bc564f3581 100644
--- a/addons/account_balance/i18n/lt.po
+++ b/addons/account_balance/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_balance
diff --git a/addons/account_balance/i18n/nl.po b/addons/account_balance/i18n/nl.po
index e500db0f98b..777641395a8 100644
--- a/addons/account_balance/i18n/nl.po
+++ b/addons/account_balance/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_balance
diff --git a/addons/account_balance/i18n/pl.po b/addons/account_balance/i18n/pl.po
index 78f76a89e84..762397b070c 100644
--- a/addons/account_balance/i18n/pl.po
+++ b/addons/account_balance/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_balance
diff --git a/addons/account_balance/i18n/pt.po b/addons/account_balance/i18n/pt.po
index 6f30bfd2d67..0230abb2085 100644
--- a/addons/account_balance/i18n/pt.po
+++ b/addons/account_balance/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_balance
diff --git a/addons/account_balance/i18n/pt_BR.po b/addons/account_balance/i18n/pt_BR.po
index b1db3930d94..eafa265f751 100644
--- a/addons/account_balance/i18n/pt_BR.po
+++ b/addons/account_balance/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-19 07:50+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_balance
diff --git a/addons/account_balance/i18n/ro.po b/addons/account_balance/i18n/ro.po
index ecf4120e067..9c229349487 100644
--- a/addons/account_balance/i18n/ro.po
+++ b/addons/account_balance/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_balance
diff --git a/addons/account_balance/i18n/ru.po b/addons/account_balance/i18n/ru.po
index c4ae118390a..be5a6180a67 100644
--- a/addons/account_balance/i18n/ru.po
+++ b/addons/account_balance/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_balance
diff --git a/addons/account_balance/i18n/sl.po b/addons/account_balance/i18n/sl.po
index 640c3c2eeed..7894ca04f40 100644
--- a/addons/account_balance/i18n/sl.po
+++ b/addons/account_balance/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_balance
diff --git a/addons/account_balance/i18n/sv.po b/addons/account_balance/i18n/sv.po
index d38004e5cb9..728d11ee6c3 100644
--- a/addons/account_balance/i18n/sv.po
+++ b/addons/account_balance/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_balance
diff --git a/addons/account_balance/i18n/tlh.po b/addons/account_balance/i18n/tlh.po
index d58d119cf94..6f2f14a111a 100644
--- a/addons/account_balance/i18n/tlh.po
+++ b/addons/account_balance/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_balance
diff --git a/addons/account_balance/i18n/tr.po b/addons/account_balance/i18n/tr.po
index c5ac1c01f9b..d1ce9c420b8 100644
--- a/addons/account_balance/i18n/tr.po
+++ b/addons/account_balance/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_balance
diff --git a/addons/account_balance/i18n/uk.po b/addons/account_balance/i18n/uk.po
index c25c7a9cb02..efc8335fa53 100644
--- a/addons/account_balance/i18n/uk.po
+++ b/addons/account_balance/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_balance
diff --git a/addons/account_balance/i18n/zh_CN.po b/addons/account_balance/i18n/zh_CN.po
index a4fec5d3318..d920da595a7 100644
--- a/addons/account_balance/i18n/zh_CN.po
+++ b/addons/account_balance/i18n/zh_CN.po
@@ -4,96 +4,96 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 13:58+0000\n"
-"Last-Translator: Fabien (Open ERP) \n"
+"PO-Revision-Date: 2010-03-20 06:56+0000\n"
+"Last-Translator: Black Jack \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_balance
#: wizard_field:account.balance.account.balance.report,init,show_columns:0
msgid "Show Debit/Credit Information"
-msgstr ""
+msgstr "显示借方/贷方信息"
#. module: account_balance
#: selection:account.balance.account.balance.report,init,account_choice:0
msgid "All accounts"
-msgstr ""
+msgstr "所有科目"
#. module: account_balance
#: wizard_field:account.balance.account.balance.report,init,period_manner:0
msgid "Entries Selection Based on"
-msgstr ""
+msgstr "凭证选择基于"
#. module: account_balance
#: wizard_view:account.balance.account.balance.report,backtoinit:0
#: wizard_view:account.balance.account.balance.report,zero_years:0
msgid "Notification"
-msgstr ""
+msgstr "通知"
#. module: account_balance
#: selection:account.balance.account.balance.report,init,period_manner:0
msgid "Financial Period"
-msgstr ""
+msgstr "财务会计期间"
#. module: account_balance
#: model:ir.actions.report.xml,name:account_balance.account_account_balance
#: model:ir.actions.report.xml,name:account_balance.account_account_balance_landscape
msgid "Account balance"
-msgstr "科目余额"
+msgstr "科目结余"
#. module: account_balance
#: rml:account.account.balance.landscape:0
#: rml:account.balance.account.balance:0
msgid "Account Name"
-msgstr ""
+msgstr "科目名称"
#. module: account_balance
#: rml:account.account.balance.landscape:0
#: rml:account.balance.account.balance:0
msgid "Debit"
-msgstr ""
+msgstr "借方"
#. module: account_balance
#: wizard_button:account.balance.account.balance.report,init,checkyear:0
msgid "Print"
-msgstr ""
+msgstr "打印"
#. module: account_balance
#: wizard_view:account.balance.account.balance.report,init:0
msgid "Select Period(s)"
-msgstr ""
+msgstr "选择会计期间"
#. module: account_balance
#: selection:account.balance.account.balance.report,init,compare_pattern:0
msgid "Percentage"
-msgstr ""
+msgstr "百分率"
#. module: account_balance
#: wizard_field:account.balance.account.balance.report,init,compare_pattern:0
msgid "Compare Selected Years In Terms Of"
-msgstr ""
+msgstr "选定比较年份"
#. module: account_balance
#: wizard_view:account.balance.account.balance.report,init:0
msgid "Select Fiscal Year(s)(Maximum Three Years)"
-msgstr ""
+msgstr "选择会计年度度(最大值为三年)"
#. module: account_balance
#: wizard_field:account.balance.account.balance.report,init,select_account:0
msgid "Select Reference Account(for % comparision)"
-msgstr ""
+msgstr "选择参考科目(为比较)"
#. module: account_balance
#: model:ir.actions.wizard,name:account_balance.wizard_account_balance_report
msgid "Account balance-Compare Years"
-msgstr ""
+msgstr "科目结余年度比较"
#. module: account_balance
#: model:ir.module.module,description:account_balance.module_meta_information
@@ -116,152 +116,161 @@ msgid ""
" 5. You have an option to print the desired report in Landscape format.\n"
" "
msgstr ""
+"科目结余模块是一附加的财务管理模块\n"
+" \n"
+"\t该模块为你提供各种可选择打印的资产负债表\n"
+"\t1.你能比较资产负债表的不同年份.\n"
+"\t2.你能设置两年的现金或百分比比较\n"
+"\t3.你能设置特别年份的参考科目的百分比比较\n"
+"\t4.你能选择会计期间的实际日期或在会计期间创建日期\n"
+"\t5.你可以选择打印要求的报表\n"
+" "
#. module: account_balance
#: wizard_view:account.balance.account.balance.report,backtoinit:0
msgid "You have to select 'Landscape' option. Please Check it."
-msgstr ""
+msgstr "请勾选此项你能选择‘规定格式’选项"
#. module: account_balance
#: wizard_field:account.balance.account.balance.report,init,landscape:0
msgid "Show Report in Landscape Form"
-msgstr ""
+msgstr "显示固定格式的报表"
#. module: account_balance
#: help:account.balance.account.balance.report,init,periods:0
msgid "All periods if empty"
-msgstr ""
+msgstr "留空为所有会计期间"
#. module: account_balance
#: selection:account.balance.account.balance.report,init,account_choice:0
msgid "With balance is not equal to 0"
-msgstr ""
+msgstr "余额不为0"
#. module: account_balance
#: rml:account.account.balance.landscape:0
#: rml:account.balance.account.balance:0
msgid "Total :"
-msgstr ""
+msgstr "合计:"
#. module: account_balance
#: rml:account.account.balance.landscape:0
#: rml:account.balance.account.balance:0
msgid "Account Balance -"
-msgstr ""
+msgstr "科目结余-"
#. module: account_balance
#: wizard_field:account.balance.account.balance.report,init,format_perc:0
msgid "Show Comparision in %"
-msgstr ""
+msgstr "显示对比在 %"
#. module: account_balance
#: wizard_view:account.balance.account.balance.report,init:0
msgid "Select Period"
-msgstr ""
+msgstr "选择会计期间"
#. module: account_balance
#: wizard_view:account.balance.account.balance.report,init:0
msgid "Report Options"
-msgstr ""
+msgstr "报表选项"
#. module: account_balance
#: selection:account.balance.account.balance.report,init,account_choice:0
msgid "With movements"
-msgstr ""
+msgstr "进展"
#. module: account_balance
#: wizard_button:account.balance.account.balance.report,backtoinit,end:0
#: wizard_button:account.balance.account.balance.report,zero_years,end:0
msgid "Ok"
-msgstr ""
+msgstr "确定"
#. module: account_balance
#: selection:account.balance.account.balance.report,init,compare_pattern:0
msgid "Cash"
-msgstr ""
+msgstr "现金"
#. module: account_balance
#: selection:account.balance.account.balance.report,init,compare_pattern:0
msgid "Don't Compare"
-msgstr ""
+msgstr "不比较"
#. module: account_balance
#: wizard_field:account.balance.account.balance.report,init,account_choice:0
msgid "Show Accounts"
-msgstr ""
+msgstr "显示科目"
#. module: account_balance
#: rml:account.account.balance.landscape:0
#: rml:account.balance.account.balance:0
msgid "Credit"
-msgstr ""
+msgstr "贷方"
#. module: account_balance
#: wizard_view:account.balance.account.balance.report,backtoinit:0
msgid "1. You have selected more than 3 years in any case."
-msgstr ""
+msgstr "你必须要选择多于3年."
#. module: account_balance
#: model:ir.module.module,shortdesc:account_balance.module_meta_information
msgid "Accounting and financial management-Compare Accounts"
-msgstr ""
+msgstr "会计和财务管理-科目比较"
#. module: account_balance
#: rml:account.account.balance.landscape:0
#: rml:account.balance.account.balance:0
msgid "Year :"
-msgstr ""
+msgstr "会计年度:"
#. module: account_balance
#: wizard_view:account.balance.account.balance.report,backtoinit:0
msgid "You can select maximum 3 years. Please check again."
-msgstr ""
+msgstr "请勾选此项你最多能选择3年"
#. module: account_balance
#: rml:account.account.balance.landscape:0
#: rml:account.balance.account.balance:0
msgid "Balance"
-msgstr ""
+msgstr "余额"
#. module: account_balance
#: wizard_view:account.balance.account.balance.report,backtoinit:0
msgid ""
"3. You have selected 'Percentage' option with more than 2 years, but you "
"have not selected landscape format."
-msgstr ""
+msgstr "你已经选择‘百分率’选项这要2年以上.你没选择规定格式."
#. module: account_balance
#: wizard_view:account.balance.account.balance.report,backtoinit:0
msgid ""
"You might have done following mistakes. Please correct them and try again."
-msgstr ""
+msgstr "你可能犯以下错误.请纠正后再试."
#. module: account_balance
#: help:account.balance.account.balance.report,init,select_account:0
msgid "Keep empty for comparision to its parent"
-msgstr ""
+msgstr "留空为比较其母公司"
#. module: account_balance
#: selection:account.balance.account.balance.report,init,period_manner:0
msgid "Creation Date"
-msgstr ""
+msgstr "创建日期"
#. module: account_balance
#: wizard_field:account.balance.account.balance.report,init,fiscalyear:0
msgid "Fiscal year"
-msgstr ""
+msgstr "会计年度"
#. module: account_balance
#: wizard_view:account.balance.account.balance.report,backtoinit:0
msgid ""
"2. You have not selected 'Percentage' option, but you have selected more "
"than 2 years."
-msgstr ""
+msgstr "你尚未选择‘百分率’选项你要选择2年以上."
#. module: account_balance
#: wizard_field:account.balance.account.balance.report,init,periods:0
msgid "Periods"
-msgstr ""
+msgstr "会计期间"
#. module: account_balance
#: wizard_view:account.balance.account.balance.report,zero_years:0
@@ -269,19 +278,22 @@ msgid ""
"You may have selected the compare options with more than 1 year with "
"credit/debit columns and % option.This can lead contents to be printed out "
"of the paper.Please try again."
-msgstr ""
+msgstr "你必须要选择比较选项一年以上的借方/贷方栏和%选项这才能产生打印的内容请再试."
#. module: account_balance
#: wizard_button:account.balance.account.balance.report,init,end:0
msgid "Cancel"
-msgstr ""
+msgstr "取消"
#. module: account_balance
#: wizard_view:account.balance.account.balance.report,zero_years:0
msgid "You have to select at least 1 Fiscal Year. Try again."
-msgstr ""
+msgstr "你至少要选择一个会计年度再试"
#. module: account_balance
#: wizard_view:account.balance.account.balance.report,init:0
msgid "Customize Report"
-msgstr ""
+msgstr "自定义报表"
+
+#~ msgid "(If you do not select Fiscal year it will take all open fiscal years)"
+#~ msgstr "如果你不选择会计年度将提取所有会计年度"
diff --git a/addons/account_balance/i18n/zh_TW.po b/addons/account_balance/i18n/zh_TW.po
index 5fe71dfd7d6..a7d03782f30 100644
--- a/addons/account_balance/i18n/zh_TW.po
+++ b/addons/account_balance/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_balance
diff --git a/addons/account_budget/i18n/ar.po b/addons/account_budget/i18n/ar.po
index 84b9e39aad9..13e014fa41b 100644
--- a/addons/account_budget/i18n/ar.po
+++ b/addons/account_budget/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_budget
diff --git a/addons/account_budget/i18n/bg.po b/addons/account_budget/i18n/bg.po
index 769e9da4899..36d9ed3df15 100644
--- a/addons/account_budget/i18n/bg.po
+++ b/addons/account_budget/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_budget
diff --git a/addons/account_budget/i18n/bs.po b/addons/account_budget/i18n/bs.po
index 9be255d764e..6d7b0aa01ed 100644
--- a/addons/account_budget/i18n/bs.po
+++ b/addons/account_budget/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_budget
diff --git a/addons/account_budget/i18n/ca.po b/addons/account_budget/i18n/ca.po
index 4e57d3ce32d..d4d5b688744 100644
--- a/addons/account_budget/i18n/ca.po
+++ b/addons/account_budget/i18n/ca.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_budget
diff --git a/addons/account_budget/i18n/cs.po b/addons/account_budget/i18n/cs.po
index b99d3919529..ba153d3feae 100644
--- a/addons/account_budget/i18n/cs.po
+++ b/addons/account_budget/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_budget
diff --git a/addons/account_budget/i18n/de.po b/addons/account_budget/i18n/de.po
index 070eba6c9bb..1ced39aad5f 100644
--- a/addons/account_budget/i18n/de.po
+++ b/addons/account_budget/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_budget
diff --git a/addons/account_budget/i18n/el.po b/addons/account_budget/i18n/el.po
index c09a44309b0..4f379b2d3fe 100644
--- a/addons/account_budget/i18n/el.po
+++ b/addons/account_budget/i18n/el.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_budget
diff --git a/addons/account_budget/i18n/es.po b/addons/account_budget/i18n/es.po
index 550236bfcf2..da0c05f86c2 100644
--- a/addons/account_budget/i18n/es.po
+++ b/addons/account_budget/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_budget
diff --git a/addons/account_budget/i18n/es_AR.po b/addons/account_budget/i18n/es_AR.po
index e8e23668d4b..ff5f1299d7b 100644
--- a/addons/account_budget/i18n/es_AR.po
+++ b/addons/account_budget/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_budget
diff --git a/addons/account_budget/i18n/et.po b/addons/account_budget/i18n/et.po
index 4ea0041b12f..0a5ae3e1f6b 100644
--- a/addons/account_budget/i18n/et.po
+++ b/addons/account_budget/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_budget
diff --git a/addons/account_budget/i18n/fi.po b/addons/account_budget/i18n/fi.po
index 68dd432bdb1..0b49a6a905a 100644
--- a/addons/account_budget/i18n/fi.po
+++ b/addons/account_budget/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_budget
diff --git a/addons/account_budget/i18n/fr.po b/addons/account_budget/i18n/fr.po
index df982663cea..078668f383f 100644
--- a/addons/account_budget/i18n/fr.po
+++ b/addons/account_budget/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_budget
diff --git a/addons/account_budget/i18n/gl.po b/addons/account_budget/i18n/gl.po
index ba9738ddcb0..90c9ab61481 100644
--- a/addons/account_budget/i18n/gl.po
+++ b/addons/account_budget/i18n/gl.po
@@ -15,7 +15,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_budget
diff --git a/addons/account_budget/i18n/hi.po b/addons/account_budget/i18n/hi.po
index 45e850fcc12..d33bd3d0978 100644
--- a/addons/account_budget/i18n/hi.po
+++ b/addons/account_budget/i18n/hi.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_budget
diff --git a/addons/account_budget/i18n/hr.po b/addons/account_budget/i18n/hr.po
index b3bf1fed123..00a33e424b6 100644
--- a/addons/account_budget/i18n/hr.po
+++ b/addons/account_budget/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_budget
diff --git a/addons/account_budget/i18n/hu.po b/addons/account_budget/i18n/hu.po
index 3b68583980b..856617c1587 100644
--- a/addons/account_budget/i18n/hu.po
+++ b/addons/account_budget/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_budget
diff --git a/addons/account_budget/i18n/id.po b/addons/account_budget/i18n/id.po
index 721ef6e5f90..9047fa4ac15 100644
--- a/addons/account_budget/i18n/id.po
+++ b/addons/account_budget/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_budget
diff --git a/addons/account_budget/i18n/it.po b/addons/account_budget/i18n/it.po
index 67e2ebf3e8c..d122cf21762 100644
--- a/addons/account_budget/i18n/it.po
+++ b/addons/account_budget/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_budget
diff --git a/addons/account_budget/i18n/ko.po b/addons/account_budget/i18n/ko.po
index ef3c41e045f..97a4c8dfd54 100644
--- a/addons/account_budget/i18n/ko.po
+++ b/addons/account_budget/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_budget
diff --git a/addons/account_budget/i18n/lt.po b/addons/account_budget/i18n/lt.po
index 14e5e0e782a..c52662f648c 100644
--- a/addons/account_budget/i18n/lt.po
+++ b/addons/account_budget/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_budget
diff --git a/addons/account_budget/i18n/nl.po b/addons/account_budget/i18n/nl.po
index a914b477f98..67ba7f23e74 100644
--- a/addons/account_budget/i18n/nl.po
+++ b/addons/account_budget/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_budget
diff --git a/addons/account_budget/i18n/nl_BE.po b/addons/account_budget/i18n/nl_BE.po
index 7da34ef54b9..6c999cad1c4 100644
--- a/addons/account_budget/i18n/nl_BE.po
+++ b/addons/account_budget/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_budget
diff --git a/addons/account_budget/i18n/pl.po b/addons/account_budget/i18n/pl.po
index d0d6682f8da..5371eb2e5f2 100644
--- a/addons/account_budget/i18n/pl.po
+++ b/addons/account_budget/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_budget
diff --git a/addons/account_budget/i18n/pt.po b/addons/account_budget/i18n/pt.po
index c05b9a9671c..80cf845a641 100644
--- a/addons/account_budget/i18n/pt.po
+++ b/addons/account_budget/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_budget
diff --git a/addons/account_budget/i18n/pt_BR.po b/addons/account_budget/i18n/pt_BR.po
index 478907ecd1d..d7fe5464537 100644
--- a/addons/account_budget/i18n/pt_BR.po
+++ b/addons/account_budget/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_budget
diff --git a/addons/account_budget/i18n/ro.po b/addons/account_budget/i18n/ro.po
index aa8ff2bb1ab..cd3c7f8b1d7 100644
--- a/addons/account_budget/i18n/ro.po
+++ b/addons/account_budget/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_budget
diff --git a/addons/account_budget/i18n/ru.po b/addons/account_budget/i18n/ru.po
index f5fb4df6773..c29692ad115 100644
--- a/addons/account_budget/i18n/ru.po
+++ b/addons/account_budget/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_budget
diff --git a/addons/account_budget/i18n/sl.po b/addons/account_budget/i18n/sl.po
index 41f27182235..309b9597ea1 100644
--- a/addons/account_budget/i18n/sl.po
+++ b/addons/account_budget/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_budget
diff --git a/addons/account_budget/i18n/sv.po b/addons/account_budget/i18n/sv.po
index 13c3fd23f00..dcf557c50d8 100644
--- a/addons/account_budget/i18n/sv.po
+++ b/addons/account_budget/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_budget
diff --git a/addons/account_budget/i18n/tlh.po b/addons/account_budget/i18n/tlh.po
index 38985660267..046ec1654a6 100644
--- a/addons/account_budget/i18n/tlh.po
+++ b/addons/account_budget/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_budget
diff --git a/addons/account_budget/i18n/tr.po b/addons/account_budget/i18n/tr.po
index 2acb39764f0..4f893f19895 100644
--- a/addons/account_budget/i18n/tr.po
+++ b/addons/account_budget/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_budget
diff --git a/addons/account_budget/i18n/uk.po b/addons/account_budget/i18n/uk.po
index b4ae02d02e2..1b457b7549c 100644
--- a/addons/account_budget/i18n/uk.po
+++ b/addons/account_budget/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_budget
diff --git a/addons/account_budget/i18n/zh_CN.po b/addons/account_budget/i18n/zh_CN.po
index 70c01c0dfaf..a35420ee2f2 100644
--- a/addons/account_budget/i18n/zh_CN.po
+++ b/addons/account_budget/i18n/zh_CN.po
@@ -4,44 +4,44 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-01-08 03:31+0000\n"
-"Last-Translator: Wei \"oldrev\" Li \n"
+"PO-Revision-Date: 2010-03-20 06:58+0000\n"
+"Last-Translator: Black Jack \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_budget
#: field:crossovered.budget,creating_user_id:0
msgid "Responsible User"
-msgstr "负责用户"
+msgstr "责任用户"
#. module: account_budget
#: rml:account.budget:0
msgid "% performance"
-msgstr ""
+msgstr "% 执行%"
#. module: account_budget
#: model:ir.actions.act_window,name:account_budget.open_budget_post_form
#: model:ir.ui.menu,name:account_budget.menu_budget_post_form
msgid "Budgetary Positions"
-msgstr "预算状况"
+msgstr "预算位于"
#. module: account_budget
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
-msgstr "在动作定义使用了无效的模型名称。"
+msgstr "在这动作定义中有无效的模块名"
#. module: account_budget
#: rml:account.analytic.account.budget:0
#: rml:crossovered.budget.report:0
msgid "Printed at:"
-msgstr "打印于:"
+msgstr "打印在:"
#. module: account_budget
#: view:crossovered.budget:0
@@ -51,13 +51,13 @@ msgstr "确认"
#. module: account_budget
#: field:crossovered.budget,validating_user_id:0
msgid "Validate User"
-msgstr ""
+msgstr "确认用户"
#. module: account_budget
#: constraint:ir.model:0
msgid ""
"The Object name must start with x_ and not contain any special character !"
-msgstr "对象名称必须以“x_”起头且不能包含任何特殊字符!"
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
#. module: account_budget
#: selection:crossovered.budget,state:0
@@ -67,7 +67,7 @@ msgstr "已确认"
#. module: account_budget
#: field:account.budget.post.dotation,period_id:0
msgid "Period"
-msgstr "期间"
+msgstr "会计期间"
#. module: account_budget
#: wizard_field:account.budget.report,init,date2:0
@@ -75,12 +75,12 @@ msgstr "期间"
#: wizard_field:wizard.crossovered.budget,init,date_to:0
#: wizard_field:wizard.crossovered.budget.summary,init,date_to:0
msgid "End of period"
-msgstr "期末"
+msgstr "会计期间结束"
#. module: account_budget
#: rml:account.budget:0
msgid "Printing date:"
-msgstr "打印时间:"
+msgstr "打印日期:"
#. module: account_budget
#: selection:crossovered.budget,state:0
@@ -92,44 +92,44 @@ msgstr "草稿"
#: rml:account.budget:0
#: rml:crossovered.budget.report:0
msgid "at"
-msgstr ""
+msgstr "在"
#. module: account_budget
#: view:account.budget.post:0
msgid "Dotations"
-msgstr ""
+msgstr "给予"
#. module: account_budget
#: rml:account.budget:0
msgid "Performance"
-msgstr ""
+msgstr "执行"
#. module: account_budget
#: rml:account.analytic.account.budget:0
#: rml:account.budget:0
#: rml:crossovered.budget.report:0
msgid "Currency:"
-msgstr "货币:"
+msgstr "货币:"
#. module: account_budget
#: rml:account.budget:0
msgid "From"
-msgstr ""
+msgstr "从"
#. module: account_budget
#: field:crossovered.budget.lines,percentage:0
msgid "Percentage"
-msgstr ""
+msgstr "百分比"
#. module: account_budget
#: rml:account.budget:0
msgid "Results"
-msgstr ""
+msgstr "结果"
#. module: account_budget
#: field:crossovered.budget,state:0
msgid "Status"
-msgstr ""
+msgstr "状态"
#. module: account_budget
#: model:ir.module.module,description:account_budget.module_meta_information
@@ -160,6 +160,24 @@ msgid ""
"Budgets per Budgets.\n"
"\n"
msgstr ""
+"这模块允许会计管理辅助核算和交叉预算\n"
+"\n"
+"一旦在财务上定义主预算和预算\n"
+"(在财务管理/预算),项目经理可以设置\n"
+"每个辅助核算项目的计划金额.\n"
+"\n"
+"会计有可能看到每个已计划总金额\n"
+"确保总的已计划金额\n"
+"不低于或高于每个列表计划的预算和主要预算.\n"
+"每个记录列表能转为图形显示\n"
+"\n"
+"三个报表都可以:\n"
+"1.首先是可得到预算列表.它提供延伸对这些预算每个主要的预算辅助核算项目.\n"
+"\n"
+"2.其次是前面的摘要它只提供每个预算的主预算选择辅助核算项目的延伸.\n"
+"\n"
+"3.最后一个可用的辅助核算项目表.它提供每个预算的主预算选择的辅助核算项目的延伸.\n"
+"\n"
#. module: account_budget
#: rml:account.budget:0
@@ -171,12 +189,12 @@ msgstr ""
#: rml:account.analytic.account.budget:0
#: rml:crossovered.budget.report:0
msgid "Description"
-msgstr ""
+msgstr "说明"
#. module: account_budget
#: rml:account.analytic.account.budget:0
msgid "Analytic Account :"
-msgstr ""
+msgstr "辅助核算项目:"
#. module: account_budget
#: wizard_button:account.budget.report,init,report:0
@@ -196,94 +214,94 @@ msgstr ""
#: rml:account.budget:0
#: rml:crossovered.budget.report:0
msgid "to"
-msgstr ""
+msgstr "到"
#. module: account_budget
#: rml:account.analytic.account.budget:0
#: rml:account.budget:0
#: rml:crossovered.budget.report:0
msgid "Total :"
-msgstr "总计:"
+msgstr "合计:"
#. module: account_budget
#: rml:account.analytic.account.budget:0
#: field:crossovered.budget.lines,planned_amount:0
#: rml:crossovered.budget.report:0
msgid "Planned Amount"
-msgstr ""
+msgstr "已计划的金额"
#. module: account_budget
#: rml:account.analytic.account.budget:0
#: rml:crossovered.budget.report:0
msgid "Perc(%)"
-msgstr ""
+msgstr "百分比(%)"
#. module: account_budget
#: rml:account.budget:0
msgid "Period Budget"
-msgstr ""
+msgstr "会计期间预算"
#. module: account_budget
#: rml:account.budget:0
msgid "Budget Analysis"
-msgstr ""
+msgstr "预算核算"
#. module: account_budget
#: view:crossovered.budget:0
#: selection:crossovered.budget,state:0
msgid "Done"
-msgstr ""
+msgstr "完成"
#. module: account_budget
#: view:crossovered.budget:0
msgid "Validate"
-msgstr ""
+msgstr "确认"
#. module: account_budget
#: wizard_view:wizard.crossovered.budget,init:0
#: wizard_view:wizard.crossovered.budget.summary,init:0
msgid "Select Options"
-msgstr ""
+msgstr "选择可选择项"
#. module: account_budget
#: rml:account.analytic.account.budget:0
#: field:crossovered.budget.lines,practical_amount:0
#: rml:crossovered.budget.report:0
msgid "Practical Amount"
-msgstr ""
+msgstr "实际金额"
#. module: account_budget
#: field:crossovered.budget,date_to:0
#: field:crossovered.budget.lines,date_to:0
msgid "End Date"
-msgstr "结束时间"
+msgstr "结束日期"
#. module: account_budget
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
-msgstr "无效的 XML 视图架构!"
+msgstr "无效XML视图结构!"
#. module: account_budget
#: field:crossovered.budget.lines,theoritical_amount:0
msgid "Theoritical Amount"
-msgstr ""
+msgstr "理论金额"
#. module: account_budget
#: field:account.budget.post,name:0
#: field:account.budget.post.dotation,name:0
#: field:crossovered.budget,name:0
msgid "Name"
-msgstr "科目名称"
+msgstr "名称"
#. module: account_budget
#: model:ir.actions.wizard,name:account_budget.wizard_crossovered_budget_menu_1
msgid "Print Summary of Budgets"
-msgstr ""
+msgstr "打印预算合计"
#. module: account_budget
#: model:ir.actions.wizard,name:account_budget.wizard_budget_spread
msgid "Spread amount"
-msgstr ""
+msgstr "延伸金额"
#. module: account_budget
#: view:account.analytic.account:0
@@ -316,7 +334,7 @@ msgstr "金额"
#. module: account_budget
#: field:crossovered.budget.lines,paid_date:0
msgid "Paid Date"
-msgstr ""
+msgstr "支付日期"
#. module: account_budget
#: model:ir.actions.act_window,name:account_budget.action_account_budget_post_tree
@@ -328,30 +346,30 @@ msgstr "预算"
#. module: account_budget
#: selection:crossovered.budget,state:0
msgid "Cancelled"
-msgstr ""
+msgstr "已取消"
#. module: account_budget
#: view:account.budget.post.dotation:0
#: model:ir.model,name:account_budget.model_account_budget_post_dotation
msgid "Budget Dotation"
-msgstr ""
+msgstr "预算给予"
#. module: account_budget
#: view:account.budget.post.dotation:0
msgid "Budget Dotations"
-msgstr ""
+msgstr "预算给予"
#. module: account_budget
#: rml:account.budget:0
msgid "Budget Item Detail"
-msgstr ""
+msgstr "预算项详情"
#. module: account_budget
#: view:account.budget.post:0
#: field:crossovered.budget.lines,general_budget_id:0
#: model:ir.model,name:account_budget.model_account_budget_post
msgid "Budgetary Position"
-msgstr ""
+msgstr "预算位于"
#. module: account_budget
#: wizard_field:account.budget.report,init,date1:0
@@ -359,7 +377,7 @@ msgstr ""
#: wizard_field:wizard.crossovered.budget,init,date_from:0
#: wizard_field:wizard.crossovered.budget.summary,init,date_from:0
msgid "Start of period"
-msgstr "开始日期"
+msgstr "期初日期"
#. module: account_budget
#: model:ir.actions.report.xml,name:account_budget.account_analytic_account_budget
@@ -367,34 +385,34 @@ msgstr "开始日期"
#: model:ir.actions.wizard,name:account_budget.account_analytic_account_budget_report
#: model:ir.actions.wizard,name:account_budget.wizard_crossovered_budget_menu
msgid "Print Budgets"
-msgstr ""
+msgstr "打印预算"
#. module: account_budget
#: field:account.budget.post,code:0
#: field:crossovered.budget,code:0
msgid "Code"
-msgstr "编码"
+msgstr "代码"
#. module: account_budget
#: field:account.budget.post.dotation,tot_planned:0
msgid "Total Planned Amount"
-msgstr ""
+msgstr "计划金额合计"
#. module: account_budget
#: wizard_view:wizard.analytic.account.budget.report,init:0
msgid "Select Dates Period"
-msgstr ""
+msgstr "选择会计期间日期"
#. module: account_budget
#: field:account.budget.post,dotation_ids:0
msgid "Spreading"
-msgstr ""
+msgstr "延伸"
#. module: account_budget
#: rml:account.analytic.account.budget:0
#: rml:crossovered.budget.report:0
msgid "Theoretical Amount"
-msgstr ""
+msgstr "理论金额"
#. module: account_budget
#: wizard_field:account.budget.spread,init,fiscalyear:0
@@ -404,12 +422,12 @@ msgstr "会计年度"
#. module: account_budget
#: field:crossovered.budget.lines,analytic_account_id:0
msgid "Analytic Account"
-msgstr ""
+msgstr "辅助核算项目"
#. module: account_budget
#: rml:crossovered.budget.report:0
msgid "Budget :"
-msgstr ""
+msgstr "预算:"
#. module: account_budget
#: rml:account.budget:0
@@ -417,7 +435,7 @@ msgstr ""
#: wizard_view:account.budget.spread,init:0
#: wizard_button:account.budget.spread,init,spread:0
msgid "Spread"
-msgstr ""
+msgstr "延伸"
#. module: account_budget
#: view:account.budget.post:0
@@ -428,7 +446,7 @@ msgstr "科目"
#. module: account_budget
#: model:ir.actions.report.xml,name:account_budget.account_budget
msgid "Print Budget"
-msgstr "打印预算表"
+msgstr "打印预算"
#. module: account_budget
#: view:account.analytic.account:0
@@ -443,7 +461,7 @@ msgstr "打印预算表"
#: model:ir.model,name:account_budget.model_crossovered_budget_lines
#: model:ir.ui.menu,name:account_budget.menu_act_crossovered_budget_lines_view
msgid "Budget Lines"
-msgstr ""
+msgstr "预算明细"
#. module: account_budget
#: wizard_button:account.budget.report,init,end:0
@@ -458,26 +476,26 @@ msgstr "取消"
#. module: account_budget
#: model:ir.module.module,shortdesc:account_budget.module_meta_information
msgid "Budget Management"
-msgstr ""
+msgstr "预算管理"
#. module: account_budget
#: field:crossovered.budget,date_from:0
#: field:crossovered.budget.lines,date_from:0
msgid "Start Date"
-msgstr ""
+msgstr "开始日期"
#. module: account_budget
#: rml:account.analytic.account.budget:0
#: rml:crossovered.budget.report:0
msgid "Analysis from"
-msgstr ""
+msgstr "辅助核算从"
#. module: account_budget
#: selection:crossovered.budget,state:0
msgid "Validated"
-msgstr ""
+msgstr "确认"
#. module: account_budget
#: wizard_view:account.budget.report,init:0
msgid "Select period"
-msgstr "选择期间"
+msgstr "选择会计期间"
diff --git a/addons/account_budget/i18n/zh_TW.po b/addons/account_budget/i18n/zh_TW.po
index ea1793223d0..d02488227e6 100644
--- a/addons/account_budget/i18n/zh_TW.po
+++ b/addons/account_budget/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_budget
diff --git a/addons/account_budget/wizard/wizard_analytic_account_budget.py b/addons/account_budget/wizard/wizard_analytic_account_budget.py
index a8d6fb27c06..16702f7633d 100644
--- a/addons/account_budget/wizard/wizard_analytic_account_budget.py
+++ b/addons/account_budget/wizard/wizard_analytic_account_budget.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL ().
#
@@ -15,7 +15,7 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
#
##############################################################################
@@ -38,7 +38,7 @@ class wizard_report(wizard.interface):
states = {
'init': {
'actions': [],
- 'result': {'type':'form', 'arch':dates_form, 'fields':dates_fields, 'state':[('end','Cancel'),('report','Print')]}
+ 'result': {'type':'form', 'arch':dates_form, 'fields':dates_fields, 'state':[('end','Cancel', 'gtk-cancel'),('report','Print', 'gtk-print', True)]}
},
'report': {
'actions': [],
diff --git a/addons/account_budget/wizard/wizard_budget_report.py b/addons/account_budget/wizard/wizard_budget_report.py
index 544a401546b..72f251445ba 100644
--- a/addons/account_budget/wizard/wizard_budget_report.py
+++ b/addons/account_budget/wizard/wizard_budget_report.py
@@ -47,7 +47,7 @@ class wizard_report(wizard.interface):
states = {
'init': {
'actions': [_default],
- 'result': {'type':'form', 'arch':dates_form, 'fields':dates_fields, 'state':[('end','Cancel'),('report','Print')]}
+ 'result': {'type':'form', 'arch':dates_form, 'fields':dates_fields, 'state':[('end','Cancel', 'gtk-cancel'),('report','Print', 'gtk-print', True)]}
},
'report': {
'actions': [],
diff --git a/addons/account_budget/wizard/wizard_budget_spread.py b/addons/account_budget/wizard/wizard_budget_spread.py
index 31c4e8fb76f..a4885df2324 100644
--- a/addons/account_budget/wizard/wizard_budget_spread.py
+++ b/addons/account_budget/wizard/wizard_budget_spread.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL ().
#
@@ -15,7 +15,7 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
#
##############################################################################
@@ -43,7 +43,7 @@ class wizard_budget_spread(wizard.interface):
states = {
'init': {
'actions': [],
- 'result': {'type':'form', 'arch':_spread_form, 'fields':_spread_fields, 'state':[('end','Cancel'),('spread','Spread')]}
+ 'result': {'type':'form', 'arch':_spread_form, 'fields':_spread_fields, 'state':[('end','Cancel'),('spread','Spread','',True)]}
},
'spread': {
'actions': [_spread],
diff --git a/addons/account_budget/wizard/wizard_crossovered_budget_report.py b/addons/account_budget/wizard/wizard_crossovered_budget_report.py
index 2737798e7fe..a1357974126 100644
--- a/addons/account_budget/wizard/wizard_crossovered_budget_report.py
+++ b/addons/account_budget/wizard/wizard_crossovered_budget_report.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL ().
#
@@ -15,7 +15,7 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
#
##############################################################################
@@ -43,7 +43,7 @@ class wizard_report(wizard.interface):
states = {
'init': {
'actions': [_default],
- 'result': {'type':'form', 'arch':dates_form, 'fields':dates_fields, 'state':[('end','Cancel'),('report','Print')]}
+ 'result': {'type':'form', 'arch':dates_form, 'fields':dates_fields, 'state':[('end','Cancel', 'gtk-cancel'),('report','Print', 'gtk-print', True)]}
},
'report': {
'actions': [],
diff --git a/addons/account_budget/wizard/wizard_crossovered_budget_summary_report.py b/addons/account_budget/wizard/wizard_crossovered_budget_summary_report.py
index cbca68165b6..5580fea385f 100644
--- a/addons/account_budget/wizard/wizard_crossovered_budget_summary_report.py
+++ b/addons/account_budget/wizard/wizard_crossovered_budget_summary_report.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL ().
#
@@ -15,7 +15,7 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
#
##############################################################################
@@ -42,7 +42,7 @@ class wizard_report_summary(wizard.interface):
states = {
'init': {
'actions': [_default],
- 'result': {'type':'form', 'arch':dates_form, 'fields':dates_fields, 'state':[('end','Cancel'),('report','Print')]}
+ 'result': {'type':'form', 'arch':dates_form, 'fields':dates_fields, 'state':[('end','Cancel', 'gtk-cancel'),('report','Print', 'gtk-print', True)]}
},
'report': {
'actions': [],
diff --git a/addons/account_chart/i18n/ar.po b/addons/account_chart/i18n/ar.po
index a510d70d589..eaa300a9762 100644
--- a/addons/account_chart/i18n/ar.po
+++ b/addons/account_chart/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_chart
diff --git a/addons/account_chart/i18n/bg.po b/addons/account_chart/i18n/bg.po
index 0e4096cf523..09a4e57d2f5 100644
--- a/addons/account_chart/i18n/bg.po
+++ b/addons/account_chart/i18n/bg.po
@@ -7,16 +7,16 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-24 11:57+0000\n"
-"Last-Translator: lem0na \n"
+"PO-Revision-Date: 2010-03-29 11:00+0000\n"
+"Last-Translator: Boris \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_chart
#: model:ir.module.module,description:account_chart.module_meta_information
msgid "Remove minimal account chart"
-msgstr ""
+msgstr "Премахване на минимална графика на сметка"
diff --git a/addons/account_chart/i18n/bs.po b/addons/account_chart/i18n/bs.po
index 53ce1d5df28..017a0ea29f9 100644
--- a/addons/account_chart/i18n/bs.po
+++ b/addons/account_chart/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_chart
diff --git a/addons/account_chart/i18n/ca.po b/addons/account_chart/i18n/ca.po
index 8580048031c..283e2b63910 100644
--- a/addons/account_chart/i18n/ca.po
+++ b/addons/account_chart/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_chart
diff --git a/addons/account_chart/i18n/cs.po b/addons/account_chart/i18n/cs.po
index f52949ae39d..bb74bca7305 100644
--- a/addons/account_chart/i18n/cs.po
+++ b/addons/account_chart/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_chart
diff --git a/addons/account_chart/i18n/da.po b/addons/account_chart/i18n/da.po
index 8e8279e0488..28832159be8 100644
--- a/addons/account_chart/i18n/da.po
+++ b/addons/account_chart/i18n/da.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_chart
diff --git a/addons/account_chart/i18n/de.po b/addons/account_chart/i18n/de.po
index 16220f7af0d..6a71e089125 100644
--- a/addons/account_chart/i18n/de.po
+++ b/addons/account_chart/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_chart
diff --git a/addons/account_chart/i18n/el.po b/addons/account_chart/i18n/el.po
index 72165ab1348..18ade051d36 100644
--- a/addons/account_chart/i18n/el.po
+++ b/addons/account_chart/i18n/el.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_chart
diff --git a/addons/account_chart/i18n/es.po b/addons/account_chart/i18n/es.po
index a444198c59f..056e15cfe15 100644
--- a/addons/account_chart/i18n/es.po
+++ b/addons/account_chart/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_chart
diff --git a/addons/account_chart/i18n/es_AR.po b/addons/account_chart/i18n/es_AR.po
index a681de9ab2d..c60181a6691 100644
--- a/addons/account_chart/i18n/es_AR.po
+++ b/addons/account_chart/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_chart
diff --git a/addons/account_chart/i18n/et.po b/addons/account_chart/i18n/et.po
index 4dd6d7d40b5..c8caf7a0584 100644
--- a/addons/account_chart/i18n/et.po
+++ b/addons/account_chart/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_chart
diff --git a/addons/account_chart/i18n/fi.po b/addons/account_chart/i18n/fi.po
index a3688ddce50..fc5b32068ae 100644
--- a/addons/account_chart/i18n/fi.po
+++ b/addons/account_chart/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_chart
diff --git a/addons/account_chart/i18n/fr.po b/addons/account_chart/i18n/fr.po
index ef2655ea04d..222b88ff17b 100644
--- a/addons/account_chart/i18n/fr.po
+++ b/addons/account_chart/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_chart
diff --git a/addons/account_chart/i18n/gl.po b/addons/account_chart/i18n/gl.po
index dbbeea6b770..cf914678286 100644
--- a/addons/account_chart/i18n/gl.po
+++ b/addons/account_chart/i18n/gl.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_chart
diff --git a/addons/account_chart/i18n/hi.po b/addons/account_chart/i18n/hi.po
index 2e3a3a3dc7a..0d4c2653df3 100644
--- a/addons/account_chart/i18n/hi.po
+++ b/addons/account_chart/i18n/hi.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_chart
diff --git a/addons/account_chart/i18n/hr.po b/addons/account_chart/i18n/hr.po
index 0d4a76bfb62..65b39d1ac80 100644
--- a/addons/account_chart/i18n/hr.po
+++ b/addons/account_chart/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_chart
diff --git a/addons/account_chart/i18n/hu.po b/addons/account_chart/i18n/hu.po
index a510d70d589..eaa300a9762 100644
--- a/addons/account_chart/i18n/hu.po
+++ b/addons/account_chart/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_chart
diff --git a/addons/account_chart/i18n/id.po b/addons/account_chart/i18n/id.po
index 872fda64cae..e2115b8a5f2 100644
--- a/addons/account_chart/i18n/id.po
+++ b/addons/account_chart/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_chart
diff --git a/addons/account_chart/i18n/it.po b/addons/account_chart/i18n/it.po
index 2def9688000..c351d7f2b32 100644
--- a/addons/account_chart/i18n/it.po
+++ b/addons/account_chart/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_chart
diff --git a/addons/account_chart/i18n/ko.po b/addons/account_chart/i18n/ko.po
index 86804c8f446..181d0c85b7c 100644
--- a/addons/account_chart/i18n/ko.po
+++ b/addons/account_chart/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_chart
diff --git a/addons/account_chart/i18n/lt.po b/addons/account_chart/i18n/lt.po
index 75cccbbd211..0770eb83f0b 100644
--- a/addons/account_chart/i18n/lt.po
+++ b/addons/account_chart/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_chart
diff --git a/addons/account_chart/i18n/lv.po b/addons/account_chart/i18n/lv.po
index be6191351cf..79eb5052507 100644
--- a/addons/account_chart/i18n/lv.po
+++ b/addons/account_chart/i18n/lv.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_chart
diff --git a/addons/account_chart/i18n/nb.po b/addons/account_chart/i18n/nb.po
index 3efc97c3e8c..7fa8ef7e7d7 100644
--- a/addons/account_chart/i18n/nb.po
+++ b/addons/account_chart/i18n/nb.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_chart
diff --git a/addons/account_chart/i18n/nl.po b/addons/account_chart/i18n/nl.po
index a33b377f78d..2ba03eeaa1f 100644
--- a/addons/account_chart/i18n/nl.po
+++ b/addons/account_chart/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_chart
diff --git a/addons/account_chart/i18n/nl_BE.po b/addons/account_chart/i18n/nl_BE.po
index 19801abd7fe..2a0eddddfcc 100644
--- a/addons/account_chart/i18n/nl_BE.po
+++ b/addons/account_chart/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_chart
diff --git a/addons/account_chart/i18n/oc.po b/addons/account_chart/i18n/oc.po
index 7b897c5dc2b..8230730d802 100644
--- a/addons/account_chart/i18n/oc.po
+++ b/addons/account_chart/i18n/oc.po
@@ -9,12 +9,12 @@ msgstr ""
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2009-09-18 15:24+0000\n"
-"Last-Translator: Cédric VALMARY \n"
+"Last-Translator: Cédric VALMARY (Per Tot en òc) \n"
"Language-Team: Occitan (post 1500) \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_chart
diff --git a/addons/account_chart/i18n/pl.po b/addons/account_chart/i18n/pl.po
index 649e4f38d75..d5b1059e13f 100644
--- a/addons/account_chart/i18n/pl.po
+++ b/addons/account_chart/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_chart
diff --git a/addons/account_chart/i18n/pt.po b/addons/account_chart/i18n/pt.po
index c5bcb48c47e..2cc5553e7f6 100644
--- a/addons/account_chart/i18n/pt.po
+++ b/addons/account_chart/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_chart
diff --git a/addons/account_chart/i18n/pt_BR.po b/addons/account_chart/i18n/pt_BR.po
index 671c652c689..a1aa8bd5558 100644
--- a/addons/account_chart/i18n/pt_BR.po
+++ b/addons/account_chart/i18n/pt_BR.po
@@ -7,16 +7,16 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 13:47+0000\n"
+"PO-Revision-Date: 2010-03-24 01:00+0000\n"
"Last-Translator: Pedro_Maschio \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_chart
#: model:ir.module.module,description:account_chart.module_meta_information
msgid "Remove minimal account chart"
-msgstr ""
+msgstr "Remover plano de contas mínimo"
diff --git a/addons/account_chart/i18n/ro.po b/addons/account_chart/i18n/ro.po
index aae6426ebed..7ec977fad7c 100644
--- a/addons/account_chart/i18n/ro.po
+++ b/addons/account_chart/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_chart
diff --git a/addons/account_chart/i18n/ru.po b/addons/account_chart/i18n/ru.po
index a510d70d589..519eb416a3b 100644
--- a/addons/account_chart/i18n/ru.po
+++ b/addons/account_chart/i18n/ru.po
@@ -7,16 +7,16 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-04-10 14:08+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-03-30 10:18+0000\n"
+"Last-Translator: Nikolay Chesnokov \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-01 03:41+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_chart
#: model:ir.module.module,description:account_chart.module_meta_information
msgid "Remove minimal account chart"
-msgstr ""
+msgstr "Удалите минимальный план счетов"
diff --git a/addons/account_chart/i18n/sk.po b/addons/account_chart/i18n/sk.po
index a6bc5c91ab4..9c01a07d114 100644
--- a/addons/account_chart/i18n/sk.po
+++ b/addons/account_chart/i18n/sk.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_chart
diff --git a/addons/account_chart/i18n/sl.po b/addons/account_chart/i18n/sl.po
index 84c54a0b32e..c13aa8731ec 100644
--- a/addons/account_chart/i18n/sl.po
+++ b/addons/account_chart/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_chart
diff --git a/addons/account_chart/i18n/sr.po b/addons/account_chart/i18n/sr.po
index 62d5d5d5b4d..d7c2b20dccc 100644
--- a/addons/account_chart/i18n/sr.po
+++ b/addons/account_chart/i18n/sr.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_chart
diff --git a/addons/account_chart/i18n/sv.po b/addons/account_chart/i18n/sv.po
index da5aa9ed853..fbf4c72a770 100644
--- a/addons/account_chart/i18n/sv.po
+++ b/addons/account_chart/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_chart
diff --git a/addons/account_chart/i18n/tr.po b/addons/account_chart/i18n/tr.po
index 3af28a548a6..f05f1a51a04 100644
--- a/addons/account_chart/i18n/tr.po
+++ b/addons/account_chart/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_chart
diff --git a/addons/account_chart/i18n/uk.po b/addons/account_chart/i18n/uk.po
index 71d68a44750..0cac882d308 100644
--- a/addons/account_chart/i18n/uk.po
+++ b/addons/account_chart/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_chart
diff --git a/addons/account_chart/i18n/zh_CN.po b/addons/account_chart/i18n/zh_CN.po
index b1c22fd3747..41a1b6c0b2a 100644
--- a/addons/account_chart/i18n/zh_CN.po
+++ b/addons/account_chart/i18n/zh_CN.po
@@ -4,19 +4,22 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-01 15:49+0000\n"
-"Last-Translator: Wei \"oldrev\" Li \n"
+"PO-Revision-Date: 2010-03-20 07:00+0000\n"
+"Last-Translator: Black Jack \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_chart
#: model:ir.module.module,description:account_chart.module_meta_information
msgid "Remove minimal account chart"
-msgstr "去除最小化的会计科目表"
+msgstr "删除最小科目表"
+
+#~ msgid "Charts of Accounts"
+#~ msgstr "科目表"
diff --git a/addons/account_chart/i18n/zh_TW.po b/addons/account_chart/i18n/zh_TW.po
index a510d70d589..eaa300a9762 100644
--- a/addons/account_chart/i18n/zh_TW.po
+++ b/addons/account_chart/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:16+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_chart
diff --git a/addons/account_date_check/i18n/ar.po b/addons/account_date_check/i18n/ar.po
index b12b3181ef6..a7a02e11712 100644
--- a/addons/account_date_check/i18n/ar.po
+++ b/addons/account_date_check/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_date_check
diff --git a/addons/account_date_check/i18n/bg.po b/addons/account_date_check/i18n/bg.po
index a5c23087f77..e16bad3b7d4 100644
--- a/addons/account_date_check/i18n/bg.po
+++ b/addons/account_date_check/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_date_check
diff --git a/addons/account_date_check/i18n/bs.po b/addons/account_date_check/i18n/bs.po
index d98ed4d008a..a846146d12b 100644
--- a/addons/account_date_check/i18n/bs.po
+++ b/addons/account_date_check/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_date_check
diff --git a/addons/account_date_check/i18n/ca.po b/addons/account_date_check/i18n/ca.po
index 3feabc5ebc4..aef874dc6cb 100644
--- a/addons/account_date_check/i18n/ca.po
+++ b/addons/account_date_check/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_date_check
diff --git a/addons/account_date_check/i18n/cs.po b/addons/account_date_check/i18n/cs.po
index a32f7b78ad6..ca30b6a1ff1 100644
--- a/addons/account_date_check/i18n/cs.po
+++ b/addons/account_date_check/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_date_check
diff --git a/addons/account_date_check/i18n/da.po b/addons/account_date_check/i18n/da.po
index f6407bbc0f0..66a5b68d4e5 100644
--- a/addons/account_date_check/i18n/da.po
+++ b/addons/account_date_check/i18n/da.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_date_check
diff --git a/addons/account_date_check/i18n/de.po b/addons/account_date_check/i18n/de.po
index 4cfae9f5fe2..d3c83fc361c 100644
--- a/addons/account_date_check/i18n/de.po
+++ b/addons/account_date_check/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_date_check
diff --git a/addons/account_date_check/i18n/el.po b/addons/account_date_check/i18n/el.po
index 39a8d724642..4c37875f3c1 100644
--- a/addons/account_date_check/i18n/el.po
+++ b/addons/account_date_check/i18n/el.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_date_check
diff --git a/addons/account_date_check/i18n/es.po b/addons/account_date_check/i18n/es.po
index 0f9dd7eea85..2ffffbba92f 100644
--- a/addons/account_date_check/i18n/es.po
+++ b/addons/account_date_check/i18n/es.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_date_check
diff --git a/addons/account_date_check/i18n/es_AR.po b/addons/account_date_check/i18n/es_AR.po
index ead527adb81..f74c0556303 100644
--- a/addons/account_date_check/i18n/es_AR.po
+++ b/addons/account_date_check/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_date_check
diff --git a/addons/account_date_check/i18n/et.po b/addons/account_date_check/i18n/et.po
index 2c580c3fe29..2e351b5dd1e 100644
--- a/addons/account_date_check/i18n/et.po
+++ b/addons/account_date_check/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_date_check
diff --git a/addons/account_date_check/i18n/fi.po b/addons/account_date_check/i18n/fi.po
index 858c9488f32..21d66c24962 100644
--- a/addons/account_date_check/i18n/fi.po
+++ b/addons/account_date_check/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_date_check
diff --git a/addons/account_date_check/i18n/fr.po b/addons/account_date_check/i18n/fr.po
index 0dace404340..673ac7f58f7 100644
--- a/addons/account_date_check/i18n/fr.po
+++ b/addons/account_date_check/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_date_check
diff --git a/addons/account_date_check/i18n/gl.po b/addons/account_date_check/i18n/gl.po
index 288baebb310..76656bf270e 100644
--- a/addons/account_date_check/i18n/gl.po
+++ b/addons/account_date_check/i18n/gl.po
@@ -15,7 +15,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_date_check
diff --git a/addons/account_date_check/i18n/hr.po b/addons/account_date_check/i18n/hr.po
index c26fb6ae270..d8f44fc380a 100644
--- a/addons/account_date_check/i18n/hr.po
+++ b/addons/account_date_check/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_date_check
diff --git a/addons/account_date_check/i18n/hu.po b/addons/account_date_check/i18n/hu.po
index b12b3181ef6..a7a02e11712 100644
--- a/addons/account_date_check/i18n/hu.po
+++ b/addons/account_date_check/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_date_check
diff --git a/addons/account_date_check/i18n/id.po b/addons/account_date_check/i18n/id.po
index 0ac6efa1146..4f14ad764c9 100644
--- a/addons/account_date_check/i18n/id.po
+++ b/addons/account_date_check/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_date_check
diff --git a/addons/account_date_check/i18n/it.po b/addons/account_date_check/i18n/it.po
index 2628f709520..8d844595cd9 100644
--- a/addons/account_date_check/i18n/it.po
+++ b/addons/account_date_check/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_date_check
diff --git a/addons/account_date_check/i18n/ko.po b/addons/account_date_check/i18n/ko.po
index 1a367e09bd9..2686d1b6469 100644
--- a/addons/account_date_check/i18n/ko.po
+++ b/addons/account_date_check/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_date_check
diff --git a/addons/account_date_check/i18n/lt.po b/addons/account_date_check/i18n/lt.po
index 103cc4f50ca..be238d31d4e 100644
--- a/addons/account_date_check/i18n/lt.po
+++ b/addons/account_date_check/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_date_check
diff --git a/addons/account_date_check/i18n/nl.po b/addons/account_date_check/i18n/nl.po
index 097f7308383..1e8ca9ed8e1 100644
--- a/addons/account_date_check/i18n/nl.po
+++ b/addons/account_date_check/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_date_check
diff --git a/addons/account_date_check/i18n/nl_BE.po b/addons/account_date_check/i18n/nl_BE.po
index 689d13c0fe7..b87cbeecdce 100644
--- a/addons/account_date_check/i18n/nl_BE.po
+++ b/addons/account_date_check/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_date_check
diff --git a/addons/account_date_check/i18n/oc.po b/addons/account_date_check/i18n/oc.po
index 52b15d9dbcd..984f4f1a24a 100644
--- a/addons/account_date_check/i18n/oc.po
+++ b/addons/account_date_check/i18n/oc.po
@@ -9,12 +9,12 @@ msgstr ""
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-03-12 13:29+0000\n"
-"Last-Translator: Cédric VALMARY \n"
+"Last-Translator: Cédric VALMARY (Per Tot en òc) \n"
"Language-Team: Occitan (post 1500) \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-13 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_date_check
diff --git a/addons/account_date_check/i18n/pl.po b/addons/account_date_check/i18n/pl.po
index e44a266417d..0a331b47522 100644
--- a/addons/account_date_check/i18n/pl.po
+++ b/addons/account_date_check/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_date_check
diff --git a/addons/account_date_check/i18n/pt.po b/addons/account_date_check/i18n/pt.po
index 4980e1cb5b2..1afa1470827 100644
--- a/addons/account_date_check/i18n/pt.po
+++ b/addons/account_date_check/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_date_check
diff --git a/addons/account_date_check/i18n/pt_BR.po b/addons/account_date_check/i18n/pt_BR.po
index ed4cb3f003a..99d11dd8177 100644
--- a/addons/account_date_check/i18n/pt_BR.po
+++ b/addons/account_date_check/i18n/pt_BR.po
@@ -7,26 +7,26 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-09 16:21+0000\n"
-"Last-Translator: Fabien (Open ERP) \n"
+"PO-Revision-Date: 2010-03-24 01:05+0000\n"
+"Last-Translator: Pedro_Maschio \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_date_check
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
-msgstr "Invalido XML para Arquitetura da View"
+msgstr "XML inválido para Arquitetura da View"
#. module: account_date_check
#: field:account.journal,allow_date:0
msgid "Allows date not in the period"
-msgstr ""
+msgstr "Permite datas fora do período"
#. module: account_date_check
#: model:ir.module.module,shortdesc:account_date_check.module_meta_information
msgid "Account Date check"
-msgstr ""
+msgstr "Verificação de Data de Conta"
diff --git a/addons/account_date_check/i18n/ro.po b/addons/account_date_check/i18n/ro.po
index 734df245b68..58d576188cb 100644
--- a/addons/account_date_check/i18n/ro.po
+++ b/addons/account_date_check/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_date_check
diff --git a/addons/account_date_check/i18n/ru.po b/addons/account_date_check/i18n/ru.po
index 0f7846587fb..fb86de74ceb 100644
--- a/addons/account_date_check/i18n/ru.po
+++ b/addons/account_date_check/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_date_check
diff --git a/addons/account_date_check/i18n/sk.po b/addons/account_date_check/i18n/sk.po
index aec156662d0..4c4ab4bc724 100644
--- a/addons/account_date_check/i18n/sk.po
+++ b/addons/account_date_check/i18n/sk.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_date_check
diff --git a/addons/account_date_check/i18n/sl.po b/addons/account_date_check/i18n/sl.po
index dd8f906b6eb..51a12d17a87 100644
--- a/addons/account_date_check/i18n/sl.po
+++ b/addons/account_date_check/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_date_check
diff --git a/addons/account_date_check/i18n/sv.po b/addons/account_date_check/i18n/sv.po
index 113d9fdf2bb..bf47370e2c6 100644
--- a/addons/account_date_check/i18n/sv.po
+++ b/addons/account_date_check/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_date_check
diff --git a/addons/account_date_check/i18n/tlh.po b/addons/account_date_check/i18n/tlh.po
index ced207bef50..14ebd73efc3 100644
--- a/addons/account_date_check/i18n/tlh.po
+++ b/addons/account_date_check/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_date_check
diff --git a/addons/account_date_check/i18n/tr.po b/addons/account_date_check/i18n/tr.po
index 7f0d3789102..69f2a69359c 100644
--- a/addons/account_date_check/i18n/tr.po
+++ b/addons/account_date_check/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_date_check
diff --git a/addons/account_date_check/i18n/uk.po b/addons/account_date_check/i18n/uk.po
index 4c0d6f142eb..234481b3170 100644
--- a/addons/account_date_check/i18n/uk.po
+++ b/addons/account_date_check/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_date_check
diff --git a/addons/account_date_check/i18n/zh_CN.po b/addons/account_date_check/i18n/zh_CN.po
index 310e98da4e3..9822ef5572f 100644
--- a/addons/account_date_check/i18n/zh_CN.po
+++ b/addons/account_date_check/i18n/zh_CN.po
@@ -4,29 +4,50 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-01-08 03:45+0000\n"
-"Last-Translator: Wei \"oldrev\" Li \n"
+"PO-Revision-Date: 2010-03-20 07:01+0000\n"
+"Last-Translator: Black Jack \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_date_check
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
-msgstr "无效的 XML 视图架构!"
+msgstr "无效的视图结构XML文件!"
#. module: account_date_check
#: field:account.journal,allow_date:0
msgid "Allows date not in the period"
-msgstr ""
+msgstr "允许日期不在这会计期间"
#. module: account_date_check
#: model:ir.module.module,shortdesc:account_date_check.module_meta_information
msgid "Account Date check"
-msgstr ""
+msgstr "科目日期检查"
+
+#~ msgid ""
+#~ "\n"
+#~ " * Adds a field on journals: \"Allows date not in the period\"\n"
+#~ " * By default, this field is checked.\n"
+#~ "\n"
+#~ "If this field is not checked, the system control that the date is in the\n"
+#~ "period when you create an account entry. Otherwise, it generates an\n"
+#~ "error message: \"The date of your account move is not in the defined\n"
+#~ "period !\"\n"
+#~ " "
+#~ msgstr ""
+#~ "\n"
+#~ " * 在分类帐增加一个字段:允许日期不在会计期间\n"
+#~ " * 默认下这字段是已检查\n"
+#~ "\n"
+#~ " 如果这字段是不检查,系统日期是在这会计期间\n"
+#~ "你能创建凭证.\n"
+#~ "否则,它会产生一个错误信息:\n"
+#~ "你不能在这会计期间凭证\n"
+#~ " "
diff --git a/addons/account_date_check/i18n/zh_TW.po b/addons/account_date_check/i18n/zh_TW.po
index c45e95ab44a..e6ca8e68944 100644
--- a/addons/account_date_check/i18n/zh_TW.po
+++ b/addons/account_date_check/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_date_check
diff --git a/addons/account_followup/i18n/ar.po b/addons/account_followup/i18n/ar.po
index 2c598e4b300..94dd52e0513 100644
--- a/addons/account_followup/i18n/ar.po
+++ b/addons/account_followup/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_followup
diff --git a/addons/account_followup/i18n/bg.po b/addons/account_followup/i18n/bg.po
index d052e42e93e..7cdfd7c2bd9 100644
--- a/addons/account_followup/i18n/bg.po
+++ b/addons/account_followup/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_followup
diff --git a/addons/account_followup/i18n/bs.po b/addons/account_followup/i18n/bs.po
index cab90780daa..4c5e89364e0 100644
--- a/addons/account_followup/i18n/bs.po
+++ b/addons/account_followup/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_followup
diff --git a/addons/account_followup/i18n/ca.po b/addons/account_followup/i18n/ca.po
index 077cd97a2fb..597962ae488 100644
--- a/addons/account_followup/i18n/ca.po
+++ b/addons/account_followup/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_followup
diff --git a/addons/account_followup/i18n/cs.po b/addons/account_followup/i18n/cs.po
index 2c598e4b300..94dd52e0513 100644
--- a/addons/account_followup/i18n/cs.po
+++ b/addons/account_followup/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_followup
diff --git a/addons/account_followup/i18n/de.po b/addons/account_followup/i18n/de.po
index a4c36dacd36..22e9addf58a 100644
--- a/addons/account_followup/i18n/de.po
+++ b/addons/account_followup/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_followup
diff --git a/addons/account_followup/i18n/el.po b/addons/account_followup/i18n/el.po
index d9597e30ea7..da16bb4eac3 100644
--- a/addons/account_followup/i18n/el.po
+++ b/addons/account_followup/i18n/el.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_followup
diff --git a/addons/account_followup/i18n/es.po b/addons/account_followup/i18n/es.po
index 8eff4e484d5..ac5bf792881 100644
--- a/addons/account_followup/i18n/es.po
+++ b/addons/account_followup/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_followup
diff --git a/addons/account_followup/i18n/es_AR.po b/addons/account_followup/i18n/es_AR.po
index ee96c7f7630..d669e28eb4f 100644
--- a/addons/account_followup/i18n/es_AR.po
+++ b/addons/account_followup/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_followup
diff --git a/addons/account_followup/i18n/et.po b/addons/account_followup/i18n/et.po
index f41cbb17c8a..e76f8f06536 100644
--- a/addons/account_followup/i18n/et.po
+++ b/addons/account_followup/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_followup
diff --git a/addons/account_followup/i18n/fi.po b/addons/account_followup/i18n/fi.po
index f71e87d5e69..ab35aafeaaa 100644
--- a/addons/account_followup/i18n/fi.po
+++ b/addons/account_followup/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-13 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_followup
diff --git a/addons/account_followup/i18n/fr.po b/addons/account_followup/i18n/fr.po
index 61034b4229a..3404cc24f60 100644
--- a/addons/account_followup/i18n/fr.po
+++ b/addons/account_followup/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_followup
diff --git a/addons/account_followup/i18n/hr.po b/addons/account_followup/i18n/hr.po
index 65c32ec29f3..1e1d4980536 100644
--- a/addons/account_followup/i18n/hr.po
+++ b/addons/account_followup/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_followup
diff --git a/addons/account_followup/i18n/hu.po b/addons/account_followup/i18n/hu.po
index 2c598e4b300..94dd52e0513 100644
--- a/addons/account_followup/i18n/hu.po
+++ b/addons/account_followup/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_followup
diff --git a/addons/account_followup/i18n/id.po b/addons/account_followup/i18n/id.po
index 43711e6ec82..4f60a06b80a 100644
--- a/addons/account_followup/i18n/id.po
+++ b/addons/account_followup/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_followup
diff --git a/addons/account_followup/i18n/it.po b/addons/account_followup/i18n/it.po
index 0f7c8a645bf..e85a81a35d5 100644
--- a/addons/account_followup/i18n/it.po
+++ b/addons/account_followup/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_followup
diff --git a/addons/account_followup/i18n/ko.po b/addons/account_followup/i18n/ko.po
index 8b4d6c84b9b..173d7f72e4d 100644
--- a/addons/account_followup/i18n/ko.po
+++ b/addons/account_followup/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_followup
diff --git a/addons/account_followup/i18n/lt.po b/addons/account_followup/i18n/lt.po
index a6c4deacf77..cfe7f5331c4 100644
--- a/addons/account_followup/i18n/lt.po
+++ b/addons/account_followup/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_followup
diff --git a/addons/account_followup/i18n/nl.po b/addons/account_followup/i18n/nl.po
index d991176792a..1a7ca5938d0 100644
--- a/addons/account_followup/i18n/nl.po
+++ b/addons/account_followup/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_followup
diff --git a/addons/account_followup/i18n/nl_BE.po b/addons/account_followup/i18n/nl_BE.po
index 3bb1164718c..55f5c135e31 100644
--- a/addons/account_followup/i18n/nl_BE.po
+++ b/addons/account_followup/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_followup
diff --git a/addons/account_followup/i18n/pl.po b/addons/account_followup/i18n/pl.po
index 921ca5011cf..c5dc703649d 100644
--- a/addons/account_followup/i18n/pl.po
+++ b/addons/account_followup/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_followup
diff --git a/addons/account_followup/i18n/pt.po b/addons/account_followup/i18n/pt.po
index cf55a72d8f4..0b83cee8e24 100644
--- a/addons/account_followup/i18n/pt.po
+++ b/addons/account_followup/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_followup
diff --git a/addons/account_followup/i18n/pt_BR.po b/addons/account_followup/i18n/pt_BR.po
index 188769435ac..25206af21ce 100644
--- a/addons/account_followup/i18n/pt_BR.po
+++ b/addons/account_followup/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_followup
diff --git a/addons/account_followup/i18n/ro.po b/addons/account_followup/i18n/ro.po
index e5a9cfc3bc3..017f1f377ee 100644
--- a/addons/account_followup/i18n/ro.po
+++ b/addons/account_followup/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_followup
diff --git a/addons/account_followup/i18n/ru.po b/addons/account_followup/i18n/ru.po
index 4a4f94c6d8d..021ebf2ba21 100644
--- a/addons/account_followup/i18n/ru.po
+++ b/addons/account_followup/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_followup
diff --git a/addons/account_followup/i18n/sl.po b/addons/account_followup/i18n/sl.po
index dec5beec597..d9770d8ee51 100644
--- a/addons/account_followup/i18n/sl.po
+++ b/addons/account_followup/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_followup
diff --git a/addons/account_followup/i18n/sv.po b/addons/account_followup/i18n/sv.po
index 847be312ea9..f1dd4ee3e74 100644
--- a/addons/account_followup/i18n/sv.po
+++ b/addons/account_followup/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_followup
diff --git a/addons/account_followup/i18n/tlh.po b/addons/account_followup/i18n/tlh.po
index f56c761c388..b91adfcfaa9 100644
--- a/addons/account_followup/i18n/tlh.po
+++ b/addons/account_followup/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_followup
diff --git a/addons/account_followup/i18n/tr.po b/addons/account_followup/i18n/tr.po
index 7600e2ef489..6154f02f758 100644
--- a/addons/account_followup/i18n/tr.po
+++ b/addons/account_followup/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_followup
diff --git a/addons/account_followup/i18n/uk.po b/addons/account_followup/i18n/uk.po
index 73d83d4f779..6c9f48ed296 100644
--- a/addons/account_followup/i18n/uk.po
+++ b/addons/account_followup/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_followup
diff --git a/addons/account_followup/i18n/zh_CN.po b/addons/account_followup/i18n/zh_CN.po
index df4c9c195e3..72495407627 100644
--- a/addons/account_followup/i18n/zh_CN.po
+++ b/addons/account_followup/i18n/zh_CN.po
@@ -4,209 +4,209 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-01-30 12:49+0000\n"
-"Last-Translator: Fabien (Open ERP) \n"
+"PO-Revision-Date: 2010-03-20 07:04+0000\n"
+"Last-Translator: Black Jack \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_followup
#: rml:account_followup.followup.print:0
msgid "Date :"
-msgstr ""
+msgstr "打印日期:"
#. module: account_followup
#: wizard_field:account_followup.followup.print.all,next,partner_ids:0
msgid "Partners"
-msgstr ""
+msgstr "业务伙伴"
#. module: account_followup
#: rml:account_followup.followup.print:0
msgid "Customer Ref :"
-msgstr ""
+msgstr "客户参考:"
#. module: account_followup
#: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_payable_all
#: model:ir.ui.menu,name:account_followup.menu_account_move_open_unreconcile_payable
msgid "All payable entries"
-msgstr ""
+msgstr "所有应付款凭证"
#. module: account_followup
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "在这动作定义中有无效的模块名"
#. module: account_followup
#: field:account_followup.followup.line,description:0
msgid "Printed Message"
-msgstr ""
+msgstr "已打印消息"
#. module: account_followup
#: rml:account_followup.followup.print:0
msgid "Amount In Currency"
-msgstr ""
+msgstr "金额"
#. module: account_followup
#: rml:account_followup.followup.print:0
msgid "Due"
-msgstr ""
+msgstr "应付款"
#. module: account_followup
#: view:account.move.line:0
msgid "Total debit"
-msgstr ""
+msgstr "借方合计"
#. module: account_followup
#: view:account_followup.followup.line:0
#: wizard_view:account_followup.followup.print.all,next:0
msgid "%(user_signature)s: User name"
-msgstr ""
+msgstr "%(user_signature)s:用户名 %(user_signature)"
#. module: account_followup
#: wizard_view:account_followup.followup.print.all,next:0
msgid "Select partners"
-msgstr ""
+msgstr "选择业务伙伴"
#. module: account_followup
#: view:account_followup.followup:0
#: field:account_followup.followup,followup_line:0
msgid "Follow-Up"
-msgstr ""
+msgstr "跟进"
#. module: account_followup
#: field:account_followup.stat,debit:0
msgid "Debit"
-msgstr ""
+msgstr "借方"
#. module: account_followup
#: wizard_view:account_followup.followup.print.all,next:0
msgid "Email Settings"
-msgstr ""
+msgstr "电子邮件设置"
#. module: account_followup
#: field:account_followup.stat,account_type:0
msgid "Account Type"
-msgstr ""
+msgstr "科目类型"
#. module: account_followup
#: rml:account_followup.followup.print:0
msgid "Ref"
-msgstr ""
+msgstr "参考"
#. module: account_followup
#: wizard_view:account_followup.followup.print.all,next:0
msgid "%(followup_amount)s: Total Amount Due"
-msgstr ""
+msgstr "应付总金额:%(followup_amount)s"
#. module: account_followup
#: view:account_followup.followup.line:0
#: wizard_view:account_followup.followup.print.all,next:0
msgid "%(date)s: Current Date"
-msgstr ""
+msgstr "当前日期:%(date)s"
#. module: account_followup
#: field:account.move.line,followup_date:0
msgid "Latest Follow-up"
-msgstr ""
+msgstr "最近跟进"
#. module: account_followup
#: field:account_followup.followup.line,followup_id:0
#: field:account_followup.stat,followup_id:0
msgid "Follow Ups"
-msgstr ""
+msgstr "跟进"
#. module: account_followup
#: wizard_field:account_followup.followup.print.all,init,date:0
msgid "Follow-up Sending Date"
-msgstr ""
+msgstr "跟进发送日期"
#. module: account_followup
#: view:account_followup.followup:0
#: field:account_followup.followup,description:0
#: rml:account_followup.followup.print:0
msgid "Description"
-msgstr ""
+msgstr "说明"
#. module: account_followup
#: rml:account_followup.followup.print:0
msgid "Balance:"
-msgstr ""
+msgstr "余额:"
#. module: account_followup
#: rml:account_followup.followup.print:0
msgid "VAT:"
-msgstr ""
+msgstr "增值税:"
#. module: account_followup
#: field:account_followup.followup,company_id:0
msgid "Company"
-msgstr ""
+msgstr "公司"
#. module: account_followup
#: rml:account_followup.followup.print:0
msgid "Invoice Date"
-msgstr ""
+msgstr "发票日期"
#. module: account_followup
#: wizard_field:account_followup.followup.print.all,next,email_subject:0
msgid "Email Subject"
-msgstr ""
+msgstr "电子邮件主题"
#. module: account_followup
#: rml:account_followup.followup.print:0
msgid "Paid"
-msgstr ""
+msgstr "已付"
#. module: account_followup
#: wizard_view:account_followup.followup.print.all,next:0
msgid "%(line)s: Account Move lines"
-msgstr ""
+msgstr "凭证明细:%(line)s"
#. module: account_followup
#: field:account_followup.stat,date_followup:0
msgid "Latest followup"
-msgstr ""
+msgstr "最近跟进"
#. module: account_followup
#: view:account.move.line:0
msgid "Partner entries"
-msgstr ""
+msgstr "业务伙伴凭证"
#. module: account_followup
#: model:ir.model,name:account_followup.model_account_followup_followup_line
msgid "Follow-Ups Criteria"
-msgstr ""
+msgstr "跟进条件"
#. module: account_followup
#: wizard_view:account_followup.followup.print.all,next:0
msgid "Partner Selection"
-msgstr ""
+msgstr "业务伙伴选择"
#. module: account_followup
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "无效的视图结构XML文件!"
#. module: account_followup
#: field:account_followup.followup.line,start:0
msgid "Type of Term"
-msgstr ""
+msgstr "条件类型"
#. module: account_followup
#: wizard_view:account_followup.followup.print.all,init:0
msgid "Follow-up and Date Selection"
-msgstr ""
+msgstr "跟进和日期选择"
#. module: account_followup
#: wizard_view:account_followup.followup.print.all,next:0
msgid "Select partners to remind"
-msgstr ""
+msgstr "给业务伙伴一个提醒电子邮件"
#. module: account_followup
#: rml:account_followup.followup.print:0
@@ -230,123 +230,130 @@ msgid ""
"Best Regards,\n"
"\t\t\t"
msgstr ""
+"\n"
+"您好 %(partner_name)s\n"
+"\n"
+"如果不是我们出错,这货款应该未付,请采取适当措施,以便在未来8天支付这货款\n"
+"\n"
+"如有疑问请联系我们\n"
+"\t\t\t"
#. module: account_followup
#: constraint:ir.model:0
msgid ""
"The Object name must start with x_ and not contain any special character !"
-msgstr ""
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
#. module: account_followup
#: wizard_button:account_followup.followup.print.all,summary,end:0
msgid "Ok"
-msgstr ""
+msgstr "确定"
#. module: account_followup
#: field:account_followup.followup,name:0
#: field:account_followup.followup.line,name:0
msgid "Name"
-msgstr ""
+msgstr "名称"
#. module: account_followup
#: field:account_followup.stat,date_move:0
msgid "First move"
-msgstr ""
+msgstr "首先"
#. module: account_followup
#: selection:account_followup.followup.line,start:0
msgid "End of Month"
-msgstr ""
+msgstr "月末"
#. module: account_followup
#: view:account_followup.followup.line:0
#: wizard_view:account_followup.followup.print.all,next:0
msgid "%(company_name)s: User's Company name"
-msgstr ""
+msgstr "公司名称:%(company_currency)s"
#. module: account_followup
#: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_all
#: model:ir.ui.menu,name:account_followup.menu_account_move_open_unreconcile
msgid "All receivable entries"
-msgstr ""
+msgstr "所有应收款"
#. module: account_followup
#: view:account_followup.followup:0
msgid "Lines"
-msgstr ""
+msgstr "明细"
#. module: account_followup
#: model:ir.actions.wizard,name:account_followup.action_account_followup_all_wizard
#: model:ir.ui.menu,name:account_followup.account_followup_wizard_menu
msgid "Send followups"
-msgstr ""
+msgstr "发送跟进"
#. module: account_followup
#: field:account.move.line,followup_line_id:0
msgid "Follow-up Level"
-msgstr ""
+msgstr "跟进期限"
#. module: account_followup
#: field:account_followup.stat,credit:0
msgid "Credit"
-msgstr ""
+msgstr "贷方"
#. module: account_followup
#: model:ir.model,name:account_followup.model_account_followup_stat
msgid "Followup statistics"
-msgstr ""
+msgstr "跟进统计"
#. module: account_followup
#: wizard_button:account_followup.followup.print.all,init,next:0
msgid "Continue"
-msgstr ""
+msgstr "继续"
#. module: account_followup
#: model:ir.module.module,shortdesc:account_followup.module_meta_information
msgid "Accounting follow-ups management"
-msgstr ""
+msgstr "会计跟进管理"
#. module: account_followup
#: wizard_view:account_followup.followup.print.all,summary:0
#: wizard_field:account_followup.followup.print.all,summary,summary:0
msgid "Summary"
-msgstr ""
+msgstr "概要"
#. module: account_followup
#: view:account_followup.followup.line:0
msgid "Follow-Up Lines"
-msgstr ""
+msgstr "跟进明细"
#. module: account_followup
#: rml:account_followup.followup.print:0
msgid "Document : Customer account statement"
-msgstr ""
+msgstr "客户科目报表"
#. module: account_followup
#: view:account_followup.stat:0
msgid "Follow-Up lines"
-msgstr ""
+msgstr "跟进明细"
#. module: account_followup
#: wizard_view:account_followup.followup.print.all,next:0
msgid "%(company_currency)s: User's Company Currency"
-msgstr ""
+msgstr "当前公司:%(company_currency)s"
#. module: account_followup
#: field:account_followup.stat,balance:0
msgid "Balance"
-msgstr ""
+msgstr "余额"
#. module: account_followup
#: help:account_followup.followup.print.all,init,date:0
msgid ""
"This field allow you to select a forecast date to plan your follow-ups"
-msgstr ""
+msgstr "这字段允许你选择一个预定计划日期去跟进"
#. module: account_followup
#: view:account.move.line:0
msgid "Total credit"
-msgstr ""
+msgstr "贷方合计"
#. module: account_followup
#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
@@ -376,12 +383,12 @@ msgstr ""
#. module: account_followup
#: rml:account_followup.followup.print:0
msgid "Sub-Total:"
-msgstr ""
+msgstr "小计"
#. module: account_followup
#: selection:account_followup.followup.line,start:0
msgid "Net Days"
-msgstr ""
+msgstr "净天数"
#. module: account_followup
#: model:ir.actions.act_window,name:account_followup.action_account_followup_definition_form
@@ -390,28 +397,28 @@ msgstr ""
#: model:ir.ui.menu,name:account_followup.account_followup_menu
#: model:ir.ui.menu,name:account_followup.menu_action_followup_stat
msgid "Follow-Ups"
-msgstr ""
+msgstr "跟进"
#. module: account_followup
#: wizard_view:account_followup.followup.print.all,next:0
#: wizard_field:account_followup.followup.print.all,next,email_body:0
msgid "Email body"
-msgstr ""
+msgstr "电子邮件内容"
#. module: account_followup
#: field:account_followup.stat,date_move_last:0
msgid "Last move"
-msgstr ""
+msgstr "最后"
#. module: account_followup
#: rml:account_followup.followup.print:0
msgid "Maturity"
-msgstr ""
+msgstr "到期"
#. module: account_followup
#: model:ir.actions.report.xml,name:account_followup.account_followup_followup_report
msgid "Followup Report"
-msgstr ""
+msgstr "跟进报表"
#. module: account_followup
#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
@@ -433,48 +440,57 @@ msgid ""
"Best Regards,\n"
"\t\t\t"
msgstr ""
+"\n"
+"%(partner_name)\n"
+" \n"
+" 尽管我们多次催问,但你的账户仍然还没解决\n"
+" \n"
+" 在未来8天如果还不全额支付,我们将采取法律行动,请恕我不另行通知\n"
+"\n"
+" 如有疑问请联系我们\n"
+"\t\t\t"
#. module: account_followup
#: rml:account_followup.followup.print:0
msgid "Maturity Date"
-msgstr ""
+msgstr "到期日期"
#. module: account_followup
#: view:account_followup.followup.line:0
#: wizard_view:account_followup.followup.print.all,next:0
msgid "Legend"
-msgstr ""
+msgstr "说明"
#. module: account_followup
#: field:account_followup.followup.line,sequence:0
msgid "Sequence"
-msgstr ""
+msgstr "序列"
#. module: account_followup
#: wizard_view:account_followup.followup.print.all,next:0
msgid "%(heading)s: Move line header"
-msgstr ""
+msgstr "%(heading):凭证明细的头"
#. module: account_followup
#: view:account_followup.followup.line:0
#: wizard_view:account_followup.followup.print.all,next:0
msgid "%(partner_name)s: Partner name"
-msgstr ""
+msgstr "业务伙伴名称:%(partner_name)s"
#. module: account_followup
#: wizard_field:account_followup.followup.print.all,next,email_conf:0
msgid "Send email confirmation"
-msgstr ""
+msgstr "确认发送电子邮件"
#. module: account_followup
#: wizard_field:account_followup.followup.print.all,init,followup_id:0
msgid "Follow-up"
-msgstr ""
+msgstr "跟进"
#. module: account_followup
#: field:account_followup.stat,name:0
msgid "Partner"
-msgstr ""
+msgstr "业务伙伴"
#. module: account_followup
#: wizard_button:account_followup.followup.print.all,init,end:0
@@ -485,9 +501,61 @@ msgstr "取消"
#. module: account_followup
#: field:account_followup.followup.line,delay:0
msgid "Days of delay"
-msgstr ""
+msgstr "拖延天数"
#. module: account_followup
#: wizard_button:account_followup.followup.print.all,next,print:0
msgid "Print Follow Ups & Send Mails"
-msgstr ""
+msgstr "打印跟进&发送电子邮件"
+
+#~ msgid "Follow-up Message"
+#~ msgstr "跟进消息"
+
+#~ msgid ""
+#~ "\n"
+#~ " Modules to automate letters for unpaid invoices, with multi-level "
+#~ "recalls.\n"
+#~ "\n"
+#~ " You can define your multiple levels of recall through the menu:\n"
+#~ " Financial Management/Configuration/Payment Terms/Follow-Ups\n"
+#~ "\n"
+#~ " Once it's defined, you can automatically prints recall every days\n"
+#~ " through simply clicking on the menu:\n"
+#~ " Financial_Management/Periodical_Processing/Print_Follow-Ups\n"
+#~ "\n"
+#~ " It will generate a PDF with all the letters according the the\n"
+#~ " different levels of recall defined. You can define different policies\n"
+#~ " for different companies.\n"
+#~ "\n"
+#~ "\n"
+#~ " Note that if you want to change the followup level for a given "
+#~ "partner/account entry, you can do it in the menu:\n"
+#~ " Financial_Management/Reporting/Follow-Ups/All Receivable Entries\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ " 模块能自动发送未支付的发票和多次跟进\n"
+#~ "\n"
+#~ "你能在菜单定义的多层重复提醒:\n"
+#~ "财务管理/设置/付款条件/跟进\n"
+#~ "\n"
+#~ "一旦确定,你就能自动地打印每日的重复提醒事件,\n"
+#~ "通过简单点击菜单:\n"
+#~ " 财务管理/期间处理/打印跟进\n"
+#~ "\n"
+#~ "它将产生一定义的不同级别自动提醒的财务信函的PDF.\n"
+#~ "你能定义不同公司的不同格式\n"
+#~ "针对不同公司\n"
+#~ "\n"
+#~ "\n"
+#~ "注意:如果你想要变更一业务伙伴/凭证的跟进级别,你可以在菜单:\n"
+#~ " 财务管理/报表/跟进/所有应收账款凭证\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Do not change message text, if you want to send email in partner language, "
+#~ "or configre from company"
+#~ msgstr "如果你想在发送的电子邮件中用业务伙伴的语言,请不要改变着消息的文本"
+
+#~ msgid "Send Email in Partner Language"
+#~ msgstr "发送到业务伙伴Email的语言"
diff --git a/addons/account_followup/i18n/zh_TW.po b/addons/account_followup/i18n/zh_TW.po
index cc6a5b5bd4c..9695334e432 100644
--- a/addons/account_followup/i18n/zh_TW.po
+++ b/addons/account_followup/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_followup
diff --git a/addons/account_invoice_layout/account_invoice_layout.py b/addons/account_invoice_layout/account_invoice_layout.py
index 58f7721d253..2317e0c65a9 100644
--- a/addons/account_invoice_layout/account_invoice_layout.py
+++ b/addons/account_invoice_layout/account_invoice_layout.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL ().
#
@@ -15,7 +15,7 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
#
##############################################################################
@@ -70,7 +70,7 @@ class account_invoice_line(osv.osv):
res[field]['states'][key] = value
return res
- def _onchange_invoice_line_view(self, cr, uid, id, type, context={}, *args):
+ def onchange_invoice_line_view(self, cr, uid, id, type, context={}, *args):
if (not type):
return {}
diff --git a/addons/account_invoice_layout/account_invoice_layout_view.xml b/addons/account_invoice_layout/account_invoice_layout_view.xml
index 18e7996a7cd..fe11e407bf3 100644
--- a/addons/account_invoice_layout/account_invoice_layout_view.xml
+++ b/addons/account_invoice_layout/account_invoice_layout_view.xml
@@ -9,7 +9,7 @@
form
-
+
diff --git a/addons/account_invoice_layout/i18n/ar.po b/addons/account_invoice_layout/i18n/ar.po
index 6447bdb5d61..ccdde1c9ceb 100644
--- a/addons/account_invoice_layout/i18n/ar.po
+++ b/addons/account_invoice_layout/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_invoice_layout
diff --git a/addons/account_invoice_layout/i18n/bg.po b/addons/account_invoice_layout/i18n/bg.po
index af52bcb3691..7497a20fee5 100644
--- a/addons/account_invoice_layout/i18n/bg.po
+++ b/addons/account_invoice_layout/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_invoice_layout
diff --git a/addons/account_invoice_layout/i18n/bs.po b/addons/account_invoice_layout/i18n/bs.po
index 80f9b3dd66d..c1cdb737868 100644
--- a/addons/account_invoice_layout/i18n/bs.po
+++ b/addons/account_invoice_layout/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_invoice_layout
diff --git a/addons/account_invoice_layout/i18n/ca.po b/addons/account_invoice_layout/i18n/ca.po
index 6b58fa1eec9..807eeaaa209 100644
--- a/addons/account_invoice_layout/i18n/ca.po
+++ b/addons/account_invoice_layout/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_invoice_layout
diff --git a/addons/account_invoice_layout/i18n/cs.po b/addons/account_invoice_layout/i18n/cs.po
index 6447bdb5d61..ccdde1c9ceb 100644
--- a/addons/account_invoice_layout/i18n/cs.po
+++ b/addons/account_invoice_layout/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_invoice_layout
diff --git a/addons/account_invoice_layout/i18n/de.po b/addons/account_invoice_layout/i18n/de.po
index a70c364bf74..98125e12ad6 100644
--- a/addons/account_invoice_layout/i18n/de.po
+++ b/addons/account_invoice_layout/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_invoice_layout
diff --git a/addons/account_invoice_layout/i18n/el.po b/addons/account_invoice_layout/i18n/el.po
index f7fd651cad8..7022e8c875a 100644
--- a/addons/account_invoice_layout/i18n/el.po
+++ b/addons/account_invoice_layout/i18n/el.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_invoice_layout
diff --git a/addons/account_invoice_layout/i18n/es.po b/addons/account_invoice_layout/i18n/es.po
index e9e5ee25b16..246a38d942a 100644
--- a/addons/account_invoice_layout/i18n/es.po
+++ b/addons/account_invoice_layout/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_invoice_layout
diff --git a/addons/account_invoice_layout/i18n/es_AR.po b/addons/account_invoice_layout/i18n/es_AR.po
index 2160dd915e2..3418addcfc9 100644
--- a/addons/account_invoice_layout/i18n/es_AR.po
+++ b/addons/account_invoice_layout/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_invoice_layout
diff --git a/addons/account_invoice_layout/i18n/et.po b/addons/account_invoice_layout/i18n/et.po
index b57b2d3af1f..d64d3c63e64 100644
--- a/addons/account_invoice_layout/i18n/et.po
+++ b/addons/account_invoice_layout/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_invoice_layout
diff --git a/addons/account_invoice_layout/i18n/fi.po b/addons/account_invoice_layout/i18n/fi.po
index 5777c3107ea..935e7972aed 100644
--- a/addons/account_invoice_layout/i18n/fi.po
+++ b/addons/account_invoice_layout/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_invoice_layout
@@ -47,7 +47,7 @@ msgstr "Otsikko"
#. module: account_invoice_layout
#: model:ir.actions.wizard,name:account_invoice_layout.wizard_notify_message
msgid "Invoices with Layout and Message"
-msgstr ""
+msgstr "Laskut joissa sommittelu ja viesti"
#. module: account_invoice_layout
#: rml:account.invoice.layout:0
@@ -73,7 +73,7 @@ msgstr "Tulosta"
#: help:notify.message,msg:0
msgid ""
"This notification will appear at the bottom of the Invoices when printed."
-msgstr "Tämä ilmoitus näkyy tulostetun laskun alaosassa."
+msgstr "Tämä huomautus on näkyvillä laskujen alaosassa kun ne tulostetaan."
#. module: account_invoice_layout
#: rml:account.invoice.layout:0
@@ -83,12 +83,12 @@ msgstr "Yksikköhinta"
#. module: account_invoice_layout
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
-msgstr "Virheellinen mallin nimi toimenpiteen määrittelyssä."
+msgstr "Virheellinen mallin nimi toiminnon määrittelyssä."
#. module: account_invoice_layout
#: model:ir.model,name:account_invoice_layout.model_notify_message
msgid "Notify By Messages"
-msgstr "Ilmoitus Viestittäin"
+msgstr "Huomautus viesteittäin"
#. module: account_invoice_layout
#: rml:account.invoice.layout:0
@@ -103,17 +103,17 @@ msgstr "Laskurivit"
#. module: account_invoice_layout
#: view:account.invoice.line:0
msgid "Seq."
-msgstr ""
+msgstr "Sarja"
#. module: account_invoice_layout
#: model:ir.ui.menu,name:account_invoice_layout.menu_finan_config_notify_message
msgid "Notification Message"
-msgstr "Ilmoituksen Viesti"
+msgstr "Huomautuksen viesti"
#. module: account_invoice_layout
#: rml:account.invoice.layout:0
msgid "Customer Ref:"
-msgstr "Asiakkaan Viite:"
+msgstr "Asiakkaan viite:"
#. module: account_invoice_layout
#: rml:account.invoice.layout:0
@@ -143,37 +143,37 @@ msgstr "Verot:"
#. module: account_invoice_layout
#: field:account.invoice.line,functional_field:0
msgid "Source Account"
-msgstr ""
+msgstr "Lähdetili"
#. module: account_invoice_layout
#: model:ir.actions.act_window,name:account_invoice_layout.notify_mesage_tree_form
msgid "Write Messages"
-msgstr ""
+msgstr "Kirjoita viestejä"
#. module: account_invoice_layout
#: rml:account.invoice.layout:0
msgid "Base"
-msgstr ""
+msgstr "Pohja"
#. module: account_invoice_layout
#: rml:account.invoice.layout:0
msgid "Fax :"
-msgstr ""
+msgstr "Faksi:"
#. module: account_invoice_layout
#: field:notify.message,msg:0
msgid "Special Message"
-msgstr ""
+msgstr "Erikoisviesti"
#. module: account_invoice_layout
#: view:notify.message:0
msgid "Write a notification or a wishful message."
-msgstr ""
+msgstr "Kirjoita viesti tai toivotus."
#. module: account_invoice_layout
#: rml:account.invoice.layout:0
msgid "Tel. :"
-msgstr ""
+msgstr "Puh.:"
#. module: account_invoice_layout
#: constraint:ir.ui.view:0
@@ -188,7 +188,7 @@ msgstr "Sivunvaihto"
#. module: account_invoice_layout
#: rml:account.invoice.layout:0
msgid "Document:"
-msgstr "Asiakirja:"
+msgstr "Dokumentti:"
#. module: account_invoice_layout
#: wizard_view:wizard.notify_message,init:0
@@ -208,7 +208,7 @@ msgstr "Tuote"
#. module: account_invoice_layout
#: model:ir.actions.report.xml,name:account_invoice_layout.account_invoices_1
msgid "Invoices with Layout"
-msgstr ""
+msgstr "Laskut joissa sommittelu"
#. module: account_invoice_layout
#: rml:account.invoice.layout:0
@@ -218,7 +218,7 @@ msgstr ""
#. module: account_invoice_layout
#: rml:account.invoice.layout:0
msgid "Amount"
-msgstr ""
+msgstr "Summa"
#. module: account_invoice_layout
#: rml:account.invoice.layout:0
@@ -228,12 +228,12 @@ msgstr ""
#. module: account_invoice_layout
#: rml:account.invoice.layout:0
msgid "Draft Invoice"
-msgstr "Laskun luonnos"
+msgstr "Luonnoslasku"
#. module: account_invoice_layout
#: field:account.invoice.line,sequence:0
msgid "Sequence Number"
-msgstr "Järjestysnumero"
+msgstr "Sarjan numero"
#. module: account_invoice_layout
#: rml:account.invoice.layout:0
@@ -248,12 +248,12 @@ msgstr "Hyvitys"
#. module: account_invoice_layout
#: rml:account.invoice.layout:0
msgid "VAT :"
-msgstr ""
+msgstr "ALV:"
#. module: account_invoice_layout
#: selection:account.invoice.line,state:0
msgid "Separator Line"
-msgstr ""
+msgstr "Erotinrivi"
#. module: account_invoice_layout
#: rml:account.invoice.layout:0
@@ -273,7 +273,7 @@ msgstr "Vero"
#. module: account_invoice_layout
#: model:ir.module.module,shortdesc:account_invoice_layout.module_meta_information
msgid "account_invoice_layout"
-msgstr ""
+msgstr "account_invoice_layout"
#. module: account_invoice_layout
#: rml:account.invoice.layout:0
@@ -308,7 +308,7 @@ msgstr "Yhteensä"
#. module: account_invoice_layout
#: model:ir.ui.menu,name:account_invoice_layout.menu_notify_mesage_tree_form
msgid "All Notification Messages"
-msgstr ""
+msgstr "Kaikki huomautuksien viestit"
#~ msgid "Description"
#~ msgstr "Kuvaus"
diff --git a/addons/account_invoice_layout/i18n/fr.po b/addons/account_invoice_layout/i18n/fr.po
index 687eccaf2eb..ee960295e3a 100644
--- a/addons/account_invoice_layout/i18n/fr.po
+++ b/addons/account_invoice_layout/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_invoice_layout
diff --git a/addons/account_invoice_layout/i18n/hi.po b/addons/account_invoice_layout/i18n/hi.po
index 6b20dbea986..eb05d32ea44 100644
--- a/addons/account_invoice_layout/i18n/hi.po
+++ b/addons/account_invoice_layout/i18n/hi.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_invoice_layout
diff --git a/addons/account_invoice_layout/i18n/hr.po b/addons/account_invoice_layout/i18n/hr.po
index 0652f429d69..1ae26f281d7 100644
--- a/addons/account_invoice_layout/i18n/hr.po
+++ b/addons/account_invoice_layout/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_invoice_layout
diff --git a/addons/account_invoice_layout/i18n/hu.po b/addons/account_invoice_layout/i18n/hu.po
index 6447bdb5d61..ccdde1c9ceb 100644
--- a/addons/account_invoice_layout/i18n/hu.po
+++ b/addons/account_invoice_layout/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_invoice_layout
diff --git a/addons/account_invoice_layout/i18n/id.po b/addons/account_invoice_layout/i18n/id.po
index e54d55971ce..f5816b5eccc 100644
--- a/addons/account_invoice_layout/i18n/id.po
+++ b/addons/account_invoice_layout/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_invoice_layout
diff --git a/addons/account_invoice_layout/i18n/it.po b/addons/account_invoice_layout/i18n/it.po
index 494de13e7ee..97eb1825856 100644
--- a/addons/account_invoice_layout/i18n/it.po
+++ b/addons/account_invoice_layout/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_invoice_layout
diff --git a/addons/account_invoice_layout/i18n/iu.po b/addons/account_invoice_layout/i18n/iu.po
index 28a0b419be4..673cea4ec42 100644
--- a/addons/account_invoice_layout/i18n/iu.po
+++ b/addons/account_invoice_layout/i18n/iu.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_invoice_layout
diff --git a/addons/account_invoice_layout/i18n/ko.po b/addons/account_invoice_layout/i18n/ko.po
index b5dcd394e9f..a864f191559 100644
--- a/addons/account_invoice_layout/i18n/ko.po
+++ b/addons/account_invoice_layout/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_invoice_layout
diff --git a/addons/account_invoice_layout/i18n/lt.po b/addons/account_invoice_layout/i18n/lt.po
index 3b15fefdb01..664b3166db1 100644
--- a/addons/account_invoice_layout/i18n/lt.po
+++ b/addons/account_invoice_layout/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_invoice_layout
diff --git a/addons/account_invoice_layout/i18n/nb.po b/addons/account_invoice_layout/i18n/nb.po
index 078d40d5c51..352be1a9953 100644
--- a/addons/account_invoice_layout/i18n/nb.po
+++ b/addons/account_invoice_layout/i18n/nb.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_invoice_layout
diff --git a/addons/account_invoice_layout/i18n/nl.po b/addons/account_invoice_layout/i18n/nl.po
index b05230e3d22..aca745a15d9 100644
--- a/addons/account_invoice_layout/i18n/nl.po
+++ b/addons/account_invoice_layout/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_invoice_layout
diff --git a/addons/account_invoice_layout/i18n/nl_BE.po b/addons/account_invoice_layout/i18n/nl_BE.po
index f1df5ec4380..ef639898a84 100644
--- a/addons/account_invoice_layout/i18n/nl_BE.po
+++ b/addons/account_invoice_layout/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_invoice_layout
diff --git a/addons/account_invoice_layout/i18n/pl.po b/addons/account_invoice_layout/i18n/pl.po
index aa32c8f6eb5..c8f72b1a38a 100644
--- a/addons/account_invoice_layout/i18n/pl.po
+++ b/addons/account_invoice_layout/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_invoice_layout
diff --git a/addons/account_invoice_layout/i18n/pt.po b/addons/account_invoice_layout/i18n/pt.po
index 62afa5d0032..561a5957e50 100644
--- a/addons/account_invoice_layout/i18n/pt.po
+++ b/addons/account_invoice_layout/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_invoice_layout
diff --git a/addons/account_invoice_layout/i18n/pt_BR.po b/addons/account_invoice_layout/i18n/pt_BR.po
index fdb38cb70a8..5afa11e7912 100644
--- a/addons/account_invoice_layout/i18n/pt_BR.po
+++ b/addons/account_invoice_layout/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_invoice_layout
diff --git a/addons/account_invoice_layout/i18n/ro.po b/addons/account_invoice_layout/i18n/ro.po
index c52f5636178..caf1235a2e7 100644
--- a/addons/account_invoice_layout/i18n/ro.po
+++ b/addons/account_invoice_layout/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_invoice_layout
diff --git a/addons/account_invoice_layout/i18n/ru.po b/addons/account_invoice_layout/i18n/ru.po
index 1272067dbce..653d3bddbad 100644
--- a/addons/account_invoice_layout/i18n/ru.po
+++ b/addons/account_invoice_layout/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_invoice_layout
diff --git a/addons/account_invoice_layout/i18n/sl.po b/addons/account_invoice_layout/i18n/sl.po
index 143612e2f46..03e656d8ff9 100644
--- a/addons/account_invoice_layout/i18n/sl.po
+++ b/addons/account_invoice_layout/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_invoice_layout
diff --git a/addons/account_invoice_layout/i18n/sv.po b/addons/account_invoice_layout/i18n/sv.po
index 6695ae3b1d7..1261f7e9283 100644
--- a/addons/account_invoice_layout/i18n/sv.po
+++ b/addons/account_invoice_layout/i18n/sv.po
@@ -8,12 +8,12 @@ msgstr ""
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-02-15 19:26+0000\n"
-"Last-Translator: Anders Eriksson \n"
+"Last-Translator: Anders Eriksson (Mobila System) \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_invoice_layout
diff --git a/addons/account_invoice_layout/i18n/tlh.po b/addons/account_invoice_layout/i18n/tlh.po
index 1b62ee02f85..4dc59d73c7c 100644
--- a/addons/account_invoice_layout/i18n/tlh.po
+++ b/addons/account_invoice_layout/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_invoice_layout
diff --git a/addons/account_invoice_layout/i18n/tr.po b/addons/account_invoice_layout/i18n/tr.po
index 7f852e13300..fee4275a6ca 100644
--- a/addons/account_invoice_layout/i18n/tr.po
+++ b/addons/account_invoice_layout/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_invoice_layout
diff --git a/addons/account_invoice_layout/i18n/uk.po b/addons/account_invoice_layout/i18n/uk.po
index a4867685d8c..26263484eed 100644
--- a/addons/account_invoice_layout/i18n/uk.po
+++ b/addons/account_invoice_layout/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_invoice_layout
diff --git a/addons/account_invoice_layout/i18n/zh_CN.po b/addons/account_invoice_layout/i18n/zh_CN.po
index 66b8f542666..7b617a9766a 100644
--- a/addons/account_invoice_layout/i18n/zh_CN.po
+++ b/addons/account_invoice_layout/i18n/zh_CN.po
@@ -4,115 +4,115 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-01-30 12:43+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-03-20 07:11+0000\n"
+"Last-Translator: Black Jack \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_invoice_layout
#: selection:account.invoice.line,state:0
msgid "Sub Total"
-msgstr ""
+msgstr "小计"
#. module: account_invoice_layout
#: rml:account.invoice.layout:0
msgid "Invoice Date:"
-msgstr ""
+msgstr "发票日期:"
#. module: account_invoice_layout
#: constraint:ir.model:0
msgid ""
"The Object name must start with x_ and not contain any special character !"
-msgstr ""
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
#. module: account_invoice_layout
#: rml:account.invoice.layout:0
msgid "Cancelled Invoice"
-msgstr ""
+msgstr "取消发票"
#. module: account_invoice_layout
#: selection:account.invoice.line,state:0
#: field:notify.message,name:0
msgid "Title"
-msgstr ""
+msgstr "标题"
#. module: account_invoice_layout
#: model:ir.actions.wizard,name:account_invoice_layout.wizard_notify_message
msgid "Invoices with Layout and Message"
-msgstr ""
+msgstr "带消息的发票式样"
#. module: account_invoice_layout
#: rml:account.invoice.layout:0
msgid "Disc. (%)"
-msgstr ""
+msgstr "折扣(%)"
#. module: account_invoice_layout
#: rml:account.invoice.layout:0
msgid "(Incl. taxes):"
-msgstr ""
+msgstr "含税:"
#. module: account_invoice_layout
#: selection:account.invoice.line,state:0
msgid "Note"
-msgstr ""
+msgstr "备注"
#. module: account_invoice_layout
#: wizard_button:wizard.notify_message,init,print:0
msgid "Print"
-msgstr ""
+msgstr "打印"
#. module: account_invoice_layout
#: help:notify.message,msg:0
msgid ""
"This notification will appear at the bottom of the Invoices when printed."
-msgstr ""
+msgstr "此通知将在打印在发票底部"
#. module: account_invoice_layout
#: rml:account.invoice.layout:0
msgid "Unit Price"
-msgstr ""
+msgstr "单价"
#. module: account_invoice_layout
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "在这动作定义中有无效的模块名"
#. module: account_invoice_layout
#: model:ir.model,name:account_invoice_layout.model_notify_message
msgid "Notify By Messages"
-msgstr ""
+msgstr "通知信息"
#. module: account_invoice_layout
#: rml:account.invoice.layout:0
msgid "PRO-FORMA"
-msgstr ""
+msgstr "形式发票"
#. module: account_invoice_layout
#: field:account.invoice,abstract_line_ids:0
msgid "Invoice Lines"
-msgstr ""
+msgstr "发票明细"
#. module: account_invoice_layout
#: view:account.invoice.line:0
msgid "Seq."
-msgstr ""
+msgstr "序号"
#. module: account_invoice_layout
#: model:ir.ui.menu,name:account_invoice_layout.menu_finan_config_notify_message
msgid "Notification Message"
-msgstr ""
+msgstr "通知信息"
#. module: account_invoice_layout
#: rml:account.invoice.layout:0
msgid "Customer Ref:"
-msgstr ""
+msgstr "客户参考"
#. module: account_invoice_layout
#: rml:account.invoice.layout:0
@@ -122,12 +122,12 @@ msgstr ""
#. module: account_invoice_layout
#: field:account.invoice.line,state:0
msgid "Type"
-msgstr ""
+msgstr "类型"
#. module: account_invoice_layout
#: rml:account.invoice.layout:0
msgid "Price"
-msgstr ""
+msgstr "打印"
#. module: account_invoice_layout
#: rml:account.invoice.layout:0
@@ -137,137 +137,137 @@ msgstr ""
#. module: account_invoice_layout
#: rml:account.invoice.layout:0
msgid "Taxes:"
-msgstr ""
+msgstr "税:"
#. module: account_invoice_layout
#: field:account.invoice.line,functional_field:0
msgid "Source Account"
-msgstr ""
+msgstr "源科目"
#. module: account_invoice_layout
#: model:ir.actions.act_window,name:account_invoice_layout.notify_mesage_tree_form
msgid "Write Messages"
-msgstr ""
+msgstr "写信息"
#. module: account_invoice_layout
#: rml:account.invoice.layout:0
msgid "Base"
-msgstr ""
+msgstr "基于"
#. module: account_invoice_layout
#: rml:account.invoice.layout:0
msgid "Fax :"
-msgstr ""
+msgstr "传真:"
#. module: account_invoice_layout
#: field:notify.message,msg:0
msgid "Special Message"
-msgstr ""
+msgstr "特别消息"
#. module: account_invoice_layout
#: view:notify.message:0
msgid "Write a notification or a wishful message."
-msgstr ""
+msgstr "写通知或一愿望的信息"
#. module: account_invoice_layout
#: rml:account.invoice.layout:0
msgid "Tel. :"
-msgstr ""
+msgstr "电话:"
#. module: account_invoice_layout
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "无效XML视图结构!"
#. module: account_invoice_layout
#: selection:account.invoice.line,state:0
msgid "Page Break"
-msgstr ""
+msgstr "分页符"
#. module: account_invoice_layout
#: rml:account.invoice.layout:0
msgid "Document:"
-msgstr ""
+msgstr "票据:"
#. module: account_invoice_layout
#: wizard_view:wizard.notify_message,init:0
msgid "Select Message"
-msgstr ""
+msgstr "选择消息"
#. module: account_invoice_layout
#: view:notify.message:0
msgid "Messages"
-msgstr ""
+msgstr "信息"
#. module: account_invoice_layout
#: selection:account.invoice.line,state:0
msgid "Product"
-msgstr ""
+msgstr "产品"
#. module: account_invoice_layout
#: model:ir.actions.report.xml,name:account_invoice_layout.account_invoices_1
msgid "Invoices with Layout"
-msgstr ""
+msgstr "发票式样"
#. module: account_invoice_layout
#: rml:account.invoice.layout:0
msgid "Description / Taxes"
-msgstr ""
+msgstr "说明 / 税"
#. module: account_invoice_layout
#: rml:account.invoice.layout:0
msgid "Amount"
-msgstr ""
+msgstr "金额"
#. module: account_invoice_layout
#: rml:account.invoice.layout:0
msgid "Description/Taxes"
-msgstr ""
+msgstr "说明 / 税"
#. module: account_invoice_layout
#: rml:account.invoice.layout:0
msgid "Draft Invoice"
-msgstr ""
+msgstr "发票草稿"
#. module: account_invoice_layout
#: field:account.invoice.line,sequence:0
msgid "Sequence Number"
-msgstr ""
+msgstr "序号"
#. module: account_invoice_layout
#: rml:account.invoice.layout:0
msgid "Quantity"
-msgstr ""
+msgstr "数量"
#. module: account_invoice_layout
#: rml:account.invoice.layout:0
msgid "Refund"
-msgstr ""
+msgstr "退货"
#. module: account_invoice_layout
#: rml:account.invoice.layout:0
msgid "VAT :"
-msgstr ""
+msgstr "增值税"
#. module: account_invoice_layout
#: selection:account.invoice.line,state:0
msgid "Separator Line"
-msgstr ""
+msgstr "分割线"
#. module: account_invoice_layout
#: rml:account.invoice.layout:0
msgid "Supplier Invoice"
-msgstr ""
+msgstr "供应商发票"
#. module: account_invoice_layout
#: rml:account.invoice.layout:0
msgid "Note :"
-msgstr ""
+msgstr "备注:"
#. module: account_invoice_layout
#: rml:account.invoice.layout:0
msgid "Tax"
-msgstr ""
+msgstr "税"
#. module: account_invoice_layout
#: model:ir.module.module,shortdesc:account_invoice_layout.module_meta_information
@@ -277,34 +277,63 @@ msgstr ""
#. module: account_invoice_layout
#: rml:account.invoice.layout:0
msgid "Total (Excl. taxes):"
-msgstr ""
+msgstr "(不含税):"
#. module: account_invoice_layout
#: rml:account.invoice.layout:0
msgid "Invoice"
-msgstr ""
+msgstr "发票"
#. module: account_invoice_layout
#: wizard_button:wizard.notify_message,init,end:0
msgid "Cancel"
-msgstr ""
+msgstr "取消"
#. module: account_invoice_layout
#: rml:account.invoice.layout:0
msgid "Supplier Refund"
-msgstr ""
+msgstr "供应商退货"
#. module: account_invoice_layout
#: wizard_field:wizard.notify_message,init,message:0
msgid "Message"
-msgstr ""
+msgstr "信息"
#. module: account_invoice_layout
#: rml:account.invoice.layout:0
msgid "Total"
-msgstr ""
+msgstr "合计"
#. module: account_invoice_layout
#: model:ir.ui.menu,name:account_invoice_layout.menu_notify_mesage_tree_form
msgid "All Notification Messages"
-msgstr ""
+msgstr "所有通知信息"
+
+#~ msgid ""
+#~ "\n"
+#~ " This module provides some features to improve the layout of the "
+#~ "invoices.\n"
+#~ "\n"
+#~ " It gives you the possibility to\n"
+#~ " * order all the lines of an invoice\n"
+#~ " * add titles, comment lines, sub total lines\n"
+#~ " * draw horizontal lines and put page breaks\n"
+#~ "\n"
+#~ " Moreover, there is one option which allow you to print all the selected "
+#~ "invoices with a given special message at the bottom of it. This feature can "
+#~ "be very useful for printing your invoices with end-of-year wishes, special "
+#~ "punctual conditions...\n"
+#~ "\n"
+#~ " "
+#~ msgstr ""
+#~ "\n"
+#~ " 这模块允许你改进发票的格式\n"
+#~ "\n"
+#~ " 它给出以下的可能:\n"
+#~ "\t * 所有的发票明细\n"
+#~ "\t * 增加标题,注释行,子行标题\n"
+#~ "\t * 画水平线和加入分页符\n"
+#~ "\t\n"
+#~ "此外,还有一个选择项,让你打印所有选择发票时在底部有一个提别的信息,这功能对年终发票特别是要求准时支付提醒时有用\n"
+#~ "\n"
+#~ " "
diff --git a/addons/account_invoice_layout/i18n/zh_TW.po b/addons/account_invoice_layout/i18n/zh_TW.po
index 66b8f542666..a2ada6f5678 100644
--- a/addons/account_invoice_layout/i18n/zh_TW.po
+++ b/addons/account_invoice_layout/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:08+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_invoice_layout
diff --git a/addons/account_payment/i18n/ar.po b/addons/account_payment/i18n/ar.po
index aa6f2a61d93..efe3a9ada7d 100644
--- a/addons/account_payment/i18n/ar.po
+++ b/addons/account_payment/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment
diff --git a/addons/account_payment/i18n/bg.po b/addons/account_payment/i18n/bg.po
index 3c0b41f073b..697a7a722e9 100644
--- a/addons/account_payment/i18n/bg.po
+++ b/addons/account_payment/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment
diff --git a/addons/account_payment/i18n/bs.po b/addons/account_payment/i18n/bs.po
index ef7cb7c74e8..20db662a651 100644
--- a/addons/account_payment/i18n/bs.po
+++ b/addons/account_payment/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment
diff --git a/addons/account_payment/i18n/ca.po b/addons/account_payment/i18n/ca.po
index 0b326503ed6..101d803a9d2 100644
--- a/addons/account_payment/i18n/ca.po
+++ b/addons/account_payment/i18n/ca.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment
diff --git a/addons/account_payment/i18n/cs.po b/addons/account_payment/i18n/cs.po
index aa6f2a61d93..efe3a9ada7d 100644
--- a/addons/account_payment/i18n/cs.po
+++ b/addons/account_payment/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment
diff --git a/addons/account_payment/i18n/de.po b/addons/account_payment/i18n/de.po
index b647939096a..d34e780dbd2 100644
--- a/addons/account_payment/i18n/de.po
+++ b/addons/account_payment/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment
diff --git a/addons/account_payment/i18n/el.po b/addons/account_payment/i18n/el.po
index 23ef6dfcf6e..7fe88c0d229 100644
--- a/addons/account_payment/i18n/el.po
+++ b/addons/account_payment/i18n/el.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment
diff --git a/addons/account_payment/i18n/es.po b/addons/account_payment/i18n/es.po
index 5e32c78cb9f..52a91b41943 100644
--- a/addons/account_payment/i18n/es.po
+++ b/addons/account_payment/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment
diff --git a/addons/account_payment/i18n/es_AR.po b/addons/account_payment/i18n/es_AR.po
index 4e318381c4e..ebbf8691fec 100644
--- a/addons/account_payment/i18n/es_AR.po
+++ b/addons/account_payment/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment
diff --git a/addons/account_payment/i18n/et.po b/addons/account_payment/i18n/et.po
index a63182c559c..a9df435cfbe 100644
--- a/addons/account_payment/i18n/et.po
+++ b/addons/account_payment/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment
@@ -334,7 +334,7 @@ msgstr "Partner"
#. module: account_payment
#: help:payment.line,communication2:0
msgid "The successor message of Communication."
-msgstr ""
+msgstr "Suhtlemise sõnumi järglane"
#. module: account_payment
#: help:payment.line,info_partner:0
diff --git a/addons/account_payment/i18n/fi.po b/addons/account_payment/i18n/fi.po
index f7d5fe6afd8..defe43fe32c 100644
--- a/addons/account_payment/i18n/fi.po
+++ b/addons/account_payment/i18n/fi.po
@@ -14,13 +14,13 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment
#: field:payment.order,date_planned:0
msgid "Scheduled date if fixed"
-msgstr "Suunniteltu päivämäärä jos muutettu"
+msgstr "Suunniteltu päivämäärä jos kiinteä"
#. module: account_payment
#: field:payment.line,currency:0
@@ -30,24 +30,24 @@ msgstr "Yhteistyökumppanin valuutta"
#. module: account_payment
#: view:payment.order:0
msgid "Set to draft"
-msgstr "Valitse vedokseen"
+msgstr "Aseta luonnokseksi"
#. module: account_payment
#: help:payment.order,mode:0
msgid "Select the Payment Mode to be applied."
-msgstr "Valitse käytettävä maksumuoto"
+msgstr "Valitse käytettävä maksutapa."
#. module: account_payment
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Virheellinen mallin nimi toiminnon määrittelyssä."
#. module: account_payment
#: view:payment.line:0
#: field:payment.line,info_owner:0
#: view:payment.order:0
msgid "Owner Account"
-msgstr "Omistajatili"
+msgstr "Omistajan tili"
#. module: account_payment
#: help:account.invoice,amount_to_pay:0
@@ -55,15 +55,17 @@ msgid ""
"The amount which should be paid at the current date\n"
"minus the amount which is already in payment order"
msgstr ""
-"Summa, joka tulee olla maksettu tiettyyn päivämäärään ja josta on vähennetty "
-"se summa, joka on jo maksumääräyksessä"
+"Summa, joka tulisi maksaa tällä päivämäärällä, ja josta\n"
+"on vähennettu jo maksumääräyksessä oleva summa."
#. module: account_payment
#: help:payment.line,date:0
msgid ""
"If no payment date is specified, the bank will treat this payment line "
"directly"
-msgstr "Jos maksupäivämäärää ei ole määritelty, käytetään suoraveloitusta"
+msgstr ""
+"Jos päivämäärää ei ole määritelty, pankki tulee käsittelemään tämän rivin "
+"välittömästi"
#. module: account_payment
#: field:payment.order,date_prefered:0
@@ -73,22 +75,22 @@ msgstr "Suositeltu päivämäärä"
#. module: account_payment
#: selection:payment.line,state:0
msgid "Free"
-msgstr ""
+msgstr "Vapaa"
#. module: account_payment
#: wizard_field:populate_payment,search,entries:0
msgid "Entries"
-msgstr ""
+msgstr "Merkinnät"
#. module: account_payment
#: wizard_field:populate_payment,init,duedate:0
msgid "Due Date"
-msgstr ""
+msgstr "Eräpäivä"
#. module: account_payment
#: view:account.move.line:0
msgid "Account Entry Line"
-msgstr ""
+msgstr "Tilimerkinnän rivi"
#. module: account_payment
#: wizard_button:populate_payment,search,create:0
@@ -99,22 +101,22 @@ msgstr "_Lisää maksumääräykseen"
#: rml:payment.order:0
#: view:payment.order:0
msgid "Amount"
-msgstr ""
+msgstr "Summa"
#. module: account_payment
#: rml:payment.order:0
msgid "Execution date:"
-msgstr "Toimitus päivämäärä"
+msgstr "Toimeenpanopäivä:"
#. module: account_payment
#: view:payment.order:0
msgid "Total in Company Currency"
-msgstr "Loppusumma yhtiön valuuttana"
+msgstr "Loppusumma yrityksen valuutassa"
#. module: account_payment
#: selection:payment.order,state:0
msgid "Cancelled"
-msgstr ""
+msgstr "Peruttu"
#. module: account_payment
#: model:ir.actions.act_window,name:account_payment.action_payment_order_tree_new
@@ -126,7 +128,7 @@ msgstr "Uusi maksumääräys"
#: rml:payment.order:0
#: field:payment.order,reference:0
msgid "Reference"
-msgstr ""
+msgstr "Viite"
#. module: account_payment
#: model:ir.actions.act_window,name:account_payment.action_payment_order_tree
@@ -137,7 +139,7 @@ msgstr "Maksumääräykset"
#. module: account_payment
#: selection:payment.order,date_prefered:0
msgid "Directly"
-msgstr "Suoraan"
+msgstr "Heti"
#. module: account_payment
#: model:ir.actions.act_window,name:account_payment.action_payment_line_form
@@ -145,12 +147,12 @@ msgstr "Suoraan"
#: view:payment.line:0
#: view:payment.order:0
msgid "Payment Line"
-msgstr ""
+msgstr "Maksurivi"
#. module: account_payment
#: field:payment.type,suitable_bank_types:0
msgid "Suitable bank types"
-msgstr "Käytettävissä olevat pankit"
+msgstr "Soveltuvat pankkityypit"
#. module: account_payment
#: view:payment.line:0
@@ -160,38 +162,39 @@ msgstr "Loppusumma"
#. module: account_payment
#: selection:payment.order,state:0
msgid "Confirmed"
-msgstr ""
+msgstr "Vahvistettu"
#. module: account_payment
#: help:payment.line,ml_date_created:0
msgid "Invoice Effective Date"
-msgstr ""
+msgstr "Laskun voimaantulopäivä"
#. module: account_payment
#: field:payment.order,line_ids:0
msgid "Payment lines"
-msgstr ""
+msgstr "Maksurivit"
#. module: account_payment
#: help:payment.order,date_planned:0
msgid "Select a date if you have chosen Preferred Date to be fixed."
-msgstr "Valitse päivämäärä jos olet valinnut suositellun päivämäärän vaihdon"
+msgstr ""
+"Aseta päivämäärä jos olet valinnut suositellun maksupäivän kiinteäksi."
#. module: account_payment
#: selection:payment.line,state:0
msgid "Structured"
-msgstr ""
+msgstr "Jäsennetty"
#. module: account_payment
#: field:payment.order,state:0
msgid "State"
-msgstr ""
+msgstr "Tila"
#. module: account_payment
#: view:payment.line:0
#: view:payment.order:0
msgid "Transaction Information"
-msgstr "Maksutapahtuman tiedot"
+msgstr "Tapahtuman tiedot"
#. module: account_payment
#: model:ir.actions.act_window,name:account_payment.action_payment_mode_form
@@ -203,12 +206,12 @@ msgstr "Maksutapa"
#. module: account_payment
#: field:payment.line,ml_date_created:0
msgid "Effective Date"
-msgstr ""
+msgstr "Toimeenpanopäivä"
#. module: account_payment
#: field:payment.line,ml_inv_ref:0
msgid "Invoice Ref."
-msgstr ""
+msgstr "Laskun viite"
#. module: account_payment
#: help:payment.order,date_prefered:0
@@ -217,24 +220,24 @@ msgid ""
"by you.'Directly' stands for the direct execution.'Due date' stands for the "
"scheduled date of execution."
msgstr ""
-"Valitse maksun suorittamistapa: \"Oma\" - määräät itse päivämäärän. "
-"\"Suoraveloitus\" - suoritus tapahtuu heti. \"Eräpäivä\" - suunniteltu "
-"maksupäivämäärä."
+"Valitse maksumääräyksen suorittamistapa: \"Kiinteä\" on käyttäjän asettama "
+"kiinteä päivämäärä. \"Heti\" tarkoittaa välitöntä toimeenpanoa. \"Eräpäivä\" "
+"asettaa toimeenpanolle suunnitellun päivämäärän."
#. module: account_payment
#: view:account.move.line:0
msgid "Total debit"
-msgstr ""
+msgstr "Debet yhteensä"
#. module: account_payment
#: field:payment.order,date_done:0
msgid "Execution date"
-msgstr "Suorituspäivämäärä"
+msgstr "Toimeenpanopäivä"
#. module: account_payment
#: selection:payment.order,date_prefered:0
msgid "Fixed date"
-msgstr "Oma päivämäärä"
+msgstr "Kiinteä päivämäärä"
#. module: account_payment
#: field:payment.line,info_partner:0
@@ -245,29 +248,29 @@ msgstr "Kohdetili"
#: view:payment.line:0
#: view:payment.order:0
msgid "Desitination Account"
-msgstr ""
+msgstr "Kohdetili"
#. module: account_payment
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Virheellinen XML näkymä-arkkitehtuurille!"
#. module: account_payment
#: wizard_button:populate_payment,init,end:0
#: wizard_button:populate_payment,search,end:0
#: wizard_button:populate_statement,init,end:0
msgid "_Cancel"
-msgstr ""
+msgstr "_Peruuta"
#. module: account_payment
#: field:payment.line,create_date:0
msgid "Created"
-msgstr ""
+msgstr "Luotu"
#. module: account_payment
#: view:payment.line:0
msgid "Currency Amount Total"
-msgstr ""
+msgstr "Valuutta loppusumma"
#. module: account_payment
#: view:payment.order:0
@@ -287,7 +290,7 @@ msgstr "Maksunhallinta"
#. module: account_payment
#: field:payment.line,communication:0
msgid "Communication"
-msgstr ""
+msgstr "Viestirivi 1"
#. module: account_payment
#: selection:payment.order,date_prefered:0
@@ -313,71 +316,71 @@ msgstr "Maksumuoto"
#: view:payment.type:0
#: help:payment.type,name:0
msgid "Payment Type"
-msgstr "Maksutapa"
+msgstr "Maksutyyppi"
#. module: account_payment
#: help:payment.line,amount_currency:0
msgid "Payment amount in the partner currency"
-msgstr "Maksunmäärä yhteistyökumppanin valuuttana"
+msgstr "Maksun summa kumppanin valuutassa"
#. module: account_payment
#: selection:payment.order,state:0
msgid "Draft"
-msgstr ""
+msgstr "Luonnos"
#. module: account_payment
#: field:payment.line,partner_id:0
#: rml:payment.order:0
msgid "Partner"
-msgstr ""
+msgstr "Kumppani"
#. module: account_payment
#: help:payment.line,communication2:0
msgid "The successor message of Communication."
-msgstr ""
+msgstr "Jatkoa viestiriville 1"
#. module: account_payment
#: help:payment.line,info_partner:0
msgid "Address of the Ordering Customer."
-msgstr "Tilaavan asiakkaan osoite"
+msgstr "Tilaavan asiakkaan osoite."
#. module: account_payment
#: view:account.move.line:0
msgid "Total credit"
-msgstr ""
+msgstr "Kredit yhteensä"
#. module: account_payment
#: model:ir.actions.wizard,name:account_payment.wizard_populate_payment
msgid "Populate payment"
-msgstr ""
+msgstr "Täytä maksu"
#. module: account_payment
#: field:payment.order,user_id:0
msgid "User"
-msgstr ""
+msgstr "Käyttäjä"
#. module: account_payment
#: model:ir.actions.act_window,name:account_payment.act_account_invoice_2_payment_line
#: wizard_field:populate_statement,init,lines:0
msgid "Payment Lines"
-msgstr ""
+msgstr "Maksurivit"
#. module: account_payment
#: rml:payment.order:0
msgid "Date"
-msgstr ""
+msgstr "Päivämäärä"
#. module: account_payment
#: rml:payment.order:0
msgid "Reference:"
-msgstr ""
+msgstr "Viite:"
#. module: account_payment
#: help:payment.line,move_line_id:0
msgid ""
"This Entry Line will be referred for the information of the ordering "
"customer."
-msgstr "Tällä kentällä viitataan tilaavan asiakkaan tietoihin"
+msgstr "Tätä riviä käytetään viittaamaan tilaavan asiakkaan tietoihin."
#. module: account_payment
#: field:payment.line,date:0
@@ -387,7 +390,7 @@ msgstr "Maksupäivämäärä"
#. module: account_payment
#: field:payment.order,date_created:0
msgid "Creation date"
-msgstr ""
+msgstr "Luomispäivämäärä"
#. module: account_payment
#: field:payment.line,ml_maturity_date:0
@@ -407,12 +410,12 @@ msgstr "Anna maksutyypin koodi"
#. module: account_payment
#: field:account.move.line,amount_to_pay:0
msgid "Amount to pay"
-msgstr "Summa joka maksetaan"
+msgstr "Maksettava summa"
#. module: account_payment
#: field:payment.line,amount:0
msgid "Amount in Company Currency"
-msgstr "Summa yhtiön valuuttana"
+msgstr "Summa yrityksen valuutassa"
#. module: account_payment
#: help:payment.line,partner_id:0
@@ -422,12 +425,12 @@ msgstr "Tilaava asiakas"
#. module: account_payment
#: field:payment.type,code:0
msgid "Code"
-msgstr ""
+msgstr "Koodi"
#. module: account_payment
#: field:payment.line,name:0
msgid "Your Reference"
-msgstr ""
+msgstr "Oma viitteesi"
#. module: account_payment
#: view:payment.order:0
@@ -438,12 +441,12 @@ msgstr "Maksumääräys"
#: view:payment.line:0
#: view:payment.order:0
msgid "General Information"
-msgstr ""
+msgstr "Yleistiedot"
#. module: account_payment
#: selection:payment.order,state:0
msgid "Done"
-msgstr ""
+msgstr "Valmis"
#. module: account_payment
#: view:payment.order:0
@@ -453,41 +456,41 @@ msgstr "Valitse maksettavat laskut"
#. module: account_payment
#: view:payment.order:0
msgid "Cancel"
-msgstr ""
+msgstr "Peruuta"
#. module: account_payment
#: view:payment.line:0
#: view:payment.order:0
msgid "Information"
-msgstr ""
+msgstr "Tiedot"
#. module: account_payment
#: constraint:ir.model:0
msgid ""
"The Object name must start with x_ and not contain any special character !"
-msgstr ""
+msgstr "Objektin nimen tulee alkaa x_ ja se ei saa sisältää erikoismerkkejä!"
#. module: account_payment
#: model:ir.actions.wizard,name:account_payment.wizard_pay_payment
msgid "Pay"
-msgstr ""
+msgstr "Maksa"
#. module: account_payment
#: model:ir.actions.report.xml,name:account_payment.payment_order1
#: model:ir.model,name:account_payment.model_payment_order
msgid "Payment Order"
-msgstr ""
+msgstr "Maksumääräys"
#. module: account_payment
#: model:ir.actions.act_window,name:account_payment.action_payment_order_draft
#: model:ir.ui.menu,name:account_payment.menu_action_payment_order_draft
msgid "Draft Payment Order"
-msgstr ""
+msgstr "Maksumääräys luonnos"
#. module: account_payment
#: help:payment.line,amount:0
msgid "Payment amount in the company currency"
-msgstr ""
+msgstr "Maksun summa yrityksen valuutassa"
#. module: account_payment
#: wizard_view:populate_payment,init:0
@@ -497,28 +500,28 @@ msgstr "Etsi maksurivejä"
#. module: account_payment
#: field:payment.line,amount_currency:0
msgid "Amount in Partner Currency"
-msgstr ""
+msgstr "Summa kumppanin valuutassa"
#. module: account_payment
#: field:payment.line,communication2:0
msgid "Communication 2"
-msgstr ""
+msgstr "Viestirivi 2"
#. module: account_payment
#: field:payment.line,bank_id:0
msgid "Destination Bank account"
-msgstr "Kohteen pankkitili"
+msgstr "Kohde pankkitili"
#. module: account_payment
#: help:payment.mode,journal:0
msgid "Cash Journal for the Payment Mode"
-msgstr ""
+msgstr "Käteispäiväkirja maksutavalle"
#. module: account_payment
#: field:payment.mode,bank_id:0
#: rml:payment.order:0
msgid "Bank account"
-msgstr ""
+msgstr "Pankkitili"
#. module: account_payment
#: view:payment.order:0
@@ -528,7 +531,7 @@ msgstr "Vahvista maksut"
#. module: account_payment
#: field:payment.line,company_currency:0
msgid "Company Currency"
-msgstr ""
+msgstr "Yrityksen valuutta"
#. module: account_payment
#: model:ir.ui.menu,name:account_payment.menu_main
@@ -536,12 +539,12 @@ msgstr ""
#: view:payment.line:0
#: view:payment.order:0
msgid "Payment"
-msgstr ""
+msgstr "Maksu"
#. module: account_payment
#: field:payment.line,move_line_id:0
msgid "Entry line"
-msgstr "Syötekenttä"
+msgstr "Merkintärivi"
#. module: account_payment
#: help:payment.line,communication:0
@@ -549,33 +552,35 @@ msgid ""
"Used as the message between ordering customer and current company. Depicts "
"'What do you want to say to the recipient about this order ?'"
msgstr ""
+"Käytetään viestinä tilaavan asiakkaan ja yrityksen väillä. Kirjoita tähän "
+"mitä haluat sanoa vastaanottajalle."
#. module: account_payment
#: field:payment.mode,name:0
#: field:payment.type,name:0
msgid "Name"
-msgstr ""
+msgstr "Nimi"
#. module: account_payment
#: wizard_button:populate_payment,init,search:0
msgid "_Search"
-msgstr ""
+msgstr "_Etsi"
#. module: account_payment
#: view:payment.line:0
#: view:payment.order:0
msgid "Entry Information"
-msgstr ""
+msgstr "Merkinnän tiedot"
#. module: account_payment
#: model:ir.actions.wizard,name:account_payment.wizard_populate_statement
msgid "Populate Statement with Payment lines"
-msgstr ""
+msgstr "Täytä tiliote maksuriveillä"
#. module: account_payment
#: field:payment.line,order_id:0
msgid "Order"
-msgstr ""
+msgstr "Määräys"
#. module: account_payment
#: model:ir.actions.act_window,name:account_payment.action_payment_order_open
@@ -592,30 +597,30 @@ msgstr "Maksutyyppi"
#. module: account_payment
#: field:payment.order,total:0
msgid "Total"
-msgstr ""
+msgstr "Yhteensä"
#. module: account_payment
#: wizard_button:populate_statement,init,add:0
msgid "_Add"
-msgstr ""
+msgstr "_Lisää"
#. module: account_payment
#: help:payment.mode,type:0
msgid "Select the Payment Type for the Payment Mode."
-msgstr ""
+msgstr "Valitse maksutyyppi tälle maksutavalle."
#. module: account_payment
#: model:ir.model,name:account_payment.model_payment_mode
#: field:payment.order,mode:0
msgid "Payment mode"
-msgstr ""
+msgstr "Maksutapa"
#. module: account_payment
#: help:payment.mode,bank_id:0
msgid "Bank Account for the Payment Mode"
-msgstr ""
+msgstr "Pankkitili tälle maksutavalle"
#. module: account_payment
#: field:payment.mode,journal:0
msgid "Journal"
-msgstr ""
+msgstr "Päiväkirja"
diff --git a/addons/account_payment/i18n/fr.po b/addons/account_payment/i18n/fr.po
index de0d26c24bb..207ee97e40e 100644
--- a/addons/account_payment/i18n/fr.po
+++ b/addons/account_payment/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment
diff --git a/addons/account_payment/i18n/hi.po b/addons/account_payment/i18n/hi.po
index e0cd80d0d89..584e53c7c55 100644
--- a/addons/account_payment/i18n/hi.po
+++ b/addons/account_payment/i18n/hi.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment
diff --git a/addons/account_payment/i18n/hr.po b/addons/account_payment/i18n/hr.po
index 93877d36874..8b257064bbf 100644
--- a/addons/account_payment/i18n/hr.po
+++ b/addons/account_payment/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment
diff --git a/addons/account_payment/i18n/hu.po b/addons/account_payment/i18n/hu.po
index aa6f2a61d93..efe3a9ada7d 100644
--- a/addons/account_payment/i18n/hu.po
+++ b/addons/account_payment/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment
diff --git a/addons/account_payment/i18n/id.po b/addons/account_payment/i18n/id.po
index d0837f8df52..6c646a2ef75 100644
--- a/addons/account_payment/i18n/id.po
+++ b/addons/account_payment/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment
diff --git a/addons/account_payment/i18n/it.po b/addons/account_payment/i18n/it.po
index e6f5b10f475..1e6d0bc779c 100644
--- a/addons/account_payment/i18n/it.po
+++ b/addons/account_payment/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment
diff --git a/addons/account_payment/i18n/ko.po b/addons/account_payment/i18n/ko.po
index 7740ab718e4..048c1bf9e4e 100644
--- a/addons/account_payment/i18n/ko.po
+++ b/addons/account_payment/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment
diff --git a/addons/account_payment/i18n/lt.po b/addons/account_payment/i18n/lt.po
index aa363e7bf0a..053536ba625 100644
--- a/addons/account_payment/i18n/lt.po
+++ b/addons/account_payment/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment
diff --git a/addons/account_payment/i18n/nl.po b/addons/account_payment/i18n/nl.po
index 717678ffb37..5c80a9be7bc 100644
--- a/addons/account_payment/i18n/nl.po
+++ b/addons/account_payment/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment
diff --git a/addons/account_payment/i18n/nl_BE.po b/addons/account_payment/i18n/nl_BE.po
index 4314bc4931d..aada7794678 100644
--- a/addons/account_payment/i18n/nl_BE.po
+++ b/addons/account_payment/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment
diff --git a/addons/account_payment/i18n/pl.po b/addons/account_payment/i18n/pl.po
index 606396e1340..c0b737c9330 100644
--- a/addons/account_payment/i18n/pl.po
+++ b/addons/account_payment/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment
diff --git a/addons/account_payment/i18n/pt.po b/addons/account_payment/i18n/pt.po
index 3adbabe9c5a..7d44dcd1d53 100644
--- a/addons/account_payment/i18n/pt.po
+++ b/addons/account_payment/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment
diff --git a/addons/account_payment/i18n/pt_BR.po b/addons/account_payment/i18n/pt_BR.po
index b2fd6799488..db208e38a34 100644
--- a/addons/account_payment/i18n/pt_BR.po
+++ b/addons/account_payment/i18n/pt_BR.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-04 16:01+0000\n"
-"Last-Translator: JCF \n"
+"PO-Revision-Date: 2010-03-24 01:02+0000\n"
+"Last-Translator: Pedro_Maschio \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment
@@ -335,7 +335,7 @@ msgstr "Parceiro"
#. module: account_payment
#: help:payment.line,communication2:0
msgid "The successor message of Communication."
-msgstr ""
+msgstr "A mensagem que segue a Comunicação."
#. module: account_payment
#: help:payment.line,info_partner:0
diff --git a/addons/account_payment/i18n/ro.po b/addons/account_payment/i18n/ro.po
index c054f41bb02..75a55b5cb67 100644
--- a/addons/account_payment/i18n/ro.po
+++ b/addons/account_payment/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment
diff --git a/addons/account_payment/i18n/ru.po b/addons/account_payment/i18n/ru.po
index b19cb6667ea..80e27b216b5 100644
--- a/addons/account_payment/i18n/ru.po
+++ b/addons/account_payment/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment
diff --git a/addons/account_payment/i18n/sl.po b/addons/account_payment/i18n/sl.po
index ee415a01fd7..f4307cd4d07 100644
--- a/addons/account_payment/i18n/sl.po
+++ b/addons/account_payment/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment
diff --git a/addons/account_payment/i18n/sv.po b/addons/account_payment/i18n/sv.po
index 358d117f2e1..5e841bd05cb 100644
--- a/addons/account_payment/i18n/sv.po
+++ b/addons/account_payment/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment
diff --git a/addons/account_payment/i18n/tlh.po b/addons/account_payment/i18n/tlh.po
index 7d8bf3f0364..96f6210e559 100644
--- a/addons/account_payment/i18n/tlh.po
+++ b/addons/account_payment/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment
diff --git a/addons/account_payment/i18n/tr.po b/addons/account_payment/i18n/tr.po
index eabb61d208a..721ee01bc5d 100644
--- a/addons/account_payment/i18n/tr.po
+++ b/addons/account_payment/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment
diff --git a/addons/account_payment/i18n/uk.po b/addons/account_payment/i18n/uk.po
index 1b80b62be63..75f5f5792d2 100644
--- a/addons/account_payment/i18n/uk.po
+++ b/addons/account_payment/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment
diff --git a/addons/account_payment/i18n/zh_CN.po b/addons/account_payment/i18n/zh_CN.po
index 7eb79f01087..87ce9c455be 100644
--- a/addons/account_payment/i18n/zh_CN.po
+++ b/addons/account_payment/i18n/zh_CN.po
@@ -4,27 +4,27 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-01-08 04:00+0000\n"
-"Last-Translator: Wei \"oldrev\" Li \n"
+"PO-Revision-Date: 2010-03-20 07:13+0000\n"
+"Last-Translator: Black Jack \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment
#: field:payment.order,date_planned:0
msgid "Scheduled date if fixed"
-msgstr ""
+msgstr "预定日期如果是固定"
#. module: account_payment
#: field:payment.line,currency:0
msgid "Partner Currency"
-msgstr ""
+msgstr "业务伙伴货币"
#. module: account_payment
#: view:payment.order:0
@@ -34,107 +34,107 @@ msgstr "设为草稿"
#. module: account_payment
#: help:payment.order,mode:0
msgid "Select the Payment Mode to be applied."
-msgstr ""
+msgstr "选择使用的付款方式"
#. module: account_payment
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
-msgstr "在动作定义使用了无效的模型名称。"
+msgstr "在这动作定义中有无效的模块名"
#. module: account_payment
#: view:payment.line:0
#: field:payment.line,info_owner:0
#: view:payment.order:0
msgid "Owner Account"
-msgstr ""
+msgstr "自己的账号"
#. module: account_payment
#: help:account.invoice,amount_to_pay:0
msgid ""
"The amount which should be paid at the current date\n"
"minus the amount which is already in payment order"
-msgstr ""
+msgstr "该金额应在当前日期支付扣减付款单"
#. module: account_payment
#: help:payment.line,date:0
msgid ""
"If no payment date is specified, the bank will treat this payment line "
"directly"
-msgstr ""
+msgstr "如果没有指定付款日期将直接由银行付款"
#. module: account_payment
#: field:payment.order,date_prefered:0
msgid "Preferred date"
-msgstr ""
+msgstr "首选日期"
#. module: account_payment
#: selection:payment.line,state:0
msgid "Free"
-msgstr ""
+msgstr "自由"
#. module: account_payment
#: wizard_field:populate_payment,search,entries:0
msgid "Entries"
-msgstr ""
+msgstr "凭证"
#. module: account_payment
#: wizard_field:populate_payment,init,duedate:0
msgid "Due Date"
-msgstr ""
+msgstr "到期日期"
#. module: account_payment
#: view:account.move.line:0
msgid "Account Entry Line"
-msgstr ""
+msgstr "凭证明细"
#. module: account_payment
#: wizard_button:populate_payment,search,create:0
msgid "_Add to payment order"
-msgstr ""
+msgstr "增加到付款单"
#. module: account_payment
#: rml:payment.order:0
#: view:payment.order:0
msgid "Amount"
-msgstr ""
+msgstr "金额"
#. module: account_payment
#: rml:payment.order:0
msgid "Execution date:"
-msgstr ""
+msgstr "执行日期:"
#. module: account_payment
#: view:payment.order:0
msgid "Total in Company Currency"
-msgstr ""
+msgstr "公司货币的合计"
#. module: account_payment
#: selection:payment.order,state:0
msgid "Cancelled"
-msgstr ""
+msgstr "取消"
#. module: account_payment
#: model:ir.actions.act_window,name:account_payment.action_payment_order_tree_new
#: model:ir.ui.menu,name:account_payment.menu_action_payment_order_form_new
msgid "New Payment Order"
-msgstr ""
+msgstr "新付款单"
#. module: account_payment
#: rml:payment.order:0
#: field:payment.order,reference:0
msgid "Reference"
-msgstr ""
+msgstr "参考"
#. module: account_payment
#: model:ir.actions.act_window,name:account_payment.action_payment_order_tree
#: model:ir.ui.menu,name:account_payment.menu_action_payment_order_form
msgid "Payment Orders"
-msgstr ""
+msgstr "付款单"
#. module: account_payment
#: selection:payment.order,date_prefered:0
msgid "Directly"
-msgstr ""
+msgstr "直接"
#. module: account_payment
#: model:ir.actions.act_window,name:account_payment.action_payment_line_form
@@ -142,70 +142,70 @@ msgstr ""
#: view:payment.line:0
#: view:payment.order:0
msgid "Payment Line"
-msgstr ""
+msgstr "付款明细"
#. module: account_payment
#: field:payment.type,suitable_bank_types:0
msgid "Suitable bank types"
-msgstr ""
+msgstr "合适的银行类型"
#. module: account_payment
#: view:payment.line:0
msgid "Amount Total"
-msgstr ""
+msgstr "金额合计"
#. module: account_payment
#: selection:payment.order,state:0
msgid "Confirmed"
-msgstr ""
+msgstr "确认"
#. module: account_payment
#: help:payment.line,ml_date_created:0
msgid "Invoice Effective Date"
-msgstr ""
+msgstr "发票有效日期"
#. module: account_payment
#: field:payment.order,line_ids:0
msgid "Payment lines"
-msgstr ""
+msgstr "付款明细"
#. module: account_payment
#: help:payment.order,date_planned:0
msgid "Select a date if you have chosen Preferred Date to be fixed."
-msgstr ""
+msgstr "如果你选择的优先日期是固定的选择一个日期"
#. module: account_payment
#: selection:payment.line,state:0
msgid "Structured"
-msgstr ""
+msgstr "规范"
#. module: account_payment
#: field:payment.order,state:0
msgid "State"
-msgstr ""
+msgstr "状态"
#. module: account_payment
#: view:payment.line:0
#: view:payment.order:0
msgid "Transaction Information"
-msgstr ""
+msgstr "交易信息"
#. module: account_payment
#: model:ir.actions.act_window,name:account_payment.action_payment_mode_form
#: model:ir.ui.menu,name:account_payment.menu_action_payment_mode_form
#: view:payment.mode:0
msgid "Payment Mode"
-msgstr ""
+msgstr "付款方式"
#. module: account_payment
#: field:payment.line,ml_date_created:0
msgid "Effective Date"
-msgstr ""
+msgstr "有效日期"
#. module: account_payment
#: field:payment.line,ml_inv_ref:0
msgid "Invoice Ref."
-msgstr ""
+msgstr "发票参考"
#. module: account_payment
#: help:payment.order,date_prefered:0
@@ -213,142 +213,142 @@ msgid ""
"Choose an option for the Payment Order:'Fixed' stands for a date specified "
"by you.'Directly' stands for the direct execution.'Due date' stands for the "
"scheduled date of execution."
-msgstr ""
+msgstr "选择付款单选项‘固定’由你指定一个指定的日期.‘直接’直接执行.‘预定日期’指定一个时间表的日期执行."
#. module: account_payment
#: view:account.move.line:0
msgid "Total debit"
-msgstr ""
+msgstr "借方合计"
#. module: account_payment
#: field:payment.order,date_done:0
msgid "Execution date"
-msgstr ""
+msgstr "执行日期"
#. module: account_payment
#: selection:payment.order,date_prefered:0
msgid "Fixed date"
-msgstr ""
+msgstr "固定日期"
#. module: account_payment
#: field:payment.line,info_partner:0
msgid "Destination Account"
-msgstr ""
+msgstr "目标科目"
#. module: account_payment
#: view:payment.line:0
#: view:payment.order:0
msgid "Desitination Account"
-msgstr ""
+msgstr "目标账号"
#. module: account_payment
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "无效XML视图结构!"
#. module: account_payment
#: wizard_button:populate_payment,init,end:0
#: wizard_button:populate_payment,search,end:0
#: wizard_button:populate_statement,init,end:0
msgid "_Cancel"
-msgstr "取消(_C)"
+msgstr "取消"
#. module: account_payment
#: field:payment.line,create_date:0
msgid "Created"
-msgstr ""
+msgstr "创建"
#. module: account_payment
#: view:payment.line:0
msgid "Currency Amount Total"
-msgstr ""
+msgstr "当前金额合计"
#. module: account_payment
#: view:payment.order:0
msgid "Make Payments"
-msgstr ""
+msgstr "付款"
#. module: account_payment
#: field:payment.line,state:0
msgid "Communication Type"
-msgstr ""
+msgstr "沟通类型"
#. module: account_payment
#: model:ir.module.module,shortdesc:account_payment.module_meta_information
msgid "Payment Management"
-msgstr ""
+msgstr "付款管理"
#. module: account_payment
#: field:payment.line,communication:0
msgid "Communication"
-msgstr ""
+msgstr "沟通"
#. module: account_payment
#: selection:payment.order,date_prefered:0
msgid "Due date"
-msgstr ""
+msgstr "到期日期"
#. module: account_payment
#: field:account.invoice,amount_to_pay:0
msgid "Amount to be paid"
-msgstr ""
+msgstr "应支付金额"
#. module: account_payment
#: help:payment.line,info_owner:0
msgid "Address of the Main Partner"
-msgstr ""
+msgstr "主要业务伙伴地址"
#. module: account_payment
#: help:payment.mode,name:0
msgid "Mode of Payment"
-msgstr ""
+msgstr "付款方式"
#. module: account_payment
#: view:payment.type:0
#: help:payment.type,name:0
msgid "Payment Type"
-msgstr ""
+msgstr "付款类型"
#. module: account_payment
#: help:payment.line,amount_currency:0
msgid "Payment amount in the partner currency"
-msgstr ""
+msgstr "在业务伙伴货币的货币金额"
#. module: account_payment
#: selection:payment.order,state:0
msgid "Draft"
-msgstr ""
+msgstr "草稿"
#. module: account_payment
#: field:payment.line,partner_id:0
#: rml:payment.order:0
msgid "Partner"
-msgstr ""
+msgstr "业务伙伴"
#. module: account_payment
#: help:payment.line,communication2:0
msgid "The successor message of Communication."
-msgstr ""
+msgstr "沟通的消息"
#. module: account_payment
#: help:payment.line,info_partner:0
msgid "Address of the Ordering Customer."
-msgstr ""
+msgstr "客户订单地址"
#. module: account_payment
#: view:account.move.line:0
msgid "Total credit"
-msgstr ""
+msgstr "贷方合计"
#. module: account_payment
#: model:ir.actions.wizard,name:account_payment.wizard_populate_payment
msgid "Populate payment"
-msgstr ""
+msgstr "填写付款"
#. module: account_payment
#: field:payment.order,user_id:0
msgid "User"
-msgstr ""
+msgstr "用户"
#. module: account_payment
#: model:ir.actions.act_window,name:account_payment.act_account_invoice_2_payment_line
@@ -359,170 +359,170 @@ msgstr "付款明细"
#. module: account_payment
#: rml:payment.order:0
msgid "Date"
-msgstr ""
+msgstr "日期"
#. module: account_payment
#: rml:payment.order:0
msgid "Reference:"
-msgstr ""
+msgstr "参考"
#. module: account_payment
#: help:payment.line,move_line_id:0
msgid ""
"This Entry Line will be referred for the information of the ordering "
"customer."
-msgstr ""
+msgstr "这凭证明细将在这客户订单作为参考信息"
#. module: account_payment
#: field:payment.line,date:0
msgid "Payment Date"
-msgstr ""
+msgstr "付款日期"
#. module: account_payment
#: field:payment.order,date_created:0
msgid "Creation date"
-msgstr ""
+msgstr "创建日期"
#. module: account_payment
#: field:payment.line,ml_maturity_date:0
msgid "Maturity Date"
-msgstr ""
+msgstr "到期日期"
#. module: account_payment
#: view:account.bank.statement:0
msgid "Import payment lines"
-msgstr ""
+msgstr "进项付款明细"
#. module: account_payment
#: help:payment.type,code:0
msgid "Specify the Code for Payment Type"
-msgstr ""
+msgstr "指定付款类型代码"
#. module: account_payment
#: field:account.move.line,amount_to_pay:0
msgid "Amount to pay"
-msgstr ""
+msgstr "支付金额"
#. module: account_payment
#: field:payment.line,amount:0
msgid "Amount in Company Currency"
-msgstr ""
+msgstr "公司使用货币的金额"
#. module: account_payment
#: help:payment.line,partner_id:0
msgid "The Ordering Customer"
-msgstr ""
+msgstr "客户订单"
#. module: account_payment
#: field:payment.type,code:0
msgid "Code"
-msgstr ""
+msgstr "代码"
#. module: account_payment
#: field:payment.line,name:0
msgid "Your Reference"
-msgstr ""
+msgstr "你的参考"
#. module: account_payment
#: view:payment.order:0
msgid "Payment order"
-msgstr ""
+msgstr "付款单"
#. module: account_payment
#: view:payment.line:0
#: view:payment.order:0
msgid "General Information"
-msgstr ""
+msgstr "一般信息"
#. module: account_payment
#: selection:payment.order,state:0
msgid "Done"
-msgstr ""
+msgstr "完成"
#. module: account_payment
#: view:payment.order:0
msgid "Select Invoices to Pay"
-msgstr ""
+msgstr "选择发票支付"
#. module: account_payment
#: view:payment.order:0
msgid "Cancel"
-msgstr ""
+msgstr "取消"
#. module: account_payment
#: view:payment.line:0
#: view:payment.order:0
msgid "Information"
-msgstr ""
+msgstr "信息"
#. module: account_payment
#: constraint:ir.model:0
msgid ""
"The Object name must start with x_ and not contain any special character !"
-msgstr ""
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
#. module: account_payment
#: model:ir.actions.wizard,name:account_payment.wizard_pay_payment
msgid "Pay"
-msgstr ""
+msgstr "支付"
#. module: account_payment
#: model:ir.actions.report.xml,name:account_payment.payment_order1
#: model:ir.model,name:account_payment.model_payment_order
msgid "Payment Order"
-msgstr ""
+msgstr "付款单"
#. module: account_payment
#: model:ir.actions.act_window,name:account_payment.action_payment_order_draft
#: model:ir.ui.menu,name:account_payment.menu_action_payment_order_draft
msgid "Draft Payment Order"
-msgstr ""
+msgstr "付款单草稿"
#. module: account_payment
#: help:payment.line,amount:0
msgid "Payment amount in the company currency"
-msgstr ""
+msgstr "在公司货币的付款金额"
#. module: account_payment
#: wizard_view:populate_payment,init:0
msgid "Search Payment lines"
-msgstr ""
+msgstr "付款明细"
#. module: account_payment
#: field:payment.line,amount_currency:0
msgid "Amount in Partner Currency"
-msgstr ""
+msgstr "业务伙伴使用货币的金额"
#. module: account_payment
#: field:payment.line,communication2:0
msgid "Communication 2"
-msgstr ""
+msgstr "沟通2"
#. module: account_payment
#: field:payment.line,bank_id:0
msgid "Destination Bank account"
-msgstr ""
+msgstr "银行账号"
#. module: account_payment
#: help:payment.mode,journal:0
msgid "Cash Journal for the Payment Mode"
-msgstr ""
+msgstr "付款方式的现金分类帐"
#. module: account_payment
#: field:payment.mode,bank_id:0
#: rml:payment.order:0
msgid "Bank account"
-msgstr ""
+msgstr "银行账号"
#. module: account_payment
#: view:payment.order:0
msgid "Confirm Payments"
-msgstr ""
+msgstr "确认付款"
#. module: account_payment
#: field:payment.line,company_currency:0
msgid "Company Currency"
-msgstr ""
+msgstr "公司货币"
#. module: account_payment
#: model:ir.ui.menu,name:account_payment.menu_main
@@ -530,7 +530,7 @@ msgstr ""
#: view:payment.line:0
#: view:payment.order:0
msgid "Payment"
-msgstr ""
+msgstr "付款"
#. module: account_payment
#: field:payment.line,move_line_id:0
@@ -542,74 +542,87 @@ msgstr ""
msgid ""
"Used as the message between ordering customer and current company. Depicts "
"'What do you want to say to the recipient about this order ?'"
-msgstr ""
+msgstr "用作订购客户和当前公司之间的消息.描述你在这订单想要说的?"
#. module: account_payment
#: field:payment.mode,name:0
#: field:payment.type,name:0
msgid "Name"
-msgstr ""
+msgstr "名称"
#. module: account_payment
#: wizard_button:populate_payment,init,search:0
msgid "_Search"
-msgstr ""
+msgstr "查找"
#. module: account_payment
#: view:payment.line:0
#: view:payment.order:0
msgid "Entry Information"
-msgstr ""
+msgstr "凭证信息"
#. module: account_payment
#: model:ir.actions.wizard,name:account_payment.wizard_populate_statement
msgid "Populate Statement with Payment lines"
-msgstr ""
+msgstr "填写付款明细"
#. module: account_payment
#: field:payment.line,order_id:0
msgid "Order"
-msgstr ""
+msgstr "付款单"
#. module: account_payment
#: model:ir.actions.act_window,name:account_payment.action_payment_order_open
#: model:ir.ui.menu,name:account_payment.menu_action_payment_order_open
msgid "Payment Orders to Validate"
-msgstr ""
+msgstr "确认付款单"
#. module: account_payment
#: model:ir.model,name:account_payment.model_payment_type
#: field:payment.mode,type:0
msgid "Payment type"
-msgstr ""
+msgstr "付款类型"
#. module: account_payment
#: field:payment.order,total:0
msgid "Total"
-msgstr ""
+msgstr "合计"
#. module: account_payment
#: wizard_button:populate_statement,init,add:0
msgid "_Add"
-msgstr "添加(_A)"
+msgstr "增加"
#. module: account_payment
#: help:payment.mode,type:0
msgid "Select the Payment Type for the Payment Mode."
-msgstr ""
+msgstr "选择这付款方式的付款类型"
#. module: account_payment
#: model:ir.model,name:account_payment.model_payment_mode
#: field:payment.order,mode:0
msgid "Payment mode"
-msgstr ""
+msgstr "付款方式"
#. module: account_payment
#: help:payment.mode,bank_id:0
msgid "Bank Account for the Payment Mode"
-msgstr ""
+msgstr "银行账号付款方式"
#. module: account_payment
#: field:payment.mode,journal:0
msgid "Journal"
-msgstr ""
+msgstr "分类帐"
+
+#~ msgid ""
+#~ "\n"
+#~ " This module provide :\n"
+#~ " * a more efficient way to manage invoice payment.\n"
+#~ " * a basic mechanism to easily plug various automated payment.\n"
+#~ " "
+#~ msgstr ""
+#~ "\n"
+#~ " 这模块提供:\n"
+#~ " * 更有效的方式来管理发票的付款.\n"
+#~ " * 一个基本机制来自动支付\n"
+#~ " "
diff --git a/addons/account_payment/i18n/zh_TW.po b/addons/account_payment/i18n/zh_TW.po
index 5650b203a86..6e264fbebe0 100644
--- a/addons/account_payment/i18n/zh_TW.po
+++ b/addons/account_payment/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment
diff --git a/addons/account_report/i18n/ar.po b/addons/account_report/i18n/ar.po
index c24c660af62..5c4649fb657 100644
--- a/addons/account_report/i18n/ar.po
+++ b/addons/account_report/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_report
diff --git a/addons/account_report/i18n/bg.po b/addons/account_report/i18n/bg.po
index b5e3b455066..38c677a953c 100644
--- a/addons/account_report/i18n/bg.po
+++ b/addons/account_report/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_report
diff --git a/addons/account_report/i18n/bs.po b/addons/account_report/i18n/bs.po
index 11e724e17ea..4760a0dba4b 100644
--- a/addons/account_report/i18n/bs.po
+++ b/addons/account_report/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_report
diff --git a/addons/account_report/i18n/ca.po b/addons/account_report/i18n/ca.po
index 35aa43ec429..8285cdc30a7 100644
--- a/addons/account_report/i18n/ca.po
+++ b/addons/account_report/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_report
diff --git a/addons/account_report/i18n/cs.po b/addons/account_report/i18n/cs.po
index c24c660af62..5c4649fb657 100644
--- a/addons/account_report/i18n/cs.po
+++ b/addons/account_report/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_report
diff --git a/addons/account_report/i18n/de.po b/addons/account_report/i18n/de.po
index 5443b3f182a..679a3f2be38 100644
--- a/addons/account_report/i18n/de.po
+++ b/addons/account_report/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_report
diff --git a/addons/account_report/i18n/el.po b/addons/account_report/i18n/el.po
index fdf8cb03947..5c359002f0a 100644
--- a/addons/account_report/i18n/el.po
+++ b/addons/account_report/i18n/el.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_report
diff --git a/addons/account_report/i18n/es.po b/addons/account_report/i18n/es.po
index 2d831939352..53a939a4015 100644
--- a/addons/account_report/i18n/es.po
+++ b/addons/account_report/i18n/es.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_report
diff --git a/addons/account_report/i18n/es_AR.po b/addons/account_report/i18n/es_AR.po
index 39a249fb471..f8905255489 100644
--- a/addons/account_report/i18n/es_AR.po
+++ b/addons/account_report/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_report
diff --git a/addons/account_report/i18n/et.po b/addons/account_report/i18n/et.po
index 91ea9ac942d..adc92423f3c 100644
--- a/addons/account_report/i18n/et.po
+++ b/addons/account_report/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_report
diff --git a/addons/account_report/i18n/fi.po b/addons/account_report/i18n/fi.po
index 7cb6257d117..90fa5380255 100644
--- a/addons/account_report/i18n/fi.po
+++ b/addons/account_report/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_report
diff --git a/addons/account_report/i18n/fr.po b/addons/account_report/i18n/fr.po
index 8d3cb7b928b..ad953823b84 100644
--- a/addons/account_report/i18n/fr.po
+++ b/addons/account_report/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_report
diff --git a/addons/account_report/i18n/hr.po b/addons/account_report/i18n/hr.po
index 6d1be03b9a6..c059ad88dc9 100644
--- a/addons/account_report/i18n/hr.po
+++ b/addons/account_report/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_report
diff --git a/addons/account_report/i18n/hu.po b/addons/account_report/i18n/hu.po
index c24c660af62..5c4649fb657 100644
--- a/addons/account_report/i18n/hu.po
+++ b/addons/account_report/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_report
diff --git a/addons/account_report/i18n/id.po b/addons/account_report/i18n/id.po
index 858f5dac566..a4c87a1cfe7 100644
--- a/addons/account_report/i18n/id.po
+++ b/addons/account_report/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_report
diff --git a/addons/account_report/i18n/it.po b/addons/account_report/i18n/it.po
index 03a155ff638..c36fa43c84f 100644
--- a/addons/account_report/i18n/it.po
+++ b/addons/account_report/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_report
diff --git a/addons/account_report/i18n/ko.po b/addons/account_report/i18n/ko.po
index d72c0c49c0d..e450b4d09d5 100644
--- a/addons/account_report/i18n/ko.po
+++ b/addons/account_report/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_report
diff --git a/addons/account_report/i18n/lt.po b/addons/account_report/i18n/lt.po
index f3b0fb68bc9..b35b82c000e 100644
--- a/addons/account_report/i18n/lt.po
+++ b/addons/account_report/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_report
diff --git a/addons/account_report/i18n/nl.po b/addons/account_report/i18n/nl.po
index 5a36907fd54..22cafca33bc 100644
--- a/addons/account_report/i18n/nl.po
+++ b/addons/account_report/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_report
diff --git a/addons/account_report/i18n/nl_BE.po b/addons/account_report/i18n/nl_BE.po
index f40425db09b..9f28190aeb7 100644
--- a/addons/account_report/i18n/nl_BE.po
+++ b/addons/account_report/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_report
diff --git a/addons/account_report/i18n/pl.po b/addons/account_report/i18n/pl.po
index 3e2ba7d03a1..4621b045637 100644
--- a/addons/account_report/i18n/pl.po
+++ b/addons/account_report/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_report
diff --git a/addons/account_report/i18n/pt.po b/addons/account_report/i18n/pt.po
index e826b9bc301..ac408449167 100644
--- a/addons/account_report/i18n/pt.po
+++ b/addons/account_report/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_report
diff --git a/addons/account_report/i18n/pt_BR.po b/addons/account_report/i18n/pt_BR.po
index 6c5abb270cb..0375d02f81a 100644
--- a/addons/account_report/i18n/pt_BR.po
+++ b/addons/account_report/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_report
diff --git a/addons/account_report/i18n/ro.po b/addons/account_report/i18n/ro.po
index 04c57b0c519..13f7430490a 100644
--- a/addons/account_report/i18n/ro.po
+++ b/addons/account_report/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_report
diff --git a/addons/account_report/i18n/ru.po b/addons/account_report/i18n/ru.po
index 6a325ff036c..ba7a50d6a7a 100644
--- a/addons/account_report/i18n/ru.po
+++ b/addons/account_report/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_report
diff --git a/addons/account_report/i18n/sl.po b/addons/account_report/i18n/sl.po
index 870e26910af..fba07ca5a2b 100644
--- a/addons/account_report/i18n/sl.po
+++ b/addons/account_report/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_report
diff --git a/addons/account_report/i18n/sv.po b/addons/account_report/i18n/sv.po
index 0495c693565..d93855dda94 100644
--- a/addons/account_report/i18n/sv.po
+++ b/addons/account_report/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_report
diff --git a/addons/account_report/i18n/tlh.po b/addons/account_report/i18n/tlh.po
index 17f92321e30..458470d9134 100644
--- a/addons/account_report/i18n/tlh.po
+++ b/addons/account_report/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_report
diff --git a/addons/account_report/i18n/tr.po b/addons/account_report/i18n/tr.po
index 2e9f301979f..81bcc502101 100644
--- a/addons/account_report/i18n/tr.po
+++ b/addons/account_report/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_report
diff --git a/addons/account_report/i18n/uk.po b/addons/account_report/i18n/uk.po
index 410d36be014..dfe0bdf4885 100644
--- a/addons/account_report/i18n/uk.po
+++ b/addons/account_report/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_report
diff --git a/addons/account_report/i18n/zh_CN.po b/addons/account_report/i18n/zh_CN.po
index af808553d7a..62d815b50f4 100644
--- a/addons/account_report/i18n/zh_CN.po
+++ b/addons/account_report/i18n/zh_CN.po
@@ -4,16 +4,16 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-02-08 06:26+0000\n"
-"Last-Translator: Wei \"oldrev\" Li \n"
+"PO-Revision-Date: 2010-03-20 07:14+0000\n"
+"Last-Translator: Black Jack \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_report
@@ -21,22 +21,22 @@ msgstr ""
#: selection:account.report.report,type:0
#: model:ir.model,name:account_report.model_account_report_history
msgid "Indicator"
-msgstr "进度条"
+msgstr "指标"
#. module: account_report
#: wizard_field:print.indicators.pdf,init,file:0
msgid "Select a PDF File"
-msgstr "选择一个 PDF 文件"
+msgstr "选择一个PDF文件"
#. module: account_report
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
-msgstr "操作定义中使用了无效的模式名称。"
+msgstr "在这动作定义中有无效的模块名"
#. module: account_report
#: view:account.report.report:0
msgid "Operators:"
-msgstr "运算符"
+msgstr "操作:"
#. module: account_report
#: field:account.report.report,parent_id:0
@@ -46,12 +46,12 @@ msgstr "上级"
#. module: account_report
#: field:account.report.report,disp_graph:0
msgid "Display As Graph"
-msgstr "显示图形"
+msgstr "图形"
#. module: account_report
#: view:account.report.report:0
msgid "Account Debit:"
-msgstr "借方科目:"
+msgstr "科目借方:"
#. module: account_report
#: selection:account.report.report,type:0
@@ -66,7 +66,7 @@ msgstr ""
#. module: account_report
#: rml:print.indicators:0
msgid "Tabular Summary"
-msgstr ""
+msgstr "一览表"
#. module: account_report
#: view:account.report.report:0
@@ -76,12 +76,12 @@ msgstr "备注"
#. module: account_report
#: view:account.report.report:0
msgid "= Goodness Indicator Limit:"
-msgstr ""
+msgstr "=良好指标范围:"
#. module: account_report
#: view:account.report.report:0
msgid "Very bad"
-msgstr ""
+msgstr "非常差"
#. module: account_report
#: field:account.report.history,val:0
@@ -92,7 +92,7 @@ msgstr "值"
#. module: account_report
#: view:account.report.report:0
msgid "= Badness Indicator Limit:"
-msgstr ""
+msgstr "=不良指标范围:"
#. module: account_report
#: view:account.report.report:0
@@ -103,27 +103,27 @@ msgstr "差"
#. module: account_report
#: wizard_view:print.indicators.pdf,init:0
msgid "Select the PDF file on which Indicators will be printed."
-msgstr ""
+msgstr "选择一个指标打印为PDF"
#. module: account_report
#: view:account.report.report:0
msgid "> Goodness Indicator Limit:"
-msgstr ""
+msgstr ">良好指标范围:"
#. module: account_report
#: field:account.report.report,badness_limit:0
msgid "Badness Indicator Limit"
-msgstr ""
+msgstr "不良指标范围"
#. module: account_report
#: selection:account.report.report,status:0
msgid "Very Bad"
-msgstr "很差"
+msgstr "非常差"
#. module: account_report
#: model:ir.actions.act_window,name:account_report.account_report_history_record_structure
msgid "Indicator history"
-msgstr ""
+msgstr "指标过去的记录"
#. module: account_report
#: view:account.report.report:0
@@ -133,22 +133,22 @@ msgstr ""
#. module: account_report
#: view:account.report.report:0
msgid "Report Amount:"
-msgstr ""
+msgstr "金额:"
#. module: account_report
#: model:ir.actions.report.xml,name:account_report.fiscal_statements
msgid "Fiscal Statements"
-msgstr ""
+msgstr "财务报表"
#. module: account_report
#: wizard_button:print.indicators,init,next:0
msgid "Next"
-msgstr ""
+msgstr "下一个"
#. module: account_report
#: model:ir.module.module,shortdesc:account_report.module_meta_information
msgid "Reporting for accounting"
-msgstr ""
+msgstr "会计报表"
#. module: account_report
#: wizard_button:print.indicators,next,print:0
@@ -164,33 +164,33 @@ msgstr "类型"
#. module: account_report
#: model:ir.actions.report.xml,name:account_report.report_indicator_pdf
msgid "Print Indicators in PDF"
-msgstr ""
+msgstr "打印PDF指标"
#. module: account_report
#: view:account.report.report:0
msgid "Account Tax Code:"
-msgstr ""
+msgstr "税代码:"
#. module: account_report
#: view:account.report.report:0
#: selection:account.report.report,status:0
msgid "Good"
-msgstr "良好"
+msgstr "好"
#. module: account_report
#: view:account.report.history:0
msgid "Account Report History"
-msgstr "科目报表历史记录"
+msgstr "报表日志"
#. module: account_report
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
-msgstr "无效的XML视图结构!"
+msgstr "无效XML视图结构!"
#. module: account_report
#: help:account.report.report,badness_limit:0
msgid "This Value sets the limit of badness."
-msgstr "此值设置好坏评估标准的限制"
+msgstr "这个值设置为不良范围"
#. module: account_report
#: wizard_field:print.indicators,init,select_base:0
@@ -205,17 +205,17 @@ msgstr ""
#. module: account_report
#: view:account.report.report:0
msgid "Account Credit:"
-msgstr ""
+msgstr "科目贷方:"
#. module: account_report
#: wizard_view:print.indicators,init:0
msgid "Select the criteria based on which Indicators will be printed."
-msgstr ""
+msgstr "选择标准的指标基于将要被打印"
#. module: account_report
#: view:account.report.report:0
msgid "< Badness Indicator Limit:"
-msgstr ""
+msgstr "<不良指标范围:"
#. module: account_report
#: view:account.report.report:0
@@ -232,24 +232,24 @@ msgstr "备注"
#: rml:accounting.report:0
#: rml:print.indicators:0
msgid "Currency:"
-msgstr "货币:"
+msgstr "货币:"
#. module: account_report
#: field:account.report.report,status:0
msgid "Status"
-msgstr ""
+msgstr "状态"
#. module: account_report
#: help:account.report.report,disp_tree:0
msgid ""
"When the indicators are printed, if one indicator is set with this field to "
"True, then it will display one more graphs with all its children in tree"
-msgstr ""
+msgstr "打印指标时如果一个指标字段为真将显示一个所有子树的图形"
#. module: account_report
#: selection:account.report.report,status:0
msgid "Normal"
-msgstr ""
+msgstr "正常"
#. module: account_report
#: view:account.report.report:0
@@ -259,32 +259,32 @@ msgstr ""
#. module: account_report
#: field:account.report.report,active:0
msgid "Active"
-msgstr ""
+msgstr "有效"
#. module: account_report
#: field:account.report.report,disp_tree:0
msgid "Display Tree"
-msgstr ""
+msgstr "显示树"
#. module: account_report
#: selection:print.indicators,init,select_base:0
msgid "Based On Fiscal Years"
-msgstr ""
+msgstr "基于会计年度"
#. module: account_report
#: model:ir.model,name:account_report.model_account_report_report
msgid "Account reporting"
-msgstr ""
+msgstr "科目报表"
#. module: account_report
#: view:account.report.report:0
msgid "Account Balance:"
-msgstr ""
+msgstr "科目余额:"
#. module: account_report
#: rml:print.indicators:0
msgid "Expression :"
-msgstr ""
+msgstr "表达式:"
#. module: account_report
#: view:account.report.report:0
@@ -294,24 +294,24 @@ msgstr ""
#. module: account_report
#: field:account.report.report,expression:0
msgid "Expression"
-msgstr ""
+msgstr "表达式"
#. module: account_report
#: view:account.report.report:0
msgid "Accounting reporting"
-msgstr ""
+msgstr "会计报表"
#. module: account_report
#: model:ir.actions.act_window,name:account_report.action_account_report_form
#: model:ir.ui.menu,name:account_report.menu_action_account_report_form
msgid "New Reporting Item Formula"
-msgstr ""
+msgstr "新报表项公式"
#. module: account_report
#: field:account.report.report,code:0
#: rml:accounting.report:0
msgid "Code"
-msgstr ""
+msgstr "代码"
#. module: account_report
#: field:account.report.history,tmp:0
@@ -321,40 +321,40 @@ msgstr ""
#. module: account_report
#: field:account.report.history,period_id:0
msgid "Period"
-msgstr ""
+msgstr "会计期间"
#. module: account_report
#: view:account.report.report:0
msgid "General"
-msgstr ""
+msgstr "普通"
#. module: account_report
#: view:account.report.report:0
msgid "Legend of operators"
-msgstr ""
+msgstr "操作说明"
#. module: account_report
#: wizard_button:print.indicators,init,end:0
#: wizard_button:print.indicators,next,end:0
#: wizard_button:print.indicators.pdf,init,end:0
msgid "Cancel"
-msgstr ""
+msgstr "取消"
#. module: account_report
#: field:account.report.report,child_ids:0
msgid "Children"
-msgstr ""
+msgstr "子项"
#. module: account_report
#: constraint:ir.model:0
msgid ""
"The Object name must start with x_ and not contain any special character !"
-msgstr ""
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
#. module: account_report
#: help:account.report.report,goodness_limit:0
msgid "This Value sets the limit of goodness."
-msgstr ""
+msgstr "这个值设为好范围"
#. module: account_report
#: model:ir.actions.wizard,name:account_report.wizard_print_indicators
@@ -362,7 +362,7 @@ msgstr ""
#: wizard_view:print.indicators,init:0
#: wizard_view:print.indicators,next:0
msgid "Print Indicators"
-msgstr ""
+msgstr "打印指标"
#. module: account_report
#: view:account.report.report:0
@@ -373,41 +373,41 @@ msgstr ""
#: rml:accounting.report:0
#: rml:print.indicators:0
msgid "Printing date:"
-msgstr ""
+msgstr "打印日期:"
#. module: account_report
#: model:ir.actions.wizard,name:account_report.wizard_indicators_with_pdf
msgid "Indicators in PDF"
-msgstr ""
+msgstr "指标PDF文件"
#. module: account_report
#: rml:accounting.report:0
#: rml:print.indicators:0
msgid "at"
-msgstr ""
+msgstr "在"
#. module: account_report
#: rml:accounting.report:0
msgid "Accounting Report"
-msgstr ""
+msgstr "会计报表"
#. module: account_report
#: field:account.report.report,goodness_limit:0
msgid "Goodness Indicator Limit"
-msgstr ""
+msgstr "良好指标范围"
#. module: account_report
#: model:ir.actions.act_window,name:account_report.action_account_report_tree_view_other
#: model:ir.ui.menu,name:account_report.menu_action_account_report_tree_view_other
msgid "Other reports"
-msgstr ""
+msgstr "其它报表"
#. module: account_report
#: view:account.report.report:0
msgid ""
"Note: The second arguement 'fiscalyear' and 'period' are optional "
"arguements.If the value is -1,previous fiscalyear or period is considered."
-msgstr ""
+msgstr "备注:第二参数‘会计年度’和‘会计期间’是可选参数.如果值为-1会计年度或会计期间是以前的."
#. module: account_report
#: rml:print.indicators:0
@@ -418,41 +418,41 @@ msgstr ""
#: model:ir.actions.act_window,name:account_report.action_account_report_tree_view_fiscal
#: model:ir.ui.menu,name:account_report.menu_action_account_report_tree_view_fiscal
msgid "Fiscal Statements reporting"
-msgstr ""
+msgstr "财务报表"
#. module: account_report
#: selection:print.indicators,init,select_base:0
msgid "Based on Fiscal Periods"
-msgstr ""
+msgstr "基于会计会计期间"
#. module: account_report
#: model:ir.actions.report.xml,name:account_report.report_print_indicators
#: rml:print.indicators:0
msgid "Indicators"
-msgstr ""
+msgstr "指标"
#. module: account_report
#: wizard_view:print.indicators.pdf,init:0
msgid "Print Indicators with PDF"
-msgstr ""
+msgstr "打印PDF指标"
#. module: account_report
#: model:ir.actions.act_window,name:account_report.action_account_report_tree_view_indicator
#: model:ir.ui.menu,name:account_report.menu_action_account_report_tree_view_indicator
msgid "Indicators reporting"
-msgstr ""
+msgstr "指标报表"
#. module: account_report
#: field:account.report.report,name:0
#: rml:accounting.report:0
#: rml:print.indicators:0
msgid "Name"
-msgstr ""
+msgstr "名称"
#. module: account_report
#: wizard_field:print.indicators,next,base_selection:0
msgid "Select Criteria"
-msgstr ""
+msgstr "选择标准"
#. module: account_report
#: view:account.report.report:0
@@ -462,7 +462,7 @@ msgstr ""
#. module: account_report
#: field:account.report.history,fiscalyear_id:0
msgid "Fiscal Year"
-msgstr ""
+msgstr "会计年度"
#. module: account_report
#: model:ir.actions.act_window,name:account_report.action_account_report_tree
@@ -470,44 +470,44 @@ msgstr ""
#: model:ir.ui.menu,name:account_report.menu_action_account_report_tree_define
#: model:ir.ui.menu,name:account_report.menu_action_account_report_tree_view
msgid "Custom reporting"
-msgstr ""
+msgstr "自定义报表"
#. module: account_report
#: rml:print.indicators:0
msgid "Page"
-msgstr ""
+msgstr "页"
#. module: account_report
#: selection:account.report.report,type:0
msgid "View"
-msgstr ""
+msgstr "视图"
#. module: account_report
#: rml:print.indicators:0
msgid "Indicators -"
-msgstr ""
+msgstr "指标 -"
#. module: account_report
#: help:account.report.report,disp_graph:0
msgid ""
"If the field is set to True, information will be printed as a Graph, "
"otherwise as an array."
-msgstr ""
+msgstr "如果这字段设为真信息将打印为图形否则为数组"
#. module: account_report
#: view:account.report.report:0
msgid "Return value for status"
-msgstr ""
+msgstr "状态返回值"
#. module: account_report
#: field:account.report.report,sequence:0
msgid "Sequence"
-msgstr ""
+msgstr "序列"
#. module: account_report
#: rml:accounting.report:0
msgid "Amount"
-msgstr ""
+msgstr "金额"
#. module: account_report
#: rml:print.indicators:0
@@ -522,8 +522,10 @@ msgid ""
" Indicators\n"
" "
msgstr ""
+"财务和会计,财务报表指标\n"
+" "
#. module: account_report
#: selection:account.report.report,type:0
msgid "Fiscal Statement"
-msgstr ""
+msgstr "财务报表"
diff --git a/addons/account_report/i18n/zh_TW.po b/addons/account_report/i18n/zh_TW.po
index d1b07beea41..2d3d7c77775 100644
--- a/addons/account_report/i18n/zh_TW.po
+++ b/addons/account_report/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 03:54+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_report
diff --git a/addons/account_reporting/i18n/ar.po b/addons/account_reporting/i18n/ar.po
index 06c5fdfcbca..73c4bab43b5 100644
--- a/addons/account_reporting/i18n/ar.po
+++ b/addons/account_reporting/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_reporting
diff --git a/addons/account_reporting/i18n/bg.po b/addons/account_reporting/i18n/bg.po
index 9788f9f120c..f7bed309949 100644
--- a/addons/account_reporting/i18n/bg.po
+++ b/addons/account_reporting/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_reporting
diff --git a/addons/account_reporting/i18n/bs.po b/addons/account_reporting/i18n/bs.po
index 0b3a95e34f8..551da5e9354 100644
--- a/addons/account_reporting/i18n/bs.po
+++ b/addons/account_reporting/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_reporting
diff --git a/addons/account_reporting/i18n/ca.po b/addons/account_reporting/i18n/ca.po
index 9a90c76a93d..e14231c74f4 100644
--- a/addons/account_reporting/i18n/ca.po
+++ b/addons/account_reporting/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_reporting
diff --git a/addons/account_reporting/i18n/cs.po b/addons/account_reporting/i18n/cs.po
index 06c5fdfcbca..73c4bab43b5 100644
--- a/addons/account_reporting/i18n/cs.po
+++ b/addons/account_reporting/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_reporting
diff --git a/addons/account_reporting/i18n/de.po b/addons/account_reporting/i18n/de.po
index 47f6d3b87ec..643137328d5 100644
--- a/addons/account_reporting/i18n/de.po
+++ b/addons/account_reporting/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_reporting
diff --git a/addons/account_reporting/i18n/el.po b/addons/account_reporting/i18n/el.po
index cdc23bc8a60..20d6ab42450 100644
--- a/addons/account_reporting/i18n/el.po
+++ b/addons/account_reporting/i18n/el.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_reporting
diff --git a/addons/account_reporting/i18n/es.po b/addons/account_reporting/i18n/es.po
index 5b7664fe0da..a4ecc7a9a60 100644
--- a/addons/account_reporting/i18n/es.po
+++ b/addons/account_reporting/i18n/es.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_reporting
diff --git a/addons/account_reporting/i18n/es_AR.po b/addons/account_reporting/i18n/es_AR.po
index 1cf3b3e1e89..3b01c80235b 100644
--- a/addons/account_reporting/i18n/es_AR.po
+++ b/addons/account_reporting/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_reporting
diff --git a/addons/account_reporting/i18n/et.po b/addons/account_reporting/i18n/et.po
index 2fe2fb76333..82065b0422e 100644
--- a/addons/account_reporting/i18n/et.po
+++ b/addons/account_reporting/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_reporting
diff --git a/addons/account_reporting/i18n/fi.po b/addons/account_reporting/i18n/fi.po
index 5e3fd086665..f122c805d70 100644
--- a/addons/account_reporting/i18n/fi.po
+++ b/addons/account_reporting/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_reporting
diff --git a/addons/account_reporting/i18n/fr.po b/addons/account_reporting/i18n/fr.po
index 94b74e4331a..0326eb29dd8 100644
--- a/addons/account_reporting/i18n/fr.po
+++ b/addons/account_reporting/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_reporting
diff --git a/addons/account_reporting/i18n/hr.po b/addons/account_reporting/i18n/hr.po
index 198ce4396dd..459c595ea34 100644
--- a/addons/account_reporting/i18n/hr.po
+++ b/addons/account_reporting/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_reporting
diff --git a/addons/account_reporting/i18n/hu.po b/addons/account_reporting/i18n/hu.po
index 06c5fdfcbca..73c4bab43b5 100644
--- a/addons/account_reporting/i18n/hu.po
+++ b/addons/account_reporting/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_reporting
diff --git a/addons/account_reporting/i18n/id.po b/addons/account_reporting/i18n/id.po
index e64193f14c7..1d18fc4c7d8 100644
--- a/addons/account_reporting/i18n/id.po
+++ b/addons/account_reporting/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_reporting
diff --git a/addons/account_reporting/i18n/it.po b/addons/account_reporting/i18n/it.po
index a5ca5605513..ef84d66febb 100644
--- a/addons/account_reporting/i18n/it.po
+++ b/addons/account_reporting/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_reporting
diff --git a/addons/account_reporting/i18n/ko.po b/addons/account_reporting/i18n/ko.po
index cad5bdd3480..87318cb79a4 100644
--- a/addons/account_reporting/i18n/ko.po
+++ b/addons/account_reporting/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_reporting
diff --git a/addons/account_reporting/i18n/lt.po b/addons/account_reporting/i18n/lt.po
index 602c4cdedf0..fae99aee833 100644
--- a/addons/account_reporting/i18n/lt.po
+++ b/addons/account_reporting/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_reporting
diff --git a/addons/account_reporting/i18n/nl.po b/addons/account_reporting/i18n/nl.po
index 7f20c23e6d6..5ce0018dce7 100644
--- a/addons/account_reporting/i18n/nl.po
+++ b/addons/account_reporting/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_reporting
diff --git a/addons/account_reporting/i18n/nl_BE.po b/addons/account_reporting/i18n/nl_BE.po
index b2404db713a..7b13398dfae 100644
--- a/addons/account_reporting/i18n/nl_BE.po
+++ b/addons/account_reporting/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_reporting
diff --git a/addons/account_reporting/i18n/pl.po b/addons/account_reporting/i18n/pl.po
index 71f780316ca..0dac6c39d74 100644
--- a/addons/account_reporting/i18n/pl.po
+++ b/addons/account_reporting/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_reporting
diff --git a/addons/account_reporting/i18n/pt.po b/addons/account_reporting/i18n/pt.po
index ac1a9458ee3..8b79bf1aec8 100644
--- a/addons/account_reporting/i18n/pt.po
+++ b/addons/account_reporting/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_reporting
diff --git a/addons/account_reporting/i18n/pt_BR.po b/addons/account_reporting/i18n/pt_BR.po
index b5fa606c95f..b75916ba7f9 100644
--- a/addons/account_reporting/i18n/pt_BR.po
+++ b/addons/account_reporting/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_reporting
diff --git a/addons/account_reporting/i18n/ro.po b/addons/account_reporting/i18n/ro.po
index f4dd9ffce23..a9e584d0295 100644
--- a/addons/account_reporting/i18n/ro.po
+++ b/addons/account_reporting/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_reporting
diff --git a/addons/account_reporting/i18n/ru.po b/addons/account_reporting/i18n/ru.po
index 67559193818..93c730bc999 100644
--- a/addons/account_reporting/i18n/ru.po
+++ b/addons/account_reporting/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_reporting
diff --git a/addons/account_reporting/i18n/sl.po b/addons/account_reporting/i18n/sl.po
index 685fde427ea..90af3526866 100644
--- a/addons/account_reporting/i18n/sl.po
+++ b/addons/account_reporting/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_reporting
diff --git a/addons/account_reporting/i18n/sv.po b/addons/account_reporting/i18n/sv.po
index bb2d146fc24..c24790f4159 100644
--- a/addons/account_reporting/i18n/sv.po
+++ b/addons/account_reporting/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_reporting
diff --git a/addons/account_reporting/i18n/tlh.po b/addons/account_reporting/i18n/tlh.po
index c941a5f2caf..8eba08fb772 100644
--- a/addons/account_reporting/i18n/tlh.po
+++ b/addons/account_reporting/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_reporting
diff --git a/addons/account_reporting/i18n/tr.po b/addons/account_reporting/i18n/tr.po
index f54a210f68d..6e0e2517b86 100644
--- a/addons/account_reporting/i18n/tr.po
+++ b/addons/account_reporting/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_reporting
diff --git a/addons/account_reporting/i18n/uk.po b/addons/account_reporting/i18n/uk.po
index 80ba51ea29c..879cd3a024a 100644
--- a/addons/account_reporting/i18n/uk.po
+++ b/addons/account_reporting/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_reporting
diff --git a/addons/account_reporting/i18n/zh_CN.po b/addons/account_reporting/i18n/zh_CN.po
index 29d0966bad1..a9e0f82ebbd 100644
--- a/addons/account_reporting/i18n/zh_CN.po
+++ b/addons/account_reporting/i18n/zh_CN.po
@@ -4,28 +4,28 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 16:37+0000\n"
-"Last-Translator: caih2000 \n"
+"PO-Revision-Date: 2010-03-20 07:15+0000\n"
+"Last-Translator: Black Jack \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_reporting
#: field:color.rml,code:0
msgid "code"
-msgstr ""
+msgstr "代码"
#. module: account_reporting
#: constraint:ir.model:0
msgid ""
"The Object name must start with x_ and not contain any special character !"
-msgstr ""
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
#. module: account_reporting
#: selection:account.report.bs,font_style:0
@@ -40,23 +40,23 @@ msgstr ""
#. module: account_reporting
#: field:account.report.bs,note:0
msgid "Note"
-msgstr ""
+msgstr "备注"
#. module: account_reporting
#: field:account.report.bs,report_type:0
msgid "Report Type"
-msgstr ""
+msgstr "报表类型"
#. module: account_reporting
#: model:ir.ui.menu,name:account_reporting.action_account_report_bs_form
#: model:ir.ui.menu,name:account_reporting.menu_finan_config_BSheet
msgid "Balance Sheet Report"
-msgstr ""
+msgstr "科目余额表"
#. module: account_reporting
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "在这动作定义中有无效的模块名"
#. module: account_reporting
#: selection:account.report.bs,font_style:0
@@ -71,34 +71,34 @@ msgstr ""
#. module: account_reporting
#: wizard_button:account.account.balancesheet.report,init,report:0
msgid "Print BalanceSheet"
-msgstr ""
+msgstr "打印科目余额表"
#. module: account_reporting
#: help:account.account.balancesheet.report,init,periods:0
msgid "All periods if empty"
-msgstr ""
+msgstr "如果留空为所有会计期间"
#. module: account_reporting
#: field:account.report.bs,color_font:0
msgid "Font Color"
-msgstr ""
+msgstr "字体颜色"
#. module: account_reporting
#: selection:account.report.bs,report_type:0
msgid "Report Objects With Accounts and child of Accounts"
-msgstr ""
+msgstr "科目和子科目报表对象"
#. module: account_reporting
#: model:ir.module.module,description:account_reporting.module_meta_information
msgid ""
"Financial and accounting reporting\n"
" Balance Sheet Report"
-msgstr ""
+msgstr "财务和会计报表 资产负债表"
#. module: account_reporting
#: selection:account.report.bs,report_type:0
msgid "Report Objects With Accounts"
-msgstr ""
+msgstr "科目报表对象"
#. module: account_reporting
#: selection:account.report.bs,font_style:0
@@ -108,28 +108,28 @@ msgstr ""
#. module: account_reporting
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "无效XML视图结构!"
#. module: account_reporting
#: field:account.report.bs,name:0
#: field:color.rml,name:0
msgid "Name"
-msgstr ""
+msgstr "名称"
#. module: account_reporting
#: view:account.report.bs:0
msgid "Account reporting"
-msgstr ""
+msgstr "科目报表"
#. module: account_reporting
#: model:ir.ui.menu,name:account_reporting.bs_report_action_form
msgid "Balance Sheet Report Form"
-msgstr ""
+msgstr "科目余额表格式"
#. module: account_reporting
#: view:account.report.bs:0
msgid "Notes"
-msgstr ""
+msgstr "备注"
#. module: account_reporting
#: selection:account.report.bs,font_style:0
@@ -139,7 +139,7 @@ msgstr ""
#. module: account_reporting
#: model:ir.model,name:account_reporting.model_account_report_bs
msgid "Account reporting for Balance Sheet"
-msgstr ""
+msgstr "会计报表资产负债表"
#. module: account_reporting
#: selection:account.report.bs,font_style:0
@@ -154,32 +154,32 @@ msgstr ""
#. module: account_reporting
#: selection:account.report.bs,report_type:0
msgid "Report Objects Only"
-msgstr ""
+msgstr "只有报表对象"
#. module: account_reporting
#: model:ir.model,name:account_reporting.model_color_rml
msgid "Rml Colors"
-msgstr ""
+msgstr "颜色"
#. module: account_reporting
#: model:ir.module.module,shortdesc:account_reporting.module_meta_information
msgid "Reporting of Balancesheet for accounting"
-msgstr ""
+msgstr "资产负债表报表"
#. module: account_reporting
#: field:account.report.bs,code:0
msgid "Code"
-msgstr ""
+msgstr "代码"
#. module: account_reporting
#: field:account.report.bs,parent_id:0
msgid "Parent"
-msgstr ""
+msgstr "上级"
#. module: account_reporting
#: field:account.report.bs,sequence:0
msgid "Sequence"
-msgstr ""
+msgstr "序列"
#. module: account_reporting
#: selection:account.report.bs,font_style:0
@@ -189,38 +189,38 @@ msgstr ""
#. module: account_reporting
#: view:account.report.bs:0
msgid "General"
-msgstr ""
+msgstr "一般"
#. module: account_reporting
#: wizard_field:account.account.balancesheet.report,init,fiscalyear:0
msgid "Fiscal year"
-msgstr ""
+msgstr "会计年度"
#. module: account_reporting
#: view:account.report.bs:0
#: field:account.report.bs,account_id:0
msgid "Accounts"
-msgstr ""
+msgstr "科目"
#. module: account_reporting
#: wizard_field:account.account.balancesheet.report,init,periods:0
msgid "Periods"
-msgstr ""
+msgstr "会计期间"
#. module: account_reporting
#: field:account.report.bs,color_back:0
msgid "Back Color"
-msgstr ""
+msgstr "背景色"
#. module: account_reporting
#: field:account.report.bs,child_id:0
msgid "Children"
-msgstr ""
+msgstr "子项"
#. module: account_reporting
#: wizard_button:account.account.balancesheet.report,init,end:0
msgid "Cancel"
-msgstr ""
+msgstr "取消"
#. module: account_reporting
#: selection:account.report.bs,font_style:0
@@ -235,9 +235,12 @@ msgstr ""
#. module: account_reporting
#: field:account.report.bs,font_style:0
msgid "Font"
-msgstr ""
+msgstr "字体"
#. module: account_reporting
#: wizard_view:account.account.balancesheet.report,init:0
msgid "Customize Report"
-msgstr ""
+msgstr "自定义报表"
+
+#~ msgid "Account balance"
+#~ msgstr "科目余额表"
diff --git a/addons/account_reporting/i18n/zh_TW.po b/addons/account_reporting/i18n/zh_TW.po
index 014048e33e9..e0ed5cf58b2 100644
--- a/addons/account_reporting/i18n/zh_TW.po
+++ b/addons/account_reporting/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:11+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_reporting
diff --git a/addons/account_tax_include/i18n/ar.po b/addons/account_tax_include/i18n/ar.po
index 82bf7a5f860..838dd5c061f 100644
--- a/addons/account_tax_include/i18n/ar.po
+++ b/addons/account_tax_include/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
diff --git a/addons/account_tax_include/i18n/bg.po b/addons/account_tax_include/i18n/bg.po
index cf8ec6f9dbe..962fcb8b815 100644
--- a/addons/account_tax_include/i18n/bg.po
+++ b/addons/account_tax_include/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
diff --git a/addons/account_tax_include/i18n/bs.po b/addons/account_tax_include/i18n/bs.po
index 6d6242027a6..ef136031348 100644
--- a/addons/account_tax_include/i18n/bs.po
+++ b/addons/account_tax_include/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
diff --git a/addons/account_tax_include/i18n/ca.po b/addons/account_tax_include/i18n/ca.po
index e5843ce8a8d..5861b7951f9 100644
--- a/addons/account_tax_include/i18n/ca.po
+++ b/addons/account_tax_include/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
diff --git a/addons/account_tax_include/i18n/cs.po b/addons/account_tax_include/i18n/cs.po
index 82bf7a5f860..838dd5c061f 100644
--- a/addons/account_tax_include/i18n/cs.po
+++ b/addons/account_tax_include/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
diff --git a/addons/account_tax_include/i18n/de.po b/addons/account_tax_include/i18n/de.po
index e5a9098f52a..b460151e6d5 100644
--- a/addons/account_tax_include/i18n/de.po
+++ b/addons/account_tax_include/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
diff --git a/addons/account_tax_include/i18n/el.po b/addons/account_tax_include/i18n/el.po
index 1ab4d279432..c733947a025 100644
--- a/addons/account_tax_include/i18n/el.po
+++ b/addons/account_tax_include/i18n/el.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
diff --git a/addons/account_tax_include/i18n/en_AU.po b/addons/account_tax_include/i18n/en_AU.po
index 497da85bf0c..d7c13bc320c 100644
--- a/addons/account_tax_include/i18n/en_AU.po
+++ b/addons/account_tax_include/i18n/en_AU.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
diff --git a/addons/account_tax_include/i18n/es.po b/addons/account_tax_include/i18n/es.po
index e6fa949f075..4952c135e8c 100644
--- a/addons/account_tax_include/i18n/es.po
+++ b/addons/account_tax_include/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
diff --git a/addons/account_tax_include/i18n/es_AR.po b/addons/account_tax_include/i18n/es_AR.po
index 58f33ca0554..1c16a29d059 100644
--- a/addons/account_tax_include/i18n/es_AR.po
+++ b/addons/account_tax_include/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
diff --git a/addons/account_tax_include/i18n/et.po b/addons/account_tax_include/i18n/et.po
index 200d53b72df..e8c62184d90 100644
--- a/addons/account_tax_include/i18n/et.po
+++ b/addons/account_tax_include/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
diff --git a/addons/account_tax_include/i18n/fi.po b/addons/account_tax_include/i18n/fi.po
index 0b9ec7dbf7d..45b0f27e316 100644
--- a/addons/account_tax_include/i18n/fi.po
+++ b/addons/account_tax_include/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-18 04:34+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
diff --git a/addons/account_tax_include/i18n/fr.po b/addons/account_tax_include/i18n/fr.po
index 6203480db74..5e7fe31fd4a 100644
--- a/addons/account_tax_include/i18n/fr.po
+++ b/addons/account_tax_include/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
@@ -29,22 +29,22 @@ msgstr "Méthode de prix"
#. module: account_tax_include
#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
msgid "Invoices and prices with taxes included"
-msgstr "Factures et Prix avec Taxes Comprises"
+msgstr "Factures et prix avec taxes comprises"
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax included"
-msgstr "Taxe incluse"
+msgstr "Taxe comprise"
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax excluded"
-msgstr "Taxe exclue"
+msgstr "Hors-taxe"
#. module: account_tax_include
#: view:account.tax:0
msgid "Compute Code for Taxes included prices"
-msgstr "Calcule le Code pour les Prix Taxes Comprises"
+msgstr "Code de calcul pour les prix taxes comprises"
#. module: account_tax_include
#: field:account.invoice.line,price_subtotal_incl:0
diff --git a/addons/account_tax_include/i18n/gl.po b/addons/account_tax_include/i18n/gl.po
index a8483652c0c..e0b844d0551 100644
--- a/addons/account_tax_include/i18n/gl.po
+++ b/addons/account_tax_include/i18n/gl.po
@@ -15,7 +15,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
diff --git a/addons/account_tax_include/i18n/hr.po b/addons/account_tax_include/i18n/hr.po
index 7e7fe46490c..aba51f0c29f 100644
--- a/addons/account_tax_include/i18n/hr.po
+++ b/addons/account_tax_include/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
diff --git a/addons/account_tax_include/i18n/hu.po b/addons/account_tax_include/i18n/hu.po
index 82bf7a5f860..838dd5c061f 100644
--- a/addons/account_tax_include/i18n/hu.po
+++ b/addons/account_tax_include/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
diff --git a/addons/account_tax_include/i18n/id.po b/addons/account_tax_include/i18n/id.po
index 18313b680de..a3cb6005de3 100644
--- a/addons/account_tax_include/i18n/id.po
+++ b/addons/account_tax_include/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
diff --git a/addons/account_tax_include/i18n/it.po b/addons/account_tax_include/i18n/it.po
index ff907248cd4..4ecfc99c8f7 100644
--- a/addons/account_tax_include/i18n/it.po
+++ b/addons/account_tax_include/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
diff --git a/addons/account_tax_include/i18n/ko.po b/addons/account_tax_include/i18n/ko.po
index a959550f879..4e673d5c8b4 100644
--- a/addons/account_tax_include/i18n/ko.po
+++ b/addons/account_tax_include/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
diff --git a/addons/account_tax_include/i18n/lt.po b/addons/account_tax_include/i18n/lt.po
index 4d1a9d30fc9..b6a2665df65 100644
--- a/addons/account_tax_include/i18n/lt.po
+++ b/addons/account_tax_include/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
diff --git a/addons/account_tax_include/i18n/nl.po b/addons/account_tax_include/i18n/nl.po
index 4f28d02779b..b6ab5f0672b 100644
--- a/addons/account_tax_include/i18n/nl.po
+++ b/addons/account_tax_include/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
diff --git a/addons/account_tax_include/i18n/nl_BE.po b/addons/account_tax_include/i18n/nl_BE.po
index 1b153652b2f..4f9a2bfeab0 100644
--- a/addons/account_tax_include/i18n/nl_BE.po
+++ b/addons/account_tax_include/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
diff --git a/addons/account_tax_include/i18n/pl.po b/addons/account_tax_include/i18n/pl.po
index 83c73cc6d24..f5a456277ce 100644
--- a/addons/account_tax_include/i18n/pl.po
+++ b/addons/account_tax_include/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
diff --git a/addons/account_tax_include/i18n/pt.po b/addons/account_tax_include/i18n/pt.po
index fffc79e2198..ac79c33dc94 100644
--- a/addons/account_tax_include/i18n/pt.po
+++ b/addons/account_tax_include/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
diff --git a/addons/account_tax_include/i18n/pt_BR.po b/addons/account_tax_include/i18n/pt_BR.po
index 72e70d7df16..b0a6ae92a87 100644
--- a/addons/account_tax_include/i18n/pt_BR.po
+++ b/addons/account_tax_include/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
diff --git a/addons/account_tax_include/i18n/ro.po b/addons/account_tax_include/i18n/ro.po
index f805fc3be5e..d265f1a9cf5 100644
--- a/addons/account_tax_include/i18n/ro.po
+++ b/addons/account_tax_include/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
diff --git a/addons/account_tax_include/i18n/ru.po b/addons/account_tax_include/i18n/ru.po
index 01e1ec3d86d..c1d714cf07f 100644
--- a/addons/account_tax_include/i18n/ru.po
+++ b/addons/account_tax_include/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
diff --git a/addons/account_tax_include/i18n/sk.po b/addons/account_tax_include/i18n/sk.po
index 7a6e1c886b8..c76f1ae7c96 100644
--- a/addons/account_tax_include/i18n/sk.po
+++ b/addons/account_tax_include/i18n/sk.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
diff --git a/addons/account_tax_include/i18n/sl.po b/addons/account_tax_include/i18n/sl.po
index 4533a188403..7e0047f0db5 100644
--- a/addons/account_tax_include/i18n/sl.po
+++ b/addons/account_tax_include/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
diff --git a/addons/account_tax_include/i18n/sv.po b/addons/account_tax_include/i18n/sv.po
index fe06b766930..c81c1b87ceb 100644
--- a/addons/account_tax_include/i18n/sv.po
+++ b/addons/account_tax_include/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
diff --git a/addons/account_tax_include/i18n/tlh.po b/addons/account_tax_include/i18n/tlh.po
index 1abc2528c78..95c73167222 100644
--- a/addons/account_tax_include/i18n/tlh.po
+++ b/addons/account_tax_include/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
diff --git a/addons/account_tax_include/i18n/tr.po b/addons/account_tax_include/i18n/tr.po
index 0f4ebc1d208..5f504db8c51 100644
--- a/addons/account_tax_include/i18n/tr.po
+++ b/addons/account_tax_include/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
diff --git a/addons/account_tax_include/i18n/uk.po b/addons/account_tax_include/i18n/uk.po
index 52f3734a2a6..909564f3314 100644
--- a/addons/account_tax_include/i18n/uk.po
+++ b/addons/account_tax_include/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
diff --git a/addons/account_tax_include/i18n/zh_CN.po b/addons/account_tax_include/i18n/zh_CN.po
index ac4ade1519a..70d2ca164cb 100644
--- a/addons/account_tax_include/i18n/zh_CN.po
+++ b/addons/account_tax_include/i18n/zh_CN.po
@@ -4,49 +4,60 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-01-30 12:43+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-03-20 07:29+0000\n"
+"Last-Translator: Black Jack \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "无效的视图结构XML文件!"
#. module: account_tax_include
#: field:account.invoice,price_type:0
msgid "Price method"
-msgstr ""
+msgstr "价格规则"
#. module: account_tax_include
#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
msgid "Invoices and prices with taxes included"
-msgstr ""
+msgstr "发票和含税价"
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax included"
-msgstr ""
+msgstr "含税"
#. module: account_tax_include
#: selection:account.invoice,price_type:0
msgid "Tax excluded"
-msgstr ""
+msgstr "不含税"
#. module: account_tax_include
#: view:account.tax:0
msgid "Compute Code for Taxes included prices"
-msgstr ""
+msgstr "含税价格计算代码"
#. module: account_tax_include
#: field:account.invoice.line,price_subtotal_incl:0
msgid "Subtotal"
-msgstr ""
+msgstr "小计"
+
+#~ msgid ""
+#~ "Allow the user to work tax included prices.\n"
+#~ "Especially useful for b2c businesses.\n"
+#~ " \n"
+#~ "This module implement the modification on the invoice form.\n"
+#~ msgstr ""
+#~ "允许用户使用含税价格\n"
+#~ "特别适用于B2C商务\n"
+#~ "\n"
+#~ "这模块使发票的格式生效\n"
diff --git a/addons/account_tax_include/i18n/zh_TW.po b/addons/account_tax_include/i18n/zh_TW.po
index ac4ade1519a..8176287845c 100644
--- a/addons/account_tax_include/i18n/zh_TW.po
+++ b/addons/account_tax_include/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
diff --git a/addons/account_voucher/__terp__.py b/addons/account_voucher/__terp__.py
index b6843372f4c..a006cb10bab 100755
--- a/addons/account_voucher/__terp__.py
+++ b/addons/account_voucher/__terp__.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL ().
#
@@ -15,7 +15,7 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
#
##############################################################################
@@ -24,20 +24,25 @@
"version" : "1.0",
"author" : 'Tiny & Axelor',
"description": """
- India Accounting module includes all the basic requirenment of
- Basic Accounting, like
- * Bank Payment, Receipt
- * Cash Payent, Receipt
+ India Accounting module includes all the basic requirenment of
+ Basic Accounting, plus new things which available are
+ * Indian Account Chart
+ * New Invoice - (Local, Retail)
+ * Invoice Report
+ * Tax structure
+ * Journals
+ * VAT Declaration report
+ * Accounting Periods
""",
- "category" : "Generic Modules/Indian Accounting",
+ "category" : "Generic Modules/Accounting",
"website" : "http://tinyerp.com",
"depends" : ["base", "account"],
"init_xml" : [
],
-
+
"demo_xml" : [
],
-
+
"update_xml" : [
"security/ir.model.access.csv",
"voucher_sequence.xml",
diff --git a/addons/account_voucher/account.py b/addons/account_voucher/account.py
index 4e01e275988..7cdbfc6b444 100644
--- a/addons/account_voucher/account.py
+++ b/addons/account_voucher/account.py
@@ -65,7 +65,7 @@ class account_account(osv.osv):
def compute_total(self, cr, uid, ids, yr_st_date, yr_end_date, st_date, end_date, field_names, context={}):
if not (st_date >= yr_st_date and end_date <= yr_end_date):
return {}
- query = "l.date >= '%s' AND l.date <= '%s'" (st_date, end_date)
+ query = "l.date >= '%s' AND l.date <= '%s'" % (st_date, end_date)
return self.__compute(cr, uid, ids, field_names, context=context, query=query)
def create(self, cr, uid, vals, context={}):
diff --git a/addons/account_voucher/i18n/ar.po b/addons/account_voucher/i18n/ar.po
index 3a1682e6792..a074fdb72f5 100644
--- a/addons/account_voucher/i18n/ar.po
+++ b/addons/account_voucher/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_voucher
diff --git a/addons/account_voucher/i18n/bg.po b/addons/account_voucher/i18n/bg.po
index 7328407e2f8..ab279037b21 100644
--- a/addons/account_voucher/i18n/bg.po
+++ b/addons/account_voucher/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_voucher
diff --git a/addons/account_voucher/i18n/bs.po b/addons/account_voucher/i18n/bs.po
index 9215fdb5126..6b5f1fe788e 100644
--- a/addons/account_voucher/i18n/bs.po
+++ b/addons/account_voucher/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_voucher
diff --git a/addons/account_voucher/i18n/ca.po b/addons/account_voucher/i18n/ca.po
index ce2af29b136..b78f556c5f0 100644
--- a/addons/account_voucher/i18n/ca.po
+++ b/addons/account_voucher/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_voucher
diff --git a/addons/account_voucher/i18n/cs.po b/addons/account_voucher/i18n/cs.po
index 3a1682e6792..a074fdb72f5 100644
--- a/addons/account_voucher/i18n/cs.po
+++ b/addons/account_voucher/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_voucher
diff --git a/addons/account_voucher/i18n/de.po b/addons/account_voucher/i18n/de.po
index 44630bc61c3..f65d09b57e8 100644
--- a/addons/account_voucher/i18n/de.po
+++ b/addons/account_voucher/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_voucher
diff --git a/addons/account_voucher/i18n/el.po b/addons/account_voucher/i18n/el.po
index e215a7841de..f235ce42b99 100644
--- a/addons/account_voucher/i18n/el.po
+++ b/addons/account_voucher/i18n/el.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_voucher
diff --git a/addons/account_voucher/i18n/es.po b/addons/account_voucher/i18n/es.po
index 70f14df853e..45e5c70f23d 100644
--- a/addons/account_voucher/i18n/es.po
+++ b/addons/account_voucher/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_voucher
diff --git a/addons/account_voucher/i18n/es_AR.po b/addons/account_voucher/i18n/es_AR.po
index adc26936924..8c5bd620fe4 100644
--- a/addons/account_voucher/i18n/es_AR.po
+++ b/addons/account_voucher/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_voucher
diff --git a/addons/account_voucher/i18n/et.po b/addons/account_voucher/i18n/et.po
index 2afb0e57cc7..e55ea6756f9 100644
--- a/addons/account_voucher/i18n/et.po
+++ b/addons/account_voucher/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_voucher
diff --git a/addons/account_voucher/i18n/fr.po b/addons/account_voucher/i18n/fr.po
index f011fa8a24a..48462599e66 100644
--- a/addons/account_voucher/i18n/fr.po
+++ b/addons/account_voucher/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_voucher
diff --git a/addons/account_voucher/i18n/hr.po b/addons/account_voucher/i18n/hr.po
index a703a2c1f73..a2409c4575b 100644
--- a/addons/account_voucher/i18n/hr.po
+++ b/addons/account_voucher/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_voucher
diff --git a/addons/account_voucher/i18n/hu.po b/addons/account_voucher/i18n/hu.po
index 3a1682e6792..a074fdb72f5 100644
--- a/addons/account_voucher/i18n/hu.po
+++ b/addons/account_voucher/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_voucher
diff --git a/addons/account_voucher/i18n/id.po b/addons/account_voucher/i18n/id.po
index 1f0aaad760c..76fab6712ac 100644
--- a/addons/account_voucher/i18n/id.po
+++ b/addons/account_voucher/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_voucher
diff --git a/addons/account_voucher/i18n/it.po b/addons/account_voucher/i18n/it.po
index b05cca359c8..8c0250703a9 100644
--- a/addons/account_voucher/i18n/it.po
+++ b/addons/account_voucher/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_voucher
diff --git a/addons/account_voucher/i18n/ko.po b/addons/account_voucher/i18n/ko.po
index 9e2ef2ed32e..e1da261edbe 100644
--- a/addons/account_voucher/i18n/ko.po
+++ b/addons/account_voucher/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_voucher
diff --git a/addons/account_voucher/i18n/lt.po b/addons/account_voucher/i18n/lt.po
index 7738a7a5df9..5ebd3f0ce84 100644
--- a/addons/account_voucher/i18n/lt.po
+++ b/addons/account_voucher/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_voucher
diff --git a/addons/account_voucher/i18n/nl.po b/addons/account_voucher/i18n/nl.po
index d27343606f0..6e74cd58ec1 100644
--- a/addons/account_voucher/i18n/nl.po
+++ b/addons/account_voucher/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_voucher
diff --git a/addons/account_voucher/i18n/nl_BE.po b/addons/account_voucher/i18n/nl_BE.po
index 63b5b92a985..57255fcdbfd 100644
--- a/addons/account_voucher/i18n/nl_BE.po
+++ b/addons/account_voucher/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_voucher
diff --git a/addons/account_voucher/i18n/pl.po b/addons/account_voucher/i18n/pl.po
index 2aa2b6fada6..8d0d5ce86ec 100644
--- a/addons/account_voucher/i18n/pl.po
+++ b/addons/account_voucher/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_voucher
diff --git a/addons/account_voucher/i18n/pt.po b/addons/account_voucher/i18n/pt.po
index fd8d0a26850..30524f1294e 100644
--- a/addons/account_voucher/i18n/pt.po
+++ b/addons/account_voucher/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_voucher
diff --git a/addons/account_voucher/i18n/pt_BR.po b/addons/account_voucher/i18n/pt_BR.po
index 70860a66dbc..a138b815ca9 100644
--- a/addons/account_voucher/i18n/pt_BR.po
+++ b/addons/account_voucher/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_voucher
diff --git a/addons/account_voucher/i18n/ro.po b/addons/account_voucher/i18n/ro.po
index fefee997270..42e5ea83fa8 100644
--- a/addons/account_voucher/i18n/ro.po
+++ b/addons/account_voucher/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_voucher
diff --git a/addons/account_voucher/i18n/ru.po b/addons/account_voucher/i18n/ru.po
index b7e3f078210..d9ad1b57de0 100644
--- a/addons/account_voucher/i18n/ru.po
+++ b/addons/account_voucher/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_voucher
diff --git a/addons/account_voucher/i18n/sl.po b/addons/account_voucher/i18n/sl.po
index 565be65d428..43b40eab80e 100644
--- a/addons/account_voucher/i18n/sl.po
+++ b/addons/account_voucher/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_voucher
diff --git a/addons/account_voucher/i18n/sr.po b/addons/account_voucher/i18n/sr.po
index d9ace1cb77b..eed04b2f024 100644
--- a/addons/account_voucher/i18n/sr.po
+++ b/addons/account_voucher/i18n/sr.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_voucher
diff --git a/addons/account_voucher/i18n/sv.po b/addons/account_voucher/i18n/sv.po
index 04895d49f02..6c917765925 100644
--- a/addons/account_voucher/i18n/sv.po
+++ b/addons/account_voucher/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_voucher
diff --git a/addons/account_voucher/i18n/tlh.po b/addons/account_voucher/i18n/tlh.po
index 4735691b437..247e4aa6fce 100644
--- a/addons/account_voucher/i18n/tlh.po
+++ b/addons/account_voucher/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_voucher
diff --git a/addons/account_voucher/i18n/tr.po b/addons/account_voucher/i18n/tr.po
index 78c031d2c0d..cb29e0b7649 100644
--- a/addons/account_voucher/i18n/tr.po
+++ b/addons/account_voucher/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_voucher
diff --git a/addons/account_voucher/i18n/uk.po b/addons/account_voucher/i18n/uk.po
index e41924567e5..f1b37a424ab 100644
--- a/addons/account_voucher/i18n/uk.po
+++ b/addons/account_voucher/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_voucher
diff --git a/addons/account_voucher/i18n/zh_CN.po b/addons/account_voucher/i18n/zh_CN.po
index 6b66f8598c0..8de15211a03 100644
--- a/addons/account_voucher/i18n/zh_CN.po
+++ b/addons/account_voucher/i18n/zh_CN.po
@@ -4,50 +4,50 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-01-23 17:16+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-03-20 07:30+0000\n"
+"Last-Translator: Black Jack \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_voucher
#: model:ir.actions.act_window,name:account_voucher.act_account_acount_move_line_open1
msgid "Opening Balance Entry"
-msgstr ""
+msgstr "期初余额凭证"
#. module: account_voucher
#: model:ir.ui.menu,name:account_voucher.menu_action_receipt_bakreceipt_voucher_list
msgid "Bank Receipts"
-msgstr ""
+msgstr "银行收入"
#. module: account_voucher
#: rml:voucher.cash_amount:0
#: rml:voucher.cash_receipt.drcr:0
msgid "Particulars"
-msgstr ""
+msgstr "细节"
#. module: account_voucher
#: rml:voucher.cash_amount:0
#: rml:voucher.cash_receipt.drcr:0
msgid "State :"
-msgstr ""
+msgstr "状态:"
#. module: account_voucher
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "在这动作定义中有无效的模块名"
#. module: account_voucher
#: rml:voucher.cash_amount:0
#: rml:voucher.cash_receipt.drcr:0
msgid "Ref. :"
-msgstr ""
+msgstr "参考:"
#. module: account_voucher
#: selection:account.move,voucher_type:0
@@ -56,12 +56,12 @@ msgstr ""
#: model:ir.actions.act_window,name:account_voucher.action_view_cont_voucher_form
#: model:ir.ui.menu,name:account_voucher.menu_action_view_cont_voucher_form
msgid "Contra Voucher"
-msgstr ""
+msgstr "反向原始凭证"
#. module: account_voucher
#: field:account.voucher,company_id:0
msgid "Company"
-msgstr ""
+msgstr "公司"
#. module: account_voucher
#: selection:account.move,voucher_type:0
@@ -69,7 +69,7 @@ msgstr ""
#: model:ir.actions.act_window,name:account_voucher.action_view_jour_voucher_form
#: model:ir.ui.menu,name:account_voucher.menu_action_view_jour_voucher_form
msgid "Journal Voucher"
-msgstr ""
+msgstr "原始凭证分类帐"
#. module: account_voucher
#: rml:voucher.cash_receipt.drcr:0
@@ -79,28 +79,28 @@ msgstr ""
#. module: account_voucher
#: view:account.voucher:0
msgid "Set to Draft"
-msgstr ""
+msgstr "设为草稿"
#. module: account_voucher
#: wizard_button:account.voucher.open,init,open:0
msgid "Open Voucher Entries"
-msgstr ""
+msgstr "打开原始凭证记录"
#. module: account_voucher
#: model:ir.model,name:account_voucher.model_account_voucher_line
msgid "Voucher Line"
-msgstr ""
+msgstr "原始凭证明细"
#. module: account_voucher
#: view:account.move:0
msgid "Total Credit"
-msgstr ""
+msgstr "贷方合计"
#. module: account_voucher
#: field:account.voucher,account_id:0
#: field:account.voucher.line,account_id:0
msgid "Account"
-msgstr ""
+msgstr "科目"
#. module: account_voucher
#: rml:voucher.cash_amount:0
@@ -110,30 +110,30 @@ msgstr ""
#. module: account_voucher
#: field:account.account,level:0
msgid "Level"
-msgstr ""
+msgstr "级"
#. module: account_voucher
#: view:account.move:0
msgid "Account Entry Line"
-msgstr ""
+msgstr "凭证明细"
#. module: account_voucher
#: view:account.move:0
msgid "Total Debit"
-msgstr ""
+msgstr "借方合计"
#. module: account_voucher
#: field:account.voucher,amount:0
#: field:account.voucher.line,amount:0
#: rml:voucher.cash_amount:0
msgid "Amount"
-msgstr ""
+msgstr "金额"
#. module: account_voucher
#: rml:voucher.cash_amount:0
#: rml:voucher.cash_receipt.drcr:0
msgid "Receiver's Signature"
-msgstr ""
+msgstr "收款人签字"
#. module: account_voucher
#: rml:voucher.cash_amount:0
@@ -145,12 +145,12 @@ msgstr ""
#: rml:voucher.cash_amount:0
#: rml:voucher.cash_receipt.drcr:0
msgid "Amount (in words) :"
-msgstr ""
+msgstr "金额:"
#. module: account_voucher
#: field:account.voucher.line,account_analytic_id:0
msgid "Analytic Account"
-msgstr ""
+msgstr "辅助核算项目"
#. module: account_voucher
#: selection:account.move,voucher_type:0
@@ -159,24 +159,24 @@ msgstr ""
#: model:ir.actions.act_window,name:account_voucher.action_view_jour_sale_voucher_form
#: model:ir.ui.menu,name:account_voucher.menu_action_view_jour_sale_voucher_form
msgid "Journal Sale Voucher"
-msgstr ""
+msgstr "销售原始凭证分类帐"
#. module: account_voucher
#: model:ir.actions.act_window,name:account_voucher.action_receipt_vou_voucher_list
#: model:ir.ui.menu,name:account_voucher.menu_action_receipt_vou_voucher_list
msgid "Receipt Vouchers"
-msgstr ""
+msgstr "收入原始凭证"
#. module: account_voucher
#: rml:voucher.cash_amount:0
msgid "Account :"
-msgstr ""
+msgstr "科目:"
#. module: account_voucher
#: rml:voucher.cash_amount:0
#: rml:voucher.cash_receipt.drcr:0
msgid "On Account of :"
-msgstr ""
+msgstr "在科目:"
#. module: account_voucher
#: model:ir.actions.act_window,name:account_voucher.action_payments_bankpay_voucher_list
@@ -184,30 +184,30 @@ msgstr ""
#: model:ir.actions.act_window,name:account_voucher.action_payments_voucher_list
#: model:ir.ui.menu,name:account_voucher.menu_action_payments_voucher_list
msgid "Payment Vouchers"
-msgstr ""
+msgstr "付款原始凭证"
#. module: account_voucher
#: view:account.voucher:0
msgid "Create"
-msgstr ""
+msgstr "创建"
#. module: account_voucher
#: selection:account.account,type1:0
#: selection:account.account.template,type1:0
msgid "None"
-msgstr ""
+msgstr "无"
#. module: account_voucher
#: field:account.voucher,number:0
msgid "Number"
-msgstr ""
+msgstr "编号"
#. module: account_voucher
#: view:account.move:0
#: field:account.voucher,state:0
#: wizard_field:account.voucher.open,init,state:0
msgid "State"
-msgstr ""
+msgstr "状态"
#. module: account_voucher
#: selection:account.account,type1:0
@@ -215,81 +215,81 @@ msgstr ""
#: selection:account.voucher.line,type:0
#: rml:voucher.cash_receipt.drcr:0
msgid "Debit"
-msgstr ""
+msgstr "借方"
#. module: account_voucher
#: field:account.voucher,type:0
#: field:account.voucher.line,type:0
msgid "Type"
-msgstr ""
+msgstr "类型"
#. module: account_voucher
#: model:ir.ui.menu,name:account_voucher.menu_action_voucher_list
msgid "Voucher Entries"
-msgstr ""
+msgstr "原始凭证记录"
#. module: account_voucher
#: rml:voucher.cash_amount:0
#: rml:voucher.cash_receipt.drcr:0
msgid "Authorised Signatory"
-msgstr ""
+msgstr "授权的签字人"
#. module: account_voucher
#: view:account.voucher:0
#: model:ir.actions.act_window,name:account_voucher.action_voucher_list
msgid "Vouchers"
-msgstr ""
+msgstr "原始凭证"
#. module: account_voucher
#: view:account.voucher:0
#: field:account.voucher.line,voucher_id:0
#: model:res.request.link,name:account_voucher.req_link_voucher
msgid "Voucher"
-msgstr ""
+msgstr "原始凭证"
#. module: account_voucher
#: wizard_view:account.voucher.open,init:0
#: model:ir.ui.menu,name:account_voucher.menu_wizard_account_voucher_open
msgid "Open Vouchers"
-msgstr ""
+msgstr "打开原始凭证"
#. module: account_voucher
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "无效XML视图结构!"
#. module: account_voucher
#: rml:voucher.cash_amount:0
#: rml:voucher.cash_receipt.drcr:0
msgid "Dated :"
-msgstr ""
+msgstr "日期:"
#. module: account_voucher
#: model:ir.ui.menu,name:account_voucher.menu_action_receipt_cashreceipt_voucher_list
msgid "Cash Receipts"
-msgstr ""
+msgstr "现金收入"
#. module: account_voucher
#: field:account.voucher,partner_id:0
#: field:account.voucher.line,partner_id:0
msgid "Partner"
-msgstr ""
+msgstr "业务伙伴"
#. module: account_voucher
#: model:ir.ui.menu,name:account_voucher.menu_action_view_bank_pay_voucher_form
msgid "New Bank Payment"
-msgstr ""
+msgstr "新的银行付款"
#. module: account_voucher
#: view:account.voucher:0
#: field:account.voucher,payment_ids:0
msgid "Voucher Lines"
-msgstr ""
+msgstr "原始凭证明细"
#. module: account_voucher
#: field:account.voucher,currency_id:0
msgid "Currency"
-msgstr ""
+msgstr "货币"
#. module: account_voucher
#: view:account.move:0
@@ -297,27 +297,27 @@ msgstr ""
#: view:account.voucher:0
#: field:account.voucher,narration:0
msgid "Narration"
-msgstr ""
+msgstr "描述"
#. module: account_voucher
#: field:account.voucher,reference:0
msgid "Voucher Reference"
-msgstr ""
+msgstr "原始凭证参考"
#. module: account_voucher
#: model:ir.ui.menu,name:account_voucher.menu_action_view_cash_rec_voucher_form
msgid "New Cash Receipt"
-msgstr ""
+msgstr "新的现金收入"
#. module: account_voucher
#: model:ir.actions.report.xml,name:account_voucher.report_account_voucher_amt
msgid "Voucher Report"
-msgstr ""
+msgstr "原始凭证报表"
#. module: account_voucher
#: field:account.account,open_bal:0
msgid "Opening Balance"
-msgstr ""
+msgstr "期初余额"
#. module: account_voucher
#: selection:account.voucher,state:0
@@ -325,38 +325,38 @@ msgstr ""
#: rml:voucher.cash_amount:0
#: rml:voucher.cash_receipt.drcr:0
msgid "Draft"
-msgstr ""
+msgstr "草稿"
#. module: account_voucher
#: rml:voucher.cash_amount:0
#: rml:voucher.cash_receipt.drcr:0
msgid "PRO-FORMA"
-msgstr ""
+msgstr "形式发票"
#. module: account_voucher
#: model:ir.actions.act_window,name:account_voucher.action_receipt_cashreceipt_voucher_list
msgid "Cash Receipt"
-msgstr ""
+msgstr "现金收入"
#. module: account_voucher
#: model:ir.ui.menu,name:account_voucher.menu_action_view_cash_pay_voucher_form
msgid "New Cash Payment"
-msgstr ""
+msgstr "新的现金付款"
#. module: account_voucher
#: view:account.move:0
msgid "Optional Information"
-msgstr ""
+msgstr "其它信息"
#. module: account_voucher
#: view:account.voucher:0
msgid "General Entries"
-msgstr ""
+msgstr "一般凭证"
#. module: account_voucher
#: field:account.voucher,date:0
msgid "Date"
-msgstr ""
+msgstr "日期"
#. module: account_voucher
#: rml:voucher.cash_amount:0
@@ -368,18 +368,18 @@ msgstr ""
#: field:account.account,type1:0
#: field:account.account.template,type1:0
msgid "Dr/Cr"
-msgstr ""
+msgstr "借/贷"
#. module: account_voucher
#: model:ir.actions.report.xml,name:account_voucher.report_account_voucher
msgid "Voucher Report (Cr/Dr)"
-msgstr ""
+msgstr "原始凭证报表(贷/借)"
#. module: account_voucher
#: field:account.move,voucher_type:0
#: wizard_field:account.voucher.open,init,type:0
msgid "Voucher Type"
-msgstr ""
+msgstr "原始凭证类型"
#. module: account_voucher
#: selection:account.account,type1:0
@@ -387,43 +387,43 @@ msgstr ""
#: selection:account.voucher.line,type:0
#: rml:voucher.cash_receipt.drcr:0
msgid "Credit"
-msgstr ""
+msgstr "贷方"
#. module: account_voucher
#: rml:voucher.cash_amount:0
#: rml:voucher.cash_receipt.drcr:0
msgid "Through :"
-msgstr ""
+msgstr "通过:"
#. module: account_voucher
#: field:account.voucher,reference_type:0
msgid "Reference Type"
-msgstr ""
+msgstr "参考类型"
#. module: account_voucher
#: model:ir.model,name:account_voucher.model_account_voucher
msgid "Accounting Voucher"
-msgstr ""
+msgstr "原始凭证"
#. module: account_voucher
#: field:account.voucher,period_id:0
msgid "Period"
-msgstr ""
+msgstr "会计期间"
#. module: account_voucher
#: model:ir.ui.menu,name:account_voucher.menu_action_payments_bankpay_voucher_list
msgid "Bank Payments"
-msgstr ""
+msgstr "银行付款"
#. module: account_voucher
#: view:account.move:0
msgid "General Information"
-msgstr ""
+msgstr "一般信息"
#. module: account_voucher
#: wizard_field:account.voucher.open,init,period_ids:0
msgid "Periods"
-msgstr ""
+msgstr "会计期间"
#. module: account_voucher
#: view:account.voucher:0
@@ -431,52 +431,52 @@ msgstr ""
#: wizard_button:account.voucher.open,init,end:0
#: selection:account.voucher.open,init,state:0
msgid "Cancel"
-msgstr ""
+msgstr "取消"
#. module: account_voucher
#: view:account.voucher:0
#: selection:account.voucher,state:0
#: selection:account.voucher.open,init,state:0
msgid "Pro-forma"
-msgstr ""
+msgstr "形式发票"
#. module: account_voucher
#: constraint:ir.model:0
msgid ""
"The Object name must start with x_ and not contain any special character !"
-msgstr ""
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
#. module: account_voucher
#: view:account.voucher:0
msgid "Other Info"
-msgstr ""
+msgstr "其它信息"
#. module: account_voucher
#: model:ir.module.module,shortdesc:account_voucher.module_meta_information
msgid "Accounting Voucher Entries"
-msgstr ""
+msgstr "原始凭证记录"
#. module: account_voucher
#: field:res.currency,sub_name:0
msgid "Sub Currency"
-msgstr ""
+msgstr "货币细分"
#. module: account_voucher
#: model:ir.actions.act_window,name:account_voucher.action_other_voucher_list
#: model:ir.ui.menu,name:account_voucher.menu_action_other_voucher_list
msgid "Other Vouchers"
-msgstr ""
+msgstr "其它原始凭证"
#. module: account_voucher
#: field:account.voucher.line,name:0
msgid "Description"
-msgstr ""
+msgstr "说明"
#. module: account_voucher
#: rml:voucher.cash_amount:0
#: rml:voucher.cash_receipt.drcr:0
msgid "Canceled"
-msgstr ""
+msgstr "取消"
#. module: account_voucher
#: selection:account.move,voucher_type:0
@@ -486,12 +486,12 @@ msgstr ""
#: rml:voucher.cash_amount:0
#: rml:voucher.cash_receipt.drcr:0
msgid "Cash Payment Voucher"
-msgstr ""
+msgstr "现金付款原始凭证"
#. module: account_voucher
#: model:ir.actions.act_window,name:account_voucher.action_receipt_bakreceipt_voucher_list
msgid "Bank Receipt"
-msgstr ""
+msgstr "银行收入"
#. module: account_voucher
#: rml:voucher.cash_amount:0
@@ -506,17 +506,17 @@ msgstr ""
#: model:ir.actions.act_window,name:account_voucher.action_view_jour_pur_voucher_form
#: model:ir.ui.menu,name:account_voucher.menu_action_view_jour_pur_voucher_form
msgid "Journal Purchase Voucher"
-msgstr ""
+msgstr "采购原始凭证分类帐"
#. module: account_voucher
#: view:account.account:0
msgid "Closing Balance"
-msgstr ""
+msgstr "期末结余"
#. module: account_voucher
#: field:account.voucher.line,ref:0
msgid "Ref."
-msgstr ""
+msgstr "参考"
#. module: account_voucher
#: selection:account.voucher,state:0
@@ -524,42 +524,42 @@ msgstr ""
#: rml:voucher.cash_amount:0
#: rml:voucher.cash_receipt.drcr:0
msgid "Posted"
-msgstr ""
+msgstr "已审核"
#. module: account_voucher
#: field:account.voucher,name:0
msgid "Name"
-msgstr ""
+msgstr "名称"
#. module: account_voucher
#: field:account.voucher,move_ids:0
msgid "Real Entry"
-msgstr ""
+msgstr "实际凭证"
#. module: account_voucher
#: model:ir.actions.wizard,name:account_voucher.wizard_account_voucher_open
msgid "Open a Voucher Entry"
-msgstr ""
+msgstr "打开一原始凭证记录"
#. module: account_voucher
#: field:account.voucher,move_id:0
msgid "Account Entry"
-msgstr ""
+msgstr "凭证"
#. module: account_voucher
#: view:account.voucher:0
msgid "Entry Lines"
-msgstr ""
+msgstr "凭证明细"
#. module: account_voucher
#: model:ir.ui.menu,name:account_voucher.menu_action_view_bank_rec_voucher_form
msgid "New Bank Receipt"
-msgstr ""
+msgstr "新的银行收入"
#. module: account_voucher
#: model:ir.ui.menu,name:account_voucher.menu_action_payments_cashpay_voucher_list
msgid "Cash Payments"
-msgstr ""
+msgstr "现金付款"
#. module: account_voucher
#: selection:account.move,voucher_type:0
@@ -569,7 +569,7 @@ msgstr ""
#: rml:voucher.cash_amount:0
#: rml:voucher.cash_receipt.drcr:0
msgid "Cash Receipt Voucher"
-msgstr ""
+msgstr "现金收入原始凭证"
#. module: account_voucher
#: selection:account.move,voucher_type:0
@@ -579,7 +579,7 @@ msgstr ""
#: rml:voucher.cash_amount:0
#: rml:voucher.cash_receipt.drcr:0
msgid "Bank Payment Voucher"
-msgstr ""
+msgstr "银行付款原始凭证"
#. module: account_voucher
#: selection:account.move,voucher_type:0
@@ -589,10 +589,10 @@ msgstr ""
#: rml:voucher.cash_amount:0
#: rml:voucher.cash_receipt.drcr:0
msgid "Bank Receipt Voucher"
-msgstr ""
+msgstr "银行收入原始凭证"
#. module: account_voucher
#: field:account.account,journal_id:0
#: field:account.voucher,journal_id:0
msgid "Journal"
-msgstr ""
+msgstr "分类帐"
diff --git a/addons/account_voucher/i18n/zh_TW.po b/addons/account_voucher/i18n/zh_TW.po
index 4e3127c1084..6d82c9ec000 100644
--- a/addons/account_voucher/i18n/zh_TW.po
+++ b/addons/account_voucher/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_voucher
diff --git a/addons/analytic_journal_billing_rate/i18n/ar.po b/addons/analytic_journal_billing_rate/i18n/ar.po
index 5e05b257ee4..30ad37bff7a 100644
--- a/addons/analytic_journal_billing_rate/i18n/ar.po
+++ b/addons/analytic_journal_billing_rate/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/bg.po b/addons/analytic_journal_billing_rate/i18n/bg.po
index 5797de3e339..aa3fc999354 100644
--- a/addons/analytic_journal_billing_rate/i18n/bg.po
+++ b/addons/analytic_journal_billing_rate/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/bs.po b/addons/analytic_journal_billing_rate/i18n/bs.po
index c415ce43e7e..735f5cf57e7 100644
--- a/addons/analytic_journal_billing_rate/i18n/bs.po
+++ b/addons/analytic_journal_billing_rate/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/ca.po b/addons/analytic_journal_billing_rate/i18n/ca.po
index 99639e27288..aa57fdd5b48 100644
--- a/addons/analytic_journal_billing_rate/i18n/ca.po
+++ b/addons/analytic_journal_billing_rate/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/cs.po b/addons/analytic_journal_billing_rate/i18n/cs.po
index 5e05b257ee4..30ad37bff7a 100644
--- a/addons/analytic_journal_billing_rate/i18n/cs.po
+++ b/addons/analytic_journal_billing_rate/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/de.po b/addons/analytic_journal_billing_rate/i18n/de.po
index 4a92756147c..6bd9903387d 100644
--- a/addons/analytic_journal_billing_rate/i18n/de.po
+++ b/addons/analytic_journal_billing_rate/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/el.po b/addons/analytic_journal_billing_rate/i18n/el.po
index 609715343b1..d3319f67748 100644
--- a/addons/analytic_journal_billing_rate/i18n/el.po
+++ b/addons/analytic_journal_billing_rate/i18n/el.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/es.po b/addons/analytic_journal_billing_rate/i18n/es.po
index 20b81d58713..a1f682c220a 100644
--- a/addons/analytic_journal_billing_rate/i18n/es.po
+++ b/addons/analytic_journal_billing_rate/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/es_AR.po b/addons/analytic_journal_billing_rate/i18n/es_AR.po
index 774db1a9aa1..ed67a339178 100644
--- a/addons/analytic_journal_billing_rate/i18n/es_AR.po
+++ b/addons/analytic_journal_billing_rate/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/et.po b/addons/analytic_journal_billing_rate/i18n/et.po
index bfe3a67ab36..710925c258e 100644
--- a/addons/analytic_journal_billing_rate/i18n/et.po
+++ b/addons/analytic_journal_billing_rate/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/fr.po b/addons/analytic_journal_billing_rate/i18n/fr.po
index 37aa9bb54ee..d0940898423 100644
--- a/addons/analytic_journal_billing_rate/i18n/fr.po
+++ b/addons/analytic_journal_billing_rate/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/gl.po b/addons/analytic_journal_billing_rate/i18n/gl.po
index 92ce77a4236..491644215c1 100644
--- a/addons/analytic_journal_billing_rate/i18n/gl.po
+++ b/addons/analytic_journal_billing_rate/i18n/gl.po
@@ -15,7 +15,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/hr.po b/addons/analytic_journal_billing_rate/i18n/hr.po
index cd08f80d26e..15fa3a27259 100644
--- a/addons/analytic_journal_billing_rate/i18n/hr.po
+++ b/addons/analytic_journal_billing_rate/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/hu.po b/addons/analytic_journal_billing_rate/i18n/hu.po
index 5e05b257ee4..30ad37bff7a 100644
--- a/addons/analytic_journal_billing_rate/i18n/hu.po
+++ b/addons/analytic_journal_billing_rate/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/id.po b/addons/analytic_journal_billing_rate/i18n/id.po
index 5d31d4a56f3..5a2b6577e27 100644
--- a/addons/analytic_journal_billing_rate/i18n/id.po
+++ b/addons/analytic_journal_billing_rate/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/it.po b/addons/analytic_journal_billing_rate/i18n/it.po
index afd15869c95..154fe2f4a1d 100644
--- a/addons/analytic_journal_billing_rate/i18n/it.po
+++ b/addons/analytic_journal_billing_rate/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/ko.po b/addons/analytic_journal_billing_rate/i18n/ko.po
index 0d24999112f..8669a629e93 100644
--- a/addons/analytic_journal_billing_rate/i18n/ko.po
+++ b/addons/analytic_journal_billing_rate/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/lt.po b/addons/analytic_journal_billing_rate/i18n/lt.po
index 477f60064f2..eb75b54c989 100644
--- a/addons/analytic_journal_billing_rate/i18n/lt.po
+++ b/addons/analytic_journal_billing_rate/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/nl.po b/addons/analytic_journal_billing_rate/i18n/nl.po
index 941e6f6f688..ac1bb683fd8 100644
--- a/addons/analytic_journal_billing_rate/i18n/nl.po
+++ b/addons/analytic_journal_billing_rate/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/nl_BE.po b/addons/analytic_journal_billing_rate/i18n/nl_BE.po
index df170eac537..aa59c529211 100644
--- a/addons/analytic_journal_billing_rate/i18n/nl_BE.po
+++ b/addons/analytic_journal_billing_rate/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/pl.po b/addons/analytic_journal_billing_rate/i18n/pl.po
index e84a1918280..985a1589694 100644
--- a/addons/analytic_journal_billing_rate/i18n/pl.po
+++ b/addons/analytic_journal_billing_rate/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/pt.po b/addons/analytic_journal_billing_rate/i18n/pt.po
index fd64148e83f..efb40a3f0ac 100644
--- a/addons/analytic_journal_billing_rate/i18n/pt.po
+++ b/addons/analytic_journal_billing_rate/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/pt_BR.po b/addons/analytic_journal_billing_rate/i18n/pt_BR.po
index 040d6b01bfd..a57a7d2e632 100644
--- a/addons/analytic_journal_billing_rate/i18n/pt_BR.po
+++ b/addons/analytic_journal_billing_rate/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/ro.po b/addons/analytic_journal_billing_rate/i18n/ro.po
index 2d1830705d9..6b88e0c34a4 100644
--- a/addons/analytic_journal_billing_rate/i18n/ro.po
+++ b/addons/analytic_journal_billing_rate/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/ru.po b/addons/analytic_journal_billing_rate/i18n/ru.po
index a4a4fe32be3..155f1ae7eee 100644
--- a/addons/analytic_journal_billing_rate/i18n/ru.po
+++ b/addons/analytic_journal_billing_rate/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/sl.po b/addons/analytic_journal_billing_rate/i18n/sl.po
index aed6fe5117d..9674880f2bb 100644
--- a/addons/analytic_journal_billing_rate/i18n/sl.po
+++ b/addons/analytic_journal_billing_rate/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/sv.po b/addons/analytic_journal_billing_rate/i18n/sv.po
index 2c07cc0789c..36b3b698058 100644
--- a/addons/analytic_journal_billing_rate/i18n/sv.po
+++ b/addons/analytic_journal_billing_rate/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/tlh.po b/addons/analytic_journal_billing_rate/i18n/tlh.po
index f9bd1161732..4b694d34c41 100644
--- a/addons/analytic_journal_billing_rate/i18n/tlh.po
+++ b/addons/analytic_journal_billing_rate/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/tr.po b/addons/analytic_journal_billing_rate/i18n/tr.po
index 9d6f2c856b3..a49a0dbb3d2 100644
--- a/addons/analytic_journal_billing_rate/i18n/tr.po
+++ b/addons/analytic_journal_billing_rate/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/uk.po b/addons/analytic_journal_billing_rate/i18n/uk.po
index 0161f5b759c..17d52275623 100644
--- a/addons/analytic_journal_billing_rate/i18n/uk.po
+++ b/addons/analytic_journal_billing_rate/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/zh_CN.po b/addons/analytic_journal_billing_rate/i18n/zh_CN.po
index 76149e194b0..f22e1be37d3 100644
--- a/addons/analytic_journal_billing_rate/i18n/zh_CN.po
+++ b/addons/analytic_journal_billing_rate/i18n/zh_CN.po
@@ -4,60 +4,82 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-01-23 16:15+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-03-20 07:31+0000\n"
+"Last-Translator: Black Jack \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_journal_billing_rate
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "无效的视图结构XML文件!"
#. module: analytic_journal_billing_rate
#: field:analytic_journal_rate_grid,journal_id:0
msgid "Analytic Journal"
-msgstr ""
+msgstr "辅助核算分类帐"
#. module: analytic_journal_billing_rate
#: constraint:ir.model:0
msgid ""
"The Object name must start with x_ and not contain any special character !"
-msgstr ""
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
#. module: analytic_journal_billing_rate
#: view:analytic_journal_rate_grid:0
msgid "Billing Rate per Journal for this Analytic Account"
-msgstr ""
+msgstr "这辅助核算项分类帐的开单价"
#. module: analytic_journal_billing_rate
#: field:analytic_journal_rate_grid,account_id:0
msgid "Analytic Account"
-msgstr ""
+msgstr "辅助核算项"
#. module: analytic_journal_billing_rate
#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
msgid "Relation table between journals and billing rates"
-msgstr ""
+msgstr "分类帐和开单价的关系表"
#. module: analytic_journal_billing_rate
#: field:account.analytic.account,journal_rate_ids:0
msgid "Invoicing Rate per Journal"
-msgstr ""
+msgstr "每个分类帐的计价折扣"
#. module: analytic_journal_billing_rate
#: model:ir.module.module,shortdesc:analytic_journal_billing_rate.module_meta_information
msgid "Analytic Journal Billing Rate"
-msgstr ""
+msgstr "辅助核算分类帐的开单价"
#. module: analytic_journal_billing_rate
#: field:analytic_journal_rate_grid,rate_id:0
msgid "Invoicing Rate"
-msgstr ""
+msgstr "计价折扣"
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ " This module allows you to define what is the default invoicing rate for "
+#~ "a specific journal on a given account. This is mostly used when a user "
+#~ "encode his timesheet: the values are retrieved and the fields are auto-"
+#~ "filled... but the possibility to change these values is still available.\n"
+#~ "\n"
+#~ " Obviously if no data has been recorded for the current account, the "
+#~ "default value is given as usual by the account data so that this module is "
+#~ "perfectly compatible with older configurations.\n"
+#~ "\n"
+#~ " "
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ " 这模块允许你定义指定分类帐里规定科目的默认开发票价格.这主要用于在时间表的用户代码:这值是自动计算和自动填写的字段,但可以修改这值. \n"
+#~ " \n"
+#~ " 显然,如果当前的科目没有记录的数据,默认的值是作为正常科目数据,所以这模块是完全兼容旧的设置\n"
+#~ "\n"
+#~ " "
diff --git a/addons/analytic_journal_billing_rate/i18n/zh_TW.po b/addons/analytic_journal_billing_rate/i18n/zh_TW.po
index bf87a6dbc4c..c07dce7313d 100644
--- a/addons/analytic_journal_billing_rate/i18n/zh_TW.po
+++ b/addons/analytic_journal_billing_rate/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_journal_billing_rate
diff --git a/addons/analytic_user_function/i18n/ar.po b/addons/analytic_user_function/i18n/ar.po
index efe0b930f81..13979ecab5e 100644
--- a/addons/analytic_user_function/i18n/ar.po
+++ b/addons/analytic_user_function/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_user_function
diff --git a/addons/analytic_user_function/i18n/bg.po b/addons/analytic_user_function/i18n/bg.po
index 90d66755b90..86f57c254d0 100644
--- a/addons/analytic_user_function/i18n/bg.po
+++ b/addons/analytic_user_function/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_user_function
diff --git a/addons/analytic_user_function/i18n/bs.po b/addons/analytic_user_function/i18n/bs.po
index 11afefde432..34c2a7acf25 100644
--- a/addons/analytic_user_function/i18n/bs.po
+++ b/addons/analytic_user_function/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_user_function
diff --git a/addons/analytic_user_function/i18n/ca.po b/addons/analytic_user_function/i18n/ca.po
index dc6037f7377..098e91b78bf 100644
--- a/addons/analytic_user_function/i18n/ca.po
+++ b/addons/analytic_user_function/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_user_function
diff --git a/addons/analytic_user_function/i18n/cs.po b/addons/analytic_user_function/i18n/cs.po
index af777f01608..5b64cf6f042 100644
--- a/addons/analytic_user_function/i18n/cs.po
+++ b/addons/analytic_user_function/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_user_function
diff --git a/addons/analytic_user_function/i18n/de.po b/addons/analytic_user_function/i18n/de.po
index d45b2bcd4e8..844af118a6f 100644
--- a/addons/analytic_user_function/i18n/de.po
+++ b/addons/analytic_user_function/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_user_function
diff --git a/addons/analytic_user_function/i18n/el.po b/addons/analytic_user_function/i18n/el.po
index e8a8aa4c96e..eaf9b142d98 100644
--- a/addons/analytic_user_function/i18n/el.po
+++ b/addons/analytic_user_function/i18n/el.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_user_function
diff --git a/addons/analytic_user_function/i18n/es.po b/addons/analytic_user_function/i18n/es.po
index 80ab67091ae..293a2661987 100644
--- a/addons/analytic_user_function/i18n/es.po
+++ b/addons/analytic_user_function/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_user_function
diff --git a/addons/analytic_user_function/i18n/es_AR.po b/addons/analytic_user_function/i18n/es_AR.po
index 7bf2da2bfbd..c2bd4e9d196 100644
--- a/addons/analytic_user_function/i18n/es_AR.po
+++ b/addons/analytic_user_function/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_user_function
diff --git a/addons/analytic_user_function/i18n/et.po b/addons/analytic_user_function/i18n/et.po
index 87339686ddf..2fd92590d58 100644
--- a/addons/analytic_user_function/i18n/et.po
+++ b/addons/analytic_user_function/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_user_function
diff --git a/addons/analytic_user_function/i18n/fr.po b/addons/analytic_user_function/i18n/fr.po
index 1f831b601b6..8b38f6f5f28 100644
--- a/addons/analytic_user_function/i18n/fr.po
+++ b/addons/analytic_user_function/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_user_function
diff --git a/addons/analytic_user_function/i18n/gl.po b/addons/analytic_user_function/i18n/gl.po
index 4a04aa103fd..9319bf4e125 100644
--- a/addons/analytic_user_function/i18n/gl.po
+++ b/addons/analytic_user_function/i18n/gl.po
@@ -15,7 +15,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_user_function
diff --git a/addons/analytic_user_function/i18n/hr.po b/addons/analytic_user_function/i18n/hr.po
index d458ac939a6..e3f0ad4eaca 100644
--- a/addons/analytic_user_function/i18n/hr.po
+++ b/addons/analytic_user_function/i18n/hr.po
@@ -1,64 +1,66 @@
# Translation of OpenERP Server.
# This file contains the translation of the following modules:
-# * analytic_user_function
-#
+# * analytic_user_function
+# Drazen Bosak , 2010.
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 15:12+0000\n"
-"Last-Translator: Ivica Perić \n"
-"Language-Team: \n"
+"PO-Revision-Date: 2010-03-25 00:56+0000\n"
+"Last-Translator: Drazen Bosak \n"
+"Language-Team: Vinteh\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
+"Language: hr\n"
#. module: analytic_user_function
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Nepravilan XML format za View Architecture!"
#. module: analytic_user_function
#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
msgid "Relation table between users and products on a analytic account"
-msgstr ""
+msgstr "Vza između korisnika i proizvoda kod Analitičkog konta."
#. module: analytic_user_function
#: field:analytic_user_funct_grid,product_id:0
msgid "Product"
-msgstr ""
+msgstr "Proizvod"
#. module: analytic_user_function
#: field:analytic_user_funct_grid,account_id:0
msgid "Analytic Account"
-msgstr ""
+msgstr "Analitički Konto"
#. module: analytic_user_function
#: view:account.analytic.account:0
#: field:account.analytic.account,user_product_ids:0
msgid "Users/Products Rel."
-msgstr ""
+msgstr "veza Korisnici/Proizvodi"
#. module: analytic_user_function
#: field:analytic_user_funct_grid,user_id:0
msgid "User"
-msgstr ""
+msgstr "Korisnik"
#. module: analytic_user_function
#: constraint:ir.model:0
msgid ""
"The Object name must start with x_ and not contain any special character !"
msgstr ""
+"Naziv Objekta mora početi s x_ i ne smije sadržavati bilo koji posebni znak !"
#. module: analytic_user_function
#: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
msgid "Analytic User Function"
-msgstr ""
+msgstr "Funkcija Analitičkog Korisnika"
#. module: analytic_user_function
#: view:analytic_user_funct_grid:0
msgid "User's Product for this Analytic Account"
-msgstr ""
+msgstr "Korisnikov Proizvod za ovaj Analitički konto."
diff --git a/addons/analytic_user_function/i18n/hu.po b/addons/analytic_user_function/i18n/hu.po
index efe0b930f81..13979ecab5e 100644
--- a/addons/analytic_user_function/i18n/hu.po
+++ b/addons/analytic_user_function/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_user_function
diff --git a/addons/analytic_user_function/i18n/id.po b/addons/analytic_user_function/i18n/id.po
index 1b5acfa6e23..b9210646d74 100644
--- a/addons/analytic_user_function/i18n/id.po
+++ b/addons/analytic_user_function/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_user_function
diff --git a/addons/analytic_user_function/i18n/it.po b/addons/analytic_user_function/i18n/it.po
index b81282f13e2..081e5329c52 100644
--- a/addons/analytic_user_function/i18n/it.po
+++ b/addons/analytic_user_function/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_user_function
diff --git a/addons/analytic_user_function/i18n/ko.po b/addons/analytic_user_function/i18n/ko.po
index f1175d58d21..f712ef2ba23 100644
--- a/addons/analytic_user_function/i18n/ko.po
+++ b/addons/analytic_user_function/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_user_function
diff --git a/addons/analytic_user_function/i18n/lt.po b/addons/analytic_user_function/i18n/lt.po
index ec7754da59a..cc6d51e3aba 100644
--- a/addons/analytic_user_function/i18n/lt.po
+++ b/addons/analytic_user_function/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_user_function
diff --git a/addons/analytic_user_function/i18n/nl.po b/addons/analytic_user_function/i18n/nl.po
index 86e098c11b0..64966f881ed 100644
--- a/addons/analytic_user_function/i18n/nl.po
+++ b/addons/analytic_user_function/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_user_function
diff --git a/addons/analytic_user_function/i18n/pl.po b/addons/analytic_user_function/i18n/pl.po
index cfdb6e5c4cc..6d049f567a9 100644
--- a/addons/analytic_user_function/i18n/pl.po
+++ b/addons/analytic_user_function/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_user_function
diff --git a/addons/analytic_user_function/i18n/pt.po b/addons/analytic_user_function/i18n/pt.po
index c2ce6cb3f0a..b61265d82b5 100644
--- a/addons/analytic_user_function/i18n/pt.po
+++ b/addons/analytic_user_function/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_user_function
diff --git a/addons/analytic_user_function/i18n/pt_BR.po b/addons/analytic_user_function/i18n/pt_BR.po
index a96c958e23d..be35271e628 100644
--- a/addons/analytic_user_function/i18n/pt_BR.po
+++ b/addons/analytic_user_function/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_user_function
diff --git a/addons/analytic_user_function/i18n/ro.po b/addons/analytic_user_function/i18n/ro.po
index be670e3d6b0..2b697c2c1ae 100644
--- a/addons/analytic_user_function/i18n/ro.po
+++ b/addons/analytic_user_function/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_user_function
diff --git a/addons/analytic_user_function/i18n/ru.po b/addons/analytic_user_function/i18n/ru.po
index ec17e688415..4620d48fa44 100644
--- a/addons/analytic_user_function/i18n/ru.po
+++ b/addons/analytic_user_function/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_user_function
diff --git a/addons/analytic_user_function/i18n/sk.po b/addons/analytic_user_function/i18n/sk.po
index 82500456def..05c2f2561a7 100644
--- a/addons/analytic_user_function/i18n/sk.po
+++ b/addons/analytic_user_function/i18n/sk.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_user_function
diff --git a/addons/analytic_user_function/i18n/sl.po b/addons/analytic_user_function/i18n/sl.po
index edfa58692cb..aa83b3b293f 100644
--- a/addons/analytic_user_function/i18n/sl.po
+++ b/addons/analytic_user_function/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_user_function
diff --git a/addons/analytic_user_function/i18n/sv.po b/addons/analytic_user_function/i18n/sv.po
index 167e1d792a4..30a60964808 100644
--- a/addons/analytic_user_function/i18n/sv.po
+++ b/addons/analytic_user_function/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_user_function
diff --git a/addons/analytic_user_function/i18n/tlh.po b/addons/analytic_user_function/i18n/tlh.po
index b45e87eba14..fbb9bfbccbb 100644
--- a/addons/analytic_user_function/i18n/tlh.po
+++ b/addons/analytic_user_function/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_user_function
diff --git a/addons/analytic_user_function/i18n/tr.po b/addons/analytic_user_function/i18n/tr.po
index cab63294ac0..ca5b53c8be8 100644
--- a/addons/analytic_user_function/i18n/tr.po
+++ b/addons/analytic_user_function/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_user_function
diff --git a/addons/analytic_user_function/i18n/uk.po b/addons/analytic_user_function/i18n/uk.po
index 3d617b0a2ae..7fdcf6b48ca 100644
--- a/addons/analytic_user_function/i18n/uk.po
+++ b/addons/analytic_user_function/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_user_function
diff --git a/addons/analytic_user_function/i18n/zh_CN.po b/addons/analytic_user_function/i18n/zh_CN.po
index bb9a703d859..f8df542b6e5 100644
--- a/addons/analytic_user_function/i18n/zh_CN.po
+++ b/addons/analytic_user_function/i18n/zh_CN.po
@@ -4,27 +4,27 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-01-23 16:16+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-03-20 07:31+0000\n"
+"Last-Translator: Black Jack \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_user_function
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
-msgstr "无效的 XML 视图架构!"
+msgstr "无效的视图结构XML文件!"
#. module: analytic_user_function
#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
msgid "Relation table between users and products on a analytic account"
-msgstr "分析账户中用户和产品之间的关系表"
+msgstr "用在有关系的用户和产品的辅助核算项"
#. module: analytic_user_function
#: field:analytic_user_funct_grid,product_id:0
@@ -34,13 +34,13 @@ msgstr "产品"
#. module: analytic_user_function
#: field:analytic_user_funct_grid,account_id:0
msgid "Analytic Account"
-msgstr "分析科目"
+msgstr "辅助核算项"
#. module: analytic_user_function
#: view:account.analytic.account:0
#: field:account.analytic.account,user_product_ids:0
msgid "Users/Products Rel."
-msgstr ""
+msgstr "用户/相关产品"
#. module: analytic_user_function
#: field:analytic_user_funct_grid,user_id:0
@@ -51,14 +51,36 @@ msgstr "用户"
#: constraint:ir.model:0
msgid ""
"The Object name must start with x_ and not contain any special character !"
-msgstr "对象名必须以“x_”开始且不能包含任何特殊字符!"
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
#. module: analytic_user_function
#: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
msgid "Analytic User Function"
-msgstr "分析用户的作用"
+msgstr "辅助核算用的函数"
#. module: analytic_user_function
#: view:analytic_user_funct_grid:0
msgid "User's Product for this Analytic Account"
-msgstr "这个分析账户使用者的产品"
+msgstr "用户的产品辅助核算项"
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ " This module allows you to define what is the default function of a "
+#~ "specific user on a given account. This is mostly used when a user encode his "
+#~ "timesheet: the values are retrieved and the fields are auto-filled... but "
+#~ "the possibility to change these values is still available.\n"
+#~ "\n"
+#~ " Obviously if no data has been recorded for the current account, the "
+#~ "default value is given as usual by the employee data so that this module is "
+#~ "perfectly compatible with older configurations.\n"
+#~ "\n"
+#~ " "
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ " 这模块允许你定义在特定科目的默认功能.这主要用于在时间表的用户代码:这值是自动计算和自动填写的字段,但可以修改这值.\n"
+#~ " \n"
+#~ " 显然,如果当前的科目没有记录的数据,默认的值是作为正常科目数据,所以这模块是完全兼容旧的设置\n"
+#~ "\n"
+#~ " "
diff --git a/addons/analytic_user_function/i18n/zh_TW.po b/addons/analytic_user_function/i18n/zh_TW.po
index d1888518afe..4e781171788 100644
--- a/addons/analytic_user_function/i18n/zh_TW.po
+++ b/addons/analytic_user_function/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:14+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_user_function
diff --git a/addons/association/__terp__.py b/addons/association/__terp__.py
index 29eeb474d9c..43f61ed2392 100644
--- a/addons/association/__terp__.py
+++ b/addons/association/__terp__.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL ().
#
@@ -15,7 +15,7 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
#
##############################################################################
@@ -24,7 +24,7 @@
'name': 'Association profile',
'version': '0.1',
'category': 'Profile',
- 'description': """Profile for Associates""",
+ 'description': """This module is to create Profile for Associates""",
'author': 'Tiny',
'depends': ['membership', 'board_association'],
'update_xml': ['security/ir.model.access.csv', 'profile_association.xml'],
diff --git a/addons/auction/__terp__.py b/addons/auction/__terp__.py
index 83064640266..8918a6394aa 100644
--- a/addons/auction/__terp__.py
+++ b/addons/auction/__terp__.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL ().
#
@@ -15,7 +15,7 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
#
##############################################################################
@@ -24,16 +24,35 @@
'name': 'Auction Management',
'version': '1.0',
'category': 'Generic Modules/Auction',
- 'description': """This module provides functionality to
- manage artists, articles, sellers, buyers and auction.
- Manage bids, track of sold, paid and unpaid objects.
- Delivery Management.
+ 'description': """
+ This module manages the records of the artists,
+ the articles to be put up for auction,the buyers and
+ sellers.
+
+ It completely manages an auction such as managing bids,
+ keeping track of the sold articles along with the paid
+ and unpaid objects including delivery of the articles.
""",
'author': 'Tiny',
'depends': ['base', 'account', 'hr_attendance'],
'init_xml': ['auction_sequence.xml'],
'update_xml': [
'security/ir.model.access.csv',
+# 'wizard/auction_lots_cancel_view.xml',
+# 'wizard/auction_transfer_unsold_object_view.xml',
+ 'wizard/auction_lots_able_view.xml',
+ 'wizard/auction_lots_enable_view.xml',
+ 'wizard/auction_lots_make_invoice_buyer_view.xml',
+ 'wizard/auction_lots_make_invoice_view.xml',
+ 'wizard/auction_taken_view.xml',
+ 'wizard/auction_lots_auction_move_view.xml',
+ 'wizard/auction_pay_buy_view.xml',
+ 'wizard/auction_payer_sel_view.xml',
+ 'wizard/auction_lots_sms_send_view.xml',
+ 'wizard/auction_catalog_flagey_view.xml',
+# 'wizard/auction_aie_send_result_view.xml',
+ 'wizard/auction_lots_buyer_map_view.xml',
+
'auction_view.xml',
'auction_report.xml',
'auction_wizard.xml'
diff --git a/addons/auction/auction.py b/addons/auction/auction.py
index 0ece4690d9f..cf5f27775df 100644
--- a/addons/auction/auction.py
+++ b/addons/auction/auction.py
@@ -95,15 +95,17 @@ class auction_dates(osv.osv):
RETURN: True
"""
# objects vendus mais non factures
+ #TODO: convert this query to tiny API
+ lots_obj = self.pool.get('auction.lots')
cr.execute('select count(*) as c from auction_lots where auction_id =ANY(%s) and state=%s and obj_price>0', (ids,'draft',))
nbr = cr.fetchone()[0]
ach_uids = {}
cr.execute('select id from auction_lots where auction_id =ANY(%s) and state=%s and obj_price>0', (ids,'draft',))
- r=self.pool.get('auction.lots').lots_invoice(cr, uid, [x[0] for x in cr.fetchall()],{},None)
+ r = lots_obj.lots_invoice(cr, uid, [x[0] for x in cr.fetchall()],{},None)
cr.execute('select id from auction_lots where auction_id =ANY(%s) and obj_price>0',(ids,))
ids2 = [x[0] for x in cr.fetchall()]
# for auction in auction_ids:
- c=self.pool.get('auction.lots').seller_trans_create(cr, uid, ids2,{})
+ c = lots_obj.seller_trans_create(cr, uid, ids2,{})
self.write(cr, uid, ids, {'state':'closed'}) #close the auction
return True
auction_dates()
@@ -478,13 +480,13 @@ class auction_lots(osv.osv):
result = [ (r['id'], str(r['obj_num'])+' - '+r['name']) for r in self.read(cr, user, ids, ['name','obj_num'])]
return result
- def name_search(self, cr, user, name, args=[], operator='ilike', context={}):
- try:
- ids = self.search(cr, user, [('obj_num','=',int(name))]+ args)
- except:
- ids = []
+ def name_search(self, cr, user, name, args=None, operator='ilike', context={}):
+ if not args:
+ args = []
+
+ ids = self.search(cr, user, [('obj_num','=',int(name))] + args)
if not ids:
- ids = self.search(cr, user, [('name',operator,name)]+ args)
+ ids = self.search(cr, user, [('name',operator,name)] + args)
return self.name_get(cr, user, ids)
def _sum_taxes_by_type_and_id(self, taxes):
@@ -508,14 +510,14 @@ class auction_lots(osv.osv):
##CHECKME: est-ce que ca vaudrait la peine de faire des groupes de lots qui ont les memes couts pour passer des listes de lots a compute?
taxes = []
amount=0.0
- # pt_tax=pool.get('account.tax')
+ pt_tax = self.pool.get('account.tax')
for lot in lots:
taxes = lot.product_id.taxes_id
if lot.author_right:
taxes.append(lot.author_right)
elif lot.auction_id:
taxes += lot.auction_id.buyer_costs
- tax=self.pool.get('account.tax').compute(cr,uid,taxes,lot.obj_price,1)
+ tax=pt_tax.compute(cr,uid,taxes,lot.obj_price,1)
for t in tax:
amount+=t['amount']
#amount+=lot.obj_price*0.2
@@ -630,18 +632,20 @@ class auction_lots(osv.osv):
def buyer_proforma(self,cr,uid,ids,context):
invoices = {}
- inv_ref=self.pool.get('account.invoice')
+ inv_ref = self.pool.get('account.invoice')
+ partner_r = self.pool.get('res.partner')
+ inv_line_obj = self.pool.get('account.invoice.line')
+ wf_service = netsvc.LocalService('workflow')
# acc_receiv=self.pool.get('account.account').search([cr,uid,[('code','=','4010')]])
for lot in self.browse(cr,uid,ids,context):
if not lot.obj_price>0:
continue
- partner_r=self.pool.get('res.partner')
if not lot.ach_uid.id:
raise orm.except_orm(_('Missed buyer !'), _('The object "%s" has no buyer assigned.') % (lot.name,))
else:
partner_ref =lot.ach_uid.id
lot_name = lot.obj_num
- res = self.pool.get('res.partner').address_get(cr, uid, [partner_ref], ['contact', 'invoice'])
+ res = partner_r.address_get(cr, uid, [partner_ref], ['contact', 'invoice'])
contact_addr_id = res['contact']
invoice_addr_id = res['invoice']
if not invoice_addr_id:
@@ -675,12 +679,11 @@ class auction_lots(osv.osv):
'account_id': lot.auction_id.acc_income.id,
'price_unit': lot.obj_price,
}
- self.pool.get('account.invoice.line').create(cr, uid, inv_line,context)
+ inv_line_obj.create(cr, uid, inv_line,context)
# inv_ref.button_compute(cr, uid, [inv_id])
# wf_service = netsvc.LocalService('workflow')
# wf_service.trg_validate(uid, 'account.invoice', inv_id, 'invoice_open', cr)
inv_ref.button_compute(cr, uid, invoice.values())
- wf_service = netsvc.LocalService('workflow')
wf_service.trg_validate(uid, 'account.invoice', inv_id, 'invoice_proforma', cr)
return invoices.values()
@@ -694,6 +697,9 @@ class auction_lots(osv.osv):
# use each list of object in turn
invoices = {}
inv_ref=self.pool.get('account.invoice')
+ partner_obj = self.pool.get('res.partner')
+ inv_line_obj = self.pool.get('account.invoice.line')
+ wf_service = netsvc.LocalService('workflow')
for lot in self.browse(cr,uid,ids,context):
partner_id = lot.bord_vnd_id.partner_id.id
if not lot.auction_id.id:
@@ -702,7 +708,7 @@ class auction_lots(osv.osv):
if lot.bord_vnd_id.id in invoices:
inv_id = invoices[lot.bord_vnd_id.id]
else:
- res = self.pool.get('res.partner').address_get(cr, uid, [lot.bord_vnd_id.partner_id.id], ['contact', 'invoice'])
+ res = partner_obj.address_get(cr, uid, [lot.bord_vnd_id.partner_id.id], ['contact', 'invoice'])
contact_addr_id = res['contact']
invoice_addr_id = res['invoice']
inv = {
@@ -734,13 +740,12 @@ class auction_lots(osv.osv):
'account_id': lot.auction_id.acc_expense.id,
'price_unit': lot.obj_price,
}
- self.pool.get('account.invoice.line').create(cr, uid, inv_line,context)
+ inv_line_obj.create(cr, uid, inv_line,context)
inv_ref.button_compute(cr, uid, invoices.values())
for inv in inv_ref.browse(cr, uid, invoices.values(), context):
inv_ref.write(cr, uid, [inv.id], {
'check_total': inv.amount_total
})
- wf_service = netsvc.LocalService('workflow')
wf_service.trg_validate(uid, 'account.invoice', inv.id, 'invoice_open', cr)
return invoices.values()
@@ -756,13 +761,15 @@ class auction_lots(osv.osv):
RETURN: id of generated invoice
"""
dt = time.strftime('%Y-%m-%d')
- inv_ref=self.pool.get('account.invoice')
+ inv_ref = self.pool.get('account.invoice')
+ partner_r = self.pool.get('res.partner')
+ inv_line_obj = self.pool.get('account.invoice.line')
+ wf_service = netsvc.LocalService('workflow')
invoices={}
for lot in self.browse(cr, uid, ids,context):
# partner_ref = lot.ach_uid.id
if not lot.auction_id.id:
continue
- partner_r=self.pool.get('res.partner')
if not lot.ach_uid.id:
raise orm.except_orm(_('Missed buyer !'), _('The object "%s" has no buyer assigned.') % (lot.name,))
if (lot.auction_id.id,lot.ach_uid.id) in invoices:
@@ -773,13 +780,12 @@ class auction_lots(osv.osv):
raise orm.except_orm(_('Missed Address !'), _('The Buyer has no Invoice Address.'))
price = lot.obj_price or 0.0
lot_name =lot.obj_num
- inv={
+ inv = {
'name':lot.auction_id.name or '',
'reference': lot.ach_login,
'journal_id': lot.auction_id.journal_id.id,
'partner_id': lot.ach_uid.id,
'type': 'out_invoice',
-
}
if invoice_number:
inv['number'] = invoice_number
@@ -804,12 +810,11 @@ class auction_lots(osv.osv):
'account_id': lot.auction_id.acc_income.id,
'price_unit': lot.obj_price,
}
- self.pool.get('account.invoice.line').create(cr, uid, inv_line,context)
+ inv_line_obj.create(cr, uid, inv_line,context)
# inv_ref.button_compute(cr, uid, [inpq tu dis cav_id])
# inv_ref.button_compute(cr, uid, [inv_id])
inv_ref.button_compute(cr, uid, [inv_id])
for l in inv_ref.browse(cr, uid, invoices.values(), context):
- wf_service = netsvc.LocalService('workflow')
# wf_service.trg_validate(uid, 'account.invoice',l.id, 'invoice_proforma', cr)
wf_service.trg_validate(uid, 'account.invoice',l.id, 'invoice_open', cr)
return invoices.values()
diff --git a/addons/auction/auction_view.xml b/addons/auction/auction_view.xml
index 2189253f3ce..ee1004ab0f3 100644
--- a/addons/auction/auction_view.xml
+++ b/addons/auction/auction_view.xml
@@ -3,7 +3,8 @@
-
+
+
=======================================================
Auction Management/Configuration/artist
=======================================================
@@ -203,6 +204,7 @@
+
@@ -277,7 +279,7 @@
-
+
@@ -330,7 +332,6 @@
-
@@ -340,9 +341,7 @@
-
-
diff --git a/addons/auction/auction_wizard.xml b/addons/auction/auction_wizard.xml
index 0a93799cc20..ab1b051add5 100644
--- a/addons/auction/auction_wizard.xml
+++ b/addons/auction/auction_wizard.xml
@@ -1,8 +1,8 @@
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ -->
diff --git a/addons/auction/i18n/ar.po b/addons/auction/i18n/ar.po
index 7a1dbbfb7c5..1d14a28c384 100644
--- a/addons/auction/i18n/ar.po
+++ b/addons/auction/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: auction
diff --git a/addons/auction/i18n/bg.po b/addons/auction/i18n/bg.po
index 6ec6f4746fe..5c8194b8612 100644
--- a/addons/auction/i18n/bg.po
+++ b/addons/auction/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: auction
diff --git a/addons/auction/i18n/bs.po b/addons/auction/i18n/bs.po
index 1eb4487816c..e30cd6d27c0 100644
--- a/addons/auction/i18n/bs.po
+++ b/addons/auction/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: auction
diff --git a/addons/auction/i18n/ca.po b/addons/auction/i18n/ca.po
index 3509fac7373..4303f1d04ae 100644
--- a/addons/auction/i18n/ca.po
+++ b/addons/auction/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: auction
diff --git a/addons/auction/i18n/cs.po b/addons/auction/i18n/cs.po
index 427fa257508..eec10e163c1 100644
--- a/addons/auction/i18n/cs.po
+++ b/addons/auction/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: auction
diff --git a/addons/auction/i18n/de.po b/addons/auction/i18n/de.po
index dc77448f476..f97445af3ab 100644
--- a/addons/auction/i18n/de.po
+++ b/addons/auction/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: auction
diff --git a/addons/auction/i18n/el.po b/addons/auction/i18n/el.po
index 350f4365721..4b0a13ba7ff 100644
--- a/addons/auction/i18n/el.po
+++ b/addons/auction/i18n/el.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: auction
diff --git a/addons/auction/i18n/es.po b/addons/auction/i18n/es.po
index 4b95687dafa..2978801f6bc 100644
--- a/addons/auction/i18n/es.po
+++ b/addons/auction/i18n/es.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: auction
diff --git a/addons/auction/i18n/es_AR.po b/addons/auction/i18n/es_AR.po
index a1853afb4e0..f412d3a6c29 100644
--- a/addons/auction/i18n/es_AR.po
+++ b/addons/auction/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: auction
diff --git a/addons/auction/i18n/et.po b/addons/auction/i18n/et.po
index 5894d748558..0bea17c7c34 100644
--- a/addons/auction/i18n/et.po
+++ b/addons/auction/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: auction
diff --git a/addons/auction/i18n/fi.po b/addons/auction/i18n/fi.po
index 9a9612390ce..a1d3d5ade29 100644
--- a/addons/auction/i18n/fi.po
+++ b/addons/auction/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: auction
diff --git a/addons/auction/i18n/fr.po b/addons/auction/i18n/fr.po
index cc08d2aea19..5617f210b61 100644
--- a/addons/auction/i18n/fr.po
+++ b/addons/auction/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: auction
diff --git a/addons/auction/i18n/hi.po b/addons/auction/i18n/hi.po
index dc7bc3d4336..9c30c78d5a9 100644
--- a/addons/auction/i18n/hi.po
+++ b/addons/auction/i18n/hi.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: auction
diff --git a/addons/auction/i18n/hr.po b/addons/auction/i18n/hr.po
index bbcc8c26920..be2e9b916a2 100644
--- a/addons/auction/i18n/hr.po
+++ b/addons/auction/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: auction
diff --git a/addons/auction/i18n/hu.po b/addons/auction/i18n/hu.po
index 7a1dbbfb7c5..1d14a28c384 100644
--- a/addons/auction/i18n/hu.po
+++ b/addons/auction/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: auction
diff --git a/addons/auction/i18n/id.po b/addons/auction/i18n/id.po
index 9de62b86c93..77fe62a2e54 100644
--- a/addons/auction/i18n/id.po
+++ b/addons/auction/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: auction
diff --git a/addons/auction/i18n/it.po b/addons/auction/i18n/it.po
index 4e9cd39da1c..e25e249a6d1 100644
--- a/addons/auction/i18n/it.po
+++ b/addons/auction/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: auction
diff --git a/addons/auction/i18n/ko.po b/addons/auction/i18n/ko.po
index 260a632ed17..b3d86ba6dab 100644
--- a/addons/auction/i18n/ko.po
+++ b/addons/auction/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: auction
diff --git a/addons/auction/i18n/lt.po b/addons/auction/i18n/lt.po
index 5e234961356..2b98f90a95c 100644
--- a/addons/auction/i18n/lt.po
+++ b/addons/auction/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: auction
diff --git a/addons/auction/i18n/nl.po b/addons/auction/i18n/nl.po
index 61da0d9a409..6894d992b88 100644
--- a/addons/auction/i18n/nl.po
+++ b/addons/auction/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:09+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: auction
diff --git a/addons/auction/i18n/nl_BE.po b/addons/auction/i18n/nl_BE.po
index e40aaf92d0b..db013de5b73 100644
--- a/addons/auction/i18n/nl_BE.po
+++ b/addons/auction/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: auction
diff --git a/addons/auction/i18n/pl.po b/addons/auction/i18n/pl.po
index 51aafebf03e..c3f9344a650 100644
--- a/addons/auction/i18n/pl.po
+++ b/addons/auction/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: auction
diff --git a/addons/auction/i18n/pt.po b/addons/auction/i18n/pt.po
index 888047f53d6..dfa717be762 100644
--- a/addons/auction/i18n/pt.po
+++ b/addons/auction/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: auction
diff --git a/addons/auction/i18n/pt_BR.po b/addons/auction/i18n/pt_BR.po
index b55891b8adb..3f3b7ea0d71 100644
--- a/addons/auction/i18n/pt_BR.po
+++ b/addons/auction/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: auction
diff --git a/addons/auction/i18n/ro.po b/addons/auction/i18n/ro.po
index c96c5c1f539..050ce3e08b6 100644
--- a/addons/auction/i18n/ro.po
+++ b/addons/auction/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: auction
diff --git a/addons/auction/i18n/ru.po b/addons/auction/i18n/ru.po
index c10be386909..8d2edd3ee68 100644
--- a/addons/auction/i18n/ru.po
+++ b/addons/auction/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: auction
diff --git a/addons/auction/i18n/sl.po b/addons/auction/i18n/sl.po
index e88a3e28e7e..67eedb18d83 100644
--- a/addons/auction/i18n/sl.po
+++ b/addons/auction/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: auction
diff --git a/addons/auction/i18n/sv.po b/addons/auction/i18n/sv.po
index 9d80a0fd870..ee5cae0a034 100644
--- a/addons/auction/i18n/sv.po
+++ b/addons/auction/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: auction
diff --git a/addons/auction/i18n/tlh.po b/addons/auction/i18n/tlh.po
index 31937fff464..e4631823963 100644
--- a/addons/auction/i18n/tlh.po
+++ b/addons/auction/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: auction
diff --git a/addons/auction/i18n/tr.po b/addons/auction/i18n/tr.po
index 8fb0b6b10c6..45c86eafea5 100644
--- a/addons/auction/i18n/tr.po
+++ b/addons/auction/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: auction
diff --git a/addons/auction/i18n/uk.po b/addons/auction/i18n/uk.po
index f9d7c8db704..8151ba7bfe6 100644
--- a/addons/auction/i18n/uk.po
+++ b/addons/auction/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: auction
diff --git a/addons/auction/i18n/zh_CN.po b/addons/auction/i18n/zh_CN.po
index 253022213e4..72e873580da 100644
--- a/addons/auction/i18n/zh_CN.po
+++ b/addons/auction/i18n/zh_CN.po
@@ -4,32 +4,32 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
+"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 13:42+0000\n"
-"Last-Translator: Wei \"oldrev\" Li \n"
+"PO-Revision-Date: 2010-03-20 07:33+0000\n"
+"Last-Translator: Black Jack \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: auction
#: field:report.deposit.border,total_marge:0
msgid "Total margin"
-msgstr ""
+msgstr "总利润"
#. module: auction
#: wizard_view:auction.lots.sms_send,init:0
msgid "SMS - Gateway: clickatell"
-msgstr ""
+msgstr "SMS网关"
#. module: auction
#: view:auction.lots:0
msgid "Set to draft"
-msgstr ""
+msgstr "设为草稿"
#. module: auction
#: field:auction.deposit,partner_id:0
@@ -39,12 +39,12 @@ msgstr ""
#: field:report.seller.auction,seller:0
#: field:report.seller.auction2,seller:0
msgid "Seller"
-msgstr ""
+msgstr "卖方"
#. module: auction
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "在这动作定义中无效的模块名"
#. module: auction
#: selection:auction.lots.send.aie,date_ask,numerotation:0
@@ -56,38 +56,38 @@ msgstr ""
#: selection:auction.lots.send.aie,date_ask,numerotation:0
#: selection:auction.lots.send.aie,init,numerotation:0
msgid "Definitive (ordre catalogue)"
-msgstr ""
+msgstr "确定的(订单目录)"
#. module: auction
#: model:ir.ui.menu,name:auction.menu_report_auction_object_date_tree1_my
msgid "My Encoded Objects Per Day"
-msgstr ""
+msgstr "每天我编码的物品"
#. module: auction
#: model:ir.model,name:auction.model_auction_lot_history
msgid "Lot history"
-msgstr ""
+msgstr "批日志"
#. module: auction
#: field:report.seller.auction,avg_estimation:0
msgid "Avg estimation"
-msgstr ""
+msgstr "平均估价"
#. module: auction
#: field:report.auction.object.date,obj_num:0
#: field:report.auction.view2,obj_number:0
msgid "# of Objects"
-msgstr ""
+msgstr "物品#"
#. module: auction
#: model:ir.ui.menu,name:auction.menu_action_bids_form
msgid "Bids line"
-msgstr ""
+msgstr "出价线"
#. module: auction
#: xsl:report.auction.deposit:0
msgid "Deposit Form"
-msgstr ""
+msgstr "押金方式"
#. module: auction
#: rml:auction.bids:0
@@ -102,60 +102,60 @@ msgstr ""
#: field:report.buyer.auction,buyer:0
#: field:report.buyer.auction2,buyer:0
msgid "Buyer"
-msgstr ""
+msgstr "买家"
#. module: auction
#: field:report.auction.view,nobjects:0
#: field:report.buyer.auction,object:0
msgid "No of objects"
-msgstr ""
+msgstr "没有物品"
#. module: auction
#: model:ir.ui.menu,name:auction.menu_report_auction_adjudication_tree
msgid "Adjudication by Auction"
-msgstr ""
+msgstr "拍卖最终结果"
#. module: auction
#: rml:auction.total.rml:0
msgid "# of paid items (based on invoices):"
-msgstr ""
+msgstr "(根据发票)支付项目:"
#. module: auction
#: model:ir.actions.wizard,name:auction.wizard_numerotate_lot
msgid "Numerotation (per lot)"
-msgstr ""
+msgstr "编号(每批)"
#. module: auction
#: selection:auction.lot.category,aie_categ:0
msgid "Antique/Books, manuscripts, eso."
-msgstr ""
+msgstr "古董/书籍/手稿"
#. module: auction
#: view:auction.deposit:0
#: model:ir.model,name:auction.model_auction_deposit
msgid "Deposit Border"
-msgstr ""
+msgstr "押金最少"
#. module: auction
#: wizard_field:auction.lots.make_invoice,init,amount:0
#: wizard_field:auction.lots.make_invoice_buyer,init,amount:0
msgid "Invoiced Amount"
-msgstr ""
+msgstr "发票金额"
#. module: auction
#: selection:auction.lot.category,aie_categ:0
msgid "Antique/Tin / Copper wares"
-msgstr ""
+msgstr "古董/锡/铜制品"
#. module: auction
#: field:auction.lots,paid_ach:0
msgid "Buyer invoice reconciled"
-msgstr ""
+msgstr "买家发票对账"
#. module: auction
#: model:ir.actions.wizard,name:auction.auction_wizard_able_taken
msgid "Mark as taken away"
-msgstr ""
+msgstr "标记为带走"
#. module: auction
#: xsl:report.auction.seller.list:0
@@ -165,90 +165,90 @@ msgstr ""
#. module: auction
#: field:auction.deposit.cost,amount:0
msgid "Amount"
-msgstr ""
+msgstr "金额"
#. module: auction
#: model:ir.actions.act_window,name:auction.action_deposit_border
#: model:ir.ui.menu,name:auction.menu_auction_deposit_border
msgid "Deposit border"
-msgstr ""
+msgstr "押金最少"
#. module: auction
#: xsl:report.auction.deposit:0
msgid "VAT"
-msgstr ""
+msgstr "增值税"
#. module: auction
#: view:auction.lots:0
msgid "Statements"
-msgstr ""
+msgstr "描述"
#. module: auction
#: xsl:flagey.huissier:0
msgid "Adjudication"
-msgstr ""
+msgstr "最终结果"
#. module: auction
#: field:auction.dates,account_analytic_id:0
msgid "Analytic Account"
-msgstr ""
+msgstr "辅助核算项"
#. module: auction
#: selection:auction.lot.category,aie_categ:0
msgid "Unclassifieds"
-msgstr ""
+msgstr "不分类"
#. module: auction
#: model:ir.ui.menu,name:auction.menu_auction_dates_next_by_auction
msgid "Objects by Auction"
-msgstr ""
+msgstr "拍卖物品"
#. module: auction
#: field:auction.lots,lot_num:0
#: field:report.unclassified.objects,lot_num:0
msgid "List Number"
-msgstr ""
+msgstr "表编号"
#. module: auction
#: field:auction.deposit.cost,name:0
msgid "Cost Name"
-msgstr ""
+msgstr "费用名"
#. module: auction
#: selection:auction.lot.category,aie_categ:0
msgid "Antiques"
-msgstr ""
+msgstr "古董"
#. module: auction
#: view:auction.dates:0
msgid "State"
-msgstr ""
+msgstr "状态"
#. module: auction
#: field:report.auction.estimation.adj.category,lot_type:0
msgid "Object Type"
-msgstr ""
+msgstr "物品类型"
#. module: auction
#: wizard_field:auction.lots.sms_send,init,text:0
msgid "SMS Message"
-msgstr ""
+msgstr "SMS消息"
#. module: auction
#: selection:auction.lot.category,aie_categ:0
msgid "Contemporary Art"
-msgstr ""
+msgstr "当代艺术"
#. module: auction
#: view:auction.lots:0
#: view:report.unclassified.objects:0
msgid "Ref"
-msgstr ""
+msgstr "参考"
#. module: auction
#: field:report.auction.view,nseller:0
msgid "No of sellers"
-msgstr ""
+msgstr "没卖家"
#. module: auction
#: selection:auction.lots.send.aie,date_ask,lang:0
@@ -258,7 +258,7 @@ msgstr ""
#. module: auction
#: constraint:hr.attendance:0
msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
-msgstr ""
+msgstr "错误:登入必须要先登出"
#. module: auction
#: view:auction.lots:0
@@ -269,7 +269,7 @@ msgstr ""
#. module: auction
#: field:report.auction.view2,obj_margin_procent:0
msgid "Net margin (%)"
-msgstr ""
+msgstr "净利润(%)"
#. module: auction
#: selection:auction.lots,state:0
@@ -277,28 +277,28 @@ msgstr ""
#: selection:report.seller.auction,state:0
#: selection:report.unclassified.objects,state:0
msgid "Unsold"
-msgstr ""
+msgstr "未出售的"
#. module: auction
#: view:auction.dates:0
msgid "Dates"
-msgstr ""
+msgstr "日期"
#. module: auction
#: constraint:product.template:0
msgid "Error: UOS must be in a different category than the UOM"
-msgstr ""
+msgstr "错误:销售单位必须要和计量单位不同类型"
#. module: auction
#: rml:auction.total.rml:0
msgid "Items"
-msgstr ""
+msgstr "项目"
#. module: auction
#: model:account.tax,name:auction.auction_tax5
#: field:auction.dates,seller_costs:0
msgid "Seller Costs"
-msgstr ""
+msgstr "卖家费用"
#. module: auction
#: view:auction.bid:0
@@ -308,75 +308,75 @@ msgstr ""
#: model:ir.actions.report.xml,name:auction.bid_auction
#: model:ir.ui.menu,name:auction.menu_action_bid_open
msgid "Bids"
-msgstr ""
+msgstr "出价"
#. module: auction
#: model:ir.ui.menu,name:auction.auction_all_objects_menu
msgid "All objects"
-msgstr ""
+msgstr "所有物品"
#. module: auction
#: model:ir.actions.act_window,name:auction.action_auction_buyer_reporting_all2
msgid "Buyer's auction for all months"
-msgstr ""
+msgstr "买家所有月份拍卖"
#. module: auction
#: field:auction.bid,contact_tel:0
msgid "Contact"
-msgstr ""
+msgstr "联系"
#. module: auction
#: field:report.auction.view,obj_ret:0
#: field:report.object.encoded,obj_ret:0
#: field:report.object.encoded.manager,obj_ret:0
msgid "# obj ret"
-msgstr ""
+msgstr "物品#"
#. module: auction
#: wizard_button:auction.lots.sms_send,init,send:0
msgid "Send SMS"
-msgstr ""
+msgstr "发送SMS"
#. module: auction
#: selection:auction.lot.category,aie_categ:0
msgid "Cont. Art/Painting"
-msgstr ""
+msgstr "艺术/绘画"
#. module: auction
#: field:auction.lots,sel_inv_id:0
msgid "Seller Invoice"
-msgstr ""
+msgstr "卖方发票"
#. module: auction
#: view:auction.dates:0
msgid "Commissions"
-msgstr ""
+msgstr "佣金"
#. module: auction
#: wizard_button:auction.lots.numerotate,search,init:0
msgid "Back"
-msgstr ""
+msgstr "后面"
#. module: auction
#: model:ir.actions.act_window,name:auction.action_all_objects_unsold
msgid "Unsold objects"
-msgstr ""
+msgstr "未出售的物品"
#. module: auction
#: model:ir.ui.menu,name:auction.menu_all_objects_sold1
msgid "Sold Objects"
-msgstr ""
+msgstr "已卖出的物品"
#. module: auction
#: view:report.buyer.auction2:0
#: view:report.seller.auction2:0
msgid "Sum net margin"
-msgstr ""
+msgstr "合计净利润"
#. module: auction
#: view:auction.deposit:0
msgid "Deposit Border Form"
-msgstr ""
+msgstr "押金最少方式"
#. module: auction
#: field:auction.bid,bid_lines:0
@@ -384,7 +384,7 @@ msgstr ""
#: rml:bids.lots:0
#: model:ir.model,name:auction.model_auction_bid_line
msgid "Bid"
-msgstr ""
+msgstr "出价"
#. module: auction
#: wizard_field:auction.lots.send.aie,date_ask,lang:0
@@ -397,17 +397,17 @@ msgstr ""
#: view:auction.lots:0
#: model:ir.model,name:auction.model_auction_lots
msgid "Object"
-msgstr ""
+msgstr "物品"
#. module: auction
#: model:ir.actions.wizard,name:auction.wizard_map_user
msgid "Map buyer username to Partners"
-msgstr ""
+msgstr "从买家用户到业务伙伴"
#. module: auction
#: wizard_field:auction.lots.numerotate,search,lot_num:0
msgid "Inventory Number"
-msgstr ""
+msgstr "库存数量"
#. module: auction
#: wizard_button:auction.lots.buyer_map,check,end:0
@@ -415,17 +415,17 @@ msgstr ""
#: wizard_button:auction.lots.numerotate,search,end:0
#: wizard_button:auction.lots.numerotate_cont,init,end:0
msgid "Exit"
-msgstr ""
+msgstr "出口"
#. module: auction
#: field:report.buyer.auction2,net_revenue:0
msgid "Net Revenue"
-msgstr ""
+msgstr "营业净收入"
#. module: auction
#: view:report.buyer.auction:0
msgid "Auction buyer reporting form view"
-msgstr ""
+msgstr "拍卖买方报表"
#. module: auction
#: field:auction.dates,state:0
@@ -435,17 +435,17 @@ msgstr ""
#: field:report.seller.auction,state:0
#: field:report.unclassified.objects,state:0
msgid "Status"
-msgstr ""
+msgstr "状态"
#. module: auction
#: model:ir.actions.wizard,name:auction.wizard_sms
msgid "SMS Send"
-msgstr ""
+msgstr "发送SMS"
#. module: auction
#: selection:auction.lot.category,aie_categ:0
msgid "Antique/Cartoons"
-msgstr ""
+msgstr "古董/卡通"
#. module: auction
#: view:auction.lots:0
@@ -453,42 +453,42 @@ msgstr ""
#: selection:report.seller.auction,state:0
#: selection:report.unclassified.objects,state:0
msgid "Sold"
-msgstr ""
+msgstr "销售"
#. module: auction
#: constraint:hr.employee:0
msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr ""
+msgstr "错误:你不能创建递归的员工"
#. module: auction
#: field:auction.bid_line,name:0
msgid "Bid date"
-msgstr ""
+msgstr "出价日期"
#. module: auction
#: field:auction.dates,acc_expense:0
msgid "Expense Account"
-msgstr ""
+msgstr "费用科目"
#. module: auction
#: model:ir.ui.menu,name:auction.menu_wizard_emporte
msgid "Deliveries Management"
-msgstr ""
+msgstr "发货管理"
#. module: auction
#: field:auction.lots,obj_desc:0
msgid "Object Description"
-msgstr ""
+msgstr "物品描述"
#. module: auction
#: selection:auction.deposit,method:0
msgid "Contact the Seller"
-msgstr ""
+msgstr "联系卖家"
#. module: auction
#: view:auction.lots:0
msgid "Auction Objects"
-msgstr ""
+msgstr "拍卖物品"
#. module: auction
#: field:auction.lots,gross_revenue:0
@@ -496,7 +496,7 @@ msgstr ""
#: field:report.object.encoded.manager,gross_revenue:0
#: field:report.seller.auction2,gross_revenue:0
msgid "Gross revenue"
-msgstr ""
+msgstr "营业总收益"
#. module: auction
#: view:report.seller.auction2:0
diff --git a/addons/auction/i18n/zh_TW.po b/addons/auction/i18n/zh_TW.po
index 52d9b3e6abf..4c59ee505dc 100644
--- a/addons/auction/i18n/zh_TW.po
+++ b/addons/auction/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:10+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: auction
diff --git a/addons/auction/security/ir.model.access.csv b/addons/auction/security/ir.model.access.csv
index 642209edd05..1c1df0828ca 100644
--- a/addons/auction/security/ir.model.access.csv
+++ b/addons/auction/security/ir.model.access.csv
@@ -22,3 +22,13 @@
"access_report_object_encoded","report.object.encoded","model_report_object_encoded","base.group_user",1,0,0,0
"access_report_object_encoded_manager","report.object.encoded.manager","model_report_object_encoded_manager","base.group_user",1,0,0,0
"access_report_unclassified_objects","report.unclassified.objects","model_report_unclassified_objects","base.group_user",1,0,0,0
+"access_auction_lots_able","auction.lots.able","model_auction_lots_able","base.group_user",1,0,0,0
+"access_auction_lots_auction_move","auction.lots.auction.move","model_auction_lots_auction_move","base.group_user",1,0,0,0
+"access_auction_lots_enable","auction.lots.enable","model_auction_lots_enable","base.group_user",1,0,0,0
+"access_auction_lots_make_invoice_buyer","auction.lots.make.invoice.buyer","model_auction_lots_make_invoice_buyer","base.group_user",1,0,0,0
+"access_auction_lots_make_invoice","auction.lots.make.invoice","model_auction_lots_make_invoice","base.group_user",1,0,0,0
+"access_auction_lots_sms_send","auction.lots.sms.send","model_auction_lots_sms_send","base.group_user",1,0,0,0
+"access_auction_pay_buy","auction.pay.buy","model_auction_pay_buy","base.group_user",1,0,0,0
+"acess_auction_payer","auction.payer","model_auction_payer","base.group_user",1,0,0,0
+"access_auction_pay_sel","auction.pay.sel","model_auction_payer_sel","base.group_user",1,0,0,0
+"acess_auction_taken","auction.taken","model_auction_taken","base.group_user",1,0,0,0
diff --git a/addons/auction/wizard/__init__.py b/addons/auction/wizard/__init__.py
index ec07ef6e04f..957ab02b053 100644
--- a/addons/auction/wizard/__init__.py
+++ b/addons/auction/wizard/__init__.py
@@ -19,24 +19,20 @@
#
##############################################################################
-import wizard_aie_send
-import wizard_aie_send_result
-import wizard_lots_buyer_map
-import wizard_lots_cancel
-import wizard_lots_invoice
-import wizard_lots_numerotate
-import wizard_lots_pay
-import wizard_pay
-import wizard_lots_sms
-import wizard_lot_date_move
-import wizard_auction_journal
-import wizard_auction_invoice_buyer
-import wizard_transfer_unsold_object
-import auction_wizard_enable_taken
-import auction_wizard_able_taken
-import auction_catalog_flagey
-#import wizard_lots_barcode
-import wizard_emporte
-import wizard_payer
+import auction_lots_able
+import auction_lots_enable
+import auction_lots_make_invoice_buyer
+import auction_lots_make_invoice
+import auction_taken
+import auction_lots_auction_move
+import auction_pay_buy
+import auction_payer_sel
+import auction_lots_sms_send
+import auction_catalog_flagey_report
+#import auction_lots_cancel
+#import auction_transfer_unsold_object
+#import auction_aie_send_result
+import auction_lots_buyer_map
+
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/auction/wizard/auction_catalog_flagey_report.py b/addons/auction/wizard/auction_catalog_flagey_report.py
new file mode 100644
index 00000000000..d8fec4b6d95
--- /dev/null
+++ b/addons/auction/wizard/auction_catalog_flagey_report.py
@@ -0,0 +1,83 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL ().
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+##############################################################################
+
+from osv import osv, fields
+import netsvc
+
+class auction_catalog_flagey(osv.osv_memory):
+ _name = 'auction.catalog.flagey'
+ _description = 'Auction Catalog Flagey'
+
+ def default_get(self, cr, uid, fields, context):
+ """
+ To get default values for the object.
+ @param self: The object pointer.
+ @param cr: A database cursor
+ @param uid: ID of the user currently logged in
+ @param fields: List of fields for which we want default values
+ @param context: A standard dictionary
+ @return: A dictionary which of fields with values.
+ """
+ res = super(auction_catalog_flagey, self).default_get(cr, uid, fields, context=context)
+ return res
+
+ def view_init(self, cr, uid, fields, context):
+ """
+ Creates view dynamically, adding fields at runtime, raises exception
+ at the time of initialization of view.
+ @param self: The object pointer.
+ @param cr: A database cursor
+ @param uid: ID of the user currently logged in
+ @param fields: List of fields for which we want default values
+ @param context: A standard dictionary
+ @return: New arch of view with new columns.
+ """
+ lots_obj = self.pool.get('auction.lots')
+ auc_dates_obj = self.pool.get('auction.dates')
+ current_auction = auc_dates_obj.browse(cr,uid,context.get('active_ids', []))
+ v_lots = lots_obj.search(cr,uid,[('auction_id','=',current_auction.id)])
+ v_ids = lots_obj.browse(cr,uid,v_lots)
+ for ab in v_ids:
+ if not ab.auction_id :
+ raise osv.except_osv('Error!','No Lots belong to this Auction Date')
+ pass
+
+ def print_report(self, cr, uid, ids, context):
+ """
+ Prints auction catalog flagey report.
+ @param self: The object pointer.
+ @param cr: A database cursor
+ @param uid: ID of the user currently logged in
+ @param ids: List of IDs selected
+ @param context: A standard dictionary
+ @return: Report
+ """
+ datas = {'ids': context.get('active_ids',[])}
+ return {
+ 'type': 'ir.actions.report.xml',
+ 'report_name': 'auction.cat_flagy',
+ 'datas': datas,
+ }
+
+auction_catalog_flagey()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/auction/wizard/auction_catalog_flagey_view.xml b/addons/auction/wizard/auction_catalog_flagey_view.xml
new file mode 100644
index 00000000000..ca87771cc37
--- /dev/null
+++ b/addons/auction/wizard/auction_catalog_flagey_view.xml
@@ -0,0 +1,32 @@
+
+
+
+
+
+
+
+ Auction Catalog Flagey
+ auction.catalog.flagey
+ form
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/mrp/wizard/wizard_price.py b/addons/auction/wizard/auction_lots_able.py
similarity index 57%
rename from addons/mrp/wizard/wizard_price.py
rename to addons/auction/wizard/auction_lots_able.py
index dd84ad23be2..8ddeeca8055 100644
--- a/addons/mrp/wizard/wizard_price.py
+++ b/addons/auction/wizard/auction_lots_able.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL ().
#
@@ -15,35 +15,30 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
#
##############################################################################
-
+from osv import fields, osv
+from tools.translate import _
+import netsvc
+import pooler
+import time
+import tools
import wizard
-price_form = '''
-
-
- '''
-
-price_fields = {
- 'number': {'string':'Number of products to produce', 'type':'integer', 'required':True},
-}
-
-class wizard_price(wizard.interface):
- states = {
- 'init': {
- 'actions': [],
- 'result': {'type':'form', 'arch':price_form, 'fields':price_fields, 'state':[('end','Cancel'),('price','Print product price') ]}
- },
- 'price': {
- 'actions': [],
- 'result': {'type':'print', 'report':'product.price', 'state':'end'}
- }
- }
-wizard_price('product_price')
-
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
+class auction_lots_able(osv.osv_memory):
+
+ _name = "auction.lots.able"
+ _description = "Lots able"
+
+ def confirm_able(self, cr, uid, ids, context={}):
+ """
+ This function Update auction lots object and set taken away field true.
+ @param cr: the current row, from the database cursor,
+ @param uid: the current user’s ID for security checks,
+ @param ids: List of auction lots able’s IDs.
+ """
+ self.pool.get('auction.lots').write(cr, uid, context['active_ids'], {'ach_emp':True})
+ return {}
+
+auction_lots_able()
diff --git a/addons/auction/wizard/auction_lots_able_view.xml b/addons/auction/wizard/auction_lots_able_view.xml
new file mode 100644
index 00000000000..96135460c72
--- /dev/null
+++ b/addons/auction/wizard/auction_lots_able_view.xml
@@ -0,0 +1,30 @@
+
+
+
+
+ auction.lots.able.form
+ auction.lots.able
+ form
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/auction/wizard/auction_lots_auction_move.py b/addons/auction/wizard/auction_lots_auction_move.py
new file mode 100644
index 00000000000..d1303be0887
--- /dev/null
+++ b/addons/auction/wizard/auction_lots_auction_move.py
@@ -0,0 +1,88 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL ().
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+##############################################################################
+
+from osv import fields, osv
+from tools.translate import _
+import netsvc
+import pooler
+import time
+import tools
+import wizard
+
+class auction_lots_auction_move(osv.osv_memory):
+
+ _name = "auction.lots.auction.move"
+ _description = "Auction move "
+ _columns= {
+ 'auction_id':fields.many2one('auction.dates', 'Auction Date', required=True),
+ }
+
+# def _top(self, cr, uid, ids, context={}):
+# refs = self.pool.get('auction.lots')
+# rec_ids = refs.browse(cr, uid, context['active_ids'])
+# for rec in rec_ids:
+# if not rec.auction_id:
+# raise osv.except_osv('Error !', 'You can not move a lot that has no auction date')
+# return {}
+
+ def auction_move_set(self, cr, uid, ids, context={}):
+ """
+ This Function update auction date on auction lots to given auction date.
+ erase the auction lots's object adjudication price and its buyer and change state to draft.
+ create new entry in auction lot history.
+ @param cr: the current row, from the database cursor,
+ @param uid: the current user’s ID for security checks,
+ @param ids: List of auction lots auction move’s IDs.
+ """
+ refs = self.pool.get('auction.lots')
+ auction_bid_line_obj = self.pool.get('auction.bid_line')
+ auction_lot_history_obj = self.pool.get('auction.lot.history')
+ auction_lots_obj = self.pool.get('auction.lots')
+ rec_ids = refs.browse(cr, uid, context['active_ids'])
+ for datas in self.read(cr, uid, ids):
+ if not (datas['auction_id'] and len(context['active_ids'])) :
+ return {}
+
+# line_ids = auction_bid_line_obj.search(cr, uid, [('lot_id', 'in', context['active_ids'])])
+# pooler.get_pool(cr.dbname).get('auction.bid_line').unlink(cr, uid, line_ids)
+ for rec in rec_ids:
+ new_id = auction_lot_history_obj.create(cr, uid, {
+ 'auction_id': rec.auction_id.id,
+ 'lot_id': rec.id,
+ 'price': rec.obj_ret
+ })
+ up_auction = auction_lots_obj.write(cr, uid, [rec.id], {
+ 'auction_id':datas['auction_id'],
+ 'obj_ret': None,
+ 'obj_price': None,
+ 'ach_login': None,
+ 'ach_uid': None,
+ 'ach_inv_id': None,
+ 'sel_inv_id': None,
+ 'obj_num': None,
+ 'state': 'draft'})
+ return {}
+
+auction_lots_auction_move()
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/auction/wizard/auction_lots_auction_move_view.xml b/addons/auction/wizard/auction_lots_auction_move_view.xml
new file mode 100644
index 00000000000..dd116a8bc6c
--- /dev/null
+++ b/addons/auction/wizard/auction_lots_auction_move_view.xml
@@ -0,0 +1,32 @@
+
+
+
+
+ auction.lots.auction.move.form
+ auction.lots.auction.move
+ form
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/auction/wizard/auction_lots_buyer_map.py b/addons/auction/wizard/auction_lots_buyer_map.py
new file mode 100644
index 00000000000..b20250edc38
--- /dev/null
+++ b/addons/auction/wizard/auction_lots_buyer_map.py
@@ -0,0 +1,130 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL ().
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+##############################################################################
+
+import netsvc
+import sql_db
+from osv import osv,fields
+
+class wiz_auc_lots_buyer_map(osv.osv_memory):
+ _name = 'auction.lots.buyer_map'
+ _description = 'Map Buyer'
+
+ _columns = {
+ 'ach_login': fields.char('Buyer Username', size=64, required=True),
+ 'ach_uid': fields.many2one('res.partner','Buyer', required=True),
+ }
+
+ def default_get(self, cr, uid, fields, context):
+ """
+ To get default values for the object.
+ @param self: The object pointer.
+ @param cr: A database cursor
+ @param uid: ID of the user currently logged in
+ @param fields: List of fields for which we want default values
+ @param context: A standard dictionary
+ @return: A dictionary which of fields with values.
+ """
+ ids = context and context.get('active_ids',False) or False
+ assert ids, _('Active IDs not Found')
+ res = super(wiz_auc_lots_buyer_map,self).default_get(cr, uid, fields, context)
+ cr.execute('select id from auction_lots where (ach_uid is null and ach_login is not null) ')
+ v_ids = [x[0] for x in cr.fetchall()]
+ for rec in self.pool.get('auction.lots').browse(cr, uid, v_ids, context):
+ if (not rec.ach_uid or not rec.ach_login):
+ res.update(self._start(cr, uid, ids, context))
+ return res
+ res.update(self._start(cr, uid, ids, context))
+ return res
+
+ def _start(self, cr, uid, ids, context):
+ """
+ Returns login if already there in the selected record.
+ @param self: The object pointer.
+ @param cr: A database cursor
+ @param uid: ID of the user currently logged in
+ @param ids: List of ids
+ @param context: A standard dictionary
+ @return: login field from current record.
+ """
+ lots_obj = self.pool.get('auction.lots')
+ for rec in lots_obj.browse(cr, uid, ids, context):
+ if (len(ids)==1) and (not rec.ach_uid and not rec.ach_login):
+ raise osv.except_osv('Error', 'No buyer is set for this lot.')
+ if not rec.ach_uid and rec.ach_login:
+ return {'ach_login': rec.ach_login}
+ return {}
+
+ def buyer_map_set(self, cr, uid, ids, context):
+ """
+ To map the buyer and login name.
+ @param self: The object pointer.
+ @param cr: A database cursor
+ @param uid: ID of the user currently logged in
+ @param ids: List of ids
+ @param context: A standard dictionary
+ @return:
+ """
+ rec_ids = context and context.get('active_ids',False) or False
+ assert rec_ids, _('Active IDs not Found')
+ datas = self.read(cr, uid, ids[0],['ach_login','ach_uid'])
+ lots_obj = self.pool.get('auction.lots')
+ recs = lots_obj.browse(cr, uid, rec_ids, context)
+ for rec in recs:
+ if rec.ach_login==datas['ach_login']:
+ lots_obj.write(cr, uid, [rec.id], {'ach_uid': datas['ach_uid']}, context=context)
+ cr.commit()
+ return {}
+
+ def fields_view_get(self, cr, uid, view_id=None, view_type='form',
+ context=None, toolbar=False, submenu=False):
+ """
+ Changes the view dynamically
+ @param self: The object pointer.
+ @param cr: A database cursor
+ @param uid: ID of the user currently logged in
+ @param context: A standard dictionary
+ @return: New arch of view.
+ """
+ record_ids = context and context.get('active_ids', False) or False
+ res = super(wiz_auc_lots_buyer_map, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
+ lots_obj = self.pool.get('auction.lots')
+ if record_ids:
+ try:
+ for lots in lots_obj.browse(cr, uid, record_ids):
+ if lots.ach_uid:
+ res['arch'] = """
+
+
+
+
+
+
+
+ """
+ except:
+ return res
+ return res
+
+wiz_auc_lots_buyer_map()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/auction/wizard/auction_lots_buyer_map_view.xml b/addons/auction/wizard/auction_lots_buyer_map_view.xml
new file mode 100644
index 00000000000..c76c74983d2
--- /dev/null
+++ b/addons/auction/wizard/auction_lots_buyer_map_view.xml
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
+ Map buyer username to Partners
+ auction.lots.buyer_map
+ form
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/auction/wizard/auction_lots_cancel.py b/addons/auction/wizard/auction_lots_cancel.py
new file mode 100644
index 00000000000..edf530ac8aa
--- /dev/null
+++ b/addons/auction/wizard/auction_lots_cancel.py
@@ -0,0 +1,55 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL ().
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+##############################################################################
+
+from osv import osv
+from osv import fields
+
+class auction_lots_cancel(osv.osv):
+ '''
+ Open ERP Model
+ '''
+ _name = 'auction.lots.cancel'
+ _description = 'To cancel auction lots.'
+
+ def cancel(self, cr, uid, ids, context):
+ """
+ To cancel the auction lot
+
+ @param self: The object pointer.
+ @param cr: A database cursor
+ @param uid: ID of the user currently logged in
+ @param ids: List of IDs selected
+ @param context: A standard dictionary
+ @return:
+ """
+
+ lots_obj = self.pool.get('auction.lots')
+ invoice_obj = self.pool.get('account.invoice')
+ lot = lots_obj.browse(cr,uid,context['active_id'],context)
+ if lot.ach_inv_id:
+ supplier_refund_inv_id = invoice_obj.refund(cr, uid,[lot.ach_inv_id.id])
+ if lot.sel_inv_id:
+ customer_refund_inv_id = invoice_obj.refund(cr, uid,[lot.sel_inv_id.id])
+ return {}
+
+ _columns = {
+ }
+auction_lots_cancel()
\ No newline at end of file
diff --git a/addons/auction/wizard/auction_lots_cancel_view.xml b/addons/auction/wizard/auction_lots_cancel_view.xml
new file mode 100644
index 00000000000..77ff6a373b7
--- /dev/null
+++ b/addons/auction/wizard/auction_lots_cancel_view.xml
@@ -0,0 +1,27 @@
+
+
+
+
+ auction.lots.cancel.form
+ auction.lots.cancel
+ form
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/auction/wizard/auction_lots_enable.py b/addons/auction/wizard/auction_lots_enable.py
new file mode 100644
index 00000000000..65cb0c4d49e
--- /dev/null
+++ b/addons/auction/wizard/auction_lots_enable.py
@@ -0,0 +1,41 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL ().
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+##############################################################################
+from osv import fields, osv
+
+class auction_lots_enable(osv.osv_memory):
+ _name = "auction.lots.enable"
+ _description = "Lots Enable"
+
+ _columns= {
+ 'confirm_en':fields.integer('Catalog Number')
+ }
+
+ def confirm_enable(self, cr, uid, ids, context={}):
+ """
+ This function Update auction lots object and set taken away field False.
+ @param cr: the current row, from the database cursor,
+ @param uid: the current user’s ID for security checks,
+ @param ids: List of auction lots enable’s IDs.
+ """
+ self.pool.get('auction.lots').write(cr, uid, context['active_id'], {'ach_emp':False})
+ return {}
+
+auction_lots_enable()
diff --git a/addons/auction/wizard/auction_lots_enable_view.xml b/addons/auction/wizard/auction_lots_enable_view.xml
new file mode 100644
index 00000000000..8384524dad2
--- /dev/null
+++ b/addons/auction/wizard/auction_lots_enable_view.xml
@@ -0,0 +1,34 @@
+
+
+
+
+ auction.lots.enable.form
+ auction.lots.enable
+ form
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/auction/wizard/auction_lots_invoice.py b/addons/auction/wizard/auction_lots_invoice.py
new file mode 100644
index 00000000000..9581941266f
--- /dev/null
+++ b/addons/auction/wizard/auction_lots_invoice.py
@@ -0,0 +1,124 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL ().
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+##############################################################################
+
+from osv import osv, fields
+import netsvc
+from tools.translate import _
+
+class auction_lots_invoice(osv.osv_memory):
+ _name = 'auction.lots.invoice'
+ _description = "Auction Lots Invoice"
+
+ _columns = {
+ 'amount': fields.float('Invoiced Amount', required=True, readonly=True),
+ 'amount_topay': fields.float('Amount to pay', required=True, readonly=True),
+ 'amount_paid': fields.float('Amount paid', readonly=True),
+ 'objects': fields.integer('# of objects', required=True, readonly=True),
+ 'ach_uid': fields.many2one('res.partner','Buyer Name', required=True ),
+ 'number': fields.integer('Invoice Number'),
+# 'tax_applied':{'string':'Tax Applied', 'type':'float', 'readonly':True},
+ }
+
+ def default_get(self, cr, uid, fields, context={}):
+ """
+ To get default values for the object.
+ @param self: The object pointer.
+ @param cr: A database cursor
+ @param uid: ID of the user currently logged in
+ @param fields: List of fields for which we want default values
+ @param context: A standard dictionary
+ @return: A dictionary which of fields with values.
+ """
+ res = super(auction_lots_invoice, self).default_get(cr, uid, fields, context=context)
+ service = netsvc.LocalService("object_proxy")
+ lots = service.execute(cr.dbname, uid, 'auction.lots', 'read', context.get('active_ids', []))
+ auction = service.execute(cr.dbname,uid, 'auction.dates', 'read', [lots[0]['auction_id'][0]])[0]
+
+ price = 0.0
+ price_topay = 0.0
+ price_paid = 0.0
+ #tax=data['form']['tax_applied']
+# uid = False
+ for lot in lots:
+ price_lot = lot['obj_price'] or 0.0
+
+ costs = service.execute(cr.dbname, uid, 'auction.lots', 'compute_buyer_costs', [lot['id']])
+ price_lot += costs['amount']
+# for cost in costs:
+# price_lot += cost['amount']
+
+ price += price_lot
+
+ if lot['ach_uid']:
+ if uid and (lot['ach_uid'][0]<>uid):
+ raise osv.except_osv(_('UserError'), _('Two different buyers for the same invoice !\nPlease correct this problem before invoicing'))
+ uid = lot['ach_uid'][0]
+ elif lot['ach_login']:
+ refs = service.execute(uid, 'res.partner', 'search', [('ref','=',lot['ach_login'])])
+ if len(refs):
+ uid = refs[-1]
+ if 'ach_pay_id' in lot and lot['ach_pay_id']:
+ price_paid += price_lot
+ #*tax
+ else:
+ price_topay += price_lot
+ #*tax
+
+ #TODO: recuperer id next invoice (de la sequence)???
+ invoice_number = False
+ for lot in self.pool.get('auction.lots').browse(cr, uid, context.get('active_ids', [])):
+ if 'objects' in fields:
+ res.update({'objects':len(context.get('active_ids', []))})
+ if 'amount' in fields:
+ res.update({'amount': price})
+ if 'ach_uid' in fields:
+ res.update({'ach_uid': uid})
+ if 'amount_topay' in fields:
+ res.update({'amount_topay':price_topay})
+ if 'amount_paid' in fields:
+ res.update({'amount_paid':price_paid})
+ if 'number' in fields:
+ res.update({'number':invoice_number})
+ return res
+
+ def print_report(self, cr, uid, ids, context={}):
+ """
+ Create an invoice report.
+ @param cr: the current row, from the database cursor.
+ @param uid: the current user’s ID for security checks.
+ @param ids: List of Auction lots make invoice buyer’s IDs
+ @return: dictionary of account invoice form.
+ """
+ service = netsvc.LocalService("object_proxy")
+ datas = {'ids' : context.get('active_ids',[])}
+ res = self.read(cr, uid, ids, ['number','ach_uid'])
+ res = res and res[0] or {}
+ datas['form'] = res
+# service.execute(cr.dbname, uid, 'auction.lots', 'lots_invoice_and_cancel_old_invoice', datas['ids'], datas['form']['number'], datas['form']['ach_uid'], 'invoice_open')
+ return {
+ 'type' : 'ir.actions.report.xml',
+ 'report_name':'auction.invoice',
+ 'datas' : datas,
+ }
+
+auction_lots_invoice()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/auction/wizard/auction_lots_invoice_view.xml b/addons/auction/wizard/auction_lots_invoice_view.xml
new file mode 100644
index 00000000000..4adc7098789
--- /dev/null
+++ b/addons/auction/wizard/auction_lots_invoice_view.xml
@@ -0,0 +1,39 @@
+
+
+
+
+
+
+
+ auction.lots.invoice.wizard
+ auction.lots.invoice
+ form
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/auction/wizard/auction_lots_make_invoice.py b/addons/auction/wizard/auction_lots_make_invoice.py
new file mode 100644
index 00000000000..8cda461e186
--- /dev/null
+++ b/addons/auction/wizard/auction_lots_make_invoice.py
@@ -0,0 +1,89 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL ().
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+##############################################################################
+from osv import fields, osv
+from tools.translate import _
+import netsvc
+import pooler
+import time
+import tools
+import wizard
+
+class auction_lots_make_invoice(osv.osv_memory):
+ _name = "auction.lots.make.invoice"
+ _description = "Make invoice"
+
+ _columns = {
+ 'amount': fields.float('Invoiced Amount', required =True, readonly=True),
+ 'objects':fields.integer('# of objects', required =True, readonly=True),
+ 'number':fields.char('Invoice Number', size=64),
+
+ }
+
+ _defaults = {
+ 'number': lambda *a: False,
+ }
+
+ def default_get(self, cr, uid, fields, context):
+ """
+ To get default values for the object.
+ @param self: The object pointer.
+ @param cr: A database cursor
+ @param uid: ID of the user currently logged in
+ @param fields: List of fields for which we want default values
+ @param context: A standard dictionary
+ @return: A dictionary which of fields with values.
+ """
+ res = super(auction_lots_make_invoice, self).default_get(cr, uid, fields, context=context)
+ for lot in self.pool.get('auction.lots').browse(cr, uid, context.get('active_ids', [])):
+ if 'amount' in fields:
+ res.update({'amount': lot.buyer_price})
+ if 'objects' in fields:
+ res.update({'objects': len(context['active_ids'])})
+ return res
+
+
+ def makeInvoices(self, cr, uid, ids, context):
+ """
+ Seller invoice :Create an invoice.
+ @param cr: the current row, from the database cursor.
+ @param uid: the current user’s ID for security checks.
+ @param ids: List of Auction lots make invoice’s IDs
+ @return: dictionary of account invoice form.
+ """
+ order_obj = self.pool.get('auction.lots')
+ mod_obj = self.pool.get('ir.model.data')
+ result = mod_obj._get_id(cr, uid, 'account', 'view_account_invoice_filter')
+ id = mod_obj.read(cr, uid, result, ['res_id'])
+ lots_ids = order_obj.seller_trans_create(cr, uid, context['active_ids'], context)
+ cr.commit()
+ return {
+ 'domain': "[('id','in', ["+','.join(map(str, lots_ids))+"])]",
+ 'name': 'Seller invoices',
+ 'view_type': 'form',
+ 'view_mode': 'tree,form',
+ 'res_model': 'account.invoice',
+ 'view_id': False,
+ 'context': "{'type':'out_refund'}",
+ 'type': 'ir.actions.act_window',
+ 'search_view_id': id['res_id']
+ }
+
+auction_lots_make_invoice()
diff --git a/addons/auction/wizard/auction_lots_make_invoice_buyer.py b/addons/auction/wizard/auction_lots_make_invoice_buyer.py
new file mode 100644
index 00000000000..5d2e370a81e
--- /dev/null
+++ b/addons/auction/wizard/auction_lots_make_invoice_buyer.py
@@ -0,0 +1,89 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL ().
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+##############################################################################
+from osv import fields, osv
+
+class auction_lots_make_invoice_buyer(osv.osv_memory):
+ _name = "auction.lots.make.invoice.buyer"
+ _description = "Make invoice buyer "
+
+ _columns= {
+ 'amount': fields.float('Invoiced Amount', required =True, readonly=True),
+ 'objects':fields.integer('# of objects', required =True, readonly=True),
+ 'number':fields.char('Invoice Number', size=64),
+ 'buyer_id':fields.many2one('res.partner', 'Buyer', required=True),
+ }
+
+ _defaults={
+ 'number': lambda *a: False,
+ }
+
+ def default_get(self, cr, uid, fields, context):
+ """
+ To get default values for the object.
+ @param self: The object pointer.
+ @param cr: A database cursor
+ @param uid: ID of the user currently logged in
+ @param fields: List of fields for which we want default values
+ @param context: A standard dictionary
+ @return: A dictionary which of fields with values.
+ """
+ res = super(auction_lots_make_invoice_buyer, self).default_get(cr, uid, fields, context=context)
+ for lot in self.pool.get('auction.lots').browse(cr, uid, context.get('active_ids', [])):
+ if 'amount' in fields:
+ res.update({'amount': lot.buyer_price})
+ if 'buyer_id' in fields:
+ res.update({'buyer_id': lot.ach_uid and lot.ach_uid.id or False})
+ if 'objects' in fields:
+ res.update({'objects': len(context['active_ids'])})
+ return res
+
+ def makeInvoices(self, cr, uid, ids, context):
+ """
+ Create an invoice for selected lots (IDS) to BUYER_ID .
+ @param cr: the current row, from the database cursor.
+ @param uid: the current user’s ID for security checks.
+ @param ids: List of Auction lots make invoice buyer’s IDs
+ @return: dictionary of account invoice form.
+ """
+ order_obj = self.pool.get('auction.lots')
+ mod_obj = self.pool.get('ir.model.data')
+ result = mod_obj._get_id(cr, uid, 'account', 'view_account_invoice_filter')
+ id = mod_obj.read(cr, uid, result, ['res_id'])
+ lots = order_obj.browse(cr, uid, context['active_ids'])
+ for data in self.read(cr, uid, ids):
+ invoice_number = data['number']
+ for lot in lots:
+ up_auction = order_obj.write(cr, uid, [lot.id], {'ach_uid': data['buyer_id']})
+ lots_ids = order_obj.lots_invoice(cr, uid, context['active_ids'], context, data['number'])
+ cr.commit()
+ return {
+ 'domain': "[('id','in', ["+','.join(map(str, lots_ids))+"])]",
+ 'name': 'Buyer invoices',
+ 'view_type': 'form',
+ 'view_mode': 'tree,form',
+ 'res_model': 'account.invoice',
+ 'view_id': False,
+ 'context': "{'type':'in_refund'}",
+ 'type': 'ir.actions.act_window',
+ 'search_view_id': id['res_id']
+ }
+
+auction_lots_make_invoice_buyer()
diff --git a/addons/auction/wizard/auction_lots_make_invoice_buyer_view.xml b/addons/auction/wizard/auction_lots_make_invoice_buyer_view.xml
new file mode 100644
index 00000000000..ba4aac79ca6
--- /dev/null
+++ b/addons/auction/wizard/auction_lots_make_invoice_buyer_view.xml
@@ -0,0 +1,36 @@
+
+
+
+
+ auction.lots.make.invoice.buyer.form
+ auction.lots.make.invoice.buyer
+ form
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/auction/wizard/auction_lots_make_invoice_view.xml b/addons/auction/wizard/auction_lots_make_invoice_view.xml
new file mode 100644
index 00000000000..29ef3e09348
--- /dev/null
+++ b/addons/auction/wizard/auction_lots_make_invoice_view.xml
@@ -0,0 +1,33 @@
+
+
+
+
+ auction.lots.make.invoice.form
+ auction.lots.make.invoice
+ form
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/auction/wizard/auction_lots_sms_send.py b/addons/auction/wizard/auction_lots_sms_send.py
new file mode 100644
index 00000000000..a5736ce4990
--- /dev/null
+++ b/addons/auction/wizard/auction_lots_sms_send.py
@@ -0,0 +1,78 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL ().
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+##############################################################################
+
+from osv import fields, osv
+from tools.translate import _
+import netsvc
+import pooler
+import time
+import tools
+import wizard
+
+class auction_lots_sms_send(osv.osv_memory):
+
+ _name = "auction.lots.sms.send"
+ _description = "Sms send "
+ _columns= {
+ 'app_id':fields.char('API ID', size=64, required=True),
+ 'user':fields.char('Login', size=64, required=True),
+ 'password':fields.char('Password', size=64, required=True),
+ 'text':fields.text('SMS Message', required=True)
+ }
+
+ def sms_send(self, cr, uid, ids, context):
+ """
+ to send sms
+
+ @param cr: the current row, from the database cursor.
+ @param uid: the current user’s ID for security checks.
+ @param ids: the ID or list of IDs
+ @param context: A standard dictionary
+ @return: number indicating the acknowledgement
+ """
+
+ lot_obj = self.pool.get('auction.lots')
+ partner_obj = self.pool.get('res.partner')
+ partner_address_obj = self.pool.get('res.partner.address')
+ for datas in self.read(cr, uid, ids):
+ lots = lot_obj.read(cr, uid, context['active_ids'], ['obj_num','obj_price','ach_uid'])
+ res = partner_obj.read(cr, uid, [l['ach_uid'][0] for l in lots if l['ach_uid']], ['gsm'], context)
+
+ nbr = 0
+ for r in res:
+ add = partner_obj.address_get(cr, uid, [r['id']])['default']
+ addr = partner_address_obj.browse(cr, uid, add)
+ to = addr.mobile
+ if to:
+ tools.smssend(data['user'], data['password'], data['app_id'], unicode(data['text'], 'utf-8').encode('latin1'), to)
+ nbr += 1
+ return {'sms_sent': nbr}
+
+ if to:
+ tools.smssend(data['user'], data['password'], data['app_id'], unicode(data['text'], 'utf-8').encode('latin1'), to)
+ nbr += 1
+ return {'sms_sent': nbr}
+#
+auction_lots_sms_send()
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/auction/wizard/auction_lots_sms_send_view.xml b/addons/auction/wizard/auction_lots_sms_send_view.xml
new file mode 100644
index 00000000000..22aa9d681ac
--- /dev/null
+++ b/addons/auction/wizard/auction_lots_sms_send_view.xml
@@ -0,0 +1,35 @@
+
+
+
+
+ auction.lots.sms.send.form
+ auction.lots.sms.send
+ form
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/auction/wizard/auction_pay_buy.py b/addons/auction/wizard/auction_pay_buy.py
new file mode 100644
index 00000000000..28028f45538
--- /dev/null
+++ b/addons/auction/wizard/auction_pay_buy.py
@@ -0,0 +1,107 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL ().
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+##############################################################################
+
+from osv import fields, osv
+from tools.translate import _
+import time
+import tools
+
+class auction_pay_buy(osv.osv_memory):
+ _name = "auction.pay.buy"
+ _description = "Pay buy"
+
+ _columns= {
+ 'amount': fields.float('Amount paid', digits= (16, int(tools.config['price_accuracy']))),
+ 'buyer_id':fields.many2one('res.partner', 'Buyer'),
+ 'statement_id1':fields.many2one('account.bank.statement', 'Statement', required=True),
+ 'amount2': fields.float('Amount paid', digits= (16, int(tools.config['price_accuracy']))),
+ 'statement_id2':fields.many2one('account.bank.statement', 'Statement'),
+ 'amount3': fields.float('Amount paid', digits = (16, int(tools.config['price_accuracy']))),
+ 'statement_id3':fields.many2one('account.bank.statement', 'Statement'),
+ 'total': fields.float('Amount paid', digits = (16, int(tools.config['price_accuracy'])), readonly =True),
+ }
+
+ def default_get(self, cr, uid, fields, context):
+ """
+ To get default values for the object.
+ @param self: The object pointer.
+ @param cr: A database cursor
+ @param uid: ID of the user currently logged in
+ @param fields: List of fields for which we want default values
+ @param context: A standard dictionary
+ @return: A dictionary which of fields with values.
+ """
+ res = super(auction_pay_buy, self).default_get(cr, uid, fields, context=context)
+ for lot in self.pool.get('auction.lots').browse(cr, uid, context.get('active_ids', [])):
+ if 'amount' in fields:
+ res.update({'amount': lot.buyer_price})
+ if 'buyer_id' in fields:
+ res.update({'buyer_id': lot.ach_uid and lot.ach_uid.id or False})
+ if 'total' in fields:
+ res.update({'total': lot.buyer_price})
+ return res
+
+ def pay_and_reconcile(self, cr, uid, ids, context):
+ """
+ Pay and Reconcile
+ @param cr: the current row, from the database cursor.
+ @param uid: the current user’s ID for security checks.
+ @param ids: the ID or list of IDs
+ @param context: A standard dictionary
+ @return:
+ """
+ lot_obj = self.pool.get('auction.lots')
+ bank_statement_line_obj = self.pool.get('account.bank.statement.line')
+
+ for datas in self.read(cr, uid, ids):
+ if not abs(datas['total'] - (datas['amount'] + datas['amount2'] + datas['amount3'])) <0.01:
+ rest = datas['total']-(datas['amount'] + datas['amount2'] + datas['amount3'])
+ raise osv.except_osv('Payment aborted !', 'You should pay all the total: "%.2f" are missing to accomplish the payment.' %(round(rest, 2)))
+
+ lots = lot_obj.browse(cr, uid, context['active_ids'], context)
+ ref_bk_s = bank_statement_line_obj
+
+ for lot in lots:
+ if datas['buyer_id']:
+ lot_obj.write(cr, uid, [lot.id], {'ach_uid':datas['buyer_id']})
+ if not lot.auction_id:
+ raise osv.except_osv('Error !', 'No auction date for "%s": Please set one.'%(lot.name))
+ lot_obj.write(cr, uid, [lot.id], {'is_ok':True})
+
+ for st, stamount in [('statement_id1', 'amount'), ('statement_id2', 'amount2'), ('statement_id3', 'amount3')]:
+ if datas[st]:
+ new_id = ref_bk_s.create(cr, uid, {
+ 'name':'Buyer:'+ str(lot.ach_login or '')+', auction:'+ lots[0].auction_id.name,
+ 'date': time.strftime('%Y-%m-%d'),
+ 'partner_id': datas['buyer_id'] or False,
+ 'type':'customer',
+ 'statement_id': datas[st],
+ 'account_id': lot.auction_id.acc_income.id,
+ 'amount': datas[stamount]
+ })
+ for lot in lots:
+ lot_obj.write(cr, uid, [lot.id], {'statement_id':[(4, new_id)]})
+ return {}
+
+auction_pay_buy()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/auction/wizard/auction_pay_buy_view.xml b/addons/auction/wizard/auction_pay_buy_view.xml
new file mode 100644
index 00000000000..0a9a3a6dcee
--- /dev/null
+++ b/addons/auction/wizard/auction_pay_buy_view.xml
@@ -0,0 +1,37 @@
+
+
+
+
+ auction.pay.buy.form
+ auction.pay.buy
+ form
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/auction/wizard/auction_pay_sel.py b/addons/auction/wizard/auction_pay_sel.py
new file mode 100644
index 00000000000..6873092c7e9
--- /dev/null
+++ b/addons/auction/wizard/auction_pay_sel.py
@@ -0,0 +1,56 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL ().
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+##############################################################################
+from osv import fields, osv
+from tools.translate import _
+import tools
+
+class auction_pay_sel(osv.osv_memory):
+ _name = "auction.pay.sel"
+ _description = "Pay Invoice"
+
+ _columns= {
+ 'amount': fields.float('Amount paid', digits= (16, int(tools.config['price_accuracy'])), required=True),
+ 'dest_account_id':fields.many2one('account.account', 'Payment to Account', required=True, domain= [('type', '=', 'cash')]),
+ 'journal_id':fields.many2one('account.journal', 'Journal', required=True),
+ 'period_id':fields.many2one('account.period', 'Period', required=True),
+ }
+
+ def pay_and_reconcile(self, cr, uid, ids, context):
+ """
+ Pay and Reconcile
+ @param cr: the current row, from the database cursor.
+ @param uid: the current user’s ID for security checks.
+ @param ids: the ID or list of IDs
+ @param context: A standard dictionary
+ @return:
+ """
+ lot = self.pool.get('auction.lots').browse(cr, uid, context['active_id'], context)
+ invoice_obj = self.pool.get('account.invoice')
+ for datas in self.read(cr, uid, ids):
+ account_id = datas.get('writeoff_acc_id', False)
+ period_id = datas.get('period_id', False)
+ journal_id = datas.get('journal_id', False)
+ if lot.sel_inv_id:
+ p = invoice_obj.pay_and_reconcile(['lot.sel_inv_id.id'], datas['amount'], datas['dest_account_id'], journal_id, account_id, period_id, journal_id, context)
+ # lots.sel_inv_id.pay_and_reconcile(cr,uid,data[id], form['amount'], form['dest_account_id'], journal_id, account_id, period_id, journal_id, context)
+ return {}
+
+auction_pay_sel()
diff --git a/addons/auction/wizard/auction_pay_sel_view.xml b/addons/auction/wizard/auction_pay_sel_view.xml
new file mode 100644
index 00000000000..2570b7a7a0a
--- /dev/null
+++ b/addons/auction/wizard/auction_pay_sel_view.xml
@@ -0,0 +1,35 @@
+
+
+
+
+ auction.pay.sel.form
+ auction.pay.sel
+ form
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Pay objects of the seller
+ auction.pay.sel
+ form
+ tree,form
+
+ new
+
+
+
+
diff --git a/addons/auction/wizard/auction_wizard_able_taken.py b/addons/auction/wizard/auction_payer_sel.py
similarity index 52%
rename from addons/auction/wizard/auction_wizard_able_taken.py
rename to addons/auction/wizard/auction_payer_sel.py
index 261cc47c48b..c422ee91857 100644
--- a/addons/auction/wizard/auction_wizard_able_taken.py
+++ b/addons/auction/wizard/auction_payer_sel.py
@@ -19,43 +19,35 @@
#
##############################################################################
-import wizard
-import netsvc
-import pooler
-take_form = """
-
-
-
-
-"""
-
-take_fields = {
-# 'confirm_en': {'string':'Catalog Number', 'type':'integer'},
-}
-
-def _confirm_able(self,cr,uid,data,context={}):
- res={}
- pool = pooler.get_pool(cr.dbname)
- pool.get('auction.lots').write(cr,uid,data['ids'],{'ach_emp':True})
- return {}
-
-class able_take_away(wizard.interface):
- states = {
- 'init' : {
- 'actions' : [],
- 'result' : {
- 'type' : 'form',
- 'arch' : take_form,
- 'fields' : take_fields,
- 'state' : [('end', 'Cancel'),('go', 'Able Taken away')]}
- },
- 'go' : {
- 'actions' : [_confirm_able],
- 'result' : {'type' : 'state', 'state' : 'end'}
- },
-}
-able_take_away('auction.lots.able')
+from osv import fields, osv
+class auction_payer(osv.osv_memory):
+ _name = "auction.payer"
+ _description = "Auction payer"
+
+ def payer(self, cr, uid, ids, context):
+ self.pool.get('auction.lots').write(cr, uid, context['active_ids'], {'is_ok':True, 'state':'paid'})
+ return {}
+
+auction_payer()
+class auction_payer_sel(osv.osv_memory):
+ """
+ For Mark as payment for seller
+ """
+ _name = "auction.payer.sel"
+ _description = "Auction payment for seller"
+
+ def payer_sel(self, cr, uid, ids, context):
+ """
+ This function Update auction lots object and seller paid true.
+ @param cr: the current row, from the database cursor,
+ @param uid: the current user’s ID for security checks,
+ @param ids: List of auction payer sel’s IDs.
+ """
+ self.pool.get('auction.lots').write(cr, uid, context['active_ids'], {'paid_vnd':True})
+ return {}
+
+auction_payer_sel()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/auction/wizard/auction_payer_sel_view.xml b/addons/auction/wizard/auction_payer_sel_view.xml
new file mode 100644
index 00000000000..57c43df8fe4
--- /dev/null
+++ b/addons/auction/wizard/auction_payer_sel_view.xml
@@ -0,0 +1,43 @@
+
+
+
+
+ auction.payer.form
+ auction.payer
+ form
+
+
+
+
+
+
+
+
+
+
+
+
+ auction.payer.sel.form
+ auction.payer.sel
+ form
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/auction/wizard/auction_taken.py b/addons/auction/wizard/auction_taken.py
new file mode 100644
index 00000000000..005fd042646
--- /dev/null
+++ b/addons/auction/wizard/auction_taken.py
@@ -0,0 +1,57 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL ().
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+##############################################################################
+from osv import fields, osv
+from tools.translate import _
+import netsvc
+import pooler
+import time
+import tools
+import wizard
+
+class auction_taken(osv.osv_memory):
+ """
+ Auction lots taken.
+ """
+ _name = "auction.taken"
+ _description = "Auction taken"
+
+ _columns = {
+ 'lot_ids':fields.many2many('auction.lots', 'auction_taken_rel', 'taken_id', 'lot_id', 'Lots Emportes'),
+ }
+
+ def _to_xml(s):
+ return s.replace('&','&').replace('<','<').replace('>','>')
+
+ def process(self, cr, uid, ids, context):
+ """
+ Update Auction lots state to taken_away.
+ @param cr: the current row, from the database cursor.
+ @param uid: the current user’s ID for security checks.
+ @param ids: List of Auction taken’s IDs
+ @return: dictionary of lot_ids fields with empty list
+ """
+ lot_obj = self.pool.get('auction.lots')
+ for data in self.read(cr, uid, ids):
+ if data['lot_ids']:
+ lot_obj.write(cr, uid, data['lot_ids'], {'state':'taken_away'})
+ return {'lot_ids': []}
+
+auction_taken()
diff --git a/addons/auction/wizard/auction_taken_view.xml b/addons/auction/wizard/auction_taken_view.xml
new file mode 100644
index 00000000000..626caa473ad
--- /dev/null
+++ b/addons/auction/wizard/auction_taken_view.xml
@@ -0,0 +1,42 @@
+
+
+
+
+ auction.taken.form
+ auction.taken
+ form
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Gestion emporte
+ auction.taken
+ form
+ tree,form
+
+ new
+
+
+
+
+
+
diff --git a/addons/auction/wizard/auction_transfer_unsold_object.py b/addons/auction/wizard/auction_transfer_unsold_object.py
new file mode 100644
index 00000000000..47aadc25d59
--- /dev/null
+++ b/addons/auction/wizard/auction_transfer_unsold_object.py
@@ -0,0 +1,86 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL ().
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+##############################################################################
+
+from osv import osv
+from osv import fields
+
+class auction_transfer_unsold_object(osv.osv):
+ '''
+ Open ERP Model
+ '''
+ _name = 'auction.transfer.unsold.object'
+ _description = 'To transfer unsold objects'
+
+ _columns = {
+ 'auction_id_from':fields.many2one('auction.dates', 'From Auction Date', required=True),
+ 'auction_id_to':fields.many2one('auction.dates', 'To Auction Date', required=True),
+ }
+
+ _defaults = {
+ 'auction_id_from': _start,
+ }
+
+ def _start(self, cr, uid, context):
+ """
+ To initialize auction_id_from
+ @param self: The object pointer.
+ @param cr: A database cursor
+ @param uid: ID of the user currently logged in
+ @param ids: List of IDs selected
+ @param context: A standard dictionary
+ @return: auction_id_from
+ """
+ lots_obj = self.pool.get('auction.lots')
+ rec = lots_obj.browse(cr, uid, context['active_id'], context)
+ auction_from = rec and rec.auction_id.id or False
+ return auction_from
+
+ def transfer_unsold_object(self, cr, uid, ids, context):
+ """
+ To Transfer the unsold object
+ @param self: The object pointer.
+ @param cr: A database cursor
+ @param uid: ID of the user currently logged in
+ @param ids: List of IDs selected
+ @param context: A standard dictionary
+ @return:
+ """
+ bid_line_obj = self.pool.get('auction.bid_line')
+ lots_obj = self.pool.get('auction.lots')
+ lot_history_obj = self.pool.get('auction.lot.history')
+ line_ids= bid_line_obj.search(cr,uid,[('lot_id','in',context['active_ids'])])
+ bid_line_obj.unlink(cr, uid, line_ids)
+
+ res = self.browse(cr, uid, ids)
+ unsold_ids = lots_obj.search(cr,uid,[('auction_id','=',res[0].auction_id_from.id),('state','=','unsold')])
+ for rec in lots_obj.browse(cr, uid, unsold_ids, context):
+ new_id = lot_history_obj.create(cr,uid,{'auction_id':rec.auction_id.id,'lot_id':rec.id,'price': rec.obj_ret, 'name': rec.auction_id.auction1})
+ up_auction = lots_obj.write(cr,uid,[rec.id],{'auction_id': res[0].auction_id_to.id,
+ 'obj_ret':None,
+ 'obj_price':None,
+ 'ach_login':None,
+ 'ach_uid':None,
+ 'ach_inv_id':None,
+ 'sel_inv_id':None,
+ 'state':'draft'})
+ return {}
+
+auction_transfer_unsold_object()
\ No newline at end of file
diff --git a/addons/auction/wizard/auction_transfer_unsold_object_view.xml b/addons/auction/wizard/auction_transfer_unsold_object_view.xml
new file mode 100644
index 00000000000..768043b3bed
--- /dev/null
+++ b/addons/auction/wizard/auction_transfer_unsold_object_view.xml
@@ -0,0 +1,26 @@
+
+
+
+
+ auction.transfer.unsold.object.form
+ auction.transfer.unsold.object
+ form
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/auction/wizard/auction_wizard_enable_taken.py b/addons/auction/wizard/auction_wizard_enable_taken.py
deleted file mode 100644
index 01f54ca28dc..00000000000
--- a/addons/auction/wizard/auction_wizard_enable_taken.py
+++ /dev/null
@@ -1,61 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2010 Tiny SPRL ().
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
-#
-##############################################################################
-
-import wizard
-import netsvc
-import pooler
-#field name="confirm_en"/>
-
-take_form = """
-
-
-
-
-"""
-
-take_fields = {
- 'confirm_en': {'string':'Catalog Number', 'type':'integer'},
-}
-
-def _confirm_enable(self,cr,uid,data,context={}):
- pool = pooler.get_pool(cr.dbname)
- pool.get('auction.lots').write(cr,uid,data['ids'],{'ach_emp':False})
- return {}
-
-class enable_take_away(wizard.interface):
- states = {
- 'init' : {
- 'actions' : [],
- 'result' : {
- 'type' : 'form',
- 'arch' : take_form,
- 'fields' : take_fields,
- 'state' : [ ('end', 'Cancel'),('go', 'Enable Taken away')]}
- },
- 'go' : {
- 'actions' : [_confirm_enable],
- 'result' : {'type' : 'state', 'state' : 'end'}
- },
-}
-enable_take_away('auction.lots.enable')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/auction/wizard/wizard_auction_invoice_buyer.py b/addons/auction/wizard/wizard_auction_invoice_buyer.py
deleted file mode 100644
index 6cf12b5da22..00000000000
--- a/addons/auction/wizard/wizard_auction_invoice_buyer.py
+++ /dev/null
@@ -1,111 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2010 Tiny SPRL ().
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
-#
-##############################################################################
-
-import wizard
-import netsvc
-import pooler
-
-invoice_form = '''
-
-
-
-
-
-
- '''
-
-invoice_fields = {
- 'amount': {'string':'Invoiced Amount', 'type':'float', 'required':True, 'readonly':True},
- 'objects': {'string':'# of objects', 'type':'integer', 'required':True, 'readonly':True},
- 'number': {'string':'Invoice Number', 'type':'char'},
- 'buyer_id':{'string': 'Buyer', 'type': 'many2one', 'relation':'res.partner'}
-
-}
-
-
-def _values(self,cr,uid, datas,context={}):
- pool = pooler.get_pool(cr.dbname)
- lots= pool.get('auction.lots').browse(cr,uid,datas['ids'])
-# price = 0.0
- amount_total=0.0
-# pt_tax=pooler.get_pool(cr.dbname).get('account.tax')
- for lot in lots:
- buyer=lot and lot.ach_uid.id or False
- amount_total+=lot.buyer_price
-# taxes = lot.product_id.taxes_id
-# if lot.author_right:
-# taxes.append(lot.author_right)
-# if lot.auction_id:
-# taxes += lot.auction_id.buyer_costs
-# tax=pt_tax.compute(cr,uid,taxes,lot.obj_price,1)
-# for t in tax:
-# amount_total+=t['amount']
-# amount_total+=lot.obj_price
- # up_auction=pooler.get_pool(cr.dbname).get('auction.lots').write(cr,uid,[lot.id],{'ach_uid':datas['form']['buyer_id']})
- invoice_number = False
- return {'objects':len(datas['ids']), 'amount':amount_total, 'number':invoice_number,'buyer_id':buyer}
-
-
-def _makeInvoices(self, cr, uid, data, context):
- newinv = []
- pool = pooler.get_pool(cr.dbname)
- order_obj = pool.get('auction.lots')
- mod_obj = pool.get('ir.model.data')
- result = mod_obj._get_id(cr, uid, 'account', 'view_account_invoice_filter')
- id = mod_obj.read(cr, uid, result, ['res_id'])
- lots= order_obj.browse(cr,uid,data['ids'])
- invoice_number=data['form']['number']
- for lot in lots:
- up_auction=pooler.get_pool(cr.dbname).get('auction.lots').write(cr,uid,[lot.id],{'ach_uid':data['form']['buyer_id']})
- ids = order_obj.lots_invoice(cr, uid, data['ids'],context,data['form']['number'])
-# ids = order_obj.lots_invoice(cr, uid, data['ids'],context,invoice_number)
- cr.commit()
- return {
- 'domain': "[('id','in', ["+','.join(map(str, ids))+"])]",
- 'name': 'Buyer invoices',
- 'view_type': 'form',
- 'view_mode': 'tree,form',
- 'res_model': 'account.invoice',
- 'view_id': False,
- 'context': "{'type':'in_refund'}",
- 'type': 'ir.actions.act_window',
- 'search_view_id': id['res_id']
- }
- return {}
-
-class make_invoice(wizard.interface):
- states = {
- 'init' : {
- 'actions' : [_values],
- 'result' : {'type' : 'form',
- 'arch' : invoice_form,
- 'fields' : invoice_fields,
- 'state' : [('end', 'Cancel'),('invoice', 'Create invoices')]}
- },
- 'invoice' : {
- 'actions' : [],
- 'result' : {'type' : 'action',
- 'action' : _makeInvoices}
- },
- }
-make_invoice("auction.lots.make_invoice_buyer")
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/auction/wizard/wizard_auction_journal.py b/addons/auction/wizard/wizard_auction_journal.py
deleted file mode 100644
index 79329592165..00000000000
--- a/addons/auction/wizard/wizard_auction_journal.py
+++ /dev/null
@@ -1,105 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2010 Tiny SPRL ().
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
-#
-##############################################################################
-
-import wizard
-import netsvc
-import pooler
-
-
-
-invoice_form = '''
-
-
-
-
- '''
-
-invoice_fields = {
- 'amount': {'string':'Invoiced Amount', 'type':'float', 'required':True, 'readonly':True},
- 'objects': {'string':'# of objects', 'type':'integer', 'required':True, 'readonly':True},
- 'number': {'string':'Invoice Number', 'type':'integer'},
-}
-
-def _values(self,cr,uid, datas,context={}):
- lots= pooler.get_pool(cr.dbname).get('auction.lots').browse(cr,uid,datas['ids'])
-# service = netsvc.LocalService("object_proxy")
-# lots = service.execute(cr,uid, 'auction.lots', 'read', datas['ids'])
-# auction = service.execute(cr,uid, 'auction.dates', 'read', [lots[0]['auction_id'][0]])[0]
- price = 0.0
- amount_total=0.0
- pt_tax=pooler.get_pool(cr.dbname).get('account.tax')
- for lot in lots:
- # taxes = lot.product_id.taxes_id
- # if lot.bord_vnd_id.tax_id:
- # taxes.append(lot.bord_vnd_id.tax_id)
- # if lot.auction_id:
- # taxes += lot.auction_id.seller_costs
- # tax=pt_tax.compute(cr,uid,taxes,lot.obj_price,1)
- # for t in tax:
- # amount_total+=t['amount']
- # amount_total+=lot.obj_price
- amount_total+=lot.seller_price
-#TODO: recuperer id next invoice (de la sequence)???
- invoice_number = False
- return {'objects':len(datas['ids']), 'amount':amount_total, 'number':invoice_number}
-
-def _makeInvoices(self, cr, uid, data, context):
-
- pool = pooler.get_pool(cr.dbname)
- order_obj = pool.get('auction.lots')
- mod_obj = pool.get('ir.model.data')
- result = mod_obj._get_id(cr, uid, 'account', 'view_account_invoice_filter')
- id = mod_obj.read(cr, uid, result, ['res_id'])
- newinv = []
- ids = order_obj.seller_trans_create(cr, uid, data['ids'],context)
- cr.commit()
- return {
- 'domain': "[('id','in', ["+','.join(map(str, ids))+"])]",
- 'name': 'Seller invoices',
- 'view_type': 'form',
- 'view_mode': 'tree,form',
- 'res_model': 'account.invoice',
- 'view_id': False,
- 'context': "{'type':'out_refund'}",
- 'type': 'ir.actions.act_window',
- 'search_view_id': id['res_id']
- }
- return {}
-
-class make_invoice(wizard.interface):
- states = {
- 'init' : {
- 'actions' : [_values],
- 'result' : {'type' : 'form',
- 'arch' : invoice_form,
- 'fields' : invoice_fields,
- 'state' : [('end', 'Cancel'),('invoice', 'Create invoices')]}
- },
- 'invoice' : {
- 'actions' : [_makeInvoices],
- 'result' : {'type' : 'action',
- 'action' : _makeInvoices,
- 'state' : 'end'}
- },
- }
-make_invoice("auction.lots.make_invoice")
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/auction/wizard/wizard_emporte.py b/addons/auction/wizard/wizard_emporte.py
deleted file mode 100644
index 1172404e218..00000000000
--- a/addons/auction/wizard/wizard_emporte.py
+++ /dev/null
@@ -1,73 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2010 Tiny SPRL ().
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
-#
-##############################################################################
-
-import wizard
-import netsvc
-
-import pooler
-from tools.misc import UpdateableStr
-
-
-# Dossier
-
-_lot_arch = """
-
-
-
-
-"""
-_lot_fields = {
- 'lot_ids': {'string':'Lots Emportes','relation':'auction.lots','type':'many2many'}
-}
-
-def _to_xml(s):
- return s.replace('&','&').replace('<','<').replace('>','>')
-
-def _process(self, cr, uid, data, context):
- pool = pooler.get_pool(cr.dbname)
- lot_obj = pool.get('auction.lots')
- if data['form']['lot_ids']:
- lot_obj.write(cr, uid, data['form']['lot_ids'][0][2], {'state':'taken_away'})
- return {'lot_ids': []}
-
-class wizard_reprint(wizard.interface):
- states = {
- 'valid': {
- 'actions': [_process],
- 'result': {'type':'state', 'state':'init'}
- },
- 'init': {
- 'actions': [],
- 'result': {
- 'type':'form',
- 'arch': _lot_arch,
- 'fields': _lot_fields,
- 'state': [
- ('valid',' OK ')
- ],
- }
- }
- }
-wizard_reprint('auction.taken')
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/auction/wizard/wizard_lot_date_move.py b/addons/auction/wizard/wizard_lot_date_move.py
deleted file mode 100644
index e6e13ea0ab2..00000000000
--- a/addons/auction/wizard/wizard_lot_date_move.py
+++ /dev/null
@@ -1,96 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2010 Tiny SPRL ().
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
-#
-##############################################################################
-
-import wizard
-import netsvc
-import pooler
-import sql_db
-
-auction_move = '''
-
-
-
-
-
-
- '''
-
-auction_move_fields = {
- 'auction_id': {'string':'Auction Date', 'type':'many2one', 'required':True, 'relation':'auction.dates'},
-}
-
-#def _auction_move_set(self, uid, datas):
-# if datas['form']['auction_id']:
-# cr = sql_db.db.cursor()
-# cr.execute('update auction_lots set auction_id=%s, obj_price=NULL, ach_login=NULL, ach_uid=NULL, ach_pay_id=NULL, ach_inv_id=NULL, state=%s where id in ('+','.join(map(str, datas['ids']))+')', (str(datas['form']['auction_id']), 'draft'))
-# cr.execute('delete from auction_bid_line where lot_id in ('+','.join(map(str, datas['ids']))+')')
-# cr.commit()
-# cr.close()
-# return {}
-def _top(self,cr,uid,datas,context={}):
- refs = pooler.get_pool(cr.dbname).get('auction.lots')
- rec_ids = refs.browse(cr,uid,datas['ids'])
- for rec in rec_ids:
- if not rec.auction_id:
- raise wizard.except_wizard('Error !','You can not move a lot that has no auction date')
- return {}
-def _auction_move_set(self,cr,uid,datas,context={}):
- if not (datas['form']['auction_id'] and len(datas['ids'])) :
- return {}
- refs = pooler.get_pool(cr.dbname).get('auction.lots')
- rec_ids = refs.browse(cr,uid,datas['ids'])
-
- line_ids= pooler.get_pool(cr.dbname).get('auction.bid_line').search(cr,uid,[('lot_id','in',datas['ids'])])
-# pooler.get_pool(cr.dbname).get('auction.bid_line').unlink(cr, uid, line_ids)
- for rec in rec_ids:
- new_id=pooler.get_pool(cr.dbname).get('auction.lot.history').create(cr,uid,{
- 'auction_id':rec.auction_id.id,
- 'lot_id':rec.id,
- 'price': rec.obj_ret
- })
- up_auction=pooler.get_pool(cr.dbname).get('auction.lots').write(cr,uid,[rec.id],{
- 'auction_id':datas['form']['auction_id'],
- 'obj_ret':None,
- 'obj_price':None,
- 'ach_login':None,
- 'ach_uid':None,
- 'ach_inv_id':None,
- 'sel_inv_id':None,
- 'obj_num':None,
- 'state':'draft'})
- return {}
-
-class wiz_auc_lots_auction_move(wizard.interface):
- states = {
- 'init': {
- 'actions': [_top],
- 'result': {'type': 'form', 'arch':auction_move, 'fields': auction_move_fields, 'state':[('set_date', 'Move to Auction date'),('end','Cancel')]}
- },
- 'set_date': {
- 'actions': [_auction_move_set],
- 'result': {'type': 'state', 'state':'end'}
- }
- }
-
-wiz_auc_lots_auction_move('auction.lots.auction_move')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/auction/wizard/wizard_lots_buyer_map.py b/addons/auction/wizard/wizard_lots_buyer_map.py
deleted file mode 100644
index 42c5f80a530..00000000000
--- a/addons/auction/wizard/wizard_lots_buyer_map.py
+++ /dev/null
@@ -1,107 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2010 Tiny SPRL ().
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
-#
-##############################################################################
-
-import wizard
-import netsvc
-import pooler
-import sql_db
-
-buyer_map = '''
-
-
-
-
- '''
-
-buyer_map_fields = {
- 'ach_login': {'string':'Buyer Username', 'type':'char', 'size':64, 'required':True},
- 'ach_uid': {'string':'Buyer', 'type':'many2one', 'required':True, 'relation':'res.partner'},
-}
-
-
-#
-# Try to find an object not mapped
-#
-def _state_check(self, cr, uid, data, context):
- pool = pooler.get_pool(cr.dbname)
- cr.execute('select id from auction_lots where (ach_uid is null and ach_login is not null) ')
- v_ids=[x[0] for x in cr.fetchall()]
- #ids_not_mapped=pool.get('auction.lots').search(cr,uid,[('rec.ach_uid','=',False)])
- for rec in pool.get('auction.lots').browse(cr,uid,v_ids,context):
- # if not rec.ach_uid and not rec.ach_login:
- # raise wizard.except_wizard ('Error','No username is associated to this lot!')
- if (not rec.ach_uid or not rec.ach_login):
- return 'check'
- return 'done'
-
-def _start(self,cr,uid,datas,context):
- pool = pooler.get_pool(cr.dbname)
- for rec in pool.get('auction.lots').browse(cr,uid,datas['ids'],context):
- if (len(datas['ids'])==1) and (not rec.ach_uid and not rec.ach_login):
- raise wizard.except_wizard('Error', 'No buyer setted for this lot')
- if not rec.ach_uid and rec.ach_login:
- return {'ach_login': rec.ach_login}
-
- for rec in pool.get('auction.lots').browse(cr,uid,datas['ids'],context):
- if (not rec.ach_uid and rec.ach_login):
- return {'ach_login': rec.ach_login}
- return {}
-
-def _buyer_map_set(self,cr, uid, datas,context):
- pool = pooler.get_pool(cr.dbname)
- recs=pool.get('auction.lots').browse(cr,uid,datas['ids'],context)
- for rec in recs:
- if rec.ach_login==datas['form']['ach_login']:
- pool.get('auction.lots').write(cr, uid, [rec.id], {'ach_uid': datas['form']['ach_uid']}, context=context)
- cr.commit()
- return {'ach_login':False, 'ach_uid':False}
-
-class wiz_auc_lots_buyer_map(wizard.interface):
- states = {
- 'init': {
- 'actions': [],
- 'result': {'type': 'choice', 'next_state':_state_check}
- },
- 'check': {
- 'actions': [_start],
- 'result': {'type': 'form', 'arch':buyer_map, 'fields': buyer_map_fields, 'state':[('end','Exit'),('set_buyer', 'Update')]}
- },
- 'set_buyer': {
- 'actions': [_buyer_map_set],
- 'result': {'type': 'state', 'state':'init'}
- },
- 'done': {
- 'actions': [_start],
- 'result': {
- 'type': 'form',
- 'arch':'''
-
-
- ''',
- 'fields': {},
- 'state':[('end','Close')]}
- }
- }
-
-wiz_auc_lots_buyer_map('auction.lots.buyer_map')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/auction/wizard/wizard_lots_cancel.py b/addons/auction/wizard/wizard_lots_cancel.py
deleted file mode 100644
index 1d7f93b14d3..00000000000
--- a/addons/auction/wizard/wizard_lots_cancel.py
+++ /dev/null
@@ -1,91 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2010 Tiny SPRL ().
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
-#
-##############################################################################
-
-import wizard
-import netsvc
-import pooler
-
-paid_form = '''
-
-
- '''
-fields_ask = {
-}
-#
-#def _get_value(self,cr,uid, datas,context={}):
-## service = netsvc.LocalService("object_proxy")
-# lots=pool.get('auction.lots').browse(cr,uid,data['id'],context)
-#
-#
-## lots = service.execute(cr.dbname,uid, 'auction.lots', 'read', datas['ids'])
-#
-# ids = []
-# pay_ids = {}
-# price = 0.0
-# price_paid = 0.0
-# uid = False
-#
-##TODO: refuse if several payments?
-# for lot in lots:
-# price += lot['obj_price']
-#
-# # add all the buyer costs
-# costs = service.execute(cr.dbname,uid, 'auction.lots', 'compute_buyer_costs', [lot['id']])
-# for cost in costs:
-# price += cost['amount']
-#
-##TODO: pr bien faire, faudrait leur poser la question: continue anyway?
-# if len(ids)).
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
-#
-##############################################################################
-
-import wizard
-import netsvc
-
-invoice_form = '''
-
-
-
-
-
-
-
-
-
-
- '''
-
-invoice_fields = {
- 'amount': {'string':'Invoiced Amount', 'type':'float', 'required':True, 'readonly':True},
- 'amount_topay': {'string':'Amount to pay', 'type':'float', 'required':True, 'readonly':True},
- 'amount_paid': {'string':'Amount paid', 'type':'float', 'readonly':True},
- 'objects': {'string':'# of objects', 'type':'integer', 'required':True, 'readonly':True},
- 'ach_uid': {'string':'Buyer Name', 'type':'many2one', 'required':True, 'relation':'res.partner'},
- 'number': {'string':'Invoice Number', 'type':'integer'},
- #'tax_applied':{'string':'Tax Applied', 'type':'float', 'readonly':True},
-}
-
-def _get_value(self,cr,uid, datas,context={}):
- service = netsvc.LocalService("object_proxy")
- lots = service.execute(cr,uid, 'auction.lots', 'read', datas['ids'])
- auction = service.execute(cr,uid, 'auction.dates', 'read', [lots[0]['auction_id'][0]])[0]
-
- price = 0.0
- price_topay = 0.0
- price_paid = 0.0
- #tax=data['form']['tax_applied']
- uid = False
- for lot in lots:
- price_lot = lot['obj_price'] or 0.0
-
- costs = service.execute(uid, 'auction.lots', 'compute_buyer_costs', [lot['id']])
- for cost in costs:
- price_lot += cost['amount']
-
- price += price_lot
-
- if lot['ach_uid']:
- if uid and (lot['ach_uid'][0]<>uid):
- raise wizard.except_wizard('UserError', ('Two different buyers for the same invoice !\nPlease correct this problem before invoicing', 'init'))
- uid = lot['ach_uid'][0]
- elif lot['ach_login']:
- refs = service.execute(uid, 'res.partner', 'search', [('ref','=',lot['ach_login'])])
- if len(refs):
- uid = refs[-1]
- if lot['ach_pay_id']:
- price_paid += price_lot
- #*tax
- else:
- price_topay += price_lot
- #*tax
-
-#TODO: recuperer id next invoice (de la sequence)???
- invoice_number = False
- return {'objects':len(datas['ids']), 'amount':price, 'ach_uid':uid, 'amount_topay':price_topay, 'amount_paid':price_paid, 'number':invoice_number}
-
-def _invoice(self, uid, datas):
- service = netsvc.LocalService("object_proxy")
- service.execute(uid, 'auction.lots', 'lots_invoice_and_cancel_old_invoice', datas['ids'], datas['form']['number'], datas['form']['ach_uid'], 'invoice_open')
- return {}
-
-class wiz_auc_lots_invoice(wizard.interface):
- states = {
- 'init': {
- 'actions': [_get_value],
- 'result': {'type': 'form', 'arch':invoice_form, 'fields': invoice_fields, 'state':[('invoice','Create Invoice'), ('end','Cancel')]}
- },
- 'invoice': {
- 'actions': [_invoice],
- 'result': {'type': 'print', 'report':'auction.invoice', 'state':'end'}
- }
- }
-wiz_auc_lots_invoice('auction.lots.invoice');
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/auction/wizard/wizard_lots_pay.py b/addons/auction/wizard/wizard_lots_pay.py
deleted file mode 100644
index a6b8f635ba4..00000000000
--- a/addons/auction/wizard/wizard_lots_pay.py
+++ /dev/null
@@ -1,103 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2010 Tiny SPRL ().
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
-#
-##############################################################################
-
-import wizard
-import netsvc
-import netsvc
-import osv
-import time
-import pooler
-
-invoice_form = '''
-
-
-
-
-
- '''
-
-invoice_fields = {
- 'amount': {'string': 'Amount paid', 'type':'float', 'required':True},
- 'dest_account_id': {'string':'Payment to Account', 'type':'many2one', 'required':True, 'relation':'account.account', 'domain':[('type','=','cash')]},
- 'journal_id': {'string': 'Journal', 'type': 'many2one', 'relation':'account.journal', 'required':True},
- 'period_id': {'string': 'Period', 'type': 'many2one', 'relation':'account.period', 'required':True},
-}
-#def pay_n_check(self, cr, uid, data, context):
-#
-# auction = pool.get('auction.lots').browse(cr,uid,data['id'],context)
-# try:
-#
-# for lot in auction:
-#
-# if not lot.auction_id :
-# raise osv.except_osv("Error","No payment defined for this auction.")
-# i=1
-# tot= 0
-# for payment in auction:
-# if not payment.journal_id :
-# raise osv.except_osv("Error","No journal defined for the payment line %d" % (i,))
-# if not payment.ach_inv_id.amount :
-# raise osv.except_osv("Error","No amount defined for the payment line %d." % (i,))
-# i+=1
-# tot+= payment.ach_inv_id.amount
-# if abs(float(tot)) - abs(float(lot.obj_ret)) > 10**-6:
-# raise osv.except_osv("Error","The amount paid does not match the total amount")
-# else:
-# for lot in auction:
-# if not lot.journal_id :
-# raise osv.except_osv("Error","Please choose a journal for the auction ("+lot.name+").")
-# pool.get('auction.lots').create(cr,uid,{
-# 'auction_id': lot.auction.id,
-# 'journal_id': lot.journal_id,
-#
-# })
-# except osv.except_osv, e:
-# raise wizard.except_wizard(e.name, e.name)
-# return True
-def _pay_and_reconcile(self, cr, uid, data, context):
-
- pool = pooler.get_pool(cr.dbname)
- lot = pool.get('auction.lots').browse(cr,uid,data['id'],context)
- form = data['form']
- account_id = form.get('writeoff_acc_id', False)
- period_id = form.get('period_id', False)
- journal_id = form.get('journal_id', False)
- if lot.sel_inv_id:
- p=pool.get('account.invoice').pay_and_reconcile(['lot.sel_inv_id.id'], form['amount'], form['dest_account_id'], journal_id, account_id, period_id, journal_id, context)
-# lots.sel_inv_id.pay_and_reconcile(cr,uid,data[id], form['amount'], form['dest_account_id'], journal_id, account_id, period_id, journal_id, context)
- return {}
-
-
-class wiz_auc_lots_pay(wizard.interface):
- states = {
- 'init': {
- 'actions': [],
- 'result': {'type': 'form', 'arch':invoice_form, 'fields': invoice_fields, 'state':[ ('pay','Pay'), ('end','Cancel')]}
- },
- 'pay': {
- 'actions': [_pay_and_reconcile],
- 'result': {'type': 'state', 'state':'end'}
- }}
-wiz_auc_lots_pay('auction.pay.sel');
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/auction/wizard/wizard_lots_sms.py b/addons/auction/wizard/wizard_lots_sms.py
deleted file mode 100644
index dc60a9bd24d..00000000000
--- a/addons/auction/wizard/wizard_lots_sms.py
+++ /dev/null
@@ -1,150 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2010 Tiny SPRL ().
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
-#
-##############################################################################
-
-import wizard
-import netsvc
-
-import urllib
-
-sms_send_form = '''
-
-
-
-
-
-
-
-
- ''' % ('SMS - Gateway: clickatell', 'Bulk SMS send')
-
-sms_send_fields = {
- 'app_id': {'string':'API ID', 'type':'char', 'required':True},
- 'user': {'string':'Login', 'type':'char', 'required':True},
- 'password': {'string':'Password', 'type':'char', 'required':True},
- 'text': {'string':'SMS Message', 'type':'text', 'required':True, 'value':'Les lots [lots] vous ont etes adjuges. -- Rops'}
-}
-##############################################################################
-#
-# Copyright (c) 2004-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
-# Fabien Pinckaers
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-##############################################################################
-
-import wizard
-import netsvc
-import pooler
-
-sms_send_form = '''
-
-
-
-
-
-
-
-
- ''' % ('SMS - Gateway: clickatell','Bulk SMS send')
-
-sms_send_fields = {
- 'app_id': {'string':'API ID', 'type':'char', 'required':True},
- 'user': {'string':'Login', 'type':'char', 'required':True},
- 'password': {'string':'Password', 'type':'char', 'required':True},
- 'text': {'string':'SMS Message', 'type':'text', 'required':True}
-}
-
-def _sms_send(self, cr, uid, data, context):
- service = netsvc.LocalService("object_proxy")
- lots = service.execute(cr.dbname,uid, 'auction.lots', 'read', data['ids'], ['obj_num','obj_price','ach_uid'])
- res = service.execute(cr.dbname,uid, 'res.partner', 'read', [l['ach_uid'] for l in lots if l['ach_uid']], ['gsm'])
- #res = service.execute(cr.dbname, uid, 'res.partner', 'read', data['ids'], ['gsm'])
-# service = netsvc.LocalService("object_proxy")
-# pool=pooler.get_pool(cr.dbname)
-# lots=pool.get('auction.lots').browse(cr,uid,data['id'],context)
-# r=lots.ach_uid.id
- nbr = 0
- for r in res:
- to = r['mobile']
- if to:
- tools.smssend(data['form']['user'], data['form']['password'], data['form']['app_id'], unicode(data['form']['text'], 'utf-8').encode('latin1'), to)
- nbr += 1
- return {'sms_sent': nbr}
-
- if to:
- tools.smssend(data['form']['user'], data['form']['password'], data['form']['app_id'], unicode(data['form']['text'], 'utf-8').encode('latin1'), to)
- nbr += 1
- return {'sms_sent': nbr}
-#
-#def _sms_send(self, uid, datas):
-# service = netsvc.LocalService("object_proxy")
-# pool=pooler.ger_pool(cr.dbname)
-# lots=pool.get('auction.lots').browse(cr,uid,datas['ids'],context)
-# #lots = service.execute(uid, 'auction.lots', 'read', datas['ids'], ['obj_num','obj_price','ach_uid'])
-# #part = service.execute(uid, 'res.partner', 'read', [l['ach_uid'] for l in lots if l['ach_uid']], ['gsm'])
-#
-# part =ach_uid.id
-# part = map(lambda x: (x.id,x.mobile), part)
-# for l in lots:
-# part.append(str(l.obj_num)+'-%dEUR' % int(l.obj_price))
-#
-# for p in part.values():
-# to = p.mobile
-# if to:
-# params = urllib.urlencode({'user': datas['form']['user'], 'password': datas['form']['password'], 'api_id': datas['form']['app_id'], 'text':unicode(datas['form']['text'].replace('[lots]',', '.join(p['lots'])), 'utf-8').encode('latin1'), 'to':to})
-# f = urllib.urlopen("http://196.7.150.220/http/sendmsg", params)
-# nbr+=1
-# return {'sms_sent':nbr}
-
-class lots_sms(wizard.interface):
- states = {
- 'init': {
- 'actions': [],
- 'result': {'type': 'form', 'arch':sms_send_form, 'fields': sms_send_fields, 'state':[('send','Send SMS'), ('end','Cancel')]}
- },
- 'send': {
- 'actions': [_sms_send],
- 'result': {'type': 'state', 'state':'end'}
- }
- }
-lots_sms('auction.lots.sms_send');
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/auction/wizard/wizard_pay.py b/addons/auction/wizard/wizard_pay.py
deleted file mode 100644
index ff68c2b5b8d..00000000000
--- a/addons/auction/wizard/wizard_pay.py
+++ /dev/null
@@ -1,109 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2010 Tiny SPRL ().
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
-#
-##############################################################################
-
-import wizard
-import netsvc
-import netsvc
-import osv
-import time
-import pooler
-pay_form = '''
-
-
-
-
-
-
-
-
-
-
- '''
-
-def _start(self,cr,uid,data,context):
- pool = pooler.get_pool(cr.dbname)
- rec=pool.get('auction.lots').browse(cr,uid,data['ids'],context)
- amount1=0.0
- for r in rec:
- amount1+=r.buyer_price
- buyer= r and r.ach_uid.id or False
- if r.is_ok:
- raise wizard.except_wizard('Error !', 'Some lots of the selection are already paid.')
- return {'amount':amount1, 'total':amount1,'buyer_id':buyer}
-
-pay_fields = {
- 'amount': {'string': 'Amount paid', 'type':'float'},
- 'buyer_id': {'string': 'Buyer', 'type': 'many2one', 'relation':'res.partner'},
- 'statement_id1': {'string':'Statement', 'type':'many2one', 'required':True, 'relation':'account.bank.statement'},
- 'amount2': {'string': 'Amount paid', 'type':'float'},
- 'statement_id2': {'string':'Statement', 'type':'many2one', 'relation':'account.bank.statement'},
- 'amount3': {'string': 'Amount paid', 'type':'float'},
- 'statement_id3': {'string':'Statement', 'type':'many2one', 'relation':'account.bank.statement'},
- 'total': {'string': 'Amount to paid', 'type':'float','readonly':True}
-}
-
-def _pay_and_reconcile(self, cr, uid, data, context):
- if not abs(data['form']['total'] - (data['form']['amount']+data['form']['amount2']+data['form']['amount3']))<0.01:
- rest=data['form']['total']-(data['form']['amount']+data['form']['amount2']+data['form']['amount3'])
- raise wizard.except_wizard('Payment aborted !', 'You should pay all the total: "%.2f" are missing to accomplish the payment.' %(round(rest,2)))
-
- pool = pooler.get_pool(cr.dbname)
- lots = pool.get('auction.lots').browse(cr,uid,data['ids'],context)
- ref_bk_s=pooler.get_pool(cr.dbname).get('account.bank.statement.line')
-
- for lot in lots:
- if data['form']['buyer_id']:
- pool.get('auction.lots').write(cr,uid,[lot.id],{'ach_uid':data['form']['buyer_id']})
- if not lot.auction_id:
- raise wizard.except_wizard('Error !', 'No auction date for "%s": Please set one.'%(lot.name))
- pool.get('auction.lots').write(cr,uid,[lot.id],{'is_ok':True})
-
- for st,stamount in [('statement_id1','amount'),('statement_id2','amount2'),('statement_id3','amount3')]:
- if data['form'][st]:
- new_id=ref_bk_s.create(cr,uid,{
- 'name':'Buyer:'+str(lot.ach_login or '')+', auction:'+ lots[0].auction_id.name,
- 'date': time.strftime('%Y-%m-%d'),
- 'partner_id':data['form']['buyer_id'] or False,
- 'type':'customer',
- 'statement_id':data['form'][st],
- 'account_id':lot.auction_id.acc_income.id,
- 'amount':data['form'][stamount]
- })
- for lot in lots:
- pool.get('auction.lots').write(cr,uid,[lot.id],{'statement_id':[(4,new_id)]})
- return {}
-
-
-class wiz_auc_lots_pay(wizard.interface):
- states = {
- 'init': {
- 'actions': [_start],
- 'result': {'type': 'form', 'arch':pay_form, 'fields': pay_fields, 'state':[('end','Cancel'),('pay','Pay')]}
- },
- 'pay': {
- 'actions': [_pay_and_reconcile],
- 'result': {'type': 'state', 'state':'end'}
- }}
-wiz_auc_lots_pay('auction.pay.buy')
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/auction/wizard/wizard_payer.py b/addons/auction/wizard/wizard_payer.py
deleted file mode 100644
index 6e224fbadad..00000000000
--- a/addons/auction/wizard/wizard_payer.py
+++ /dev/null
@@ -1,79 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2010 Tiny SPRL ().
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
-#
-##############################################################################
-
-import wizard
-import netsvc
-import netsvc
-import osv
-import time
-import pooler
-
-pay_form = '''
-
- '''
-pay_fields = {
-}
-
-
-pay_form1 = '''
-
- '''
-pay_fields1 = {
-}
-def _payer(self, cr, uid, data, context):
- pool = pooler.get_pool(cr.dbname)
- pool.get('auction.lots').write(cr,uid,data['ids'],{'is_ok':True, 'state':'paid'})
- return {}
-
-
-def _payer_sel(self, cr, uid, data, context):
- pool = pooler.get_pool(cr.dbname)
- pool.get('auction.lots').write(cr,uid,data['ids'],{'paid_vnd':True})
- return {}
-
-
-class wiz_auc_pay(wizard.interface):
- states = {
- 'init': {
- 'actions': [],
- 'result': {'type': 'form', 'arch':pay_form, 'fields': pay_fields, 'state':[('end','Cancel'),('pay','Pay')]}
- },
- 'pay': {
- 'actions': [_payer],
- 'result': {'type': 'state', 'state':'end'}
- }}
-wiz_auc_pay('auction.payer')
-
-
-class wiz_auc_pay_sel(wizard.interface):
- states = {
- 'init': {
- 'actions': [],
- 'result': {'type': 'form', 'arch':pay_form1, 'fields': pay_fields1, 'state':[('end','Cancel'),('pay2','Pay')]}
- },
- 'pay2': {
- 'actions': [_payer_sel],
- 'result': {'type': 'state', 'state':'end'}
- }}
-wiz_auc_pay_sel('auction.payer.sel')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/auction/wizard/wizard_transfer_unsold_object.py b/addons/auction/wizard/wizard_transfer_unsold_object.py
deleted file mode 100644
index dd42ed865cd..00000000000
--- a/addons/auction/wizard/wizard_transfer_unsold_object.py
+++ /dev/null
@@ -1,92 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2010 Tiny SPRL ().
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
-#
-##############################################################################
-
-import time
-import wizard
-import netsvc
-import pooler
-from osv.orm import browse_record
-import sql_db
-
-transfer_unsold_object_form = """
-
-
-
-
-
-
-
-
-
-"""
-
-transfer_unsold_object_fields = {
- 'auction_id_from': {'string':'From Auction Date', 'type':'many2one', 'required':True, 'relation':'auction.dates'},
- 'auction_id_to': {'string':'To Auction Date', 'type':'many2one', 'required':True, 'relation':'auction.dates'},
-}
-
-def _start(self,cr,uid,data,context):
- pool = pooler.get_pool(cr.dbname)
- rec=pool.get('auction.lots').browse(cr,uid,data['id'],context)
- auction_from= rec and rec.auction_id.id or False
- return {'auction_id_from':auction_from}
-
-def _transfer_unsold_object(self, cr, uid, data, context):
- #if not (data['form']['auction_id_to']) :
- # return {}
-#Historique de l objet + changement de l auction date + supp des bid line
- line_ids= pooler.get_pool(cr.dbname).get('auction.bid_line').search(cr,uid,[('lot_id','in',data['ids'])])
- pooler.get_pool(cr.dbname).get('auction.bid_line').unlink(cr, uid, line_ids)
-
- obj_pool = pooler.get_pool(cr.dbname).get('auction.lots')
- ids= obj_pool.search(cr,uid,[('auction_id','=',data['form']['auction_id_from']),('state','=','unsold')])
- for rec in obj_pool.browse(cr, uid, ids, context):
- new_id=pooler.get_pool(cr.dbname).get('auction.lot.history').create(cr,uid,{'auction_id':rec.auction_id.id,'lot_id':rec.id,'price': rec.obj_ret, 'name': 'reasons'+rec.auction_id.auction1})
- up_auction=pooler.get_pool(cr.dbname).get('auction.lots').write(cr,uid,[rec.id],{'auction_id':data['form']['auction_id_to'],
- 'obj_ret':None,
- 'obj_price':None,
- 'ach_login':None,
- 'ach_uid':None,
- 'ach_inv_id':None,
- 'sel_inv_id':None,
- 'state':'draft'})
-
- # new_id = self.pool.get('auction.lot.history').copy(cr, uid, m.id, {'price': recs.obj_ret, 'name': 'reasons'+recs.auction_id.name})
- # new_id=pooler.get_pool(cr.dbname).get('auction.lot.history').create(cr,uid,{'auction_id':rec.auction_id,'lot_id':rec.name,'price': rec.obj_ret, 'name': 'reasons'+rec.auction_id.auction1})
- return {}
-
-class transfer_object(wizard.interface):
- states = {
- 'init' : {
- 'actions' : [_start],
- 'result' : {'type' : 'form',
- 'arch' : transfer_unsold_object_form,
- 'fields' :transfer_unsold_object_fields,
- 'state' : [('transfer', 'Transfer'),('end', 'Cancel') ]}
- },
- 'transfer' : {
- 'actions' : [_transfer_unsold_object],
- 'result' : {'type' : 'state','state' : 'end'}
- },
- }
-transfer_object('auction.lots.transfer.unsold.object')
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/audittrail/__terp__.py b/addons/audittrail/__terp__.py
index 8718523e7f1..7ec81b4eb7e 100644
--- a/addons/audittrail/__terp__.py
+++ b/addons/audittrail/__terp__.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL ().
#
@@ -15,7 +15,7 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
#
##############################################################################
@@ -24,8 +24,14 @@
'name': 'Audit Trail',
'version': '1.0',
'category': 'Generic Modules/Others',
- 'description': """Allows the administrator to track every user operations on all objects of the system.
- Subscribe Rules for read, write, create and delete on objects and check logs""",
+ 'description': """
+ This module gives the administrator the right
+ to track every user operation on all the objects
+ of the system.
+
+ Administrator can subscribe rules for read,write and
+ delete on objects and can check logs.
+ """,
'author': 'Tiny',
'website': 'http://www.openerp.com',
'depends': ['base'],
diff --git a/addons/audittrail/i18n/ar.po b/addons/audittrail/i18n/ar.po
index 8f01319c1e3..fdc79cc59d3 100644
--- a/addons/audittrail/i18n/ar.po
+++ b/addons/audittrail/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: audittrail
diff --git a/addons/audittrail/i18n/bg.po b/addons/audittrail/i18n/bg.po
index 5171275ff77..b7bc8fed724 100644
--- a/addons/audittrail/i18n/bg.po
+++ b/addons/audittrail/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: audittrail
diff --git a/addons/audittrail/i18n/bs.po b/addons/audittrail/i18n/bs.po
index 9eef8a950c4..91378a66f91 100644
--- a/addons/audittrail/i18n/bs.po
+++ b/addons/audittrail/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: audittrail
diff --git a/addons/audittrail/i18n/ca.po b/addons/audittrail/i18n/ca.po
index 01b13367278..c0f23ed1e56 100644
--- a/addons/audittrail/i18n/ca.po
+++ b/addons/audittrail/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: audittrail
diff --git a/addons/audittrail/i18n/cs.po b/addons/audittrail/i18n/cs.po
index 8f01319c1e3..fdc79cc59d3 100644
--- a/addons/audittrail/i18n/cs.po
+++ b/addons/audittrail/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: audittrail
diff --git a/addons/audittrail/i18n/de.po b/addons/audittrail/i18n/de.po
index 73074ee299f..ac23f3c4373 100644
--- a/addons/audittrail/i18n/de.po
+++ b/addons/audittrail/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: audittrail
diff --git a/addons/audittrail/i18n/el.po b/addons/audittrail/i18n/el.po
index 49bffc4d161..c9a594ff894 100644
--- a/addons/audittrail/i18n/el.po
+++ b/addons/audittrail/i18n/el.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: audittrail
diff --git a/addons/audittrail/i18n/es.po b/addons/audittrail/i18n/es.po
index 1825b1ce3e2..90246309dcd 100644
--- a/addons/audittrail/i18n/es.po
+++ b/addons/audittrail/i18n/es.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: audittrail
diff --git a/addons/audittrail/i18n/es_AR.po b/addons/audittrail/i18n/es_AR.po
index c8f78ca39c8..3b132a92acd 100644
--- a/addons/audittrail/i18n/es_AR.po
+++ b/addons/audittrail/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: audittrail
diff --git a/addons/audittrail/i18n/et.po b/addons/audittrail/i18n/et.po
index 82799f3e868..7e7885225e7 100644
--- a/addons/audittrail/i18n/et.po
+++ b/addons/audittrail/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: audittrail
diff --git a/addons/audittrail/i18n/fr.po b/addons/audittrail/i18n/fr.po
index 0f965069d55..04d202bfad2 100644
--- a/addons/audittrail/i18n/fr.po
+++ b/addons/audittrail/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: audittrail
diff --git a/addons/audittrail/i18n/hr.po b/addons/audittrail/i18n/hr.po
index 93477723853..791ee4d7c0e 100644
--- a/addons/audittrail/i18n/hr.po
+++ b/addons/audittrail/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: audittrail
diff --git a/addons/audittrail/i18n/hu.po b/addons/audittrail/i18n/hu.po
index 8f01319c1e3..fdc79cc59d3 100644
--- a/addons/audittrail/i18n/hu.po
+++ b/addons/audittrail/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: audittrail
diff --git a/addons/audittrail/i18n/id.po b/addons/audittrail/i18n/id.po
index ad2e3c5afd6..80406f221ba 100644
--- a/addons/audittrail/i18n/id.po
+++ b/addons/audittrail/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: audittrail
diff --git a/addons/audittrail/i18n/it.po b/addons/audittrail/i18n/it.po
index 5f27a27e25a..ef0956d2e0a 100644
--- a/addons/audittrail/i18n/it.po
+++ b/addons/audittrail/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: audittrail
diff --git a/addons/audittrail/i18n/ko.po b/addons/audittrail/i18n/ko.po
index 0f5cf3bb073..438c6078923 100644
--- a/addons/audittrail/i18n/ko.po
+++ b/addons/audittrail/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: audittrail
diff --git a/addons/audittrail/i18n/lt.po b/addons/audittrail/i18n/lt.po
index 158ae3dab1b..130b235f6bd 100644
--- a/addons/audittrail/i18n/lt.po
+++ b/addons/audittrail/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: audittrail
diff --git a/addons/audittrail/i18n/nl.po b/addons/audittrail/i18n/nl.po
index 3fda68cd1c7..17679bdfb4a 100644
--- a/addons/audittrail/i18n/nl.po
+++ b/addons/audittrail/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: audittrail
diff --git a/addons/audittrail/i18n/nl_BE.po b/addons/audittrail/i18n/nl_BE.po
index 04999070b23..f23ecf8d7bf 100644
--- a/addons/audittrail/i18n/nl_BE.po
+++ b/addons/audittrail/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: audittrail
diff --git a/addons/audittrail/i18n/pl.po b/addons/audittrail/i18n/pl.po
index 4f14ae9a78d..6aaea2264b7 100644
--- a/addons/audittrail/i18n/pl.po
+++ b/addons/audittrail/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: audittrail
diff --git a/addons/audittrail/i18n/pt.po b/addons/audittrail/i18n/pt.po
index 5d82d7a531f..cd51847bae0 100644
--- a/addons/audittrail/i18n/pt.po
+++ b/addons/audittrail/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: audittrail
diff --git a/addons/audittrail/i18n/pt_BR.po b/addons/audittrail/i18n/pt_BR.po
index 9ef7e68e8ab..4eee122091f 100644
--- a/addons/audittrail/i18n/pt_BR.po
+++ b/addons/audittrail/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: audittrail
diff --git a/addons/audittrail/i18n/ro.po b/addons/audittrail/i18n/ro.po
index dbda9af2ee9..11ed5bb1fa9 100644
--- a/addons/audittrail/i18n/ro.po
+++ b/addons/audittrail/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: audittrail
diff --git a/addons/audittrail/i18n/ru.po b/addons/audittrail/i18n/ru.po
index e30ca0b6b58..148d94c2c32 100644
--- a/addons/audittrail/i18n/ru.po
+++ b/addons/audittrail/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: audittrail
diff --git a/addons/audittrail/i18n/sl.po b/addons/audittrail/i18n/sl.po
index dc30578fee9..c2f0a1e5fe4 100644
--- a/addons/audittrail/i18n/sl.po
+++ b/addons/audittrail/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: audittrail
diff --git a/addons/audittrail/i18n/sv.po b/addons/audittrail/i18n/sv.po
index f70b14c504f..83b539c4b0e 100644
--- a/addons/audittrail/i18n/sv.po
+++ b/addons/audittrail/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: audittrail
diff --git a/addons/audittrail/i18n/tlh.po b/addons/audittrail/i18n/tlh.po
index 596b058f61e..b2dd3acfc19 100644
--- a/addons/audittrail/i18n/tlh.po
+++ b/addons/audittrail/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: audittrail
diff --git a/addons/audittrail/i18n/tr.po b/addons/audittrail/i18n/tr.po
index 15001fae14e..0bc8d0c4257 100644
--- a/addons/audittrail/i18n/tr.po
+++ b/addons/audittrail/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: audittrail
diff --git a/addons/audittrail/i18n/uk.po b/addons/audittrail/i18n/uk.po
index 9492553e029..a7f8f9a5198 100644
--- a/addons/audittrail/i18n/uk.po
+++ b/addons/audittrail/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: audittrail
diff --git a/addons/audittrail/i18n/zh_CN.po b/addons/audittrail/i18n/zh_CN.po
index 05b1e2e8306..b491e2e94f3 100644
--- a/addons/audittrail/i18n/zh_CN.po
+++ b/addons/audittrail/i18n/zh_CN.po
@@ -4,78 +4,78 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
+"Project-Id-Version: OpenERP Server 5.0.6\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-01-23 17:17+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-03-20 07:34+0000\n"
+"Last-Translator: Black Jack \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: audittrail
#: model:ir.module.module,shortdesc:audittrail.module_meta_information
msgid "Audit Trail"
-msgstr ""
+msgstr "审计线索"
#. module: audittrail
#: constraint:ir.model:0
msgid ""
"The Object name must start with x_ and not contain any special character !"
-msgstr ""
+msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
#. module: audittrail
#: field:audittrail.log.line,log_id:0
msgid "Log"
-msgstr ""
+msgstr "日志"
#. module: audittrail
#: selection:audittrail.rule,state:0
msgid "Subscribed"
-msgstr ""
+msgstr "订阅"
#. module: audittrail
#: view:audittrail.log:0
msgid "Old Value : "
-msgstr ""
+msgstr "旧值: "
#. module: audittrail
#: selection:audittrail.log,method:0
msgid "Create"
-msgstr ""
+msgstr "创建"
#. module: audittrail
#: wizard_view:audittrail.view.log,init:0
msgid "Audit Logs"
-msgstr ""
+msgstr "审计日志"
#. module: audittrail
#: field:audittrail.rule,state:0
msgid "State"
-msgstr ""
+msgstr "状态"
#. module: audittrail
#: selection:audittrail.rule,state:0
msgid "Draft"
-msgstr ""
+msgstr "草稿"
#. module: audittrail
#: field:audittrail.log.line,old_value:0
msgid "Old Value"
-msgstr ""
+msgstr "旧值"
#. module: audittrail
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "在这动作定义中有无效的模块名"
#. module: audittrail
#: model:ir.actions.wizard,name:audittrail.wizard_audittrail_log
msgid "View log"
-msgstr ""
+msgstr "日志视图"
#. module: audittrail
#: model:ir.model,name:audittrail.model_audittrail_log_line
@@ -85,12 +85,12 @@ msgstr ""
#. module: audittrail
#: field:audittrail.log,method:0
msgid "Method"
-msgstr ""
+msgstr "方法"
#. module: audittrail
#: wizard_field:audittrail.view.log,init,from:0
msgid "Log From"
-msgstr ""
+msgstr "日志格式"
#. module: audittrail
#: field:audittrail.log.line,log:0
@@ -100,53 +100,53 @@ msgstr ""
#. module: audittrail
#: field:audittrail.log,res_id:0
msgid "Resource Id"
-msgstr ""
+msgstr "资源ID"
#. module: audittrail
#: selection:audittrail.log,method:0
msgid "Write"
-msgstr ""
+msgstr "写"
#. module: audittrail
#: model:ir.ui.menu,name:audittrail.menu_action_audittrail
msgid "Audittrails"
-msgstr ""
+msgstr "审计线索"
#. module: audittrail
#: view:audittrail.log:0
msgid "Log Lines"
-msgstr ""
+msgstr "日志明细"
#. module: audittrail
#: view:audittrail.rule:0
msgid "Subscribe"
-msgstr ""
+msgstr "订阅"
#. module: audittrail
#: selection:audittrail.log,method:0
msgid "Read"
-msgstr ""
+msgstr "读"
#. module: audittrail
#: field:audittrail.log,object_id:0
#: field:audittrail.rule,object_id:0
msgid "Object"
-msgstr ""
+msgstr "对象"
#. module: audittrail
#: view:audittrail.rule:0
msgid "AuditTrail Rule"
-msgstr ""
+msgstr "审计线索规则"
#. module: audittrail
#: wizard_field:audittrail.view.log,init,to:0
msgid "Log To"
-msgstr ""
+msgstr "日志到"
#. module: audittrail
#: view:audittrail.log:0
msgid "New Value Text: "
-msgstr ""
+msgstr "新值正文: "
#. module: audittrail
#: model:ir.module.module,description:audittrail.module_meta_information
@@ -156,51 +156,53 @@ msgid ""
" Subscribe Rules for read, write, create and delete on objects and check "
"logs"
msgstr ""
+"允许管理员跟踪每个用户操作系统所有对象\n"
+"访问规则读、写、创建、删除对象和检查日志"
#. module: audittrail
#: field:audittrail.log,timestamp:0
msgid "Date"
-msgstr ""
+msgstr "日期"
#. module: audittrail
#: field:audittrail.log,user_id:0
msgid "User"
-msgstr ""
+msgstr "用户"
#. module: audittrail
#: view:audittrail.log:0
msgid "Old Value Text : "
-msgstr ""
+msgstr "旧值正文: "
#. module: audittrail
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "无效XML视图结构!"
#. module: audittrail
#: field:audittrail.log,name:0
msgid "Name"
-msgstr ""
+msgstr "名称"
#. module: audittrail
#: field:audittrail.log,line_ids:0
msgid "Log lines"
-msgstr ""
+msgstr "日志明细"
#. module: audittrail
#: model:ir.ui.menu,name:audittrail.menu_action_audittrail_rule_tree_sub
msgid "Subscribed Rules"
-msgstr ""
+msgstr "订阅规则"
#. module: audittrail
#: field:audittrail.log.line,field_id:0
msgid "Fields"
-msgstr ""
+msgstr "字段"
#. module: audittrail
#: view:audittrail.rule:0
msgid "AuditTrail Rules"
-msgstr ""
+msgstr "审计线索规则"
#. module: audittrail
#: model:ir.model,name:audittrail.model_audittrail_rule
@@ -210,99 +212,99 @@ msgstr ""
#. module: audittrail
#: view:audittrail.rule:0
msgid "UnSubscribe"
-msgstr ""
+msgstr "取消订阅"
#. module: audittrail
#: field:audittrail.rule,log_write:0
msgid "Log writes"
-msgstr ""
+msgstr "日志写"
#. module: audittrail
#: model:ir.model,name:audittrail.model_audittrail_log
msgid "audittrail.log"
-msgstr ""
+msgstr "日志"
#. module: audittrail
#: field:audittrail.log.line,field_description:0
msgid "Field Description"
-msgstr ""
+msgstr "字段说明"
#. module: audittrail
#: selection:audittrail.log,method:0
msgid "Delete"
-msgstr ""
+msgstr "删除"
#. module: audittrail
#: wizard_button:audittrail.view.log,init,open:0
msgid "Open Logs"
-msgstr ""
+msgstr "打开日志"
#. module: audittrail
#: field:audittrail.log.line,new_value_text:0
msgid "New value Text"
-msgstr ""
+msgstr "新值正文"
#. module: audittrail
#: field:audittrail.rule,name:0
msgid "Rule Name"
-msgstr ""
+msgstr "规则名称"
#. module: audittrail
#: field:audittrail.rule,log_read:0
msgid "Log reads"
-msgstr ""
+msgstr "日志读"
#. module: audittrail
#: model:ir.ui.menu,name:audittrail.menu_action_audittrail_log_tree
msgid "Logs"
-msgstr ""
+msgstr "日志"
#. module: audittrail
#: field:audittrail.log.line,new_value:0
msgid "New Value"
-msgstr ""
+msgstr "新值"
#. module: audittrail
#: model:ir.ui.menu,name:audittrail.menu_action_log_tree2
msgid "View Logs"
-msgstr ""
+msgstr "日志视图"
#. module: audittrail
#: field:audittrail.rule,log_create:0
msgid "Log creates"
-msgstr ""
+msgstr "日志建立者"
#. module: audittrail
#: view:audittrail.log:0
msgid "AuditTrail Logs"
-msgstr ""
+msgstr "审计线索日志"
#. module: audittrail
#: model:ir.ui.menu,name:audittrail.menu_action_audittrail_rule_tree
msgid "Rules"
-msgstr ""
+msgstr "规则"
#. module: audittrail
#: view:audittrail.log:0
msgid "New Value : "
-msgstr ""
+msgstr "新值: "
#. module: audittrail
#: field:audittrail.rule,user_id:0
msgid "Users"
-msgstr ""
+msgstr "用户"
#. module: audittrail
#: field:audittrail.log.line,old_value_text:0
msgid "Old value Text"
-msgstr ""
+msgstr "旧值正文"
#. module: audittrail
#: wizard_button:audittrail.view.log,init,end:0
msgid "Cancel"
-msgstr ""
+msgstr "取消"
#. module: audittrail
#: field:audittrail.rule,log_unlink:0
msgid "Log deletes"
-msgstr ""
+msgstr "日志删除"
diff --git a/addons/audittrail/i18n/zh_TW.po b/addons/audittrail/i18n/zh_TW.po
index 05b1e2e8306..9c361325c4d 100644
--- a/addons/audittrail/i18n/zh_TW.po
+++ b/addons/audittrail/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: audittrail
diff --git a/addons/base_action_rule/base_action_rule.py b/addons/base_action_rule/base_action_rule.py
index 020d2740d4d..f4129998bcc 100644
--- a/addons/base_action_rule/base_action_rule.py
+++ b/addons/base_action_rule/base_action_rule.py
@@ -29,61 +29,86 @@ from osv.orm import except_orm
from tools.translate import _
class base_action_rule(osv.osv):
+ """ Base Action Rules """
+
_name = 'base.action.rule'
- _description = 'Action Rules'
-
-
+ _description = 'Action Rules'
+
_columns = {
'name': fields.many2one('ir.model', 'Model', required=True),
- 'max_level': fields.integer('Max Level', help='Specifies maximum level.'),
+ 'max_level': fields.integer('Max Level', help='Specifies maximum level.'),
'rule_lines': fields.one2many('base.action.rule.line','rule_id','Rule Lines'),
'create_date': fields.datetime('Create Date', readonly=1),
'active': fields.boolean('Active')
}
-
+
_defaults = {
'active': lambda *a: True,
'max_level': lambda *a: 15,
}
def format_body(self, body):
+ """ Foramat Action rule's body
+ @param self: The object pointer """
+
return body and tools.ustr(body) or ''
def format_mail(self, obj, body):
+ """ Foramat Mail
+ @param self: The object pointer """
+
data = {
'object_id': obj.id,
'object_subject': hasattr(obj, 'name') and obj.name or False,
'object_date': hasattr(obj, 'date') and obj.date or False,
'object_description': hasattr(obj, 'description') and obj.description or False,
'object_user': hasattr(obj, 'user_id') and (obj.user_id and obj.user_id.name) or '/',
- 'object_user_email': hasattr(obj, 'user_id') and (obj.user_id and obj.user_id.address_id and obj.user_id.address_id.email) or '/',
- 'object_user_phone': hasattr(obj, 'user_id') and (obj.user_id and obj.user_id.address_id and obj.user_id.address_id.phone) or '/',
+ 'object_user_email': hasattr(obj, 'user_id') and (obj.user_id and \
+ obj.user_id.address_id and obj.user_id.address_id.email) or '/',
+ 'object_user_phone': hasattr(obj, 'user_id') and (obj.user_id and\
+ obj.user_id.address_id and obj.user_id.address_id.phone) or '/',
'partner': hasattr(obj, 'partner_id') and (obj.partner_id and obj.partner_id.name) or '/',
- 'partner_email': hasattr(obj, 'partner_address_id') and (obj.partner_address_id and obj.partner_address_id.email) or '/',
+ 'partner_email': hasattr(obj, 'partner_address_id') and (obj.partner_address_id and\
+ obj.partner_address_id.email) or '/',
}
return self.format_body(body % data)
def email_send(self, cr, uid, obj, emails, body, emailfrom=tools.config.get('email_from',False), context={}):
+ """ send email
+ @param self: The object pointer
+ @param cr: the current row, from the database cursor,
+ @param uid: the current user’s ID for security checks,
+ @param email: pass the emails
+ @param emailfrom: Pass name the email From else False
+ @param context: A standard dictionary for contextual values """
+
body = self.format_mail(obj, body)
if not emailfrom:
- if hasattr(obj, 'user_id') and obj.user_id and obj.user_id.address_id and obj.user_id.address_id.email:
+ if hasattr(obj, 'user_id') and obj.user_id and obj.user_id.address_id and\
+ obj.user_id.address_id.email:
emailfrom = obj.user_id.address_id.email
-
+
name = '[%d] %s' % (obj.id, tools.ustr(obj.name))
emailfrom = tools.ustr(emailfrom)
- reply_to = emailfrom
+ reply_to = emailfrom
if not emailfrom:
raise osv.except_osv(_('Error!'),
_("No E-Mail ID Found for your Company address!"))
return tools.email_send(emailfrom, emails, name, body, reply_to=reply_to, openobject_id=str(obj.id))
-
+
def do_check(self, cr, uid, action, obj, context={}):
- ok = True
- if hasattr(obj, 'user_id'):
+ """ check Action
+ @param self: The object pointer
+ @param cr: the current row, from the database cursor,
+ @param uid: the current user’s ID for security checks,
+ @param context: A standard dictionary for contextual values """
+
+ ok = True
+ if hasattr(obj, 'user_id'):
ok = ok and (not action.trg_user_id.id or action.trg_user_id.id==obj.user_id.id)
if hasattr(obj, 'partner_id'):
- ok = ok and (not action.trg_partner_id.id or action.trg_partner_id.id==obj.partner_id.id)
+ ok = ok and (not action.trg_partner_id.id or action.trg_partner_id.id==obj.partner_id.id)
ok = ok and (
not action.trg_partner_categ_id.id or
(
@@ -113,14 +138,22 @@ class base_action_rule(osv.osv):
return ok
def do_action(self, cr, uid, action, model_obj, obj, context={}):
+ """ Do Action
+ @param self: The object pointer
+ @param cr: the current row, from the database cursor,
+ @param uid: the current user’s ID for security checks,
+ @param action: pass action
+ @param model_obj: pass Model object
+ @param context: A standard dictionary for contextual values """
+
if action.server_action_id:
context.update({'active_id':obj.id,'active_ids':[obj.id]})
self.pool.get('ir.actions.server').run(cr, uid, [action.server_action_id.id], context)
- write = {}
+ write = {}
if hasattr(obj, 'user_id') and action.act_user_id:
obj.user_id = action.act_user_id
write['user_id'] = action.act_user_id.id
- if hasattr(obj, 'date_action_last'):
+ if hasattr(obj, 'date_action_last'):
write['date_action_last'] = time.strftime('%Y-%m-%d %H:%M:%S')
if hasattr(obj, 'state') and action.act_state:
obj.state = action.act_state
@@ -135,7 +168,7 @@ class base_action_rule(osv.osv):
write['priority'] = action.act_priority
model_obj.write(cr, uid, [obj.id], write, context)
-
+
if hasattr(model_obj, 'remind_user') and action.act_remind_user:
model_obj.remind_user(cr, uid, [obj.id], context, attach=action.act_remind_attach)
if hasattr(model_obj, 'remind_partner') and action.act_remind_partner:
@@ -146,7 +179,7 @@ class base_action_rule(osv.osv):
if hasattr(obj, 'user_id') and action.act_mail_to_user:
if obj.user_id and obj.user_id.address_id:
emails.append(obj.user_id.address_id.email)
-
+
if action.act_mail_to_watchers:
emails += (action.act_email_cc or '').split(',')
if action.act_mail_to_email:
@@ -158,11 +191,19 @@ class base_action_rule(osv.osv):
return True
def _action(self, cr, uid, ids, objects, scrit=None, context={}):
+ """ Do Action
+ @param self: The object pointer
+ @param cr: the current row, from the database cursor,
+ @param uid: the current user’s ID for security checks,
+ @param ids: List of Basic Action Rule’s IDs,
+ @param objects: pass objects
+ @param context: A standard dictionary for contextual values """
+
if not scrit:
scrit = []
rule_line_obj = self.pool.get('base.action.rule.line')
- for rule in self.browse(cr, uid, ids):
- level = rule.max_level
+ for rule in self.browse(cr, uid, ids):
+ level = rule.max_level
if not level:
break
newactions = []
@@ -184,7 +225,8 @@ class base_action_rule(osv.osv):
base = mx.DateTime.strptime(obj.date_action_last, '%Y-%m-%d %H:%M:%S')
else:
base = mx.DateTime.strptime(obj.create_date[:19], '%Y-%m-%d %H:%M:%S')
- elif hasattr(obj, 'date_deadline') and action.trg_date_type=='deadline' and obj.date_deadline:
+ elif hasattr(obj, 'date_deadline') and action.trg_date_type=='deadline' \
+ and obj.date_deadline:
base = mx.DateTime.strptime(obj.date_deadline, '%Y-%m-%d %H:%M:%S')
elif hasattr(obj, 'date') and action.trg_date_type=='date' and obj.date:
base = mx.DateTime.strptime(obj.date, '%Y-%m-%d %H:%M:%S')
@@ -212,7 +254,7 @@ class base_action_rule(osv.osv):
if ok:
self.do_action(cr, uid, action, model_obj, obj, context)
- break
+ break
level -= 1
return True
base_action_rule()
@@ -222,20 +264,46 @@ class base_action_rule_line(osv.osv):
_description = 'Action Rule Lines'
def _state_get(self, cr, uid, context={}):
+ """ Get State
+ @param self: The object pointer
+ @param cr: the current row, from the database cursor,
+ @param uid: the current user’s ID for security checks,
+ @param context: A standard dictionary for contextual values """
+
return self.state_get(cr, uid, context=context)
def _priority_get(self, cr, uid, context={}):
+ """ Get Priority
+ @param self: The object pointer
+ @param cr: the current row, from the database cursor,
+ @param uid: the current user’s ID for security checks,
+ @param context: A standard dictionary for contextual values """
+
return self.priority_get(cr, uid, context=context)
def state_get(self, cr, uid, context={}):
+ """ Get State
+ @param self: The object pointer
+ @param cr: the current row, from the database cursor,
+ @param uid: the current user’s ID for security checks,
+ @param context: A standard dictionary for contextual values """
+
return [('','')]
def priority_get(self, cr, uid, context={}):
+ """ Get Priority
+ @param self: The object pointer
+ @param cr: the current row, from the database cursor,
+ @param uid: the current user’s ID for security checks,
+ @param context: A standard dictionary for contextual values """
+
return [('','')]
_columns = {
'name': fields.char('Rule Name',size=64, required=True),
'rule_id': fields.many2one('base.action.rule','Rule'),
- 'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the rule without removing it."),
- 'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of rules."),
+ 'active': fields.boolean('Active', help="If the active field is set to true,\
+ it will allow you to hide the rule without removing it."),
+ 'sequence': fields.integer('Sequence', help="Gives the sequence order when\
+ displaying a list of rules."),
'trg_date_type': fields.selection([
('none','None'),
@@ -243,11 +311,13 @@ class base_action_rule_line(osv.osv):
('action_last','Last Action Date'),
('date','Date'),
], 'Trigger Date', size=16),
- 'trg_date_range': fields.integer('Delay after trigger date',help="Delay After Trigger Date, specifies you can put a negative number " \
- "if you need a delay before the trigger date, like sending a reminder 15 minutes before a meeting."),
- 'trg_date_range_type': fields.selection([('minutes', 'Minutes'),('hour','Hours'),('day','Days'),('month','Months')], 'Delay type'),
+ 'trg_date_range': fields.integer('Delay after trigger date',help="Delay After Trigger Date,\
+ specifies you can put a negative number " \
+ "if you need a delay before the trigger date, like sending a reminder 15 minutes before a meeting."),
+ 'trg_date_range_type': fields.selection([('minutes', 'Minutes'),('hour','Hours'),\
+ ('day','Days'),('month','Months')], 'Delay type'),
+
-
'trg_user_id': fields.many2one('res.users', 'Responsible'),
'trg_partner_id': fields.many2one('res.partner', 'Partner'),
@@ -255,42 +325,59 @@ class base_action_rule_line(osv.osv):
'trg_state_from': fields.selection(_state_get, 'State', size=16),
'trg_state_to': fields.selection(_state_get, 'Button Pressed', size=16),
'trg_priority_from': fields.selection(_priority_get, 'Minimum Priority'),
- 'trg_priority_to': fields.selection(_priority_get, 'Maximum Priority'),
-
- 'act_method': fields.char('Call Object Method', size=64),
- 'act_user_id': fields.many2one('res.users', 'Set responsible to'),
+ 'trg_priority_to': fields.selection(_priority_get, 'Maximum Priority'),
+
+ 'act_method': fields.char('Call Object Method', size=64),
+ 'act_user_id': fields.many2one('res.users', 'Set responsible to'),
'act_state': fields.selection(_state_get, 'Set state to', size=16),
- 'act_priority': fields.selection(_priority_get, 'Set priority to'),
- 'act_email_cc': fields.char('Add watchers (Cc)', size=250, help="These people will receive a copy of the future communication between partner and users by email"),
+ 'act_priority': fields.selection(_priority_get, 'Set priority to'),
+ 'act_email_cc': fields.char('Add watchers (Cc)', size=250, help="These people\
+ will receive a copy of the future communication between partner and users by email"),
- 'act_remind_partner': fields.boolean('Remind Partner', help="Check this if you want the rule to send a reminder by email to the partner."),
- 'act_remind_user': fields.boolean('Remind responsible', help="Check this if you want the rule to send a reminder by email to the user."),
+ 'act_remind_partner': fields.boolean('Remind Partner', help="Check this if\
+ you want the rule to send a reminder by email to the partner."),
+ 'act_remind_user': fields.boolean('Remind responsible', help="Check this if \
+ you want the rule to send a reminder by email to the user."),
'act_reply_to': fields.char('Reply-To', size=64),
- 'act_remind_attach': fields.boolean('Remind with attachment', help="Check this if you want that all documents attached to the object be attached to the reminder email sent."),
+ 'act_remind_attach': fields.boolean('Remind with attachment', help="Check this if\
+ you want that all documents attached to the object be attached \
+ to the reminder email sent."),
- 'act_mail_to_user': fields.boolean('Mail to responsible',help="Check this if you want the rule to send an email to the responsible person."),
- 'act_mail_to_watchers': fields.boolean('Mail to watchers (CC)',help="Check this if you want the rule to mark CC(mail to any other person defined in actions)."),
- 'act_mail_to_email': fields.char('Mail to these emails', size=128,help="Email-id of the persons whom mail is to be sent"),
+ 'act_mail_to_user': fields.boolean('Mail to responsible',help="Check this if \
+ you want the rule to send an email to the responsible person."),
+ 'act_mail_to_watchers': fields.boolean('Mail to watchers (CC)',help="Check this\
+ if you want the rule to mark CC(mail to any other person\
+ defined in actions)."),
+ 'act_mail_to_email': fields.char('Mail to these emails', size=128,help="Email-id \
+ of the persons whom mail is to be sent"),
'act_mail_body': fields.text('Mail body',help="Content of mail"),
'regex_name': fields.char('Regular Expression on Model Name', size=128),
- 'server_action_id': fields.many2one('ir.actions.server','Server Action',help="Describes the action name." \
- "eg:on which object which action to be taken on basis of which condition"),
+ 'server_action_id': fields.many2one('ir.actions.server','Server Action',help="Describes the\
+ action name." \
+ "eg:on which object which action to be taken on basis of which condition"),
}
-
+
_defaults = {
'active': lambda *a: 1,
'trg_date_type': lambda *a: 'none',
'trg_date_range_type': lambda *a: 'day',
'act_mail_to_user': lambda *a: 0,
'act_remind_partner': lambda *a: 0,
- 'act_remind_user': lambda *a: 0,
+ 'act_remind_user': lambda *a: 0,
'act_mail_to_watchers': lambda *a: 0,
}
-
- _order = 'sequence'
-
-
+
+ _order = 'sequence'
+
+
def _check_mail(self, cr, uid, ids, context=None):
+ """ Check Mail
+ @param self: The object pointer
+ @param cr: the current row, from the database cursor,
+ @param uid: the current user’s ID for security checks,
+ @param ids: List of Action Rule’s IDs
+ @param context: A standard dictionary for contextual values """
+
empty = orm.browse_null()
rule_obj = self.pool.get('base.action.rule')
for rule in self.browse(cr, uid, ids):
@@ -300,10 +387,11 @@ class base_action_rule_line(osv.osv):
except (ValueError, KeyError, TypeError):
return False
return True
-
+
_constraints = [
(_check_mail, 'Error: The mail is not well formated', ['act_mail_body']),
]
-
+
base_action_rule_line()
+
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_action_rule/base_action_rule_view.xml b/addons/base_action_rule/base_action_rule_view.xml
index 9892886c675..06837e2c2da 100644
--- a/addons/base_action_rule/base_action_rule_view.xml
+++ b/addons/base_action_rule/base_action_rule_view.xml
@@ -1,10 +1,11 @@
-
+
-
base.action.rule.form
@@ -21,6 +22,8 @@
+
+
base.action.rule.tree
base.action.rule
@@ -34,6 +37,8 @@
+
+
Action Rules
base.action.rule
@@ -42,10 +47,11 @@
-
+
-
base.action.rule.line.form
@@ -127,6 +133,9 @@
+
+
+
base.action.rule.line.tree
base.action.rule.line
diff --git a/addons/base_calendar/__terp__.py b/addons/base_calendar/__terp__.py
index ce65e1166c5..e8b528db1a3 100755
--- a/addons/base_calendar/__terp__.py
+++ b/addons/base_calendar/__terp__.py
@@ -19,31 +19,27 @@
#
##############################################################################
-
{
"name" : "Basic Calendar Functionality",
"version" : "1.0",
- "depends" : [
- "base",
- ],
- 'description': """
- Full featured calendar system that support:
- - Alerts (create requests)
- - Recurring events (*)
- - Invitations to others people
-""",
+ "depends" : ["base"],
+ 'description': """Full featured calendar system that support:
+ - Alerts (create requests)
+ - Recurring events (*)
+ - Invitations to others people""",
"author" : "Tiny",
'category': 'Generic Modules/Others',
'website': 'http://www.openerp.com',
"init_xml" : [
- 'base_calendar_data.xml'
- ],
+ 'base_calendar_data.xml'
+ ],
"demo_xml" : [],
"update_xml" : [
- 'security/ir.model.access.csv',
- 'wizard/calendar_event_edit_all_view.xml',
- 'base_calendar_view.xml'
- ],
+ 'security/ir.model.access.csv',
+ 'wizard/calendar_event_edit_all_view.xml',
+ 'wizard/base_calendar_invite_attendee_view.xml',
+ 'base_calendar_view.xml'
+ ],
"installable" : True,
"active" : False,
}
diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 4aa274a0a68..c60b75a9815 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL ().
#
@@ -15,9 +15,10 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
#
##############################################################################
+
from datetime import datetime, timedelta
from dateutil import parser
from dateutil import rrule
@@ -36,11 +37,17 @@ months = {
def get_recurrent_dates(rrulestring, exdate, startdate=None):
"""
- Get recurrent dates
+ Get recurrent dates based on Rule string considering exdate and start date
+ @param rrulestring: Rulestring
+ @param exdate: List of exception dates for rrule
+ @param startdate: Startdate for computing recurrent dates
+ @return: List of Recurrent dates
"""
+
def todate(date):
val = parser.parse(''.join((re.compile('\d')).findall(date)))
return val
+
if not startdate:
startdate = datetime.now()
rset1 = rrule.rrulestr(rrulestring, dtstart=startdate, forceset=True)
@@ -53,11 +60,14 @@ def get_recurrent_dates(rrulestring, exdate, startdate=None):
def base_calendar_id2real_id(base_calendar_id=None, with_date=False):
"""
- Convert base calendar id into real id.
- @return: base calendar id
+ This function converts virtual event id into real id of actual event
+ @param base_calendar_id: Id of calendar
+ @param with_date: If value passed to this param it will return dates based on value of withdate + base_calendar_id
"""
+
if base_calendar_id and isinstance(base_calendar_id, (str, unicode)):
res = base_calendar_id.split('-')
+
if len(res) >= 2:
real_id = res[0]
if with_date:
@@ -67,16 +77,20 @@ def base_calendar_id2real_id(base_calendar_id=None, with_date=False):
end = start + timedelta(hours=with_date)
return (int(real_id), real_date, end.strftime("%Y-%m-%d %H:%M:%S"))
return int(real_id)
+
return base_calendar_id and int(base_calendar_id) or base_calendar_id
def real_id2base_calendar_id(real_id, recurrent_date):
"""
- Convert real id into base_calendar_id.
+ Convert real id of record into virtual id using recurrent_date
+ e.g. real id is 1 and recurrent_date is 01-12-2009 10:00:00 then it will return
+ 1-20091201100000
@return: real id with recurrent date.
"""
+
if real_id and recurrent_date:
recurrent_date = time.strftime("%Y%m%d%H%M%S", \
- time.strptime(recurrent_date, "%Y-%m-%d %H:%M:%S"))
+ time.strptime(recurrent_date, "%Y-%m-%d %H:%M:%S"))
return '%d-%s' % (real_id, recurrent_date)
return real_id
@@ -89,9 +103,10 @@ def _links_get(self, cr, uid, context={}):
@param context: A standard dictionary for contextual values
@return: list of dictionary which contain object and name and id.
"""
+
obj = self.pool.get('res.request.link')
ids = obj.search(cr, uid, [])
- res = obj.read(cr, uid, ids, ['object', 'name'], context)
+ res = obj.read(cr, uid, ids, ['object', 'name'], context=context)
return [(r['object'], r['name']) for r in res]
html_invitation = """
@@ -200,142 +215,6 @@ html_invitation = """